diff options
693 files changed, 10829 insertions, 7175 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index f2d168c522..8622a7bf94 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake | |||
@@ -27,7 +27,7 @@ from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException | |||
27 | 27 | ||
28 | bb.utils.check_system_locale() | 28 | bb.utils.check_system_locale() |
29 | 29 | ||
30 | __version__ = "2.7.3" | 30 | __version__ = "2.9.1" |
31 | 31 | ||
32 | if __name__ == "__main__": | 32 | if __name__ == "__main__": |
33 | if __version__ != bb.__version__: | 33 | if __version__ != bb.__version__: |
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index d4b1d1aaf2..aebb5100c2 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -33,7 +33,7 @@ def main(): | |||
33 | add_help=False) | 33 | add_help=False) |
34 | parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true') | 34 | parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true') |
35 | parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true') | 35 | parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true') |
36 | parser.add_argument('-F', '--force', help='Force add without recipe parse verification', action='store_true') | 36 | parser.add_argument('-F', '--force', help='Forced execution: can be specified multiple times. -F will force add without recipe parse verification and -FF will additionally force the run withput layer parsing.', action='count', default=0) |
37 | parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR') | 37 | parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR') |
38 | 38 | ||
39 | global_args, unparsed_args = parser.parse_known_args() | 39 | global_args, unparsed_args = parser.parse_known_args() |
@@ -59,16 +59,20 @@ def main(): | |||
59 | plugins = [] | 59 | plugins = [] |
60 | tinfoil = bb.tinfoil.Tinfoil(tracking=True) | 60 | tinfoil = bb.tinfoil.Tinfoil(tracking=True) |
61 | tinfoil.logger.setLevel(logger.getEffectiveLevel()) | 61 | tinfoil.logger.setLevel(logger.getEffectiveLevel()) |
62 | try: | 62 | if global_args.force > 1: |
63 | bbpaths = [] | ||
64 | else: | ||
63 | tinfoil.prepare(True) | 65 | tinfoil.prepare(True) |
64 | for path in ([topdir] + | 66 | bbpaths = tinfoil.config_data.getVar('BBPATH').split(':') |
65 | tinfoil.config_data.getVar('BBPATH').split(':')): | 67 | |
68 | try: | ||
69 | for path in ([topdir] + bbpaths): | ||
66 | pluginpath = os.path.join(path, 'lib', 'bblayers') | 70 | pluginpath = os.path.join(path, 'lib', 'bblayers') |
67 | bb.utils.load_plugins(logger, plugins, pluginpath) | 71 | bb.utils.load_plugins(logger, plugins, pluginpath) |
68 | 72 | ||
69 | registered = False | 73 | registered = False |
70 | for plugin in plugins: | 74 | for plugin in plugins: |
71 | if hasattr(plugin, 'tinfoil_init'): | 75 | if hasattr(plugin, 'tinfoil_init') and global_args.force <= 1: |
72 | plugin.tinfoil_init(tinfoil) | 76 | plugin.tinfoil_init(tinfoil) |
73 | if hasattr(plugin, 'register_commands'): | 77 | if hasattr(plugin, 'register_commands'): |
74 | registered = True | 78 | registered = True |
diff --git a/bitbake/bin/bitbake-prserv b/bitbake/bin/bitbake-prserv index 5be42f3ce5..ad0a069401 100755 --- a/bitbake/bin/bitbake-prserv +++ b/bitbake/bin/bitbake-prserv | |||
@@ -7,49 +7,77 @@ | |||
7 | 7 | ||
8 | import os | 8 | import os |
9 | import sys,logging | 9 | import sys,logging |
10 | import optparse | 10 | import argparse |
11 | import warnings | 11 | import warnings |
12 | warnings.simplefilter("default") | 12 | warnings.simplefilter("default") |
13 | 13 | ||
14 | sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)),'lib')) | 14 | sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)), "lib")) |
15 | 15 | ||
16 | import prserv | 16 | import prserv |
17 | import prserv.serv | 17 | import prserv.serv |
18 | 18 | ||
19 | __version__="1.0.0" | 19 | VERSION = "1.1.0" |
20 | 20 | ||
21 | PRHOST_DEFAULT='0.0.0.0' | 21 | PRHOST_DEFAULT="0.0.0.0" |
22 | PRPORT_DEFAULT=8585 | 22 | PRPORT_DEFAULT=8585 |
23 | 23 | ||
24 | def main(): | 24 | def main(): |
25 | parser = optparse.OptionParser( | 25 | parser = argparse.ArgumentParser( |
26 | version="Bitbake PR Service Core version %s, %%prog version %s" % (prserv.__version__, __version__), | 26 | description="BitBake PR Server. Version=%s" % VERSION, |
27 | usage = "%prog < --start | --stop > [options]") | 27 | formatter_class=argparse.RawTextHelpFormatter) |
28 | 28 | ||
29 | parser.add_option("-f", "--file", help="database filename(default: prserv.sqlite3)", action="store", | 29 | parser.add_argument( |
30 | dest="dbfile", type="string", default="prserv.sqlite3") | 30 | "-f", |
31 | parser.add_option("-l", "--log", help="log filename(default: prserv.log)", action="store", | 31 | "--file", |
32 | dest="logfile", type="string", default="prserv.log") | 32 | default="prserv.sqlite3", |
33 | parser.add_option("--loglevel", help="logging level, i.e. CRITICAL, ERROR, WARNING, INFO, DEBUG", | 33 | help="database filename (default: prserv.sqlite3)", |
34 | action = "store", type="string", dest="loglevel", default = "INFO") | 34 | ) |
35 | parser.add_option("--start", help="start daemon", | 35 | parser.add_argument( |
36 | action="store_true", dest="start") | 36 | "-l", |
37 | parser.add_option("--stop", help="stop daemon", | 37 | "--log", |
38 | action="store_true", dest="stop") | 38 | default="prserv.log", |
39 | parser.add_option("--host", help="ip address to bind", action="store", | 39 | help="log filename(default: prserv.log)", |
40 | dest="host", type="string", default=PRHOST_DEFAULT) | 40 | ) |
41 | parser.add_option("--port", help="port number(default: 8585)", action="store", | 41 | parser.add_argument( |
42 | dest="port", type="int", default=PRPORT_DEFAULT) | 42 | "--loglevel", |
43 | parser.add_option("-r", "--read-only", help="open database in read-only mode", | 43 | default="INFO", |
44 | action="store_true") | 44 | help="logging level, i.e. CRITICAL, ERROR, WARNING, INFO, DEBUG", |
45 | ) | ||
46 | parser.add_argument( | ||
47 | "--start", | ||
48 | action="store_true", | ||
49 | help="start daemon", | ||
50 | ) | ||
51 | parser.add_argument( | ||
52 | "--stop", | ||
53 | action="store_true", | ||
54 | help="stop daemon", | ||
55 | ) | ||
56 | parser.add_argument( | ||
57 | "--host", | ||
58 | help="ip address to bind", | ||
59 | default=PRHOST_DEFAULT, | ||
60 | ) | ||
61 | parser.add_argument( | ||
62 | "--port", | ||
63 | type=int, | ||
64 | default=PRPORT_DEFAULT, | ||
65 | help="port number (default: 8585)", | ||
66 | ) | ||
67 | parser.add_argument( | ||
68 | "-r", | ||
69 | "--read-only", | ||
70 | action="store_true", | ||
71 | help="open database in read-only mode", | ||
72 | ) | ||
45 | 73 | ||
46 | options, args = parser.parse_args(sys.argv) | 74 | args = parser.parse_args() |
47 | prserv.init_logger(os.path.abspath(options.logfile),options.loglevel) | 75 | prserv.init_logger(os.path.abspath(args.log), args.loglevel) |
48 | 76 | ||
49 | if options.start: | 77 | if args.start: |
50 | ret=prserv.serv.start_daemon(options.dbfile, options.host, options.port,os.path.abspath(options.logfile), options.read_only) | 78 | ret=prserv.serv.start_daemon(args.file, args.host, args.port, os.path.abspath(args.log), args.read_only) |
51 | elif options.stop: | 79 | elif args.stop: |
52 | ret=prserv.serv.stop_daemon(options.host, options.port) | 80 | ret=prserv.serv.stop_daemon(args.host, args.port) |
53 | else: | 81 | else: |
54 | ret=parser.print_help() | 82 | ret=parser.print_help() |
55 | return ret | 83 | return ret |
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables-context.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables-context.rst new file mode 100644 index 0000000000..e9c454ba11 --- /dev/null +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables-context.rst | |||
@@ -0,0 +1,91 @@ | |||
1 | .. SPDX-License-Identifier: CC-BY-2.5 | ||
2 | |||
3 | ================ | ||
4 | Variable Context | ||
5 | ================ | ||
6 | |||
7 | | | ||
8 | |||
9 | Variables might only have an impact or can be used in certain contexts. Some | ||
10 | should only be used in global files like ``.conf``, while others are intended only | ||
11 | for local files like ``.bb``. This chapter aims to describe some important variable | ||
12 | contexts. | ||
13 | |||
14 | .. _ref-varcontext-configuration: | ||
15 | |||
16 | BitBake's own configuration | ||
17 | =========================== | ||
18 | |||
19 | Variables starting with ``BB_`` usually configure the behaviour of BitBake itself. | ||
20 | For example, one could configure: | ||
21 | |||
22 | - System resources, like disk space to be used (:term:`BB_DISKMON_DIRS`), | ||
23 | or the number of tasks to be run in parallel by BitBake (:term:`BB_NUMBER_THREADS`). | ||
24 | |||
25 | - How the fetchers shall behave, e.g., :term:`BB_FETCH_PREMIRRORONLY` is used | ||
26 | by BitBake to determine if BitBake's fetcher shall search only | ||
27 | :term:`PREMIRRORS` for files. | ||
28 | |||
29 | Those variables are usually configured globally. | ||
30 | |||
31 | BitBake configuration | ||
32 | ===================== | ||
33 | |||
34 | There are variables: | ||
35 | |||
36 | - Like :term:`B` or :term:`T`, that are used to specify directories used by | ||
37 | BitBake during the build of a particular recipe. Those variables are | ||
38 | specified in ``bitbake.conf``. Some, like :term:`B`, are quite often | ||
39 | overwritten in recipes. | ||
40 | |||
41 | - Starting with ``FAKEROOT``, to configure how the ``fakeroot`` command is | ||
42 | handled. Those are usually set by ``bitbake.conf`` and might get adapted in a | ||
43 | ``bbclass``. | ||
44 | |||
45 | - Detailing where BitBake will store and fetch information from, for | ||
46 | data reuse between build runs like :term:`CACHE`, :term:`DL_DIR` or | ||
47 | :term:`PERSISTENT_DIR`. Those are usually global. | ||
48 | |||
49 | |||
50 | Layers and files | ||
51 | ================ | ||
52 | |||
53 | Variables starting with ``LAYER`` configure how BitBake handles layers. | ||
54 | Additionally, variables starting with ``BB`` configure how layers and files are | ||
55 | handled. For example: | ||
56 | |||
57 | - :term:`LAYERDEPENDS` is used to configure on which layers a given layer | ||
58 | depends. | ||
59 | |||
60 | - The configured layers are contained in :term:`BBLAYERS` and files in | ||
61 | :term:`BBFILES`. | ||
62 | |||
63 | Those variables are often used in the files ``layer.conf`` and ``bblayers.conf``. | ||
64 | |||
65 | Recipes and packages | ||
66 | ==================== | ||
67 | |||
68 | Variables handling recipes and packages can be split into: | ||
69 | |||
70 | - :term:`PN`, :term:`PV` or :term:`PF` for example, contain information about | ||
71 | the name or revision of a recipe or package. Usually, the default set in | ||
72 | ``bitbake.conf`` is used, but those are from time to time overwritten in | ||
73 | recipes. | ||
74 | |||
75 | - :term:`SUMMARY`, :term:`DESCRIPTION`, :term:`LICENSE` or :term:`HOMEPAGE` | ||
76 | contain the expected information and should be set specifically for every | ||
77 | recipe. | ||
78 | |||
79 | - In recipes, variables are also used to control build and runtime | ||
80 | dependencies between recipes/packages with other recipes/packages. The | ||
81 | most common should be: :term:`PROVIDES`, :term:`RPROVIDES`, :term:`DEPENDS`, | ||
82 | and :term:`RDEPENDS`. | ||
83 | |||
84 | - There are further variables starting with ``SRC`` that specify the sources in | ||
85 | a recipe like :term:`SRC_URI` or :term:`SRCDATE`. Those are also usually set | ||
86 | in recipes. | ||
87 | |||
88 | - Which version or provider of a recipe should be given preference when | ||
89 | multiple recipes would provide the same item, is controlled by variables | ||
90 | starting with ``PREFERRED_``. Those are normally set in the configuration | ||
91 | files of a ``MACHINE`` or ``DISTRO``. | ||
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index d3936935cd..899e584f91 100644 --- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | |||
@@ -432,6 +432,15 @@ overview of their function and contents. | |||
432 | ``ConfigParsed`` event can set the variable to trigger the re-parse. | 432 | ``ConfigParsed`` event can set the variable to trigger the re-parse. |
433 | You must be careful to avoid recursive loops with this functionality. | 433 | You must be careful to avoid recursive loops with this functionality. |
434 | 434 | ||
435 | :term:`BB_LOADFACTOR_MAX` | ||
436 | Setting this to a value will cause BitBake to check the system load | ||
437 | average before executing new tasks. If the load average is above the | ||
438 | the number of CPUs multipled by this factor, no new task will be started | ||
439 | unless there is no task executing. A value of "1.5" has been found to | ||
440 | work reasonably. This is helpful for systems which don't have pressure | ||
441 | regulation enabled, which is more granular. Pressure values take | ||
442 | precedence over loadfactor. | ||
443 | |||
435 | :term:`BB_LOGCONFIG` | 444 | :term:`BB_LOGCONFIG` |
436 | Specifies the name of a config file that contains the user logging | 445 | Specifies the name of a config file that contains the user logging |
437 | configuration. See | 446 | configuration. See |
diff --git a/bitbake/doc/index.rst b/bitbake/doc/index.rst index 3ff8b1580f..ee1660ac15 100644 --- a/bitbake/doc/index.rst +++ b/bitbake/doc/index.rst | |||
@@ -13,6 +13,7 @@ BitBake User Manual | |||
13 | bitbake-user-manual/bitbake-user-manual-intro | 13 | bitbake-user-manual/bitbake-user-manual-intro |
14 | bitbake-user-manual/bitbake-user-manual-execution | 14 | bitbake-user-manual/bitbake-user-manual-execution |
15 | bitbake-user-manual/bitbake-user-manual-metadata | 15 | bitbake-user-manual/bitbake-user-manual-metadata |
16 | bitbake-user-manual/bitbake-user-manual-ref-variables-context | ||
16 | bitbake-user-manual/bitbake-user-manual-fetching | 17 | bitbake-user-manual/bitbake-user-manual-fetching |
17 | bitbake-user-manual/bitbake-user-manual-ref-variables | 18 | bitbake-user-manual/bitbake-user-manual-ref-variables |
18 | bitbake-user-manual/bitbake-user-manual-hello | 19 | bitbake-user-manual/bitbake-user-manual-hello |
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index 768cce84e9..8b6ea2d8ed 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py | |||
@@ -9,7 +9,7 @@ | |||
9 | # SPDX-License-Identifier: GPL-2.0-only | 9 | # SPDX-License-Identifier: GPL-2.0-only |
10 | # | 10 | # |
11 | 11 | ||
12 | __version__ = "2.7.3" | 12 | __version__ = "2.9.1" |
13 | 13 | ||
14 | import sys | 14 | import sys |
15 | if sys.version_info < (3, 8, 0): | 15 | if sys.version_info < (3, 8, 0): |
diff --git a/bitbake/lib/bb/asyncrpc/client.py b/bitbake/lib/bb/asyncrpc/client.py index 29a5ab76aa..65f3f8964d 100644 --- a/bitbake/lib/bb/asyncrpc/client.py +++ b/bitbake/lib/bb/asyncrpc/client.py | |||
@@ -10,11 +10,38 @@ import json | |||
10 | import os | 10 | import os |
11 | import socket | 11 | import socket |
12 | import sys | 12 | import sys |
13 | import re | ||
13 | import contextlib | 14 | import contextlib |
14 | from threading import Thread | 15 | from threading import Thread |
15 | from .connection import StreamConnection, WebsocketConnection, DEFAULT_MAX_CHUNK | 16 | from .connection import StreamConnection, WebsocketConnection, DEFAULT_MAX_CHUNK |
16 | from .exceptions import ConnectionClosedError, InvokeError | 17 | from .exceptions import ConnectionClosedError, InvokeError |
17 | 18 | ||
19 | UNIX_PREFIX = "unix://" | ||
20 | WS_PREFIX = "ws://" | ||
21 | WSS_PREFIX = "wss://" | ||
22 | |||
23 | ADDR_TYPE_UNIX = 0 | ||
24 | ADDR_TYPE_TCP = 1 | ||
25 | ADDR_TYPE_WS = 2 | ||
26 | |||
27 | WEBSOCKETS_MIN_VERSION = (9, 1) | ||
28 | |||
29 | |||
30 | def parse_address(addr): | ||
31 | if addr.startswith(UNIX_PREFIX): | ||
32 | return (ADDR_TYPE_UNIX, (addr[len(UNIX_PREFIX) :],)) | ||
33 | elif addr.startswith(WS_PREFIX) or addr.startswith(WSS_PREFIX): | ||
34 | return (ADDR_TYPE_WS, (addr,)) | ||
35 | else: | ||
36 | m = re.match(r"\[(?P<host>[^\]]*)\]:(?P<port>\d+)$", addr) | ||
37 | if m is not None: | ||
38 | host = m.group("host") | ||
39 | port = m.group("port") | ||
40 | else: | ||
41 | host, port = addr.split(":") | ||
42 | |||
43 | return (ADDR_TYPE_TCP, (host, int(port))) | ||
44 | |||
18 | 45 | ||
19 | class AsyncClient(object): | 46 | class AsyncClient(object): |
20 | def __init__( | 47 | def __init__( |
@@ -63,6 +90,24 @@ class AsyncClient(object): | |||
63 | async def connect_websocket(self, uri): | 90 | async def connect_websocket(self, uri): |
64 | import websockets | 91 | import websockets |
65 | 92 | ||
93 | try: | ||
94 | version = tuple( | ||
95 | int(v) | ||
96 | for v in websockets.__version__.split(".")[ | ||
97 | 0 : len(WEBSOCKETS_MIN_VERSION) | ||
98 | ] | ||
99 | ) | ||
100 | except ValueError: | ||
101 | raise ImportError( | ||
102 | f"Unable to parse websockets version '{websockets.__version__}'" | ||
103 | ) | ||
104 | |||
105 | if version < WEBSOCKETS_MIN_VERSION: | ||
106 | min_ver_str = ".".join(str(v) for v in WEBSOCKETS_MIN_VERSION) | ||
107 | raise ImportError( | ||
108 | f"Websockets version {websockets.__version__} is less than minimum required version {min_ver_str}" | ||
109 | ) | ||
110 | |||
66 | async def connect_sock(): | 111 | async def connect_sock(): |
67 | websocket = await websockets.connect(uri, ping_interval=None) | 112 | websocket = await websockets.connect(uri, ping_interval=None) |
68 | return WebsocketConnection(websocket, self.timeout) | 113 | return WebsocketConnection(websocket, self.timeout) |
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 44d08f5c55..ab8bce3d57 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -197,6 +197,8 @@ def exec_func(func, d, dirs = None): | |||
197 | for cdir in d.expand(cleandirs).split(): | 197 | for cdir in d.expand(cleandirs).split(): |
198 | bb.utils.remove(cdir, True) | 198 | bb.utils.remove(cdir, True) |
199 | bb.utils.mkdirhier(cdir) | 199 | bb.utils.mkdirhier(cdir) |
200 | if cdir == oldcwd: | ||
201 | os.chdir(cdir) | ||
200 | 202 | ||
201 | if flags and dirs is None: | 203 | if flags and dirs is None: |
202 | dirs = flags.get('dirs') | 204 | dirs = flags.get('dirs') |
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index c5bfef55d6..939a999974 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -315,13 +315,13 @@ class BBCooker: | |||
315 | dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db" | 315 | dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db" |
316 | upstream = self.data.getVar("BB_HASHSERVE_UPSTREAM") or None | 316 | upstream = self.data.getVar("BB_HASHSERVE_UPSTREAM") or None |
317 | if upstream: | 317 | if upstream: |
318 | import socket | ||
319 | try: | 318 | try: |
320 | sock = socket.create_connection(upstream.split(":"), 5) | 319 | with hashserv.create_client(upstream) as client: |
321 | sock.close() | 320 | client.ping() |
322 | except socket.error as e: | 321 | except (ConnectionError, ImportError) as e: |
323 | bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s" | 322 | bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s" |
324 | % (upstream, repr(e))) | 323 | % (upstream, repr(e))) |
324 | upstream = None | ||
325 | 325 | ||
326 | self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") | 326 | self.hashservaddr = "unix://%s/hashserve.sock" % self.data.getVar("TOPDIR") |
327 | self.hashserv = hashserv.create_server( | 327 | self.hashserv = hashserv.create_server( |
diff --git a/bitbake/lib/bb/fetch2/crate.py b/bitbake/lib/bb/fetch2/crate.py index 01d49435c3..e611736f06 100644 --- a/bitbake/lib/bb/fetch2/crate.py +++ b/bitbake/lib/bb/fetch2/crate.py | |||
@@ -70,6 +70,7 @@ class Crate(Wget): | |||
70 | host = 'crates.io/api/v1/crates' | 70 | host = 'crates.io/api/v1/crates' |
71 | 71 | ||
72 | ud.url = "https://%s/%s/%s/download" % (host, name, version) | 72 | ud.url = "https://%s/%s/%s/download" % (host, name, version) |
73 | ud.versionsurl = "https://%s/%s/versions" % (host, name) | ||
73 | ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version) | 74 | ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version) |
74 | if 'name' not in ud.parm: | 75 | if 'name' not in ud.parm: |
75 | ud.parm['name'] = '%s-%s' % (name, version) | 76 | ud.parm['name'] = '%s-%s' % (name, version) |
@@ -139,3 +140,11 @@ class Crate(Wget): | |||
139 | mdpath = os.path.join(bbpath, cratepath, mdfile) | 140 | mdpath = os.path.join(bbpath, cratepath, mdfile) |
140 | with open(mdpath, "w") as f: | 141 | with open(mdpath, "w") as f: |
141 | json.dump(metadata, f) | 142 | json.dump(metadata, f) |
143 | |||
144 | def latest_versionstring(self, ud, d): | ||
145 | from functools import cmp_to_key | ||
146 | json_data = json.loads(self._fetch_index(ud.versionsurl, ud, d)) | ||
147 | versions = [(0, i["num"], "") for i in json_data["versions"]] | ||
148 | versions = sorted(versions, key=cmp_to_key(bb.utils.vercmp)) | ||
149 | |||
150 | return (versions[-1][1], "") | ||
diff --git a/bitbake/lib/bb/fetch2/gcp.py b/bitbake/lib/bb/fetch2/gcp.py index f40ce2eaa5..eb3e0c6a6b 100644 --- a/bitbake/lib/bb/fetch2/gcp.py +++ b/bitbake/lib/bb/fetch2/gcp.py | |||
@@ -23,6 +23,7 @@ import urllib.parse, urllib.error | |||
23 | from bb.fetch2 import FetchMethod | 23 | from bb.fetch2 import FetchMethod |
24 | from bb.fetch2 import FetchError | 24 | from bb.fetch2 import FetchError |
25 | from bb.fetch2 import logger | 25 | from bb.fetch2 import logger |
26 | from bb.fetch2 import runfetchcmd | ||
26 | 27 | ||
27 | class GCP(FetchMethod): | 28 | class GCP(FetchMethod): |
28 | """ | 29 | """ |
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index d40e4d2909..0852108e7d 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py | |||
@@ -210,3 +210,6 @@ class Svn(FetchMethod): | |||
210 | 210 | ||
211 | def _build_revision(self, ud, d): | 211 | def _build_revision(self, ud, d): |
212 | return ud.revision | 212 | return ud.revision |
213 | |||
214 | def supports_checksum(self, urldata): | ||
215 | return False | ||
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index dc025800e6..fbfa6938ac 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py | |||
@@ -87,7 +87,10 @@ class Wget(FetchMethod): | |||
87 | if not ud.localfile: | 87 | if not ud.localfile: |
88 | ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", ".")) | 88 | ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", ".")) |
89 | 89 | ||
90 | self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp" | 90 | self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30" |
91 | |||
92 | if ud.type == 'ftp' or ud.type == 'ftps': | ||
93 | self.basecmd += " --passive-ftp" | ||
91 | 94 | ||
92 | if not self.check_certs(d): | 95 | if not self.check_certs(d): |
93 | self.basecmd += " --no-check-certificate" | 96 | self.basecmd += " --no-check-certificate" |
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index cd1c998f8f..c13e4b9755 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -34,6 +34,7 @@ __infunc__ = [] | |||
34 | __inpython__ = False | 34 | __inpython__ = False |
35 | __body__ = [] | 35 | __body__ = [] |
36 | __classname__ = "" | 36 | __classname__ = "" |
37 | __residue__ = [] | ||
37 | 38 | ||
38 | cached_statements = {} | 39 | cached_statements = {} |
39 | 40 | ||
@@ -80,7 +81,7 @@ def inherit(files, fn, lineno, d, deferred=False): | |||
80 | __inherit_cache = d.getVar('__inherit_cache', False) or [] | 81 | __inherit_cache = d.getVar('__inherit_cache', False) or [] |
81 | 82 | ||
82 | def get_statements(filename, absolute_filename, base_name): | 83 | def get_statements(filename, absolute_filename, base_name): |
83 | global cached_statements | 84 | global cached_statements, __residue__, __body__ |
84 | 85 | ||
85 | try: | 86 | try: |
86 | return cached_statements[absolute_filename] | 87 | return cached_statements[absolute_filename] |
@@ -100,6 +101,11 @@ def get_statements(filename, absolute_filename, base_name): | |||
100 | # add a blank line to close out any python definition | 101 | # add a blank line to close out any python definition |
101 | feeder(lineno, "", filename, base_name, statements, eof=True) | 102 | feeder(lineno, "", filename, base_name, statements, eof=True) |
102 | 103 | ||
104 | if __residue__: | ||
105 | raise ParseError("Unparsed lines %s: %s" % (filename, str(__residue__)), filename, lineno) | ||
106 | if __body__: | ||
107 | raise ParseError("Unparsed lines from unclosed function %s: %s" % (filename, str(__body__)), filename, lineno) | ||
108 | |||
103 | if filename.endswith(".bbclass") or filename.endswith(".inc"): | 109 | if filename.endswith(".bbclass") or filename.endswith(".inc"): |
104 | cached_statements[absolute_filename] = statements | 110 | cached_statements[absolute_filename] = statements |
105 | return statements | 111 | return statements |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index bc7e18175d..6b43f303d5 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1290,7 +1290,7 @@ class RunQueueData: | |||
1290 | return len(self.runtaskentries) | 1290 | return len(self.runtaskentries) |
1291 | 1291 | ||
1292 | def prepare_task_hash(self, tid): | 1292 | def prepare_task_hash(self, tid): |
1293 | bb.parse.siggen.prep_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches) | 1293 | self.runtaskentries[tid].taskhash_deps = bb.parse.siggen.prep_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches) |
1294 | self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches) | 1294 | self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(tid, self.runtaskentries[tid].depends, self.dataCaches) |
1295 | self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(tid) | 1295 | self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(tid) |
1296 | 1296 | ||
@@ -2445,7 +2445,8 @@ class RunQueueExecute: | |||
2445 | unihash = self.rqdata.runtaskentries[task].unihash | 2445 | unihash = self.rqdata.runtaskentries[task].unihash |
2446 | deps = self.filtermcdeps(task, mc, deps) | 2446 | deps = self.filtermcdeps(task, mc, deps) |
2447 | hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn] | 2447 | hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn] |
2448 | taskdepdata_cache[task] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn] | 2448 | taskhash_deps = self.rqdata.runtaskentries[task].taskhash_deps |
2449 | taskdepdata_cache[task] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn, taskhash_deps] | ||
2449 | 2450 | ||
2450 | self.taskdepdata_cache = taskdepdata_cache | 2451 | self.taskdepdata_cache = taskdepdata_cache |
2451 | 2452 | ||
@@ -2812,7 +2813,8 @@ class RunQueueExecute: | |||
2812 | taskhash = self.rqdata.runtaskentries[revdep].hash | 2813 | taskhash = self.rqdata.runtaskentries[revdep].hash |
2813 | unihash = self.rqdata.runtaskentries[revdep].unihash | 2814 | unihash = self.rqdata.runtaskentries[revdep].unihash |
2814 | hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn] | 2815 | hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn] |
2815 | taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn] | 2816 | taskhash_deps = self.rqdata.runtaskentries[revdep].taskhash_deps |
2817 | taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn, taskhash_deps] | ||
2816 | for revdep2 in deps: | 2818 | for revdep2 in deps: |
2817 | if revdep2 not in taskdepdata: | 2819 | if revdep2 not in taskdepdata: |
2818 | additional.append(revdep2) | 2820 | additional.append(revdep2) |
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 2a0ecf57e1..03dfda6f3c 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -15,6 +15,7 @@ import difflib | |||
15 | import simplediff | 15 | import simplediff |
16 | import json | 16 | import json |
17 | import types | 17 | import types |
18 | from contextlib import contextmanager | ||
18 | import bb.compress.zstd | 19 | import bb.compress.zstd |
19 | from bb.checksum import FileChecksumCache | 20 | from bb.checksum import FileChecksumCache |
20 | from bb import runqueue | 21 | from bb import runqueue |
@@ -28,6 +29,14 @@ hashequiv_logger = logging.getLogger('BitBake.SigGen.HashEquiv') | |||
28 | # The minimum version of the find_siginfo function we need | 29 | # The minimum version of the find_siginfo function we need |
29 | find_siginfo_minversion = 2 | 30 | find_siginfo_minversion = 2 |
30 | 31 | ||
32 | HASHSERV_ENVVARS = [ | ||
33 | "SSL_CERT_DIR", | ||
34 | "SSL_CERT_FILE", | ||
35 | "NO_PROXY", | ||
36 | "HTTPS_PROXY", | ||
37 | "HTTP_PROXY" | ||
38 | ] | ||
39 | |||
31 | def check_siggen_version(siggen): | 40 | def check_siggen_version(siggen): |
32 | if not hasattr(siggen, "find_siginfo_version"): | 41 | if not hasattr(siggen, "find_siginfo_version"): |
33 | bb.fatal("Siggen from metadata (OE-Core?) is too old, please update it (no version found)") | 42 | bb.fatal("Siggen from metadata (OE-Core?) is too old, please update it (no version found)") |
@@ -372,7 +381,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
372 | self.taints[tid] = taint | 381 | self.taints[tid] = taint |
373 | logger.warning("%s is tainted from a forced run" % tid) | 382 | logger.warning("%s is tainted from a forced run" % tid) |
374 | 383 | ||
375 | return | 384 | return set(dep for _, dep in self.runtaskdeps[tid]) |
376 | 385 | ||
377 | def get_taskhash(self, tid, deps, dataCaches): | 386 | def get_taskhash(self, tid, deps, dataCaches): |
378 | 387 | ||
@@ -537,14 +546,23 @@ class SignatureGeneratorUniHashMixIn(object): | |||
537 | self.unihash_exists_cache = set() | 546 | self.unihash_exists_cache = set() |
538 | self.username = None | 547 | self.username = None |
539 | self.password = None | 548 | self.password = None |
549 | self.env = {} | ||
550 | |||
551 | origenv = data.getVar("BB_ORIGENV") | ||
552 | for e in HASHSERV_ENVVARS: | ||
553 | value = data.getVar(e) | ||
554 | if not value and origenv: | ||
555 | value = origenv.getVar(e) | ||
556 | if value: | ||
557 | self.env[e] = value | ||
540 | super().__init__(data) | 558 | super().__init__(data) |
541 | 559 | ||
542 | def get_taskdata(self): | 560 | def get_taskdata(self): |
543 | return (self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password) + super().get_taskdata() | 561 | return (self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password, self.env) + super().get_taskdata() |
544 | 562 | ||
545 | def set_taskdata(self, data): | 563 | def set_taskdata(self, data): |
546 | self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password = data[:6] | 564 | self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password, self.env = data[:7] |
547 | super().set_taskdata(data[6:]) | 565 | super().set_taskdata(data[7:]) |
548 | 566 | ||
549 | def get_hashserv_creds(self): | 567 | def get_hashserv_creds(self): |
550 | if self.username and self.password: | 568 | if self.username and self.password: |
@@ -555,15 +573,34 @@ class SignatureGeneratorUniHashMixIn(object): | |||
555 | 573 | ||
556 | return {} | 574 | return {} |
557 | 575 | ||
576 | @contextmanager | ||
577 | def _client_env(self): | ||
578 | orig_env = os.environ.copy() | ||
579 | try: | ||
580 | for k, v in self.env.items(): | ||
581 | os.environ[k] = v | ||
582 | |||
583 | yield | ||
584 | finally: | ||
585 | for k, v in self.env.items(): | ||
586 | if k in orig_env: | ||
587 | os.environ[k] = orig_env[k] | ||
588 | else: | ||
589 | del os.environ[k] | ||
590 | |||
591 | @contextmanager | ||
558 | def client(self): | 592 | def client(self): |
559 | if getattr(self, '_client', None) is None: | 593 | with self._client_env(): |
560 | self._client = hashserv.create_client(self.server, **self.get_hashserv_creds()) | 594 | if getattr(self, '_client', None) is None: |
561 | return self._client | 595 | self._client = hashserv.create_client(self.server, **self.get_hashserv_creds()) |
596 | yield self._client | ||
562 | 597 | ||
598 | @contextmanager | ||
563 | def client_pool(self): | 599 | def client_pool(self): |
564 | if getattr(self, '_client_pool', None) is None: | 600 | with self._client_env(): |
565 | self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel, **self.get_hashserv_creds()) | 601 | if getattr(self, '_client_pool', None) is None: |
566 | return self._client_pool | 602 | self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel, **self.get_hashserv_creds()) |
603 | yield self._client_pool | ||
567 | 604 | ||
568 | def reset(self, data): | 605 | def reset(self, data): |
569 | self.__close_clients() | 606 | self.__close_clients() |
@@ -574,12 +611,13 @@ class SignatureGeneratorUniHashMixIn(object): | |||
574 | return super().exit() | 611 | return super().exit() |
575 | 612 | ||
576 | def __close_clients(self): | 613 | def __close_clients(self): |
577 | if getattr(self, '_client', None) is not None: | 614 | with self._client_env(): |
578 | self._client.close() | 615 | if getattr(self, '_client', None) is not None: |
579 | self._client = None | 616 | self._client.close() |
580 | if getattr(self, '_client_pool', None) is not None: | 617 | self._client = None |
581 | self._client_pool.close() | 618 | if getattr(self, '_client_pool', None) is not None: |
582 | self._client_pool = None | 619 | self._client_pool.close() |
620 | self._client_pool = None | ||
583 | 621 | ||
584 | def get_stampfile_hash(self, tid): | 622 | def get_stampfile_hash(self, tid): |
585 | if tid in self.taskhash: | 623 | if tid in self.taskhash: |
@@ -650,11 +688,13 @@ class SignatureGeneratorUniHashMixIn(object): | |||
650 | 688 | ||
651 | if self.max_parallel <= 1 or len(uncached_query) <= 1: | 689 | if self.max_parallel <= 1 or len(uncached_query) <= 1: |
652 | # No parallelism required. Make the query serially with the single client | 690 | # No parallelism required. Make the query serially with the single client |
653 | uncached_result = { | 691 | with self.client() as client: |
654 | key: self.client().unihash_exists(value) for key, value in uncached_query.items() | 692 | uncached_result = { |
655 | } | 693 | key: client.unihash_exists(value) for key, value in uncached_query.items() |
694 | } | ||
656 | else: | 695 | else: |
657 | uncached_result = self.client_pool().unihashes_exist(uncached_query) | 696 | with self.client_pool() as client_pool: |
697 | uncached_result = client_pool.unihashes_exist(uncached_query) | ||
658 | 698 | ||
659 | for key, exists in uncached_result.items(): | 699 | for key, exists in uncached_result.items(): |
660 | if exists: | 700 | if exists: |
@@ -687,10 +727,12 @@ class SignatureGeneratorUniHashMixIn(object): | |||
687 | 727 | ||
688 | if self.max_parallel <= 1 or len(queries) <= 1: | 728 | if self.max_parallel <= 1 or len(queries) <= 1: |
689 | # No parallelism required. Make the query serially with the single client | 729 | # No parallelism required. Make the query serially with the single client |
690 | for tid, args in queries.items(): | 730 | with self.client() as client: |
691 | query_result[tid] = self.client().get_unihash(*args) | 731 | for tid, args in queries.items(): |
732 | query_result[tid] = client.get_unihash(*args) | ||
692 | else: | 733 | else: |
693 | query_result = self.client_pool().get_unihashes(queries) | 734 | with self.client_pool() as client_pool: |
735 | query_result = client_pool.get_unihashes(queries) | ||
694 | 736 | ||
695 | for tid, unihash in query_result.items(): | 737 | for tid, unihash in query_result.items(): |
696 | # In the absence of being able to discover a unique hash from the | 738 | # In the absence of being able to discover a unique hash from the |
@@ -785,7 +827,9 @@ class SignatureGeneratorUniHashMixIn(object): | |||
785 | if tid in self.extramethod: | 827 | if tid in self.extramethod: |
786 | method = method + self.extramethod[tid] | 828 | method = method + self.extramethod[tid] |
787 | 829 | ||
788 | data = self.client().report_unihash(taskhash, method, outhash, unihash, extra_data) | 830 | with self.client() as client: |
831 | data = client.report_unihash(taskhash, method, outhash, unihash, extra_data) | ||
832 | |||
789 | new_unihash = data['unihash'] | 833 | new_unihash = data['unihash'] |
790 | 834 | ||
791 | if new_unihash != unihash: | 835 | if new_unihash != unihash: |
@@ -816,7 +860,9 @@ class SignatureGeneratorUniHashMixIn(object): | |||
816 | if tid in self.extramethod: | 860 | if tid in self.extramethod: |
817 | method = method + self.extramethod[tid] | 861 | method = method + self.extramethod[tid] |
818 | 862 | ||
819 | data = self.client().report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) | 863 | with self.client() as client: |
864 | data = client.report_unihash_equiv(taskhash, method, wanted_unihash, extra_data) | ||
865 | |||
820 | hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) | 866 | hashequiv_logger.verbose('Reported task %s as unihash %s to %s (%s)' % (tid, wanted_unihash, self.server, str(data))) |
821 | 867 | ||
822 | if data is None: | 868 | if data is None: |
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 85c1f79ff3..ed7a39a723 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -511,7 +511,8 @@ class MirrorUriTest(FetcherTest): | |||
511 | mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ | 511 | mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ |
512 | "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \ | 512 | "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \ |
513 | "https://.*/.* file:///someotherpath/downloads/ " \ | 513 | "https://.*/.* file:///someotherpath/downloads/ " \ |
514 | "http://.*/.* file:///someotherpath/downloads/" | 514 | "http://.*/.* file:///someotherpath/downloads/ " \ |
515 | "svn://svn.server1.com/ svn://svn.server2.com/" | ||
515 | 516 | ||
516 | def test_urireplace(self): | 517 | def test_urireplace(self): |
517 | self.d.setVar("FILESPATH", ".") | 518 | self.d.setVar("FILESPATH", ".") |
@@ -535,6 +536,13 @@ class MirrorUriTest(FetcherTest): | |||
535 | uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) | 536 | uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) |
536 | self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz']) | 537 | self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz']) |
537 | 538 | ||
539 | def test_urilistsvn(self): | ||
540 | # Catch svn:// -> svn:// bug | ||
541 | fetcher = bb.fetch.FetchData("svn://svn.server1.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2", self.d) | ||
542 | mirrors = bb.fetch2.mirror_from_string(self.mirrorvar) | ||
543 | uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) | ||
544 | self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2']) | ||
545 | |||
538 | def test_mirror_of_mirror(self): | 546 | def test_mirror_of_mirror(self): |
539 | # Test if mirror of a mirror works | 547 | # Test if mirror of a mirror works |
540 | mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/" | 548 | mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/" |
@@ -1493,6 +1501,12 @@ class FetchLatestVersionTest(FetcherTest): | |||
1493 | : "2.8", | 1501 | : "2.8", |
1494 | } | 1502 | } |
1495 | 1503 | ||
1504 | test_crate_uris = { | ||
1505 | # basic example; version pattern "A.B.C+cargo-D.E.F" | ||
1506 | ("cargo-c", "crate://crates.io/cargo-c/0.9.18+cargo-0.69") | ||
1507 | : "0.9.29" | ||
1508 | } | ||
1509 | |||
1496 | @skipIfNoNetwork() | 1510 | @skipIfNoNetwork() |
1497 | def test_git_latest_versionstring(self): | 1511 | def test_git_latest_versionstring(self): |
1498 | for k, v in self.test_git_uris.items(): | 1512 | for k, v in self.test_git_uris.items(): |
@@ -1532,6 +1546,16 @@ class FetchLatestVersionTest(FetcherTest): | |||
1532 | finally: | 1546 | finally: |
1533 | server.stop() | 1547 | server.stop() |
1534 | 1548 | ||
1549 | @skipIfNoNetwork() | ||
1550 | def test_crate_latest_versionstring(self): | ||
1551 | for k, v in self.test_crate_uris.items(): | ||
1552 | self.d.setVar("PN", k[0]) | ||
1553 | ud = bb.fetch2.FetchData(k[1], self.d) | ||
1554 | pupver = ud.method.latest_versionstring(ud, self.d) | ||
1555 | verstring = pupver[0] | ||
1556 | self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) | ||
1557 | r = bb.utils.vercmp_string(v, verstring) | ||
1558 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) | ||
1535 | 1559 | ||
1536 | class FetchCheckStatusTest(FetcherTest): | 1560 | class FetchCheckStatusTest(FetcherTest): |
1537 | test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", | 1561 | test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", |
diff --git a/bitbake/lib/bblayers/action.py b/bitbake/lib/bblayers/action.py index a8f2699335..a14f19948e 100644 --- a/bitbake/lib/bblayers/action.py +++ b/bitbake/lib/bblayers/action.py | |||
@@ -50,8 +50,8 @@ class ActionPlugin(LayerPlugin): | |||
50 | 50 | ||
51 | try: | 51 | try: |
52 | notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None) | 52 | notadded, _ = bb.utils.edit_bblayers_conf(bblayers_conf, layerdirs, None) |
53 | self.tinfoil.modified_files() | ||
54 | if not (args.force or notadded): | 53 | if not (args.force or notadded): |
54 | self.tinfoil.modified_files() | ||
55 | try: | 55 | try: |
56 | self.tinfoil.run_command('parseConfiguration') | 56 | self.tinfoil.run_command('parseConfiguration') |
57 | except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): | 57 | except (bb.tinfoil.TinfoilUIException, bb.BBHandledException): |
@@ -83,6 +83,8 @@ class ActionPlugin(LayerPlugin): | |||
83 | layerdir = os.path.abspath(item) | 83 | layerdir = os.path.abspath(item) |
84 | layerdirs.append(layerdir) | 84 | layerdirs.append(layerdir) |
85 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdirs) | 85 | (_, notremoved) = bb.utils.edit_bblayers_conf(bblayers_conf, None, layerdirs) |
86 | if args.force > 1: | ||
87 | return 0 | ||
86 | self.tinfoil.modified_files() | 88 | self.tinfoil.modified_files() |
87 | if notremoved: | 89 | if notremoved: |
88 | for item in notremoved: | 90 | for item in notremoved: |
diff --git a/bitbake/lib/hashserv/__init__.py b/bitbake/lib/hashserv/__init__.py index 552a33278f..74367eb6b4 100644 --- a/bitbake/lib/hashserv/__init__.py +++ b/bitbake/lib/hashserv/__init__.py | |||
@@ -5,39 +5,14 @@ | |||
5 | 5 | ||
6 | import asyncio | 6 | import asyncio |
7 | from contextlib import closing | 7 | from contextlib import closing |
8 | import re | ||
9 | import itertools | 8 | import itertools |
10 | import json | 9 | import json |
11 | from collections import namedtuple | 10 | from collections import namedtuple |
12 | from urllib.parse import urlparse | 11 | from urllib.parse import urlparse |
13 | 12 | from bb.asyncrpc.client import parse_address, ADDR_TYPE_UNIX, ADDR_TYPE_WS | |
14 | UNIX_PREFIX = "unix://" | ||
15 | WS_PREFIX = "ws://" | ||
16 | WSS_PREFIX = "wss://" | ||
17 | |||
18 | ADDR_TYPE_UNIX = 0 | ||
19 | ADDR_TYPE_TCP = 1 | ||
20 | ADDR_TYPE_WS = 2 | ||
21 | 13 | ||
22 | User = namedtuple("User", ("username", "permissions")) | 14 | User = namedtuple("User", ("username", "permissions")) |
23 | 15 | ||
24 | |||
25 | def parse_address(addr): | ||
26 | if addr.startswith(UNIX_PREFIX): | ||
27 | return (ADDR_TYPE_UNIX, (addr[len(UNIX_PREFIX) :],)) | ||
28 | elif addr.startswith(WS_PREFIX) or addr.startswith(WSS_PREFIX): | ||
29 | return (ADDR_TYPE_WS, (addr,)) | ||
30 | else: | ||
31 | m = re.match(r"\[(?P<host>[^\]]*)\]:(?P<port>\d+)$", addr) | ||
32 | if m is not None: | ||
33 | host = m.group("host") | ||
34 | port = m.group("port") | ||
35 | else: | ||
36 | host, port = addr.split(":") | ||
37 | |||
38 | return (ADDR_TYPE_TCP, (host, int(port))) | ||
39 | |||
40 | |||
41 | def create_server( | 16 | def create_server( |
42 | addr, | 17 | addr, |
43 | dbname, | 18 | dbname, |
diff --git a/bitbake/lib/hashserv/client.py b/bitbake/lib/hashserv/client.py index b269879ecf..0b254beddd 100644 --- a/bitbake/lib/hashserv/client.py +++ b/bitbake/lib/hashserv/client.py | |||
@@ -27,9 +27,7 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
27 | 27 | ||
28 | async def setup_connection(self): | 28 | async def setup_connection(self): |
29 | await super().setup_connection() | 29 | await super().setup_connection() |
30 | cur_mode = self.mode | ||
31 | self.mode = self.MODE_NORMAL | 30 | self.mode = self.MODE_NORMAL |
32 | await self._set_mode(cur_mode) | ||
33 | if self.username: | 31 | if self.username: |
34 | # Save off become user temporarily because auth() resets it | 32 | # Save off become user temporarily because auth() resets it |
35 | become = self.saved_become_user | 33 | become = self.saved_become_user |
@@ -38,13 +36,20 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
38 | if become: | 36 | if become: |
39 | await self.become_user(become) | 37 | await self.become_user(become) |
40 | 38 | ||
41 | async def send_stream(self, msg): | 39 | async def send_stream(self, mode, msg): |
42 | async def proc(): | 40 | async def proc(): |
41 | await self._set_mode(mode) | ||
43 | await self.socket.send(msg) | 42 | await self.socket.send(msg) |
44 | return await self.socket.recv() | 43 | return await self.socket.recv() |
45 | 44 | ||
46 | return await self._send_wrapper(proc) | 45 | return await self._send_wrapper(proc) |
47 | 46 | ||
47 | async def invoke(self, *args, **kwargs): | ||
48 | # It's OK if connection errors cause a failure here, because the mode | ||
49 | # is also reset to normal on a new connection | ||
50 | await self._set_mode(self.MODE_NORMAL) | ||
51 | return await super().invoke(*args, **kwargs) | ||
52 | |||
48 | async def _set_mode(self, new_mode): | 53 | async def _set_mode(self, new_mode): |
49 | async def stream_to_normal(): | 54 | async def stream_to_normal(): |
50 | await self.socket.send("END") | 55 | await self.socket.send("END") |
@@ -84,14 +89,12 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
84 | self.mode = new_mode | 89 | self.mode = new_mode |
85 | 90 | ||
86 | async def get_unihash(self, method, taskhash): | 91 | async def get_unihash(self, method, taskhash): |
87 | await self._set_mode(self.MODE_GET_STREAM) | 92 | r = await self.send_stream(self.MODE_GET_STREAM, "%s %s" % (method, taskhash)) |
88 | r = await self.send_stream("%s %s" % (method, taskhash)) | ||
89 | if not r: | 93 | if not r: |
90 | return None | 94 | return None |
91 | return r | 95 | return r |
92 | 96 | ||
93 | async def report_unihash(self, taskhash, method, outhash, unihash, extra={}): | 97 | async def report_unihash(self, taskhash, method, outhash, unihash, extra={}): |
94 | await self._set_mode(self.MODE_NORMAL) | ||
95 | m = extra.copy() | 98 | m = extra.copy() |
96 | m["taskhash"] = taskhash | 99 | m["taskhash"] = taskhash |
97 | m["method"] = method | 100 | m["method"] = method |
@@ -100,7 +103,6 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
100 | return await self.invoke({"report": m}) | 103 | return await self.invoke({"report": m}) |
101 | 104 | ||
102 | async def report_unihash_equiv(self, taskhash, method, unihash, extra={}): | 105 | async def report_unihash_equiv(self, taskhash, method, unihash, extra={}): |
103 | await self._set_mode(self.MODE_NORMAL) | ||
104 | m = extra.copy() | 106 | m = extra.copy() |
105 | m["taskhash"] = taskhash | 107 | m["taskhash"] = taskhash |
106 | m["method"] = method | 108 | m["method"] = method |
@@ -108,18 +110,15 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
108 | return await self.invoke({"report-equiv": m}) | 110 | return await self.invoke({"report-equiv": m}) |
109 | 111 | ||
110 | async def get_taskhash(self, method, taskhash, all_properties=False): | 112 | async def get_taskhash(self, method, taskhash, all_properties=False): |
111 | await self._set_mode(self.MODE_NORMAL) | ||
112 | return await self.invoke( | 113 | return await self.invoke( |
113 | {"get": {"taskhash": taskhash, "method": method, "all": all_properties}} | 114 | {"get": {"taskhash": taskhash, "method": method, "all": all_properties}} |
114 | ) | 115 | ) |
115 | 116 | ||
116 | async def unihash_exists(self, unihash): | 117 | async def unihash_exists(self, unihash): |
117 | await self._set_mode(self.MODE_EXIST_STREAM) | 118 | r = await self.send_stream(self.MODE_EXIST_STREAM, unihash) |
118 | r = await self.send_stream(unihash) | ||
119 | return r == "true" | 119 | return r == "true" |
120 | 120 | ||
121 | async def get_outhash(self, method, outhash, taskhash, with_unihash=True): | 121 | async def get_outhash(self, method, outhash, taskhash, with_unihash=True): |
122 | await self._set_mode(self.MODE_NORMAL) | ||
123 | return await self.invoke( | 122 | return await self.invoke( |
124 | { | 123 | { |
125 | "get-outhash": { | 124 | "get-outhash": { |
@@ -132,27 +131,21 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
132 | ) | 131 | ) |
133 | 132 | ||
134 | async def get_stats(self): | 133 | async def get_stats(self): |
135 | await self._set_mode(self.MODE_NORMAL) | ||
136 | return await self.invoke({"get-stats": None}) | 134 | return await self.invoke({"get-stats": None}) |
137 | 135 | ||
138 | async def reset_stats(self): | 136 | async def reset_stats(self): |
139 | await self._set_mode(self.MODE_NORMAL) | ||
140 | return await self.invoke({"reset-stats": None}) | 137 | return await self.invoke({"reset-stats": None}) |
141 | 138 | ||
142 | async def backfill_wait(self): | 139 | async def backfill_wait(self): |
143 | await self._set_mode(self.MODE_NORMAL) | ||
144 | return (await self.invoke({"backfill-wait": None}))["tasks"] | 140 | return (await self.invoke({"backfill-wait": None}))["tasks"] |
145 | 141 | ||
146 | async def remove(self, where): | 142 | async def remove(self, where): |
147 | await self._set_mode(self.MODE_NORMAL) | ||
148 | return await self.invoke({"remove": {"where": where}}) | 143 | return await self.invoke({"remove": {"where": where}}) |
149 | 144 | ||
150 | async def clean_unused(self, max_age): | 145 | async def clean_unused(self, max_age): |
151 | await self._set_mode(self.MODE_NORMAL) | ||
152 | return await self.invoke({"clean-unused": {"max_age_seconds": max_age}}) | 146 | return await self.invoke({"clean-unused": {"max_age_seconds": max_age}}) |
153 | 147 | ||
154 | async def auth(self, username, token): | 148 | async def auth(self, username, token): |
155 | await self._set_mode(self.MODE_NORMAL) | ||
156 | result = await self.invoke({"auth": {"username": username, "token": token}}) | 149 | result = await self.invoke({"auth": {"username": username, "token": token}}) |
157 | self.username = username | 150 | self.username = username |
158 | self.password = token | 151 | self.password = token |
@@ -160,7 +153,6 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
160 | return result | 153 | return result |
161 | 154 | ||
162 | async def refresh_token(self, username=None): | 155 | async def refresh_token(self, username=None): |
163 | await self._set_mode(self.MODE_NORMAL) | ||
164 | m = {} | 156 | m = {} |
165 | if username: | 157 | if username: |
166 | m["username"] = username | 158 | m["username"] = username |
@@ -174,34 +166,28 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
174 | return result | 166 | return result |
175 | 167 | ||
176 | async def set_user_perms(self, username, permissions): | 168 | async def set_user_perms(self, username, permissions): |
177 | await self._set_mode(self.MODE_NORMAL) | ||
178 | return await self.invoke( | 169 | return await self.invoke( |
179 | {"set-user-perms": {"username": username, "permissions": permissions}} | 170 | {"set-user-perms": {"username": username, "permissions": permissions}} |
180 | ) | 171 | ) |
181 | 172 | ||
182 | async def get_user(self, username=None): | 173 | async def get_user(self, username=None): |
183 | await self._set_mode(self.MODE_NORMAL) | ||
184 | m = {} | 174 | m = {} |
185 | if username: | 175 | if username: |
186 | m["username"] = username | 176 | m["username"] = username |
187 | return await self.invoke({"get-user": m}) | 177 | return await self.invoke({"get-user": m}) |
188 | 178 | ||
189 | async def get_all_users(self): | 179 | async def get_all_users(self): |
190 | await self._set_mode(self.MODE_NORMAL) | ||
191 | return (await self.invoke({"get-all-users": {}}))["users"] | 180 | return (await self.invoke({"get-all-users": {}}))["users"] |
192 | 181 | ||
193 | async def new_user(self, username, permissions): | 182 | async def new_user(self, username, permissions): |
194 | await self._set_mode(self.MODE_NORMAL) | ||
195 | return await self.invoke( | 183 | return await self.invoke( |
196 | {"new-user": {"username": username, "permissions": permissions}} | 184 | {"new-user": {"username": username, "permissions": permissions}} |
197 | ) | 185 | ) |
198 | 186 | ||
199 | async def delete_user(self, username): | 187 | async def delete_user(self, username): |
200 | await self._set_mode(self.MODE_NORMAL) | ||
201 | return await self.invoke({"delete-user": {"username": username}}) | 188 | return await self.invoke({"delete-user": {"username": username}}) |
202 | 189 | ||
203 | async def become_user(self, username): | 190 | async def become_user(self, username): |
204 | await self._set_mode(self.MODE_NORMAL) | ||
205 | result = await self.invoke({"become-user": {"username": username}}) | 191 | result = await self.invoke({"become-user": {"username": username}}) |
206 | if username == self.username: | 192 | if username == self.username: |
207 | self.saved_become_user = None | 193 | self.saved_become_user = None |
@@ -210,15 +196,12 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
210 | return result | 196 | return result |
211 | 197 | ||
212 | async def get_db_usage(self): | 198 | async def get_db_usage(self): |
213 | await self._set_mode(self.MODE_NORMAL) | ||
214 | return (await self.invoke({"get-db-usage": {}}))["usage"] | 199 | return (await self.invoke({"get-db-usage": {}}))["usage"] |
215 | 200 | ||
216 | async def get_db_query_columns(self): | 201 | async def get_db_query_columns(self): |
217 | await self._set_mode(self.MODE_NORMAL) | ||
218 | return (await self.invoke({"get-db-query-columns": {}}))["columns"] | 202 | return (await self.invoke({"get-db-query-columns": {}}))["columns"] |
219 | 203 | ||
220 | async def gc_status(self): | 204 | async def gc_status(self): |
221 | await self._set_mode(self.MODE_NORMAL) | ||
222 | return await self.invoke({"gc-status": {}}) | 205 | return await self.invoke({"gc-status": {}}) |
223 | 206 | ||
224 | async def gc_mark(self, mark, where): | 207 | async def gc_mark(self, mark, where): |
@@ -231,7 +214,6 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
231 | kept. In addition, any new entries added to the database after this | 214 | kept. In addition, any new entries added to the database after this |
232 | command will be automatically marked with "mark" | 215 | command will be automatically marked with "mark" |
233 | """ | 216 | """ |
234 | await self._set_mode(self.MODE_NORMAL) | ||
235 | return await self.invoke({"gc-mark": {"mark": mark, "where": where}}) | 217 | return await self.invoke({"gc-mark": {"mark": mark, "where": where}}) |
236 | 218 | ||
237 | async def gc_sweep(self, mark): | 219 | async def gc_sweep(self, mark): |
@@ -242,7 +224,6 @@ class AsyncClient(bb.asyncrpc.AsyncClient): | |||
242 | It is recommended to clean unused outhash entries after running this to | 224 | It is recommended to clean unused outhash entries after running this to |
243 | cleanup any dangling outhashes | 225 | cleanup any dangling outhashes |
244 | """ | 226 | """ |
245 | await self._set_mode(self.MODE_NORMAL) | ||
246 | return await self.invoke({"gc-sweep": {"mark": mark}}) | 227 | return await self.invoke({"gc-sweep": {"mark": mark}}) |
247 | 228 | ||
248 | 229 | ||
diff --git a/bitbake/lib/prserv/__init__.py b/bitbake/lib/prserv/__init__.py index 38ced818ad..0e0aa34d0e 100644 --- a/bitbake/lib/prserv/__init__.py +++ b/bitbake/lib/prserv/__init__.py | |||
@@ -7,13 +7,13 @@ | |||
7 | __version__ = "1.0.0" | 7 | __version__ = "1.0.0" |
8 | 8 | ||
9 | import os, time | 9 | import os, time |
10 | import sys,logging | 10 | import sys, logging |
11 | 11 | ||
12 | def init_logger(logfile, loglevel): | 12 | def init_logger(logfile, loglevel): |
13 | numeric_level = getattr(logging, loglevel.upper(), None) | 13 | numeric_level = getattr(logging, loglevel.upper(), None) |
14 | if not isinstance(numeric_level, int): | 14 | if not isinstance(numeric_level, int): |
15 | raise ValueError('Invalid log level: %s' % loglevel) | 15 | raise ValueError("Invalid log level: %s" % loglevel) |
16 | FORMAT = '%(asctime)-15s %(message)s' | 16 | FORMAT = "%(asctime)-15s %(message)s" |
17 | logging.basicConfig(level=numeric_level, filename=logfile, format=FORMAT) | 17 | logging.basicConfig(level=numeric_level, filename=logfile, format=FORMAT) |
18 | 18 | ||
19 | class NotFoundError(Exception): | 19 | class NotFoundError(Exception): |
diff --git a/bitbake/lib/prserv/client.py b/bitbake/lib/prserv/client.py index 6b81356fac..8471ee3046 100644 --- a/bitbake/lib/prserv/client.py +++ b/bitbake/lib/prserv/client.py | |||
@@ -11,40 +11,61 @@ logger = logging.getLogger("BitBake.PRserv") | |||
11 | 11 | ||
12 | class PRAsyncClient(bb.asyncrpc.AsyncClient): | 12 | class PRAsyncClient(bb.asyncrpc.AsyncClient): |
13 | def __init__(self): | 13 | def __init__(self): |
14 | super().__init__('PRSERVICE', '1.0', logger) | 14 | super().__init__("PRSERVICE", "1.0", logger) |
15 | 15 | ||
16 | async def getPR(self, version, pkgarch, checksum): | 16 | async def getPR(self, version, pkgarch, checksum): |
17 | response = await self.invoke( | 17 | response = await self.invoke( |
18 | {'get-pr': {'version': version, 'pkgarch': pkgarch, 'checksum': checksum}} | 18 | {"get-pr": {"version": version, "pkgarch": pkgarch, "checksum": checksum}} |
19 | ) | 19 | ) |
20 | if response: | 20 | if response: |
21 | return response['value'] | 21 | return response["value"] |
22 | |||
23 | async def test_pr(self, version, pkgarch, checksum): | ||
24 | response = await self.invoke( | ||
25 | {"test-pr": {"version": version, "pkgarch": pkgarch, "checksum": checksum}} | ||
26 | ) | ||
27 | if response: | ||
28 | return response["value"] | ||
29 | |||
30 | async def test_package(self, version, pkgarch): | ||
31 | response = await self.invoke( | ||
32 | {"test-package": {"version": version, "pkgarch": pkgarch}} | ||
33 | ) | ||
34 | if response: | ||
35 | return response["value"] | ||
36 | |||
37 | async def max_package_pr(self, version, pkgarch): | ||
38 | response = await self.invoke( | ||
39 | {"max-package-pr": {"version": version, "pkgarch": pkgarch}} | ||
40 | ) | ||
41 | if response: | ||
42 | return response["value"] | ||
22 | 43 | ||
23 | async def importone(self, version, pkgarch, checksum, value): | 44 | async def importone(self, version, pkgarch, checksum, value): |
24 | response = await self.invoke( | 45 | response = await self.invoke( |
25 | {'import-one': {'version': version, 'pkgarch': pkgarch, 'checksum': checksum, 'value': value}} | 46 | {"import-one": {"version": version, "pkgarch": pkgarch, "checksum": checksum, "value": value}} |
26 | ) | 47 | ) |
27 | if response: | 48 | if response: |
28 | return response['value'] | 49 | return response["value"] |
29 | 50 | ||
30 | async def export(self, version, pkgarch, checksum, colinfo): | 51 | async def export(self, version, pkgarch, checksum, colinfo): |
31 | response = await self.invoke( | 52 | response = await self.invoke( |
32 | {'export': {'version': version, 'pkgarch': pkgarch, 'checksum': checksum, 'colinfo': colinfo}} | 53 | {"export": {"version": version, "pkgarch": pkgarch, "checksum": checksum, "colinfo": colinfo}} |
33 | ) | 54 | ) |
34 | if response: | 55 | if response: |
35 | return (response['metainfo'], response['datainfo']) | 56 | return (response["metainfo"], response["datainfo"]) |
36 | 57 | ||
37 | async def is_readonly(self): | 58 | async def is_readonly(self): |
38 | response = await self.invoke( | 59 | response = await self.invoke( |
39 | {'is-readonly': {}} | 60 | {"is-readonly": {}} |
40 | ) | 61 | ) |
41 | if response: | 62 | if response: |
42 | return response['readonly'] | 63 | return response["readonly"] |
43 | 64 | ||
44 | class PRClient(bb.asyncrpc.Client): | 65 | class PRClient(bb.asyncrpc.Client): |
45 | def __init__(self): | 66 | def __init__(self): |
46 | super().__init__() | 67 | super().__init__() |
47 | self._add_methods('getPR', 'importone', 'export', 'is_readonly') | 68 | self._add_methods("getPR", "test_pr", "test_package", "importone", "export", "is_readonly") |
48 | 69 | ||
49 | def _get_async_client(self): | 70 | def _get_async_client(self): |
50 | return PRAsyncClient() | 71 | return PRAsyncClient() |
diff --git a/bitbake/lib/prserv/db.py b/bitbake/lib/prserv/db.py index b4bda7078c..eb41508198 100644 --- a/bitbake/lib/prserv/db.py +++ b/bitbake/lib/prserv/db.py | |||
@@ -38,9 +38,9 @@ class PRTable(object): | |||
38 | self.read_only = read_only | 38 | self.read_only = read_only |
39 | self.dirty = False | 39 | self.dirty = False |
40 | if nohist: | 40 | if nohist: |
41 | self.table = "%s_nohist" % table | 41 | self.table = "%s_nohist" % table |
42 | else: | 42 | else: |
43 | self.table = "%s_hist" % table | 43 | self.table = "%s_hist" % table |
44 | 44 | ||
45 | if self.read_only: | 45 | if self.read_only: |
46 | table_exists = self._execute( | 46 | table_exists = self._execute( |
@@ -64,7 +64,7 @@ class PRTable(object): | |||
64 | try: | 64 | try: |
65 | return self.conn.execute(*query) | 65 | return self.conn.execute(*query) |
66 | except sqlite3.OperationalError as exc: | 66 | except sqlite3.OperationalError as exc: |
67 | if 'is locked' in str(exc) and end > time.time(): | 67 | if "is locked" in str(exc) and end > time.time(): |
68 | continue | 68 | continue |
69 | raise exc | 69 | raise exc |
70 | 70 | ||
@@ -78,7 +78,53 @@ class PRTable(object): | |||
78 | self.sync() | 78 | self.sync() |
79 | self.dirty = False | 79 | self.dirty = False |
80 | 80 | ||
81 | def _getValueHist(self, version, pkgarch, checksum): | 81 | def test_package(self, version, pkgarch): |
82 | """Returns whether the specified package version is found in the database for the specified architecture""" | ||
83 | |||
84 | # Just returns the value if found or None otherwise | ||
85 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=?;" % self.table, | ||
86 | (version, pkgarch)) | ||
87 | row=data.fetchone() | ||
88 | if row is not None: | ||
89 | return True | ||
90 | else: | ||
91 | return False | ||
92 | |||
93 | def test_value(self, version, pkgarch, value): | ||
94 | """Returns whether the specified value is found in the database for the specified package and architecture""" | ||
95 | |||
96 | # Just returns the value if found or None otherwise | ||
97 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? and value=?;" % self.table, | ||
98 | (version, pkgarch, value)) | ||
99 | row=data.fetchone() | ||
100 | if row is not None: | ||
101 | return True | ||
102 | else: | ||
103 | return False | ||
104 | |||
105 | def find_value(self, version, pkgarch, checksum): | ||
106 | """Returns the value for the specified checksum if found or None otherwise.""" | ||
107 | |||
108 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | ||
109 | (version, pkgarch, checksum)) | ||
110 | row=data.fetchone() | ||
111 | if row is not None: | ||
112 | return row[0] | ||
113 | else: | ||
114 | return None | ||
115 | |||
116 | def find_max_value(self, version, pkgarch): | ||
117 | """Returns the greatest value for (version, pkgarch), or None if not found. Doesn't create a new value""" | ||
118 | |||
119 | data = self._execute("SELECT max(value) FROM %s where version=? AND pkgarch=?;" % (self.table), | ||
120 | (version, pkgarch)) | ||
121 | row = data.fetchone() | ||
122 | if row is not None: | ||
123 | return row[0] | ||
124 | else: | ||
125 | return None | ||
126 | |||
127 | def _get_value_hist(self, version, pkgarch, checksum): | ||
82 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 128 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
83 | (version, pkgarch, checksum)) | 129 | (version, pkgarch, checksum)) |
84 | row=data.fetchone() | 130 | row=data.fetchone() |
@@ -87,7 +133,7 @@ class PRTable(object): | |||
87 | else: | 133 | else: |
88 | #no value found, try to insert | 134 | #no value found, try to insert |
89 | if self.read_only: | 135 | if self.read_only: |
90 | data = self._execute("SELECT ifnull(max(value)+1,0) FROM %s where version=? AND pkgarch=?;" % (self.table), | 136 | data = self._execute("SELECT ifnull(max(value)+1, 0) FROM %s where version=? AND pkgarch=?;" % (self.table), |
91 | (version, pkgarch)) | 137 | (version, pkgarch)) |
92 | row = data.fetchone() | 138 | row = data.fetchone() |
93 | if row is not None: | 139 | if row is not None: |
@@ -96,9 +142,9 @@ class PRTable(object): | |||
96 | return 0 | 142 | return 0 |
97 | 143 | ||
98 | try: | 144 | try: |
99 | self._execute("INSERT INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1,0) from %s where version=? AND pkgarch=?));" | 145 | self._execute("INSERT INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1, 0) from %s where version=? AND pkgarch=?));" |
100 | % (self.table,self.table), | 146 | % (self.table, self.table), |
101 | (version,pkgarch, checksum,version, pkgarch)) | 147 | (version, pkgarch, checksum, version, pkgarch)) |
102 | except sqlite3.IntegrityError as exc: | 148 | except sqlite3.IntegrityError as exc: |
103 | logger.error(str(exc)) | 149 | logger.error(str(exc)) |
104 | 150 | ||
@@ -112,10 +158,10 @@ class PRTable(object): | |||
112 | else: | 158 | else: |
113 | raise prserv.NotFoundError | 159 | raise prserv.NotFoundError |
114 | 160 | ||
115 | def _getValueNohist(self, version, pkgarch, checksum): | 161 | def _get_value_no_hist(self, version, pkgarch, checksum): |
116 | data=self._execute("SELECT value FROM %s \ | 162 | data=self._execute("SELECT value FROM %s \ |
117 | WHERE version=? AND pkgarch=? AND checksum=? AND \ | 163 | WHERE version=? AND pkgarch=? AND checksum=? AND \ |
118 | value >= (select max(value) from %s where version=? AND pkgarch=?);" | 164 | value >= (select max(value) from %s where version=? AND pkgarch=?);" |
119 | % (self.table, self.table), | 165 | % (self.table, self.table), |
120 | (version, pkgarch, checksum, version, pkgarch)) | 166 | (version, pkgarch, checksum, version, pkgarch)) |
121 | row=data.fetchone() | 167 | row=data.fetchone() |
@@ -124,17 +170,13 @@ class PRTable(object): | |||
124 | else: | 170 | else: |
125 | #no value found, try to insert | 171 | #no value found, try to insert |
126 | if self.read_only: | 172 | if self.read_only: |
127 | data = self._execute("SELECT ifnull(max(value)+1,0) FROM %s where version=? AND pkgarch=?;" % (self.table), | 173 | data = self._execute("SELECT ifnull(max(value)+1, 0) FROM %s where version=? AND pkgarch=?;" % (self.table), |
128 | (version, pkgarch)) | 174 | (version, pkgarch)) |
129 | row = data.fetchone() | 175 | return data.fetchone()[0] |
130 | if row is not None: | ||
131 | return row[0] | ||
132 | else: | ||
133 | return 0 | ||
134 | 176 | ||
135 | try: | 177 | try: |
136 | self._execute("INSERT OR REPLACE INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1,0) from %s where version=? AND pkgarch=?));" | 178 | self._execute("INSERT OR REPLACE INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1, 0) from %s where version=? AND pkgarch=?));" |
137 | % (self.table,self.table), | 179 | % (self.table, self.table), |
138 | (version, pkgarch, checksum, version, pkgarch)) | 180 | (version, pkgarch, checksum, version, pkgarch)) |
139 | except sqlite3.IntegrityError as exc: | 181 | except sqlite3.IntegrityError as exc: |
140 | logger.error(str(exc)) | 182 | logger.error(str(exc)) |
@@ -150,17 +192,17 @@ class PRTable(object): | |||
150 | else: | 192 | else: |
151 | raise prserv.NotFoundError | 193 | raise prserv.NotFoundError |
152 | 194 | ||
153 | def getValue(self, version, pkgarch, checksum): | 195 | def get_value(self, version, pkgarch, checksum): |
154 | if self.nohist: | 196 | if self.nohist: |
155 | return self._getValueNohist(version, pkgarch, checksum) | 197 | return self._get_value_no_hist(version, pkgarch, checksum) |
156 | else: | 198 | else: |
157 | return self._getValueHist(version, pkgarch, checksum) | 199 | return self._get_value_hist(version, pkgarch, checksum) |
158 | 200 | ||
159 | def _importHist(self, version, pkgarch, checksum, value): | 201 | def _import_hist(self, version, pkgarch, checksum, value): |
160 | if self.read_only: | 202 | if self.read_only: |
161 | return None | 203 | return None |
162 | 204 | ||
163 | val = None | 205 | val = None |
164 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 206 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
165 | (version, pkgarch, checksum)) | 207 | (version, pkgarch, checksum)) |
166 | row = data.fetchone() | 208 | row = data.fetchone() |
@@ -183,27 +225,27 @@ class PRTable(object): | |||
183 | val = row[0] | 225 | val = row[0] |
184 | return val | 226 | return val |
185 | 227 | ||
186 | def _importNohist(self, version, pkgarch, checksum, value): | 228 | def _import_no_hist(self, version, pkgarch, checksum, value): |
187 | if self.read_only: | 229 | if self.read_only: |
188 | return None | 230 | return None |
189 | 231 | ||
190 | try: | 232 | try: |
191 | #try to insert | 233 | #try to insert |
192 | self._execute("INSERT INTO %s VALUES (?, ?, ?, ?);" % (self.table), | 234 | self._execute("INSERT INTO %s VALUES (?, ?, ?, ?);" % (self.table), |
193 | (version, pkgarch, checksum,value)) | 235 | (version, pkgarch, checksum, value)) |
194 | except sqlite3.IntegrityError as exc: | 236 | except sqlite3.IntegrityError as exc: |
195 | #already have the record, try to update | 237 | #already have the record, try to update |
196 | try: | 238 | try: |
197 | self._execute("UPDATE %s SET value=? WHERE version=? AND pkgarch=? AND checksum=? AND value<?" | 239 | self._execute("UPDATE %s SET value=? WHERE version=? AND pkgarch=? AND checksum=? AND value<?" |
198 | % (self.table), | 240 | % (self.table), |
199 | (value,version,pkgarch,checksum,value)) | 241 | (value, version, pkgarch, checksum, value)) |
200 | except sqlite3.IntegrityError as exc: | 242 | except sqlite3.IntegrityError as exc: |
201 | logger.error(str(exc)) | 243 | logger.error(str(exc)) |
202 | 244 | ||
203 | self.dirty = True | 245 | self.dirty = True |
204 | 246 | ||
205 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, | 247 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, |
206 | (version,pkgarch,checksum,value)) | 248 | (version, pkgarch, checksum, value)) |
207 | row=data.fetchone() | 249 | row=data.fetchone() |
208 | if row is not None: | 250 | if row is not None: |
209 | return row[0] | 251 | return row[0] |
@@ -212,33 +254,33 @@ class PRTable(object): | |||
212 | 254 | ||
213 | def importone(self, version, pkgarch, checksum, value): | 255 | def importone(self, version, pkgarch, checksum, value): |
214 | if self.nohist: | 256 | if self.nohist: |
215 | return self._importNohist(version, pkgarch, checksum, value) | 257 | return self._import_no_hist(version, pkgarch, checksum, value) |
216 | else: | 258 | else: |
217 | return self._importHist(version, pkgarch, checksum, value) | 259 | return self._import_hist(version, pkgarch, checksum, value) |
218 | 260 | ||
219 | def export(self, version, pkgarch, checksum, colinfo): | 261 | def export(self, version, pkgarch, checksum, colinfo): |
220 | metainfo = {} | 262 | metainfo = {} |
221 | #column info | 263 | #column info |
222 | if colinfo: | 264 | if colinfo: |
223 | metainfo['tbl_name'] = self.table | 265 | metainfo["tbl_name"] = self.table |
224 | metainfo['core_ver'] = prserv.__version__ | 266 | metainfo["core_ver"] = prserv.__version__ |
225 | metainfo['col_info'] = [] | 267 | metainfo["col_info"] = [] |
226 | data = self._execute("PRAGMA table_info(%s);" % self.table) | 268 | data = self._execute("PRAGMA table_info(%s);" % self.table) |
227 | for row in data: | 269 | for row in data: |
228 | col = {} | 270 | col = {} |
229 | col['name'] = row['name'] | 271 | col["name"] = row["name"] |
230 | col['type'] = row['type'] | 272 | col["type"] = row["type"] |
231 | col['notnull'] = row['notnull'] | 273 | col["notnull"] = row["notnull"] |
232 | col['dflt_value'] = row['dflt_value'] | 274 | col["dflt_value"] = row["dflt_value"] |
233 | col['pk'] = row['pk'] | 275 | col["pk"] = row["pk"] |
234 | metainfo['col_info'].append(col) | 276 | metainfo["col_info"].append(col) |
235 | 277 | ||
236 | #data info | 278 | #data info |
237 | datainfo = [] | 279 | datainfo = [] |
238 | 280 | ||
239 | if self.nohist: | 281 | if self.nohist: |
240 | sqlstmt = "SELECT T1.version, T1.pkgarch, T1.checksum, T1.value FROM %s as T1, \ | 282 | sqlstmt = "SELECT T1.version, T1.pkgarch, T1.checksum, T1.value FROM %s as T1, \ |
241 | (SELECT version,pkgarch,max(value) as maxvalue FROM %s GROUP BY version,pkgarch) as T2 \ | 283 | (SELECT version, pkgarch, max(value) as maxvalue FROM %s GROUP BY version, pkgarch) as T2 \ |
242 | WHERE T1.version=T2.version AND T1.pkgarch=T2.pkgarch AND T1.value=T2.maxvalue " % (self.table, self.table) | 284 | WHERE T1.version=T2.version AND T1.pkgarch=T2.pkgarch AND T1.value=T2.maxvalue " % (self.table, self.table) |
243 | else: | 285 | else: |
244 | sqlstmt = "SELECT * FROM %s as T1 WHERE 1=1 " % self.table | 286 | sqlstmt = "SELECT * FROM %s as T1 WHERE 1=1 " % self.table |
@@ -261,12 +303,12 @@ class PRTable(object): | |||
261 | else: | 303 | else: |
262 | data = self._execute(sqlstmt) | 304 | data = self._execute(sqlstmt) |
263 | for row in data: | 305 | for row in data: |
264 | if row['version']: | 306 | if row["version"]: |
265 | col = {} | 307 | col = {} |
266 | col['version'] = row['version'] | 308 | col["version"] = row["version"] |
267 | col['pkgarch'] = row['pkgarch'] | 309 | col["pkgarch"] = row["pkgarch"] |
268 | col['checksum'] = row['checksum'] | 310 | col["checksum"] = row["checksum"] |
269 | col['value'] = row['value'] | 311 | col["value"] = row["value"] |
270 | datainfo.append(col) | 312 | datainfo.append(col) |
271 | return (metainfo, datainfo) | 313 | return (metainfo, datainfo) |
272 | 314 | ||
@@ -275,7 +317,7 @@ class PRTable(object): | |||
275 | for line in self.conn.iterdump(): | 317 | for line in self.conn.iterdump(): |
276 | writeCount = writeCount + len(line) + 1 | 318 | writeCount = writeCount + len(line) + 1 |
277 | fd.write(line) | 319 | fd.write(line) |
278 | fd.write('\n') | 320 | fd.write("\n") |
279 | return writeCount | 321 | return writeCount |
280 | 322 | ||
281 | class PRData(object): | 323 | class PRData(object): |
@@ -302,7 +344,7 @@ class PRData(object): | |||
302 | def disconnect(self): | 344 | def disconnect(self): |
303 | self.connection.close() | 345 | self.connection.close() |
304 | 346 | ||
305 | def __getitem__(self,tblname): | 347 | def __getitem__(self, tblname): |
306 | if not isinstance(tblname, str): | 348 | if not isinstance(tblname, str): |
307 | raise TypeError("tblname argument must be a string, not '%s'" % | 349 | raise TypeError("tblname argument must be a string, not '%s'" % |
308 | type(tblname)) | 350 | type(tblname)) |
@@ -316,4 +358,4 @@ class PRData(object): | |||
316 | if tblname in self._tables: | 358 | if tblname in self._tables: |
317 | del self._tables[tblname] | 359 | del self._tables[tblname] |
318 | logger.info("drop table %s" % (tblname)) | 360 | logger.info("drop table %s" % (tblname)) |
319 | self.connection.execute("DROP TABLE IF EXISTS %s;" % tblname) | 361 | self.connection.execute("DROP TABLE IF EXISTS %s;" % tblname) |
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 5fc8863f70..dc4be5b620 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -20,16 +20,19 @@ PIDPREFIX = "/tmp/PRServer_%s_%s.pid" | |||
20 | singleton = None | 20 | singleton = None |
21 | 21 | ||
22 | class PRServerClient(bb.asyncrpc.AsyncServerConnection): | 22 | class PRServerClient(bb.asyncrpc.AsyncServerConnection): |
23 | def __init__(self, socket, table, read_only): | 23 | def __init__(self, socket, server): |
24 | super().__init__(socket, 'PRSERVICE', logger) | 24 | super().__init__(socket, "PRSERVICE", server.logger) |
25 | self.server = server | ||
26 | |||
25 | self.handlers.update({ | 27 | self.handlers.update({ |
26 | 'get-pr': self.handle_get_pr, | 28 | "get-pr": self.handle_get_pr, |
27 | 'import-one': self.handle_import_one, | 29 | "test-pr": self.handle_test_pr, |
28 | 'export': self.handle_export, | 30 | "test-package": self.handle_test_package, |
29 | 'is-readonly': self.handle_is_readonly, | 31 | "max-package-pr": self.handle_max_package_pr, |
32 | "import-one": self.handle_import_one, | ||
33 | "export": self.handle_export, | ||
34 | "is-readonly": self.handle_is_readonly, | ||
30 | }) | 35 | }) |
31 | self.table = table | ||
32 | self.read_only = read_only | ||
33 | 36 | ||
34 | def validate_proto_version(self): | 37 | def validate_proto_version(self): |
35 | return (self.proto_version == (1, 0)) | 38 | return (self.proto_version == (1, 0)) |
@@ -38,57 +41,80 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): | |||
38 | try: | 41 | try: |
39 | return await super().dispatch_message(msg) | 42 | return await super().dispatch_message(msg) |
40 | except: | 43 | except: |
41 | self.table.sync() | 44 | self.server.table.sync() |
42 | raise | 45 | raise |
43 | else: | 46 | else: |
44 | self.table.sync_if_dirty() | 47 | self.server.table.sync_if_dirty() |
48 | |||
49 | async def handle_test_pr(self, request): | ||
50 | '''Finds the PR value corresponding to the request. If not found, returns None and doesn't insert a new value''' | ||
51 | version = request["version"] | ||
52 | pkgarch = request["pkgarch"] | ||
53 | checksum = request["checksum"] | ||
54 | |||
55 | value = self.server.table.find_value(version, pkgarch, checksum) | ||
56 | return {"value": value} | ||
57 | |||
58 | async def handle_test_package(self, request): | ||
59 | '''Tells whether there are entries for (version, pkgarch) in the db. Returns True or False''' | ||
60 | version = request["version"] | ||
61 | pkgarch = request["pkgarch"] | ||
62 | |||
63 | value = self.server.table.test_package(version, pkgarch) | ||
64 | return {"value": value} | ||
65 | |||
66 | async def handle_max_package_pr(self, request): | ||
67 | '''Finds the greatest PR value for (version, pkgarch) in the db. Returns None if no entry was found''' | ||
68 | version = request["version"] | ||
69 | pkgarch = request["pkgarch"] | ||
70 | |||
71 | value = self.server.table.find_max_value(version, pkgarch) | ||
72 | return {"value": value} | ||
45 | 73 | ||
46 | async def handle_get_pr(self, request): | 74 | async def handle_get_pr(self, request): |
47 | version = request['version'] | 75 | version = request["version"] |
48 | pkgarch = request['pkgarch'] | 76 | pkgarch = request["pkgarch"] |
49 | checksum = request['checksum'] | 77 | checksum = request["checksum"] |
50 | 78 | ||
51 | response = None | 79 | response = None |
52 | try: | 80 | try: |
53 | value = self.table.getValue(version, pkgarch, checksum) | 81 | value = self.server.table.get_value(version, pkgarch, checksum) |
54 | response = {'value': value} | 82 | response = {"value": value} |
55 | except prserv.NotFoundError: | 83 | except prserv.NotFoundError: |
56 | logger.error("can not find value for (%s, %s)",version, checksum) | 84 | self.logger.error("failure storing value in database for (%s, %s)",version, checksum) |
57 | except sqlite3.Error as exc: | ||
58 | logger.error(str(exc)) | ||
59 | 85 | ||
60 | return response | 86 | return response |
61 | 87 | ||
62 | async def handle_import_one(self, request): | 88 | async def handle_import_one(self, request): |
63 | response = None | 89 | response = None |
64 | if not self.read_only: | 90 | if not self.server.read_only: |
65 | version = request['version'] | 91 | version = request["version"] |
66 | pkgarch = request['pkgarch'] | 92 | pkgarch = request["pkgarch"] |
67 | checksum = request['checksum'] | 93 | checksum = request["checksum"] |
68 | value = request['value'] | 94 | value = request["value"] |
69 | 95 | ||
70 | value = self.table.importone(version, pkgarch, checksum, value) | 96 | value = self.server.table.importone(version, pkgarch, checksum, value) |
71 | if value is not None: | 97 | if value is not None: |
72 | response = {'value': value} | 98 | response = {"value": value} |
73 | 99 | ||
74 | return response | 100 | return response |
75 | 101 | ||
76 | async def handle_export(self, request): | 102 | async def handle_export(self, request): |
77 | version = request['version'] | 103 | version = request["version"] |
78 | pkgarch = request['pkgarch'] | 104 | pkgarch = request["pkgarch"] |
79 | checksum = request['checksum'] | 105 | checksum = request["checksum"] |
80 | colinfo = request['colinfo'] | 106 | colinfo = request["colinfo"] |
81 | 107 | ||
82 | try: | 108 | try: |
83 | (metainfo, datainfo) = self.table.export(version, pkgarch, checksum, colinfo) | 109 | (metainfo, datainfo) = self.server.table.export(version, pkgarch, checksum, colinfo) |
84 | except sqlite3.Error as exc: | 110 | except sqlite3.Error as exc: |
85 | logger.error(str(exc)) | 111 | self.logger.error(str(exc)) |
86 | metainfo = datainfo = None | 112 | metainfo = datainfo = None |
87 | 113 | ||
88 | return {'metainfo': metainfo, 'datainfo': datainfo} | 114 | return {"metainfo": metainfo, "datainfo": datainfo} |
89 | 115 | ||
90 | async def handle_is_readonly(self, request): | 116 | async def handle_is_readonly(self, request): |
91 | return {'readonly': self.read_only} | 117 | return {"readonly": self.server.read_only} |
92 | 118 | ||
93 | class PRServer(bb.asyncrpc.AsyncServer): | 119 | class PRServer(bb.asyncrpc.AsyncServer): |
94 | def __init__(self, dbfile, read_only=False): | 120 | def __init__(self, dbfile, read_only=False): |
@@ -98,14 +124,14 @@ class PRServer(bb.asyncrpc.AsyncServer): | |||
98 | self.read_only = read_only | 124 | self.read_only = read_only |
99 | 125 | ||
100 | def accept_client(self, socket): | 126 | def accept_client(self, socket): |
101 | return PRServerClient(socket, self.table, self.read_only) | 127 | return PRServerClient(socket, self) |
102 | 128 | ||
103 | def start(self): | 129 | def start(self): |
104 | tasks = super().start() | 130 | tasks = super().start() |
105 | self.db = prserv.db.PRData(self.dbfile, read_only=self.read_only) | 131 | self.db = prserv.db.PRData(self.dbfile, read_only=self.read_only) |
106 | self.table = self.db["PRMAIN"] | 132 | self.table = self.db["PRMAIN"] |
107 | 133 | ||
108 | logger.info("Started PRServer with DBfile: %s, Address: %s, PID: %s" % | 134 | self.logger.info("Started PRServer with DBfile: %s, Address: %s, PID: %s" % |
109 | (self.dbfile, self.address, str(os.getpid()))) | 135 | (self.dbfile, self.address, str(os.getpid()))) |
110 | 136 | ||
111 | return tasks | 137 | return tasks |
@@ -135,7 +161,7 @@ class PRServSingleton(object): | |||
135 | if not self.prserv.address: | 161 | if not self.prserv.address: |
136 | raise PRServiceConfigError | 162 | raise PRServiceConfigError |
137 | if not self.port: | 163 | if not self.port: |
138 | self.port = int(self.prserv.address.rsplit(':', 1)[1]) | 164 | self.port = int(self.prserv.address.rsplit(":", 1)[1]) |
139 | 165 | ||
140 | def run_as_daemon(func, pidfile, logfile): | 166 | def run_as_daemon(func, pidfile, logfile): |
141 | """ | 167 | """ |
@@ -171,18 +197,18 @@ def run_as_daemon(func, pidfile, logfile): | |||
171 | # stdout/stderr or it could be 'real' unix fd forking where we need | 197 | # stdout/stderr or it could be 'real' unix fd forking where we need |
172 | # to physically close the fds to prevent the program launching us from | 198 | # to physically close the fds to prevent the program launching us from |
173 | # potentially hanging on a pipe. Handle both cases. | 199 | # potentially hanging on a pipe. Handle both cases. |
174 | si = open('/dev/null', 'r') | 200 | si = open("/dev/null", "r") |
175 | try: | 201 | try: |
176 | os.dup2(si.fileno(),sys.stdin.fileno()) | 202 | os.dup2(si.fileno(), sys.stdin.fileno()) |
177 | except (AttributeError, io.UnsupportedOperation): | 203 | except (AttributeError, io.UnsupportedOperation): |
178 | sys.stdin = si | 204 | sys.stdin = si |
179 | so = open(logfile, 'a+') | 205 | so = open(logfile, "a+") |
180 | try: | 206 | try: |
181 | os.dup2(so.fileno(),sys.stdout.fileno()) | 207 | os.dup2(so.fileno(), sys.stdout.fileno()) |
182 | except (AttributeError, io.UnsupportedOperation): | 208 | except (AttributeError, io.UnsupportedOperation): |
183 | sys.stdout = so | 209 | sys.stdout = so |
184 | try: | 210 | try: |
185 | os.dup2(so.fileno(),sys.stderr.fileno()) | 211 | os.dup2(so.fileno(), sys.stderr.fileno()) |
186 | except (AttributeError, io.UnsupportedOperation): | 212 | except (AttributeError, io.UnsupportedOperation): |
187 | sys.stderr = so | 213 | sys.stderr = so |
188 | 214 | ||
@@ -200,7 +226,7 @@ def run_as_daemon(func, pidfile, logfile): | |||
200 | 226 | ||
201 | # write pidfile | 227 | # write pidfile |
202 | pid = str(os.getpid()) | 228 | pid = str(os.getpid()) |
203 | with open(pidfile, 'w') as pf: | 229 | with open(pidfile, "w") as pf: |
204 | pf.write("%s\n" % pid) | 230 | pf.write("%s\n" % pid) |
205 | 231 | ||
206 | func() | 232 | func() |
@@ -245,15 +271,15 @@ def stop_daemon(host, port): | |||
245 | # so at least advise the user which ports the corresponding server is listening | 271 | # so at least advise the user which ports the corresponding server is listening |
246 | ports = [] | 272 | ports = [] |
247 | portstr = "" | 273 | portstr = "" |
248 | for pf in glob.glob(PIDPREFIX % (ip,'*')): | 274 | for pf in glob.glob(PIDPREFIX % (ip, "*")): |
249 | bn = os.path.basename(pf) | 275 | bn = os.path.basename(pf) |
250 | root, _ = os.path.splitext(bn) | 276 | root, _ = os.path.splitext(bn) |
251 | ports.append(root.split('_')[-1]) | 277 | ports.append(root.split("_")[-1]) |
252 | if len(ports): | 278 | if len(ports): |
253 | portstr = "Wrong port? Other ports listening at %s: %s" % (host, ' '.join(ports)) | 279 | portstr = "Wrong port? Other ports listening at %s: %s" % (host, " ".join(ports)) |
254 | 280 | ||
255 | sys.stderr.write("pidfile %s does not exist. Daemon not running? %s\n" | 281 | sys.stderr.write("pidfile %s does not exist. Daemon not running? %s\n" |
256 | % (pidfile,portstr)) | 282 | % (pidfile, portstr)) |
257 | return 1 | 283 | return 1 |
258 | 284 | ||
259 | try: | 285 | try: |
@@ -284,7 +310,7 @@ def is_running(pid): | |||
284 | return True | 310 | return True |
285 | 311 | ||
286 | def is_local_special(host, port): | 312 | def is_local_special(host, port): |
287 | if (host == 'localhost' or host == '127.0.0.1') and not port: | 313 | if (host == "localhost" or host == "127.0.0.1") and not port: |
288 | return True | 314 | return True |
289 | else: | 315 | else: |
290 | return False | 316 | return False |
@@ -295,7 +321,7 @@ class PRServiceConfigError(Exception): | |||
295 | def auto_start(d): | 321 | def auto_start(d): |
296 | global singleton | 322 | global singleton |
297 | 323 | ||
298 | host_params = list(filter(None, (d.getVar('PRSERV_HOST') or '').split(':'))) | 324 | host_params = list(filter(None, (d.getVar("PRSERV_HOST") or "").split(":"))) |
299 | if not host_params: | 325 | if not host_params: |
300 | # Shutdown any existing PR Server | 326 | # Shutdown any existing PR Server |
301 | auto_shutdown() | 327 | auto_shutdown() |
@@ -304,7 +330,7 @@ def auto_start(d): | |||
304 | if len(host_params) != 2: | 330 | if len(host_params) != 2: |
305 | # Shutdown any existing PR Server | 331 | # Shutdown any existing PR Server |
306 | auto_shutdown() | 332 | auto_shutdown() |
307 | logger.critical('\n'.join(['PRSERV_HOST: incorrect format', | 333 | logger.critical("\n".join(["PRSERV_HOST: incorrect format", |
308 | 'Usage: PRSERV_HOST = "<hostname>:<port>"'])) | 334 | 'Usage: PRSERV_HOST = "<hostname>:<port>"'])) |
309 | raise PRServiceConfigError | 335 | raise PRServiceConfigError |
310 | 336 | ||
@@ -357,8 +383,8 @@ def connect(host, port): | |||
357 | 383 | ||
358 | global singleton | 384 | global singleton |
359 | 385 | ||
360 | if host.strip().lower() == 'localhost' and not port: | 386 | if host.strip().lower() == "localhost" and not port: |
361 | host = 'localhost' | 387 | host = "localhost" |
362 | port = singleton.port | 388 | port = singleton.port |
363 | 389 | ||
364 | conn = client.PRClient() | 390 | conn = client.PRClient() |
diff --git a/documentation/Makefile b/documentation/Makefile index c930d2d280..189bd1dfac 100644 --- a/documentation/Makefile +++ b/documentation/Makefile | |||
@@ -53,9 +53,8 @@ stylecheck: | |||
53 | vale sync | 53 | vale sync |
54 | vale $(VALEOPTS) $(VALEDOCS) | 54 | vale $(VALEOPTS) $(VALEDOCS) |
55 | 55 | ||
56 | stylecheck: | 56 | sphinx-lint: |
57 | vale sync | 57 | sphinx-lint $(SOURCEDIR) |
58 | vale $(VALEOPTS) $(VALEDOCS) | ||
59 | 58 | ||
60 | epub: $(PNGs) | 59 | epub: $(PNGs) |
61 | $(SOURCEDIR)/set_versions.py | 60 | $(SOURCEDIR)/set_versions.py |
diff --git a/documentation/README b/documentation/README index 8035418cac..b60472fcbf 100644 --- a/documentation/README +++ b/documentation/README | |||
@@ -165,6 +165,20 @@ To run Vale: | |||
165 | 165 | ||
166 | $ make stylecheck | 166 | $ make stylecheck |
167 | 167 | ||
168 | Link checking the Yocto Project documentation | ||
169 | ============================================= | ||
170 | |||
171 | To fix errors which are not reported by Sphinx itself, | ||
172 | the project uses sphinx-lint (https://github.com/sphinx-contrib/sphinx-lint). | ||
173 | |||
174 | To install sphinx-lint: | ||
175 | |||
176 | $ pip install sphinx-lint | ||
177 | |||
178 | To run sphinx-lint: | ||
179 | |||
180 | $ make sphinx-lint | ||
181 | |||
168 | Sphinx theme and CSS customization | 182 | Sphinx theme and CSS customization |
169 | ================================== | 183 | ================================== |
170 | 184 | ||
diff --git a/documentation/brief-yoctoprojectqs/index.rst b/documentation/brief-yoctoprojectqs/index.rst index 61c5cbec36..c5400e4ac8 100644 --- a/documentation/brief-yoctoprojectqs/index.rst +++ b/documentation/brief-yoctoprojectqs/index.rst | |||
@@ -251,11 +251,17 @@ an entire Linux distribution, including the toolchain, from source. | |||
251 | To use such mirrors, uncomment the below lines in your ``conf/local.conf`` | 251 | To use such mirrors, uncomment the below lines in your ``conf/local.conf`` |
252 | file in the :term:`Build Directory`:: | 252 | file in the :term:`Build Directory`:: |
253 | 253 | ||
254 | BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" | 254 | BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws" |
255 | SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" | 255 | SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" |
256 | BB_HASHSERVE = "auto" | 256 | BB_HASHSERVE = "auto" |
257 | BB_SIGNATURE_HANDLER = "OEEquivHash" | 257 | BB_SIGNATURE_HANDLER = "OEEquivHash" |
258 | 258 | ||
259 | The hash equivalence server needs the websockets python module version 9.1 | ||
260 | or later. Debian GNU/Linux 12 (Bookworm) and later, Fedora, CentOS Stream | ||
261 | 9 and later, and Ubuntu 22.04 (LTS) and later, all have a recent enough | ||
262 | package. Other supported distributions need to get the module some other | ||
263 | place than their package feed, e.g. via ``pip``. | ||
264 | |||
259 | #. **Start the Build:** Continue with the following command to build an OS | 265 | #. **Start the Build:** Continue with the following command to build an OS |
260 | image for the target, which is ``core-image-sato`` in this example: | 266 | image for the target, which is ``core-image-sato`` in this example: |
261 | 267 | ||
diff --git a/documentation/conf.py b/documentation/conf.py index a64685ec9b..35c5c14535 100644 --- a/documentation/conf.py +++ b/documentation/conf.py | |||
@@ -159,8 +159,8 @@ html_last_updated_fmt = '%b %d, %Y' | |||
159 | html_secnumber_suffix = " " | 159 | html_secnumber_suffix = " " |
160 | 160 | ||
161 | latex_elements = { | 161 | latex_elements = { |
162 | 'passoptionstopackages': '\PassOptionsToPackage{bookmarksdepth=5}{hyperref}', | 162 | 'passoptionstopackages': '\\PassOptionsToPackage{bookmarksdepth=5}{hyperref}', |
163 | 'preamble': '\setcounter{tocdepth}{2}', | 163 | 'preamble': '\\setcounter{tocdepth}{2}', |
164 | } | 164 | } |
165 | 165 | ||
166 | # Make the EPUB builder prefer PNG to SVG because of issues rendering Inkscape SVG | 166 | # Make the EPUB builder prefer PNG to SVG because of issues rendering Inkscape SVG |
diff --git a/documentation/contributor-guide/submit-changes.rst b/documentation/contributor-guide/submit-changes.rst index dfeb0305c3..47a416b245 100644 --- a/documentation/contributor-guide/submit-changes.rst +++ b/documentation/contributor-guide/submit-changes.rst | |||
@@ -440,7 +440,7 @@ varies by component: | |||
440 | 440 | ||
441 | For changes to other layers and tools hosted in the Yocto Project source | 441 | For changes to other layers and tools hosted in the Yocto Project source |
442 | repositories (i.e. :yocto_git:`git.yoctoproject.org <>`), use the | 442 | repositories (i.e. :yocto_git:`git.yoctoproject.org <>`), use the |
443 | :yocto_lists:`yocto </g/yocto/>` general mailing list. | 443 | :yocto_lists:`yocto-patches </g/yocto-patches/>` general mailing list. |
444 | 444 | ||
445 | For changes to other layers hosted in the OpenEmbedded source | 445 | For changes to other layers hosted in the OpenEmbedded source |
446 | repositories (i.e. :oe_git:`git.openembedded.org <>`), use | 446 | repositories (i.e. :oe_git:`git.openembedded.org <>`), use |
diff --git a/documentation/dev-manual/custom-distribution.rst b/documentation/dev-manual/custom-distribution.rst index 47faed0d04..0bc386d606 100644 --- a/documentation/dev-manual/custom-distribution.rst +++ b/documentation/dev-manual/custom-distribution.rst | |||
@@ -4,10 +4,16 @@ Creating Your Own Distribution | |||
4 | ****************************** | 4 | ****************************** |
5 | 5 | ||
6 | When you build an image using the Yocto Project and do not alter any | 6 | When you build an image using the Yocto Project and do not alter any |
7 | distribution :term:`Metadata`, you are | 7 | distribution :term:`Metadata`, you are using the Poky distribution. |
8 | creating a Poky distribution. If you wish to gain more control over | 8 | Poky is explicitly a *reference* distribution for testing and |
9 | package alternative selections, compile-time options, and other | 9 | development purposes. It enables most hardware and software features |
10 | low-level configurations, you can create your own distribution. | 10 | so that they can be tested, but this also means that from a security |
11 | point of view the attack surface is very large. Additionally, at some | ||
12 | point it is likely that you will want to gain more control over package | ||
13 | alternative selections, compile-time options, and other low-level | ||
14 | configurations. For both of these reasons, if you are using the Yocto | ||
15 | Project for production use then you are strongly encouraged to create | ||
16 | your own distribution. | ||
11 | 17 | ||
12 | To create your own distribution, the basic steps consist of creating | 18 | To create your own distribution, the basic steps consist of creating |
13 | your own distribution layer, creating your own distribution | 19 | your own distribution layer, creating your own distribution |
@@ -107,3 +113,23 @@ layer. The following steps provide some more detail: | |||
107 | For information on append files, see the | 113 | For information on append files, see the |
108 | ":ref:`dev-manual/layers:appending other layers metadata with your layer`" | 114 | ":ref:`dev-manual/layers:appending other layers metadata with your layer`" |
109 | section. | 115 | section. |
116 | |||
117 | Copying and modifying the Poky distribution | ||
118 | =========================================== | ||
119 | |||
120 | Instead of creating a custom distribution from scratch as per above, you may | ||
121 | wish to start your custom distribution configuration by copying the Poky | ||
122 | distribution provided within the ``meta-poky`` layer and then modifying it. | ||
123 | This is fine, however if you do this you should keep the following in mind: | ||
124 | |||
125 | - Every reference to Poky needs to be updated in your copy so that it | ||
126 | will still apply. This includes override usage within files (e.g. ``:poky``) | ||
127 | and in directory names. This is a good opportunity to evaluate each one of | ||
128 | these customizations to see if they are needed for your use case. | ||
129 | |||
130 | - Unless you also intend to use them, the ``poky-tiny``, ``poky-altcfg`` and | ||
131 | ``poky-bleeding`` variants and any references to them can be removed. | ||
132 | |||
133 | - More generally, the Poky distribution configuration enables a lot more | ||
134 | than you likely need for your production use case. You should evaluate *every* | ||
135 | configuration choice made in your copy to determine if it is needed. | ||
diff --git a/documentation/dev-manual/debugging.rst b/documentation/dev-manual/debugging.rst index e20637e1c6..92458a0c37 100644 --- a/documentation/dev-manual/debugging.rst +++ b/documentation/dev-manual/debugging.rst | |||
@@ -270,13 +270,17 @@ format and can be converted to images (e.g. using the ``dot`` tool from | |||
270 | displays paths between graph nodes. | 270 | displays paths between graph nodes. |
271 | 271 | ||
272 | You can use a different method to view dependency information by using | 272 | You can use a different method to view dependency information by using |
273 | the following command:: | 273 | either:: |
274 | 274 | ||
275 | $ bitbake -g -u taskexp recipename | 275 | $ bitbake -g -u taskexp recipename |
276 | 276 | ||
277 | This command | 277 | or:: |
278 | displays a GUI window from which you can view build-time and runtime | 278 | |
279 | dependencies for the recipes involved in building recipename. | 279 | $ bitbake -g -u taskexp_ncurses recipename |
280 | |||
281 | The ``-u taskdep`` option GUI window from which you can view build-time and | ||
282 | runtime dependencies for the recipes involved in building recipename. The | ||
283 | ``-u taskexp_ncurses`` option uses ncurses instead of GTK to render the UI. | ||
280 | 284 | ||
281 | Viewing Task Variable Dependencies | 285 | Viewing Task Variable Dependencies |
282 | ================================== | 286 | ================================== |
diff --git a/documentation/dev-manual/disk-space.rst b/documentation/dev-manual/disk-space.rst index 6d1638a302..efca82601d 100644 --- a/documentation/dev-manual/disk-space.rst +++ b/documentation/dev-manual/disk-space.rst | |||
@@ -49,7 +49,7 @@ requires a full build environment to be available and doesn't work well | |||
49 | covering multiple releases. It won't work either on limited environments | 49 | covering multiple releases. It won't work either on limited environments |
50 | such as BSD based NAS:: | 50 | such as BSD based NAS:: |
51 | 51 | ||
52 | sstate-cache-management.sh --remove-duplicated --cache-dir=build/sstate-cache | 52 | sstate-cache-management.py --remove-duplicated --cache-dir=sstate-cache |
53 | 53 | ||
54 | This command will ask you to confirm the deletions it identifies. | 54 | This command will ask you to confirm the deletions it identifies. |
55 | Run ``sstate-cache-management.sh`` for more details about this script. | 55 | Run ``sstate-cache-management.sh`` for more details about this script. |
diff --git a/documentation/dev-manual/init-manager.rst b/documentation/dev-manual/init-manager.rst index 20d61ea830..ddce82b81f 100644 --- a/documentation/dev-manual/init-manager.rst +++ b/documentation/dev-manual/init-manager.rst | |||
@@ -121,7 +121,7 @@ increasing levels of complexity and functionality: | |||
121 | :widths: 40 20 20 20 | 121 | :widths: 40 20 20 20 |
122 | :header-rows: 1 | 122 | :header-rows: 1 |
123 | 123 | ||
124 | * - | 124 | * - |
125 | - BusyBox init | 125 | - BusyBox init |
126 | - SysVinit | 126 | - SysVinit |
127 | - systemd | 127 | - systemd |
diff --git a/documentation/dev-manual/layers.rst b/documentation/dev-manual/layers.rst index f7929e630e..91889bd0ae 100644 --- a/documentation/dev-manual/layers.rst +++ b/documentation/dev-manual/layers.rst | |||
@@ -501,12 +501,12 @@ the "meta" layer at ``meta/recipes-bsp/formfactor``:: | |||
501 | INHIBIT_DEFAULT_DEPS = "1" | 501 | INHIBIT_DEFAULT_DEPS = "1" |
502 | 502 | ||
503 | do_install() { | 503 | do_install() { |
504 | # Install file only if it has contents | 504 | # Install file only if it has contents |
505 | install -d ${D}${sysconfdir}/formfactor/ | 505 | install -d ${D}${sysconfdir}/formfactor/ |
506 | install -m 0644 ${S}/config ${D}${sysconfdir}/formfactor/ | 506 | install -m 0644 ${S}/config ${D}${sysconfdir}/formfactor/ |
507 | if [ -s "${S}/machconfig" ]; then | 507 | if [ -s "${S}/machconfig" ]; then |
508 | install -m 0644 ${S}/machconfig ${D}${sysconfdir}/formfactor/ | 508 | install -m 0644 ${S}/machconfig ${D}${sysconfdir}/formfactor/ |
509 | fi | 509 | fi |
510 | } | 510 | } |
511 | 511 | ||
512 | In the main recipe, note the :term:`SRC_URI` | 512 | In the main recipe, note the :term:`SRC_URI` |
@@ -582,10 +582,10 @@ Directory`. Here is the main ``xserver-xf86-config`` recipe, which is named | |||
582 | ALLOW_EMPTY:${PN} = "1" | 582 | ALLOW_EMPTY:${PN} = "1" |
583 | 583 | ||
584 | do_install () { | 584 | do_install () { |
585 | if test -s ${WORKDIR}/xorg.conf; then | 585 | if test -s ${WORKDIR}/xorg.conf; then |
586 | install -d ${D}/${sysconfdir}/X11 | 586 | install -d ${D}/${sysconfdir}/X11 |
587 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ | 587 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ |
588 | fi | 588 | fi |
589 | } | 589 | } |
590 | 590 | ||
591 | Here is the append file, which is named ``xserver-xf86-config_%.bbappend`` | 591 | Here is the append file, which is named ``xserver-xf86-config_%.bbappend`` |
@@ -732,7 +732,7 @@ The following list describes the available commands: | |||
732 | 732 | ||
733 | - ``save-build-conf``: Saves the currently active build configuration | 733 | - ``save-build-conf``: Saves the currently active build configuration |
734 | (``conf/local.conf``, ``conf/bblayers.conf``) as a template into a layer. | 734 | (``conf/local.conf``, ``conf/bblayers.conf``) as a template into a layer. |
735 | This template can later be used for setting up builds via :term:``TEMPLATECONF``. | 735 | This template can later be used for setting up builds via :term:`TEMPLATECONF`. |
736 | For information about saving and using configuration templates, see | 736 | For information about saving and using configuration templates, see |
737 | ":ref:`dev-manual/custom-template-configuration-directory:creating a custom template configuration directory`". | 737 | ":ref:`dev-manual/custom-template-configuration-directory:creating a custom template configuration directory`". |
738 | 738 | ||
diff --git a/documentation/dev-manual/start.rst b/documentation/dev-manual/start.rst index 8539bc0889..386e5f5d29 100644 --- a/documentation/dev-manual/start.rst +++ b/documentation/dev-manual/start.rst | |||
@@ -619,7 +619,7 @@ containing the release you wish to use, for example | |||
619 | 619 | ||
620 | You will find there source archives of individual components (if you wish | 620 | You will find there source archives of individual components (if you wish |
621 | to use them individually), and of the corresponding Poky release bundling | 621 | to use them individually), and of the corresponding Poky release bundling |
622 | a selection of these components. | 622 | a selection of these components. |
623 | 623 | ||
624 | .. note:: | 624 | .. note:: |
625 | 625 | ||
diff --git a/documentation/dev-manual/wic.rst b/documentation/dev-manual/wic.rst index 05e9cb381b..a3880f3a1c 100644 --- a/documentation/dev-manual/wic.rst +++ b/documentation/dev-manual/wic.rst | |||
@@ -139,20 +139,20 @@ individual images through the ``list`` command. You can use the ``list`` | |||
139 | command to return the available Wic images as follows:: | 139 | command to return the available Wic images as follows:: |
140 | 140 | ||
141 | $ wic list images | 141 | $ wic list images |
142 | genericx86 Create an EFI disk image for genericx86* | 142 | genericx86 Create an EFI disk image for genericx86* |
143 | beaglebone-yocto Create SD card image for Beaglebone | 143 | beaglebone-yocto Create SD card image for Beaglebone |
144 | qemuriscv Create qcow2 image for RISC-V QEMU machines | 144 | qemuriscv Create qcow2 image for RISC-V QEMU machines |
145 | mkefidisk Create an EFI disk image | 145 | mkefidisk Create an EFI disk image |
146 | qemuloongarch Create qcow2 image for LoongArch QEMU machines | 146 | qemuloongarch Create qcow2 image for LoongArch QEMU machines |
147 | directdisk-multi-rootfs Create multi rootfs image using rootfs plugin | 147 | directdisk-multi-rootfs Create multi rootfs image using rootfs plugin |
148 | directdisk Create a 'pcbios' direct disk image | 148 | directdisk Create a 'pcbios' direct disk image |
149 | efi-bootdisk | 149 | efi-bootdisk |
150 | mkhybridiso Create a hybrid ISO image | 150 | mkhybridiso Create a hybrid ISO image |
151 | directdisk-gpt Create a 'pcbios' direct disk image | 151 | directdisk-gpt Create a 'pcbios' direct disk image |
152 | systemd-bootdisk Create an EFI disk image with systemd-boot | 152 | systemd-bootdisk Create an EFI disk image with systemd-boot |
153 | sdimage-bootpart Create SD card image with a boot partition | 153 | sdimage-bootpart Create SD card image with a boot partition |
154 | qemux86-directdisk Create a qemu machine 'pcbios' direct disk image | 154 | qemux86-directdisk Create a qemu machine 'pcbios' direct disk image |
155 | directdisk-bootloader-config Create a 'pcbios' direct disk image with custom bootloader config | 155 | directdisk-bootloader-config Create a 'pcbios' direct disk image with custom bootloader config |
156 | 156 | ||
157 | Once you know the list of available | 157 | Once you know the list of available |
158 | Wic images, you can use ``help`` with the command to get help on a | 158 | Wic images, you can use ``help`` with the command to get help on a |
@@ -282,20 +282,20 @@ following two locations:: | |||
282 | Use the following command to list the available kickstart files:: | 282 | Use the following command to list the available kickstart files:: |
283 | 283 | ||
284 | $ wic list images | 284 | $ wic list images |
285 | genericx86 Create an EFI disk image for genericx86* | 285 | genericx86 Create an EFI disk image for genericx86* |
286 | beaglebone-yocto Create SD card image for Beaglebone | 286 | beaglebone-yocto Create SD card image for Beaglebone |
287 | qemuriscv Create qcow2 image for RISC-V QEMU machines | 287 | qemuriscv Create qcow2 image for RISC-V QEMU machines |
288 | mkefidisk Create an EFI disk image | 288 | mkefidisk Create an EFI disk image |
289 | qemuloongarch Create qcow2 image for LoongArch QEMU machines | 289 | qemuloongarch Create qcow2 image for LoongArch QEMU machines |
290 | directdisk-multi-rootfs Create multi rootfs image using rootfs plugin | 290 | directdisk-multi-rootfs Create multi rootfs image using rootfs plugin |
291 | directdisk Create a 'pcbios' direct disk image | 291 | directdisk Create a 'pcbios' direct disk image |
292 | efi-bootdisk | 292 | efi-bootdisk |
293 | mkhybridiso Create a hybrid ISO image | 293 | mkhybridiso Create a hybrid ISO image |
294 | directdisk-gpt Create a 'pcbios' direct disk image | 294 | directdisk-gpt Create a 'pcbios' direct disk image |
295 | systemd-bootdisk Create an EFI disk image with systemd-boot | 295 | systemd-bootdisk Create an EFI disk image with systemd-boot |
296 | sdimage-bootpart Create SD card image with a boot partition | 296 | sdimage-bootpart Create SD card image with a boot partition |
297 | qemux86-directdisk Create a qemu machine 'pcbios' direct disk image | 297 | qemux86-directdisk Create a qemu machine 'pcbios' direct disk image |
298 | directdisk-bootloader-config Create a 'pcbios' direct disk image with custom bootloader config | 298 | directdisk-bootloader-config Create a 'pcbios' direct disk image with custom bootloader config |
299 | 299 | ||
300 | When you use an existing file, you | 300 | When you use an existing file, you |
301 | do not have to use the ``.wks`` extension. Here is an example in Raw | 301 | do not have to use the ``.wks`` extension. Here is an example in Raw |
diff --git a/documentation/kernel-dev/advanced.rst b/documentation/kernel-dev/advanced.rst index bcaaaeed14..4c463503f6 100644 --- a/documentation/kernel-dev/advanced.rst +++ b/documentation/kernel-dev/advanced.rst | |||
@@ -303,8 +303,8 @@ The following listings show the ``build.scc`` file and part of the | |||
303 | . | 303 | . |
304 | . | 304 | . |
305 | . | 305 | . |
306 | char *dump_write = NULL, *files_source = NULL; | 306 | char *dump_write = NULL, *files_source = NULL; |
307 | int opt; | 307 | int opt; |
308 | -- | 308 | -- |
309 | 2.10.1 | 309 | 2.10.1 |
310 | 310 | ||
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst index 0cee503346..fda41694dc 100644 --- a/documentation/kernel-dev/common.rst +++ b/documentation/kernel-dev/common.rst | |||
@@ -315,11 +315,7 @@ home directory: | |||
315 | 315 | ||
316 | #. *Create Structure*: Create the layer's structure:: | 316 | #. *Create Structure*: Create the layer's structure:: |
317 | 317 | ||
318 | $ mkdir meta-mylayer | 318 | $ mkdir -p meta-mylayer/conf meta-mylayer/recipes-kernel/linux/linux-yocto |
319 | $ mkdir meta-mylayer/conf | ||
320 | $ mkdir meta-mylayer/recipes-kernel | ||
321 | $ mkdir meta-mylayer/recipes-kernel/linux | ||
322 | $ mkdir meta-mylayer/recipes-kernel/linux/linux-yocto | ||
323 | 319 | ||
324 | The ``conf`` directory holds your configuration files, while the | 320 | The ``conf`` directory holds your configuration files, while the |
325 | ``recipes-kernel`` directory holds your append file and eventual | 321 | ``recipes-kernel`` directory holds your append file and eventual |
@@ -964,9 +960,7 @@ Section. | |||
964 | additional structure to your layer using the following commands:: | 960 | additional structure to your layer using the following commands:: |
965 | 961 | ||
966 | $ cd ~/meta-mylayer | 962 | $ cd ~/meta-mylayer |
967 | $ mkdir recipes-kernel | 963 | $ mkdir -p recipes-kernel recipes-kernel/linux/linux-yocto |
968 | $ mkdir recipes-kernel/linux | ||
969 | $ mkdir recipes-kernel/linux/linux-yocto | ||
970 | 964 | ||
971 | Once you have created this | 965 | Once you have created this |
972 | hierarchy in your layer, you can move the patch file using the | 966 | hierarchy in your layer, you can move the patch file using the |
@@ -1674,10 +1668,10 @@ looks much like the one provided with the ``hello-mod`` template:: | |||
1674 | SRC := $(shell pwd) | 1668 | SRC := $(shell pwd) |
1675 | 1669 | ||
1676 | all: | 1670 | all: |
1677 | $(MAKE) -C $(KERNEL_SRC) M=$(SRC) | 1671 | $(MAKE) -C $(KERNEL_SRC) M=$(SRC) |
1678 | 1672 | ||
1679 | modules_install: | 1673 | modules_install: |
1680 | $(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install | 1674 | $(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install |
1681 | ... | 1675 | ... |
1682 | 1676 | ||
1683 | The important point to note here is the :term:`KERNEL_SRC` variable. The | 1677 | The important point to note here is the :term:`KERNEL_SRC` variable. The |
diff --git a/documentation/migration-guides/migration-4.0.rst b/documentation/migration-guides/migration-4.0.rst index b5bd57c312..0e9e741458 100644 --- a/documentation/migration-guides/migration-4.0.rst +++ b/documentation/migration-guides/migration-4.0.rst | |||
@@ -68,7 +68,7 @@ changes and you need to review them before committing. An example warning | |||
68 | looks like:: | 68 | looks like:: |
69 | 69 | ||
70 | poky/scripts/lib/devtool/upgrade.py needs further work at line 275 since it contains abort | 70 | poky/scripts/lib/devtool/upgrade.py needs further work at line 275 since it contains abort |
71 | 71 | ||
72 | Fetching changes | 72 | Fetching changes |
73 | ~~~~~~~~~~~~~~~~ | 73 | ~~~~~~~~~~~~~~~~ |
74 | 74 | ||
@@ -111,7 +111,7 @@ License changes | |||
111 | If they do not, by default a warning will be shown. A | 111 | If they do not, by default a warning will be shown. A |
112 | :oe_git:`convert-spdx-licenses.py </openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py>` | 112 | :oe_git:`convert-spdx-licenses.py </openembedded-core/tree/scripts/contrib/convert-spdx-licenses.py>` |
113 | script can be used to update your recipes. | 113 | script can be used to update your recipes. |
114 | 114 | ||
115 | - :term:`INCOMPATIBLE_LICENSE` should now use `SPDX identifiers <https://spdx.org/licenses/>`__. | 115 | - :term:`INCOMPATIBLE_LICENSE` should now use `SPDX identifiers <https://spdx.org/licenses/>`__. |
116 | Additionally, wildcarding is now limited to specifically supported values - | 116 | Additionally, wildcarding is now limited to specifically supported values - |
117 | see the :term:`INCOMPATIBLE_LICENSE` documentation for further information. | 117 | see the :term:`INCOMPATIBLE_LICENSE` documentation for further information. |
@@ -121,7 +121,7 @@ License changes | |||
121 | which can cause signature issues for users. In addition the ``available_licenses()`` | 121 | which can cause signature issues for users. In addition the ``available_licenses()`` |
122 | function has been removed from the :ref:`ref-classes-license` class as | 122 | function has been removed from the :ref:`ref-classes-license` class as |
123 | it is no longer needed. | 123 | it is no longer needed. |
124 | 124 | ||
125 | Removed recipes | 125 | Removed recipes |
126 | ~~~~~~~~~~~~~~~ | 126 | ~~~~~~~~~~~~~~~ |
127 | 127 | ||
@@ -136,11 +136,11 @@ The following recipes have been removed in this release: | |||
136 | 136 | ||
137 | Python changes | 137 | Python changes |
138 | ~~~~~~~~~~~~~~ | 138 | ~~~~~~~~~~~~~~ |
139 | 139 | ||
140 | - ``distutils`` has been deprecated upstream in Python 3.10 and thus the ``distutils*`` | 140 | - ``distutils`` has been deprecated upstream in Python 3.10 and thus the ``distutils*`` |
141 | classes have been moved to ``meta-python``. Recipes that inherit the ``distutils*`` | 141 | classes have been moved to ``meta-python``. Recipes that inherit the ``distutils*`` |
142 | classes should be updated to inherit ``setuptools*`` equivalents instead. | 142 | classes should be updated to inherit ``setuptools*`` equivalents instead. |
143 | 143 | ||
144 | - The Python package build process is now based on `wheels <https://pythonwheels.com/>`__. | 144 | - The Python package build process is now based on `wheels <https://pythonwheels.com/>`__. |
145 | The new Python packaging classes that should be used are | 145 | The new Python packaging classes that should be used are |
146 | :ref:`ref-classes-python_flit_core`, :ref:`ref-classes-python_setuptools_build_meta` | 146 | :ref:`ref-classes-python_flit_core`, :ref:`ref-classes-python_setuptools_build_meta` |
@@ -159,7 +159,7 @@ Prelink removed | |||
159 | Prelink has been dropped by ``glibc`` upstream in 2.36. It already caused issues with | 159 | Prelink has been dropped by ``glibc`` upstream in 2.36. It already caused issues with |
160 | binary corruption, has a number of open bugs and is of questionable benefit | 160 | binary corruption, has a number of open bugs and is of questionable benefit |
161 | without disabling load address randomization and PIE executables. | 161 | without disabling load address randomization and PIE executables. |
162 | 162 | ||
163 | We disabled prelinking by default in the honister (3.4) release, but left it able | 163 | We disabled prelinking by default in the honister (3.4) release, but left it able |
164 | to be enabled if desired. However, without glibc support it cannot be maintained | 164 | to be enabled if desired. However, without glibc support it cannot be maintained |
165 | any further, so all of the prelinking functionality has been removed in this release. | 165 | any further, so all of the prelinking functionality has been removed in this release. |
@@ -170,7 +170,7 @@ reference(s). | |||
170 | Reproducible as standard | 170 | Reproducible as standard |
171 | ~~~~~~~~~~~~~~~~~~~~~~~~ | 171 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
172 | 172 | ||
173 | Reproducibility is now considered as standard functionality, thus the | 173 | Reproducibility is now considered as standard functionality, thus the |
174 | ``reproducible`` class has been removed and its previous contents merged into the | 174 | ``reproducible`` class has been removed and its previous contents merged into the |
175 | :ref:`ref-classes-base` class. If you have references in your configuration to | 175 | :ref:`ref-classes-base` class. If you have references in your configuration to |
176 | ``reproducible`` in :term:`INHERIT`, :term:`USER_CLASSES` etc. then they should be | 176 | ``reproducible`` in :term:`INHERIT`, :term:`USER_CLASSES` etc. then they should be |
@@ -212,7 +212,7 @@ and :ref:`bitbake-user-manual/bitbake-user-manual-metadata:removal (override sty | |||
212 | 212 | ||
213 | Miscellaneous changes | 213 | Miscellaneous changes |
214 | ~~~~~~~~~~~~~~~~~~~~~ | 214 | ~~~~~~~~~~~~~~~~~~~~~ |
215 | 215 | ||
216 | - ``blacklist.bbclass`` is removed and the functionality moved to the | 216 | - ``blacklist.bbclass`` is removed and the functionality moved to the |
217 | :ref:`ref-classes-base` class with a more descriptive | 217 | :ref:`ref-classes-base` class with a more descriptive |
218 | ``varflag`` variable named :term:`SKIP_RECIPE` which will use the `bb.parse.SkipRecipe()` | 218 | ``varflag`` variable named :term:`SKIP_RECIPE` which will use the `bb.parse.SkipRecipe()` |
@@ -252,7 +252,7 @@ Miscellaneous changes | |||
252 | - The ``cortexa72-crc`` and ``cortexa72-crc-crypto`` tunes have been removed since | 252 | - The ``cortexa72-crc`` and ``cortexa72-crc-crypto`` tunes have been removed since |
253 | the crc extension is now enabled by default for cortexa72. Replace any references to | 253 | the crc extension is now enabled by default for cortexa72. Replace any references to |
254 | these with ``cortexa72`` and ``cortexa72-crypto`` respectively. | 254 | these with ``cortexa72`` and ``cortexa72-crypto`` respectively. |
255 | 255 | ||
256 | - The Python development shell (previously known as ``devpyshell``) feature has been | 256 | - The Python development shell (previously known as ``devpyshell``) feature has been |
257 | renamed to ``pydevshell``. To start it you should now run:: | 257 | renamed to ``pydevshell``. To start it you should now run:: |
258 | 258 | ||
@@ -261,7 +261,7 @@ Miscellaneous changes | |||
261 | - The ``packagegroups-core-full-cmdline-libs`` packagegroup is no longer produced, as | 261 | - The ``packagegroups-core-full-cmdline-libs`` packagegroup is no longer produced, as |
262 | libraries should normally be brought in via dependencies. If you have any references | 262 | libraries should normally be brought in via dependencies. If you have any references |
263 | to this then remove them. | 263 | to this then remove them. |
264 | 264 | ||
265 | - The :term:`TOPDIR` variable and the current working directory are no longer modified | 265 | - The :term:`TOPDIR` variable and the current working directory are no longer modified |
266 | when parsing recipes. Any code depending on the previous behaviour will no longer | 266 | when parsing recipes. Any code depending on the previous behaviour will no longer |
267 | work - change any such code to explicitly use appropriate path variables instead. | 267 | work - change any such code to explicitly use appropriate path variables instead. |
diff --git a/documentation/migration-guides/migration-4.2.rst b/documentation/migration-guides/migration-4.2.rst index 1db6fbca42..f5f12c8871 100644 --- a/documentation/migration-guides/migration-4.2.rst +++ b/documentation/migration-guides/migration-4.2.rst | |||
@@ -121,7 +121,7 @@ Removed variables | |||
121 | The following variables have been removed: | 121 | The following variables have been removed: |
122 | 122 | ||
123 | - ``SERIAL_CONSOLE``, deprecated since version 2.6, replaced by :term:`SERIAL_CONSOLES`. | 123 | - ``SERIAL_CONSOLE``, deprecated since version 2.6, replaced by :term:`SERIAL_CONSOLES`. |
124 | - ``PACKAGEBUILDPKGD``, a mostly internal variable in the ref:`ref-classes-package` | 124 | - ``PACKAGEBUILDPKGD``, a mostly internal variable in the :ref:`ref-classes-package` |
125 | class was rarely used to customise packaging. If you were using this in your custom | 125 | class was rarely used to customise packaging. If you were using this in your custom |
126 | recipes or bbappends, you will need to switch to using :term:`PACKAGE_PREPROCESS_FUNCS` | 126 | recipes or bbappends, you will need to switch to using :term:`PACKAGE_PREPROCESS_FUNCS` |
127 | or :term:`PACKAGESPLITFUNCS` instead. | 127 | or :term:`PACKAGESPLITFUNCS` instead. |
diff --git a/documentation/migration-guides/migration-5.0.rst b/documentation/migration-guides/migration-5.0.rst index 32581d750b..cf413300c2 100644 --- a/documentation/migration-guides/migration-5.0.rst +++ b/documentation/migration-guides/migration-5.0.rst | |||
@@ -52,11 +52,21 @@ See :ref:`all supported distributions <system-requirements-supported-distros>`. | |||
52 | Go language changes | 52 | Go language changes |
53 | ~~~~~~~~~~~~~~~~~~~ | 53 | ~~~~~~~~~~~~~~~~~~~ |
54 | 54 | ||
55 | The ``linkmode`` flag was dropped from ``GO_LDFLAGS`` for ``nativesdk`` and | ||
56 | ``cross-canadian``. Also, dynamic linking was disabled for the whole set of | ||
57 | (previously) supported architectures in the ``goarch`` class. | ||
58 | |||
55 | .. _migration-5.0-systemd-changes: | 59 | .. _migration-5.0-systemd-changes: |
56 | 60 | ||
57 | systemd changes | 61 | systemd changes |
58 | ~~~~~~~~~~~~~~~ | 62 | ~~~~~~~~~~~~~~~ |
59 | 63 | ||
64 | Systemd's nss-resolve plugin is now supported and can be added via the | ||
65 | ``nss-resolve`` :term:`PACKAGECONFIG` option , which is from now on required | ||
66 | (along with ``resolved``) by the ``systemd-resolved`` feature. Related to that | ||
67 | (i.e., Systemd's network name resolution), an option to use ``stub-resolv.conf`` | ||
68 | was added as well. | ||
69 | |||
60 | .. _migration-5.0-recipe-changes: | 70 | .. _migration-5.0-recipe-changes: |
61 | 71 | ||
62 | Recipe changes | 72 | Recipe changes |
@@ -70,7 +80,8 @@ Recipe changes | |||
70 | Deprecated variables | 80 | Deprecated variables |
71 | ~~~~~~~~~~~~~~~~~~~~ | 81 | ~~~~~~~~~~~~~~~~~~~~ |
72 | 82 | ||
73 | The following variables have been deprecated: | 83 | - ``CVE_CHECK_IGNORE`` should be replaced with :term:`CVE_STATUS` |
84 | |||
74 | 85 | ||
75 | .. _migration-5.0-removed-variables: | 86 | .. _migration-5.0-removed-variables: |
76 | 87 | ||
@@ -79,6 +90,15 @@ Removed variables | |||
79 | 90 | ||
80 | The following variables have been removed: | 91 | The following variables have been removed: |
81 | 92 | ||
93 | - ``DEPLOY_DIR_TAR``: no longer needed since the package_tar class was removed in 4.2. | ||
94 | - ``PYTHON_PN``: Python 2 has previously been removed, leaving Python 3 as the sole | ||
95 | major version. Therefore, this abstraction to differentiate both versions is | ||
96 | no longer needed. | ||
97 | - ``oldincludedir`` | ||
98 | - ``USE_L10N``: previously deprecated, and now removed. | ||
99 | - ``CVE_SOCKET_TIMEOUT`` | ||
100 | - ``SERIAL_CONSOLES_CHECK`` - use :term:`SERIAL_CONSOLES` instead as all consoles specified in the latter are checked for their existence before a ``getty`` is started. | ||
101 | |||
82 | .. _migration-5.0-removed-recipes: | 102 | .. _migration-5.0-removed-recipes: |
83 | 103 | ||
84 | Removed recipes | 104 | Removed recipes |
@@ -86,20 +106,97 @@ Removed recipes | |||
86 | 106 | ||
87 | The following recipes have been removed in this release: | 107 | The following recipes have been removed in this release: |
88 | 108 | ||
109 | - ``libcroco``: deprecated and archived by the Gnome Project. | ||
110 | - ``liberror-perl``: unmaintained and no longer needed - moved to meta-perl. | ||
111 | - ``linux-yocto``: version 6.1 (version 6.6 provided instead). | ||
112 | - ``systemtap-uprobes``: obsolete. | ||
113 | - ``zvariant``: fails to build with newer Rust. | ||
114 | |||
89 | .. _migration-5.0-removed-classes: | 115 | .. _migration-5.0-removed-classes: |
90 | 116 | ||
91 | Removed classes | 117 | Removed classes |
92 | ~~~~~~~~~~~~~~~ | 118 | ~~~~~~~~~~~~~~~ |
93 | 119 | ||
94 | The following classes have been removed in this release: | 120 | No classes have been removed in this release. |
95 | 121 | ||
96 | .. _migration-5.0-qemu-changes: | 122 | .. _migration-5.0-qemu-changes: |
97 | 123 | ||
98 | QEMU changes | 124 | QEMU changes |
99 | ~~~~~~~~~~~~ | 125 | ~~~~~~~~~~~~ |
100 | 126 | ||
127 | In ``tune-core2``, the cpu models ``n270`` and ``core2duo`` are no longer | ||
128 | passed to QEMU, since its documentation recommends not using them with ``-cpu`` | ||
129 | option. Therefore, from now on, ``Nehalem`` model is used instead. | ||
130 | |||
131 | |||
132 | ipk packaging changes | ||
133 | ~~~~~~~~~~~~~~~~~~~~~ | ||
134 | |||
135 | ipk packaging (using ``opkg``) now uses ``zstd`` compression instead of ``xz`` | ||
136 | for better compression and performance. This does mean that ``.ipk`` packages | ||
137 | built using the 5.0 release requires Opkg built with zstd enabled --- naturally | ||
138 | this is the case in 5.0, but at least by default these packages will not be | ||
139 | usable on older systems where Opkg does not have zstd enabled at build time. | ||
140 | |||
141 | Additionally, the internal dependency solver in Opkg is now deprecated --- it | ||
142 | is still available in this release but will trigger a warning if selected. | ||
143 | The default has been the external ``libsolv`` solver for some time, but if you | ||
144 | have explicitly removed that from :term:`PACKAGECONFIG` for Opkg to | ||
145 | select the internal solver, you should plan to switch to ``libsolv`` in the | ||
146 | near future (by including ``libsolv`` your custom :term:`PACKAGECONFIG` value | ||
147 | for Opkg, or reverting to the default value). | ||
148 | |||
149 | |||
150 | motd message when using ``DISTRO = "poky"`` | ||
151 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
152 | |||
153 | The default ``poky`` :term:`DISTRO` is explicitly a *reference* distribution | ||
154 | for testing and development purposes. It enables most hardware and software | ||
155 | features so that they can be tested, but this also means that | ||
156 | from a security point of view the attack surface is very large. | ||
157 | |||
158 | We encourage anyone using the Yocto Project for production use to create | ||
159 | their own distribution and not use Poky. To encourage this behaviour | ||
160 | further, in 5.0 a warning has been added to ``/etc/motd`` when Poky is used | ||
161 | so that the developer will see it when they log in. If you are creating your | ||
162 | own distribution this message will not show up. | ||
163 | |||
164 | For information on how to create your own distribution, see | ||
165 | ":ref:`dev-manual/custom-distribution:creating your own distribution`". | ||
166 | |||
101 | .. _migration-5.0-misc-changes: | 167 | .. _migration-5.0-misc-changes: |
102 | 168 | ||
103 | Miscellaneous changes | 169 | Miscellaneous changes |
104 | ~~~~~~~~~~~~~~~~~~~~~ | 170 | ~~~~~~~~~~~~~~~~~~~~~ |
105 | 171 | ||
172 | - ``bitbake-whatchanged`` script was removed as it was broken and unmaintained. | ||
173 | |||
174 | - ``scripts/sstate-cache-management.sh`` has been replaced by | ||
175 | ``scripts/sstate-cache-management.py``, a more performant Python-based version. | ||
176 | |||
177 | - The ``bmap-tools`` recipe has been renamed to ``bmaptool``. | ||
178 | |||
179 | - ``gpgme`` has had Python binding support disabled since upstream does not | ||
180 | support Python 3.12 yet. This will be fixed in future once it is fixed upstream.) | ||
181 | |||
182 | - A warning will now be shown if the ``virtual/`` prefix is used in runtime | ||
183 | contexts (:term:`RDEPENDS` / :term:`RPROVIDES`) --- | ||
184 | See :ref:`virtual-slash <qa-check-virtual-slash>` for details. | ||
185 | |||
186 | - ``recipetool`` now prefixes the names of recipes created for Python modules | ||
187 | with ``python3-``. | ||
188 | |||
189 | - The :ref:`ref-classes-cve-check` class no longer produces a warning for | ||
190 | remote patches --- it only logs a note and does not try to fetch the patch | ||
191 | in order to scan it for issues or CVE numbers. However, CVE number | ||
192 | references in remote patch file names will now be picked up. | ||
193 | |||
194 | - The values of :term:`PE` and :term:`PR` have been dropped from | ||
195 | ``-f{file,macro,debug}-prefix-map``, in order to avoid unnecessary churn | ||
196 | in debugging symbol paths when the version is bumped. This is unlikely to | ||
197 | cause issues, but if you are paying attention to the debugging source path | ||
198 | (e.g. in recipes that need to manipulate these files during packaging) then | ||
199 | you will notice the difference. A new :term:`TARGET_DBGSRC_DIR` variable is | ||
200 | provided to make this easier. | ||
201 | |||
202 | - ``ccache`` no longer supports FORTRAN. | ||
diff --git a/documentation/migration-guides/release-4.0.rst b/documentation/migration-guides/release-4.0.rst index 685799e268..d848b3ef64 100644 --- a/documentation/migration-guides/release-4.0.rst +++ b/documentation/migration-guides/release-4.0.rst | |||
@@ -24,3 +24,4 @@ Release 4.0 (kirkstone) | |||
24 | release-notes-4.0.15 | 24 | release-notes-4.0.15 |
25 | release-notes-4.0.16 | 25 | release-notes-4.0.16 |
26 | release-notes-4.0.17 | 26 | release-notes-4.0.17 |
27 | release-notes-4.0.18 | ||
diff --git a/documentation/migration-guides/release-4.3.rst b/documentation/migration-guides/release-4.3.rst index fa5653c467..1f07d229a7 100644 --- a/documentation/migration-guides/release-4.3.rst +++ b/documentation/migration-guides/release-4.3.rst | |||
@@ -10,3 +10,4 @@ Release 4.3 (nanbield) | |||
10 | release-notes-4.3.1 | 10 | release-notes-4.3.1 |
11 | release-notes-4.3.2 | 11 | release-notes-4.3.2 |
12 | release-notes-4.3.3 | 12 | release-notes-4.3.3 |
13 | release-notes-4.3.4 | ||
diff --git a/documentation/migration-guides/release-notes-4.0.17.rst b/documentation/migration-guides/release-notes-4.0.17.rst index 1dfd10ce20..07242584b8 100644 --- a/documentation/migration-guides/release-notes-4.0.17.rst +++ b/documentation/migration-guides/release-notes-4.0.17.rst | |||
@@ -6,7 +6,7 @@ Release notes for Yocto-4.0.17 (Kirkstone) | |||
6 | Security Fixes in Yocto-4.0.17 | 6 | Security Fixes in Yocto-4.0.17 |
7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
8 | 8 | ||
9 | - bind: Fix :cve:`2023-4408`, :cve:`2023-50387`, :cve:`2023-50868`, :cve:`2023-5517` and :cve:`2023-5679` | 9 | - bind: Fix :cve:`2023-4408`, :cve:`2023-5517`, :cve:`2023-5679`, :cve:`2023-50868` and :cve:`2023-50387` |
10 | - binutils: Fix :cve:`2023-39129` and :cve:`2023-39130` | 10 | - binutils: Fix :cve:`2023-39129` and :cve:`2023-39130` |
11 | - curl: Fix :cve:`2023-46219` | 11 | - curl: Fix :cve:`2023-46219` |
12 | - curl: Ignore :cve:`2023-42915` | 12 | - curl: Ignore :cve:`2023-42915` |
@@ -18,13 +18,13 @@ Security Fixes in Yocto-4.0.17 | |||
18 | - libgit2: Fix :cve:`2024-24575` and :cve:`2024-24577` | 18 | - libgit2: Fix :cve:`2024-24575` and :cve:`2024-24577` |
19 | - libuv: fix :cve:`2024-24806` | 19 | - libuv: fix :cve:`2024-24806` |
20 | - libxml2: Fix for :cve:`2024-25062` | 20 | - libxml2: Fix for :cve:`2024-25062` |
21 | - linux-yocto/5.15: Fix :cve:`2022-36402`, :cve:`2022-40982`, :cve:`2022-47940`, :cve:`2023-1193`, :cve:`2023-1194`, :cve:`2023-20569`, :cve:`2023-20588`, :cve:`2023-25775`, :cve:`2023-31085`, :cve:`2023-32247`, :cve:`2023-32250`, :cve:`2023-32252`, :cve:`2023-32254`, :cve:`2023-32257`, :cve:`2023-32258`, :cve:`2023-34324`, :cve:`2023-35827`, :cve:`2023-3772`, :cve:`2023-38427`, :cve:`2023-38430`, :cve:`2023-38431`, :cve_mitre:`2023-3867`, :cve:`2023-39189`, :cve:`2023-39192`, :cve:`2023-39193`, :cve:`2023-39194`, :cve:`2023-39198`, :cve:`2023-40283`, :cve:`2023-4128`, :cve:`2023-4206`, :cve:`2023-4207`, :cve:`2023-4208`, :cve:`2023-4244`, :cve:`2023-4273`, :cve:`2023-42752`, :cve:`2023-42753`, :cve:`2023-42754`, :cve:`2023-42755`, :cve:`2023-4563`, :cve:`2023-4569`, :cve:`2023-45871`, :cve:`2023-4623`, :cve:`2023-46343`, :cve:`2023-46813`, :cve:`2023-46838`, :cve:`2023-46862`, :cve:`2023-4881`, :cve:`2023-4921`, :cve:`2023-51042`, :cve:`2023-5158`, :cve:`2023-51779`, :cve_mitre:`2023-52340`, :cve:`2023-52429`, :cve:`2023-52435`, :cve:`2023-52436`, :cve:`2023-52438`, :cve:`2023-52439`, :cve:`2023-52441`, :cve:`2023-52442`, :cve:`2023-52443`, :cve:`2023-52444`, :cve:`2023-52445`, :cve:`2023-52448`, :cve:`2023-52449`, :cve:`2023-52451`, :cve:`2023-52454`, :cve:`2023-52456`, :cve:`2023-52457`, :cve:`2023-52458`, :cve:`2023-52463`, :cve:`2023-52464`, :cve:`2023-5717`, :cve:`2023-6040`, :cve:`2023-6121`, :cve:`2023-6176`, :cve:`2023-6546`, :cve:`2023-6606`, :cve:`2023-6622`, :cve:`2023-6817`, :cve:`2023-6915`, :cve:`2023-6931`, :cve:`2023-6932`, :cve:`2024-0340`, :cve:`2024-0584`, :cve:`2024-0607`, :cve:`2024-0641`, :cve:`2024-0646`, :cve:`2024-1085`, :cve:`2024-1086`, :cve:`2024-1151`, :cve:`2024-22705`, :cve:`2024-23849`, :cve:`2024-23850`, :cve:`2024-23851`, :cve:`2024-24860`, :cve:`2024-26586`, :cve:`2024-26589`, :cve:`2024-26591`, :cve:`2024-26592`, :cve:`2024-26593`, :cve:`2024-26594`, :cve:`2024-26597` and :cve:`2024-26598` | 21 | - linux-yocto/5.15: Fix :cve:`2022-36402`, :cve:`2022-40982`, :cve:`2022-47940`, :cve:`2023-1193`, :cve:`2023-1194`, :cve:`2023-3772`, :cve_mitre:`2023-3867`, :cve:`2023-4128`, :cve:`2023-4206`, :cve:`2023-4207`, :cve:`2023-4208`, :cve:`2023-4244`, :cve:`2023-4273`, :cve:`2023-4563`, :cve:`2023-4569`, :cve:`2023-4623`, :cve:`2023-4881`, :cve:`2023-4921`, :cve:`2023-5158`, :cve:`2023-5717`, :cve:`2023-6040`, :cve:`2023-6121`, :cve:`2023-6176`, :cve:`2023-6546`, :cve:`2023-6606`, :cve:`2023-6622`, :cve:`2023-6817`, :cve:`2023-6915`, :cve:`2023-6931`, :cve:`2023-6932`, :cve:`2023-20569`, :cve:`2023-20588`, :cve:`2023-25775`, :cve:`2023-31085`, :cve:`2023-32247`, :cve:`2023-32250`, :cve:`2023-32252`, :cve:`2023-32254`, :cve:`2023-32257`, :cve:`2023-32258`, :cve:`2023-34324`, :cve:`2023-35827`, :cve:`2023-38427`, :cve:`2023-38430`, :cve:`2023-38431`, :cve:`2023-39189`, :cve:`2023-39192`, :cve:`2023-39193`, :cve:`2023-39194`, :cve:`2023-39198`, :cve:`2023-40283`, :cve:`2023-42752`, :cve:`2023-42753`, :cve:`2023-42754`, :cve:`2023-42755`, :cve:`2023-45871`, :cve:`2023-46343`, :cve:`2023-46813`, :cve:`2023-46838`, :cve:`2023-46862`, :cve:`2023-51042`, :cve:`2023-51779`, :cve_mitre:`2023-52340`, :cve:`2023-52429`, :cve:`2023-52435`, :cve:`2023-52436`, :cve:`2023-52438`, :cve:`2023-52439`, :cve:`2023-52441`, :cve:`2023-52442`, :cve:`2023-52443`, :cve:`2023-52444`, :cve:`2023-52445`, :cve:`2023-52448`, :cve:`2023-52449`, :cve:`2023-52451`, :cve:`2023-52454`, :cve:`2023-52456`, :cve:`2023-52457`, :cve:`2023-52458`, :cve:`2023-52463`, :cve:`2023-52464`, :cve:`2024-0340`, :cve:`2024-0584`, :cve:`2024-0607`, :cve:`2024-0641`, :cve:`2024-0646`, :cve:`2024-1085`, :cve:`2024-1086`, :cve:`2024-1151`, :cve:`2024-22705`, :cve:`2024-23849`, :cve:`2024-23850`, :cve:`2024-23851`, :cve:`2024-24860`, :cve:`2024-26586`, :cve:`2024-26589`, :cve:`2024-26591`, :cve:`2024-26592`, :cve:`2024-26593`, :cve:`2024-26594`, :cve:`2024-26597` and :cve:`2024-26598` |
22 | - linux-yocto/5.15: Ignore :cve:`2020-27418`, :cve:`2020-36766`, :cve:`2021-33630`, :cve:`2021-33631`, :cve:`2022-48619`, :cve:`2023-2430`, :cve:`2023-40791`, :cve:`2023-42756`, :cve:`2023-44466`, :cve:`2023-45862`, :cve:`2023-45863`, :cve:`2023-45898`, :cve:`2023-4610`, :cve:`2023-4732`, :cve:`2023-5090`, :cve:`2023-51043`, :cve:`2023-5178`, :cve:`2023-51780`, :cve:`2023-51781`, :cve:`2023-51782`, :cve:`2023-5197`, :cve:`2023-52433`, :cve:`2023-52440`, :cve:`2023-52446`, :cve:`2023-52450`, :cve:`2023-52453`, :cve:`2023-52455`, :cve:`2023-52459`, :cve:`2023-52460`, :cve:`2023-52461`, :cve:`2023-52462`, :cve:`2023-5345`, :cve:`2023-5633`, :cve:`2023-5972`, :cve:`2023-6111`, :cve:`2023-6200`, :cve:`2023-6531`, :cve:`2023-6679`, :cve:`2023-7192`, :cve:`2024-0193`, :cve:`2024-0443`, :cve:`2024-0562`, :cve:`2024-0582`, :cve:`2024-0639`, :cve:`2024-0775`, :cve:`2024-26581`, :cve:`2024-26582`, :cve:`2024-26590`, :cve:`2024-26596` and :cve:`2024-26599` | 22 | - linux-yocto/5.15: Ignore :cve:`2020-27418`, :cve:`2020-36766`, :cve:`2021-33630`, :cve:`2021-33631`, :cve:`2022-48619`, :cve:`2023-2430`, :cve:`2023-4610`, :cve:`2023-4732`, :cve:`2023-5090`, :cve:`2023-5178`, :cve:`2023-5197`, :cve:`2023-5345`, :cve:`2023-5633`, :cve:`2023-5972`, :cve:`2023-6111`, :cve:`2023-6200`, :cve:`2023-6531`, :cve:`2023-6679`, :cve:`2023-7192`, :cve:`2023-40791`, :cve:`2023-42756`, :cve:`2023-44466`, :cve:`2023-45862`, :cve:`2023-45863`, :cve:`2023-45898`, :cve:`2023-51043`, :cve:`2023-51780`, :cve:`2023-51781`, :cve:`2023-51782`, :cve:`2023-52433`, :cve:`2023-52440`, :cve:`2023-52446`, :cve:`2023-52450`, :cve:`2023-52453`, :cve:`2023-52455`, :cve:`2023-52459`, :cve:`2023-52460`, :cve:`2023-52461`, :cve:`2023-52462`, :cve:`2024-0193`, :cve:`2024-0443`, :cve:`2024-0562`, :cve:`2024-0582`, :cve:`2024-0639`, :cve:`2024-0775`, :cve:`2024-26581`, :cve:`2024-26582`, :cve:`2024-26590`, :cve:`2024-26596` and :cve:`2024-26599` |
23 | - linux-yocto/5.10: Fix :cve:`2023-39198`, :cve:`2023-46838`, :cve:`2023-51779`, :cve:`2023-51780`, :cve:`2023-51781`, :cve:`2023-51782`, :cve_mitre:`2023-52340`, :cve:`2023-6040`, :cve:`2023-6121`, :cve:`2023-6606`, :cve:`2023-6817`, :cve:`2023-6915`, :cve:`2023-6931`, :cve:`2023-6932`, :cve:`2024-0584` and :cve:`2024-0646` | 23 | - linux-yocto/5.10: Fix :cve:`2023-6040`, :cve:`2023-6121`, :cve:`2023-6606`, :cve:`2023-6817`, :cve:`2023-6915`, :cve:`2023-6931`, :cve:`2023-6932`, :cve:`2023-39198`, :cve:`2023-46838`, :cve:`2023-51779`, :cve:`2023-51780`, :cve:`2023-51781`, :cve:`2023-51782`, :cve_mitre:`2023-52340`, :cve:`2024-0584` and :cve:`2024-0646` |
24 | - linux-yocto/5.10: Ignore :cve:`2021-33630`, :cve:`2021-33631`, :cve:`2022-1508`, :cve:`2022-36402`, :cve:`2022-48619`, :cve:`2023-2430`, :cve:`2023-4610`, :cve:`2023-46343`, :cve:`2023-51042`, :cve:`2023-51043`, :cve:`2023-5972`, :cve:`2023-6039`, :cve:`2023-6200`, :cve:`2023-6531`, :cve:`2023-6546`, :cve:`2023-6622`, :cve:`2023-6679`, :cve:`2023-7192`, :cve:`2024-0193`, :cve:`2024-0443`, :cve:`2024-0562`, :cve:`2024-0582`, :cve:`2024-0639`, :cve:`2024-0641`, :cve:`2024-0775`, :cve:`2024-1085` and :cve:`2024-22705` | 24 | - linux-yocto/5.10: Ignore :cve:`2021-33630`, :cve:`2021-33631`, :cve:`2022-1508`, :cve:`2022-36402`, :cve:`2022-48619`, :cve:`2023-2430`, :cve:`2023-4610`, :cve:`2023-5972`, :cve:`2023-6039`, :cve:`2023-6200`, :cve:`2023-6531`, :cve:`2023-6546`, :cve:`2023-6622`, :cve:`2023-6679`, :cve:`2023-7192`, :cve:`2023-46343`, :cve:`2023-51042`, :cve:`2023-51043`, :cve:`2024-0193`, :cve:`2024-0443`, :cve:`2024-0562`, :cve:`2024-0582`, :cve:`2024-0639`, :cve:`2024-0641`, :cve:`2024-0775`, :cve:`2024-1085` and :cve:`2024-22705` |
25 | - openssl: Fix :cve:`2024-0727` | 25 | - openssl: Fix :cve:`2024-0727` |
26 | - python3-pycryptodome: Fix :cve:`2023-52323` | 26 | - python3-pycryptodome: Fix :cve:`2023-52323` |
27 | - qemu: Fix :cve:`2023-42467`, :cve:`2023-6693` and :cve:`2024-24474` | 27 | - qemu: Fix :cve:`2023-6693`, :cve:`2023-42467` and :cve:`2024-24474` |
28 | - vim: Fix :cve:`2024-22667` | 28 | - vim: Fix :cve:`2024-22667` |
29 | - xwayland: Fix :cve:`2023-6377` and :cve:`2023-6478` | 29 | - xwayland: Fix :cve:`2023-6377` and :cve:`2023-6478` |
30 | 30 | ||
diff --git a/documentation/migration-guides/release-notes-4.0.18.rst b/documentation/migration-guides/release-notes-4.0.18.rst new file mode 100644 index 0000000000..fc8cd83c02 --- /dev/null +++ b/documentation/migration-guides/release-notes-4.0.18.rst | |||
@@ -0,0 +1,191 @@ | |||
1 | .. SPDX-License-Identifier: CC-BY-SA-2.0-UK | ||
2 | |||
3 | Release notes for Yocto-4.0.18 (Kirkstone) | ||
4 | ------------------------------------------ | ||
5 | |||
6 | Security Fixes in Yocto-4.0.18 | ||
7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
8 | |||
9 | - curl: Fix :cve:`2024-2398` | ||
10 | - expat: fix :cve:`2023-52426` and :cve:`2024-28757` | ||
11 | - libssh2: fix :cve:`2023-48795` | ||
12 | - ncurses: Fix :cve:`2023-50495` | ||
13 | - nghttp2: Fix :cve:`2024-28182` and :cve:`2023-44487` | ||
14 | - openssh: Ignore :cve:`2023-51767` | ||
15 | - openssl: Fix :cve:`2024-2511` | ||
16 | - perl: Ignore :cve:`2023-47100` | ||
17 | - python3-cryptography: Fix :cve:`2024-26130` | ||
18 | - python3-urllib3: Fix :cve:`2023-45803` | ||
19 | - qemu: Fix :cve:`2023-6683` | ||
20 | - ruby: fix :cve_mitre:`2024-27281` | ||
21 | - rust: Ignore :cve:`2024-24576` | ||
22 | - tiff: Fix :cve:`2023-52356` and :cve:`2023-6277` | ||
23 | - xserver-xorg: Fix :cve:`2024-31080` and :cve:`2024-31081` | ||
24 | - xwayland: Fix :cve:`2023-6816`, :cve:`2024-0408` and :cve:`2024-0409` | ||
25 | |||
26 | |||
27 | Fixes in Yocto-4.0.18 | ||
28 | ~~~~~~~~~~~~~~~~~~~~~ | ||
29 | |||
30 | - build-appliance-image: Update to kirkstone head revision | ||
31 | - common-licenses: Backport missing license | ||
32 | - contributor-guide: add notes for tests | ||
33 | - contributor-guide: be more specific about meta-* trees | ||
34 | - cups: fix typo in :cve:`2023-32360` backport patch | ||
35 | - cve-update-nvd2-native: Add an age threshold for incremental update | ||
36 | - cve-update-nvd2-native: Fix CVE configuration update | ||
37 | - cve-update-nvd2-native: Fix typo in comment | ||
38 | - cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition | ||
39 | - cve-update-nvd2-native: Remove rejected CVE from database | ||
40 | - cve-update-nvd2-native: nvd_request_next: Improve comment | ||
41 | - dev-manual: improve descriptions of 'bitbake -S printdiff' | ||
42 | - dev-manual: packages: fix capitalization | ||
43 | - docs: conf.py: properly escape backslashes for latex_elements | ||
44 | - gcc: Backport sanitizer fix for 32-bit ALSR | ||
45 | - glibc: Fix subscript typos for get_nscd_addresses | ||
46 | - kernel-dev: join mkdir commands with -p | ||
47 | - linux-firmware: Upgrade to 20240220 | ||
48 | - manuals: add initial sphinx-lint support | ||
49 | - manuals: add initial stylechecks with Vale | ||
50 | - manuals: document VIRTUAL-RUNTIME variables | ||
51 | - manuals: fix duplicate "stylecheck" target | ||
52 | - manuals: fix incorrect double backticks | ||
53 | - manuals: fix trailing spaces | ||
54 | - manuals: refer to new yocto-patches mailing list wherever appropriate | ||
55 | - manuals: remove tab characters | ||
56 | - manuals: replace hyphens with em dashes | ||
57 | - manuals: use "manual page(s)" | ||
58 | - migration-guides: add release notes for 4.0.17 | ||
59 | - poky.conf: bump version for 4.0.18 | ||
60 | - profile-manual: usage.rst: fix reference to bug report | ||
61 | - profile-manual: usage.rst: formatting fixes | ||
62 | - profile-manual: usage.rst: further style improvements | ||
63 | - python3-urllib3: Upgrade to v1.26.18 | ||
64 | - ref-manual: add documentation of the variable :term:`SPDX_NAMESPACE_PREFIX` | ||
65 | - ref-manual: tasks: do_cleanall: recommend using '-f' instead | ||
66 | - ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate | ||
67 | - ref-manual: variables: adding multiple groups in :term:`GROUPADD_PARAM` | ||
68 | - ref-manual: variables: correct sdk installation default path | ||
69 | - stress-ng: avoid calling sync during do_compile | ||
70 | - systemd: Fix vlan qos mapping | ||
71 | - tcl: Add a way to skip ptests | ||
72 | - tcl: skip async and event tests in run-ptest | ||
73 | - tcl: skip timing-dependent tests in run-ptest | ||
74 | - valgrind: skip intermittently failing ptest | ||
75 | - wireless-regdb: Upgrade to 2024.01.23 | ||
76 | - yocto-uninative: Update to 4.4 for glibc 2.39 | ||
77 | |||
78 | |||
79 | Known Issues in Yocto-4.0.18 | ||
80 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
81 | |||
82 | - N/A | ||
83 | |||
84 | |||
85 | Contributors to Yocto-4.0.18 | ||
86 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
87 | |||
88 | - Alex Kiernan | ||
89 | - Alex Stewart | ||
90 | - Alexander Kanavin | ||
91 | - BELOUARGA Mohamed | ||
92 | - Claus Stovgaard | ||
93 | - Colin McAllister | ||
94 | - Geoff Parker | ||
95 | - Haitao Liu | ||
96 | - Harish Sadineni | ||
97 | - Johan Bezem | ||
98 | - Jonathan GUILLOT | ||
99 | - Jörg Sommer | ||
100 | - Khem Raj | ||
101 | - Lee Chee Yang | ||
102 | - Luca Ceresoli | ||
103 | - Martin Jansa | ||
104 | - Meenali Gupta | ||
105 | - Michael Halstead | ||
106 | - Michael Opdenacker | ||
107 | - Peter Marko | ||
108 | - Quentin Schulz | ||
109 | - Ross Burton | ||
110 | - Sana Kazi | ||
111 | - Simone Weiß | ||
112 | - Soumya Sambu | ||
113 | - Steve Sakoman | ||
114 | - Tan Wen Yan | ||
115 | - Vijay Anusuri | ||
116 | - Wang Mingyu | ||
117 | - Yoann Congal | ||
118 | - Yogita Urade | ||
119 | - Zahir Hussain | ||
120 | |||
121 | |||
122 | Repositories / Downloads for Yocto-4.0.18 | ||
123 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
124 | |||
125 | poky | ||
126 | |||
127 | - Repository Location: :yocto_git:`/poky` | ||
128 | - Branch: :yocto_git:`kirkstone </poky/log/?h=kirkstone>` | ||
129 | - Tag: :yocto_git:`yocto-4.0.18 </poky/log/?h=yocto-4.0.18>` | ||
130 | - Git Revision: :yocto_git:`31751bba1c789f15f574773a659b8017d7bcf440 </poky/commit/?id=31751bba1c789f15f574773a659b8017d7bcf440>` | ||
131 | - Release Artefact: poky-31751bba1c789f15f574773a659b8017d7bcf440 | ||
132 | - sha: 72d5aa65c3c37766ebc24b212740272c1d52342468548f9c070241d3522ad2ca | ||
133 | - Download Locations: | ||
134 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.18/poky-31751bba1c789f15f574773a659b8017d7bcf440.tar.bz2 | ||
135 | http://mirrors.kernel.org/yocto/yocto/yocto-4.0.18/poky-31751bba1c789f15f574773a659b8017d7bcf440.tar.bz2 | ||
136 | |||
137 | openembedded-core | ||
138 | |||
139 | - Repository Location: :oe_git:`/openembedded-core` | ||
140 | - Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>` | ||
141 | - Tag: :oe_git:`yocto-4.0.18 </openembedded-core/log/?h=yocto-4.0.18>` | ||
142 | - Git Revision: :oe_git:`b7182571242dc4e23e5250a449d90348e62a6abc </openembedded-core/commit/?id=b7182571242dc4e23e5250a449d90348e62a6abc>` | ||
143 | - Release Artefact: oecore-b7182571242dc4e23e5250a449d90348e62a6abc | ||
144 | - sha: 6f257e50c10ebae673dcf61a833b3270db6d22781f02f6794a370aac839f1020 | ||
145 | - Download Locations: | ||
146 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.18/oecore-b7182571242dc4e23e5250a449d90348e62a6abc.tar.bz2 | ||
147 | http://mirrors.kernel.org/yocto/yocto/yocto-4.0.18/oecore-b7182571242dc4e23e5250a449d90348e62a6abc.tar.bz2 | ||
148 | |||
149 | meta-mingw | ||
150 | |||
151 | - Repository Location: :yocto_git:`/meta-mingw` | ||
152 | - Branch: :yocto_git:`kirkstone </meta-mingw/log/?h=kirkstone>` | ||
153 | - Tag: :yocto_git:`yocto-4.0.18 </meta-mingw/log/?h=yocto-4.0.18>` | ||
154 | - Git Revision: :yocto_git:`f6b38ce3c90e1600d41c2ebb41e152936a0357d7 </meta-mingw/commit/?id=f6b38ce3c90e1600d41c2ebb41e152936a0357d7>` | ||
155 | - Release Artefact: meta-mingw-f6b38ce3c90e1600d41c2ebb41e152936a0357d7 | ||
156 | - sha: 7d57167c19077f4ab95623d55a24c2267a3a3fb5ed83688659b4c03586373b25 | ||
157 | - Download Locations: | ||
158 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.18/meta-mingw-f6b38ce3c90e1600d41c2ebb41e152936a0357d7.tar.bz2 | ||
159 | http://mirrors.kernel.org/yocto/yocto/yocto-4.0.18/meta-mingw-f6b38ce3c90e1600d41c2ebb41e152936a0357d7.tar.bz2 | ||
160 | |||
161 | meta-gplv2 | ||
162 | |||
163 | - Repository Location: :yocto_git:`/meta-gplv2` | ||
164 | - Branch: :yocto_git:`kirkstone </meta-gplv2/log/?h=kirkstone>` | ||
165 | - Tag: :yocto_git:`yocto-4.0.18 </meta-gplv2/log/?h=yocto-4.0.18>` | ||
166 | - Git Revision: :yocto_git:`d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a </meta-gplv2/commit/?id=d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a>` | ||
167 | - Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a | ||
168 | - sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d | ||
169 | - Download Locations: | ||
170 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.18/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2 | ||
171 | http://mirrors.kernel.org/yocto/yocto/yocto-4.0.18/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2 | ||
172 | |||
173 | bitbake | ||
174 | |||
175 | - Repository Location: :oe_git:`/bitbake` | ||
176 | - Branch: :oe_git:`2.0 </bitbake/log/?h=2.0>` | ||
177 | - Tag: :oe_git:`yocto-4.0.18 </bitbake/log/?h=yocto-4.0.18>` | ||
178 | - Git Revision: :oe_git:`40fd5f4eef7460ca67f32cfce8e229e67e1ff607 </bitbake/commit/?id=40fd5f4eef7460ca67f32cfce8e229e67e1ff607>` | ||
179 | - Release Artefact: bitbake-40fd5f4eef7460ca67f32cfce8e229e67e1ff607 | ||
180 | - sha: 5d20a0e4c5d0fce44bd84778168714a261a30a4b83f67c88df3b8a7e7115e444 | ||
181 | - Download Locations: | ||
182 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.18/bitbake-40fd5f4eef7460ca67f32cfce8e229e67e1ff607.tar.bz2 | ||
183 | http://mirrors.kernel.org/yocto/yocto/yocto-4.0.18/bitbake-40fd5f4eef7460ca67f32cfce8e229e67e1ff607.tar.bz2 | ||
184 | |||
185 | yocto-docs | ||
186 | |||
187 | - Repository Location: :yocto_git:`/yocto-docs` | ||
188 | - Branch: :yocto_git:`kirkstone </yocto-docs/log/?h=kirkstone>` | ||
189 | - Tag: :yocto_git:`yocto-4.0.18 </yocto-docs/log/?h=yocto-4.0.18>` | ||
190 | - Git Revision: :yocto_git:`fd1423141e7458ba557db465c171b0b4e9063987 </yocto-docs/commit/?id=fd1423141e7458ba557db465c171b0b4e9063987>` | ||
191 | |||
diff --git a/documentation/migration-guides/release-notes-4.0.4.rst b/documentation/migration-guides/release-notes-4.0.4.rst index 611109a77e..1d6e525bbc 100644 --- a/documentation/migration-guides/release-notes-4.0.4.rst +++ b/documentation/migration-guides/release-notes-4.0.4.rst | |||
@@ -247,7 +247,7 @@ poky | |||
247 | 247 | ||
248 | openembedded-core | 248 | openembedded-core |
249 | 249 | ||
250 | - Repository Location: oe_git:`/openembedded-core` | 250 | - Repository Location: :oe_git:`/openembedded-core` |
251 | - Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>` | 251 | - Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>` |
252 | - Tag: :oe_git:`yocto-4.0.4 </openembedded-core/log/?h=yocto-4.0.4>` | 252 | - Tag: :oe_git:`yocto-4.0.4 </openembedded-core/log/?h=yocto-4.0.4>` |
253 | - Git Revision: :oe_git:`f7766da462905ec67bf549d46b8017be36cd5b2a </openembedded-core/commit/?id=f7766da462905ec67bf549d46b8017be36cd5b2a>` | 253 | - Git Revision: :oe_git:`f7766da462905ec67bf549d46b8017be36cd5b2a </openembedded-core/commit/?id=f7766da462905ec67bf549d46b8017be36cd5b2a>` |
diff --git a/documentation/migration-guides/release-notes-4.0.5.rst b/documentation/migration-guides/release-notes-4.0.5.rst index 172b8b800d..cdfe85b750 100644 --- a/documentation/migration-guides/release-notes-4.0.5.rst +++ b/documentation/migration-guides/release-notes-4.0.5.rst | |||
@@ -83,7 +83,7 @@ Fixes in Yocto-4.0.5 | |||
83 | Known Issues in Yocto-4.0.5 | 83 | Known Issues in Yocto-4.0.5 |
84 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 84 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
85 | 85 | ||
86 | - There are recent CVEs in key components such as openssl. They are not included in this release as it was built before the issues were known and fixes were available but these are now available on the kirkstone branch. | 86 | - There are recent CVEs in key components such as openssl. They are not included in this release as it was built before the issues were known and fixes were available but these are now available on the kirkstone branch. |
87 | 87 | ||
88 | 88 | ||
89 | Contributors to Yocto-4.0.5 | 89 | Contributors to Yocto-4.0.5 |
diff --git a/documentation/migration-guides/release-notes-4.0.rst b/documentation/migration-guides/release-notes-4.0.rst index 6eb5f807de..a5d66c0410 100644 --- a/documentation/migration-guides/release-notes-4.0.rst +++ b/documentation/migration-guides/release-notes-4.0.rst | |||
@@ -38,7 +38,7 @@ New Features / Enhancements in 4.0 | |||
38 | 38 | ||
39 | - Inclusive language adjustments to some variable names - see the | 39 | - Inclusive language adjustments to some variable names - see the |
40 | :ref:`4.0 migration guide <migration-4.0-inclusive-language>` for details. | 40 | :ref:`4.0 migration guide <migration-4.0-inclusive-language>` for details. |
41 | 41 | ||
42 | - New recipes: | 42 | - New recipes: |
43 | 43 | ||
44 | - ``buildtools-docs-tarball`` | 44 | - ``buildtools-docs-tarball`` |
@@ -114,7 +114,7 @@ New Features / Enhancements in 4.0 | |||
114 | - BitBake enhancements: | 114 | - BitBake enhancements: |
115 | 115 | ||
116 | - Fetcher enhancements: | 116 | - Fetcher enhancements: |
117 | 117 | ||
118 | - New :ref:`bitbake-user-manual/bitbake-user-manual-fetching:crate fetcher (\`\`crate://\`\`)` for Rust packages | 118 | - New :ref:`bitbake-user-manual/bitbake-user-manual-fetching:crate fetcher (\`\`crate://\`\`)` for Rust packages |
119 | - Added striplevel support to unpack | 119 | - Added striplevel support to unpack |
120 | - git: Add a warning asking users to set a branch in git urls | 120 | - git: Add a warning asking users to set a branch in git urls |
@@ -127,7 +127,7 @@ New Features / Enhancements in 4.0 | |||
127 | - ssh: now supports checkstatus, allows : in URLs (both required for use with sstate) and no longer requires username | 127 | - ssh: now supports checkstatus, allows : in URLs (both required for use with sstate) and no longer requires username |
128 | - wget: add redirectauth parameter | 128 | - wget: add redirectauth parameter |
129 | - wget: add 30s timeout for checkstatus calls | 129 | - wget: add 30s timeout for checkstatus calls |
130 | 130 | ||
131 | - Show warnings for append/prepend/remove operators combined with +=/.= | 131 | - Show warnings for append/prepend/remove operators combined with +=/.= |
132 | - Add bb.warnonce() and bb.erroronce() log methods | 132 | - Add bb.warnonce() and bb.erroronce() log methods |
133 | - Improved setscene task display | 133 | - Improved setscene task display |
@@ -140,7 +140,7 @@ New Features / Enhancements in 4.0 | |||
140 | - Architecture-specific enhancements: | 140 | - Architecture-specific enhancements: |
141 | 141 | ||
142 | - ARM: | 142 | - ARM: |
143 | 143 | ||
144 | - tune-cortexa72: Enable the crc extension by default for cortexa72 | 144 | - tune-cortexa72: Enable the crc extension by default for cortexa72 |
145 | - qemuarm64: Add tiny ktype to qemuarm64 bsp | 145 | - qemuarm64: Add tiny ktype to qemuarm64 bsp |
146 | - armv9a/tune: Add the support for the Neoverse N2 core | 146 | - armv9a/tune: Add the support for the Neoverse N2 core |
@@ -163,7 +163,7 @@ New Features / Enhancements in 4.0 | |||
163 | - linux-yocto-dev: add qemuriscv32 | 163 | - linux-yocto-dev: add qemuriscv32 |
164 | - packagegroup-core-tools-profile: Enable systemtap for riscv64 | 164 | - packagegroup-core-tools-profile: Enable systemtap for riscv64 |
165 | - qemuriscv: Use virtio-tablet-pci for mouse | 165 | - qemuriscv: Use virtio-tablet-pci for mouse |
166 | 166 | ||
167 | - x86: | 167 | - x86: |
168 | 168 | ||
169 | - kernel-yocto: conditionally enable stack protection checking on x86-64 | 169 | - kernel-yocto: conditionally enable stack protection checking on x86-64 |
@@ -199,7 +199,7 @@ New Features / Enhancements in 4.0 | |||
199 | - yocto-check-layer: improved README checks | 199 | - yocto-check-layer: improved README checks |
200 | - cve-check: add json output format | 200 | - cve-check: add json output format |
201 | - cve-check: add coverage statistics on recipes with/without CVEs | 201 | - cve-check: add coverage statistics on recipes with/without CVEs |
202 | - Added mirrors for kernel sources and uninative binaries on kernel.org | 202 | - Added mirrors for kernel sources and uninative binaries on kernel.org |
203 | - glibc and binutils recipes now use shallow mirror tarballs for faster fetching | 203 | - glibc and binutils recipes now use shallow mirror tarballs for faster fetching |
204 | - When patching fails, show more information on the fatal error | 204 | - When patching fails, show more information on the fatal error |
205 | 205 | ||
@@ -234,7 +234,7 @@ New Features / Enhancements in 4.0 | |||
234 | - Detect more known licenses in Python code | 234 | - Detect more known licenses in Python code |
235 | - Move license md5sums data into CSV files | 235 | - Move license md5sums data into CSV files |
236 | - npm: Use README as license fallback | 236 | - npm: Use README as license fallback |
237 | 237 | ||
238 | - SDK-related enhancements: | 238 | - SDK-related enhancements: |
239 | 239 | ||
240 | - Extended recipes to :ref:`ref-classes-nativesdk`: ``cargo``, | 240 | - Extended recipes to :ref:`ref-classes-nativesdk`: ``cargo``, |
@@ -244,7 +244,7 @@ New Features / Enhancements in 4.0 | |||
244 | - Support creating per-toolchain cmake file in SDK | 244 | - Support creating per-toolchain cmake file in SDK |
245 | 245 | ||
246 | - Rust enhancements: | 246 | - Rust enhancements: |
247 | 247 | ||
248 | - New python_setuptools3_rust class to enable building python extensions in Rust | 248 | - New python_setuptools3_rust class to enable building python extensions in Rust |
249 | - classes/meson: Add optional rust definitions | 249 | - classes/meson: Add optional rust definitions |
250 | 250 | ||
diff --git a/documentation/migration-guides/release-notes-4.2.rst b/documentation/migration-guides/release-notes-4.2.rst index 653602f152..30049b89f6 100644 --- a/documentation/migration-guides/release-notes-4.2.rst +++ b/documentation/migration-guides/release-notes-4.2.rst | |||
@@ -35,7 +35,7 @@ New Features / Enhancements in 4.2 | |||
35 | 35 | ||
36 | - BitBake's UI will now ping the server regularly to ensure | 36 | - BitBake's UI will now ping the server regularly to ensure |
37 | it is still alive. | 37 | it is still alive. |
38 | 38 | ||
39 | - New variables: | 39 | - New variables: |
40 | 40 | ||
41 | - :term:`VOLATILE_TMP_DIR` allows to specify | 41 | - :term:`VOLATILE_TMP_DIR` allows to specify |
@@ -288,7 +288,7 @@ New Features / Enhancements in 4.2 | |||
288 | BitBake manual. All variables should be easy to access through the Yocto | 288 | BitBake manual. All variables should be easy to access through the Yocto |
289 | Manual variable index. | 289 | Manual variable index. |
290 | - Expanded the description of the :term:`BB_NUMBER_THREADS` variable. | 290 | - Expanded the description of the :term:`BB_NUMBER_THREADS` variable. |
291 | 291 | ||
292 | - Miscellaneous changes: | 292 | - Miscellaneous changes: |
293 | 293 | ||
294 | - Supporting 64 bit dates on 32 bit platforms: several packages have been | 294 | - Supporting 64 bit dates on 32 bit platforms: several packages have been |
diff --git a/documentation/migration-guides/release-notes-4.3.4.rst b/documentation/migration-guides/release-notes-4.3.4.rst new file mode 100644 index 0000000000..4c9e67f2cb --- /dev/null +++ b/documentation/migration-guides/release-notes-4.3.4.rst | |||
@@ -0,0 +1,206 @@ | |||
1 | .. SPDX-License-Identifier: CC-BY-SA-2.0-UK | ||
2 | |||
3 | Release notes for Yocto-4.3.4 (Nanbield) | ||
4 | ---------------------------------------- | ||
5 | |||
6 | Security Fixes in Yocto-4.3.4 | ||
7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
8 | |||
9 | - bind: Fix :cve:`2023-4408`, :cve:`2023-5517`, :cve:`2023-5679` and :cve:`2023-50387` | ||
10 | - gcc: Update :term:`CVE_STATUS` for :cve:`2023-4039` as fixed | ||
11 | - glibc: Fix :cve:`2023-6246`, :cve:`2023-6779` and :cve:`2023-6780` | ||
12 | - gnutls: Fix :cve:`2024-0553` and :cve:`2024-0567` | ||
13 | - gstreamer: Fix :cve_mitre:`2024-0444` | ||
14 | - libssh2: fix :cve:`2023-48795` | ||
15 | - libxml2: Fix :cve:`2024-25062` | ||
16 | - linux-yocto/6.1: Fix :cve:`2023-6610`, :cve:`2023-6915`, :cve:`2023-46838`, :cve:`2023-50431`, :cve:`2024-1085`, :cve:`2024-1086` and :cve:`2024-23849` | ||
17 | - linux-yocto/6.1: Ignore :cve:`2021-33630`, :cve:`2021-33631`, :cve:`2022-36402`, :cve:`2023-5717`, :cve:`2023-6200`, :cve:`2023-35827`, :cve:`2023-40791`, :cve:`2023-46343`, :cve:`2023-46813`, :cve:`2023-46862`, :cve:`2023-51042`, :cve:`2023-51043`, :cve_mitre:`2023-52340`, :cve:`2024-0562`, :cve:`2024-0565`, :cve:`2024-0582`, :cve:`2024-0584`, :cve:`2024-0607`, :cve:`2024-0639`, :cve:`2024-0641`, :cve:`2024-0646`, :cve:`2024-0775` and :cve:`2024-22705` | ||
18 | - openssl: fix :cve:`2024-0727` | ||
19 | - python3-jinja2: Fix :cve:`2024-22195` | ||
20 | - tiff: Fix :cve:`2023-6228`, :cve:`2023-52355` and :cve:`2023-52356` | ||
21 | - vim: Fix :cve:`2024-22667` | ||
22 | - wpa-supplicant: Fix :cve:`2023-52160` | ||
23 | - xserver-xorg: Fix :cve:`2023-6377`, :cve:`2023-6478`, :cve:`2023-6816`, :cve:`2024-0229`, :cve:`2024-0408`, :cve:`2024-0409`, :cve:`2024-21885` and :cve:`2024-21886` | ||
24 | - xwayland: Fix :cve:`2023-6816`, :cve:`2024-0408` and :cve:`2024-0409` | ||
25 | - zlib: Ignore :cve:`2023-6992` | ||
26 | |||
27 | |||
28 | Fixes in Yocto-4.3.4 | ||
29 | ~~~~~~~~~~~~~~~~~~~~ | ||
30 | |||
31 | - allarch: Fix allarch corner case | ||
32 | - at-spi2-core: Upgrade to 2.50.1 | ||
33 | - bind: Upgrade to 9.18.24 | ||
34 | - build-appliance-image: Update to nanbield head revision | ||
35 | - contributor-guide: add notes for tests | ||
36 | - contributor-guide: be more specific about meta-* trees | ||
37 | - core-image-ptest: Increase disk size to 1.5G for strace ptest image | ||
38 | - cpio: Upgrade to 2.15 | ||
39 | - curl: improve run-ptest | ||
40 | - curl: increase test timeouts | ||
41 | - cve-check: Log if :term:`CVE_STATUS` set but not reported for component | ||
42 | - cve-update-nvd2-native: Add an age threshold for incremental update | ||
43 | - cve-update-nvd2-native: Fix CVE configuration update | ||
44 | - cve-update-nvd2-native: Fix typo in comment | ||
45 | - cve-update-nvd2-native: Remove duplicated CVE_CHECK_DB_FILE definition | ||
46 | - cve-update-nvd2-native: Remove rejected CVE from database | ||
47 | - cve-update-nvd2-native: nvd_request_next: Improve comment | ||
48 | - cve_check: cleanup logging | ||
49 | - cve_check: handle :term:`CVE_STATUS` being set to the empty string | ||
50 | - dev-manual: Rephrase spdx creation | ||
51 | - dev-manual: improve descriptions of 'bitbake -S printdiff' | ||
52 | - dev-manual: packages: clarify shared :term:`PR` service constraint | ||
53 | - dev-manual: packages: fix capitalization | ||
54 | - dev-manual: packages: need enough free space | ||
55 | - docs: add initial stylechecks with Vale | ||
56 | - docs: correct sdk installation default path | ||
57 | - docs: document VIRTUAL-RUNTIME variables | ||
58 | - docs: suppress excess use of "following" word | ||
59 | - docs: use "manual page(s)" | ||
60 | - docs: Makefile: remove releases.rst in "make clean" | ||
61 | - externalsrc: fix task dependency for do_populate_lic | ||
62 | - glibc: Remove duplicate :term:`CVE_STATUS` for :cve:`2023-4527` | ||
63 | - glibc: stable 2.38 branch updates (2.38+gitd37c2b20a4) | ||
64 | - gnutls: Upgrade to 3.8.3 | ||
65 | - gstreamer1.0: skip a test that is known to be flaky | ||
66 | - gstreamer: Upgrade to 1.22.9 | ||
67 | - gtk: Set :term:`CVE_PRODUCT` | ||
68 | - kernel.bbclass: Set pkg-config variables for building modules | ||
69 | - libxml2: Upgrade to 2.11.7 | ||
70 | - linux-firmware: Upgrade to 20240220 | ||
71 | - linux-yocto/6.1: update to v6.1.78 | ||
72 | - mdadm: Disable ptests | ||
73 | - migration-guides: add release notes for 4.3.3 | ||
74 | - migration-guides: add release notes for 4.0.17 | ||
75 | - migration-guides: fix release notes for 4.3.3 linux-yocto/6.1 CVE entries | ||
76 | - multilib_global.bbclass: fix parsing error with no kernel module split | ||
77 | - openssl: fix crash on aarch64 if BTI is enabled but no Crypto instructions | ||
78 | - openssl: Upgrade to 3.1.5 | ||
79 | - overlayfs: add missing closing parenthesis in selftest | ||
80 | - poky.conf: bump version for 4.3.4 release | ||
81 | - profile-manual: usage.rst: fix reference to bug report | ||
82 | - profile-manual: usage.rst: formatting fixes | ||
83 | - profile-manual: usage.rst: further style improvements | ||
84 | - pseudo: Update to pull in gcc14 fix and missing statvfs64 intercept | ||
85 | - python3-jinja2: Upgrade to 3.1.3 | ||
86 | - ref-manual: release-process: grammar fix | ||
87 | - ref-manual: system-requirements: update packages to build docs | ||
88 | - ref-manual: tasks: do_cleanall: recommend using '-f' instead | ||
89 | - ref-manual: tasks: do_cleansstate: recommend using '-f' instead for a shared sstate | ||
90 | - ref-manual: variables: adding multiple groups in :term:`GROUPADD_PARAM` | ||
91 | - ref-manual: variables: add documentation of the variable :term:`SPDX_NAMESPACE_PREFIX` | ||
92 | - reproducible: Fix race with externalsrc/devtool over lockfile | ||
93 | - sdk-manual: extensible: correctly describe separate build-sysroots tasks in direct sdk workflows | ||
94 | - tzdata : Upgrade to 2024a | ||
95 | - udev-extraconf: fix unmount directories containing octal-escaped chars | ||
96 | - vim: Upgrade to v9.0.2190 | ||
97 | - wireless-regdb: Upgrade to 2024.01.23 | ||
98 | - xserver-xorg: Upgrade to 21.1.11 | ||
99 | - xwayland: Upgrade to 23.2.4 | ||
100 | - yocto-uninative: Update to 4.4 for glibc 2.39 | ||
101 | |||
102 | |||
103 | Known Issues in Yocto-4.3.4 | ||
104 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
105 | |||
106 | - N/A | ||
107 | |||
108 | |||
109 | Contributors to Yocto-4.3.4 | ||
110 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
111 | |||
112 | - Alex Kiernan | ||
113 | - Alexander Kanavin | ||
114 | - Alexander Sverdlin | ||
115 | - Baruch Siach | ||
116 | - BELOUARGA Mohamed | ||
117 | - Benjamin Bara | ||
118 | - Bruce Ashfield | ||
119 | - Chen Qi | ||
120 | - Claus Stovgaard | ||
121 | - Dhairya Nagodra | ||
122 | - Geoff Parker | ||
123 | - Johan Bezem | ||
124 | - Jonathan GUILLOT | ||
125 | - Julien Stephan | ||
126 | - Kai Kang | ||
127 | - Khem Raj | ||
128 | - Lee Chee Yang | ||
129 | - Luca Ceresoli | ||
130 | - Martin Jansa | ||
131 | - Michael Halstead | ||
132 | - Michael Opdenacker | ||
133 | - Munehisa Kamata | ||
134 | - Pavel Zhukov | ||
135 | - Peter Marko | ||
136 | - Priyal Doshi | ||
137 | - Richard Purdie | ||
138 | - Robert Joslyn | ||
139 | - Ross Burton | ||
140 | - Simone Weiß | ||
141 | - Soumya Sambu | ||
142 | - Steve Sakoman | ||
143 | - Tim Orling | ||
144 | - Wang Mingyu | ||
145 | - Yoann Congal | ||
146 | - Yogita Urade | ||
147 | |||
148 | |||
149 | Repositories / Downloads for Yocto-4.3.4 | ||
150 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
151 | |||
152 | poky | ||
153 | |||
154 | - Repository Location: :yocto_git:`/poky` | ||
155 | - Branch: :yocto_git:`nanbield </poky/log/?h=nanbield>` | ||
156 | - Tag: :yocto_git:`yocto-4.3.4 </poky/log/?h=yocto-4.3.4>` | ||
157 | - Git Revision: :yocto_git:`7b8aa378d069ee31373f22caba3bd7fc7863f447 </poky/commit/?id=7b8aa378d069ee31373f22caba3bd7fc7863f447>` | ||
158 | - Release Artefact: poky-7b8aa378d069ee31373f22caba3bd7fc7863f447 | ||
159 | - sha: 0cb14125f215cc9691cff43982e2c540a5b6018df4ed25c10933135b5bf21d0f | ||
160 | - Download Locations: | ||
161 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.3.4/poky-7b8aa378d069ee31373f22caba3bd7fc7863f447.tar.bz2 | ||
162 | http://mirrors.kernel.org/yocto/yocto/yocto-4.3.4/poky-7b8aa378d069ee31373f22caba3bd7fc7863f447.tar.bz2 | ||
163 | |||
164 | openembedded-core | ||
165 | |||
166 | - Repository Location: :oe_git:`/openembedded-core` | ||
167 | - Branch: :oe_git:`nanbield </openembedded-core/log/?h=nanbield>` | ||
168 | - Tag: :oe_git:`yocto-4.3.4 </openembedded-core/log/?h=yocto-4.3.4>` | ||
169 | - Git Revision: :oe_git:`d0e68072d138ccc1fb5957fdc46a91871eb6a3e1 </openembedded-core/commit/?id=d0e68072d138ccc1fb5957fdc46a91871eb6a3e1>` | ||
170 | - Release Artefact: oecore-d0e68072d138ccc1fb5957fdc46a91871eb6a3e1 | ||
171 | - sha: d311fe22ff296c466f9bea1cd26343baee5630bc37f3dda42f2d9d8cc99e3add | ||
172 | - Download Locations: | ||
173 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.3.4/oecore-d0e68072d138ccc1fb5957fdc46a91871eb6a3e1.tar.bz2 | ||
174 | http://mirrors.kernel.org/yocto/yocto/yocto-4.3.4/oecore-d0e68072d138ccc1fb5957fdc46a91871eb6a3e1.tar.bz2 | ||
175 | |||
176 | meta-mingw | ||
177 | |||
178 | - Repository Location: :yocto_git:`/meta-mingw` | ||
179 | - Branch: :yocto_git:`nanbield </meta-mingw/log/?h=nanbield>` | ||
180 | - Tag: :yocto_git:`yocto-4.3.4 </meta-mingw/log/?h=yocto-4.3.4>` | ||
181 | - Git Revision: :yocto_git:`49617a253e09baabbf0355bc736122e9549c8ab2 </meta-mingw/commit/?id=49617a253e09baabbf0355bc736122e9549c8ab2>` | ||
182 | - Release Artefact: meta-mingw-49617a253e09baabbf0355bc736122e9549c8ab2 | ||
183 | - sha: 2225115b73589cdbf1e491115221035c6a61679a92a93b2a3cf761ff87bf4ecc | ||
184 | - Download Locations: | ||
185 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.3.4/meta-mingw-49617a253e09baabbf0355bc736122e9549c8ab2.tar.bz2 | ||
186 | http://mirrors.kernel.org/yocto/yocto/yocto-4.3.4/meta-mingw-49617a253e09baabbf0355bc736122e9549c8ab2.tar.bz2 | ||
187 | |||
188 | bitbake | ||
189 | |||
190 | - Repository Location: :oe_git:`/bitbake` | ||
191 | - Branch: :oe_git:`2.6 </bitbake/log/?h=2.6>` | ||
192 | - Tag: :oe_git:`yocto-4.3.4 </bitbake/log/?h=yocto-4.3.4>` | ||
193 | - Git Revision: :oe_git:`380a9ac97de5774378ded5e37d40b79b96761a0c </bitbake/commit/?id=380a9ac97de5774378ded5e37d40b79b96761a0c>` | ||
194 | - Release Artefact: bitbake-380a9ac97de5774378ded5e37d40b79b96761a0c | ||
195 | - sha: 78f579b9d29e72d09b6fb10ac62aa925104335e92d2afb3155bc9ab1994e36c1 | ||
196 | - Download Locations: | ||
197 | http://downloads.yoctoproject.org/releases/yocto/yocto-4.3.4/bitbake-380a9ac97de5774378ded5e37d40b79b96761a0c.tar.bz2 | ||
198 | http://mirrors.kernel.org/yocto/yocto/yocto-4.3.4/bitbake-380a9ac97de5774378ded5e37d40b79b96761a0c.tar.bz2 | ||
199 | |||
200 | yocto-docs | ||
201 | |||
202 | - Repository Location: :yocto_git:`/yocto-docs` | ||
203 | - Branch: :yocto_git:`nanbield </yocto-docs/log/?h=nanbield>` | ||
204 | - Tag: :yocto_git:`yocto-4.3.4 </yocto-docs/log/?h=yocto-4.3.4>` | ||
205 | - Git Revision: :yocto_git:`05d08b0bbaef760157c8d35a78d7405bc5ffce55 </yocto-docs/commit/?id=05d08b0bbaef760157c8d35a78d7405bc5ffce55>` | ||
206 | |||
diff --git a/documentation/migration-guides/release-notes-5.0.rst b/documentation/migration-guides/release-notes-5.0.rst index e5cdd87d1d..800ba20a27 100644 --- a/documentation/migration-guides/release-notes-5.0.rst +++ b/documentation/migration-guides/release-notes-5.0.rst | |||
@@ -6,61 +6,988 @@ Release notes for 5.0 (scarthgap) | |||
6 | New Features / Enhancements in 5.0 | 6 | New Features / Enhancements in 5.0 |
7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 7 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
8 | 8 | ||
9 | - Linux kernel 6.6, gcc 13.2, glibc 2.39, LLVM 18.1, and over XXX other recipe upgrades | 9 | - Linux kernel 6.6, gcc 13.2, glibc 2.39, LLVM 18.1, and over 300 other recipe upgrades |
10 | 10 | ||
11 | - New variables: | 11 | - New variables: |
12 | 12 | ||
13 | - :term:`CVE_DB_INCR_UPDATE_AGE_THRES`: Configure the maximum age of the | ||
14 | internal CVE database for incremental update (instead of a full | ||
15 | redownload). | ||
16 | |||
17 | - :term:`RPMBUILD_EXTRA_PARAMS`: support extra user-defined fields without | ||
18 | crashing the RPM package creation. | ||
19 | |||
20 | - :term:`OPKG_MAKE_INDEX_EXTRA_PARAMS`: support extra parameters for | ||
21 | ``opkg-make-index``. | ||
22 | |||
23 | - :term:`EFI_UKI_PATH`, :term:`EFI_UKI_DIR`: define the location of UKI | ||
24 | image in the EFI System partition. | ||
25 | |||
26 | - :term:`TARGET_DBGSRC_DIR`: specifies the target path to debug source files | ||
27 | |||
28 | - :term:`USERADD_DEPENDS`: provides a way to declare dependencies on the users | ||
29 | and/or groups created by other recipes, resolving a long-standing build | ||
30 | ordering issue | ||
31 | |||
13 | - Architecture-specific enhancements: | 32 | - Architecture-specific enhancements: |
14 | 33 | ||
34 | - ``genericarm64``: a new :term:`MACHINE` to represent a 64-bit General Arm | ||
35 | SystemReady platform. | ||
36 | |||
37 | - Add Power8 tune to PowerPC architecture. | ||
38 | |||
39 | - ``arch-armv9``: remove CRC and SVE tunes, since FEAT_CRC32 is now mandatory | ||
40 | and SVE/SVE2 are enabled by default in GCC's ``-march=armv9-a``. | ||
41 | |||
42 | - ``arm/armv*``: add all of the additional Arm tunes in GCC 13.2.0 | ||
43 | |||
15 | - Kernel-related enhancements: | 44 | - Kernel-related enhancements: |
16 | 45 | ||
46 | - The default kernel is the current LTS (6.6). | ||
47 | |||
48 | - Add support for ``genericarm64``. | ||
49 | |||
17 | - New core recipes: | 50 | - New core recipes: |
18 | 51 | ||
52 | - `bmaptool <https://github.com/yoctoproject/bmaptool>`__: a tool for | ||
53 | creating block maps for files and flashing images, being now under the | ||
54 | Yocto Project umbrella. | ||
55 | |||
56 | - ``core-image-initramfs-boot``: a minimal initramfs image, containing just | ||
57 | ``udev`` and ``init``, designed to find the main root filesystem and | ||
58 | pivot to it. | ||
59 | |||
60 | - `lzlib <https://www.nongnu.org/lzip/lzlib.html>`__: a data compression | ||
61 | library that provides LZMA compression and decompression functions. | ||
62 | |||
63 | - `lzop <https://www.lzop.org/>`__: a compression utility based on the LZO | ||
64 | library, that was brought back after a (now reverted) removal. | ||
65 | |||
66 | - `python3-jsonschema-specifications <https://pypi.org/project/jsonschema-specifications/>`__: | ||
67 | support files for JSON Schema Specifications (meta-schemas and | ||
68 | vocabularies), added as a new dependency of ``python3-jsonschema``. | ||
69 | |||
70 | - `python3-maturin <https://github.com/pyo3/maturin>`__: a project that | ||
71 | allows building and publishing Rust crates as Python packages. | ||
72 | |||
73 | - `python3-meson-python <https://github.com/mesonbuild/meson-python>`__: a | ||
74 | Python build backend that enables the Meson build-system for Python packages. | ||
75 | |||
76 | - `python3-pyproject-metadata <https://pypi.org/project/pyproject-metadata/>`__: | ||
77 | a class to handle PEP 621 metadata, and a dependency for | ||
78 | ``python3-meson-python``. | ||
79 | |||
80 | - `python3-referencing <https://github.com/python-jsonschema/referencing>`__: | ||
81 | another dependency of ``python3-jsonschema``, it provides an | ||
82 | implementation of JSON reference resolution. | ||
83 | |||
84 | - `python3-rpds-py <https://pypi.org/project/rpds-py/>`__: Python bindings | ||
85 | to the Rust rpds crate, and a runtime dependency for ``python3-referencing``. | ||
86 | |||
87 | - `python3-sphinxcontrib-jquery <https://pypi.org/project/sphinxcontrib-jquery/>`__: | ||
88 | a Sphinx extension to include jQuery on newer Sphinx releases. Recent | ||
89 | versions of ``python3-sphinx-rtd-theme`` depend on it. | ||
90 | |||
91 | - `python3-websockets <https://pypi.org/project/websockets/>`__: a | ||
92 | library for building WebSocket servers and clients in Python. | ||
93 | |||
94 | - `python3-yamllint <https://github.com/adrienverge/yamllint>`__: a linter | ||
95 | for YAML files. In U-Boot, the ``binman`` tool uses this linter to verify the | ||
96 | configurations at compile time. | ||
97 | |||
98 | - ``systemd-boot-native``: a UEFI boot manager, this time built as native to | ||
99 | provide the ``ukify`` tool. | ||
100 | |||
101 | - `utfcpp <https://github.com/nemtrif/utfcpp>`__: a C++ library to handle | ||
102 | UTF-8 encoded strings. It was added as a dependency for ``taglib`` after | ||
103 | its upgrade to v2.0. | ||
104 | |||
105 | - `vulkan-utility-libraries <https://github.com/KhronosGroup/Vulkan-Utility-Libraries>`__: | ||
106 | a set of libraries to share code across various Vulkan repositories. | ||
107 | |||
108 | - `vulkan-volk <https://github.com/zeux/volk>`__: a meta-loader for Vulkan, | ||
109 | needed to support building the latest ``vulkan-tools``. | ||
110 | |||
19 | - QEMU / ``runqemu`` enhancements: | 111 | - QEMU / ``runqemu`` enhancements: |
20 | 112 | ||
21 | - QEMU has been upgraded to version 8.2.1 | 113 | - QEMU has been upgraded to version 8.2.1 |
22 | 114 | ||
115 | - ``qemuboot``: support predictable network interface names. | ||
116 | |||
117 | - ``runqemu``: match ".rootfs." in addition to "-image-" for the root | ||
118 | filesystem. | ||
119 | |||
120 | - :ref:`ref-classes-cmake-qemu`: a new class allowing to execute cross-compiled | ||
121 | binaries using QEMU user-mode emulation. | ||
122 | |||
23 | - Rust improvements: | 123 | - Rust improvements: |
24 | 124 | ||
25 | - Rust has been upgraded to version 1.75 | 125 | - Rust has been upgraded to version 1.75 |
26 | 126 | ||
127 | - The Rust profiler (i.e., PGO - Profile-Guided Optimization) options were | ||
128 | enabled back. | ||
129 | |||
130 | - The Rust ``oe-selftest`` were enabled, except for ``mips32`` whose tests | ||
131 | are skipped. | ||
132 | |||
133 | - ``rust-cross-canadian``: added ``riscv64`` to cross-canadian hosts. | ||
134 | |||
27 | - wic Image Creator enhancements: | 135 | - wic Image Creator enhancements: |
28 | 136 | ||
137 | - Allow the imager's output file extension to match the imager's name, | ||
138 | instead of hardcoding it to ``direct`` (i.e., the default imager) | ||
139 | |||
140 | - For GPT-based disks, add reproducible Disk GUID generation | ||
141 | |||
142 | - Allow generating reproducible ext4 images | ||
143 | |||
144 | - Add feature to fill a specific range of a partition with zeros | ||
145 | |||
146 | - ``bootimg-efi``: add ``install-kernel-into-boot-dir`` parameter to | ||
147 | configure kernel installation point(s) (i.e., rootfs and/or boot partition) | ||
148 | |||
149 | - ``rawcopy``: add support for zstd decompression | ||
150 | |||
29 | - SDK-related improvements: | 151 | - SDK-related improvements: |
30 | 152 | ||
153 | - ``nativesdk``: let :term:`MACHINE_FEATURES` be set by ``machine-sdk`` | ||
154 | configuration files. | ||
155 | |||
156 | - ``nativesdk``: prevent :term:`MACHINE_FEATURES` and :term:`DISTRO_FEATURES` | ||
157 | from being backfilled. | ||
158 | |||
159 | - Support for ``riscv64`` as an SDK host architecture | ||
160 | |||
161 | - Extend recipes to ``nativesdk``: ``acpica``, ``libpcap``, ``python3-setuptools-rust`` | ||
162 | |||
31 | - Testing: | 163 | - Testing: |
32 | 164 | ||
165 | - Move `patchtest` to the core (as ``scripts/patchtest``, test cases under | ||
166 | ``meta/lib/patchtest/tests``) and make a number of improvements to enable | ||
167 | it to validate patches submitted on the mailing list again. Additionally, | ||
168 | make it work with the original upstream version of | ||
169 | `Patchwork <http://jk.ozlabs.org/projects/patchwork/>`__. | ||
170 | |||
171 | - Add an optional ``unimplemented-ptest`` QA warning to detect upstream | ||
172 | packages with tests, that do not use ptest. | ||
173 | |||
174 | - ``testimage``: retrieve the ptests directory, especially for the logs, | ||
175 | upon ptest failure. | ||
176 | |||
177 | - ``oeqa``, ``oe-selftest``: add test cases for Maturin (SDK and runtime). | ||
178 | |||
179 | - Proof-of-concept of screenshot-based runtime UI test | ||
180 | (``meta/lib/oeqa/runtime/cases/login.py``) | ||
181 | |||
182 | - Enable ptests for ``python3-attrs``, ``python3-pyyaml``, ``xz`` | ||
183 | |||
33 | - Utility script changes: | 184 | - Utility script changes: |
34 | 185 | ||
186 | - ``oe-init-build-env`` can generate a initial configuration (``.vscode``) | ||
187 | for VSCode and its "Yocto Project BitBake" extension. | ||
188 | |||
189 | - The ``sstate-cache-management`` script has been rewritten in python for better performance and maintainability | ||
190 | |||
191 | - ``bitbake-layers``: added an option to update the reference of repositories in layer setup | ||
192 | |||
35 | - BitBake improvements: | 193 | - BitBake improvements: |
36 | 194 | ||
195 | - New ``inherit_defer`` statement which works as | ||
196 | :ref:`inherit <bitbake:bitbake-user-manual/bitbake-user-manual-metadata:\`\`inherit\`\` directive>` | ||
197 | does, except that it is only evaluated at the end of parsing | ||
198 | --- recommended where a conditional expression is used, e.g.:: | ||
199 | |||
200 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3targetconfig', '', d)} | ||
201 | |||
202 | This allows conditional expressions to be evaluated 'late' meaning changes | ||
203 | to the variable after the line is parsed will take effect - with inherit this | ||
204 | is not the case. | ||
205 | |||
206 | - Add support for :term:`BB_LOADFACTOR_MAX`, so Bitbake can stop running | ||
207 | extra tasks if the system load is too high, especially in distributions | ||
208 | where ``/proc/pressure`` is disabled. | ||
209 | |||
210 | - ``taskexp_ncurses``: add ncurses version of ``taskexp``, the dependency | ||
211 | explorer originally implemented with GTK. | ||
212 | |||
213 | - Improve ``runqueue`` performance by adding a cache mechanism in | ||
214 | ``build_taskdepdata``. | ||
215 | |||
216 | - ``bitbake.conf``: add ``runtimedir`` to represent the path to the runtime | ||
217 | state directory (i.e., ``/run``). | ||
218 | |||
219 | - Allow to disable colored text output through the | ||
220 | `NO_OUTPUT <https://no-color.org/>`__ environment variable. | ||
221 | |||
222 | - ``git-make-shallow`` script: add support for Git's ``safe.bareRepository=explicit`` | ||
223 | configuration setting. | ||
224 | |||
225 | - Hash equivalence gained a number of scalability improvements including: | ||
226 | |||
227 | - Support for a wide range of database backends through `SQLAlchemy` | ||
228 | |||
229 | - Support for hash equivalence server and client to communicate over websockets | ||
230 | |||
231 | - Support for per-user permissions in the hashserver, and on the client side | ||
232 | specifying credentials via the environment or ``.netrc`` | ||
233 | |||
234 | - Add garbage collection to remove unused unihashes from the database. | ||
235 | |||
236 | - devtool improvements: | ||
237 | |||
238 | - Introduce a new ``ide-sdk`` plugin to generate a configuration to use | ||
239 | the eSDK through an IDE. | ||
240 | |||
241 | - Add ``--no-pypi`` option for Python projects that are not hosted on PyPI. | ||
242 | |||
243 | - Add support for Git submodules. | ||
244 | |||
245 | - ``ide``: ``vscode``: generate files from recipe sysroots and debug the | ||
246 | root filesystem in read-only mode to avoid confusion. | ||
247 | |||
248 | - ``modify``: add support for multiple sources in :term:`SRC_URI`. | ||
249 | |||
250 | - Support plugins within plugins. | ||
251 | |||
252 | - recipetool improvements: | ||
253 | |||
254 | - ``appendsrcfile(s)``: add a mode to update the recipe itself. | ||
255 | |||
256 | - ``appendsrcfile(s)``: add ``--dry-run`` mode. | ||
257 | |||
258 | - ``create``: add handler to create Go recipes. | ||
259 | |||
260 | - ``create``: improve identification of licenses. | ||
261 | |||
262 | - ``create``: add support for modern Python PEP-517 build systems including | ||
263 | hatchling, maturin, meson-python. | ||
264 | |||
265 | - ``create``: add PyPi support. | ||
266 | |||
267 | - ``create``: prefix created Python recipes with ``python3-``. | ||
268 | |||
37 | - Packaging changes: | 269 | - Packaging changes: |
38 | 270 | ||
271 | - ``package_rpm``: the RPM package compressor's mode can now be overriden. | ||
272 | |||
273 | - ipk packaging (using ``opkg``) now uses ``zstd`` compression instead of | ||
274 | ``xz`` for better compression and performance. | ||
275 | |||
39 | - Security improvements: | 276 | - Security improvements: |
40 | 277 | ||
278 | - Improve incremental CVE database download from NVD. Rejected CVEs are | ||
279 | removed, configuration is kept up-to-date. The age threshold for | ||
280 | incremental update can be configured with :term:`CVE_DB_INCR_UPDATE_AGE_THRES` | ||
281 | variable. | ||
282 | |||
283 | - Toaster Web UI improvements: | ||
284 | |||
285 | - Numerous bugfixes, and additional input validation | ||
286 | |||
287 | - Add `pytest` support and add/update test cases | ||
288 | |||
41 | - Prominent documentation updates: | 289 | - Prominent documentation updates: |
42 | 290 | ||
291 | - Documentation for using the new ``devtool ide-sdk`` command and features. | ||
292 | See :ref:`using_devtool` for details. | ||
293 | |||
294 | - New ":doc:`bitbake:bitbake-user-manual/bitbake-user-manual-ref-variables-context`" | ||
295 | section in the BitBake User Manual. | ||
296 | |||
297 | - New ``make stylecheck`` command to run `Vale <https://vale.sh>`__, | ||
298 | to perform text style checks and comply with text writing standards in | ||
299 | the industry. | ||
300 | |||
301 | - New ``make sphinx-lint`` command to run `sphinx-lint | ||
302 | <https://github.com/sphinx-contrib/sphinx-lint>`__. After customization, | ||
303 | this will allow us to enforce Sphinx syntax style choices. | ||
304 | |||
43 | - Miscellaneous changes: | 305 | - Miscellaneous changes: |
44 | 306 | ||
307 | - Systemd's following :term:`PACKAGECONFIG` options were added: | ||
308 | ``cryptsetup-plugins``, ``no-ntp-fallback``, and ``p11kit``. | ||
309 | |||
310 | - New PACKAGECONFIG options added to ``libarchive``, ``libinput``, | ||
311 | ``libunwind``, ``mesa``, ``mesa-gl``, ``openssh``, ``perf``, | ||
312 | ``python3-pyyaml``, ``qemu``, ``rpm``, ``shadow``, ``strace``, | ||
313 | ``syslinux``, ``systemd``, ``vte``, ``webkitgtk``, ``xserver-xorg``. | ||
314 | |||
315 | - ``systemd-boot`` can, from now on, be compiled as ``native``, thus | ||
316 | providing ``ukify`` tool to build UKI images. | ||
317 | |||
318 | - systemd: split bash completion for ``udevadm`` in a new | ||
319 | ``udev-bash-completion`` package. | ||
320 | |||
321 | - The :ref:`ref-classes-go-vendor` class was added to support offline builds | ||
322 | (i.e., vendoring). It can also handle modules from the same repository, | ||
323 | taking into account their versions. | ||
324 | |||
325 | - Disable strace support of bluetooth by default. | ||
326 | |||
327 | - ``openssh`` now has a systemd service: ``sshd.service``. | ||
328 | |||
329 | - The :ref:`ref-classes-python_mesonpy` class was added (moved in from | ||
330 | ``meta-python``) to support Python package builds using the meson-python | ||
331 | PEP-517 build backend. | ||
332 | |||
333 | - Support for unpacking ``.7z`` archives in :term:`SRC_URI` using ``p7zip``. | ||
334 | |||
335 | - Add minimal VS Code configuration to avoid VS Code's indexer from choking | ||
336 | on build directories. | ||
337 | |||
338 | |||
45 | Known Issues in 5.0 | 339 | Known Issues in 5.0 |
46 | ~~~~~~~~~~~~~~~~~~~ | 340 | ~~~~~~~~~~~~~~~~~~~ |
47 | 341 | ||
48 | - N/A | 342 | - ``gpgme`` has had Python binding support disabled since upstream does not yet support Python 3.12. |
343 | |||
49 | 344 | ||
50 | Recipe License changes in 5.0 | 345 | Recipe License changes in 5.0 |
51 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 346 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
52 | 347 | ||
348 | The following corrections have been made to the :term:`LICENSE` values set by recipes: | ||
349 | |||
350 | - ``elfutils``: split license for libraries & backend and utilities. | ||
351 | - ``ghostscript``: correct :term:`LICENSE` to ``AGPL-3.0-or-later``. | ||
352 | - ``kbd``: update license for consolefont and keymaps. | ||
353 | - ``libsystemd``: set its own :term:`LICENSE` value (``LGPL-2.1-or-later``) to add more granularity. | ||
354 | - ``libtest-warnings-perl``: update :term:`LICENSE` ``Artistic-1.0`` to ``Artistic-1.0-Perl``. | ||
355 | - ``linux-firmware``: set package :term:`LICENSE` appropriately for ``carl9170``, ``rockchip`` and ``powerpr``. | ||
356 | - ``newlib``: add license ``Apache-2.0-with-LLVM-exception``. | ||
357 | - ``python3-poetry-core``: add license ``BSD-3-Clause`` for ``fastjsonschema``. | ||
358 | - ``systemd``: make the scope of ``LGPL`` more accurate (``LGPL-2.1`` -> ``LGPL-2.1-or-later``). | ||
359 | - ``util-linux``: add ``GPL-1.0-or-later`` license for fdisk and ``MIT`` license for ``flock``. | ||
360 | - ``zstd``: set to dual-licensed ``BSD-3-Clause`` or ``GPL-2.0-only``. | ||
361 | |||
53 | Security Fixes in 5.0 | 362 | Security Fixes in 5.0 |
54 | ~~~~~~~~~~~~~~~~~~~~~ | 363 | ~~~~~~~~~~~~~~~~~~~~~ |
55 | 364 | ||
365 | - avahi: :cve:`2023-1981`, :cve:`2023-38469`, :cve:`2023-38470`, :cve:`2023-38471`, :cve:`2023-38469`, :cve:`2023-38470`, :cve:`2023-38471`, :cve:`2023-38472`, :cve:`2023-38473` | ||
366 | - bind: :cve:`2023-4408`, :cve:`2023-5517`, :cve:`2023-5679`, :cve:`2023-50387` | ||
367 | - bluez5: :cve:`2023-45866` | ||
368 | - coreutils: :cve:`2024-0684` | ||
369 | - cups: :cve:`2023-4504` | ||
370 | - curl: :cve:`2023-46218` | ||
371 | - expat: :cve:`2024-28757` | ||
372 | - gcc: :cve:`2023-4039` | ||
373 | - glibc: :cve:`2023-5156`, :cve:`2023-0687` | ||
374 | - gnutls: :cve:`2024-0553`, :cve:`2024-0567`, :cve:`2024-28834`, :cve:`2024-28835` | ||
375 | - go: :cve:`2023-45288` | ||
376 | - grub: :cve:`2023-4692`, :cve:`2023-4693` | ||
377 | - grub2: :cve:`2023-4001` (ignored), :cve:`2024-1048` (ignored) | ||
378 | - libgit2: :cve:`2024-24575`, :cve:`2024-24577` | ||
379 | - libsndfile1: :cve:`2022-33065` | ||
380 | - libssh2: :cve:`2023-48795` | ||
381 | - libuv: :cve:`2024-24806` | ||
382 | - libxml2: :cve:`2023-45322` (ignored) | ||
383 | - linux-yocto/6.6: :cve:`2020-16119` | ||
384 | - openssh: :cve:`2023-48795`, :cve:`2023-51384`, :cve:`2023-51385` | ||
385 | - openssl: :cve:`2023-5363`, :cve:`2023-5678`, :cve:`2023-6129`, :cve_mitre:`2023-6237`, :cve:`2024-0727`, :cve:`2024-2511` | ||
386 | - perl: :cve:`2023-47100` | ||
387 | - pixman: :cve:`2023-37769` (ignored) | ||
388 | - python3-cryptography{-vectors}: :cve:`2023-49083`, :cve:`2024-26130` | ||
389 | - python3-urllib3: :cve:`2023-45803` | ||
390 | - shadow: :cve:`2023-4641` | ||
391 | - sudo: :cve:`2023-42456` | ||
392 | - tiff: :cve:`2023-6228`, :cve:`2023-6277`, :cve:`2023-52355`, :cve:`2023-52356` | ||
393 | - vim: :cve:`2023-46246`, :cve:`2023-48231`, :cve:`2023-48232`, :cve:`2023-48233`, :cve:`2023-48234`, :cve:`2023-48235`, :cve:`2023-48236`, :cve:`2023-48237`, :cve:`2024-22667` | ||
394 | - wpa-supplicant: :cve:`2023-52160` | ||
395 | - xserver-xorg: :cve:`2023-5574`, :cve:`2023-6816`, :cve:`2024-0229`, :cve:`2024-0408`, :cve:`2024-0409`, :cve:`2024-21885`, :cve:`2024-21886` | ||
396 | - xwayland: :cve:`2023-5367`, :cve:`2024-0408`, :cve:`2024-0409`, :cve:`2023-6816`, :cve:`2024-0229`, :cve:`2024-21885`, :cve:`2024-21886` | ||
397 | - zlib: :cve:`2023-45853` (ignored), :cve:`2023-6992` (ignored) | ||
398 | |||
399 | |||
56 | Recipe Upgrades in 5.0 | 400 | Recipe Upgrades in 5.0 |
57 | ~~~~~~~~~~~~~~~~~~~~~~ | 401 | ~~~~~~~~~~~~~~~~~~~~~~ |
58 | 402 | ||
403 | - acl 2.3.1 -> 2.3.2 | ||
404 | - acpica 20230628 -> 20240322 | ||
405 | - alsa-lib 1.2.10 -> 1.2.11 | ||
406 | - alsa-tools 1.2.5 -> 1.2.11 | ||
407 | - alsa-ucm-conf 1.2.10 -> 1.2.11 | ||
408 | - alsa-utils 1.2.10 -> 1.2.11 | ||
409 | - appstream 0.16.3 -> 1.0.2 | ||
410 | - autoconf 2.72c -> 2.72e | ||
411 | - bash 5.2.15 -> 5.2.21 | ||
412 | - bash-completion 2.11 -> 2.12.0 | ||
413 | - binutils 2.41 -> 2.42 | ||
414 | - bluez5 5.69 -> 5.72 | ||
415 | - boost 1.83.0 -> 1.84.0 | ||
416 | - boost-build-native 1.83.0 -> 1.84.0 | ||
417 | - btrfs-tools 6.5.1 -> 6.7.1 | ||
418 | - cairo 1.16.0 -> 1.18.0 | ||
419 | - cargo 1.70.0 -> 1.75.0 | ||
420 | - cargo-c-native 0.9.18 -> 0.9.30+cargo-0.77.0 | ||
421 | - ccache 4.8.3 -> 4.9.1 | ||
422 | - cmake 3.27.7 -> 3.28.3 | ||
423 | - cmake-native 3.27.7 -> 3.28.3 | ||
424 | - createrepo-c 1.0.0 -> 1.0.4 | ||
425 | - cronie 1.6.1 -> 1.7.1 | ||
426 | - cross-localedef-native 2.38+git -> 2.39+git | ||
427 | - cups 2.4.6 -> 2.4.7 | ||
428 | - curl 8.4.0 -> 8.7.1 | ||
429 | - dbus-wait 0.1+git (6cc6077a36fe…) -> 0.1+git (64bc7c8fae61…) | ||
430 | - debianutils 5.13 -> 5.16 | ||
431 | - desktop-file-utils 0.26 -> 0.27 | ||
432 | - dhcpcd 10.0.2 -> 10.0.6 | ||
433 | - diffoscope 249 -> 259 | ||
434 | - diffstat 1.65 -> 1.66 | ||
435 | - dnf 4.17.0 -> 4.19.0 | ||
436 | - dos2unix 7.5.1 -> 7.5.2 | ||
437 | - ed 1.19 -> 1.20.1 | ||
438 | - efivar 38+39+git -> 39+39+git | ||
439 | - elfutils 0.189 -> 0.191 | ||
440 | - ell 0.60 -> 0.63 | ||
441 | - enchant2 2.6.2 -> 2.6.7 | ||
442 | - epiphany 44.6 -> 46.0 | ||
443 | - erofs-utils 1.6 -> 1.7.1 | ||
444 | - ethtool 6.5 -> 6.7 | ||
445 | - eudev 3.2.12 -> 3.2.14 | ||
446 | - expat 2.5.0 -> 2.6.2 | ||
447 | - ffmpeg 6.0 -> 6.1.1 | ||
448 | - fontconfig 2.14.2 -> 2.15.0 | ||
449 | - gawk 5.2.2 -> 5.3.0 | ||
450 | - gcr 4.1.0 -> 4.2.0 | ||
451 | - gdb 13.2 -> 14.2 | ||
452 | - gettext 0.22 -> 0.22.5 | ||
453 | - gettext-minimal-native 0.22 -> 0.22.5 | ||
454 | - gi-docgen 2023.1 -> 2023.3 | ||
455 | - git 2.42.0 -> 2.44.0 | ||
456 | - glib-2.0 2.78.3 -> 2.78.4 | ||
457 | - glib-networking 2.76.1 -> 2.78.1 | ||
458 | - glibc 2.38+git -> 2.39+git | ||
459 | - glibc-locale 2.38 -> 2.39+git | ||
460 | - glibc-mtrace 2.38 -> 2.39+git | ||
461 | - glibc-scripts 2.38 -> 2.39+git | ||
462 | - glibc-testsuite 2.38+git -> 2.39+git | ||
463 | - glibc-y2038-tests 2.38+git -> 2.39+git | ||
464 | - glslang 1.3.261.1 -> 1.3.275.0 | ||
465 | - gnu-config 20230216+git -> 20240101+git | ||
466 | - gnupg 2.4.3 -> 2.4.4 | ||
467 | - gnutls 3.8.3 -> 3.8.4 | ||
468 | - go 1.20.12 -> 1.22.2 | ||
469 | - go-binary-native 1.20.12 -> 1.22.2 | ||
470 | - go-native 1.20.12 -> 1.22.2 | ||
471 | - go-runtime 1.20.12 -> 1.22.2 | ||
472 | - gpgme 1.22.0 -> 1.23.2 | ||
473 | - grub 2.06 -> 2.12 | ||
474 | - grub-efi 2.06 -> 2.12 | ||
475 | - gsettings-desktop-schemas 44.0 -> 46.0 | ||
476 | - gst-devtools 1.22.9 -> 1.22.11 | ||
477 | - gstreamer1.0 1.22.9 -> 1.22.11 | ||
478 | - gstreamer1.0-libav 1.22.9 -> 1.22.11 | ||
479 | - gstreamer1.0-omx 1.22.9 -> 1.22.11 | ||
480 | - gstreamer1.0-plugins-bad 1.22.9 -> 1.22.11 | ||
481 | - gstreamer1.0-plugins-base 1.22.9 -> 1.22.11 | ||
482 | - gstreamer1.0-plugins-good 1.22.9 -> 1.22.11 | ||
483 | - gstreamer1.0-plugins-ugly 1.22.9 -> 1.22.11 | ||
484 | - gstreamer1.0-python 1.22.9 -> 1.22.11 | ||
485 | - gstreamer1.0-rtsp-server 1.22.9 -> 1.22.11 | ||
486 | - gstreamer1.0-vaapi 1.22.9 -> 1.22.11 | ||
487 | - gtk+3 3.24.38 -> 3.24.41 | ||
488 | - gtk4 4.12.3 -> 4.14.1 | ||
489 | - harfbuzz 8.2.2 -> 8.3.0 | ||
490 | - hwlatdetect 2.5 -> 2.6 | ||
491 | - icu 73-2 -> 74-1 | ||
492 | - inetutils 2.4 -> 2.5 | ||
493 | - init-system-helpers 1.65.2 -> 1.66 | ||
494 | - iproute2 6.5.0 -> 6.7.0 | ||
495 | - iptables 1.8.9 -> 1.8.10 | ||
496 | - iputils 20221126 -> 20240117 | ||
497 | - iso-codes 4.15.0 -> 4.16.0 | ||
498 | - iw 5.19 -> 6.7 | ||
499 | - json-glib 1.6.6 -> 1.8.0 | ||
500 | - kbd 2.6.3 -> 2.6.4 | ||
501 | - kexec-tools 2.0.27 -> 2.0.28 | ||
502 | - kmod 30 -> 31 | ||
503 | - kmscube git -> 0.0.1+git | ||
504 | - libadwaita 1.4.2 -> 1.5.0 | ||
505 | - libbsd 0.11.7 -> 0.12.1 | ||
506 | - libcap-ng 0.8.3 -> 0.8.4 | ||
507 | - libcap-ng-python 0.8.3 -> 0.8.4 | ||
508 | - libcomps 0.1.19 -> 0.1.20 | ||
509 | - libdnf 0.71.0 -> 0.73.0 | ||
510 | - libdrm 2.4.116 -> 2.4.120 | ||
511 | - libffi 3.4.4 -> 3.4.6 | ||
512 | - libgit2 1.7.1 -> 1.7.2 | ||
513 | - libgloss 4.3.0+git -> 4.4.0+git | ||
514 | - libgpg-error 1.47 -> 1.48 | ||
515 | - libhandy 1.8.2 -> 1.8.3 | ||
516 | - libical 3.0.16 -> 3.0.17 | ||
517 | - libidn2 2.3.4 -> 2.3.7 | ||
518 | - libinput 1.24.0 -> 1.25.0 | ||
519 | - libksba 1.6.4 -> 1.6.6 | ||
520 | - libmicrohttpd 0.9.77 -> 1.0.1 | ||
521 | - libnl 3.8.0 -> 3.9.0 | ||
522 | - libnotify 0.8.2 -> 0.8.3 | ||
523 | - libpciaccess 0.17 -> 0.18 | ||
524 | - libpcre2 10.42 -> 10.43 | ||
525 | - libpng 1.6.40 -> 1.6.42 | ||
526 | - libproxy 0.5.3 -> 0.5.4 | ||
527 | - libpsl 0.21.2 -> 0.21.5 | ||
528 | - librepo 1.16.0 -> 1.17.0 | ||
529 | - librsvg 2.56.3 -> 2.57.1 | ||
530 | - libsdl2 2.28.4 -> 2.30.0 | ||
531 | - libseccomp 2.5.4 -> 2.5.5 | ||
532 | - libsecret 0.21.1 -> 0.21.4 | ||
533 | - libsolv 0.7.26 -> 0.7.28 | ||
534 | - libsoup 3.4.2 -> 3.4.4 | ||
535 | - libstd-rs 1.70.0 -> 1.75.0 | ||
536 | - libtest-warnings-perl 0.031 -> 0.033 | ||
537 | - libtirpc 1.3.3 -> 1.3.4 | ||
538 | - libubootenv 0.3.4 -> 0.3.5 | ||
539 | - libunistring 1.1 -> 1.2 | ||
540 | - liburi-perl 5.21 -> 5.27 | ||
541 | - libusb1 1.0.26 -> 1.0.27 | ||
542 | - libuv 1.46.0 -> 1.48.0 | ||
543 | - libva 2.19.0 -> 2.20.0 | ||
544 | - libva-initial 2.19.0 -> 2.20.0 | ||
545 | - libwpe 1.14.1 -> 1.14.2 | ||
546 | - libxext 1.3.5 -> 1.3.6 | ||
547 | - libxkbcommon 1.5.0 -> 1.6.0 | ||
548 | - libxkbfile 1.1.2 -> 1.1.3 | ||
549 | - libxml-parser-perl 2.46 -> 2.47 | ||
550 | - libxml2 2.11.7 -> 2.12.5 | ||
551 | - libxmlb 0.3.14 -> 0.3.15 | ||
552 | - libxrandr 1.5.3 -> 1.5.4 | ||
553 | - libxvmc 1.0.13 -> 1.0.14 | ||
554 | - lighttpd 1.4.71 -> 1.4.74 | ||
555 | - linux-firmware 20240220 -> 20240312 | ||
556 | - linux-libc-headers 6.5 -> 6.6 | ||
557 | - linux-yocto 6.1.78+git, 6.5.13+git -> 6.6.23+git | ||
558 | - linux-yocto-dev 6.6+git -> 6.9+git | ||
559 | - linux-yocto-rt 6.1.78+git, 6.5.13+git -> 6.6.23+git | ||
560 | - linux-yocto-tiny 6.1.78+git, 6.5.13+git -> 6.6.23+git | ||
561 | - llvm 17.0.3 -> 18.1.3 | ||
562 | - lsof 4.98.0 -> 4.99.3 | ||
563 | - ltp 20230516 -> 20240129 | ||
564 | - lttng-modules 2.13.10 -> 2.13.12 | ||
565 | - lttng-ust 2.13.6 -> 2.13.7 | ||
566 | - lzip 1.23 -> 1.24 | ||
567 | - makedepend 1.0.8 -> 1.0.9 | ||
568 | - man-db 2.11.2 -> 2.12.0 | ||
569 | - man-pages 6.05.01 -> 6.06 | ||
570 | - mc 4.8.30 -> 4.8.31 | ||
571 | - mesa 23.2.1 -> 24.0.2 | ||
572 | - mesa-gl 23.2.1 -> 24.0.2 | ||
573 | - meson 1.2.2 -> 1.3.1 | ||
574 | - minicom 2.8 -> 2.9 | ||
575 | - mmc-utils 0.1+git (613495ecaca9…) -> 0.1+git (b5ca140312d2…) | ||
576 | - mpg123 1.31.3 -> 1.32.5 | ||
577 | - newlib 4.3.0+git -> 4.4.0+git | ||
578 | - nghttp2 1.57.0 -> 1.61.0 | ||
579 | - numactl 2.0.16 -> 2.0.18 | ||
580 | - ofono 2.1 -> 2.4 | ||
581 | - opensbi 1.2 -> 1.4 | ||
582 | - openssh 9.5p1 -> 9.6p1 | ||
583 | - openssl 3.1.5 -> 3.2.1 | ||
584 | - opkg 0.6.2 -> 0.6.3 | ||
585 | - opkg-utils 0.6.2 -> 0.6.3 | ||
586 | - orc 0.4.34 -> 0.4.38 | ||
587 | - ovmf edk2-stable202308 -> edk2-stable202402 | ||
588 | - p11-kit 0.25.0 -> 0.25.3 | ||
589 | - pango 1.51.0 -> 1.52.0 | ||
590 | - pciutils 3.10.0 -> 3.11.1 | ||
591 | - piglit 1.0+gitr (71c21b1157c4…) -> 1.0+gitr (22eaf6a91cfd…) | ||
592 | - pkgconf 2.0.3 -> 2.1.1 | ||
593 | - psplash 0.1+git (44afb7506d43…) -> 0.1+git (ecc191375669…) | ||
594 | - ptest-runner 2.4.2+git -> 2.4.3+git | ||
595 | - pulseaudio 16.1 -> 17.0 | ||
596 | - puzzles 0.0+git (2d9e414ee316…) -> 0.0+git (80aac3104096…) | ||
597 | - python3 3.11.5 -> 3.12.3 | ||
598 | - python3-alabaster 0.7.13 -> 0.7.16 | ||
599 | - python3-attrs 23.1.0 -> 23.2.0 | ||
600 | - python3-babel 2.12.1 -> 2.14.0 | ||
601 | - python3-bcrypt 4.0.1 -> 4.1.2 | ||
602 | - python3-beartype 0.15.0 -> 0.17.2 | ||
603 | - python3-build 1.0.3 -> 1.1.1 | ||
604 | - python3-certifi 2023.7.22 -> 2024.2.2 | ||
605 | - python3-cffi 1.15.1 -> 1.16.0 | ||
606 | - python3-cryptography 41.0.4 -> 42.0.5 | ||
607 | - python3-cryptography-vectors 41.0.4 -> 42.0.5 | ||
608 | - python3-cython 0.29.36 -> 3.0.8 | ||
609 | - python3-dbusmock 0.29.1 -> 0.31.1 | ||
610 | - python3-dtschema 2023.7 -> 2024.2 | ||
611 | - python3-git 3.1.36 -> 3.1.42 | ||
612 | - python3-gitdb 4.0.10 -> 4.0.11 | ||
613 | - python3-hatch-fancy-pypi-readme 23.1.0 -> 24.1.0 | ||
614 | - python3-hatch-vcs 0.3.0 -> 0.4.0 | ||
615 | - python3-hatchling 1.18.0 -> 1.21.1 | ||
616 | - python3-hypothesis 6.86.2 -> 6.98.15 | ||
617 | - python3-idna 3.4 -> 3.6 | ||
618 | - python3-importlib-metadata 6.8.0 -> 7.0.1 | ||
619 | - python3-iso8601 2.0.0 -> 2.1.0 | ||
620 | - python3-jsonschema 4.17.3 -> 4.21.1 | ||
621 | - python3-license-expression 30.1.1 -> 30.2.0 | ||
622 | - python3-lxml 4.9.3 -> 5.0.0 | ||
623 | - python3-mako 1.2.4 -> 1.3.2 | ||
624 | - python3-markdown 3.4.4 -> 3.5.2 | ||
625 | - python3-markupsafe 2.1.3 -> 2.1.5 | ||
626 | - python3-more-itertools 10.1.0 -> 10.2.0 | ||
627 | - python3-numpy 1.26.0 -> 1.26.4 | ||
628 | - python3-packaging 23.1 -> 23.2 | ||
629 | - python3-pathspec 0.11.2 -> 0.12.1 | ||
630 | - python3-pbr 5.11.1 -> 6.0.0 | ||
631 | - python3-pip 23.2.1 -> 24.0 | ||
632 | - python3-pluggy 1.3.0 -> 1.4.0 | ||
633 | - python3-poetry-core 1.7.0 -> 1.9.0 | ||
634 | - python3-psutil 5.9.5 -> 5.9.8 | ||
635 | - python3-pyasn1 0.5.0 -> 0.5.1 | ||
636 | - python3-pycairo 1.24.0 -> 1.26.0 | ||
637 | - python3-pycryptodome 3.19.0 -> 3.20.0 | ||
638 | - python3-pycryptodomex 3.19.0 -> 3.20.0 | ||
639 | - python3-pygments 2.16.1 -> 2.17.2 | ||
640 | - python3-pyopenssl 23.2.0 -> 24.0.0 | ||
641 | - python3-pyrsistent 0.19.3 -> 0.20.0 | ||
642 | - python3-pytest 7.4.2 -> 8.0.2 | ||
643 | - python3-pytest-runner 6.0.0 -> 6.0.1 | ||
644 | - python3-pytz 2023.3 -> 2024.1 | ||
645 | - python3-ruamel-yaml 0.17.32 -> 0.18.6 | ||
646 | - python3-scons 4.5.2 -> 4.6.0 | ||
647 | - python3-setuptools 68.2.2 -> 69.1.1 | ||
648 | - python3-setuptools-rust 1.7.0 -> 1.9.0 | ||
649 | - python3-setuptools-scm 7.1.0 -> 8.0.4 | ||
650 | - python3-spdx-tools 0.8.1 -> 0.8.2 | ||
651 | - python3-sphinx-rtd-theme 1.3.0 -> 2.0.0 | ||
652 | - python3-sphinxcontrib-applehelp 1.0.4 -> 1.0.8 | ||
653 | - python3-sphinxcontrib-devhelp 1.0.2 -> 1.0.6 | ||
654 | - python3-sphinxcontrib-htmlhelp 2.0.1 -> 2.0.5 | ||
655 | - python3-sphinxcontrib-qthelp 1.0.3 -> 1.0.7 | ||
656 | - python3-sphinxcontrib-serializinghtml 1.1.5 -> 1.1.10 | ||
657 | - python3-subunit 1.4.2 -> 1.4.4 | ||
658 | - python3-testtools 2.6.0 -> 2.7.1 | ||
659 | - python3-trove-classifiers 2023.9.19 -> 2024.2.23 | ||
660 | - python3-typing-extensions 4.8.0 -> 4.10.0 | ||
661 | - python3-unittest-automake-output 0.1 -> 0.2 | ||
662 | - python3-urllib3 2.0.7 -> 2.2.1 | ||
663 | - python3-wcwidth 0.2.6 -> 0.2.13 | ||
664 | - python3-wheel 0.41.2 -> 0.42.0 | ||
665 | - qemu 8.1.4 -> 8.2.1 | ||
666 | - qemu-native 8.1.4 -> 8.2.1 | ||
667 | - qemu-system-native 8.1.4 -> 8.2.1 | ||
668 | - repo 2.36.1 -> 2.42 | ||
669 | - resolvconf 1.91 -> 1.92 | ||
670 | - rpm 4.18.1 -> 4.19.1 | ||
671 | - rt-tests 2.5 -> 2.6 | ||
672 | - rust 1.70.0 -> 1.75.0 | ||
673 | - rust-cross-canadian 1.70.0 -> 1.75.0 | ||
674 | - rust-llvm 1.70.0 -> 1.75.0 | ||
675 | - shaderc 2023.6 -> 2023.8 | ||
676 | - shadow 4.13 -> 4.14.2 | ||
677 | - shared-mime-info 2.2 -> 2.4 | ||
678 | - socat 1.7.4.4 -> 1.8.0.0 | ||
679 | - spirv-headers 1.3.261.1 -> 1.3.275.0 | ||
680 | - spirv-tools 1.3.261.1 -> 1.3.275.0 | ||
681 | - sqlite3 3.43.2 -> 3.45.1 | ||
682 | - strace 6.5 -> 6.7 | ||
683 | - stress-ng 0.16.05 -> 0.17.05 | ||
684 | - subversion 1.14.2 -> 1.14.3 | ||
685 | - swig 4.1.1 -> 4.2.1 | ||
686 | - sysstat 12.7.4 -> 12.7.5 | ||
687 | - systemd 254.4 -> 255.4 | ||
688 | - systemd-boot 254.4 -> 255.4 | ||
689 | - systemd-bootchart 234 -> 235 | ||
690 | - systemtap 4.9 -> 5.0 | ||
691 | - systemtap-native 4.9 -> 5.0 | ||
692 | - taglib 1.13.1 -> 2.0 | ||
693 | - ttyrun 2.29.0 -> 2.31.0 | ||
694 | - u-boot 2023.10 -> 2024.01 | ||
695 | - u-boot-tools 2023.10 -> 2024.01 | ||
696 | - update-rc.d 0.8 (8636cf478d42…) -> 0.8 (b8f950105010…) | ||
697 | - usbutils 015 -> 017 | ||
698 | - util-linux 2.39.2 -> 2.39.3 | ||
699 | - util-linux-libuuid 2.39.2 -> 2.39.3 | ||
700 | - vala 0.56.13 -> 0.56.15 | ||
701 | - valgrind 3.21.0 -> 3.22.0 | ||
702 | - vim 9.0.2190 -> 9.1.0114 | ||
703 | - vim-tiny 9.0.2190 -> 9.1.0114 | ||
704 | - virglrenderer 0.10.4 -> 1.0.1 | ||
705 | - vte 0.72.2 -> 0.74.2 | ||
706 | - vulkan-headers 1.3.261.1 -> 1.3.275.0 | ||
707 | - vulkan-loader 1.3.261.1 -> 1.3.275.0 | ||
708 | - vulkan-tools 1.3.261.1 -> 1.3.275.0 | ||
709 | - vulkan-validation-layers 1.3.261.1 -> 1.3.275.0 | ||
710 | - wayland-protocols 1.32 -> 1.33 | ||
711 | - webkitgtk 2.40.5 -> 2.44.0 | ||
712 | - weston 12.0.2 -> 13.0.0 | ||
713 | - xkbcomp 1.4.6 -> 1.4.7 | ||
714 | - xkeyboard-config 2.39 -> 2.41 | ||
715 | - xprop 1.2.6 -> 1.2.7 | ||
716 | - xwayland 23.2.4 -> 23.2.5 | ||
717 | - xz 5.4.4 -> 5.4.6 | ||
718 | - zlib 1.3 -> 1.3.1 | ||
719 | |||
720 | |||
59 | Contributors to 5.0 | 721 | Contributors to 5.0 |
60 | ~~~~~~~~~~~~~~~~~~~ | 722 | ~~~~~~~~~~~~~~~~~~~ |
61 | 723 | ||
62 | Thanks to the following people who contributed to this release: | 724 | Thanks to the following people who contributed to this release: |
63 | 725 | ||
726 | - Adam Johnston | ||
727 | - Adithya Balakumar | ||
728 | - Adrian Freihofer | ||
729 | - Alassane Yattara | ||
730 | - Alejandro Hernandez Samaniego | ||
731 | - Aleksey Smirnov | ||
732 | - Alexander Kanavin | ||
733 | - Alexander Lussier-Cullen | ||
734 | - Alexander Sverdlin | ||
735 | - Alexandre Belloni | ||
736 | - Alexandre Truong | ||
737 | - Alex Bennée | ||
738 | - Alexis Lothoré | ||
739 | - Alex Kiernan | ||
740 | - Alex Stewart | ||
741 | - André Draszik | ||
742 | - Anibal Limon | ||
743 | - Anuj Mittal | ||
744 | - Archana Polampalli | ||
745 | - Arne Schwerdt | ||
746 | - Bartosz Golaszewski | ||
747 | - Baruch Siach | ||
748 | - Bastian Krause | ||
749 | - BELHADJ SALEM Talel | ||
750 | - BELOUARGA Mohamed | ||
751 | - Bruce Ashfield | ||
752 | - Changhyeok Bae | ||
753 | - Changqing Li | ||
754 | - Charlie Johnston | ||
755 | - Chen Qi | ||
756 | - Chi Xu | ||
757 | - Chris Laplante | ||
758 | - Christian Taedcke | ||
759 | - Christoph Vogtländer | ||
760 | - Claus Stovgaard | ||
761 | - Clay Chang | ||
762 | - Clément Péron | ||
763 | - Colin McAllister | ||
764 | - Corentin Guillevic | ||
765 | - Daniel Ammann | ||
766 | - david d zuhn | ||
767 | - David Reyna | ||
768 | - Deepthi Hemraj | ||
769 | - Denys Dmytriyenko | ||
770 | - Derek Erdmann | ||
771 | - Desone Burns | ||
772 | - Dhairya Nagodra | ||
773 | - Dmitry Baryshkov | ||
774 | - Eero Aaltonen | ||
775 | - Eilís 'pidge' Ní Fhlannagáin | ||
776 | - Emil Kronborg | ||
777 | - Enguerrand de Ribaucourt | ||
778 | - Enrico Jörns | ||
779 | - Enrico Scholz | ||
780 | - Etienne Cordonnier | ||
781 | - Fabien Mahot | ||
782 | - Fabio Estevam | ||
783 | - Fahad Arslan | ||
784 | - Felix Moessbauer | ||
785 | - Florian Wickert | ||
786 | - Geoff Parker | ||
787 | - Glenn Strauss | ||
788 | - Harish Sadineni | ||
789 | - Hongxu Jia | ||
790 | - Ilya A. Kriveshko | ||
791 | - Jamin Lin | ||
792 | - Jan Vermaete | ||
793 | - Jason Andryuk | ||
794 | - Javier Tia | ||
795 | - Jeremy A. Puhlman | ||
796 | - Jérémy Rosen | ||
797 | - Jermain Horsman | ||
798 | - Jiang Kai | ||
799 | - Joakim Tjernlund | ||
800 | - Joao Marcos Costa | ||
801 | - Joe Slater | ||
802 | - Johan Bezem | ||
803 | - Johannes Schneider | ||
804 | - Jonathan GUILLOT | ||
805 | - Jon Mason | ||
806 | - Jörg Sommer | ||
807 | - Jose Quaresma | ||
808 | - Joshua Watt | ||
809 | - Julien Stephan | ||
810 | - Justin Bronder | ||
811 | - Kai Kang | ||
812 | - Kareem Zarka | ||
813 | - Kevin Hao | ||
814 | - Khem Raj | ||
815 | - Konrad Weihmann | ||
816 | - Lee Chee Yang | ||
817 | - Lei Maohui | ||
818 | - lixiaoyong | ||
819 | - Logan Gunthorpe | ||
820 | - Luca Ceresoli | ||
821 | - luca fancellu | ||
822 | - Lucas Stach | ||
823 | - Ludovic Jozeau | ||
824 | - Lukas Funke | ||
825 | - Maanya Goenka | ||
826 | - Malte Schmidt | ||
827 | - Marcel Ziswiler | ||
828 | - Marco Felsch | ||
829 | - Marcus Folkesson | ||
830 | - Marek Vasut | ||
831 | - Mark Asselstine | ||
832 | - Mark Hatle | ||
833 | - Markus Fuchs | ||
834 | - Markus Volk | ||
835 | - Marlon Rodriguez Garcia | ||
836 | - Marta Rybczynska | ||
837 | - Martin Hundebøll | ||
838 | - Martin Jansa | ||
839 | - Massimiliano Minella | ||
840 | - Maxin B. John | ||
841 | - Max Krummenacher | ||
842 | - Meenali Gupta | ||
843 | - Michael Halstead | ||
844 | - Michael Opdenacker | ||
845 | - Michal Sieron | ||
846 | - Mikko Rapeli | ||
847 | - Ming Liu | ||
848 | - Mingli Yu | ||
849 | - Munehisa Kamata | ||
850 | - Nick Owens | ||
851 | - Niko Mauno | ||
852 | - Ola x Nilsson | ||
853 | - Oleh Matiusha | ||
854 | - Patrick Williams | ||
855 | - Paul Barker | ||
856 | - Paul Eggleton | ||
857 | - Paul Gortmaker | ||
858 | - Pavel Zhukov | ||
859 | - Peter A. Bigot | ||
860 | - Peter Kjellerstedt | ||
861 | - Peter Marko | ||
862 | - Petr Vorel | ||
863 | - Philip Balister | ||
864 | - Philip Lorenz | ||
865 | - Philippe Rivest | ||
866 | - Piotr Łobacz | ||
867 | - Priyal Doshi | ||
868 | - Quentin Schulz | ||
869 | - Ragesh Nair | ||
870 | - Randolph Sapp | ||
871 | - Randy MacLeod | ||
872 | - Rasmus Villemoes | ||
873 | - Renat Khalikov | ||
874 | - Richard Haar | ||
875 | - Richard Purdie | ||
876 | - Robert Berger | ||
877 | - Robert Joslyn | ||
878 | - Robert P. J. Day | ||
879 | - Robert Yang | ||
880 | - Rodrigo M. Duarte | ||
881 | - Ross Burton | ||
882 | - Rouven Czerwinski | ||
883 | - Ryan Eatmon | ||
884 | - Sam Van Den Berge | ||
885 | - Saul Wold | ||
886 | - Sava Jakovljev | ||
887 | - Sean Nyekjaer | ||
888 | - Sergei Zhmylev | ||
889 | - Shinji Matsunaga | ||
890 | - Shubham Kulkarni | ||
891 | - Simone Weiß | ||
892 | - Siong W.LIM | ||
893 | - Soumya Sambu | ||
894 | - Sourav Kumar Pramanik | ||
895 | - Stefan Herbrechtsmeier | ||
896 | - Stéphane Veyret | ||
897 | - Steve Sakoman | ||
898 | - Sundeep KOKKONDA | ||
899 | - Thomas Perrot | ||
900 | - Thomas Wolber | ||
901 | - Timon Bergelt | ||
902 | - Tim Orling | ||
903 | - Timotheus Giuliani | ||
904 | - Tobias Hagelborn | ||
905 | - Tom Hochstein | ||
906 | - Tom Rini | ||
907 | - Toni Lammi | ||
908 | - Trevor Gamblin | ||
909 | - Trevor Woerner | ||
910 | - Ulrich Ölmann | ||
911 | - Valek Andrej | ||
912 | - venkata pyla | ||
913 | - Victor Kamensky | ||
914 | - Vijay Anusuri | ||
915 | - Vikas Katariya | ||
916 | - Vincent Davis Jr | ||
917 | - Viswanath Kraleti | ||
918 | - Vyacheslav Yurkov | ||
919 | - Wang Mingyu | ||
920 | - William A. Kennington III | ||
921 | - William Hauser | ||
922 | - William Lyu | ||
923 | - Xiangyu Chen | ||
924 | - Xiaotian Wu | ||
925 | - Yang Xu | ||
926 | - Yannick Rodriguez | ||
927 | - Yash Shinde | ||
928 | - Yi Zhao | ||
929 | - Yoann Congal | ||
930 | - Yogesh Tyagi | ||
931 | - Yogita Urade | ||
932 | - Zahir Hussain | ||
933 | - Zang Ruochen | ||
934 | - Zoltan Boszormenyi | ||
935 | |||
64 | Repositories / Downloads for Yocto-5.0 | 936 | Repositories / Downloads for Yocto-5.0 |
65 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 937 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
66 | 938 | ||
939 | poky | ||
940 | |||
941 | - Repository Location: :yocto_git:`/poky` | ||
942 | - Branch: :yocto_git:`scarthgap </poky/log/?h=scarthgap>` | ||
943 | - Tag: :yocto_git:`yocto-5.0 </poky/log/?h=yocto-5.0>` | ||
944 | - Git Revision: :yocto_git:`fb91a49387cfb0c8d48303bb3354325ba2a05587 </poky/commit/?id=fb91a49387cfb0c8d48303bb3354325ba2a05587>` | ||
945 | - Release Artefact: poky-fb91a49387cfb0c8d48303bb3354325ba2a05587 | ||
946 | - sha: 8a0dff4b677b9414ab814ed35d1880196123732ea16ab2fafa388bcc509b32ab | ||
947 | - Download Locations: | ||
948 | http://downloads.yoctoproject.org/releases/yocto/yocto-5.0/poky-fb91a49387cfb0c8d48303bb3354325ba2a05587.tar.bz2 | ||
949 | http://mirrors.kernel.org/yocto/yocto/yocto-5.0/poky-fb91a49387cfb0c8d48303bb3354325ba2a05587.tar.bz2 | ||
950 | |||
951 | openembedded-core | ||
952 | |||
953 | - Repository Location: :oe_git:`/openembedded-core` | ||
954 | - Branch: :oe_git:`scarthgap </openembedded-core/log/?h=scarthgap>` | ||
955 | - Tag: :oe_git:`yocto-5.0 </openembedded-core/log/?h=yocto-5.0>` | ||
956 | - Git Revision: :oe_git:`b65b4e5a8e4473d8ca43835ba17bc8bd4bdca277 </openembedded-core/commit/?id=b65b4e5a8e4473d8ca43835ba17bc8bd4bdca277>` | ||
957 | - Release Artefact: oecore-b65b4e5a8e4473d8ca43835ba17bc8bd4bdca277 | ||
958 | - sha: c7fd05d1a00c70acba2540e60dce01a1bdc4701ebff9a808784960240c69261d | ||
959 | - Download Locations: | ||
960 | http://downloads.yoctoproject.org/releases/yocto/yocto-5.0/oecore-b65b4e5a8e4473d8ca43835ba17bc8bd4bdca277.tar.bz2 | ||
961 | http://mirrors.kernel.org/yocto/yocto/yocto-5.0/oecore-b65b4e5a8e4473d8ca43835ba17bc8bd4bdca277.tar.bz2 | ||
962 | |||
963 | meta-mingw | ||
964 | |||
965 | - Repository Location: :yocto_git:`/meta-mingw` | ||
966 | - Branch: :yocto_git:`scarthgap </meta-mingw/log/?h=scarthgap>` | ||
967 | - Tag: :yocto_git:`yocto-5.0 </meta-mingw/log/?h=yocto-5.0>` | ||
968 | - Git Revision: :yocto_git:`acbba477893ef87388effc4679b7f40ee49fc852 </meta-mingw/commit/?id=acbba477893ef87388effc4679b7f40ee49fc852>` | ||
969 | - Release Artefact: meta-mingw-acbba477893ef87388effc4679b7f40ee49fc852 | ||
970 | - sha: 3b7c2f475dad5130bace652b150367f587d44b391218b1364a8bbc430b48c54c | ||
971 | - Download Locations: | ||
972 | http://downloads.yoctoproject.org/releases/yocto/yocto-5.0/meta-mingw-acbba477893ef87388effc4679b7f40ee49fc852.tar.bz2 | ||
973 | http://mirrors.kernel.org/yocto/yocto/yocto-5.0/meta-mingw-acbba477893ef87388effc4679b7f40ee49fc852.tar.bz2 | ||
974 | |||
975 | bitbake | ||
976 | |||
977 | - Repository Location: :oe_git:`/bitbake` | ||
978 | - Branch: :oe_git:`2.8 </bitbake/log/?h=2.8>` | ||
979 | - Tag: :oe_git:`yocto-5.0 </bitbake/log/?h=yocto-5.0>` | ||
980 | - Git Revision: :oe_git:`c86466d51e8ff14e57a734c1eec5bb651fdc73ef </bitbake/commit/?id=c86466d51e8ff14e57a734c1eec5bb651fdc73ef>` | ||
981 | - Release Artefact: bitbake-c86466d51e8ff14e57a734c1eec5bb651fdc73ef | ||
982 | - sha: 45c91294c1fa5a0044f1bb72a9bb69456bb458747114115af85c7664bf672d48 | ||
983 | - Download Locations: | ||
984 | http://downloads.yoctoproject.org/releases/yocto/yocto-5.0/bitbake-c86466d51e8ff14e57a734c1eec5bb651fdc73ef.tar.bz2 | ||
985 | http://mirrors.kernel.org/yocto/yocto/yocto-5.0/bitbake-c86466d51e8ff14e57a734c1eec5bb651fdc73ef.tar.bz2 | ||
986 | |||
987 | yocto-docs | ||
988 | |||
989 | - Repository Location: :yocto_git:`/yocto-docs` | ||
990 | - Branch: :yocto_git:`scarthgap </yocto-docs/log/?h=scarthgap>` | ||
991 | - Tag: :yocto_git:`yocto-5.0 </yocto-docs/log/?h=yocto-5.0>` | ||
992 | - Git Revision: :yocto_git:`0cdc0afd3332459d30cfc8f4c2e62bdcc23f5ed5 </yocto-docs/commit/?id=0cdc0afd3332459d30cfc8f4c2e62bdcc23f5ed5>` | ||
993 | |||
diff --git a/documentation/overview-manual/intro.rst b/documentation/overview-manual/intro.rst index a8091771f4..80446b3810 100644 --- a/documentation/overview-manual/intro.rst +++ b/documentation/overview-manual/intro.rst | |||
@@ -38,7 +38,7 @@ This manual does not give you the following: | |||
38 | procedures reside in other manuals within the Yocto Project | 38 | procedures reside in other manuals within the Yocto Project |
39 | documentation set. For example, the :doc:`/dev-manual/index` | 39 | documentation set. For example, the :doc:`/dev-manual/index` |
40 | provides examples on how to perform | 40 | provides examples on how to perform |
41 | various development tasks. As another example, the | 41 | various development tasks. As another example, the |
42 | :doc:`/sdk-manual/index` manual contains detailed | 42 | :doc:`/sdk-manual/index` manual contains detailed |
43 | instructions on how to install an SDK, which is used to develop | 43 | instructions on how to install an SDK, which is used to develop |
44 | applications for target hardware. | 44 | applications for target hardware. |
diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in index 7a686ac4e1..0c04b615ea 100644 --- a/documentation/poky.yaml.in +++ b/documentation/poky.yaml.in | |||
@@ -1,10 +1,10 @@ | |||
1 | DISTRO : "4.3" | 1 | DISTRO : "5.0" |
2 | DISTRO_NAME_NO_CAP : "nanbield" | 2 | DISTRO_NAME_NO_CAP : "scarthgap" |
3 | DISTRO_NAME : "Nanbield" | 3 | DISTRO_NAME : "Scarthgap" |
4 | DISTRO_NAME_NO_CAP_MINUS_ONE : "mickledore" | 4 | DISTRO_NAME_NO_CAP_MINUS_ONE : "nanbield" |
5 | DISTRO_NAME_NO_CAP_LTS : "kirkstone" | 5 | DISTRO_NAME_NO_CAP_LTS : "scarthgap" |
6 | YOCTO_DOC_VERSION : "4.3" | 6 | YOCTO_DOC_VERSION : "5.0" |
7 | DISTRO_REL_TAG : "yocto-4.3" | 7 | DISTRO_REL_TAG : "yocto-5.0" |
8 | DOCCONF_VERSION : "dev" | 8 | DOCCONF_VERSION : "dev" |
9 | BITBAKE_SERIES : "" | 9 | BITBAKE_SERIES : "" |
10 | YOCTO_DL_URL : "https://downloads.yoctoproject.org" | 10 | YOCTO_DL_URL : "https://downloads.yoctoproject.org" |
@@ -12,18 +12,18 @@ YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" | |||
12 | YOCTO_RELEASE_DL_URL : "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;" | 12 | YOCTO_RELEASE_DL_URL : "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;" |
13 | UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git diffstat unzip texinfo gcc \ | 13 | UBUNTU_HOST_PACKAGES_ESSENTIAL : "gawk wget git diffstat unzip texinfo gcc \ |
14 | build-essential chrpath socat cpio python3 python3-pip python3-pexpect \ | 14 | build-essential chrpath socat cpio python3 python3-pip python3-pexpect \ |
15 | xz-utils debianutils iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \ | 15 | xz-utils debianutils iputils-ping python3-git python3-jinja2 \ |
16 | python3-subunit mesa-common-dev zstd liblz4-tool file locales libacl1 | 16 | python3-subunit zstd liblz4-tool file locales libacl1 |
17 | \n\ $ sudo locale-gen en_US.UTF-8" | 17 | \n\ $ sudo locale-gen en_US.UTF-8" |
18 | FEDORA_HOST_PACKAGES_ESSENTIAL : "gawk make wget tar bzip2 gzip python3 unzip perl patch \ | 18 | FEDORA_HOST_PACKAGES_ESSENTIAL : "gawk make wget tar bzip2 gzip python3 unzip perl patch \ |
19 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ | 19 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ |
20 | ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \ | 20 | ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \ |
21 | python3-pexpect findutils which file cpio python python3-pip xz python3-GitPython \ | 21 | python3-pexpect findutils which file cpio python python3-pip xz python3-GitPython \ |
22 | python3-jinja2 SDL-devel rpcgen mesa-libGL-devel perl-FindBin perl-File-Compare \ | 22 | python3-jinja2 rpcgen perl-FindBin perl-File-Compare \ |
23 | perl-File-Copy perl-locale zstd lz4 hostname glibc-langpack-en libacl" | 23 | perl-File-Copy perl-locale zstd lz4 hostname glibc-langpack-en libacl" |
24 | OPENSUSE_HOST_PACKAGES_ESSENTIAL : "python gcc gcc-c++ git chrpath make wget python-xml \ | 24 | OPENSUSE_HOST_PACKAGES_ESSENTIAL : "python gcc gcc-c++ git chrpath make wget python-xml \ |
25 | diffstat makeinfo python-curses patch socat python3 python3-curses tar python3-pip \ | 25 | diffstat makeinfo python-curses patch socat python3 python3-curses tar python3-pip \ |
26 | python3-pexpect xz which python3-Jinja2 Mesa-libEGL1 libSDL-devel rpcgen Mesa-dri-devel \ | 26 | python3-pexpect xz which python3-Jinja2 rpcgen \ |
27 | zstd lz4 bzip2 gzip hostname libacl1 | 27 | zstd lz4 bzip2 gzip hostname libacl1 |
28 | \n\ $ sudo pip3 install GitPython" | 28 | \n\ $ sudo pip3 install GitPython" |
29 | ALMALINUX_HOST_PACKAGES_ESSENTIAL : "-y epel-release | 29 | ALMALINUX_HOST_PACKAGES_ESSENTIAL : "-y epel-release |
@@ -33,8 +33,8 @@ ALMALINUX_HOST_PACKAGES_ESSENTIAL : "-y epel-release | |||
33 | \n\ $ sudo dnf install gawk make wget tar bzip2 gzip python3 unzip perl patch \ | 33 | \n\ $ sudo dnf install gawk make wget tar bzip2 gzip python3 unzip perl patch \ |
34 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath ccache \ | 34 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath ccache \ |
35 | socat perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python3-pip \ | 35 | socat perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python3-pip \ |
36 | python3-GitPython python3-jinja2 python3-pexpect xz which SDL-devel \ | 36 | python3-GitPython python3-jinja2 python3-pexpect xz which \ |
37 | rpcgen mesa-libGL-devel zstd lz4 cpio glibc-langpack-en libacl" | 37 | rpcgen zstd lz4 cpio glibc-langpack-en libacl" |
38 | PIP3_HOST_PACKAGES_DOC : "$ sudo pip3 install sphinx sphinx_rtd_theme pyyaml" | 38 | PIP3_HOST_PACKAGES_DOC : "$ sudo pip3 install sphinx sphinx_rtd_theme pyyaml" |
39 | MIN_PYTHON_VERSION : "3.8.0" | 39 | MIN_PYTHON_VERSION : "3.8.0" |
40 | MIN_TAR_VERSION : "1.28" | 40 | MIN_TAR_VERSION : "1.28" |
diff --git a/documentation/profile-manual/usage.rst b/documentation/profile-manual/usage.rst index 2f82137538..17be149580 100644 --- a/documentation/profile-manual/usage.rst +++ b/documentation/profile-manual/usage.rst | |||
@@ -1058,13 +1058,13 @@ section:: | |||
1058 | name: do_fork | 1058 | name: do_fork |
1059 | ID: 944 | 1059 | ID: 944 |
1060 | format: | 1060 | format: |
1061 | field:unsigned short common_type; offset:0; size:2; signed:0; | 1061 | field:unsigned short common_type; offset:0; size:2; signed:0; |
1062 | field:unsigned char common_flags; offset:2; size:1; signed:0; | 1062 | field:unsigned char common_flags; offset:2; size:1; signed:0; |
1063 | field:unsigned char common_preempt_count; offset:3; size:1; signed:0; | 1063 | field:unsigned char common_preempt_count; offset:3; size:1; signed:0; |
1064 | field:int common_pid; offset:4; size:4; signed:1; | 1064 | field:int common_pid; offset:4; size:4; signed:1; |
1065 | field:int common_padding; offset:8; size:4; signed:1; | 1065 | field:int common_padding; offset:8; size:4; signed:1; |
1066 | 1066 | ||
1067 | field:unsigned long __probe_ip; offset:12; size:4; signed:0; | 1067 | field:unsigned long __probe_ip; offset:12; size:4; signed:0; |
1068 | 1068 | ||
1069 | print fmt: "(%lx)", REC->__probe_ip | 1069 | print fmt: "(%lx)", REC->__probe_ip |
1070 | 1070 | ||
@@ -1550,17 +1550,17 @@ like ftrace to display the event as text. The format of the | |||
1550 | name: kmalloc | 1550 | name: kmalloc |
1551 | ID: 313 | 1551 | ID: 313 |
1552 | format: | 1552 | format: |
1553 | field:unsigned short common_type; offset:0; size:2; signed:0; | 1553 | field:unsigned short common_type; offset:0; size:2; signed:0; |
1554 | field:unsigned char common_flags; offset:2; size:1; signed:0; | 1554 | field:unsigned char common_flags; offset:2; size:1; signed:0; |
1555 | field:unsigned char common_preempt_count; offset:3; size:1; signed:0; | 1555 | field:unsigned char common_preempt_count; offset:3; size:1; signed:0; |
1556 | field:int common_pid; offset:4; size:4; signed:1; | 1556 | field:int common_pid; offset:4; size:4; signed:1; |
1557 | field:int common_padding; offset:8; size:4; signed:1; | 1557 | field:int common_padding; offset:8; size:4; signed:1; |
1558 | 1558 | ||
1559 | field:unsigned long call_site; offset:16; size:8; signed:0; | 1559 | field:unsigned long call_site; offset:16; size:8; signed:0; |
1560 | field:const void * ptr; offset:24; size:8; signed:0; | 1560 | field:const void * ptr; offset:24; size:8; signed:0; |
1561 | field:size_t bytes_req; offset:32; size:8; signed:0; | 1561 | field:size_t bytes_req; offset:32; size:8; signed:0; |
1562 | field:size_t bytes_alloc; offset:40; size:8; signed:0; | 1562 | field:size_t bytes_alloc; offset:40; size:8; signed:0; |
1563 | field:gfp_t gfp_flags; offset:48; size:4; signed:0; | 1563 | field:gfp_t gfp_flags; offset:48; size:4; signed:0; |
1564 | 1564 | ||
1565 | print fmt: "call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", REC->call_site, REC->ptr, REC->bytes_req, REC->bytes_alloc, | 1565 | print fmt: "call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", REC->call_site, REC->ptr, REC->bytes_req, REC->bytes_alloc, |
1566 | (REC->gfp_flags) ? __print_flags(REC->gfp_flags, "|", {(unsigned long)(((( gfp_t)0x10u) | (( gfp_t)0x40u) | (( gfp_t)0x80u) | (( | 1566 | (REC->gfp_flags) ? __print_flags(REC->gfp_flags, "|", {(unsigned long)(((( gfp_t)0x10u) | (( gfp_t)0x40u) | (( gfp_t)0x80u) | (( |
@@ -1872,7 +1872,7 @@ Practically speaking, that means you need to do the following: | |||
1872 | 1872 | ||
1873 | - Or build a non-SDK image but include the profiling tools | 1873 | - Or build a non-SDK image but include the profiling tools |
1874 | (edit ``local.conf`` and add ``tools-profile`` to the end of | 1874 | (edit ``local.conf`` and add ``tools-profile`` to the end of |
1875 | :term:``EXTRA_IMAGE_FEATURES`` variable):: | 1875 | :term:`EXTRA_IMAGE_FEATURES` variable):: |
1876 | 1876 | ||
1877 | $ bitbake core-image-sato | 1877 | $ bitbake core-image-sato |
1878 | 1878 | ||
@@ -2355,29 +2355,29 @@ first part of the filenames:: | |||
2355 | 8,32 1 0 58.516990819 0 m N cfq3551 put_queue | 2355 | 8,32 1 0 58.516990819 0 m N cfq3551 put_queue |
2356 | 2356 | ||
2357 | CPU0 (sdc): | 2357 | CPU0 (sdc): |
2358 | Reads Queued: 0, 0KiB Writes Queued: 331, 26,284KiB | 2358 | Reads Queued: 0, 0KiB Writes Queued: 331, 26,284KiB |
2359 | Read Dispatches: 0, 0KiB Write Dispatches: 485, 40,484KiB | 2359 | Read Dispatches: 0, 0KiB Write Dispatches: 485, 40,484KiB |
2360 | Reads Requeued: 0 Writes Requeued: 0 | 2360 | Reads Requeued: 0 Writes Requeued: 0 |
2361 | Reads Completed: 0, 0KiB Writes Completed: 511, 41,000KiB | 2361 | Reads Completed: 0, 0KiB Writes Completed: 511, 41,000KiB |
2362 | Read Merges: 0, 0KiB Write Merges: 13, 160KiB | 2362 | Read Merges: 0, 0KiB Write Merges: 13, 160KiB |
2363 | Read depth: 0 Write depth: 2 | 2363 | Read depth: 0 Write depth: 2 |
2364 | IO unplugs: 23 Timer unplugs: 0 | 2364 | IO unplugs: 23 Timer unplugs: 0 |
2365 | CPU1 (sdc): | 2365 | CPU1 (sdc): |
2366 | Reads Queued: 0, 0KiB Writes Queued: 249, 15,800KiB | 2366 | Reads Queued: 0, 0KiB Writes Queued: 249, 15,800KiB |
2367 | Read Dispatches: 0, 0KiB Write Dispatches: 42, 1,600KiB | 2367 | Read Dispatches: 0, 0KiB Write Dispatches: 42, 1,600KiB |
2368 | Reads Requeued: 0 Writes Requeued: 0 | 2368 | Reads Requeued: 0 Writes Requeued: 0 |
2369 | Reads Completed: 0, 0KiB Writes Completed: 16, 1,084KiB | 2369 | Reads Completed: 0, 0KiB Writes Completed: 16, 1,084KiB |
2370 | Read Merges: 0, 0KiB Write Merges: 40, 276KiB | 2370 | Read Merges: 0, 0KiB Write Merges: 40, 276KiB |
2371 | Read depth: 0 Write depth: 2 | 2371 | Read depth: 0 Write depth: 2 |
2372 | IO unplugs: 30 Timer unplugs: 1 | 2372 | IO unplugs: 30 Timer unplugs: 1 |
2373 | 2373 | ||
2374 | Total (sdc): | 2374 | Total (sdc): |
2375 | Reads Queued: 0, 0KiB Writes Queued: 580, 42,084KiB | 2375 | Reads Queued: 0, 0KiB Writes Queued: 580, 42,084KiB |
2376 | Read Dispatches: 0, 0KiB Write Dispatches: 527, 42,084KiB | 2376 | Read Dispatches: 0, 0KiB Write Dispatches: 527, 42,084KiB |
2377 | Reads Requeued: 0 Writes Requeued: 0 | 2377 | Reads Requeued: 0 Writes Requeued: 0 |
2378 | Reads Completed: 0, 0KiB Writes Completed: 527, 42,084KiB | 2378 | Reads Completed: 0, 0KiB Writes Completed: 527, 42,084KiB |
2379 | Read Merges: 0, 0KiB Write Merges: 53, 436KiB | 2379 | Read Merges: 0, 0KiB Write Merges: 53, 436KiB |
2380 | IO unplugs: 53 Timer unplugs: 1 | 2380 | IO unplugs: 53 Timer unplugs: 1 |
2381 | 2381 | ||
2382 | Throughput (R/W): 0KiB/s / 719KiB/s | 2382 | Throughput (R/W): 0KiB/s / 719KiB/s |
2383 | Events (sdc): 6,592 entries | 2383 | Events (sdc): 6,592 entries |
@@ -2500,29 +2500,29 @@ And run blkparse on the host system using the device name:: | |||
2500 | 8,32 1 0 177.266696560 0 m N cfq1267 put_queue | 2500 | 8,32 1 0 177.266696560 0 m N cfq1267 put_queue |
2501 | 2501 | ||
2502 | CPU0 (sdc): | 2502 | CPU0 (sdc): |
2503 | Reads Queued: 0, 0KiB Writes Queued: 270, 21,708KiB | 2503 | Reads Queued: 0, 0KiB Writes Queued: 270, 21,708KiB |
2504 | Read Dispatches: 59, 2,628KiB Write Dispatches: 495, 39,964KiB | 2504 | Read Dispatches: 59, 2,628KiB Write Dispatches: 495, 39,964KiB |
2505 | Reads Requeued: 0 Writes Requeued: 0 | 2505 | Reads Requeued: 0 Writes Requeued: 0 |
2506 | Reads Completed: 90, 2,752KiB Writes Completed: 543, 41,596KiB | 2506 | Reads Completed: 90, 2,752KiB Writes Completed: 543, 41,596KiB |
2507 | Read Merges: 0, 0KiB Write Merges: 9, 344KiB | 2507 | Read Merges: 0, 0KiB Write Merges: 9, 344KiB |
2508 | Read depth: 2 Write depth: 2 | 2508 | Read depth: 2 Write depth: 2 |
2509 | IO unplugs: 20 Timer unplugs: 1 | 2509 | IO unplugs: 20 Timer unplugs: 1 |
2510 | CPU1 (sdc): | 2510 | CPU1 (sdc): |
2511 | Reads Queued: 688, 2,752KiB Writes Queued: 381, 20,652KiB | 2511 | Reads Queued: 688, 2,752KiB Writes Queued: 381, 20,652KiB |
2512 | Read Dispatches: 31, 124KiB Write Dispatches: 59, 2,396KiB | 2512 | Read Dispatches: 31, 124KiB Write Dispatches: 59, 2,396KiB |
2513 | Reads Requeued: 0 Writes Requeued: 0 | 2513 | Reads Requeued: 0 Writes Requeued: 0 |
2514 | Reads Completed: 0, 0KiB Writes Completed: 11, 764KiB | 2514 | Reads Completed: 0, 0KiB Writes Completed: 11, 764KiB |
2515 | Read Merges: 598, 2,392KiB Write Merges: 88, 448KiB | 2515 | Read Merges: 598, 2,392KiB Write Merges: 88, 448KiB |
2516 | Read depth: 2 Write depth: 2 | 2516 | Read depth: 2 Write depth: 2 |
2517 | IO unplugs: 52 Timer unplugs: 0 | 2517 | IO unplugs: 52 Timer unplugs: 0 |
2518 | 2518 | ||
2519 | Total (sdc): | 2519 | Total (sdc): |
2520 | Reads Queued: 688, 2,752KiB Writes Queued: 651, 42,360KiB | 2520 | Reads Queued: 688, 2,752KiB Writes Queued: 651, 42,360KiB |
2521 | Read Dispatches: 90, 2,752KiB Write Dispatches: 554, 42,360KiB | 2521 | Read Dispatches: 90, 2,752KiB Write Dispatches: 554, 42,360KiB |
2522 | Reads Requeued: 0 Writes Requeued: 0 | 2522 | Reads Requeued: 0 Writes Requeued: 0 |
2523 | Reads Completed: 90, 2,752KiB Writes Completed: 554, 42,360KiB | 2523 | Reads Completed: 90, 2,752KiB Writes Completed: 554, 42,360KiB |
2524 | Read Merges: 598, 2,392KiB Write Merges: 97, 792KiB | 2524 | Read Merges: 598, 2,392KiB Write Merges: 97, 792KiB |
2525 | IO unplugs: 72 Timer unplugs: 1 | 2525 | IO unplugs: 72 Timer unplugs: 1 |
2526 | 2526 | ||
2527 | Throughput (R/W): 15KiB/s / 238KiB/s | 2527 | Throughput (R/W): 15KiB/s / 238KiB/s |
2528 | Events (sdc): 9,301 entries | 2528 | Events (sdc): 9,301 entries |
diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst index ab71cbe40c..9520d0bf7c 100644 --- a/documentation/ref-manual/classes.rst +++ b/documentation/ref-manual/classes.rst | |||
@@ -564,6 +564,13 @@ The ``Patched`` state of a CVE issue is detected from patch files with the forma | |||
564 | ``CVE-ID.patch``, e.g. ``CVE-2019-20633.patch``, in the :term:`SRC_URI` and using | 564 | ``CVE-ID.patch``, e.g. ``CVE-2019-20633.patch``, in the :term:`SRC_URI` and using |
565 | CVE metadata of format ``CVE: CVE-ID`` in the commit message of the patch file. | 565 | CVE metadata of format ``CVE: CVE-ID`` in the commit message of the patch file. |
566 | 566 | ||
567 | .. note:: | ||
568 | |||
569 | Commit message metadata (``CVE: CVE-ID`` in a patch header) will not be scanned | ||
570 | in any patches that are remote, i.e. that are anything other than local files | ||
571 | referenced via ``file://`` in SRC_URI. However, a ``CVE-ID`` in a remote patch | ||
572 | file name itself will be registered. | ||
573 | |||
567 | If the recipe adds ``CVE-ID`` as flag of the :term:`CVE_STATUS` variable with status | 574 | If the recipe adds ``CVE-ID`` as flag of the :term:`CVE_STATUS` variable with status |
568 | mapped to ``Ignored``, then the CVE state is reported as ``Ignored``:: | 575 | mapped to ``Ignored``, then the CVE state is reported as ``Ignored``:: |
569 | 576 | ||
@@ -665,7 +672,7 @@ The padding size can be modified by setting :term:`DT_PADDING_SIZE` | |||
665 | to the desired size, in bytes. | 672 | to the desired size, in bytes. |
666 | 673 | ||
667 | See :oe_git:`devicetree.bbclass sources | 674 | See :oe_git:`devicetree.bbclass sources |
668 | </openembedded-core/tree/meta/classes-recipe/devicetree.bbclass>` | 675 | </openembedded-core/tree/meta/classes-recipe/devicetree.bbclass>` |
669 | for further variables controlling this class. | 676 | for further variables controlling this class. |
670 | 677 | ||
671 | Here is an excerpt of an example ``recipes-kernel/linux/devicetree-acme.bb`` | 678 | Here is an excerpt of an example ``recipes-kernel/linux/devicetree-acme.bb`` |
@@ -939,6 +946,20 @@ The :ref:`ref-classes-go-mod` class allows to use Go modules, and inherits the | |||
939 | 946 | ||
940 | See the associated :term:`GO_WORKDIR` variable. | 947 | See the associated :term:`GO_WORKDIR` variable. |
941 | 948 | ||
949 | .. _ref-classes-go-vendor: | ||
950 | |||
951 | ``go-vendor`` | ||
952 | ============= | ||
953 | |||
954 | The :ref:`ref-classes-go-vendor` class implements support for offline builds, | ||
955 | also known as Go vendoring. In such a scenario, the module dependencias are | ||
956 | downloaded during the :ref:`ref-tasks-fetch` task rather than when modules are | ||
957 | imported, thus being coherent with Yocto's concept of fetching every source | ||
958 | beforehand. | ||
959 | |||
960 | The dependencies are unpacked into the modules' ``vendor`` directory, where a | ||
961 | manifest file is generated. | ||
962 | |||
942 | .. _ref-classes-gobject-introspection: | 963 | .. _ref-classes-gobject-introspection: |
943 | 964 | ||
944 | ``gobject-introspection`` | 965 | ``gobject-introspection`` |
@@ -1568,6 +1589,12 @@ The tests you can list with the :term:`WARN_QA` and | |||
1568 | This is only relevant when you are using runtime package management | 1589 | This is only relevant when you are using runtime package management |
1569 | on your target system. | 1590 | on your target system. |
1570 | 1591 | ||
1592 | - ``virtual-slash:`` Checks to see if ``virtual/`` is being used in | ||
1593 | :term:`RDEPENDS` or :term:`RPROVIDES`, which is not good practice --- | ||
1594 | ``virtual/`` is a convention intended for use in the build context | ||
1595 | (i.e. :term:`PROVIDES` and :term:`DEPENDS`) rather than the runtime | ||
1596 | context. | ||
1597 | |||
1571 | - ``xorg-driver-abi:`` Checks that all packages containing Xorg | 1598 | - ``xorg-driver-abi:`` Checks that all packages containing Xorg |
1572 | drivers have ABI dependencies. The ``xserver-xorg`` recipe provides | 1599 | drivers have ABI dependencies. The ``xserver-xorg`` recipe provides |
1573 | driver ABI names. All drivers should depend on the ABI versions that | 1600 | driver ABI names. All drivers should depend on the ABI versions that |
@@ -2360,6 +2387,24 @@ Python modules built with ``flit_core.buildapi`` are pure Python (no | |||
2360 | 2387 | ||
2361 | Internally this uses the :ref:`ref-classes-python_pep517` class. | 2388 | Internally this uses the :ref:`ref-classes-python_pep517` class. |
2362 | 2389 | ||
2390 | .. _ref-classes-python_maturin: | ||
2391 | |||
2392 | ``python_maturin`` | ||
2393 | ================== | ||
2394 | |||
2395 | The :ref:`ref-classes-python_maturin` class provides support for python-maturin, a replacement | ||
2396 | for setuptools_rust and another "backend" for building Python Wheels. | ||
2397 | |||
2398 | .. _ref-classes-python_mesonpy: | ||
2399 | |||
2400 | ``python_mesonpy`` | ||
2401 | ================== | ||
2402 | |||
2403 | The :ref:`ref-classes-python_mesonpy` class enables building Python modules which use the | ||
2404 | meson-python build system. | ||
2405 | |||
2406 | Internally this uses the :ref:`ref-classes-python_pep517` class. | ||
2407 | |||
2363 | .. _ref-classes-python_pep517: | 2408 | .. _ref-classes-python_pep517: |
2364 | 2409 | ||
2365 | ``python_pep517`` | 2410 | ``python_pep517`` |
@@ -3270,7 +3315,7 @@ The variables used by this class are: | |||
3270 | - :term:`UBOOT_FIT_KEY_REQ_ARGS`: ``openssl req`` arguments. | 3315 | - :term:`UBOOT_FIT_KEY_REQ_ARGS`: ``openssl req`` arguments. |
3271 | - :term:`UBOOT_FIT_SIGN_ALG`: signature algorithm for the FIT image. | 3316 | - :term:`UBOOT_FIT_SIGN_ALG`: signature algorithm for the FIT image. |
3272 | - :term:`UBOOT_FIT_SIGN_NUMBITS`: size of the private key for FIT image | 3317 | - :term:`UBOOT_FIT_SIGN_NUMBITS`: size of the private key for FIT image |
3273 | signing. | 3318 | signing. |
3274 | - :term:`UBOOT_FIT_KEY_SIGN_PKCS`: algorithm for the public key certificate | 3319 | - :term:`UBOOT_FIT_KEY_SIGN_PKCS`: algorithm for the public key certificate |
3275 | for FIT image signing. | 3320 | for FIT image signing. |
3276 | - :term:`UBOOT_FITIMAGE_ENABLE`: enable the generation of a U-Boot FIT image. | 3321 | - :term:`UBOOT_FITIMAGE_ENABLE`: enable the generation of a U-Boot FIT image. |
diff --git a/documentation/ref-manual/qa-checks.rst b/documentation/ref-manual/qa-checks.rst index 58526a0e57..53b1836e74 100644 --- a/documentation/ref-manual/qa-checks.rst +++ b/documentation/ref-manual/qa-checks.rst | |||
@@ -799,6 +799,14 @@ Errors and Warnings | |||
799 | section in the Yocto Project Development Tasks Manual. See also the | 799 | section in the Yocto Project Development Tasks Manual. See also the |
800 | ":ref:`ref-classes-ptest`" section. | 800 | ":ref:`ref-classes-ptest`" section. |
801 | 801 | ||
802 | .. _qa-check-virtual-slash: | ||
803 | |||
804 | - ``<variable> is set to <value> but the substring 'virtual/' holds no meaning in this context. It only works for build time dependencies, not runtime ones. It is suggested to use 'VIRTUAL-RUNTIME_' variables instead.`` | ||
805 | |||
806 | ``virtual/`` is a convention intended for use in the build context | ||
807 | (i.e. :term:`PROVIDES` and :term:`DEPENDS`) rather than the runtime | ||
808 | context (i.e. :term:`RPROVIDES` and :term:`RDEPENDS`). Use | ||
809 | :term:`VIRTUAL-RUNTIME` variables instead for the latter. | ||
802 | 810 | ||
803 | 811 | ||
804 | Configuring and Disabling QA Checks | 812 | Configuring and Disabling QA Checks |
diff --git a/documentation/ref-manual/resources.rst b/documentation/ref-manual/resources.rst index 8e54ac87c9..4eaaca942e 100644 --- a/documentation/ref-manual/resources.rst +++ b/documentation/ref-manual/resources.rst | |||
@@ -66,6 +66,9 @@ instructions: | |||
66 | - :yocto_lists:`/g/yocto` --- general Yocto Project | 66 | - :yocto_lists:`/g/yocto` --- general Yocto Project |
67 | discussion mailing list. | 67 | discussion mailing list. |
68 | 68 | ||
69 | - :yocto_lists:`/g/yocto-patches` --- patch contribution mailing list for Yocto | ||
70 | Project-related layers which do not have their own mailing list. | ||
71 | |||
69 | - :oe_lists:`/g/openembedded-core` --- discussion mailing | 72 | - :oe_lists:`/g/openembedded-core` --- discussion mailing |
70 | list about OpenEmbedded-Core (the core metadata). | 73 | list about OpenEmbedded-Core (the core metadata). |
71 | 74 | ||
diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg index 198d4632b1..036aa467cc 100644 --- a/documentation/ref-manual/svg/releases.svg +++ b/documentation/ref-manual/svg/releases.svg | |||
@@ -3,8 +3,8 @@ | |||
3 | version="1.1" | 3 | version="1.1" |
4 | id="svg2" | 4 | id="svg2" |
5 | width="2040.0006" | 5 | width="2040.0006" |
6 | height="624.30518" | 6 | height="669.30511" |
7 | viewBox="0 0 2040.0006 624.30515" | 7 | viewBox="0 0 2040.0006 669.30509" |
8 | sodipodi:docname="releases.svg" | 8 | sodipodi:docname="releases.svg" |
9 | inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" | 9 | inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" |
10 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | 10 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
@@ -409,8 +409,8 @@ | |||
409 | id="namedview4" | 409 | id="namedview4" |
410 | showgrid="true" | 410 | showgrid="true" |
411 | inkscape:zoom="1.4472045" | 411 | inkscape:zoom="1.4472045" |
412 | inkscape:cx="736.24703" | 412 | inkscape:cx="987.76641" |
413 | inkscape:cy="312.32629" | 413 | inkscape:cy="357.93145" |
414 | inkscape:window-x="1728" | 414 | inkscape:window-x="1728" |
415 | inkscape:window-y="0" | 415 | inkscape:window-y="0" |
416 | inkscape:window-maximized="1" | 416 | inkscape:window-maximized="1" |
@@ -427,13 +427,13 @@ | |||
427 | type="xygrid" | 427 | type="xygrid" |
428 | id="grid1257" | 428 | id="grid1257" |
429 | originx="-289.99936" | 429 | originx="-289.99936" |
430 | originy="325" /> | 430 | originy="369.99998" /> |
431 | </sodipodi:namedview> | 431 | </sodipodi:namedview> |
432 | <g | 432 | <g |
433 | inkscape:groupmode="layer" | 433 | inkscape:groupmode="layer" |
434 | inkscape:label="Image" | 434 | inkscape:label="Image" |
435 | id="g10" | 435 | id="g10" |
436 | transform="translate(-289.99936,325.00004)"> | 436 | transform="translate(-289.99936,370.00003)"> |
437 | <path | 437 | <path |
438 | style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" | 438 | style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" |
439 | d="m 1080,220.00003 v -515.00007 0 0" | 439 | d="m 1080,220.00003 v -515.00007 0 0" |
@@ -669,11 +669,11 @@ | |||
669 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | 669 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" |
670 | id="tspan10317-2-9-1-4">4.2</tspan></text> | 670 | id="tspan10317-2-9-1-4">4.2</tspan></text> |
671 | <g | 671 | <g |
672 | id="g1379"> | 672 | id="g1258"> |
673 | <rect | 673 | <rect |
674 | style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" | 674 | style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" |
675 | id="rect917-0-0-4-4-9-4-5-38" | 675 | id="rect917-0-0-4-4-9-4-5-38" |
676 | width="140.00003" | 676 | width="120.00002" |
677 | height="45.000004" | 677 | height="45.000004" |
678 | x="1220" | 678 | x="1220" |
679 | y="-230.00005" | 679 | y="-230.00005" |
@@ -696,53 +696,76 @@ | |||
696 | id="tspan10317-2-9-1-4-6">4.3</tspan></text> | 696 | id="tspan10317-2-9-1-4-6">4.3</tspan></text> |
697 | </g> | 697 | </g> |
698 | <rect | 698 | <rect |
699 | style="opacity:0.75;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" | 699 | style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" |
700 | id="rect917-0-0-4-4-9-4-5-3-9" | 700 | id="rect917-0-0-4-4-9-4-5-3-9-2" |
701 | width="979.99994" | 701 | width="140" |
702 | height="45.000004" | 702 | height="45.000004" |
703 | x="1320" | 703 | x="1440" |
704 | y="-285.00003" | 704 | y="-340.00003" |
705 | ry="2.2558987" /> | 705 | ry="2.2558987" /> |
706 | <text | 706 | <text |
707 | xml:space="preserve" | 707 | xml:space="preserve" |
708 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" | 708 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
709 | x="1373.233" | 709 | x="1487.233" |
710 | y="-265.32928" | 710 | y="-320.32928" |
711 | id="text1185-3-55-4-0-0-0-1-1-6"><tspan | 711 | id="text1185-3-55-4-0-0-0-1-1-6-4"><tspan |
712 | sodipodi:role="line" | 712 | sodipodi:role="line" |
713 | x="1373.233" | 713 | x="1487.233" |
714 | y="-265.32928" | 714 | y="-320.32928" |
715 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | 715 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" |
716 | id="tspan957-2-8-6-3-9-7-4-2">Scarthgap</tspan><tspan | 716 | id="tspan957-2-8-6-3-9-7-4-2-0">Styhead</tspan><tspan |
717 | sodipodi:role="line" | 717 | sodipodi:role="line" |
718 | x="1373.233" | 718 | x="1487.233" |
719 | y="-247.33261" | 719 | y="-302.33261" |
720 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | 720 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" |
721 | id="tspan10317-2-9-1-4-6-5">5.0</tspan></text> | 721 | id="tspan10317-2-9-1-4-6-5-6">5.1</tspan></text> |
722 | <rect | 722 | <g |
723 | id="g1591"> | ||
724 | <rect | ||
725 | style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" | ||
726 | id="rect917-0-0-4-4-9-9" | ||
727 | width="960.00012" | ||
728 | height="45.000004" | ||
729 | x="859.99994" | ||
730 | y="-64.999992" | ||
731 | ry="2.2558987" /> | ||
732 | <text | ||
733 | xml:space="preserve" | ||
734 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" | ||
735 | x="928.49872" | ||
736 | y="-45.648258" | ||
737 | id="text1185-3-55-4-0-0-9"><tspan | ||
738 | sodipodi:role="line" | ||
739 | x="928.49872" | ||
740 | y="-45.648258" | ||
741 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | ||
742 | id="tspan957-2-8-6-3-6">Kirkstone (LTS)</tspan><tspan | ||
743 | sodipodi:role="line" | ||
744 | x="928.49872" | ||
745 | y="-27.651579" | ||
746 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | ||
747 | id="tspan10317-2-9-0">4.0</tspan></text> | ||
748 | </g> | ||
749 | <path | ||
750 | id="rect917-0-0-4-4-9-9-9" | ||
723 | style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" | 751 | style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1" |
724 | id="rect917-0-0-4-4-9-9" | 752 | d="m 1322.3015,-285.00003 c -1.2753,0 -2.302,1.00609 -2.302,2.25586 v 40.48828 c 0,1.24977 1.0267,2.25586 2.302,2.25586 h 975.0412 c 1.2754,0 2.302,-1.00609 2.302,-2.25586 v -40.48828 c 0,-1.24977 -1.0266,-2.25586 -2.302,-2.25586 z" /> |
725 | width="960.00012" | ||
726 | height="45.000004" | ||
727 | x="859.99994" | ||
728 | y="-64.999992" | ||
729 | ry="2.2558987" /> | ||
730 | <text | 753 | <text |
731 | xml:space="preserve" | 754 | xml:space="preserve" |
732 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" | 755 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
733 | x="928.49872" | 756 | x="1390.4988" |
734 | y="-45.648258" | 757 | y="-265.64832" |
735 | id="text1185-3-55-4-0-0-9"><tspan | 758 | id="text1185-3-55-4-0-0-9-0"><tspan |
736 | sodipodi:role="line" | 759 | sodipodi:role="line" |
737 | x="928.49872" | 760 | x="1390.4988" |
738 | y="-45.648258" | 761 | y="-265.64832" |
739 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | 762 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" |
740 | id="tspan957-2-8-6-3-6">Kirkstone (LTS)</tspan><tspan | 763 | id="tspan957-2-8-6-3-6-8">Scarthgap (LTS)</tspan><tspan |
741 | sodipodi:role="line" | 764 | sodipodi:role="line" |
742 | x="928.49872" | 765 | x="1390.4988" |
743 | y="-27.651579" | 766 | y="-247.65164" |
744 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" | 767 | style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none" |
745 | id="tspan10317-2-9-0">4.0</tspan></text> | 768 | id="tspan10317-2-9-0-1">5.0</tspan></text> |
746 | <text | 769 | <text |
747 | xml:space="preserve" | 770 | xml:space="preserve" |
748 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" | 771 | style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" |
diff --git a/documentation/ref-manual/tasks.rst b/documentation/ref-manual/tasks.rst index c28cd7a94a..2e4b23408d 100644 --- a/documentation/ref-manual/tasks.rst +++ b/documentation/ref-manual/tasks.rst | |||
@@ -358,7 +358,7 @@ information. | |||
358 | ``do_populate_sdk_ext`` | 358 | ``do_populate_sdk_ext`` |
359 | ----------------------- | 359 | ----------------------- |
360 | 360 | ||
361 | Creates the file and directory structure for an installable extensible | 361 | Creates the file and directory structure for an installable extensible |
362 | SDK (eSDK). See the ":ref:`overview-manual/concepts:sdk generation`" | 362 | SDK (eSDK). See the ":ref:`overview-manual/concepts:sdk generation`" |
363 | section in the Yocto Project Overview and Concepts Manual for more | 363 | section in the Yocto Project Overview and Concepts Manual for more |
364 | information. | 364 | information. |
diff --git a/documentation/ref-manual/terms.rst b/documentation/ref-manual/terms.rst index ad9c46c339..b18c4183b6 100644 --- a/documentation/ref-manual/terms.rst +++ b/documentation/ref-manual/terms.rst | |||
@@ -228,23 +228,23 @@ universal, the list includes them just in case: | |||
228 | 228 | ||
229 | As far as bootloaders are concerned, :term:`Initramfs` and "initrd" | 229 | As far as bootloaders are concerned, :term:`Initramfs` and "initrd" |
230 | images are still copied to RAM in the same way. That's why most | 230 | images are still copied to RAM in the same way. That's why most |
231 | most bootloaders refer to :term:`Initramfs` images as "initrd" | 231 | most bootloaders refer to :term:`Initramfs` images as "initrd" |
232 | or "init RAM disk". | 232 | or "init RAM disk". |
233 | 233 | ||
234 | This kind of mechanism is typically used for two reasons: | 234 | This kind of mechanism is typically used for two reasons: |
235 | 235 | ||
236 | - For booting the same kernel binary on multiple systems requiring | 236 | - For booting the same kernel binary on multiple systems requiring |
237 | different device drivers. The :term:`Initramfs` image is then customized | 237 | different device drivers. The :term:`Initramfs` image is then customized |
238 | for each type of system, to include the specific kernel modules | 238 | for each type of system, to include the specific kernel modules |
239 | necessary to access the final root filesystem. This technique | 239 | necessary to access the final root filesystem. This technique |
240 | is used on all GNU / Linux distributions for desktops and servers. | 240 | is used on all GNU / Linux distributions for desktops and servers. |
241 | 241 | ||
242 | - For booting faster. As the root filesystem is extracted into RAM, | 242 | - For booting faster. As the root filesystem is extracted into RAM, |
243 | accessing the first user-space applications is very fast, compared | 243 | accessing the first user-space applications is very fast, compared |
244 | to having to initialize a block device, to access multiple blocks | 244 | to having to initialize a block device, to access multiple blocks |
245 | from it, and to go through a filesystem having its own overhead. | 245 | from it, and to go through a filesystem having its own overhead. |
246 | For example, this allows to display a splashscreen very early, | 246 | For example, this allows to display a splashscreen very early, |
247 | and to later take care of mounting the final root filesystem and | 247 | and to later take care of mounting the final root filesystem and |
248 | loading less time-critical kernel drivers. | 248 | loading less time-critical kernel drivers. |
249 | 249 | ||
250 | This cpio archive can either be loaded to RAM by the bootloader, | 250 | This cpio archive can either be loaded to RAM by the bootloader, |
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 435481c9aa..3f37f42f21 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -561,6 +561,10 @@ system and gives an overview of their function and contents. | |||
561 | :term:`BB_INVALIDCONF` | 561 | :term:`BB_INVALIDCONF` |
562 | See :term:`bitbake:BB_INVALIDCONF` in the BitBake manual. | 562 | See :term:`bitbake:BB_INVALIDCONF` in the BitBake manual. |
563 | 563 | ||
564 | :term:`BB_LOADFACTOR_MAX` | ||
565 | The system load threshold above which BitBake will stop runnig extra | ||
566 | tasks. | ||
567 | |||
564 | :term:`BB_LOGCONFIG` | 568 | :term:`BB_LOGCONFIG` |
565 | See :term:`bitbake:BB_LOGCONFIG` in the BitBake manual. | 569 | See :term:`bitbake:BB_LOGCONFIG` in the BitBake manual. |
566 | 570 | ||
@@ -1688,6 +1692,11 @@ system and gives an overview of their function and contents. | |||
1688 | The list of package names (:term:`PN`) for which | 1692 | The list of package names (:term:`PN`) for which |
1689 | CVEs (Common Vulnerabilities and Exposures) are ignored. | 1693 | CVEs (Common Vulnerabilities and Exposures) are ignored. |
1690 | 1694 | ||
1695 | :term:`CVE_DB_INCR_UPDATE_AGE_THRES` | ||
1696 | Specifies the maximum age of the CVE database in seconds for an | ||
1697 | incremental update (instead of a full-download). Use "0" to force a | ||
1698 | full-download. | ||
1699 | |||
1691 | :term:`CVE_DB_UPDATE_INTERVAL` | 1700 | :term:`CVE_DB_UPDATE_INTERVAL` |
1692 | Specifies the CVE database update interval in seconds, as used by | 1701 | Specifies the CVE database update interval in seconds, as used by |
1693 | ``cve-update-db-native``. The default value is "86400" i.e. once a day | 1702 | ``cve-update-db-native``. The default value is "86400" i.e. once a day |
@@ -2330,6 +2339,12 @@ system and gives an overview of their function and contents. | |||
2330 | See the :ref:`ref-classes-systemd-boot` and :ref:`ref-classes-image-live` | 2339 | See the :ref:`ref-classes-systemd-boot` and :ref:`ref-classes-image-live` |
2331 | classes for more information. | 2340 | classes for more information. |
2332 | 2341 | ||
2342 | :term:`EFI_UKI_DIR` | ||
2343 | The primary place for the UKI image inside the EFI System Partition. | ||
2344 | |||
2345 | :term:`EFI_UKI_PATH` | ||
2346 | The path for the UKI image inside the root filesystem. | ||
2347 | |||
2333 | :term:`ENABLE_BINARY_LOCALE_GENERATION` | 2348 | :term:`ENABLE_BINARY_LOCALE_GENERATION` |
2334 | Variable that controls which locales for ``glibc`` are generated | 2349 | Variable that controls which locales for ``glibc`` are generated |
2335 | during the build (useful if the target device has 64Mbytes of RAM or | 2350 | during the build (useful if the target device has 64Mbytes of RAM or |
@@ -2983,18 +2998,18 @@ system and gives an overview of their function and contents. | |||
2983 | 2998 | ||
2984 | :term:`FIT_ADDRESS_CELLS` | 2999 | :term:`FIT_ADDRESS_CELLS` |
2985 | Specifies the value of the ``#address-cells`` value for the | 3000 | Specifies the value of the ``#address-cells`` value for the |
2986 | description of the FIT image. | 3001 | description of the FIT image. |
2987 | 3002 | ||
2988 | The default value is set to "1" by the :ref:`ref-classes-kernel-fitimage` | 3003 | The default value is set to "1" by the :ref:`ref-classes-kernel-fitimage` |
2989 | class, which corresponds to 32 bit addresses. | 3004 | class, which corresponds to 32 bit addresses. |
2990 | 3005 | ||
2991 | For platforms that need to set 64 bit addresses, for example in | 3006 | For platforms that need to set 64 bit addresses, for example in |
2992 | :term:`UBOOT_LOADADDRESS` and :term:`UBOOT_ENTRYPOINT`, you need to | 3007 | :term:`UBOOT_LOADADDRESS` and :term:`UBOOT_ENTRYPOINT`, you need to |
2993 | set this value to "2", as two 32 bit values (cells) will be needed | 3008 | set this value to "2", as two 32 bit values (cells) will be needed |
2994 | to represent such addresses. | 3009 | to represent such addresses. |
2995 | 3010 | ||
2996 | Here is an example setting "0x400000000" as a load address:: | 3011 | Here is an example setting "0x400000000" as a load address:: |
2997 | 3012 | ||
2998 | FIT_ADDRESS_CELLS = "2" | 3013 | FIT_ADDRESS_CELLS = "2" |
2999 | UBOOT_LOADADDRESS= "0x04 0x00000000" | 3014 | UBOOT_LOADADDRESS= "0x04 0x00000000" |
3000 | 3015 | ||
@@ -3971,15 +3986,15 @@ system and gives an overview of their function and contents. | |||
3971 | Specifies a space-separated list of license names (as they would | 3986 | Specifies a space-separated list of license names (as they would |
3972 | appear in :term:`LICENSE`) that should be excluded | 3987 | appear in :term:`LICENSE`) that should be excluded |
3973 | from the build (if set globally), or from an image (if set locally | 3988 | from the build (if set globally), or from an image (if set locally |
3974 | in an image recipe). | 3989 | in an image recipe). |
3975 | 3990 | ||
3976 | When the variable is set globally, recipes that provide no alternatives to listed | 3991 | When the variable is set globally, recipes that provide no alternatives to listed |
3977 | incompatible licenses are not built. Packages that are individually | 3992 | incompatible licenses are not built. Packages that are individually |
3978 | licensed with the specified incompatible licenses will be deleted. | 3993 | licensed with the specified incompatible licenses will be deleted. |
3979 | Most of the time this does not allow a feasible build (because it becomes impossible | 3994 | Most of the time this does not allow a feasible build (because it becomes impossible |
3980 | to satisfy build time dependencies), so the recommended way to | 3995 | to satisfy build time dependencies), so the recommended way to |
3981 | implement license restrictions is to set the variable in specific | 3996 | implement license restrictions is to set the variable in specific |
3982 | image recipes where the restrictions must apply. That way there | 3997 | image recipes where the restrictions must apply. That way there |
3983 | are no build time restrictions, but the license check is still | 3998 | are no build time restrictions, but the license check is still |
3984 | performed when the image's filesystem is assembled from packages. | 3999 | performed when the image's filesystem is assembled from packages. |
3985 | 4000 | ||
@@ -4033,7 +4048,7 @@ system and gives an overview of their function and contents. | |||
4033 | The default value of the variable is set as follows in the | 4048 | The default value of the variable is set as follows in the |
4034 | ``meta/conf/distro/defaultsetup.conf`` file:: | 4049 | ``meta/conf/distro/defaultsetup.conf`` file:: |
4035 | 4050 | ||
4036 | INHERIT_DISTRO ?= "debian devshell sstate license" | 4051 | INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool create-spdx" |
4037 | 4052 | ||
4038 | :term:`INHIBIT_DEFAULT_DEPS` | 4053 | :term:`INHIBIT_DEFAULT_DEPS` |
4039 | Prevents the default dependencies, namely the C compiler and standard | 4054 | Prevents the default dependencies, namely the C compiler and standard |
@@ -4495,12 +4510,12 @@ system and gives an overview of their function and contents. | |||
4495 | When kernel configuration fragments are missing for some | 4510 | When kernel configuration fragments are missing for some |
4496 | :term:`KERNEL_FEATURES` specified by layers or BSPs, | 4511 | :term:`KERNEL_FEATURES` specified by layers or BSPs, |
4497 | building and configuring the kernel stops with an error. | 4512 | building and configuring the kernel stops with an error. |
4498 | 4513 | ||
4499 | You can turn these errors into warnings by setting the | 4514 | You can turn these errors into warnings by setting the |
4500 | following in ``conf/local.conf``:: | 4515 | following in ``conf/local.conf``:: |
4501 | 4516 | ||
4502 | KERNEL_DANGLING_FEATURES_WARN_ONLY = "1" | 4517 | KERNEL_DANGLING_FEATURES_WARN_ONLY = "1" |
4503 | 4518 | ||
4504 | You will still be warned that runtime issues may occur, | 4519 | You will still be warned that runtime issues may occur, |
4505 | but at least the kernel configuration and build process will | 4520 | but at least the kernel configuration and build process will |
4506 | be allowed to continue. | 4521 | be allowed to continue. |
@@ -5666,6 +5681,9 @@ system and gives an overview of their function and contents. | |||
5666 | default by setting the variable in a custom distribution | 5681 | default by setting the variable in a custom distribution |
5667 | configuration file. | 5682 | configuration file. |
5668 | 5683 | ||
5684 | :term:`OPKG_MAKE_INDEX_EXTRA_PARAMS` | ||
5685 | Specifies extra parameters for the ``opkg-make-index`` command. | ||
5686 | |||
5669 | :term:`OVERLAYFS_ETC_DEVICE` | 5687 | :term:`OVERLAYFS_ETC_DEVICE` |
5670 | When the :ref:`ref-classes-overlayfs-etc` class is | 5688 | When the :ref:`ref-classes-overlayfs-etc` class is |
5671 | inherited, specifies the device to be mounted for the read/write | 5689 | inherited, specifies the device to be mounted for the read/write |
@@ -7147,6 +7165,9 @@ system and gives an overview of their function and contents. | |||
7147 | :term:`IMAGE_ROOTFS` variable for more | 7165 | :term:`IMAGE_ROOTFS` variable for more |
7148 | information. | 7166 | information. |
7149 | 7167 | ||
7168 | :term:`RPMBUILD_EXTRA_PARAMS` | ||
7169 | Specifies extra user-defined parameters for the ``rpmbuild`` command. | ||
7170 | |||
7150 | :term:`RPROVIDES` | 7171 | :term:`RPROVIDES` |
7151 | A list of package name aliases that a package also provides. These | 7172 | A list of package name aliases that a package also provides. These |
7152 | aliases are useful for satisfying runtime dependencies of other | 7173 | aliases are useful for satisfying runtime dependencies of other |
@@ -7868,7 +7889,7 @@ system and gives an overview of their function and contents. | |||
7868 | This option allows to associate `SPDX annotations | 7889 | This option allows to associate `SPDX annotations |
7869 | <https://spdx.github.io/spdx-spec/v2.3/annotations/>`__ to a recipe, | 7890 | <https://spdx.github.io/spdx-spec/v2.3/annotations/>`__ to a recipe, |
7870 | using the values of variables in the recipe:: | 7891 | using the values of variables in the recipe:: |
7871 | 7892 | ||
7872 | ANNOTATION1 = "First annotation for recipe" | 7893 | ANNOTATION1 = "First annotation for recipe" |
7873 | ANNOTATION2 = "Second annotation for recipe" | 7894 | ANNOTATION2 = "Second annotation for recipe" |
7874 | SPDX_CUSTOM_ANNOTATION_VARS = "ANNOTATION1 ANNOTATION2" | 7895 | SPDX_CUSTOM_ANNOTATION_VARS = "ANNOTATION1 ANNOTATION2" |
@@ -7991,7 +8012,7 @@ system and gives an overview of their function and contents. | |||
7991 | The name of keys used by the :ref:`ref-classes-kernel-fitimage` class | 8012 | The name of keys used by the :ref:`ref-classes-kernel-fitimage` class |
7992 | for signing U-Boot FIT image stored in the :term:`SPL_SIGN_KEYDIR` | 8013 | for signing U-Boot FIT image stored in the :term:`SPL_SIGN_KEYDIR` |
7993 | directory. If we have for example a ``dev.key`` key and a ``dev.crt`` | 8014 | directory. If we have for example a ``dev.key`` key and a ``dev.crt`` |
7994 | certificate stored in the :term:`SPL_SIGN_KEYDIR` directory, you will | 8015 | certificate stored in the :term:`SPL_SIGN_KEYDIR` directory, you will |
7995 | have to set :term:`SPL_SIGN_KEYNAME` to ``dev``. | 8016 | have to set :term:`SPL_SIGN_KEYNAME` to ``dev``. |
7996 | 8017 | ||
7997 | :term:`SPLASH` | 8018 | :term:`SPLASH` |
@@ -8028,7 +8049,7 @@ system and gives an overview of their function and contents. | |||
8028 | 8049 | ||
8029 | EXTRA_OECONF += "--disable-startup-msg --enable-img-fullscreen" | 8050 | EXTRA_OECONF += "--disable-startup-msg --enable-img-fullscreen" |
8030 | 8051 | ||
8031 | For information on append files, see the | 8052 | For information on append files, see the |
8032 | ":ref:`dev-manual/layers:appending other layers metadata with your layer`" | 8053 | ":ref:`dev-manual/layers:appending other layers metadata with your layer`" |
8033 | section. | 8054 | section. |
8034 | 8055 | ||
@@ -8792,6 +8813,10 @@ system and gives an overview of their function and contents. | |||
8792 | value so that executables built using the SDK also have the flags | 8813 | value so that executables built using the SDK also have the flags |
8793 | applied. | 8814 | applied. |
8794 | 8815 | ||
8816 | :term:`TARGET_DBGSRC_DIR` | ||
8817 | Specifies the target path to debug source files. The default is | ||
8818 | ``/usr/src/debug/${PN}/${PV}``. | ||
8819 | |||
8795 | :term:`TARGET_FPU` | 8820 | :term:`TARGET_FPU` |
8796 | Specifies the method for handling FPU code. For FPU-less targets, | 8821 | Specifies the method for handling FPU code. For FPU-less targets, |
8797 | which include most ARM CPUs, the variable must be set to "soft". If | 8822 | which include most ARM CPUs, the variable must be set to "soft". If |
@@ -9442,10 +9467,10 @@ system and gives an overview of their function and contents. | |||
9442 | 9467 | ||
9443 | :term:`UBOOT_FIT_ADDRESS_CELLS` | 9468 | :term:`UBOOT_FIT_ADDRESS_CELLS` |
9444 | Specifies the value of the ``#address-cells`` value for the | 9469 | Specifies the value of the ``#address-cells`` value for the |
9445 | description of the U-Boot FIT image. | 9470 | description of the U-Boot FIT image. |
9446 | 9471 | ||
9447 | The default value is set to "1" by the :ref:`ref-classes-uboot-sign` | 9472 | The default value is set to "1" by the :ref:`ref-classes-uboot-sign` |
9448 | class, which corresponds to 32 bit addresses. | 9473 | class, which corresponds to 32 bit addresses. |
9449 | 9474 | ||
9450 | For platforms that need to set 64 bit addresses in | 9475 | For platforms that need to set 64 bit addresses in |
9451 | :term:`UBOOT_LOADADDRESS` and :term:`UBOOT_ENTRYPOINT`, you need to | 9476 | :term:`UBOOT_LOADADDRESS` and :term:`UBOOT_ENTRYPOINT`, you need to |
@@ -9453,7 +9478,7 @@ system and gives an overview of their function and contents. | |||
9453 | to represent such addresses. | 9478 | to represent such addresses. |
9454 | 9479 | ||
9455 | Here is an example setting "0x400000000" as a load address:: | 9480 | Here is an example setting "0x400000000" as a load address:: |
9456 | 9481 | ||
9457 | UBOOT_FIT_ADDRESS_CELLS = "2" | 9482 | UBOOT_FIT_ADDRESS_CELLS = "2" |
9458 | UBOOT_LOADADDRESS= "0x04 0x00000000" | 9483 | UBOOT_LOADADDRESS= "0x04 0x00000000" |
9459 | 9484 | ||
@@ -9516,7 +9541,7 @@ system and gives an overview of their function and contents. | |||
9516 | UBOOT_FITIMAGE_ENABLE = "1" | 9541 | UBOOT_FITIMAGE_ENABLE = "1" |
9517 | 9542 | ||
9518 | See the :ref:`ref-classes-uboot-sign` class for details. | 9543 | See the :ref:`ref-classes-uboot-sign` class for details. |
9519 | 9544 | ||
9520 | :term:`UBOOT_LOADADDRESS` | 9545 | :term:`UBOOT_LOADADDRESS` |
9521 | Specifies the load address for the U-Boot image. During U-Boot image | 9546 | Specifies the load address for the U-Boot image. During U-Boot image |
9522 | creation, the :term:`UBOOT_LOADADDRESS` variable is passed as a | 9547 | creation, the :term:`UBOOT_LOADADDRESS` variable is passed as a |
@@ -9746,6 +9771,12 @@ system and gives an overview of their function and contents. | |||
9746 | ``meta-poky/conf/templates/default/local.conf.sample`` in the | 9771 | ``meta-poky/conf/templates/default/local.conf.sample`` in the |
9747 | :term:`Source Directory`. | 9772 | :term:`Source Directory`. |
9748 | 9773 | ||
9774 | :term:`USERADD_DEPENDS` | ||
9775 | Specifies a list of recipes that create users / groups (via | ||
9776 | :term:`USERADD_PARAM` / :term:`GROUPADD_PARAM`) which a recipe | ||
9777 | depends upon. This ensures that those users / groups are available | ||
9778 | when building a recipe. | ||
9779 | |||
9749 | :term:`USERADD_ERROR_DYNAMIC` | 9780 | :term:`USERADD_ERROR_DYNAMIC` |
9750 | If set to ``error``, forces the OpenEmbedded build system to produce | 9781 | If set to ``error``, forces the OpenEmbedded build system to produce |
9751 | an error if the user identification (``uid``) and group | 9782 | an error if the user identification (``uid``) and group |
diff --git a/documentation/sdk-manual/working-projects.rst b/documentation/sdk-manual/working-projects.rst index b9af33393b..4236bcec24 100644 --- a/documentation/sdk-manual/working-projects.rst +++ b/documentation/sdk-manual/working-projects.rst | |||
@@ -295,12 +295,12 @@ example: | |||
295 | all: main.o module.o | 295 | all: main.o module.o |
296 | ${CC} main.o module.o -o target_bin | 296 | ${CC} main.o module.o -o target_bin |
297 | main.o: main.c module.h | 297 | main.o: main.c module.h |
298 | ${CC} -I . -c main.c | 298 | ${CC} -I . -c main.c |
299 | module.o: module.c module.h | 299 | module.o: module.c module.h |
300 | ${CC} -I . -c module.c | 300 | ${CC} -I . -c module.c |
301 | clean: | 301 | clean: |
302 | rm -rf *.o | 302 | rm -rf *.o |
303 | rm target_bin | 303 | rm target_bin |
304 | 304 | ||
305 | #. *Make the Project:* Use the ``make`` command to create the binary | 305 | #. *Make the Project:* Use the ``make`` command to create the binary |
306 | output file. Because variables are commented out in the Makefile, the | 306 | output file. Because variables are commented out in the Makefile, the |
diff --git a/documentation/set_versions.py b/documentation/set_versions.py index 90e08fc5e0..dec0780834 100755 --- a/documentation/set_versions.py +++ b/documentation/set_versions.py | |||
@@ -26,9 +26,9 @@ ourversion = None | |||
26 | if len(sys.argv) == 2: | 26 | if len(sys.argv) == 2: |
27 | ourversion = sys.argv[1] | 27 | ourversion = sys.argv[1] |
28 | 28 | ||
29 | activereleases = ["nanbield", "kirkstone", "dunfell"] | 29 | activereleases = ["scarthgap", "nanbield", "kirkstone", "dunfell"] |
30 | devbranch = "scarthgap" | 30 | devbranch = "styhead" |
31 | ltsseries = ["kirkstone", "dunfell"] | 31 | ltsseries = ["scarthgap", "kirkstone", "dunfell"] |
32 | 32 | ||
33 | # used by run-docs-builds to get the default page | 33 | # used by run-docs-builds to get the default page |
34 | if ourversion == "getlatest": | 34 | if ourversion == "getlatest": |
@@ -36,6 +36,7 @@ if ourversion == "getlatest": | |||
36 | sys.exit(0) | 36 | sys.exit(0) |
37 | 37 | ||
38 | release_series = collections.OrderedDict() | 38 | release_series = collections.OrderedDict() |
39 | release_series["styhead"] = "5.1" | ||
39 | release_series["scarthgap"] = "5.0" | 40 | release_series["scarthgap"] = "5.0" |
40 | release_series["nanbield"] = "4.3" | 41 | release_series["nanbield"] = "4.3" |
41 | release_series["mickledore"] = "4.2" | 42 | release_series["mickledore"] = "4.2" |
@@ -68,6 +69,7 @@ release_series["laverne"] = "0.9" | |||
68 | 69 | ||
69 | 70 | ||
70 | bitbake_mapping = { | 71 | bitbake_mapping = { |
72 | "styhead" : "2.10", | ||
71 | "scarthgap" : "2.8", | 73 | "scarthgap" : "2.8", |
72 | "nanbield" : "2.6", | 74 | "nanbield" : "2.6", |
73 | "mickledore" : "2.4", | 75 | "mickledore" : "2.4", |
diff --git a/documentation/standards.md b/documentation/standards.md index e0c0cba83c..bc403e393e 100644 --- a/documentation/standards.md +++ b/documentation/standards.md | |||
@@ -70,27 +70,30 @@ cannot be split without infringing syntactic rules | |||
70 | or reducing readability, as well as for command output | 70 | or reducing readability, as well as for command output |
71 | which should be kept unmodified. | 71 | which should be kept unmodified. |
72 | 72 | ||
73 | ### Project names | 73 | ### File, tool and command names |
74 | 74 | ||
75 | Project names should be capitalized in the same | 75 | File, tool, command and package names should be double tick-quoted. |
76 | way they are on Wikipedia, in particular: | 76 | For example, ``` ``conf/local.conf`` ``` is preferred over |
77 | `"conf/local.conf"`. | ||
77 | 78 | ||
78 | * BitBake | 79 | ### Project names |
79 | * OpenEmbedded | ||
80 | 80 | ||
81 | There are exceptions in which such names can be used | 81 | Project names should be introduced with single quotes, to have them rendered |
82 | in lower case: | 82 | with an italic font and make them easier to distinguish from command names |
83 | (double tick-quoted) and from regular English words. | ||
83 | 84 | ||
84 | * When referring to a package name | 85 | An exception is when project names appear in hyperlinks, as nested markup |
85 | * When referring to the corresponding command name | 86 | is not supported by Sphinx yet. |
86 | * When used in a cross-reference title. Such | ||
87 | titles are usually in lower case. | ||
88 | 87 | ||
89 | ### File, tool and command names | 88 | Project names should also be capitalized (or not) in the same way they are on |
89 | Wikipedia, or on their own project pages if they are not described on | ||
90 | Wikipedia. If a project name isn't capitalized, it should remain so even | ||
91 | at the beginning of a sentence. | ||
90 | 92 | ||
91 | File, tool and command names should be double tick-quoted. | 93 | For example: |
92 | For example, ``` ``conf/local.conf`` ``` is preferred over | 94 | |
93 | `"conf/local.conf"`. | 95 | * ``` `BitBake` ``` |
96 | * ``` `ftrace` ``` | ||
94 | 97 | ||
95 | ### Variables | 98 | ### Variables |
96 | 99 | ||
diff --git a/meta-poky/classes/poky-bleeding.bbclass b/meta-poky/classes/poky-bleeding.bbclass index e5f30687e4..3bfdcf1454 100644 --- a/meta-poky/classes/poky-bleeding.bbclass +++ b/meta-poky/classes/poky-bleeding.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # AUTOREV and PV containing SRCPV needs to be set early, before any anonymous python | 2 | # AUTOREV and PV containing '+git' needs to be set early, before any anonymous python |
3 | # expands anything containing PV, else the parse process won't trigger the fetcher to | 3 | # expands anything containing PV, else the parse process won't trigger the fetcher to |
4 | # cache the needed version data | 4 | # cache the needed version data |
5 | # | 5 | # |
@@ -13,7 +13,7 @@ python pokybleeding_version_handler () { | |||
13 | bb.warn("Here 5 %s %s" % (d.getVar("PN"), bpn)) | 13 | bb.warn("Here 5 %s %s" % (d.getVar("PN"), bpn)) |
14 | d.setVar("SRCREV", "${AUTOREV}") | 14 | d.setVar("SRCREV", "${AUTOREV}") |
15 | if "+git" not in d.getVar("PV"): | 15 | if "+git" not in d.getVar("PV"): |
16 | d.appendVar("PV", "+git${SRCPV}") | 16 | d.appendVar("PV", "+git") |
17 | } | 17 | } |
18 | 18 | ||
19 | addhandler pokybleeding_version_handler | 19 | addhandler pokybleeding_version_handler |
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 8b061cf25c..5285753c31 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | DISTRO = "poky" | 1 | DISTRO = "poky" |
2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" | 2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" |
3 | DISTRO_VERSION = "4.3+snapshot-${METADATA_REVISION}" | 3 | DISTRO_VERSION = "5.0+snapshot-${METADATA_REVISION}" |
4 | DISTRO_CODENAME = "scarthgap" | 4 | DISTRO_CODENAME = "styhead" |
5 | SDK_VENDOR = "-pokysdk" | 5 | SDK_VENDOR = "-pokysdk" |
6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" | 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" |
7 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" | 7 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" |
diff --git a/meta-poky/conf/templates/default/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample index 1a93c9bdcf..72d3566294 100644 --- a/meta-poky/conf/templates/default/local.conf.sample +++ b/meta-poky/conf/templates/default/local.conf.sample | |||
@@ -238,7 +238,7 @@ BB_DISKMON_DIRS ??= "\ | |||
238 | # (CDN) kindly provided by JSDelivr, uncomment one of the SSTATE_MIRRORS lines, not both. | 238 | # (CDN) kindly provided by JSDelivr, uncomment one of the SSTATE_MIRRORS lines, not both. |
239 | # Using the CDN rather than the yoctoproject.org address is suggested/preferred. | 239 | # Using the CDN rather than the yoctoproject.org address is suggested/preferred. |
240 | # | 240 | # |
241 | #BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" | 241 | #BB_HASHSERVE_UPSTREAM = 'wss://hashserv.yoctoproject.org/ws' |
242 | #SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" | 242 | #SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" |
243 | # | 243 | # |
244 | ###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" | 244 | ###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" |
diff --git a/meta-selftest/conf/layer.conf b/meta-selftest/conf/layer.conf index 48ca8464f9..763ea011d4 100644 --- a/meta-selftest/conf/layer.conf +++ b/meta-selftest/conf/layer.conf | |||
@@ -11,4 +11,4 @@ BBFILE_PRIORITY_selftest = "5" | |||
11 | 11 | ||
12 | addpylib ${LAYERDIR}/lib oeqa | 12 | addpylib ${LAYERDIR}/lib oeqa |
13 | 13 | ||
14 | LAYERSERIES_COMPAT_selftest = "scarthgap" | 14 | LAYERSERIES_COMPAT_selftest = "styhead" |
diff --git a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb index 3a46404477..a897966608 100644 --- a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb +++ b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb | |||
@@ -11,7 +11,7 @@ SECURITY_CFLAGS = "" | |||
11 | SECURITY_LDFLAGS = "" | 11 | SECURITY_LDFLAGS = "" |
12 | 12 | ||
13 | do_compile() { | 13 | do_compile() { |
14 | ${FC} ${LDFLAGS} ${WORKDIR}/hello.f95 -o ${B}/fortran-hello | 14 | ${FC} ${LDFLAGS} ${UNPACKDIR}/hello.f95 -o ${B}/fortran-hello |
15 | } | 15 | } |
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
diff --git a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb index e127b48b15..7698413d4d 100644 --- a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb +++ b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb | |||
@@ -17,20 +17,20 @@ SRC_URI = "file://installscript.sh \ | |||
17 | EXCLUDE_FROM_WORLD = "1" | 17 | EXCLUDE_FROM_WORLD = "1" |
18 | 18 | ||
19 | install_extrafunc() { | 19 | install_extrafunc() { |
20 | install -m 0644 ${WORKDIR}/selftest-replaceme-inst-func ${D}${datadir}/selftest-replaceme-inst-func | 20 | install -m 0644 ${UNPACKDIR}/selftest-replaceme-inst-func ${D}${datadir}/selftest-replaceme-inst-func |
21 | } | 21 | } |
22 | 22 | ||
23 | do_install() { | 23 | do_install() { |
24 | install -d ${D}${datadir}/ | 24 | install -d ${D}${datadir}/ |
25 | install -m 0644 ${WORKDIR}/selftest-replaceme-orig ${D}${datadir}/selftest-replaceme-orig | 25 | install -m 0644 ${UNPACKDIR}/selftest-replaceme-orig ${D}${datadir}/selftest-replaceme-orig |
26 | install -m 0644 ${WORKDIR}/selftest-replaceme-todir ${D}${datadir} | 26 | install -m 0644 ${UNPACKDIR}/selftest-replaceme-todir ${D}${datadir} |
27 | install -m 0644 ${WORKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed | 27 | install -m 0644 ${UNPACKDIR}/file1 ${D}${datadir}/selftest-replaceme-renamed |
28 | install -m 0644 ${WORKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir | 28 | install -m 0644 ${UNPACKDIR}/subdir/fileinsubdir ${D}${datadir}/selftest-replaceme-subdir |
29 | cp ${WORKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile | 29 | cp ${UNPACKDIR}/selftest-replaceme-inst-glob* ${D}${datadir}/selftest-replaceme-inst-globfile |
30 | cp ${WORKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir} | 30 | cp ${UNPACKDIR}/selftest-replaceme-inst-todir-glob* ${D}${datadir} |
31 | install -d ${D}${sysconfdir} | 31 | install -d ${D}${sysconfdir} |
32 | install -m 0644 ${S}/file2 ${D}${sysconfdir}/selftest-replaceme-patched | 32 | install -m 0644 ${S}/file2 ${D}${sysconfdir}/selftest-replaceme-patched |
33 | sh ${WORKDIR}/installscript.sh ${D}${datadir} | 33 | sh ${UNPACKDIR}/installscript.sh ${D}${datadir} |
34 | install_extrafunc | 34 | install_extrafunc |
35 | } | 35 | } |
36 | 36 | ||
diff --git a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb index be346b8a0e..49c3fe827a 100644 --- a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb +++ b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb | |||
@@ -14,7 +14,7 @@ do_compile () { | |||
14 | 14 | ||
15 | do_install () { | 15 | do_install () { |
16 | install -d ${D}${bindir} | 16 | install -d ${D}${bindir} |
17 | install -m 755 ${WORKDIR}/gdb.sh ${D}${bindir}/ | 17 | install -m 755 ${S}/gdb.sh ${D}${bindir}/ |
18 | install -m 755 hello1 ${D}${bindir}/hello1 | 18 | install -m 755 hello1 ${D}${bindir}/hello1 |
19 | ln ${D}${bindir}/hello1 ${D}${bindir}/hello2 | 19 | ln ${D}${bindir}/hello1 ${D}${bindir}/hello2 |
20 | 20 | ||
diff --git a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb index c3d3548d4a..c91d00c8d9 100644 --- a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb +++ b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb | |||
@@ -9,7 +9,7 @@ EXCLUDE_FROM_WORLD = "1" | |||
9 | do_install() { | 9 | do_install() { |
10 | install -d ${D}${bindir} | 10 | install -d ${D}${bindir} |
11 | # was not able to make ownership preservation check | 11 | # was not able to make ownership preservation check |
12 | install -m 0400 ${WORKDIR}/test.awk ${D}${bindir}/test | 12 | install -m 0400 ${UNPACKDIR}/test.awk ${D}${bindir}/test |
13 | 13 | ||
14 | perm_old="$(stat --format='%a' ${D}${bindir}/test)" | 14 | perm_old="$(stat --format='%a' ${D}${bindir}/test)" |
15 | sed -i -e 's|@AWK_BIN@|${bindir}/awk|g' ${D}${bindir}/test | 15 | sed -i -e 's|@AWK_BIN@|${bindir}/awk|g' ${D}${bindir}/test |
diff --git a/meta-selftest/wic/overlayfs_etc.wks.in b/meta-selftest/wic/overlayfs_etc.wks.in index 1e1e5836e7..066cd35b15 100644 --- a/meta-selftest/wic/overlayfs_etc.wks.in +++ b/meta-selftest/wic/overlayfs_etc.wks.in | |||
@@ -1,4 +1,4 @@ | |||
1 | part /boot --active --source bootimg-biosplusefi --ondisk sda --sourceparams="loader=grub-efi" --align 1024 | 1 | part /boot --active --source bootimg-biosplusefi --ondisk sda --sourceparams="loader=grub-efi" --align 1024 |
2 | part / --source rootfs --ondisk sda --fstype=ext4 --use-uuid --align 1024 | 2 | part / --source rootfs --ondisk sda --fstype=${OVERLAYFS_ROOTFS_TYPE} --use-uuid --align 1024 |
3 | part --ondisk sda --fstype=ext4 --size=5 --align 1024 | 3 | part --ondisk sda --fstype=ext4 --size=5 --align 1024 |
4 | bootloader --ptable gpt --timeout=1 --append="rootfstype=ext4 console=ttyS0,115200 console=tty0 ${OVERLAYFS_INIT_OPTION}" | 4 | bootloader --ptable gpt --timeout=1 --append="rootfstype=${OVERLAYFS_ROOTFS_TYPE} console=ttyS0,115200 console=tty0 ${OVERLAYFS_INIT_OPTION}" |
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf index 0414fb51b6..963d2d5ce9 100644 --- a/meta-skeleton/conf/layer.conf +++ b/meta-skeleton/conf/layer.conf | |||
@@ -14,4 +14,4 @@ LAYERVERSION_skeleton = "1" | |||
14 | 14 | ||
15 | LAYERDEPENDS_skeleton = "core" | 15 | LAYERDEPENDS_skeleton = "core" |
16 | 16 | ||
17 | LAYERSERIES_COMPAT_skeleton = "scarthgap" | 17 | LAYERSERIES_COMPAT_skeleton = "styhead" |
diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb index 9437240fcf..0879bb17b9 100644 --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | |||
@@ -7,7 +7,7 @@ SUMMARY = "An example kernel recipe that uses the linux-yocto and oe-core" | |||
7 | # To use linux-yocto-custom in your layer, copy this recipe (optionally | 7 | # To use linux-yocto-custom in your layer, copy this recipe (optionally |
8 | # rename it as well) and modify it appropriately for your machine. i.e.: | 8 | # rename it as well) and modify it appropriately for your machine. i.e.: |
9 | # | 9 | # |
10 | # COMPATIBLE_MACHINE_yourmachine = "yourmachine" | 10 | # COMPATIBLE_MACHINE:yourmachine = "yourmachine" |
11 | # | 11 | # |
12 | # You must also provide a Linux kernel configuration. The most direct | 12 | # You must also provide a Linux kernel configuration. The most direct |
13 | # method is to copy your .config to files/defconfig in your layer, | 13 | # method is to copy your .config to files/defconfig in your layer, |
diff --git a/meta-yocto-bsp/README.hardware.md b/meta-yocto-bsp/README.hardware.md index a129063afa..6045c3d867 100644 --- a/meta-yocto-bsp/README.hardware.md +++ b/meta-yocto-bsp/README.hardware.md | |||
@@ -140,6 +140,11 @@ The genericarm64 MACHINE is currently tested on the following platforms: | |||
140 | The images built are EFI bootable disk images and can be written directly to a | 140 | The images built are EFI bootable disk images and can be written directly to a |
141 | SD card for booting, for example. | 141 | SD card for booting, for example. |
142 | 142 | ||
143 | There is also limited support for booting a genericarm64 image inside QEMU. When | ||
144 | building the image also build the `u-boot` recipe to build the required | ||
145 | firmware (note that this firmware will _not_ boot on real hardware), then use | ||
146 | `runqemu` as usual. | ||
147 | |||
143 | 148 | ||
144 | Texas Instruments Beaglebone (beaglebone-yocto) | 149 | Texas Instruments Beaglebone (beaglebone-yocto) |
145 | ----------------------------------------------- | 150 | ----------------------------------------------- |
diff --git a/meta-yocto-bsp/conf/machine/genericarm64.conf b/meta-yocto-bsp/conf/machine/genericarm64.conf index 4afd6c3a87..4fa9395b31 100644 --- a/meta-yocto-bsp/conf/machine/genericarm64.conf +++ b/meta-yocto-bsp/conf/machine/genericarm64.conf | |||
@@ -51,6 +51,8 @@ QB_DEFAULT_FSTYPE = "wic" | |||
51 | QB_FSINFO = "wic:no-kernel-in-fs" | 51 | QB_FSINFO = "wic:no-kernel-in-fs" |
52 | # Mount the wic rootfs as a virtio block device | 52 | # Mount the wic rootfs as a virtio block device |
53 | QB_ROOTFS_OPT = "-drive id=root,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=root" | 53 | QB_ROOTFS_OPT = "-drive id=root,file=@ROOTFS@,if=none,format=raw -device virtio-blk-pci,drive=root" |
54 | # Virtio graphics | ||
55 | QB_GRAPHICS = "-device virtio-gpu-pci" | ||
54 | # Virtio serial consoles | 56 | # Virtio serial consoles |
55 | QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 57 | QB_SERIAL_OPT = "-device virtio-serial-pci -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
56 | QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" | 58 | QB_TCPSERIAL_OPT = "-device virtio-serial-pci -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1,nodelay=on -device virtconsole,chardev=virtcon" |
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend index 4a62ac952c..5b1b736b1c 100644 --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -2,10 +2,12 @@ KBRANCH:genericx86 = "standard/base" | |||
2 | KBRANCH:genericx86-64 = "standard/base" | 2 | KBRANCH:genericx86-64 = "standard/base" |
3 | KBRANCH:beaglebone-yocto = "standard/beaglebone" | 3 | KBRANCH:beaglebone-yocto = "standard/beaglebone" |
4 | 4 | ||
5 | KMACHINE:genericarm64 ?= "genericarm64" | ||
5 | KMACHINE:genericx86 ?= "common-pc" | 6 | KMACHINE:genericx86 ?= "common-pc" |
6 | KMACHINE:genericx86-64 ?= "common-pc-64" | 7 | KMACHINE:genericx86-64 ?= "common-pc-64" |
7 | KMACHINE:beaglebone-yocto ?= "beaglebone" | 8 | KMACHINE:beaglebone-yocto ?= "beaglebone" |
8 | 9 | ||
10 | COMPATIBLE_MACHINE:genericarm64 = "genericarm64" | ||
9 | COMPATIBLE_MACHINE:genericx86 = "genericx86" | 11 | COMPATIBLE_MACHINE:genericx86 = "genericx86" |
10 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" | 12 | COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64" |
11 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" | 13 | COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto" |
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 0999b42daa..066f3848f7 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass | |||
@@ -153,7 +153,7 @@ python base_do_fetch() { | |||
153 | } | 153 | } |
154 | 154 | ||
155 | addtask unpack after do_fetch | 155 | addtask unpack after do_fetch |
156 | do_unpack[dirs] = "${WORKDIR}" | 156 | do_unpack[dirs] = "${UNPACKDIR}" |
157 | 157 | ||
158 | do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" | 158 | do_unpack[cleandirs] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" |
159 | 159 | ||
@@ -164,7 +164,7 @@ python base_do_unpack() { | |||
164 | 164 | ||
165 | try: | 165 | try: |
166 | fetcher = bb.fetch2.Fetch(src_uri, d) | 166 | fetcher = bb.fetch2.Fetch(src_uri, d) |
167 | fetcher.unpack(d.getVar('WORKDIR')) | 167 | fetcher.unpack(d.getVar('UNPACKDIR')) |
168 | except bb.fetch2.BBFetchException as e: | 168 | except bb.fetch2.BBFetchException as e: |
169 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) | 169 | bb.fatal("Bitbake Fetcher Error: " + repr(e)) |
170 | } | 170 | } |
diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index e963001d09..c32dfffd83 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass | |||
@@ -298,7 +298,7 @@ def package_qa_check_libdir(d): | |||
298 | try: | 298 | try: |
299 | elf.open() | 299 | elf.open() |
300 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) | 300 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) |
301 | except (oe.qa.NotELFFileError): | 301 | except (oe.qa.NotELFFileError, FileNotFoundError): |
302 | pass | 302 | pass |
303 | if exec_re.match(rel_path): | 303 | if exec_re.match(rel_path): |
304 | if libdir not in rel_path and libexecdir not in rel_path: | 304 | if libdir not in rel_path and libexecdir not in rel_path: |
@@ -307,7 +307,7 @@ def package_qa_check_libdir(d): | |||
307 | try: | 307 | try: |
308 | elf.open() | 308 | elf.open() |
309 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) | 309 | messages.append("%s: found library in wrong location: %s" % (package, rel_path)) |
310 | except (oe.qa.NotELFFileError): | 310 | except (oe.qa.NotELFFileError, FileNotFoundError): |
311 | pass | 311 | pass |
312 | 312 | ||
313 | if messages: | 313 | if messages: |
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 2e3e4e8c79..790ccbfaf0 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass | |||
@@ -191,7 +191,7 @@ python write_specfile () { | |||
191 | if not len(depends_dict[dep]): | 191 | if not len(depends_dict[dep]): |
192 | array.append("%s: %s" % (tag, dep)) | 192 | array.append("%s: %s" % (tag, dep)) |
193 | 193 | ||
194 | def walk_files(walkpath, target, conffiles, dirfiles): | 194 | def walk_files(walkpath, target, conffiles): |
195 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories | 195 | # We can race against the ipk/deb backends which create CONTROL or DEBIAN directories |
196 | # when packaging. We just ignore these files which are created in | 196 | # when packaging. We just ignore these files which are created in |
197 | # packages-split/ and not package/ | 197 | # packages-split/ and not package/ |
@@ -233,22 +233,12 @@ python write_specfile () { | |||
233 | return False | 233 | return False |
234 | dirs[:] = [dir for dir in dirs if not move_to_files(dir)] | 234 | dirs[:] = [dir for dir in dirs if not move_to_files(dir)] |
235 | 235 | ||
236 | # Directory handling can happen in two ways, either DIRFILES is not set at all | 236 | for dir in dirs: |
237 | # in which case we fall back to the older behaviour of packages owning all their | 237 | if dir == "CONTROL" or dir == "DEBIAN": |
238 | # directories | 238 | continue |
239 | if dirfiles is None: | 239 | p = path + '/' + dir |
240 | for dir in dirs: | 240 | # All packages own the directories their files are in... |
241 | if dir == "CONTROL" or dir == "DEBIAN": | 241 | target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') |
242 | continue | ||
243 | p = path + '/' + dir | ||
244 | # All packages own the directories their files are in... | ||
245 | target.append(get_attr(dir) + '%dir "' + escape_chars(p) + '"') | ||
246 | elif path: | ||
247 | # packages own only empty directories or explict directory. | ||
248 | # This will prevent the overlapping of security permission. | ||
249 | attr = get_attr(path) | ||
250 | if (not files and not dirs) or path in dirfiles: | ||
251 | target.append(attr + '%dir "' + escape_chars(path) + '"') | ||
252 | 242 | ||
253 | for file in files: | 243 | for file in files: |
254 | if file == "CONTROL" or file == "DEBIAN": | 244 | if file == "CONTROL" or file == "DEBIAN": |
@@ -363,9 +353,6 @@ python write_specfile () { | |||
363 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) | 353 | localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) |
364 | 354 | ||
365 | conffiles = oe.package.get_conffiles(pkg, d) | 355 | conffiles = oe.package.get_conffiles(pkg, d) |
366 | dirfiles = localdata.getVar('DIRFILES') | ||
367 | if dirfiles is not None: | ||
368 | dirfiles = dirfiles.split() | ||
369 | 356 | ||
370 | splitname = pkgname | 357 | splitname = pkgname |
371 | 358 | ||
@@ -430,7 +417,7 @@ python write_specfile () { | |||
430 | srcrpostrm = splitrpostrm | 417 | srcrpostrm = splitrpostrm |
431 | 418 | ||
432 | file_list = [] | 419 | file_list = [] |
433 | walk_files(root, file_list, conffiles, dirfiles) | 420 | walk_files(root, file_list, conffiles) |
434 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": | 421 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": |
435 | bb.note("Not creating empty RPM package for %s" % splitname) | 422 | bb.note("Not creating empty RPM package for %s" % splitname) |
436 | else: | 423 | else: |
@@ -522,7 +509,7 @@ python write_specfile () { | |||
522 | 509 | ||
523 | # Now process files | 510 | # Now process files |
524 | file_list = [] | 511 | file_list = [] |
525 | walk_files(root, file_list, conffiles, dirfiles) | 512 | walk_files(root, file_list, conffiles) |
526 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": | 513 | if not file_list and localdata.getVar('ALLOW_EMPTY', False) != "1": |
527 | bb.note("Not creating empty RPM package for %s" % splitname) | 514 | bb.note("Not creating empty RPM package for %s" % splitname) |
528 | else: | 515 | else: |
diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index bbbc41ddae..180c6b77d8 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass | |||
@@ -40,7 +40,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \ | |||
40 | conf/site.conf:SCONF_VERSION:SITE_CONF_VERSION:oecore_update_siteconf \ | 40 | conf/site.conf:SCONF_VERSION:SITE_CONF_VERSION:oecore_update_siteconf \ |
41 | " | 41 | " |
42 | 42 | ||
43 | SANITY_DIFF_TOOL ?= "meld" | 43 | SANITY_DIFF_TOOL ?= "diff -u" |
44 | 44 | ||
45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" | 45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" |
46 | python oecore_update_localconf() { | 46 | python oecore_update_localconf() { |
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 96655ff24f..76a7b59636 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass | |||
@@ -4,7 +4,7 @@ | |||
4 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
5 | # | 5 | # |
6 | 6 | ||
7 | SSTATE_VERSION = "11" | 7 | SSTATE_VERSION = "12" |
8 | 8 | ||
9 | SSTATE_ZSTD_CLEVEL ??= "8" | 9 | SSTATE_ZSTD_CLEVEL ??= "8" |
10 | 10 | ||
@@ -1115,7 +1115,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, | |||
1115 | bb.parse.siggen.checkhashes(sq_data, missed, found, d) | 1115 | bb.parse.siggen.checkhashes(sq_data, missed, found, d) |
1116 | 1116 | ||
1117 | return found | 1117 | return found |
1118 | setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT" | 1118 | setscene_depvalid[vardepsexclude] = "SSTATE_EXCLUDEDEPS_SYSROOT _SSTATE_EXCLUDEDEPS_SYSROOT" |
1119 | 1119 | ||
1120 | BB_SETSCENE_DEPVALID = "setscene_depvalid" | 1120 | BB_SETSCENE_DEPVALID = "setscene_depvalid" |
1121 | 1121 | ||
diff --git a/meta/classes-global/utils.bbclass b/meta/classes-global/utils.bbclass index 8d797ff126..957389928f 100644 --- a/meta/classes-global/utils.bbclass +++ b/meta/classes-global/utils.bbclass | |||
@@ -15,7 +15,7 @@ oe_soinstall() { | |||
15 | ;; | 15 | ;; |
16 | esac | 16 | esac |
17 | install -m 755 $1 $2/$libname | 17 | install -m 755 $1 $2/$libname |
18 | sonamelink=`${HOST_PREFIX}readelf -d $1 |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'` | 18 | sonamelink=`${READELF} -d $1 |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'` |
19 | if [ -z $sonamelink ]; then | 19 | if [ -z $sonamelink ]; then |
20 | bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." | 20 | bbfatal "oe_soinstall: $libname is missing ELF tag 'SONAME'." |
21 | fi | 21 | fi |
@@ -147,7 +147,7 @@ oe_libinstall() { | |||
147 | # special case hack for non-libtool .so.#.#.# links | 147 | # special case hack for non-libtool .so.#.#.# links |
148 | baselibfile=`basename "$libfile"` | 148 | baselibfile=`basename "$libfile"` |
149 | if (echo $baselibfile | grep -qE '^lib.*\.so\.[0-9.]*$'); then | 149 | if (echo $baselibfile | grep -qE '^lib.*\.so\.[0-9.]*$'); then |
150 | sonamelink=`${HOST_PREFIX}readelf -d $libfile |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'` | 150 | sonamelink=`${READELF} -d $libfile |grep 'Library soname:' |sed -e 's/.*\[\(.*\)\].*/\1/'` |
151 | solink=`echo $baselibfile | sed -e 's/\.so\..*/.so/'` | 151 | solink=`echo $baselibfile | sed -e 's/\.so\..*/.so/'` |
152 | if [ -n "$sonamelink" -a x"$baselibfile" != x"$sonamelink" ]; then | 152 | if [ -n "$sonamelink" -a x"$baselibfile" != x"$sonamelink" ]; then |
153 | __runcmd ln -sf $baselibfile $destpath/$sonamelink | 153 | __runcmd ln -sf $baselibfile $destpath/$sonamelink |
diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass index ca76cde0e7..9359c9b4e1 100644 --- a/meta/classes-recipe/autotools.bbclass +++ b/meta/classes-recipe/autotools.bbclass | |||
@@ -43,7 +43,8 @@ export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}" | |||
43 | 43 | ||
44 | # When building tools for use at build-time it's recommended for the build | 44 | # When building tools for use at build-time it's recommended for the build |
45 | # system to use these variables when cross-compiling. | 45 | # system to use these variables when cross-compiling. |
46 | # (http://sources.redhat.com/autobook/autobook/autobook_270.html) | 46 | # https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html |
47 | # https://stackoverflow.com/questions/24201260/autotools-cross-compilation-and-generated-sources/24208587#24208587 | ||
47 | export CPP_FOR_BUILD = "${BUILD_CPP}" | 48 | export CPP_FOR_BUILD = "${BUILD_CPP}" |
48 | export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" | 49 | export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" |
49 | 50 | ||
diff --git a/meta/classes-recipe/cmake.bbclass b/meta/classes-recipe/cmake.bbclass index 3d3781ef33..e1c3d7ddb5 100644 --- a/meta/classes-recipe/cmake.bbclass +++ b/meta/classes-recipe/cmake.bbclass | |||
@@ -124,7 +124,7 @@ set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE STRING "LDFLAGS" ) | |||
124 | 124 | ||
125 | # only search in the paths provided so cmake doesnt pick | 125 | # only search in the paths provided so cmake doesnt pick |
126 | # up libraries and tools from the native build machine | 126 | # up libraries and tools from the native build machine |
127 | set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN} ${HOSTTOOLS_DIR}) | 127 | set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR} ${OECMAKE_EXTRA_ROOT_PATH} ${EXTERNAL_TOOLCHAIN} ${COREBASE}/scripts ${HOSTTOOLS_DIR} ) |
128 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) | 128 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) |
129 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} ) | 129 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM} ) |
130 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) | 130 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) |
diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index c4e3c9ff7a..03e5fe6f47 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass | |||
@@ -61,16 +61,14 @@ python do_menuconfig() { | |||
61 | oe_terminal("sh -c 'make %s; if [ \\$? -ne 0 ]; then echo \"Command failed.\"; printf \"Press any key to continue... \"; read r; fi'" % d.getVar('KCONFIG_CONFIG_COMMAND'), | 61 | oe_terminal("sh -c 'make %s; if [ \\$? -ne 0 ]; then echo \"Command failed.\"; printf \"Press any key to continue... \"; read r; fi'" % d.getVar('KCONFIG_CONFIG_COMMAND'), |
62 | d.getVar('PN') + ' Configuration', d) | 62 | d.getVar('PN') + ' Configuration', d) |
63 | 63 | ||
64 | # FIXME this check can be removed when the minimum bitbake version has been bumped | 64 | try: |
65 | if hasattr(bb.build, 'write_taint'): | 65 | newmtime = os.path.getmtime(config) |
66 | try: | 66 | except OSError: |
67 | newmtime = os.path.getmtime(config) | 67 | newmtime = 0 |
68 | except OSError: | 68 | |
69 | newmtime = 0 | 69 | if newmtime > mtime: |
70 | 70 | bb.plain("Changed configuration saved at:\n %s\nRecompile will be forced" % config) | |
71 | if newmtime > mtime: | 71 | bb.build.write_taint('do_compile', d) |
72 | bb.note("Configuration changed, recompile will be forced") | ||
73 | bb.build.write_taint('do_compile', d) | ||
74 | } | 72 | } |
75 | do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" | 73 | do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" |
76 | do_menuconfig[nostamp] = "1" | 74 | do_menuconfig[nostamp] = "1" |
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index cc3564c36a..d32509aa6d 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass | |||
@@ -48,8 +48,6 @@ GO_RPATH:class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE | |||
48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" | 48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" |
49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" | 49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" |
50 | GO_LINKMODE ?= "" | 50 | GO_LINKMODE ?= "" |
51 | GO_LINKMODE:class-nativesdk = "--linkmode=external" | ||
52 | GO_LINKMODE:class-native = "--linkmode=external" | ||
53 | GO_EXTRA_LDFLAGS ?= "" | 51 | GO_EXTRA_LDFLAGS ?= "" |
54 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" | 52 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" |
55 | # Use system loader. If uninative is used, the uninative loader will be patched automatically | 53 | # Use system loader. If uninative is used, the uninative loader will be patched automatically |
diff --git a/meta/classes-recipe/goarch.bbclass b/meta/classes-recipe/goarch.bbclass index 6899ec28e4..1ebe03864f 100644 --- a/meta/classes-recipe/goarch.bbclass +++ b/meta/classes-recipe/goarch.bbclass | |||
@@ -38,13 +38,13 @@ BASE_GOARM:armv5 = '5' | |||
38 | # Go supports dynamic linking on a limited set of architectures. | 38 | # Go supports dynamic linking on a limited set of architectures. |
39 | # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go | 39 | # See the supportsDynlink function in go/src/cmd/compile/internal/gc/main.go |
40 | GO_DYNLINK = "" | 40 | GO_DYNLINK = "" |
41 | GO_DYNLINK:arm = "" | 41 | GO_DYNLINK:arm ?= "1" |
42 | GO_DYNLINK:aarch64 = "" | 42 | GO_DYNLINK:aarch64 ?= "1" |
43 | GO_DYNLINK:x86 = "" | 43 | GO_DYNLINK:x86 ?= "1" |
44 | GO_DYNLINK:x86-64 = "" | 44 | GO_DYNLINK:x86-64 ?= "1" |
45 | GO_DYNLINK:powerpc64 = "" | 45 | GO_DYNLINK:powerpc64 ?= "1" |
46 | GO_DYNLINK:powerpc64le = "" | 46 | GO_DYNLINK:powerpc64le ?= "1" |
47 | GO_DYNLINK:class-native = "" | 47 | GO_DYNLINK:class-native ?= "" |
48 | GO_DYNLINK:class-nativesdk = "" | 48 | GO_DYNLINK:class-nativesdk = "" |
49 | 49 | ||
50 | # define here because everybody inherits this class | 50 | # define here because everybody inherits this class |
diff --git a/meta/classes-recipe/image-live.bbclass b/meta/classes-recipe/image-live.bbclass index da919d52f9..d2e95ef51c 100644 --- a/meta/classes-recipe/image-live.bbclass +++ b/meta/classes-recipe/image-live.bbclass | |||
@@ -38,7 +38,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ | |||
38 | LABELS_LIVE ?= "boot install" | 38 | LABELS_LIVE ?= "boot install" |
39 | ROOT_LIVE ?= "root=/dev/ram0" | 39 | ROOT_LIVE ?= "root=/dev/ram0" |
40 | INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" | 40 | INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" |
41 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${INITRAMFS_FSTYPES}" | 41 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${@d.getVar('INITRAMFS_FSTYPES').split()[0]}" |
42 | 42 | ||
43 | LIVE_ROOTFS_TYPE ?= "ext4" | 43 | LIVE_ROOTFS_TYPE ?= "ext4" |
44 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" | 44 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" |
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 913cb8788c..b4a83ae284 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass | |||
@@ -112,18 +112,22 @@ IMAGE_CMD:btrfs () { | |||
112 | } | 112 | } |
113 | 113 | ||
114 | oe_mksquashfs () { | 114 | oe_mksquashfs () { |
115 | local comp=$1 | 115 | local comp=$1; shift |
116 | local suffix=$2 | 116 | local extra_imagecmd=$@ |
117 | |||
118 | if [ "$comp" = "zstd" ]; then | ||
119 | suffix="zst" | ||
120 | fi | ||
117 | 121 | ||
118 | # Use the bitbake reproducible timestamp instead of the hardcoded squashfs one | 122 | # Use the bitbake reproducible timestamp instead of the hardcoded squashfs one |
119 | export SOURCE_DATE_EPOCH=$(stat -c '%Y' ${IMAGE_ROOTFS}) | 123 | export SOURCE_DATE_EPOCH=$(stat -c '%Y' ${IMAGE_ROOTFS}) |
120 | mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} ${EXTRA_IMAGECMD} -noappend ${comp:+-comp }$comp | 124 | mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}.squashfs${comp:+-}${suffix:-$comp} -noappend ${comp:+-comp }$comp $extra_imagecmd |
121 | } | 125 | } |
122 | IMAGE_CMD:squashfs = "oe_mksquashfs" | 126 | IMAGE_CMD:squashfs = "oe_mksquashfs '' ${EXTRA_IMAGECMD}" |
123 | IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz" | 127 | IMAGE_CMD:squashfs-xz = "oe_mksquashfs xz ${EXTRA_IMAGECMD}" |
124 | IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo" | 128 | IMAGE_CMD:squashfs-lzo = "oe_mksquashfs lzo ${EXTRA_IMAGECMD}" |
125 | IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4" | 129 | IMAGE_CMD:squashfs-lz4 = "oe_mksquashfs lz4 ${EXTRA_IMAGECMD}" |
126 | IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd zst" | 130 | IMAGE_CMD:squashfs-zst = "oe_mksquashfs zstd ${EXTRA_IMAGECMD}" |
127 | 131 | ||
128 | IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs ${IMAGE_ROOTFS}" | 132 | IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs ${IMAGE_ROOTFS}" |
129 | IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs-lz4 ${IMAGE_ROOTFS}" | 133 | IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}.erofs-lz4 ${IMAGE_ROOTFS}" |
diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index 9a86616dad..6468e8aa90 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass | |||
@@ -63,7 +63,7 @@ def find_sccs(d): | |||
63 | return sources_list | 63 | return sources_list |
64 | 64 | ||
65 | # check the SRC_URI for "kmeta" type'd git repositories. Return the name of | 65 | # check the SRC_URI for "kmeta" type'd git repositories. Return the name of |
66 | # the repository as it will be found in WORKDIR | 66 | # the repository as it will be found in UNPACKDIR |
67 | def find_kernel_feature_dirs(d): | 67 | def find_kernel_feature_dirs(d): |
68 | feature_dirs=[] | 68 | feature_dirs=[] |
69 | fetch = bb.fetch2.Fetch([], d) | 69 | fetch = bb.fetch2.Fetch([], d) |
@@ -147,24 +147,24 @@ do_kernel_metadata() { | |||
147 | # from the source tree, into a common location and normalized "defconfig" name, | 147 | # from the source tree, into a common location and normalized "defconfig" name, |
148 | # where the rest of the process will include and incoroporate it into the build | 148 | # where the rest of the process will include and incoroporate it into the build |
149 | # | 149 | # |
150 | # If the fetcher has already placed a defconfig in WORKDIR (from the SRC_URI), | 150 | # If the fetcher has already placed a defconfig in UNPACKDIR (from the SRC_URI), |
151 | # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take | 151 | # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take |
152 | # precendence. | 152 | # precendence. |
153 | # | 153 | # |
154 | if [ -n "${KBUILD_DEFCONFIG}" ]; then | 154 | if [ -n "${KBUILD_DEFCONFIG}" ]; then |
155 | if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then | 155 | if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then |
156 | if [ -f "${WORKDIR}/defconfig" ]; then | 156 | if [ -f "${UNPACKDIR}/defconfig" ]; then |
157 | # If the two defconfig's are different, warn that we overwrote the | 157 | # If the two defconfig's are different, warn that we overwrote the |
158 | # one already placed in WORKDIR | 158 | # one already placed in UNPACKDIR |
159 | cmp "${WORKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" | 159 | cmp "${UNPACKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" |
160 | if [ $? -ne 0 ]; then | 160 | if [ $? -ne 0 ]; then |
161 | bbdebug 1 "detected SRC_URI or unpatched defconfig in WORKDIR. ${KBUILD_DEFCONFIG} copied over it" | 161 | bbdebug 1 "detected SRC_URI or unpatched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it" |
162 | fi | 162 | fi |
163 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig | 163 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig |
164 | else | 164 | else |
165 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig | 165 | cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig |
166 | fi | 166 | fi |
167 | in_tree_defconfig="${WORKDIR}/defconfig" | 167 | in_tree_defconfig="${UNPACKDIR}/defconfig" |
168 | else | 168 | else |
169 | bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)" | 169 | bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)" |
170 | fi | 170 | fi |
@@ -178,7 +178,7 @@ do_kernel_metadata() { | |||
178 | patches="${@" ".join(find_patches(d,'kernel-meta'))}" | 178 | patches="${@" ".join(find_patches(d,'kernel-meta'))}" |
179 | if [ -n "$patches" ]; then | 179 | if [ -n "$patches" ]; then |
180 | ( | 180 | ( |
181 | cd ${WORKDIR}/kernel-meta | 181 | cd ${UNPACKDIR}/kernel-meta |
182 | 182 | ||
183 | # take the SRC_URI patches, and create a series file | 183 | # take the SRC_URI patches, and create a series file |
184 | # this is required to support some better processing | 184 | # this is required to support some better processing |
@@ -193,11 +193,11 @@ do_kernel_metadata() { | |||
193 | # handling the rest of the kernel. This allows us | 193 | # handling the rest of the kernel. This allows us |
194 | # more flexibility for handling failures or advanced | 194 | # more flexibility for handling failures or advanced |
195 | # mergeing functinoality | 195 | # mergeing functinoality |
196 | message=$(kgit-s2q --gen -v --patches ${WORKDIR}/kernel-meta 2>&1) | 196 | message=$(kgit-s2q --gen -v --patches ${UNPACKDIR}/kernel-meta 2>&1) |
197 | if [ $? -ne 0 ]; then | 197 | if [ $? -ne 0 ]; then |
198 | # setup to try the patch again | 198 | # setup to try the patch again |
199 | kgit-s2q --prev | 199 | kgit-s2q --prev |
200 | bberror "Problem applying patches to: ${WORKDIR}/kernel-meta" | 200 | bberror "Problem applying patches to: ${UNPACKDIR}/kernel-meta" |
201 | bbfatal_log "\n($message)" | 201 | bbfatal_log "\n($message)" |
202 | fi | 202 | fi |
203 | ) | 203 | ) |
@@ -232,12 +232,12 @@ do_kernel_metadata() { | |||
232 | # SRC_URI. If they were supplied, we convert them into include directives | 232 | # SRC_URI. If they were supplied, we convert them into include directives |
233 | # for the update part of the process | 233 | # for the update part of the process |
234 | for f in ${feat_dirs}; do | 234 | for f in ${feat_dirs}; do |
235 | if [ -d "${WORKDIR}/$f/kernel-meta" ]; then | 235 | if [ -d "${UNPACKDIR}/$f/kernel-meta" ]; then |
236 | includes="$includes -I${WORKDIR}/$f/kernel-meta" | 236 | includes="$includes -I${UNPACKDIR}/$f/kernel-meta" |
237 | elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then | 237 | elif [ -d "${UNPACKDIR}/../oe-local-files/$f" ]; then |
238 | includes="$includes -I${WORKDIR}/../oe-local-files/$f" | 238 | includes="$includes -I${UNPACKDIR}/../oe-local-files/$f" |
239 | elif [ -d "${WORKDIR}/$f" ]; then | 239 | elif [ -d "${UNPACKDIR}/$f" ]; then |
240 | includes="$includes -I${WORKDIR}/$f" | 240 | includes="$includes -I${UNPACKDIR}/$f" |
241 | fi | 241 | fi |
242 | done | 242 | done |
243 | for s in ${sccs} ${patches}; do | 243 | for s in ${sccs} ${patches}; do |
@@ -460,7 +460,7 @@ do_kernel_configme() { | |||
460 | config_flags="" | 460 | config_flags="" |
461 | ;; | 461 | ;; |
462 | *) | 462 | *) |
463 | if [ -f ${WORKDIR}/defconfig ]; then | 463 | if [ -f ${UNPACKDIR}/defconfig ]; then |
464 | config_flags="-n" | 464 | config_flags="-n" |
465 | fi | 465 | fi |
466 | ;; | 466 | ;; |
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index b084d6d69d..d6eedf942c 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass | |||
@@ -463,7 +463,7 @@ kernel_do_install() { | |||
463 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" | 463 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" |
464 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" | 464 | rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" |
465 | # Remove empty module directories to prevent QA issues | 465 | # Remove empty module directories to prevent QA issues |
466 | find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete | 466 | [ -d "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" ] && find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete |
467 | else | 467 | else |
468 | bbnote "no modules to install" | 468 | bbnote "no modules to install" |
469 | fi | 469 | fi |
@@ -679,8 +679,8 @@ kernel_do_configure() { | |||
679 | 679 | ||
680 | # Copy defconfig to .config if .config does not exist. This allows | 680 | # Copy defconfig to .config if .config does not exist. This allows |
681 | # recipes to manage the .config themselves in do_configure:prepend(). | 681 | # recipes to manage the .config themselves in do_configure:prepend(). |
682 | if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then | 682 | if [ -f "${UNPACKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then |
683 | cp "${WORKDIR}/defconfig" "${B}/.config" | 683 | cp "${UNPACKDIR}/defconfig" "${B}/.config" |
684 | fi | 684 | fi |
685 | 685 | ||
686 | ${KERNEL_CONFIG_COMMAND} | 686 | ${KERNEL_CONFIG_COMMAND} |
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index f209becae1..f5687e5899 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass | |||
@@ -494,7 +494,7 @@ def prepare_locked_cache(d, baseoutpath, derivative, conf_initpath): | |||
494 | bb.utils.remove(sstate_out, True) | 494 | bb.utils.remove(sstate_out, True) |
495 | 495 | ||
496 | # uninative.bbclass sets NATIVELSBSTRING to 'universal%s' % oe.utils.host_gcc_version(d) | 496 | # uninative.bbclass sets NATIVELSBSTRING to 'universal%s' % oe.utils.host_gcc_version(d) |
497 | fixedlsbstring = "universal%s" % oe.utils.host_gcc_version(d) | 497 | fixedlsbstring = "universal%s" % oe.utils.host_gcc_version(d) if bb.data.inherits_class('uninative', d) else "" |
498 | 498 | ||
499 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1') | 499 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1') |
500 | sdk_ext_type = d.getVar('SDK_EXT_TYPE') | 500 | sdk_ext_type = d.getVar('SDK_EXT_TYPE') |
diff --git a/meta/classes-recipe/ptest.bbclass b/meta/classes-recipe/ptest.bbclass index 348d729aef..0941572f8f 100644 --- a/meta/classes-recipe/ptest.bbclass +++ b/meta/classes-recipe/ptest.bbclass | |||
@@ -53,8 +53,8 @@ do_install_ptest() { | |||
53 | } | 53 | } |
54 | 54 | ||
55 | do_install_ptest_base() { | 55 | do_install_ptest_base() { |
56 | if [ -f ${WORKDIR}/run-ptest ]; then | 56 | if [ -f ${UNPACKDIR}/run-ptest ]; then |
57 | install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest | 57 | install -D ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest |
58 | fi | 58 | fi |
59 | 59 | ||
60 | grep -q install-ptest: Makefile 2>/dev/null && oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest | 60 | grep -q install-ptest: Makefile 2>/dev/null && oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest |
diff --git a/meta/classes-recipe/pypi.bbclass b/meta/classes-recipe/pypi.bbclass index b8c18ccf39..c6bbe8119a 100644 --- a/meta/classes-recipe/pypi.bbclass +++ b/meta/classes-recipe/pypi.bbclass | |||
@@ -12,14 +12,19 @@ def pypi_package(d): | |||
12 | return bpn[8:] | 12 | return bpn[8:] |
13 | return bpn | 13 | return bpn |
14 | 14 | ||
15 | # The PyPi package name (defaults to PN without the python3- prefix) | ||
15 | PYPI_PACKAGE ?= "${@pypi_package(d)}" | 16 | PYPI_PACKAGE ?= "${@pypi_package(d)}" |
17 | # The file extension of the source archive | ||
16 | PYPI_PACKAGE_EXT ?= "tar.gz" | 18 | PYPI_PACKAGE_EXT ?= "tar.gz" |
17 | PYPI_ARCHIVE_NAME ?= "${PYPI_PACKAGE}-${PV}.${PYPI_PACKAGE_EXT}" | 19 | # An optional prefix for the download file in the case of name collisions |
18 | PYPI_ARCHIVE_NAME_PREFIX ?= "" | 20 | PYPI_ARCHIVE_NAME_PREFIX ?= "" |
19 | 21 | ||
20 | def pypi_src_uri(d): | 22 | def pypi_src_uri(d): |
23 | """ | ||
24 | Construct a source URL as per https://warehouse.pypa.io/api-reference/integration-guide.html#predictable-urls. | ||
25 | """ | ||
21 | package = d.getVar('PYPI_PACKAGE') | 26 | package = d.getVar('PYPI_PACKAGE') |
22 | archive_name = d.getVar('PYPI_ARCHIVE_NAME') | 27 | archive_name = d.expand('${PYPI_PACKAGE}-${PV}.${PYPI_PACKAGE_EXT}') |
23 | archive_downloadname = d.getVar('PYPI_ARCHIVE_NAME_PREFIX') + archive_name | 28 | archive_downloadname = d.getVar('PYPI_ARCHIVE_NAME_PREFIX') + archive_name |
24 | return 'https://files.pythonhosted.org/packages/source/%s/%s/%s;downloadfilename=%s' % (package[0], package, archive_name, archive_downloadname) | 29 | return 'https://files.pythonhosted.org/packages/source/%s/%s/%s;downloadfilename=%s' % (package[0], package, archive_name, archive_downloadname) |
25 | 30 | ||
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index e81b69a239..920da94ba2 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass | |||
@@ -206,7 +206,9 @@ read_only_rootfs_hook () { | |||
206 | # Also tweak the key location for dropbear in the same way. | 206 | # Also tweak the key location for dropbear in the same way. |
207 | if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then | 207 | if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then |
208 | if [ ! -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then | 208 | if [ ! -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then |
209 | echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear | 209 | if ! grep -q "^DROPBEAR_RSAKEY_DIR=" ${IMAGE_ROOTFS}/etc/default/dropbear ; then |
210 | echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear | ||
211 | fi | ||
210 | fi | 212 | fi |
211 | fi | 213 | fi |
212 | fi | 214 | fi |
diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 926b0630b1..330ad8a3f5 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass | |||
@@ -21,6 +21,9 @@ def llvm_features_from_tune(d): | |||
21 | 21 | ||
22 | if 'vfpv4' in feat: | 22 | if 'vfpv4' in feat: |
23 | f.append("+vfp4") | 23 | f.append("+vfp4") |
24 | elif 'vfpv4d16' in feat: | ||
25 | f.append("+vfp4") | ||
26 | f.append("-d32") | ||
24 | elif 'vfpv3' in feat: | 27 | elif 'vfpv3' in feat: |
25 | f.append("+vfp3") | 28 | f.append("+vfp3") |
26 | elif 'vfpv3d16' in feat: | 29 | elif 'vfpv3d16' in feat: |
diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 7a0b8047e4..c8e097f2f2 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass | |||
@@ -367,7 +367,7 @@ do_uboot_assemble_fitimage() { | |||
367 | done | 367 | done |
368 | 368 | ||
369 | for binary in ${UBOOT_BINARIES}; do | 369 | for binary in ${UBOOT_BINARIES}; do |
370 | k=$(expr $j + 1); | 370 | k=$(expr $k + 1); |
371 | if [ $k -eq $i ]; then | 371 | if [ $k -eq $i ]; then |
372 | break; | 372 | break; |
373 | fi | 373 | fi |
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 486efadba9..7c8a0b8b0f 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass | |||
@@ -28,7 +28,7 @@ SPDX_ARCHIVE_SOURCES ??= "0" | |||
28 | SPDX_ARCHIVE_PACKAGED ??= "0" | 28 | SPDX_ARCHIVE_PACKAGED ??= "0" |
29 | 29 | ||
30 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" | 30 | SPDX_UUID_NAMESPACE ??= "sbom.openembedded.org" |
31 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdoc" | 31 | SPDX_NAMESPACE_PREFIX ??= "http://spdx.org/spdxdocs" |
32 | SPDX_PRETTY ??= "0" | 32 | SPDX_PRETTY ??= "0" |
33 | 33 | ||
34 | SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" | 34 | SPDX_LICENSES ??= "${COREBASE}/meta/files/spdx-licenses.json" |
@@ -357,7 +357,13 @@ def collect_dep_recipes(d, doc, spdx_recipe): | |||
357 | with spdx_deps_file.open("r") as f: | 357 | with spdx_deps_file.open("r") as f: |
358 | deps = json.load(f) | 358 | deps = json.load(f) |
359 | 359 | ||
360 | for dep_pn, dep_hashfn in deps: | 360 | for dep_pn, dep_hashfn, in_taskhash in deps: |
361 | # If this dependency is not calculated in the taskhash skip it. | ||
362 | # Otherwise, it can result in broken links since this task won't | ||
363 | # rebuild and see the new SPDX ID if the dependency changes | ||
364 | if not in_taskhash: | ||
365 | continue | ||
366 | |||
361 | dep_recipe_path = oe.sbom.doc_find_by_hashfn(deploy_dir_spdx, package_archs, "recipe-" + dep_pn, dep_hashfn) | 367 | dep_recipe_path = oe.sbom.doc_find_by_hashfn(deploy_dir_spdx, package_archs, "recipe-" + dep_pn, dep_hashfn) |
362 | if not dep_recipe_path: | 368 | if not dep_recipe_path: |
363 | bb.fatal("Cannot find any SPDX file for recipe %s, %s" % (dep_pn, dep_hashfn)) | 369 | bb.fatal("Cannot find any SPDX file for recipe %s, %s" % (dep_pn, dep_hashfn)) |
@@ -478,7 +484,7 @@ def collect_direct_deps(d, dep_task): | |||
478 | for dep_name in this_dep[3]: | 484 | for dep_name in this_dep[3]: |
479 | dep_data = taskdepdata[dep_name] | 485 | dep_data = taskdepdata[dep_name] |
480 | if dep_data[1] == dep_task and dep_data[0] != pn: | 486 | if dep_data[1] == dep_task and dep_data[0] != pn: |
481 | deps.add((dep_data[0], dep_data[7])) | 487 | deps.add((dep_data[0], dep_data[7], dep_name in this_dep[8])) |
482 | 488 | ||
483 | return sorted(deps) | 489 | return sorted(deps) |
484 | 490 | ||
@@ -721,9 +727,9 @@ def collect_package_providers(d): | |||
721 | providers = {} | 727 | providers = {} |
722 | 728 | ||
723 | deps = collect_direct_deps(d, "do_create_spdx") | 729 | deps = collect_direct_deps(d, "do_create_spdx") |
724 | deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME"))) | 730 | deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME"), True)) |
725 | 731 | ||
726 | for dep_pn, dep_hashfn in deps: | 732 | for dep_pn, dep_hashfn, _ in deps: |
727 | localdata = d | 733 | localdata = d |
728 | recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) | 734 | recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) |
729 | if not recipe_data: | 735 | if not recipe_data: |
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index b6643ea60b..13c2c45b42 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf | |||
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "15" | |||
12 | # a reset of the equivalence, for example when reproducibility issues break the | 12 | # a reset of the equivalence, for example when reproducibility issues break the |
13 | # existing match data. Distros can also append to this value for the same effect. | 13 | # existing match data. Distros can also append to this value for the same effect. |
14 | # | 14 | # |
15 | HASHEQUIV_HASH_VERSION = "15" | 15 | HASHEQUIV_HASH_VERSION = "16" |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6f180d18b0..b2c500d873 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -383,8 +383,7 @@ FILESEXTRAPATHS ?= "__default:" | |||
383 | # the builtin definitions will be used. Builtin definitions included: | 383 | # the builtin definitions will be used. Builtin definitions included: |
384 | # base_prefix, prefix, exec_prefix, base_bindir, base_sbindir, base_libdir, | 384 | # base_prefix, prefix, exec_prefix, base_bindir, base_sbindir, base_libdir, |
385 | # datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir, | 385 | # datadir, sysconfdir, servicedir, sharedstatedir, localstatedir, infodir, |
386 | # mandir, docdir, bindir, sbindir, libexecdir, libdir, includedir and | 386 | # mandir, docdir, bindir, sbindir, libexecdir, libdir and includedir |
387 | # oldincludedir | ||
388 | FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'files/fs-perms-persistent-log.txt'}" | 387 | FILESYSTEM_PERMS_TABLES ?= "${@'files/fs-perms.txt' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'files/fs-perms-persistent-log.txt'}" |
389 | 388 | ||
390 | ################################################################## | 389 | ################################################################## |
@@ -406,6 +405,7 @@ STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" | |||
406 | STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" | 405 | STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*" |
407 | BASE_WORKDIR ?= "${TMPDIR}/work" | 406 | BASE_WORKDIR ?= "${TMPDIR}/work" |
408 | WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" | 407 | WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}" |
408 | UNPACKDIR ??= "${WORKDIR}" | ||
409 | T = "${WORKDIR}/temp" | 409 | T = "${WORKDIR}/temp" |
410 | D = "${WORKDIR}/image" | 410 | D = "${WORKDIR}/image" |
411 | S = "${WORKDIR}/${BP}" | 411 | S = "${WORKDIR}/${BP}" |
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index e6131c815a..2b579339b2 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -123,7 +123,6 @@ DISTRO_PN_ALIAS:pn-keymaps = "OE-Core" | |||
123 | DISTRO_PN_ALIAS:pn-kf = "OSPDT" | 123 | DISTRO_PN_ALIAS:pn-kf = "OSPDT" |
124 | DISTRO_PN_ALIAS:pn-lame = "Debian=lame Ubuntu=lame" | 124 | DISTRO_PN_ALIAS:pn-lame = "Debian=lame Ubuntu=lame" |
125 | DISTRO_PN_ALIAS:pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" | 125 | DISTRO_PN_ALIAS:pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" |
126 | DISTRO_PN_ALIAS:pn-liba52 = "Mandriva=a52dec Debian=a52dec" | ||
127 | DISTRO_PN_ALIAS:pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" | 126 | DISTRO_PN_ALIAS:pn-libacpi = "Ubuntu=libacpi Mandriva=libacpi" |
128 | DISTRO_PN_ALIAS:pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops" | 127 | DISTRO_PN_ALIAS:pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops" |
129 | DISTRO_PN_ALIAS:pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" | 128 | DISTRO_PN_ALIAS:pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4ca5430a94..a11859890e 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -305,7 +305,6 @@ RECIPE_MAINTAINER:pn-l3afpad = "Anuj Mittal <anuj.mittal@intel.com>" | |||
305 | RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <michael.opdenacker@bootlin.com>" | 305 | RECIPE_MAINTAINER:pn-lame = "Michael Opdenacker <michael.opdenacker@bootlin.com>" |
306 | RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" | 306 | RECIPE_MAINTAINER:pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" |
307 | RECIPE_MAINTAINER:pn-less = "Yi Zhao <yi.zhao@windriver.com>" | 307 | RECIPE_MAINTAINER:pn-less = "Yi Zhao <yi.zhao@windriver.com>" |
308 | RECIPE_MAINTAINER:pn-liba52 = "Unassigned <unassigned@yoctoproject.org>" | ||
309 | RECIPE_MAINTAINER:pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" | 308 | RECIPE_MAINTAINER:pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" |
310 | RECIPE_MAINTAINER:pn-libadwaita = "Alexander Kanavin <alex.kanavin@gmail.com>" | 309 | RECIPE_MAINTAINER:pn-libadwaita = "Alexander Kanavin <alex.kanavin@gmail.com>" |
311 | RECIPE_MAINTAINER:pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" | 310 | RECIPE_MAINTAINER:pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" |
@@ -328,7 +327,6 @@ RECIPE_MAINTAINER:pn-libdrm = "Otavio Salvador <otavio.salvador@ossystems.com.br | |||
328 | RECIPE_MAINTAINER:pn-libedit = "Khem Raj <raj.khem@gmail.com>" | 327 | RECIPE_MAINTAINER:pn-libedit = "Khem Raj <raj.khem@gmail.com>" |
329 | RECIPE_MAINTAINER:pn-libepoxy = "Anuj Mittal <anuj.mittal@intel.com>" | 328 | RECIPE_MAINTAINER:pn-libepoxy = "Anuj Mittal <anuj.mittal@intel.com>" |
330 | RECIPE_MAINTAINER:pn-liberation-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" | 329 | RECIPE_MAINTAINER:pn-liberation-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" |
331 | RECIPE_MAINTAINER:pn-liberror-perl = "Tim Orling <tim.orling@konsulko.com>" | ||
332 | RECIPE_MAINTAINER:pn-libevdev = "Anuj Mittal <anuj.mittal@intel.com>" | 330 | RECIPE_MAINTAINER:pn-libevdev = "Anuj Mittal <anuj.mittal@intel.com>" |
333 | RECIPE_MAINTAINER:pn-libevent = "Anuj Mittal <anuj.mittal@intel.com>" | 331 | RECIPE_MAINTAINER:pn-libevent = "Anuj Mittal <anuj.mittal@intel.com>" |
334 | RECIPE_MAINTAINER:pn-libexif = "Alexander Kanavin <alex.kanavin@gmail.com>" | 332 | RECIPE_MAINTAINER:pn-libexif = "Alexander Kanavin <alex.kanavin@gmail.com>" |
@@ -525,7 +523,6 @@ RECIPE_MAINTAINER:pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>" | |||
525 | RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" | 523 | RECIPE_MAINTAINER:pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" |
526 | RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" | 524 | RECIPE_MAINTAINER:pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" |
527 | RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" | 525 | RECIPE_MAINTAINER:pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" |
528 | RECIPE_MAINTAINER:pn-mpeg2dec = "Alexander Kanavin <alex.kanavin@gmail.com>" | ||
529 | RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>" | 526 | RECIPE_MAINTAINER:pn-mpfr = "Khem Raj <raj.khem@gmail.com>" |
530 | RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" | 527 | RECIPE_MAINTAINER:pn-mpg123 = "Alexander Kanavin <alex.kanavin@gmail.com>" |
531 | RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>" | 528 | RECIPE_MAINTAINER:pn-msmtp = "Wang Mingyu <wangmy@fujitsu.com>" |
@@ -730,6 +727,7 @@ RECIPE_MAINTAINER:pn-python3-urllib3 = "Tim Orling <tim.orling@konsulko.com>" | |||
730 | RECIPE_MAINTAINER:pn-python3-vcversioner = "Bruce Ashfield <bruce.ashfield@gmail.com>" | 727 | RECIPE_MAINTAINER:pn-python3-vcversioner = "Bruce Ashfield <bruce.ashfield@gmail.com>" |
731 | RECIPE_MAINTAINER:pn-python3-wcwidth = "Tim Orling <tim.orling@konsulko.com>" | 728 | RECIPE_MAINTAINER:pn-python3-wcwidth = "Tim Orling <tim.orling@konsulko.com>" |
732 | RECIPE_MAINTAINER:pn-python3-webcolors = "Bruce Ashfield <bruce.ashfield@gmail.com>" | 729 | RECIPE_MAINTAINER:pn-python3-webcolors = "Bruce Ashfield <bruce.ashfield@gmail.com>" |
730 | RECIPE_MAINTAINER:pn-python3-websockets = "Tim Orling <tim.orling@konsulko.com>" | ||
733 | RECIPE_MAINTAINER:pn-python3-wheel = "Tim Orling <tim.orling@konsulko.com>" | 731 | RECIPE_MAINTAINER:pn-python3-wheel = "Tim Orling <tim.orling@konsulko.com>" |
734 | RECIPE_MAINTAINER:pn-python3-xmltodict = "Leon Anavi <leon.anavi@konsulko.com>" | 732 | RECIPE_MAINTAINER:pn-python3-xmltodict = "Leon Anavi <leon.anavi@konsulko.com>" |
735 | RECIPE_MAINTAINER:pn-python3-yamllint = "Tim Orling <tim.orling@konsulko.com>" | 733 | RECIPE_MAINTAINER:pn-python3-yamllint = "Tim Orling <tim.orling@konsulko.com>" |
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0192146dbd..5975db25cc 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -28,7 +28,6 @@ PTESTS_FAST = "\ | |||
28 | json-c \ | 28 | json-c \ |
29 | json-glib \ | 29 | json-glib \ |
30 | libconvert-asn1-perl \ | 30 | libconvert-asn1-perl \ |
31 | liberror-perl \ | ||
32 | libgpg-error\ | 31 | libgpg-error\ |
33 | libnl \ | 32 | libnl \ |
34 | libpcre \ | 33 | libpcre \ |
@@ -120,6 +119,7 @@ PTESTS_SLOW = "\ | |||
120 | util-linux \ | 119 | util-linux \ |
121 | valgrind \ | 120 | valgrind \ |
122 | lz4 \ | 121 | lz4 \ |
122 | libseccomp \ | ||
123 | " | 123 | " |
124 | 124 | ||
125 | # python3 ptests hang on qemuriscv64 | 125 | # python3 ptests hang on qemuriscv64 |
@@ -139,7 +139,6 @@ PTESTS_PROBLEMS:append:x86 = " valgrind" | |||
139 | # libpam \ # Needs pam DISTRO_FEATURE | 139 | # libpam \ # Needs pam DISTRO_FEATURE |
140 | # mdadm \ # tests are flaky in AB. | 140 | # mdadm \ # tests are flaky in AB. |
141 | # numactl \ # qemu not (yet) configured for numa; all tests are skipped | 141 | # numactl \ # qemu not (yet) configured for numa; all tests are skipped |
142 | # libseccomp \ # tests failed: 38; add to slow tests once addressed | ||
143 | # python3-numpy \ # requires even more RAM and (possibly) disk space; multiple failures | 142 | # python3-numpy \ # requires even more RAM and (possibly) disk space; multiple failures |
144 | 143 | ||
145 | PTESTS_PROBLEMS = "\ | 144 | PTESTS_PROBLEMS = "\ |
@@ -149,7 +148,6 @@ PTESTS_PROBLEMS = "\ | |||
149 | ifupdown \ | 148 | ifupdown \ |
150 | libinput \ | 149 | libinput \ |
151 | libpam \ | 150 | libpam \ |
152 | libseccomp \ | ||
153 | mdadm \ | 151 | mdadm \ |
154 | numactl \ | 152 | numactl \ |
155 | python3-license-expression \ | 153 | python3-license-expression \ |
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 62f86f361a..f2bca0aa5b 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
@@ -7,12 +7,12 @@ BBFILE_COLLECTIONS += "core" | |||
7 | BBFILE_PATTERN_core = "^${LAYERDIR}/" | 7 | BBFILE_PATTERN_core = "^${LAYERDIR}/" |
8 | BBFILE_PRIORITY_core = "5" | 8 | BBFILE_PRIORITY_core = "5" |
9 | 9 | ||
10 | LAYERSERIES_CORENAMES = "scarthgap" | 10 | LAYERSERIES_CORENAMES = "scarthgap styhead" |
11 | 11 | ||
12 | # This should only be incremented on significant changes that will | 12 | # This should only be incremented on significant changes that will |
13 | # cause compatibility issues with other layers | 13 | # cause compatibility issues with other layers |
14 | LAYERVERSION_core = "15" | 14 | LAYERVERSION_core = "15" |
15 | LAYERSERIES_COMPAT_core = "scarthgap" | 15 | LAYERSERIES_COMPAT_core = "styhead" |
16 | 16 | ||
17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" | 17 | BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" |
18 | 18 | ||
@@ -87,6 +87,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
87 | sato-icon-theme->gtk+3 \ | 87 | sato-icon-theme->gtk+3 \ |
88 | adwaita-icon-theme->gdk-pixbuf \ | 88 | adwaita-icon-theme->gdk-pixbuf \ |
89 | adwaita-icon-theme->gtk+3 \ | 89 | adwaita-icon-theme->gtk+3 \ |
90 | run-postinsts->util-linux \ | ||
90 | " | 91 | " |
91 | 92 | ||
92 | # Avoid adding bison-native to the sysroot without a specific | 93 | # Avoid adding bison-native to the sysroot without a specific |
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf index d2f56a3fb0..02775970ae 100644 --- a/meta/conf/sanity.conf +++ b/meta/conf/sanity.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | # See sanity.bbclass | 3 | # See sanity.bbclass |
4 | # | 4 | # |
5 | # Expert users can confirm their sanity with "touch conf/sanity.conf" | 5 | # Expert users can confirm their sanity with "touch conf/sanity.conf" |
6 | BB_MIN_VERSION = "2.7.3" | 6 | BB_MIN_VERSION = "2.9.1" |
7 | 7 | ||
8 | SANITY_ABIFILE = "${TMPDIR}/abi_version" | 8 | SANITY_ABIFILE = "${TMPDIR}/abi_version" |
9 | 9 | ||
diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 4f27c565ee..99d5973760 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py | |||
@@ -9,7 +9,6 @@ import os | |||
9 | import sys | 9 | import sys |
10 | 10 | ||
11 | import bb.utils | 11 | import bb.utils |
12 | import bb.process | ||
13 | 12 | ||
14 | from bblayers.common import LayerPlugin | 13 | from bblayers.common import LayerPlugin |
15 | 14 | ||
@@ -24,25 +23,12 @@ def plugin_init(plugins): | |||
24 | 23 | ||
25 | class MakeSetupPlugin(LayerPlugin): | 24 | class MakeSetupPlugin(LayerPlugin): |
26 | 25 | ||
27 | def _get_repo_path(self, layer_path): | 26 | def _get_remotes_with_url(self, repo_path): |
28 | repo_path, _ = bb.process.run('git rev-parse --show-toplevel', cwd=layer_path) | ||
29 | return repo_path.strip() | ||
30 | |||
31 | def _get_remotes(self, repo_path): | ||
32 | remotes = {} | 27 | remotes = {} |
33 | remotes_list,_ = bb.process.run('git remote', cwd=repo_path) | 28 | for r in oe.buildcfg.get_metadata_git_remotes(repo_path): |
34 | for r in remotes_list.split(): | 29 | remotes[r] = {'uri':oe.buildcfg.get_metadata_git_remote_url(repo_path, r)} |
35 | uri,_ = bb.process.run('git remote get-url {r}'.format(r=r), cwd=repo_path) | ||
36 | remotes[r] = {'uri':uri.strip()} | ||
37 | return remotes | 30 | return remotes |
38 | 31 | ||
39 | def _get_describe(self, repo_path): | ||
40 | try: | ||
41 | describe,_ = bb.process.run('git describe --tags', cwd=repo_path) | ||
42 | except bb.process.ExecutionError: | ||
43 | return "" | ||
44 | return describe.strip() | ||
45 | |||
46 | def _is_submodule(self, repo_path): | 32 | def _is_submodule(self, repo_path): |
47 | # This is slightly brittle: git does not offer a way to tell whether | 33 | # This is slightly brittle: git does not offer a way to tell whether |
48 | # a given repo dir is a submodule checkout, so we need to rely on .git | 34 | # a given repo dir is a submodule checkout, so we need to rely on .git |
@@ -56,10 +42,7 @@ class MakeSetupPlugin(LayerPlugin): | |||
56 | available here. """ | 42 | available here. """ |
57 | repos = {} | 43 | repos = {} |
58 | layers = oe.buildcfg.get_layer_revisions(self.tinfoil.config_data) | 44 | layers = oe.buildcfg.get_layer_revisions(self.tinfoil.config_data) |
59 | try: | 45 | destdir_repo = oe.buildcfg.get_metadata_git_toplevel(destdir) |
60 | destdir_repo = self._get_repo_path(destdir) | ||
61 | except bb.process.ExecutionError: | ||
62 | destdir_repo = None | ||
63 | 46 | ||
64 | for (l_path, l_name, l_branch, l_rev, l_ismodified) in layers: | 47 | for (l_path, l_name, l_branch, l_rev, l_ismodified) in layers: |
65 | if l_name == 'workspace': | 48 | if l_name == 'workspace': |
@@ -67,12 +50,16 @@ class MakeSetupPlugin(LayerPlugin): | |||
67 | if l_ismodified: | 50 | if l_ismodified: |
68 | logger.error("Layer {name} in {path} has uncommitted modifications or is not in a git repository.".format(name=l_name,path=l_path)) | 51 | logger.error("Layer {name} in {path} has uncommitted modifications or is not in a git repository.".format(name=l_name,path=l_path)) |
69 | return | 52 | return |
70 | repo_path = self._get_repo_path(l_path) | 53 | repo_path = oe.buildcfg.get_metadata_git_toplevel(l_path) |
71 | 54 | ||
72 | if self._is_submodule(repo_path): | 55 | if self._is_submodule(repo_path): |
73 | continue | 56 | continue |
74 | if repo_path not in repos.keys(): | 57 | if repo_path not in repos.keys(): |
75 | repos[repo_path] = {'path':os.path.basename(repo_path),'git-remote':{'rev':l_rev, 'branch':l_branch, 'remotes':self._get_remotes(repo_path), 'describe':self._get_describe(repo_path)}} | 58 | repos[repo_path] = {'path':os.path.basename(repo_path),'git-remote':{ |
59 | 'rev':l_rev, | ||
60 | 'branch':l_branch, | ||
61 | 'remotes':self._get_remotes_with_url(repo_path), | ||
62 | 'describe':oe.buildcfg.get_metadata_git_describe(repo_path)}} | ||
76 | if repo_path == destdir_repo: | 63 | if repo_path == destdir_repo: |
77 | repos[repo_path]['contains_this_file'] = True | 64 | repos[repo_path]['contains_this_file'] = True |
78 | if not repos[repo_path]['git-remote']['remotes'] and not repos[repo_path]['contains_this_file']: | 65 | if not repos[repo_path]['git-remote']['remotes'] and not repos[repo_path]['contains_this_file']: |
diff --git a/meta/lib/oe/buildcfg.py b/meta/lib/oe/buildcfg.py index b3fe510309..27b059b834 100644 --- a/meta/lib/oe/buildcfg.py +++ b/meta/lib/oe/buildcfg.py | |||
@@ -28,6 +28,35 @@ def get_metadata_git_revision(path): | |||
28 | rev = '<unknown>' | 28 | rev = '<unknown>' |
29 | return rev.strip() | 29 | return rev.strip() |
30 | 30 | ||
31 | def get_metadata_git_toplevel(path): | ||
32 | try: | ||
33 | toplevel, _ = bb.process.run('git rev-parse --show-toplevel', cwd=path) | ||
34 | except bb.process.ExecutionError: | ||
35 | return "" | ||
36 | return toplevel.strip() | ||
37 | |||
38 | def get_metadata_git_remotes(path): | ||
39 | try: | ||
40 | remotes_list, _ = bb.process.run('git remote', cwd=path) | ||
41 | remotes = remotes_list.split() | ||
42 | except bb.process.ExecutionError: | ||
43 | remotes = [] | ||
44 | return remotes | ||
45 | |||
46 | def get_metadata_git_remote_url(path, remote): | ||
47 | try: | ||
48 | uri, _ = bb.process.run('git remote get-url {remote}'.format(remote=remote), cwd=path) | ||
49 | except bb.process.ExecutionError: | ||
50 | return "" | ||
51 | return uri.strip() | ||
52 | |||
53 | def get_metadata_git_describe(path): | ||
54 | try: | ||
55 | describe, _ = bb.process.run('git describe --tags', cwd=path) | ||
56 | except bb.process.ExecutionError: | ||
57 | return "" | ||
58 | return describe.strip() | ||
59 | |||
31 | def is_layer_modified(path): | 60 | def is_layer_modified(path): |
32 | try: | 61 | try: |
33 | subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e; | 62 | subprocess.check_output("""cd %s; export PSEUDO_UNLOAD=1; set -e; |
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 587810bdaf..1511ba47c4 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
@@ -1660,7 +1660,7 @@ def process_shlibs(pkgfiles, d): | |||
1660 | 1660 | ||
1661 | if (file.endswith(".dll") or file.endswith(".exe")): | 1661 | if (file.endswith(".dll") or file.endswith(".exe")): |
1662 | # use objdump to search for "DLL Name: .*\.dll" | 1662 | # use objdump to search for "DLL Name: .*\.dll" |
1663 | p = subprocess.Popen([d.expand("${HOST_PREFIX}objdump"), "-p", file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) | 1663 | p = subprocess.Popen([d.expand("${OBJDUMP}"), "-p", file], stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
1664 | out, err = p.communicate() | 1664 | out, err = p.communicate() |
1665 | # process the output, grabbing all .dll names | 1665 | # process the output, grabbing all .dll names |
1666 | if p.returncode == 0: | 1666 | if p.returncode == 0: |
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 60a0cc8291..58c6e34fe8 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -882,7 +882,7 @@ class UserResolver(Resolver): | |||
882 | os.chdir(olddir) | 882 | os.chdir(olddir) |
883 | 883 | ||
884 | 884 | ||
885 | def patch_path(url, fetch, workdir, expand=True): | 885 | def patch_path(url, fetch, unpackdir, expand=True): |
886 | """Return the local path of a patch, or return nothing if this isn't a patch""" | 886 | """Return the local path of a patch, or return nothing if this isn't a patch""" |
887 | 887 | ||
888 | local = fetch.localpath(url) | 888 | local = fetch.localpath(url) |
@@ -891,7 +891,7 @@ def patch_path(url, fetch, workdir, expand=True): | |||
891 | base, ext = os.path.splitext(os.path.basename(local)) | 891 | base, ext = os.path.splitext(os.path.basename(local)) |
892 | if ext in ('.gz', '.bz2', '.xz', '.Z'): | 892 | if ext in ('.gz', '.bz2', '.xz', '.Z'): |
893 | if expand: | 893 | if expand: |
894 | local = os.path.join(workdir, base) | 894 | local = os.path.join(unpackdir, base) |
895 | ext = os.path.splitext(base)[1] | 895 | ext = os.path.splitext(base)[1] |
896 | 896 | ||
897 | urldata = fetch.ud[url] | 897 | urldata = fetch.ud[url] |
@@ -905,12 +905,12 @@ def patch_path(url, fetch, workdir, expand=True): | |||
905 | return local | 905 | return local |
906 | 906 | ||
907 | def src_patches(d, all=False, expand=True): | 907 | def src_patches(d, all=False, expand=True): |
908 | workdir = d.getVar('WORKDIR') | 908 | unpackdir = d.getVar('UNPACKDIR') |
909 | fetch = bb.fetch2.Fetch([], d) | 909 | fetch = bb.fetch2.Fetch([], d) |
910 | patches = [] | 910 | patches = [] |
911 | sources = [] | 911 | sources = [] |
912 | for url in fetch.urls: | 912 | for url in fetch.urls: |
913 | local = patch_path(url, fetch, workdir, expand) | 913 | local = patch_path(url, fetch, unpackdir, expand) |
914 | if not local: | 914 | if not local: |
915 | if all: | 915 | if all: |
916 | local = fetch.localpath(url) | 916 | local = fetch.localpath(url) |
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py index 448befce33..a9f717159e 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py | |||
@@ -120,7 +120,7 @@ def get_source_date_epoch_from_git(d, sourcedir): | |||
120 | return int(p.stdout.decode('utf-8')) | 120 | return int(p.stdout.decode('utf-8')) |
121 | 121 | ||
122 | def get_source_date_epoch_from_youngest_file(d, sourcedir): | 122 | def get_source_date_epoch_from_youngest_file(d, sourcedir): |
123 | if sourcedir == d.getVar('WORKDIR'): | 123 | if sourcedir == d.getVar('UNPACKDIR'): |
124 | # These sources are almost certainly not from a tarball | 124 | # These sources are almost certainly not from a tarball |
125 | return None | 125 | return None |
126 | 126 | ||
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index b9aa39cdcc..a46e5502ab 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -339,7 +339,7 @@ class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHashMixIn, bb.sigge | |||
339 | except FileNotFoundError: | 339 | except FileNotFoundError: |
340 | pass | 340 | pass |
341 | except netrc.NetrcParseError as e: | 341 | except netrc.NetrcParseError as e: |
342 | bb.warn("Error parsing %s:%d: %s" % (e.filename, e.lineno, e.msg)) | 342 | bb.warn("Error parsing %s:%s: %s" % (e.filename, str(e.lineno), e.msg)) |
343 | 343 | ||
344 | # Insert these classes into siggen's namespace so it can see and select them | 344 | # Insert these classes into siggen's namespace so it can see and select them |
345 | bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash | 345 | bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash |
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index a1cccc39eb..882225dde3 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
@@ -286,10 +286,13 @@ class DevtoolTestCase(OESelftestTestCase): | |||
286 | else: | 286 | else: |
287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') | 287 | self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') |
288 | 288 | ||
289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri): | 289 | def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri, srcrev=None): |
290 | self.track_for_cleanup(self.workspacedir) | 290 | self.track_for_cleanup(self.workspacedir) |
291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') | 291 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') |
292 | result = runCmd('devtool add --version %s %s %s' % (version, pn, git_url)) | 292 | command = 'devtool add --version %s %s %s' % (version, pn, git_url) |
293 | if srcrev : | ||
294 | command += ' --srcrev %s' %srcrev | ||
295 | result = runCmd(command) | ||
293 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') | 296 | self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') |
294 | # Check the recipe name is correct | 297 | # Check the recipe name is correct |
295 | recipefile = get_bb_var('FILE', pn) | 298 | recipefile = get_bb_var('FILE', pn) |
@@ -479,11 +482,12 @@ class DevtoolAddTests(DevtoolBase): | |||
479 | 482 | ||
480 | def test_devtool_add_git_style2(self): | 483 | def test_devtool_add_git_style2(self): |
481 | version = 'v3.1.0' | 484 | version = 'v3.1.0' |
485 | srcrev = 'v3.1.0' | ||
482 | pn = 'mbedtls' | 486 | pn = 'mbedtls' |
483 | # this will trigger reformat_git_uri with branch parameter in url | 487 | # this will trigger reformat_git_uri with branch parameter in url |
484 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" | 488 | git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" |
485 | resulting_src_uri = "git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" | 489 | resulting_src_uri = "git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" |
486 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri) | 490 | self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri, srcrev) |
487 | 491 | ||
488 | def test_devtool_add_library(self): | 492 | def test_devtool_add_library(self): |
489 | # Fetch source | 493 | # Fetch source |
@@ -1405,14 +1409,30 @@ class DevtoolUpdateTests(DevtoolBase): | |||
1405 | runCmd('echo "Bar" > new-file', cwd=tempdir) | 1409 | runCmd('echo "Bar" > new-file', cwd=tempdir) |
1406 | runCmd('git add new-file', cwd=tempdir) | 1410 | runCmd('git add new-file', cwd=tempdir) |
1407 | runCmd('git commit -m "Add new file"', cwd=tempdir) | 1411 | runCmd('git commit -m "Add new file"', cwd=tempdir) |
1408 | self.add_command_to_tearDown('cd %s; git clean -fd .; git checkout .' % | ||
1409 | os.path.dirname(recipefile)) | ||
1410 | runCmd('devtool update-recipe %s' % testrecipe) | 1412 | runCmd('devtool update-recipe %s' % testrecipe) |
1411 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), | 1413 | expected_status = [(' M', '.*/%s$' % os.path.basename(recipefile)), |
1412 | (' M', '.*/makedevs/makedevs.c$'), | 1414 | (' M', '.*/makedevs/makedevs.c$'), |
1413 | ('??', '.*/makedevs/new-local$'), | 1415 | ('??', '.*/makedevs/new-local$'), |
1414 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] | 1416 | ('??', '.*/makedevs/0001-Add-new-file.patch$')] |
1415 | self._check_repo_status(os.path.dirname(recipefile), expected_status) | 1417 | self._check_repo_status(os.path.dirname(recipefile), expected_status) |
1418 | # Now try to update recipe in another layer, so first, clean it | ||
1419 | runCmd('cd %s; git clean -fd .; git checkout .' % os.path.dirname(recipefile)) | ||
1420 | # Create a temporary layer and add it to bblayers.conf | ||
1421 | self._create_temp_layer(templayerdir, True, 'templayer') | ||
1422 | # Update recipe in templayer | ||
1423 | result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir)) | ||
1424 | self.assertNotIn('WARNING:', result.output) | ||
1425 | # Check recipe is still clean | ||
1426 | self._check_repo_status(os.path.dirname(recipefile), []) | ||
1427 | splitpath = os.path.dirname(recipefile).split(os.sep) | ||
1428 | appenddir = os.path.join(templayerdir, splitpath[-2], splitpath[-1]) | ||
1429 | bbappendfile = self._check_bbappend(testrecipe, recipefile, appenddir) | ||
1430 | patchfile = os.path.join(appenddir, testrecipe, '0001-Add-new-file.patch') | ||
1431 | new_local_file = os.path.join(appenddir, testrecipe, 'new_local') | ||
1432 | local_file = os.path.join(appenddir, testrecipe, 'makedevs.c') | ||
1433 | self.assertExists(patchfile, 'Patch file 0001-Add-new-file.patch not created') | ||
1434 | self.assertExists(local_file, 'File makedevs.c not created') | ||
1435 | self.assertExists(patchfile, 'File new_local not created') | ||
1416 | 1436 | ||
1417 | def test_devtool_update_recipe_local_files_2(self): | 1437 | def test_devtool_update_recipe_local_files_2(self): |
1418 | """Check local source files support when oe-local-files is in Git""" | 1438 | """Check local source files support when oe-local-files is in Git""" |
@@ -1753,6 +1773,8 @@ class DevtoolExtractTests(DevtoolBase): | |||
1753 | # Definitions | 1773 | # Definitions |
1754 | testrecipe = 'mdadm' | 1774 | testrecipe = 'mdadm' |
1755 | testfile = '/sbin/mdadm' | 1775 | testfile = '/sbin/mdadm' |
1776 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
1777 | testfile = '/usr/sbin/mdadm' | ||
1756 | testimage = 'oe-selftest-image' | 1778 | testimage = 'oe-selftest-image' |
1757 | testcommand = '/sbin/mdadm --help' | 1779 | testcommand = '/sbin/mdadm --help' |
1758 | # Build an image to run | 1780 | # Build an image to run |
diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index cd0dc60c64..e31063567b 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py | |||
@@ -353,6 +353,7 @@ EXTRA_IMAGE_FEATURES += "read-only-rootfs" | |||
353 | # Image configuration for overlayfs-etc | 353 | # Image configuration for overlayfs-etc |
354 | OVERLAYFS_ETC_MOUNT_POINT = "/data" | 354 | OVERLAYFS_ETC_MOUNT_POINT = "/data" |
355 | OVERLAYFS_ETC_DEVICE = "/dev/sda3" | 355 | OVERLAYFS_ETC_DEVICE = "/dev/sda3" |
356 | OVERLAYFS_ROOTFS_TYPE = "ext4" | ||
356 | """ | 357 | """ |
357 | 358 | ||
358 | self.write_config(config) | 359 | self.write_config(config) |
@@ -367,13 +368,17 @@ OVERLAYFS_ETC_DEVICE = "/dev/sda3" | |||
367 | 368 | ||
368 | @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") | 369 | @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") |
369 | def test_sbin_init_preinit(self): | 370 | def test_sbin_init_preinit(self): |
370 | self.run_sbin_init(False) | 371 | self.run_sbin_init(False, "ext4") |
371 | 372 | ||
372 | @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") | 373 | @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") |
373 | def test_sbin_init_original(self): | 374 | def test_sbin_init_original(self): |
374 | self.run_sbin_init(True) | 375 | self.run_sbin_init(True, "ext4") |
375 | 376 | ||
376 | def run_sbin_init(self, origInit): | 377 | @skipIfNotMachine("qemux86-64", "tests are qemux86-64 specific currently") |
378 | def test_sbin_init_read_only(self): | ||
379 | self.run_sbin_init(True, "squashfs") | ||
380 | |||
381 | def run_sbin_init(self, origInit, rootfsType): | ||
377 | """ | 382 | """ |
378 | Summary: Confirm we can replace original init and mount overlay on top of /etc | 383 | Summary: Confirm we can replace original init and mount overlay on top of /etc |
379 | Expected: Image is created successfully and /etc is mounted as an overlay | 384 | Expected: Image is created successfully and /etc is mounted as an overlay |
@@ -384,7 +389,9 @@ OVERLAYFS_ETC_DEVICE = "/dev/sda3" | |||
384 | 389 | ||
385 | args = { | 390 | args = { |
386 | 'OVERLAYFS_INIT_OPTION': "" if origInit else "init=/sbin/preinit", | 391 | 'OVERLAYFS_INIT_OPTION': "" if origInit else "init=/sbin/preinit", |
387 | 'OVERLAYFS_ETC_USE_ORIG_INIT_NAME': int(origInit == True) | 392 | 'OVERLAYFS_ETC_USE_ORIG_INIT_NAME': int(origInit == True), |
393 | 'OVERLAYFS_ROOTFS_TYPE': rootfsType, | ||
394 | 'OVERLAYFS_ETC_CREATE_MOUNT_DIRS': int(rootfsType == "ext4") | ||
388 | } | 395 | } |
389 | 396 | ||
390 | self.write_config(config.format(**args)) | 397 | self.write_config(config.format(**args)) |
@@ -437,7 +444,9 @@ IMAGE_INSTALL:append = " overlayfs-user" | |||
437 | 444 | ||
438 | args = { | 445 | args = { |
439 | 'OVERLAYFS_INIT_OPTION': "", | 446 | 'OVERLAYFS_INIT_OPTION': "", |
440 | 'OVERLAYFS_ETC_USE_ORIG_INIT_NAME': 1 | 447 | 'OVERLAYFS_ETC_USE_ORIG_INIT_NAME': 1, |
448 | 'OVERLAYFS_ROOTFS_TYPE': "ext4", | ||
449 | 'OVERLAYFS_ETC_CREATE_MOUNT_DIRS': 1 | ||
441 | } | 450 | } |
442 | 451 | ||
443 | self.write_config(config.format(**args)) | 452 | self.write_config(config.format(**args)) |
@@ -463,10 +472,14 @@ IMAGE_INSTALL:append = " overlayfs-user" | |||
463 | INIT_MANAGER = "systemd" | 472 | INIT_MANAGER = "systemd" |
464 | 473 | ||
465 | # enable overlayfs in the kernel | 474 | # enable overlayfs in the kernel |
466 | KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc" | 475 | KERNEL_EXTRA_FEATURES:append = " \ |
476 | features/overlayfs/overlayfs.scc \ | ||
477 | cfg/fs/squashfs.scc" | ||
467 | 478 | ||
468 | IMAGE_FSTYPES += "wic" | 479 | IMAGE_FSTYPES += "wic" |
469 | OVERLAYFS_INIT_OPTION = "{OVERLAYFS_INIT_OPTION}" | 480 | OVERLAYFS_INIT_OPTION = "{OVERLAYFS_INIT_OPTION}" |
481 | OVERLAYFS_ROOTFS_TYPE = "{OVERLAYFS_ROOTFS_TYPE}" | ||
482 | OVERLAYFS_ETC_CREATE_MOUNT_DIRS = "{OVERLAYFS_ETC_CREATE_MOUNT_DIRS}" | ||
470 | WKS_FILE = "overlayfs_etc.wks.in" | 483 | WKS_FILE = "overlayfs_etc.wks.in" |
471 | 484 | ||
472 | EXTRA_IMAGE_FEATURES += "read-only-rootfs" | 485 | EXTRA_IMAGE_FEATURES += "read-only-rootfs" |
@@ -477,4 +490,13 @@ OVERLAYFS_ETC_MOUNT_POINT = "/data" | |||
477 | OVERLAYFS_ETC_FSTYPE = "ext4" | 490 | OVERLAYFS_ETC_FSTYPE = "ext4" |
478 | OVERLAYFS_ETC_DEVICE = "/dev/sda3" | 491 | OVERLAYFS_ETC_DEVICE = "/dev/sda3" |
479 | OVERLAYFS_ETC_USE_ORIG_INIT_NAME = "{OVERLAYFS_ETC_USE_ORIG_INIT_NAME}" | 492 | OVERLAYFS_ETC_USE_ORIG_INIT_NAME = "{OVERLAYFS_ETC_USE_ORIG_INIT_NAME}" |
493 | |||
494 | ROOTFS_POSTPROCESS_COMMAND += "{OVERLAYFS_ROOTFS_TYPE}_rootfs" | ||
495 | |||
496 | ext4_rootfs() {{ | ||
497 | }} | ||
498 | |||
499 | squashfs_rootfs() {{ | ||
500 | mkdir -p ${{IMAGE_ROOTFS}}/data | ||
501 | }} | ||
480 | """ | 502 | """ |
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index aebea42502..126906df50 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py | |||
@@ -120,9 +120,15 @@ class RecipetoolAppendTests(RecipetoolBase): | |||
120 | self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool']) | 120 | self._try_recipetool_appendfile_fail('/dev/console', self.testfile, ['ERROR: /dev/console cannot be handled by this tool']) |
121 | 121 | ||
122 | def test_recipetool_appendfile_alternatives(self): | 122 | def test_recipetool_appendfile_alternatives(self): |
123 | lspath = '/bin/ls' | ||
124 | dirname = "base_bindir" | ||
125 | if "usrmerge" in get_bb_var('DISTRO_FEATURES'): | ||
126 | lspath = '/usr/bin/ls' | ||
127 | dirname = "bindir" | ||
128 | |||
123 | # Now try with a file we know should be an alternative | 129 | # Now try with a file we know should be an alternative |
124 | # (this is very much a fake example, but one we know is reliably an alternative) | 130 | # (this is very much a fake example, but one we know is reliably an alternative) |
125 | self._try_recipetool_appendfile_fail('/bin/ls', self.testfile, ['ERROR: File /bin/ls is an alternative possibly provided by the following recipes:', 'coreutils', 'busybox']) | 131 | self._try_recipetool_appendfile_fail(lspath, self.testfile, ['ERROR: File %s is an alternative possibly provided by the following recipes:' % lspath, 'coreutils', 'busybox']) |
126 | # Need a test file - should be executable | 132 | # Need a test file - should be executable |
127 | testfile2 = os.path.join(self.corebase, 'oe-init-build-env') | 133 | testfile2 = os.path.join(self.corebase, 'oe-init-build-env') |
128 | testfile2name = os.path.basename(testfile2) | 134 | testfile2name = os.path.basename(testfile2) |
@@ -131,12 +137,12 @@ class RecipetoolAppendTests(RecipetoolBase): | |||
131 | 'SRC_URI += "file://%s"\n' % testfile2name, | 137 | 'SRC_URI += "file://%s"\n' % testfile2name, |
132 | '\n', | 138 | '\n', |
133 | 'do_install:append() {\n', | 139 | 'do_install:append() {\n', |
134 | ' install -d ${D}${base_bindir}\n', | 140 | ' install -d ${D}${%s}\n' % dirname, |
135 | ' install -m 0755 ${WORKDIR}/%s ${D}${base_bindir}/ls\n' % testfile2name, | 141 | ' install -m 0755 ${WORKDIR}/%s ${D}${%s}/ls\n' % (testfile2name, dirname), |
136 | '}\n'] | 142 | '}\n'] |
137 | self._try_recipetool_appendfile('coreutils', '/bin/ls', testfile2, '-r coreutils', expectedlines, [testfile2name]) | 143 | self._try_recipetool_appendfile('coreutils', lspath, testfile2, '-r coreutils', expectedlines, [testfile2name]) |
138 | # Now try bbappending the same file again, contents should not change | 144 | # Now try bbappending the same file again, contents should not change |
139 | bbappendfile, _ = self._try_recipetool_appendfile('coreutils', '/bin/ls', self.testfile, '-r coreutils', expectedlines, [testfile2name]) | 145 | bbappendfile, _ = self._try_recipetool_appendfile('coreutils', lspath, self.testfile, '-r coreutils', expectedlines, [testfile2name]) |
140 | # But file should have | 146 | # But file should have |
141 | copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) | 147 | copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) |
142 | result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) | 148 | result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) |
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 031c2266ac..86d6cd7464 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py | |||
@@ -772,15 +772,16 @@ addtask tmptask2 before do_tmptask1 | |||
772 | 772 | ||
773 | def find_siginfo(pn, taskname, sigs=None): | 773 | def find_siginfo(pn, taskname, sigs=None): |
774 | result = None | 774 | result = None |
775 | command_complete = False | ||
775 | tinfoil.set_event_mask(["bb.event.FindSigInfoResult", | 776 | tinfoil.set_event_mask(["bb.event.FindSigInfoResult", |
776 | "bb.command.CommandCompleted"]) | 777 | "bb.command.CommandCompleted"]) |
777 | ret = tinfoil.run_command("findSigInfo", pn, taskname, sigs) | 778 | ret = tinfoil.run_command("findSigInfo", pn, taskname, sigs) |
778 | if ret: | 779 | if ret: |
779 | while True: | 780 | while result is None or not command_complete: |
780 | event = tinfoil.wait_event(1) | 781 | event = tinfoil.wait_event(1) |
781 | if event: | 782 | if event: |
782 | if isinstance(event, bb.command.CommandCompleted): | 783 | if isinstance(event, bb.command.CommandCompleted): |
783 | break | 784 | command_complete = True |
784 | elif isinstance(event, bb.event.FindSigInfoResult): | 785 | elif isinstance(event, bb.event.FindSigInfoResult): |
785 | result = event.result | 786 | result = event.result |
786 | return result | 787 | return result |
@@ -959,7 +960,7 @@ class SStateMirrors(SStateBase): | |||
959 | self.assertEqual(len(failed_urls), missing_objects, "Amount of reported missing objects does not match failed URLs: {}\nFailed URLs:\n{}\nFetcher diagnostics:\n{}".format(missing_objects, "\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) | 960 | self.assertEqual(len(failed_urls), missing_objects, "Amount of reported missing objects does not match failed URLs: {}\nFailed URLs:\n{}\nFetcher diagnostics:\n{}".format(missing_objects, "\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) |
960 | self.assertEqual(len(failed_urls), 0, "Missing objects in the cache:\n{}\nFetcher diagnostics:\n{}".format("\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) | 961 | self.assertEqual(len(failed_urls), 0, "Missing objects in the cache:\n{}\nFetcher diagnostics:\n{}".format("\n".join(failed_urls), "\n".join(failed_urls_extrainfo))) |
961 | 962 | ||
962 | def run_test(self, machine, targets, exceptions, check_cdn = True): | 963 | def run_test(self, machine, targets, exceptions, check_cdn = True, ignore_errors = False): |
963 | # sstate is checked for existence of these, but they never get written out to begin with | 964 | # sstate is checked for existence of these, but they never get written out to begin with |
964 | exceptions += ["{}.*image_qa".format(t) for t in targets.split()] | 965 | exceptions += ["{}.*image_qa".format(t) for t in targets.split()] |
965 | exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()] | 966 | exceptions += ["{}.*deploy_source_date_epoch".format(t) for t in targets.split()] |
@@ -984,14 +985,18 @@ MACHINE = "{}" | |||
984 | """.format(machine)) | 985 | """.format(machine)) |
985 | result = bitbake("-DD -n {}".format(targets)) | 986 | result = bitbake("-DD -n {}".format(targets)) |
986 | bitbake("-S none {}".format(targets)) | 987 | bitbake("-S none {}".format(targets)) |
988 | if ignore_errors: | ||
989 | return | ||
987 | self.check_bb_output(result.output, exceptions, check_cdn) | 990 | self.check_bb_output(result.output, exceptions, check_cdn) |
988 | 991 | ||
989 | def test_cdn_mirror_qemux86_64(self): | 992 | def test_cdn_mirror_qemux86_64(self): |
990 | exceptions = [] | 993 | exceptions = [] |
994 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) | ||
991 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) | 995 | self.run_test("qemux86-64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) |
992 | 996 | ||
993 | def test_cdn_mirror_qemuarm64(self): | 997 | def test_cdn_mirror_qemuarm64(self): |
994 | exceptions = [] | 998 | exceptions = [] |
999 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions, ignore_errors = True) | ||
995 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) | 1000 | self.run_test("qemuarm64", "core-image-minimal core-image-full-cmdline core-image-sato-sdk", exceptions) |
996 | 1001 | ||
997 | def test_local_cache_qemux86_64(self): | 1002 | def test_local_cache_qemux86_64(self): |
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 57844b289a..99186175e5 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -194,8 +194,23 @@ class OESelftestTestContextExecutor(OETestContextExecutor): | |||
194 | parser.add_argument('-R', '--skip-tests', required=False, action='store', | 194 | parser.add_argument('-R', '--skip-tests', required=False, action='store', |
195 | nargs='+', dest="skips", default=None, | 195 | nargs='+', dest="skips", default=None, |
196 | help='Skip the tests specified. Format should be <module>[.<class>[.<test_method>]]') | 196 | help='Skip the tests specified. Format should be <module>[.<class>[.<test_method>]]') |
197 | |||
198 | def check_parallel_support(parameter): | ||
199 | if not parameter.isdigit(): | ||
200 | import argparse | ||
201 | raise argparse.ArgumentTypeError("argument -j/--num-processes: invalid int value: '%s' " % str(parameter)) | ||
202 | |||
203 | processes = int(parameter) | ||
204 | if processes: | ||
205 | try: | ||
206 | import testtools, subunit | ||
207 | except ImportError: | ||
208 | print("Failed to import testtools or subunit, the testcases will run serially") | ||
209 | processes = None | ||
210 | return processes | ||
211 | |||
197 | parser.add_argument('-j', '--num-processes', dest='processes', action='store', | 212 | parser.add_argument('-j', '--num-processes', dest='processes', action='store', |
198 | type=int, help="number of processes to execute in parallel with") | 213 | type=check_parallel_support, help="number of processes to execute in parallel with") |
199 | 214 | ||
200 | parser.add_argument('-t', '--select-tag', dest="select_tags", | 215 | parser.add_argument('-t', '--select-tag', dest="select_tags", |
201 | action='append', default=None, | 216 | action='append', default=None, |
diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py index 8104400ac2..ecdddd2d40 100644 --- a/meta/lib/oeqa/utils/postactions.py +++ b/meta/lib/oeqa/utils/postactions.py | |||
@@ -25,7 +25,7 @@ def create_artifacts_directory(d, tc): | |||
25 | def get_target_disk_usage(d, tc): | 25 | def get_target_disk_usage(d, tc): |
26 | output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt") | 26 | output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt") |
27 | try: | 27 | try: |
28 | (status, output) = tc.target.run('df -hl') | 28 | (status, output) = tc.target.run('df -h') |
29 | with open(output_file, 'w') as f: | 29 | with open(output_file, 'w') as f: |
30 | f.write(output) | 30 | f.write(output) |
31 | f.write("\n") | 31 | f.write("\n") |
diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index be609dbd04..f5dbcf01ed 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py | |||
@@ -18,12 +18,12 @@ class TestMetadata(base.Metadata): | |||
18 | lictag_re = pyparsing.AtLineStart("License-Update:") | 18 | lictag_re = pyparsing.AtLineStart("License-Update:") |
19 | lic_chksum_added = pyparsing.AtLineStart("+" + metadata_chksum) | 19 | lic_chksum_added = pyparsing.AtLineStart("+" + metadata_chksum) |
20 | lic_chksum_removed = pyparsing.AtLineStart("-" + metadata_chksum) | 20 | lic_chksum_removed = pyparsing.AtLineStart("-" + metadata_chksum) |
21 | add_mark = pyparsing.Regex('\+ ') | 21 | add_mark = pyparsing.Regex('\\+ ') |
22 | max_length = 200 | 22 | max_length = 200 |
23 | metadata_src_uri = 'SRC_URI' | 23 | metadata_src_uri = 'SRC_URI' |
24 | md5sum = 'md5sum' | 24 | md5sum = 'md5sum' |
25 | sha256sum = 'sha256sum' | 25 | sha256sum = 'sha256sum' |
26 | git_regex = pyparsing.Regex('^git\:\/\/.*') | 26 | git_regex = pyparsing.Regex('^git\\:\\/\\/.*') |
27 | metadata_summary = 'SUMMARY' | 27 | metadata_summary = 'SUMMARY' |
28 | cve_check_ignore_var = 'CVE_CHECK_IGNORE' | 28 | cve_check_ignore_var = 'CVE_CHECK_IGNORE' |
29 | cve_status_var = 'CVE_STATUS' | 29 | cve_status_var = 'CVE_STATUS' |
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index 7b2f1c71c5..3d6f75f90f 100644 --- a/meta/recipes-bsp/acpid/acpid.inc +++ b/meta/recipes-bsp/acpid/acpid.inc | |||
@@ -27,13 +27,13 @@ SYSTEMD_SERVICE:${PN} = "acpid.service" | |||
27 | 27 | ||
28 | do_install:append () { | 28 | do_install:append () { |
29 | install -d ${D}${sysconfdir}/init.d | 29 | install -d ${D}${sysconfdir}/init.d |
30 | sed -e 's,/usr/sbin,${sbindir},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/acpid | 30 | sed -e 's,/usr/sbin,${sbindir},g' ${UNPACKDIR}/init > ${D}${sysconfdir}/init.d/acpid |
31 | chmod 755 ${D}${sysconfdir}/init.d/acpid | 31 | chmod 755 ${D}${sysconfdir}/init.d/acpid |
32 | 32 | ||
33 | install -d ${D}${sysconfdir}/acpi | 33 | install -d ${D}${sysconfdir}/acpi |
34 | install -d ${D}${sysconfdir}/acpi/events | 34 | install -d ${D}${sysconfdir}/acpi/events |
35 | 35 | ||
36 | install -d ${D}${systemd_system_unitdir} | 36 | install -d ${D}${systemd_system_unitdir} |
37 | install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_system_unitdir} | 37 | install -m 0644 ${UNPACKDIR}/acpid.service ${D}${systemd_system_unitdir} |
38 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/acpid.service | 38 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/acpid.service |
39 | } | 39 | } |
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index bd7f610f46..83384f2daf 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb | |||
@@ -38,15 +38,15 @@ INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." | |||
38 | do_install() { | 38 | do_install() { |
39 | # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. | 39 | # Only install the init script when 'sysvinit' is in DISTRO_FEATURES. |
40 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
41 | sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state-init | 41 | sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${S}/alsa-state-init |
42 | install -d ${D}${sysconfdir}/init.d | 42 | install -d ${D}${sysconfdir}/init.d |
43 | install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state | 43 | install -m 0755 ${S}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state |
44 | fi | 44 | fi |
45 | 45 | ||
46 | install -d ${D}/${localstatedir}/lib/alsa | 46 | install -d ${D}/${localstatedir}/lib/alsa |
47 | install -d ${D}${sysconfdir} | 47 | install -d ${D}${sysconfdir} |
48 | install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} | 48 | install -m 0644 ${S}/asound.conf ${D}${sysconfdir} |
49 | install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa | 49 | install -m 0644 ${S}/*.state ${D}${localstatedir}/lib/alsa |
50 | } | 50 | } |
51 | 51 | ||
52 | PACKAGES += "alsa-states" | 52 | PACKAGES += "alsa-states" |
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index 3d5d127820..e30dd9dca2 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb | |||
@@ -31,7 +31,7 @@ do_install () { | |||
31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service | 31 | # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service |
32 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 32 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
34 | install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/ | 34 | install -m 0755 ${S}/keymap.sh ${D}${sysconfdir}/init.d/ |
35 | fi | 35 | fi |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index 1f17bd7d0a..ca5357392a 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc | |||
@@ -12,7 +12,7 @@ PE = "1" | |||
12 | 12 | ||
13 | # We use the revision in order to avoid having to fetch it from the | 13 | # We use the revision in order to avoid having to fetch it from the |
14 | # repo during parse | 14 | # repo during parse |
15 | SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e" | 15 | SRCREV = "25049ad560826f7dc1c4740883b0016014a59789" |
16 | 16 | ||
17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" | 17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" |
18 | 18 | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc index 09b3c3f68c..f3010763c0 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc | |||
@@ -4,10 +4,10 @@ DEPENDS += "gnutls openssl util-linux swig-native" | |||
4 | inherit python3native | 4 | inherit python3native |
5 | export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" | 5 | export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}" |
6 | 6 | ||
7 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" | 7 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage ${MLPREFIX}u-boot-mkeficapsule" |
8 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" | 8 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native u-boot-mkeficapsule-native" |
9 | 9 | ||
10 | PACKAGES += "${PN}-mkimage ${PN}-mkenvimage" | 10 | PACKAGES += "${PN}-mkimage ${PN}-mkenvimage ${PN}-mkeficapsule" |
11 | 11 | ||
12 | # Required for backward compatibility with "u-boot-mkimage-xxx.bb" | 12 | # Required for backward compatibility with "u-boot-mkimage-xxx.bb" |
13 | RPROVIDES:${PN}-mkimage = "u-boot-mkimage" | 13 | RPROVIDES:${PN}-mkimage = "u-boot-mkimage" |
@@ -70,15 +70,20 @@ do_install () { | |||
70 | # fit_check_sign | 70 | # fit_check_sign |
71 | install -m 0755 tools/fit_check_sign ${D}${bindir}/uboot-fit_check_sign | 71 | install -m 0755 tools/fit_check_sign ${D}${bindir}/uboot-fit_check_sign |
72 | ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign | 72 | ln -sf uboot-fit_check_sign ${D}${bindir}/fit_check_sign |
73 | |||
74 | # mkeficapsule | ||
75 | install -m 0755 tools/mkeficapsule ${D}${bindir}/uboot-mkeficapsule | ||
76 | ln -sf uboot-mkeficapsule ${D}${bindir}/mkeficapsule | ||
73 | } | 77 | } |
74 | 78 | ||
75 | ALLOW_EMPTY:${PN} = "1" | 79 | ALLOW_EMPTY:${PN} = "1" |
76 | FILES:${PN} = "" | 80 | FILES:${PN} = "" |
77 | FILES:${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign" | 81 | FILES:${PN}-mkimage = "${bindir}/uboot-mkimage ${bindir}/mkimage ${bindir}/uboot-dumpimage ${bindir}/dumpimage ${bindir}/uboot-fit_check_sign ${bindir}/fit_check_sign" |
78 | FILES:${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage" | 82 | FILES:${PN}-mkenvimage = "${bindir}/uboot-mkenvimage ${bindir}/mkenvimage" |
83 | FILES:${PN}-mkeficapsule = "${bindir}/uboot-mkeficapsule ${bindir}/mkeficapsule" | ||
79 | 84 | ||
80 | RDEPENDS:${PN}-mkimage += "dtc" | 85 | RDEPENDS:${PN}-mkimage += "dtc" |
81 | RDEPENDS:${PN} += "${PN}-mkimage ${PN}-mkenvimage" | 86 | RDEPENDS:${PN} += "${PN}-mkimage ${PN}-mkenvimage ${PN}-mkeficapsule" |
82 | RDEPENDS:${PN}:class-native = "" | 87 | RDEPENDS:${PN}:class-native = "" |
83 | 88 | ||
84 | BBCLASSEXTEND = "native nativesdk" | 89 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2024.04.bb index 7eaf721ca8..7eaf721ca8 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2024.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2024.04.bb | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index f5b43f6e36..3a7afb81c8 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc | |||
@@ -157,9 +157,9 @@ do_install () { | |||
157 | fi | 157 | fi |
158 | fi | 158 | fi |
159 | 159 | ||
160 | if [ -e ${WORKDIR}/fw_env.config ] ; then | 160 | if [ -e ${UNPACKDIR}/fw_env.config ] ; then |
161 | install -d ${D}${sysconfdir} | 161 | install -d ${D}${sysconfdir} |
162 | install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config | 162 | install -m 644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config |
163 | fi | 163 | fi |
164 | 164 | ||
165 | if [ -n "${SPL_BINARY}" ] | 165 | if [ -n "${SPL_BINARY}" ] |
diff --git a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb b/meta/recipes-bsp/u-boot/u-boot_2024.04.bb index b15bcaa818..b15bcaa818 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2024.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2024.04.bb | |||
diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb index 3a50b835c2..b80191bddc 100644 --- a/meta/recipes-bsp/usbinit/usbinit.bb +++ b/meta/recipes-bsp/usbinit/usbinit.bb | |||
@@ -5,7 +5,7 @@ same wire, at higher speeds than most Wifi connections." | |||
5 | HOMEPAGE = "http://linux-sunxi.org/USB_Gadget/Ethernet" | 5 | HOMEPAGE = "http://linux-sunxi.org/USB_Gadget/Ethernet" |
6 | 6 | ||
7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | 8 | LIC_FILES_CHKSUM = "file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" |
9 | 9 | ||
10 | 10 | ||
11 | SRC_URI = "file://usb-gether \ | 11 | SRC_URI = "file://usb-gether \ |
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 1f18d4491d..a78e776a18 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb | |||
@@ -184,8 +184,8 @@ SYSTEMD_SERVICE:${PN}-dnsconfd = "avahi-dnsconfd.service" | |||
184 | 184 | ||
185 | do_install:append() { | 185 | do_install:append() { |
186 | install -d ${D}${sysconfdir}/udhcpc.d | 186 | install -d ${D}${sysconfdir}/udhcpc.d |
187 | install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 187 | install ${UNPACKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
188 | install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 188 | install ${UNPACKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
189 | } | 189 | } |
190 | 190 | ||
191 | # At the time the postinst runs, dbus might not be setup so only restart if running | 191 | # At the time the postinst runs, dbus might not be setup so only restart if running |
diff --git a/meta/recipes-connectivity/bind/bind_9.18.24.bb b/meta/recipes-connectivity/bind/bind_9.18.26.bb index 2874990320..b99f92537c 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.24.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.26.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ | |||
20 | file://0001-avoid-start-failure-with-bind-user.patch \ | 20 | file://0001-avoid-start-failure-with-bind-user.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66" | 23 | SRC_URI[sha256sum] = "75ffee52731e9604c849b658df29e927f1c4f01d5a71ea3ebcbeb63702cb6651" |
24 | 24 | ||
25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" | 25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" |
26 | # follow the ESV versions divisible by 2 | 26 | # follow the ESV versions divisible by 2 |
@@ -68,15 +68,15 @@ do_install:append() { | |||
68 | 68 | ||
69 | # Install systemd related files | 69 | # Install systemd related files |
70 | install -d ${D}${sbindir} | 70 | install -d ${D}${sbindir} |
71 | install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} | 71 | install -m 755 ${UNPACKDIR}/generate-rndc-key.sh ${D}${sbindir} |
72 | install -d ${D}${systemd_system_unitdir} | 72 | install -d ${D}${systemd_system_unitdir} |
73 | install -m 0644 ${WORKDIR}/named.service ${D}${systemd_system_unitdir} | 73 | install -m 0644 ${UNPACKDIR}/named.service ${D}${systemd_system_unitdir} |
74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
75 | -e 's,@SBINDIR@,${sbindir},g' \ | 75 | -e 's,@SBINDIR@,${sbindir},g' \ |
76 | ${D}${systemd_system_unitdir}/named.service | 76 | ${D}${systemd_system_unitdir}/named.service |
77 | 77 | ||
78 | install -d ${D}${sysconfdir}/default | 78 | install -d ${D}${sysconfdir}/default |
79 | install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default | 79 | install -m 0644 ${UNPACKDIR}/bind9 ${D}${sysconfdir}/default |
80 | 80 | ||
81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
82 | install -d ${D}${sysconfdir}/tmpfiles.d | 82 | install -d ${D}${sysconfdir}/tmpfiles.d |
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index a31d7076ba..a1ffdeef8c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -85,7 +85,7 @@ NOINST_TOOLS = " \ | |||
85 | 85 | ||
86 | do_install:append() { | 86 | do_install:append() { |
87 | install -d ${D}${INIT_D_DIR} | 87 | install -d ${D}${INIT_D_DIR} |
88 | install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth | 88 | install -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/bluetooth |
89 | 89 | ||
90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then | 90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then |
91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth | 91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth |
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index fcd154b4b0..f6150d98ec 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
@@ -26,5 +26,5 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
26 | RDEPENDS:${PN} = "connman" | 26 | RDEPENDS:${PN} = "connman" |
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ | 29 | install -m 0644 ${UNPACKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ |
30 | } | 30 | } |
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7487ca0d0c..073061eeda 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -86,7 +86,7 @@ ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','sy | |||
86 | do_install:append() { | 86 | do_install:append() { |
87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
88 | install -d ${D}${sysconfdir}/init.d | 88 | install -d ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 89 | install -m 0755 ${UNPACKDIR}/connman ${D}${sysconfdir}/init.d/connman |
90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman | 90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman |
91 | fi | 91 | fi |
92 | 92 | ||
diff --git a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch index aefdd3aa06..9e2cc34995 100644 --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch | |||
@@ -1,75 +1,88 @@ | |||
1 | From 01974865e4d331eeaf25248bee1bb96539c450d9 Mon Sep 17 00:00:00 2001 | 1 | From 60783f0d885c9a0db8b6f1d528786321e53f1512 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 | 3 | Date: Mon, 6 Apr 2015 23:02:21 -0700 |
4 | Subject: [PATCH] resolve: musl does not implement res_ninit | 4 | Subject: [PATCH] gweb/gresolv.c: make use of res_ninit optional and subject to |
5 | __RES | ||
5 | 6 | ||
6 | ported from | 7 | Not all libc implementation have those functions, and the way to determine |
8 | if they do is to check __RES which is explained in resolv.h thusly: | ||
9 | |||
10 | /* | ||
11 | * Revision information. This is the release date in YYYYMMDD format. | ||
12 | * It can change every day so the right thing to do with it is use it | ||
13 | * in preprocessor commands such as "#if (__RES > 19931104)". Do not | ||
14 | * compare for equality; rather, use it to determine whether your resolver | ||
15 | * is new enough to contain a certain feature. | ||
16 | */ | ||
17 | |||
18 | Indeed, it needs to be at least 19991006. | ||
19 | |||
20 | The portion of the patch that implements a fallback is ported from | ||
21 | Alpine Linux: | ||
7 | http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch | 22 | http://git.alpinelinux.org/cgit/aports/plain/testing/connman/libresolv.patch |
8 | 23 | ||
9 | Upstream-Status: Pending | 24 | Upstream-Status: Submitted [to connman@lists.linux.dev,marcel@holtmann.org] |
10 | 25 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 26 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
13 | --- | 27 | --- |
14 | gweb/gresolv.c | 34 +++++++++++++--------------------- | 28 | gweb/gresolv.c | 21 +++++++++++++++++++++ |
15 | 1 file changed, 13 insertions(+), 21 deletions(-) | 29 | 1 file changed, 21 insertions(+) |
16 | 30 | ||
17 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c | 31 | diff --git a/gweb/gresolv.c b/gweb/gresolv.c |
18 | index 954e7cf..2a9bc51 100644 | 32 | index 8101d71..9f1477c 100644 |
19 | --- a/gweb/gresolv.c | 33 | --- a/gweb/gresolv.c |
20 | +++ b/gweb/gresolv.c | 34 | +++ b/gweb/gresolv.c |
21 | @@ -878,8 +879,6 @@ GResolv *g_resolv_new(int index) | 35 | @@ -879,7 +879,9 @@ GResolv *g_resolv_new(int index) |
22 | resolv->index = index; | 36 | resolv->index = index; |
23 | resolv->nameserver_list = NULL; | 37 | resolv->nameserver_list = NULL; |
24 | 38 | ||
25 | - res_ninit(&resolv->res); | 39 | +#if (__RES >= 19991006) |
26 | - | 40 | res_ninit(&resolv->res); |
41 | +#endif | ||
42 | |||
27 | return resolv; | 43 | return resolv; |
28 | } | 44 | } |
29 | 45 | @@ -920,7 +922,9 @@ void g_resolv_unref(GResolv *resolv) | |
30 | @@ -919,8 +918,6 @@ void g_resolv_unref(GResolv *resolv) | ||
31 | 46 | ||
32 | flush_nameservers(resolv); | 47 | flush_nameservers(resolv); |
33 | 48 | ||
34 | - res_nclose(&resolv->res); | 49 | +#if (__RES >= 19991006) |
35 | - | 50 | res_nclose(&resolv->res); |
51 | +#endif | ||
52 | |||
36 | g_free(resolv); | 53 | g_free(resolv); |
37 | } | 54 | } |
38 | 55 | @@ -1024,6 +1028,7 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, | |
39 | @@ -1023,24 +1020,19 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, | ||
40 | debug(resolv, "hostname %s", hostname); | 56 | debug(resolv, "hostname %s", hostname); |
41 | 57 | ||
42 | if (!resolv->nameserver_list) { | 58 | if (!resolv->nameserver_list) { |
43 | - int i; | 59 | +#if (__RES >= 19991006) |
44 | - | 60 | int i; |
45 | - for (i = 0; i < resolv->res.nscount; i++) { | 61 | |
46 | - char buf[100]; | 62 | for (i = 0; i < resolv->res.nscount; i++) { |
47 | - int family = resolv->res.nsaddr_list[i].sin_family; | 63 | @@ -1043,6 +1048,22 @@ guint g_resolv_lookup_hostname(GResolv *resolv, const char *hostname, |
48 | - void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; | 64 | if (inet_ntop(family, sa_addr, buf, sizeof(buf))) |
49 | - | 65 | g_resolv_add_nameserver(resolv, buf, 53, 0); |
50 | - if (family != AF_INET && | ||
51 | - resolv->res._u._ext.nsaddrs[i]) { | ||
52 | - family = AF_INET6; | ||
53 | - sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; | ||
54 | + FILE *f = fopen("/etc/resolv.conf", "r"); | ||
55 | + if (f) { | ||
56 | + char line[256], *s; | ||
57 | + int i; | ||
58 | + while (fgets(line, sizeof(line), f)) { | ||
59 | + if (strncmp(line, "nameserver", 10) || !isspace(line[10])) | ||
60 | + continue; | ||
61 | + for (s = &line[11]; isspace(s[0]); s++); | ||
62 | + for (i = 0; s[i] && !isspace(s[i]); i++); | ||
63 | + s[i] = 0; | ||
64 | + g_resolv_add_nameserver(resolv, s, 53, 0); | ||
65 | } | ||
66 | - | ||
67 | - if (family != AF_INET && family != AF_INET6) | ||
68 | - continue; | ||
69 | - | ||
70 | - if (inet_ntop(family, sa_addr, buf, sizeof(buf))) | ||
71 | - g_resolv_add_nameserver(resolv, buf, 53, 0); | ||
72 | + fclose(f); | ||
73 | } | 66 | } |
67 | +#else | ||
68 | + FILE *f = fopen("/etc/resolv.conf", "r"); | ||
69 | + if (f) { | ||
70 | + char line[256], *s; | ||
71 | + int i; | ||
72 | + while (fgets(line, sizeof(line), f)) { | ||
73 | + if (strncmp(line, "nameserver", 10) || !isspace(line[10])) | ||
74 | + continue; | ||
75 | + for (s = &line[11]; isspace(s[0]); s++); | ||
76 | + for (i = 0; s[i] && !isspace(s[i]); i++); | ||
77 | + s[i] = 0; | ||
78 | + g_resolv_add_nameserver(resolv, s, 53, 0); | ||
79 | + } | ||
80 | + fclose(f); | ||
81 | + } | ||
82 | +#endif | ||
74 | 83 | ||
75 | if (!resolv->nameserver_list) | 84 | if (!resolv->nameserver_list) |
85 | g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0); | ||
86 | -- | ||
87 | 2.39.2 | ||
88 | |||
diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb index 91ab9895ac..5c60b9cb83 100644 --- a/meta/recipes-connectivity/connman/connman_1.42.bb +++ b/meta/recipes-connectivity/connman/connman_1.42.bb | |||
@@ -7,9 +7,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | |||
7 | file://no-version-scripts.patch \ | 7 | file://no-version-scripts.patch \ |
8 | file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \ | 8 | file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \ |
9 | file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \ | 9 | file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \ |
10 | file://0002-resolve-musl-does-not-implement-res_ninit.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch" | ||
13 | 13 | ||
14 | SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa" | 14 | SRC_URI[sha256sum] = "a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa" |
15 | 15 | ||
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb index 6bde9b1f51..fd193b2cff 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb | |||
@@ -52,7 +52,7 @@ USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" | |||
52 | do_install:append () { | 52 | do_install:append () { |
53 | # install systemd unit files | 53 | # install systemd unit files |
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} | 55 | install -m 0644 ${UNPACKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} |
56 | 56 | ||
57 | chmod 700 ${D}${DBDIR} | 57 | chmod 700 ${D}${DBDIR} |
58 | chown dhcpcd:dhcpcd ${D}${DBDIR} | 58 | chown dhcpcd:dhcpcd ${D}${DBDIR} |
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb index 0f1a0736bd..afb0462c61 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb | |||
@@ -80,23 +80,23 @@ do_install:append () { | |||
80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd | 80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd |
81 | if [ -e ${D}${libexecdir}/rexecd ]; then | 81 | if [ -e ${D}${libexecdir}/rexecd ]; then |
82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd | 82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd |
83 | cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec | 83 | cp ${UNPACKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec |
84 | fi | 84 | fi |
85 | if [ -e ${D}${libexecdir}/rlogind ]; then | 85 | if [ -e ${D}${libexecdir}/rlogind ]; then |
86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind | 86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind |
87 | cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin | 87 | cp ${UNPACKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin |
88 | fi | 88 | fi |
89 | if [ -e ${D}${libexecdir}/rshd ]; then | 89 | if [ -e ${D}${libexecdir}/rshd ]; then |
90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd | 90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd |
91 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh | 91 | cp ${UNPACKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh |
92 | fi | 92 | fi |
93 | if [ -e ${D}${libexecdir}/talkd ]; then | 93 | if [ -e ${D}${libexecdir}/talkd ]; then |
94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd | 94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd |
95 | fi | 95 | fi |
96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd | 96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd |
97 | mv ${D}${libexecdir}/* ${D}${bindir}/ | 97 | mv ${D}${libexecdir}/* ${D}${bindir}/ |
98 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet | 98 | cp ${UNPACKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet |
99 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd | 99 | cp ${UNPACKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd |
100 | 100 | ||
101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* | 101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* |
102 | if [ -e ${D}${libdir}/charset.alias ]; then | 102 | if [ -e ${D}${libdir}/charset.alias ]; then |
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch deleted file mode 100644 index 74e3de1ce9..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001 | ||
2 | From: Baruch Siach <baruch@tkos.co.il> | ||
3 | Date: Thu, 22 Dec 2016 15:26:30 +0200 | ||
4 | Subject: [PATCH] libc-compat.h: add musl workaround | ||
5 | |||
6 | The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and | ||
7 | __USE_MISC) to solve conflicts with libc provided headers. This patch makes | ||
8 | libc-compat.h work for musl libc as well. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Taken From: | ||
13 | https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch | ||
14 | |||
15 | Signed-off-by: Baruch Siach <baruch@tkos.co.il> | ||
16 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
17 | |||
18 | --- | ||
19 | include/uapi/linux/libc-compat.h | 4 +++- | ||
20 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h | ||
23 | index a159991..22198fa 100644 | ||
24 | --- a/include/uapi/linux/libc-compat.h | ||
25 | +++ b/include/uapi/linux/libc-compat.h | ||
26 | @@ -50,10 +50,12 @@ | ||
27 | #define _LIBC_COMPAT_H | ||
28 | |||
29 | /* We have included glibc headers... */ | ||
30 | -#if defined(__GLIBC__) | ||
31 | +#if 1 | ||
32 | +#define __USE_MISC | ||
33 | |||
34 | /* Coordinate with glibc net/if.h header. */ | ||
35 | #if defined(_NET_IF_H) && defined(__USE_MISC) | ||
36 | +#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 | ||
37 | |||
38 | /* GLIBC headers included first so don't define anything | ||
39 | * that would already be defined. */ | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb index 640b3013f1..68f7611943 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb | |||
@@ -11,11 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | |||
11 | 11 | ||
12 | DEPENDS = "flex-native bison-native iptables libcap" | 12 | DEPENDS = "flex-native bison-native iptables libcap" |
13 | 13 | ||
14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" |
15 | file://0001-libc-compat.h-add-musl-workaround.patch \ | ||
16 | " | ||
17 | 15 | ||
18 | SRC_URI[sha256sum] = "ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d" | 16 | SRC_URI[sha256sum] = "03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce" |
19 | 17 | ||
20 | inherit update-alternatives bash-completion pkgconfig | 18 | inherit update-alternatives bash-completion pkgconfig |
21 | 19 | ||
@@ -53,12 +51,16 @@ do_install () { | |||
53 | install -d ${D}${datadir} | 51 | install -d ${D}${datadir} |
54 | mv ${D}/share/* ${D}${datadir}/ || true | 52 | mv ${D}/share/* ${D}${datadir}/ || true |
55 | rm ${D}/share -rf || true | 53 | rm ${D}/share -rf || true |
54 | |||
55 | # Remove support fot ipt and xt in tc. So tc library directory is not needed. | ||
56 | rm ${D}${libdir}/tc -rf | ||
56 | } | 57 | } |
57 | 58 | ||
58 | # The .so files in iproute2-tc are modules, not traditional libraries | 59 | # The .so files in iproute2-tc are modules, not traditional libraries |
59 | INSANE_SKIP:${PN}-tc = "dev-so" | 60 | INSANE_SKIP:${PN}-tc = "dev-so" |
60 | 61 | ||
61 | IPROUTE2_PACKAGES =+ "\ | 62 | IPROUTE2_PACKAGES =+ "\ |
63 | ${PN}-bridge \ | ||
62 | ${PN}-devlink \ | 64 | ${PN}-devlink \ |
63 | ${PN}-genl \ | 65 | ${PN}-genl \ |
64 | ${PN}-ifstat \ | 66 | ${PN}-ifstat \ |
@@ -91,6 +93,7 @@ FILES:${PN}-tipc = "${base_sbindir}/tipc" | |||
91 | FILES:${PN}-devlink = "${base_sbindir}/devlink" | 93 | FILES:${PN}-devlink = "${base_sbindir}/devlink" |
92 | FILES:${PN}-rdma = "${base_sbindir}/rdma" | 94 | FILES:${PN}-rdma = "${base_sbindir}/rdma" |
93 | FILES:${PN}-routel = "${base_sbindir}/routel" | 95 | FILES:${PN}-routel = "${base_sbindir}/routel" |
96 | FILES:${PN}-bridge = "${base_sbindir}/bridge" | ||
94 | 97 | ||
95 | RDEPENDS:${PN}-routel = "python3-core" | 98 | RDEPENDS:${PN}-routel = "python3-core" |
96 | 99 | ||
diff --git a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch b/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch deleted file mode 100644 index 8a5bd00302..0000000000 --- a/meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
3 | Date: Tue, 8 Aug 2023 19:03:13 +0100 | ||
4 | Subject: [PATCH] kea: fix reproducible build failure | ||
5 | |||
6 | New version of Kea has started using path of build-dir instead of | ||
7 | src-dir which results in reproducible builds failure. | ||
8 | Use src-dir as is used in v2.2.0 | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | https://gitlab.isc.org/isc-projects/kea/-/issues/3007 | ||
12 | |||
13 | Upstream has confirmed the patch will not be accepted but discussions | ||
14 | with upstream is still going on, we might have a proper solution later. | ||
15 | |||
16 | Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | ||
17 | --- | ||
18 | src/bin/admin/kea-admin.in | 8 ++++---- | ||
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in | ||
22 | index 034a0ee..8ab11ab 100644 | ||
23 | --- a/src/bin/admin/kea-admin.in | ||
24 | +++ b/src/bin/admin/kea-admin.in | ||
25 | @@ -51,14 +51,14 @@ dump_qry="" | ||
26 | if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then | ||
27 | . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" | ||
28 | else | ||
29 | - . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" | ||
30 | + . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" | ||
31 | fi | ||
32 | |||
33 | # Find the installed kea-lfc if available. Fallback to sources otherwise. | ||
34 | if test -x "@sbindir@/kea-lfc"; then | ||
35 | kea_lfc="@sbindir@/kea-lfc" | ||
36 | else | ||
37 | - kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" | ||
38 | + kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" | ||
39 | fi | ||
40 | |||
41 | # Prints out usage version. | ||
42 | @@ -355,7 +355,7 @@ mysql_upgrade() { | ||
43 | # Check if there are any files in it | ||
44 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
45 | if [ "$num_files" -eq 0 ]; then | ||
46 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql | ||
47 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql | ||
48 | |||
49 | # Check if the scripts directory exists at all. | ||
50 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
51 | @@ -405,7 +405,7 @@ pgsql_upgrade() { | ||
52 | # Check if there are any files in it | ||
53 | num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) | ||
54 | if [ "$num_files" -eq 0 ]; then | ||
55 | - upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql | ||
56 | + upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql | ||
57 | |||
58 | # Check if the scripts directory exists at all. | ||
59 | if [ ! -d ${upgrade_scripts_dir} ]; then | ||
60 | -- | ||
61 | 2.39.2 | ||
62 | |||
diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb index c3aa4dc8f0..19309ce314 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb | |||
@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | |||
17 | file://fix-multilib-conflict.patch \ | 17 | file://fix-multilib-conflict.patch \ |
18 | file://fix_pid_keactrl.patch \ | 18 | file://fix_pid_keactrl.patch \ |
19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ | 19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ |
20 | file://0001-kea-fix-reproducible-build-failure.patch \ | ||
21 | " | 20 | " |
22 | SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" | 21 | SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" |
23 | 22 | ||
@@ -39,6 +38,7 @@ DEBUG_OPTIMIZATION:append:mipsel = " -O" | |||
39 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" | 38 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" |
40 | BUILD_OPTIMIZATION:append:mipsel = " -O" | 39 | BUILD_OPTIMIZATION:append:mipsel = " -O" |
41 | 40 | ||
41 | CXXFLAGS:remove = "-fvisibility-inlines-hidden" | ||
42 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ | 42 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ |
43 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ | 43 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ |
44 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" | 44 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" |
@@ -47,7 +47,7 @@ do_configure:prepend() { | |||
47 | # replace abs_top_builddir to avoid introducing the build path | 47 | # replace abs_top_builddir to avoid introducing the build path |
48 | # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target | 48 | # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target |
49 | find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" | 49 | find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" |
50 | sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in | 50 | sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in |
51 | } | 51 | } |
52 | 52 | ||
53 | # patch out build host paths for reproducibility | 53 | # patch out build host paths for reproducibility |
@@ -59,8 +59,8 @@ do_install:append() { | |||
59 | install -d ${D}${sysconfdir}/init.d | 59 | install -d ${D}${sysconfdir}/init.d |
60 | install -d ${D}${systemd_system_unitdir} | 60 | install -d ${D}${systemd_system_unitdir} |
61 | 61 | ||
62 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 62 | install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} |
63 | install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d | 63 | install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d |
64 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 64 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
65 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 65 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
66 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl | 66 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl |
diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index a98f436b98..94df1ac3d6 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb | |||
@@ -31,7 +31,7 @@ EXTRA_OECONF += "--enable-tools" | |||
31 | do_install:append() { | 31 | do_install:append() { |
32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
34 | sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ | 34 | sed "s:@installpath@:${libexecdir}/nfc:" ${UNPACKDIR}/neard.in \ |
35 | > ${D}${sysconfdir}/init.d/neard | 35 | > ${D}${sysconfdir}/init.d/neard |
36 | chmod 0755 ${D}${sysconfdir}/init.d/neard | 36 | chmod 0755 ${D}${sysconfdir}/init.d/neard |
37 | fi | 37 | fi |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 2f2644f9a8..af7a74a5fb 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb | |||
@@ -122,22 +122,22 @@ HIGH_RLIMIT_NOFILE ??= "4096" | |||
122 | 122 | ||
123 | do_install:append () { | 123 | do_install:append () { |
124 | install -d ${D}${sysconfdir}/init.d | 124 | install -d ${D}${sysconfdir}/init.d |
125 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 125 | install -m 0755 ${UNPACKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
126 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 126 | install -m 0755 ${UNPACKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |
127 | 127 | ||
128 | install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} | 128 | install -m 0755 ${UNPACKDIR}/nfs-utils.conf ${D}${sysconfdir} |
129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} | 129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} |
130 | 130 | ||
131 | install -d ${D}${systemd_system_unitdir} | 131 | install -d ${D}${systemd_system_unitdir} |
132 | install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ | 132 | install -m 0644 ${UNPACKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ |
133 | install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ | 133 | install -m 0644 ${UNPACKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ |
134 | install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ | 134 | install -m 0644 ${UNPACKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ |
135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ | 137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ |
138 | ${D}${systemd_system_unitdir}/*.service | 138 | ${D}${systemd_system_unitdir}/*.service |
139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
140 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ | 140 | install -m 0644 ${UNPACKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ |
141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ | 141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ |
142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount | 142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount |
143 | fi | 143 | fi |
diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.4.bb index dae5cc3c25..5e1e5f3b6a 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.4.bb | |||
@@ -37,7 +37,7 @@ do_configure:prepend() { | |||
37 | 37 | ||
38 | do_install:append() { | 38 | do_install:append() { |
39 | install -d ${D}${sysconfdir}/init.d/ | 39 | install -d ${D}${sysconfdir}/init.d/ |
40 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 40 | install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |
41 | } | 41 | } |
42 | 42 | ||
43 | PACKAGES =+ "${PN}-tests" | 43 | PACKAGES =+ "${PN}-tests" |
diff --git a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch index acda8f1ce9..f079d936a4 100644 --- a/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch +++ b/meta/recipes-connectivity/openssh/openssh/0001-systemd-Add-optional-support-for-systemd-sd_notify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From be187435911cde6cc3cef6982a508261074f1e56 Mon Sep 17 00:00:00 2001 | 1 | From b02ef7621758f06eb686ef4f620636dbad086eda Mon Sep 17 00:00:00 2001 |
2 | From: Matt Jolly <Matt.Jolly@footclan.ninja> | 2 | From: Matt Jolly <Matt.Jolly@footclan.ninja> |
3 | Date: Thu, 2 Feb 2023 21:05:40 +1100 | 3 | Date: Thu, 2 Feb 2023 21:05:40 +1100 |
4 | Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` | 4 | Subject: [PATCH] systemd: Add optional support for systemd `sd_notify` |
@@ -15,10 +15,10 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | |||
15 | 2 files changed, 37 insertions(+) | 15 | 2 files changed, 37 insertions(+) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 22fee70f..486c189f 100644 | 18 | index 82e8bb7..d1145d3 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -4835,6 +4835,29 @@ AC_SUBST([GSSLIBS]) | 21 | @@ -4870,6 +4870,29 @@ AC_SUBST([GSSLIBS]) |
22 | AC_SUBST([K5LIBS]) | 22 | AC_SUBST([K5LIBS]) |
23 | AC_SUBST([CHANNELLIBS]) | 23 | AC_SUBST([CHANNELLIBS]) |
24 | 24 | ||
@@ -48,7 +48,7 @@ index 22fee70f..486c189f 100644 | |||
48 | # Looking for programs, paths and files | 48 | # Looking for programs, paths and files |
49 | 49 | ||
50 | PRIVSEP_PATH=/var/empty | 50 | PRIVSEP_PATH=/var/empty |
51 | @@ -5634,6 +5657,7 @@ echo " libldns support: $LDNS_MSG" | 51 | @@ -5688,6 +5711,7 @@ echo " libldns support: $LDNS_MSG" |
52 | echo " Solaris process contract support: $SPC_MSG" | 52 | echo " Solaris process contract support: $SPC_MSG" |
53 | echo " Solaris project support: $SP_MSG" | 53 | echo " Solaris project support: $SP_MSG" |
54 | echo " Solaris privilege support: $SPP_MSG" | 54 | echo " Solaris privilege support: $SPP_MSG" |
@@ -57,7 +57,7 @@ index 22fee70f..486c189f 100644 | |||
57 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | 57 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" |
58 | echo " BSD Auth support: $BSD_AUTH_MSG" | 58 | echo " BSD Auth support: $BSD_AUTH_MSG" |
59 | diff --git a/sshd.c b/sshd.c | 59 | diff --git a/sshd.c b/sshd.c |
60 | index 6321936c..859d6a0b 100644 | 60 | index b4f2b97..6820a41 100644 |
61 | --- a/sshd.c | 61 | --- a/sshd.c |
62 | +++ b/sshd.c | 62 | +++ b/sshd.c |
63 | @@ -88,6 +88,10 @@ | 63 | @@ -88,6 +88,10 @@ |
@@ -71,7 +71,7 @@ index 6321936c..859d6a0b 100644 | |||
71 | #include "xmalloc.h" | 71 | #include "xmalloc.h" |
72 | #include "ssh.h" | 72 | #include "ssh.h" |
73 | #include "ssh2.h" | 73 | #include "ssh2.h" |
74 | @@ -310,6 +314,10 @@ static void | 74 | @@ -308,6 +312,10 @@ static void |
75 | sighup_restart(void) | 75 | sighup_restart(void) |
76 | { | 76 | { |
77 | logit("Received SIGHUP; restarting."); | 77 | logit("Received SIGHUP; restarting."); |
@@ -82,7 +82,7 @@ index 6321936c..859d6a0b 100644 | |||
82 | if (options.pid_file != NULL) | 82 | if (options.pid_file != NULL) |
83 | unlink(options.pid_file); | 83 | unlink(options.pid_file); |
84 | platform_pre_restart(); | 84 | platform_pre_restart(); |
85 | @@ -2086,6 +2094,11 @@ main(int ac, char **av) | 85 | @@ -2093,6 +2101,11 @@ main(int ac, char **av) |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -94,6 +94,3 @@ index 6321936c..859d6a0b 100644 | |||
94 | /* Accept a connection and return in a forked child */ | 94 | /* Accept a connection and return in a forked child */ |
95 | server_accept_loop(&sock_in, &sock_out, | 95 | server_accept_loop(&sock_in, &sock_out, |
96 | &newsock, config_s); | 96 | &newsock, config_s); |
97 | -- | ||
98 | 2.25.1 | ||
99 | |||
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.service b/meta/recipes-connectivity/openssh/openssh/sshd.service index 2a997b656a..3e570ab1e5 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.service +++ b/meta/recipes-connectivity/openssh/openssh/sshd.service | |||
@@ -2,6 +2,7 @@ | |||
2 | Description=OpenSSH server daemon | 2 | Description=OpenSSH server daemon |
3 | Wants=sshdgenkeys.service | 3 | Wants=sshdgenkeys.service |
4 | After=sshdgenkeys.service | 4 | After=sshdgenkeys.service |
5 | After=nss-user-lookup.target | ||
5 | 6 | ||
6 | [Service] | 7 | [Service] |
7 | Environment="SSHD_OPTS=" | 8 | Environment="SSHD_OPTS=" |
diff --git a/meta/recipes-connectivity/openssh/openssh/sshd.socket b/meta/recipes-connectivity/openssh/openssh/sshd.socket index 8d76d62309..7dd2ed0626 100644 --- a/meta/recipes-connectivity/openssh/openssh/sshd.socket +++ b/meta/recipes-connectivity/openssh/openssh/sshd.socket | |||
@@ -1,6 +1,7 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Conflicts=sshd.service | 2 | Conflicts=sshd.service |
3 | Wants=sshdgenkeys.service | 3 | Wants=sshdgenkeys.service |
4 | After=nss-user-lookup.target | ||
4 | 5 | ||
5 | [Socket] | 6 | [Socket] |
6 | ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd | 7 | ExecStartPre=@BASE_BINDIR@/mkdir -p /var/run/sshd |
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb index edd8e8c2d1..36ffa49398 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb | |||
@@ -28,7 +28,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar | |||
28 | file://0001-regress-banner.sh-log-input-and-output-files-on-erro.patch \ | 28 | 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 \ | 29 | file://0001-systemd-Add-optional-support-for-systemd-sd_notify.patch \ |
30 | " | 30 | " |
31 | SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c" | 31 | SRC_URI[sha256sum] = "490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd" |
32 | 32 | ||
33 | CVE_STATUS[CVE-2007-2768] = "not-applicable-config: This CVE is specific to OpenSSH with the pam opie which we don't build/use here." | 33 | CVE_STATUS[CVE-2007-2768] = "not-applicable-config: This CVE is specific to OpenSSH with the pam opie which we don't build/use here." |
34 | 34 | ||
@@ -58,6 +58,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) | |||
58 | # systemd-sshd-socket-mode means installing sshd.socket | 58 | # systemd-sshd-socket-mode means installing sshd.socket |
59 | # and systemd-sshd-service-mode corresponding to sshd.service | 59 | # and systemd-sshd-service-mode corresponding to sshd.service |
60 | PACKAGECONFIG ??= "systemd-sshd-socket-mode" | 60 | PACKAGECONFIG ??= "systemd-sshd-socket-mode" |
61 | PACKAGECONFIG[fido2] = "--with-security-key-builtin,--disable-security-key,libfido2" | ||
61 | PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" | 62 | PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5" |
62 | PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" | 63 | PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns" |
63 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" | 64 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" |
@@ -101,8 +102,8 @@ CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | |||
101 | 102 | ||
102 | do_configure:prepend () { | 103 | do_configure:prepend () { |
103 | export LD="${CC}" | 104 | export LD="${CC}" |
104 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | 105 | install -m 0644 ${UNPACKDIR}/sshd_config ${B}/ |
105 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | 106 | install -m 0644 ${UNPACKDIR}/ssh_config ${B}/ |
106 | } | 107 | } |
107 | 108 | ||
108 | do_compile_ptest() { | 109 | do_compile_ptest() { |
diff --git a/meta/recipes-connectivity/openssl/openssl/bti.patch b/meta/recipes-connectivity/openssl/openssl/bti.patch new file mode 100644 index 0000000000..748576c30c --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/bti.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From ba8a599395f8b770c76316b5f5b0f3838567014f Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Cosgrove <tom.cosgrove@arm.com> | ||
3 | Date: Tue, 26 Mar 2024 13:18:00 +0000 | ||
4 | Subject: [PATCH] aarch64: fix BTI in bsaes assembly code | ||
5 | |||
6 | In Arm systems where BTI is enabled but the Crypto extensions are not (more | ||
7 | likely in FVPs than in real hardware), the bit-sliced assembler code will | ||
8 | be used. However, this wasn't annotated with BTI instructions when BTI was | ||
9 | enabled, so the moment libssl jumps into this code it (correctly) aborts. | ||
10 | |||
11 | Solve this by adding the missing BTI landing pads. | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/23982] | ||
14 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
15 | --- | ||
16 | crypto/aes/asm/bsaes-armv8.pl | 5 ++++- | ||
17 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl | ||
20 | index b3c97e439f..c3c5ff3e05 100644 | ||
21 | --- a/crypto/aes/asm/bsaes-armv8.pl | ||
22 | +++ b/crypto/aes/asm/bsaes-armv8.pl | ||
23 | @@ -1018,6 +1018,7 @@ _bsaes_key_convert: | ||
24 | // Initialisation vector overwritten with last quadword of ciphertext | ||
25 | // No output registers, usual AAPCS64 register preservation | ||
26 | ossl_bsaes_cbc_encrypt: | ||
27 | + AARCH64_VALID_CALL_TARGET | ||
28 | cmp x2, #128 | ||
29 | bhs .Lcbc_do_bsaes | ||
30 | b AES_cbc_encrypt | ||
31 | @@ -1270,7 +1271,7 @@ ossl_bsaes_cbc_encrypt: | ||
32 | // Output text filled in | ||
33 | // No output registers, usual AAPCS64 register preservation | ||
34 | ossl_bsaes_ctr32_encrypt_blocks: | ||
35 | - | ||
36 | + AARCH64_VALID_CALL_TARGET | ||
37 | cmp x2, #8 // use plain AES for | ||
38 | blo .Lctr_enc_short // small sizes | ||
39 | |||
40 | @@ -1476,6 +1477,7 @@ ossl_bsaes_ctr32_encrypt_blocks: | ||
41 | // Output ciphertext filled in | ||
42 | // No output registers, usual AAPCS64 register preservation | ||
43 | ossl_bsaes_xts_encrypt: | ||
44 | + AARCH64_VALID_CALL_TARGET | ||
45 | // Stack layout: | ||
46 | // sp -> | ||
47 | // nrounds*128-96 bytes: key schedule | ||
48 | @@ -1921,6 +1923,7 @@ ossl_bsaes_xts_encrypt: | ||
49 | // Output plaintext filled in | ||
50 | // No output registers, usual AAPCS64 register preservation | ||
51 | ossl_bsaes_xts_decrypt: | ||
52 | + AARCH64_VALID_CALL_TARGET | ||
53 | // Stack layout: | ||
54 | // sp -> | ||
55 | // nrounds*128-96 bytes: key schedule | ||
56 | -- | ||
57 | 2.34.1 | ||
58 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb index 1682b6f8cc..113ed4bf95 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.2.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb | |||
@@ -12,13 +12,14 @@ 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://bti.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |
18 | file://environment.d-openssl.sh \ | 19 | file://environment.d-openssl.sh \ |
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI[sha256sum] = "83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39" | 22 | SRC_URI[sha256sum] = "53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02" |
22 | 23 | ||
23 | inherit lib_package multilib_header multilib_script ptest perlnative manpages | 24 | inherit lib_package multilib_header multilib_script ptest perlnative manpages |
24 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 25 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
@@ -135,16 +136,12 @@ do_configure () { | |||
135 | ;; | 136 | ;; |
136 | esac | 137 | esac |
137 | 138 | ||
138 | useprefix=${prefix} | ||
139 | if [ "x$useprefix" = "x" ]; then | ||
140 | useprefix=/ | ||
141 | fi | ||
142 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the | 139 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the |
143 | # environment variables set by bitbake. Adjust the environment variables instead. | 140 | # environment variables set by bitbake. Adjust the environment variables instead. |
144 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" | 141 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" |
145 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" | 142 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" |
146 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ | 143 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ |
147 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target | 144 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=${prefix} --openssldir=${libdir}/ssl-3 --libdir=${baselib} $target |
148 | perl ${B}/configdata.pm --dump | 145 | perl ${B}/configdata.pm --dump |
149 | } | 146 | } |
150 | 147 | ||
@@ -180,7 +177,7 @@ do_install:append:class-native () { | |||
180 | 177 | ||
181 | do_install:append:class-nativesdk () { | 178 | do_install:append:class-nativesdk () { |
182 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 179 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
183 | install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 180 | install -m 644 ${UNPACKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
184 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 181 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
185 | } | 182 | } |
186 | 183 | ||
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index 099c58bfc7..0c3085d3a8 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | |||
@@ -15,10 +15,10 @@ S = "${WORKDIR}" | |||
15 | 15 | ||
16 | do_install() { | 16 | do_install() { |
17 | install -d ${D}${sysconfdir}/ppp/peers | 17 | install -d ${D}${sysconfdir}/ppp/peers |
18 | install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host | 18 | install -m 0644 ${S}/host-peer ${D}${sysconfdir}/ppp/peers/host |
19 | 19 | ||
20 | install -d ${D}${sbindir} | 20 | install -d ${D}${sbindir} |
21 | install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir} | 21 | install -m 0755 ${S}/ppp-dialin ${D}${sbindir} |
22 | } | 22 | } |
23 | 23 | ||
24 | USERADD_PACKAGES = "${PN}" | 24 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb index 4b052f8ed9..36e2585de4 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb | |||
@@ -5,7 +5,7 @@ SECTION = "console/network" | |||
5 | HOMEPAGE = "http://samba.org/ppp/" | 5 | HOMEPAGE = "http://samba.org/ppp/" |
6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" | 6 | BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" |
7 | DEPENDS = "libpcap openssl virtual/crypt" | 7 | DEPENDS = "libpcap openssl virtual/crypt" |
8 | LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD" | 8 | LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD" |
9 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ | 9 | LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ |
10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ | 10 | file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ |
11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ | 11 | file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ |
@@ -35,20 +35,20 @@ do_install:append () { | |||
35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d | 35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d |
36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ | 36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ |
37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ | 37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ |
38 | install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon | 38 | install -m 0755 ${UNPACKDIR}/pon ${D}${bindir}/pon |
39 | install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff | 39 | install -m 0755 ${UNPACKDIR}/poff ${D}${bindir}/poff |
40 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp | 40 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/ppp |
41 | install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ | 41 | install -m 0755 ${UNPACKDIR}/ip-up ${D}${sysconfdir}/ppp/ |
42 | install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ | 42 | install -m 0755 ${UNPACKDIR}/ip-down ${D}${sysconfdir}/ppp/ |
43 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ | 43 | install -m 0755 ${UNPACKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ |
44 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ | 44 | install -m 0755 ${UNPACKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ |
45 | mkdir -p ${D}${sysconfdir}/chatscripts | 45 | mkdir -p ${D}${sysconfdir}/chatscripts |
46 | mkdir -p ${D}${sysconfdir}/ppp/peers | 46 | mkdir -p ${D}${sysconfdir}/ppp/peers |
47 | install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts | 47 | install -m 0755 ${UNPACKDIR}/pap ${D}${sysconfdir}/chatscripts |
48 | install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot | 48 | install -m 0755 ${UNPACKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot |
49 | install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider | 49 | install -m 0755 ${UNPACKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider |
50 | install -d ${D}${systemd_system_unitdir} | 50 | install -d ${D}${systemd_system_unitdir} |
51 | install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir} | 51 | install -m 0644 ${UNPACKDIR}/ppp@.service ${D}${systemd_system_unitdir} |
52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
53 | ${D}${systemd_system_unitdir}/ppp@.service | 53 | ${D}${systemd_system_unitdir}/ppp@.service |
54 | } | 54 | } |
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb index 226cb7ee77..c3ce5bc22e 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb | |||
@@ -29,7 +29,7 @@ do_compile () { | |||
29 | 29 | ||
30 | do_install () { | 30 | do_install () { |
31 | install -d ${D}${sysconfdir}/default/volatiles | 31 | install -d ${D}${sysconfdir}/default/volatiles |
32 | install -m 0644 ${WORKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles | 32 | install -m 0644 ${UNPACKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles |
33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
34 | install -d ${D}${sysconfdir}/tmpfiles.d | 34 | install -d ${D}${sysconfdir}/tmpfiles.d |
35 | echo "d /run/${BPN}/interface - - - -" \ | 35 | echo "d /run/${BPN}/interface - - - -" \ |
diff --git a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb index ddd10e6eeb..ede18a0031 100644 --- a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb +++ b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb | |||
@@ -10,10 +10,10 @@ INHIBIT_DEFAULT_DEPS = "1" | |||
10 | 10 | ||
11 | do_install () { | 11 | do_install () { |
12 | install -d ${D}${sysconfdir}/dropbear | 12 | install -d ${D}${sysconfdir}/dropbear |
13 | install ${WORKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ | 13 | install ${UNPACKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ |
14 | 14 | ||
15 | install -d ${D}${sysconfdir}/ssh | 15 | install -d ${D}${sysconfdir}/ssh |
16 | install ${WORKDIR}/openssh/* ${D}${sysconfdir}/ssh/ | 16 | install ${UNPACKDIR}/openssh/* ${D}${sysconfdir}/ssh/ |
17 | chmod 0600 ${D}${sysconfdir}/ssh/* | 17 | chmod 0600 ${D}${sysconfdir}/ssh/* |
18 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub | 18 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub |
19 | } \ No newline at end of file | 19 | } \ No newline at end of file |
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 22028ce957..8113bcab09 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | |||
@@ -62,15 +62,15 @@ do_install () { | |||
62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install | 62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install |
63 | 63 | ||
64 | install -d ${D}${docdir}/wpa_supplicant | 64 | install -d ${D}${docdir}/wpa_supplicant |
65 | install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant | 65 | install -m 644 wpa_supplicant/README ${UNPACKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant |
66 | 66 | ||
67 | install -d ${D}${sysconfdir} | 67 | install -d ${D}${sysconfdir} |
68 | install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf | 68 | install -m 600 ${UNPACKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf |
69 | 69 | ||
70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ | 70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ |
71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ | 71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ |
72 | install -d ${D}${sysconfdir}/network/if-down.d/ | 72 | install -d ${D}${sysconfdir}/network/if-down.d/ |
73 | install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant | 73 | install -m 755 ${UNPACKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant |
74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant | 74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant |
75 | 75 | ||
76 | install -d ${D}/${sysconfdir}/dbus-1/system.d | 76 | install -d ${D}/${sysconfdir}/dbus-1/system.d |
@@ -84,7 +84,7 @@ do_install () { | |||
84 | fi | 84 | fi |
85 | 85 | ||
86 | install -d ${D}/etc/default/volatiles | 86 | install -d ${D}/etc/default/volatiles |
87 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles | 87 | install -m 0644 ${UNPACKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles |
88 | 88 | ||
89 | install -d ${D}${includedir} | 89 | install -d ${D}${includedir} |
90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} | 90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} |
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 9fab53ce63..42a8026e63 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -113,23 +113,23 @@ do_install () { | |||
113 | ln -snf ../run ${D}${localstatedir}/run | 113 | ln -snf ../run ${D}${localstatedir}/run |
114 | ln -snf ../run/lock ${D}${localstatedir}/lock | 114 | ln -snf ../run/lock ${D}${localstatedir}/lock |
115 | 115 | ||
116 | install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts | 116 | install -m 0644 ${S}/hosts ${D}${sysconfdir}/hosts |
117 | ${BASEFILESISSUEINSTALL} | 117 | ${BASEFILESISSUEINSTALL} |
118 | 118 | ||
119 | rotation=`cat ${WORKDIR}/rotation` | 119 | rotation=`cat ${S}/rotation` |
120 | if [ "$rotation" != "0" ]; then | 120 | if [ "$rotation" != "0" ]; then |
121 | install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation | 121 | install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation |
122 | fi | 122 | fi |
123 | 123 | ||
124 | install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab | 124 | install -m 0644 ${S}/fstab ${D}${sysconfdir}/fstab |
125 | install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile | 125 | install -m 0644 ${S}/profile ${D}${sysconfdir}/profile |
126 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile | 126 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile |
127 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile | 127 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile |
128 | install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells | 128 | install -m 0644 ${S}/shells ${D}${sysconfdir}/shells |
129 | install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile | 129 | install -m 0755 ${S}/share/dot.profile ${D}${sysconfdir}/skel/.profile |
130 | install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc | 130 | install -m 0755 ${S}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |
131 | install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf | 131 | install -m 0644 ${S}/host.conf ${D}${sysconfdir}/host.conf |
132 | install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd | 132 | install -m 0644 ${S}/motd ${D}${sysconfdir}/motd |
133 | 133 | ||
134 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab | 134 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab |
135 | 135 | ||
@@ -145,12 +145,12 @@ do_install () { | |||
145 | } | 145 | } |
146 | 146 | ||
147 | do_install:append:libc-glibc () { | 147 | do_install:append:libc-glibc () { |
148 | install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf | 148 | install -m 0644 ${S}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf |
149 | } | 149 | } |
150 | 150 | ||
151 | DISTRO_VERSION[vardepsexclude] += "DATE" | 151 | DISTRO_VERSION[vardepsexclude] += "DATE" |
152 | do_install_basefilesissue () { | 152 | do_install_basefilesissue () { |
153 | install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} | 153 | install -m 644 ${S}/issue* ${D}${sysconfdir} |
154 | if [ -n "${DISTRO_NAME}" ]; then | 154 | if [ -n "${DISTRO_NAME}" ]; then |
155 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue | 155 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue |
156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net | 156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net |
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb index 6904a91930..1f179d8560 100644 --- a/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox-inittab_1.36.1.bb | |||
@@ -14,7 +14,7 @@ do_compile() { | |||
14 | 14 | ||
15 | do_install() { | 15 | do_install() { |
16 | install -d ${D}${sysconfdir} | 16 | install -d ${D}${sysconfdir} |
17 | install -D -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | 17 | install -D -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab |
18 | 18 | ||
19 | CONSOLES="${SERIAL_CONSOLES}" | 19 | CONSOLES="${SERIAL_CONSOLES}" |
20 | for s in $CONSOLES | 20 | for s in $CONSOLES |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index f5d7c3f9c8..67a9111e5b 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -114,7 +114,7 @@ do_prepare_config () { | |||
114 | export KCONFIG_NOTIMESTAMP=1 | 114 | export KCONFIG_NOTIMESTAMP=1 |
115 | 115 | ||
116 | sed -e '/CONFIG_STATIC/d' \ | 116 | sed -e '/CONFIG_STATIC/d' \ |
117 | < ${WORKDIR}/defconfig > ${S}/.config | 117 | < ${UNPACKDIR}/defconfig > ${S}/.config |
118 | echo "# CONFIG_STATIC is not set" >> .config | 118 | echo "# CONFIG_STATIC is not set" >> .config |
119 | for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ | 119 | for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ |
120 | ${S}/.config | 120 | ${S}/.config |
@@ -280,67 +280,67 @@ do_install () { | |||
280 | fi | 280 | fi |
281 | 281 | ||
282 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | 282 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then |
283 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog | 283 | install -m 0755 ${UNPACKDIR}/syslog ${D}${sysconfdir}/init.d/syslog |
284 | install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf | 284 | install -m 644 ${UNPACKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf |
285 | install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf | 285 | install -m 644 ${UNPACKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf |
286 | fi | 286 | fi |
287 | if grep -q "CONFIG_CROND=y" ${B}/.config; then | 287 | if grep -q "CONFIG_CROND=y" ${B}/.config; then |
288 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ | 288 | install -m 0755 ${UNPACKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ |
289 | fi | 289 | fi |
290 | if grep -q "CONFIG_HTTPD=y" ${B}/.config; then | 290 | if grep -q "CONFIG_HTTPD=y" ${B}/.config; then |
291 | install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ | 291 | install -m 0755 ${UNPACKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ |
292 | install -d ${D}/srv/www | 292 | install -d ${D}/srv/www |
293 | fi | 293 | fi |
294 | if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then | 294 | if grep -q "CONFIG_UDHCPD=y" ${B}/.config; then |
295 | install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ | 295 | install -m 0755 ${UNPACKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ |
296 | fi | 296 | fi |
297 | if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then | 297 | if grep -q "CONFIG_HWCLOCK=y" ${B}/.config; then |
298 | install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ | 298 | install -m 0755 ${UNPACKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ |
299 | fi | 299 | fi |
300 | if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then | 300 | if grep -q "CONFIG_UDHCPC=y" ${B}/.config; then |
301 | install -d ${D}${sysconfdir}/udhcpc.d | 301 | install -d ${D}${sysconfdir}/udhcpc.d |
302 | install -d ${D}${datadir}/udhcpc | 302 | install -d ${D}${datadir}/udhcpc |
303 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default | 303 | install -m 0755 ${UNPACKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default |
304 | sed -i "s:/SBIN_DIR/:${base_sbindir}/:" ${D}${sysconfdir}/udhcpc.d/50default | 304 | sed -i "s:/SBIN_DIR/:${base_sbindir}/:" ${D}${sysconfdir}/udhcpc.d/50default |
305 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script | 305 | install -m 0755 ${UNPACKDIR}/default.script ${D}${datadir}/udhcpc/default.script |
306 | fi | 306 | fi |
307 | if grep -q "CONFIG_INETD=y" ${B}/.config; then | 307 | if grep -q "CONFIG_INETD=y" ${B}/.config; then |
308 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} | 308 | install -m 0755 ${UNPACKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} |
309 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} | 309 | sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN} |
310 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ | 310 | install -m 0644 ${UNPACKDIR}/inetd.conf ${D}${sysconfdir}/ |
311 | fi | 311 | fi |
312 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then | 312 | if grep -q "CONFIG_MDEV=y" ${B}/.config; then |
313 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev | 313 | install -m 0755 ${UNPACKDIR}/mdev ${D}${sysconfdir}/init.d/mdev |
314 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then | 314 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then |
315 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf | 315 | install -m 644 ${UNPACKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf |
316 | install -d ${D}${sysconfdir}/mdev | 316 | install -d ${D}${sysconfdir}/mdev |
317 | install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev | 317 | install -m 0755 ${UNPACKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev |
318 | install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev | 318 | install -m 0755 ${UNPACKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev |
319 | fi | 319 | fi |
320 | fi | 320 | fi |
321 | if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then | 321 | if grep -q "CONFIG_INIT=y" ${B}/.config && ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','busybox','true','false',d)}; then |
322 | install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | 322 | install -D -m 0755 ${UNPACKDIR}/rcS ${D}${sysconfdir}/init.d/rcS |
323 | install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | 323 | install -D -m 0755 ${UNPACKDIR}/rcK ${D}${sysconfdir}/init.d/rcK |
324 | install -D -m 0755 ${WORKDIR}/rcS.default ${D}${sysconfdir}/default/rcS | 324 | install -D -m 0755 ${UNPACKDIR}/rcS.default ${D}${sysconfdir}/default/rcS |
325 | fi | 325 | fi |
326 | 326 | ||
327 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 327 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
328 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then | 328 | if grep -q "CONFIG_KLOGD=y" ${B}/.config; then |
329 | install -d ${D}${systemd_system_unitdir} | 329 | install -d ${D}${systemd_system_unitdir} |
330 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | 330 | sed 's,@base_sbindir@,${base_sbindir},g' < ${UNPACKDIR}/busybox-klogd.service.in \ |
331 | > ${D}${systemd_system_unitdir}/busybox-klogd.service | 331 | > ${D}${systemd_system_unitdir}/busybox-klogd.service |
332 | fi | 332 | fi |
333 | 333 | ||
334 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then | 334 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then |
335 | install -d ${D}${systemd_system_unitdir} | 335 | install -d ${D}${systemd_system_unitdir} |
336 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | 336 | sed 's,@base_sbindir@,${base_sbindir},g' < ${UNPACKDIR}/busybox-syslog.service.in \ |
337 | > ${D}${systemd_system_unitdir}/busybox-syslog.service | 337 | > ${D}${systemd_system_unitdir}/busybox-syslog.service |
338 | if [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then | 338 | if [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then |
339 | sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service | 339 | sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service |
340 | fi | 340 | fi |
341 | if [ -f ${WORKDIR}/busybox-syslog.default ] ; then | 341 | if [ -f ${UNPACKDIR}/busybox-syslog.default ] ; then |
342 | install -d ${D}${sysconfdir}/default | 342 | install -d ${D}${sysconfdir}/default |
343 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog | 343 | install -m 0644 ${UNPACKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog |
344 | fi | 344 | fi |
345 | fi | 345 | fi |
346 | fi | 346 | fi |
diff --git a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch index 4635250170..ceb3ad7250 100644 --- a/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch +++ b/meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch | |||
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are | |||
5 | returned for the hostname part | 5 | returned for the hostname part |
6 | 6 | ||
7 | CVE: CVE-2022-28391 | 7 | CVE: CVE-2022-28391 |
8 | Upstream-Status: Pending | 8 | Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] |
9 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> | 9 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> |
10 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | 10 | Signed-off-by: Steve Sakoman <steve@sakoman.com> |
11 | --- | 11 | --- |
diff --git a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch index 0d7409ddc3..1dbc3388a4 100644 --- a/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch +++ b/meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch | |||
@@ -8,7 +8,7 @@ Otherwise, terminal sequences can be injected, which enables various terminal in | |||
8 | attacks from DNS results. | 8 | attacks from DNS results. |
9 | 9 | ||
10 | CVE: CVE-2022-28391 | 10 | CVE: CVE-2022-28391 |
11 | Upstream-Status: Pending | 11 | Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] |
12 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> | 12 | Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> |
13 | Signed-off-by: Steve Sakoman <steve@sakoman.com> | 13 | Signed-off-by: Steve Sakoman <steve@sakoman.com> |
14 | --- | 14 | --- |
diff --git a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch deleted file mode 100644 index 948932a3e8..0000000000 --- a/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anders Darander <anders@chargestorm.se> | ||
3 | Date: Thu, 3 Nov 2011 08:51:31 +0100 | ||
4 | Subject: [PATCH] busybox-udhcpc-no_deconfig.patch | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Add a new option -D to the udhcpc client that allows for | ||
9 | dhcp renewal to occur without having to down the interface | ||
10 | in the process. | ||
11 | |||
12 | Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com> | ||
13 | |||
14 | Updated to latest Busybox 1.17.3 | ||
15 | |||
16 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
17 | |||
18 | Updated to Busybox 1.18.4 | ||
19 | option spec is changed | ||
20 | |||
21 | Signed-off-by: Qing He <qing.he@intel.com> | ||
22 | |||
23 | Updated to Busybox 1.19.3 | ||
24 | |||
25 | Signed-off-by: Anders Darander <anders@chargestorm.se> | ||
26 | |||
27 | Fixed options -b, -a and -P. | ||
28 | |||
29 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
30 | --- | ||
31 | networking/udhcp/dhcpc.c | 29 ++++++++++++++++------ | ||
32 | 1 file changed, 21 insertions(+), 8 deletions(-) | ||
33 | |||
34 | Index: busybox-1.34.0/networking/udhcp/dhcpc.c | ||
35 | =================================================================== | ||
36 | --- busybox-1.34.0.orig/networking/udhcp/dhcpc.c | ||
37 | +++ busybox-1.34.0/networking/udhcp/dhcpc.c | ||
38 | @@ -48,6 +48,8 @@ | ||
39 | }; | ||
40 | #endif | ||
41 | |||
42 | +/* option whether to down the interface when reconfiguring */ | ||
43 | +static int allow_deconfig = 1; | ||
44 | |||
45 | /* "struct client_data_t client_data" is in bb_common_bufsiz1 */ | ||
46 | |||
47 | @@ -100,8 +102,10 @@ | ||
48 | OPT_x = 1 << 16, | ||
49 | OPT_f = 1 << 17, | ||
50 | OPT_B = 1 << 18, | ||
51 | + OPT_D = 1 << 19, | ||
52 | /* The rest has variable bit positions, need to be clever */ | ||
53 | OPTBIT_B = 18, | ||
54 | + OPTBIT_D = 19, | ||
55 | USE_FOR_MMU( OPTBIT_b,) | ||
56 | IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) | ||
57 | IF_FEATURE_UDHCP_PORT( OPTBIT_P,) | ||
58 | @@ -587,7 +591,8 @@ | ||
59 | |||
60 | static void d4_run_script_deconfig(void) | ||
61 | { | ||
62 | - d4_run_script(NULL, "deconfig"); | ||
63 | + if (allow_deconfig) | ||
64 | + d4_run_script(NULL, "deconfig"); | ||
65 | } | ||
66 | |||
67 | /*** Sending/receiving packets ***/ | ||
68 | @@ -1244,7 +1249,7 @@ | ||
69 | /* Parse command line */ | ||
70 | opt = getopt32long(argv, "^" | ||
71 | /* O,x: list; -T,-t,-A take numeric param */ | ||
72 | - "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB" | ||
73 | + "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD" | ||
74 | USE_FOR_MMU("b") | ||
75 | IF_FEATURE_UDHCPC_ARPING("a::") | ||
76 | IF_FEATURE_UDHCP_PORT("P:") | ||
77 | @@ -1361,6 +1366,10 @@ | ||
78 | logmode |= LOGMODE_SYSLOG; | ||
79 | } | ||
80 | |||
81 | + if (opt & OPT_D) { | ||
82 | + allow_deconfig = 0; | ||
83 | + } | ||
84 | + | ||
85 | /* Create pidfile */ | ||
86 | write_pidfile(client_data.pidfile); | ||
87 | /* Goes to stdout (unless NOMMU) and possibly syslog */ | ||
diff --git a/meta/recipes-core/busybox/busybox_1.36.1.bb b/meta/recipes-core/busybox/busybox_1.36.1.bb index 06eb9eb999..373a6b7781 100644 --- a/meta/recipes-core/busybox/busybox_1.36.1.bb +++ b/meta/recipes-core/busybox/busybox_1.36.1.bb | |||
@@ -2,7 +2,6 @@ require busybox.inc | |||
2 | 2 | ||
3 | SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 3 | SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
4 | file://0001-depmod-Ignore-.debug-directories.patch \ | 4 | file://0001-depmod-Ignore-.debug-directories.patch \ |
5 | file://busybox-udhcpc-no_deconfig.patch \ | ||
6 | file://find-touchscreen.sh \ | 5 | file://find-touchscreen.sh \ |
7 | file://busybox-cron \ | 6 | file://busybox-cron \ |
8 | file://busybox-httpd \ | 7 | file://busybox-httpd \ |
diff --git a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch index 66f9a716c9..97a6357ab9 100644 --- a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch +++ b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Subject: local.mk: fix cross compiling problem | 1 | From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 26 Dec 2016 16:10:35 +0800 | ||
4 | Subject: [PATCH] local.mk: fix cross compiling problem | ||
2 | 5 | ||
3 | We meet the following error when cross compiling. | 6 | We meet the following error when cross compiling. |
4 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. | 7 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. |
@@ -12,15 +15,12 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 16 | ||
14 | diff --git a/src/local.mk b/src/local.mk | 17 | diff --git a/src/local.mk b/src/local.mk |
15 | index 36dfa4e..c5898cc 100644 | 18 | index 96ee941..cdd47d6 100644 |
16 | --- a/src/local.mk | 19 | --- a/src/local.mk |
17 | +++ b/src/local.mk | 20 | +++ b/src/local.mk |
18 | @@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@ | 21 | @@ -704,4 +704,4 @@ cu_install_program = @INSTALL@ |
19 | else | 22 | else |
20 | cu_install_program = src/ginstall | 23 | cu_install_program = src/ginstall |
21 | endif | 24 | endif |
22 | -INSTALL = $(cu_install_program) -c | 25 | -INSTALL = $(cu_install_program) -c |
23 | +INSTALL_PROGRAM = $(cu_install_program) | 26 | +INSTALL_PROGRAM = $(cu_install_program) |
24 | -- | ||
25 | 2.1.0 | ||
26 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/0001-posixtm-pacify-clang-18.patch b/meta/recipes-core/coreutils/coreutils/0001-posixtm-pacify-clang-18.patch deleted file mode 100644 index e6c84be3c4..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-posixtm-pacify-clang-18.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 67c298c36f69b6906840b7584be06b7b5f33f829 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Tue, 16 Jan 2024 17:21:08 -0800 | ||
4 | Subject: [PATCH] posixtm: pacify clang 18 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Problem reported by Khem Raj in: | ||
10 | https://lists.gnu.org/r/bug-gnulib/2024-01/msg00045.html | ||
11 | * lib/posixtm.c (posixtime): Pacify clang 18 by converting bool to int. | ||
12 | Arguably this is a bug in draft C2x, since the non-pointer args to | ||
13 | ckd_add should promote just like any other expressions do; | ||
14 | but that’s not clang’s fault. | ||
15 | |||
16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gnulib/2024-01/msg00046.html] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | ChangeLog | 10 ++++++++++ | ||
20 | lib/posixtm.c | 2 +- | ||
21 | 2 files changed, 11 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/lib/posixtm.c b/lib/posixtm.c | ||
24 | index ef9f55f873..a072c7cad0 100644 | ||
25 | --- a/lib/posixtm.c | ||
26 | +++ b/lib/posixtm.c | ||
27 | @@ -191,7 +191,7 @@ posixtime (time_t *p, const char *s, unsigned int syntax_bits) | ||
28 | | (tm0.tm_min ^ tm1.tm_min) | ||
29 | | (tm0.tm_sec ^ tm1.tm_sec))) | ||
30 | { | ||
31 | - if (ckd_add (&t, t, leapsec)) | ||
32 | + if (ckd_add (&t, t, +leapsec)) | ||
33 | return false; | ||
34 | *p = t; | ||
35 | return true; | ||
36 | -- | ||
37 | 2.43.0 | ||
38 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch b/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch deleted file mode 100644 index 0c68e2dce0..0000000000 --- a/meta/recipes-core/coreutils/coreutils/CVE-2024-0684.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From c4c5ed8f4e9cd55a12966d4f520e3a13101637d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Tue, 16 Jan 2024 13:48:32 -0800 | ||
4 | Subject: [PATCH 1/1] split: do not shrink hold buffer | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=utf8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * src/split.c (line_bytes_split): Do not shrink hold buffer. | ||
10 | If it’s large for this batch it’s likely to be large for the next | ||
11 | batch, and for ‘split’ it’s not worth the complexity/CPU hassle to | ||
12 | shrink it. Do not assume hold_size can be bufsize. | ||
13 | |||
14 | CVE: CVE-2024-0684 | ||
15 | Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c4c5ed8f4e9cd55a12966d4f520e3a13101637d9] | ||
16 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | ||
17 | --- | ||
18 | src/split.c | 3 --- | ||
19 | 1 file changed, 3 deletions(-) | ||
20 | |||
21 | diff --git a/src/split.c b/src/split.c | ||
22 | index 64020c859..037960a59 100644 | ||
23 | --- a/src/split.c | ||
24 | +++ b/src/split.c | ||
25 | @@ -809,10 +809,7 @@ line_bytes_split (intmax_t n_bytes, char *buf, idx_t bufsize) | ||
26 | { | ||
27 | cwrite (n_out == 0, hold, n_hold); | ||
28 | n_out += n_hold; | ||
29 | - if (n_hold > bufsize) | ||
30 | - hold = xirealloc (hold, bufsize); | ||
31 | n_hold = 0; | ||
32 | - hold_size = bufsize; | ||
33 | } | ||
34 | |||
35 | /* Output to eol if present. */ | ||
36 | -- | ||
37 | 2.11.4.GIT | ||
38 | |||
39 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch index 1a8a9b9983..718de0ab78 100644 --- a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001 | 1 | From f53ffb5b27ab7d4a4c62df00ebd6a1a6936d1709 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 3 Aug 2011 14:12:30 -0700 | 3 | Date: Wed, 3 Aug 2011 14:12:30 -0700 |
4 | Subject: [PATCH] coreutils: Fix build on uclibc | 4 | Subject: [PATCH] coreutils: Fix build on uclibc |
@@ -12,16 +12,15 @@ and make life easier for cross compilation process. | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | 13 | ||
14 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | 14 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] |
15 | |||
16 | --- | 15 | --- |
17 | m4/getloadavg.m4 | 12 ------------ | 16 | m4/getloadavg.m4 | 12 ------------ |
18 | 1 file changed, 12 deletions(-) | 17 | 1 file changed, 12 deletions(-) |
19 | 18 | ||
20 | diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 | 19 | diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 |
21 | index 8e96965..63782a2 100644 | 20 | index 9d0236f..68f7c52 100644 |
22 | --- a/m4/getloadavg.m4 | 21 | --- a/m4/getloadavg.m4 |
23 | +++ b/m4/getloadavg.m4 | 22 | +++ b/m4/getloadavg.m4 |
24 | @@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [], | 23 | @@ -46,18 +46,6 @@ if test $ac_cv_func_getloadavg != yes; then |
25 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) | 24 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) |
26 | fi | 25 | fi |
27 | 26 | ||
diff --git a/meta/recipes-core/coreutils/coreutils_9.4.bb b/meta/recipes-core/coreutils/coreutils_9.5.bb index fc51adcd5b..9a5f836ebe 100644 --- a/meta/recipes-core/coreutils/coreutils_9.4.bb +++ b/meta/recipes-core/coreutils/coreutils_9.5.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/" | |||
6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" | 6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" |
7 | LICENSE = "GPL-3.0-or-later" | 7 | LICENSE = "GPL-3.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ |
9 | file://src/ls.c;beginline=1;endline=15;md5=b720a8b317035d66c555fc6d89e3674c \ | 9 | file://src/ls.c;beginline=1;endline=15;md5=9ac94aaed7fd46fd8df7147a9e3410cb \ |
10 | " | 10 | " |
11 | DEPENDS = "gmp libcap" | 11 | DEPENDS = "gmp libcap" |
12 | DEPENDS:class-native = "" | 12 | DEPENDS:class-native = "" |
@@ -16,14 +16,12 @@ inherit autotools gettext texinfo | |||
16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 16 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
17 | file://remove-usr-local-lib-from-m4.patch \ | 17 | file://remove-usr-local-lib-from-m4.patch \ |
18 | file://0001-local.mk-fix-cross-compiling-problem.patch \ | 18 | file://0001-local.mk-fix-cross-compiling-problem.patch \ |
19 | file://0001-posixtm-pacify-clang-18.patch \ | ||
20 | file://CVE-2024-0684.patch \ | ||
21 | file://run-ptest \ | 19 | file://run-ptest \ |
22 | " | 20 | " |
23 | SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52" | 21 | SRC_URI[sha256sum] = "cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a" |
24 | 22 | ||
25 | # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 | 23 | # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 |
26 | # | 24 | # |
27 | CVE_STATUS[CVE-2016-2781] = "disputed: runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue." | 25 | CVE_STATUS[CVE-2016-2781] = "disputed: runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue." |
28 | 26 | ||
29 | EXTRA_OECONF:class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" | 27 | EXTRA_OECONF:class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" |
@@ -169,7 +167,7 @@ BBCLASSEXTEND = "native nativesdk" | |||
169 | 167 | ||
170 | inherit ptest | 168 | inherit ptest |
171 | 169 | ||
172 | RDEPENDS:${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow" | 170 | RDEPENDS:${PN}-ptest += "bash findutils gawk make perl perl-modules python3-core sed shadow" |
173 | 171 | ||
174 | # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy | 172 | # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy |
175 | # may need tweaking if DEPENDS changes | 173 | # may need tweaking if DEPENDS changes |
diff --git a/meta/recipes-core/dbus/dbus_1.14.10.bb b/meta/recipes-core/dbus/dbus_1.14.10.bb index 4fe7af7512..6a08f6984e 100644 --- a/meta/recipes-core/dbus/dbus_1.14.10.bb +++ b/meta/recipes-core/dbus/dbus_1.14.10.bb | |||
@@ -129,8 +129,8 @@ do_install() { | |||
129 | 129 | ||
130 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 130 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
131 | install -d ${D}${sysconfdir}/init.d | 131 | install -d ${D}${sysconfdir}/init.d |
132 | sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh | 132 | sed 's:@bindir@:${bindir}:' < ${UNPACKDIR}/dbus-1.init > ${S}/dbus-1.init.sh |
133 | install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 | 133 | install -m 0755 ${S}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 |
134 | install -d ${D}${sysconfdir}/default/volatiles | 134 | install -d ${D}${sysconfdir}/default/volatiles |
135 | echo "d messagebus messagebus 0755 /run/dbus none" \ | 135 | echo "d messagebus messagebus 0755 /run/dbus none" \ |
136 | > ${D}${sysconfdir}/default/volatiles/99_dbus | 136 | > ${D}${sysconfdir}/default/volatiles/99_dbus |
diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch index 99adcfd770..c74f09e484 100644 --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch | |||
@@ -2,14 +2,14 @@ Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h | |||
2 | 2 | ||
3 | Upstream-Status: Inappropriate [configuration] | 3 | Upstream-Status: Inappropriate [configuration] |
4 | --- | 4 | --- |
5 | default_options.h | 2 +- | 5 | src/default_options.h | 2 +- |
6 | 1 file changed, 1 insertion(+), 1 deletion(-) | 6 | 1 file changed, 1 insertion(+), 1 deletion(-) |
7 | 7 | ||
8 | diff --git a/default_options.h b/default_options.h | 8 | diff --git a/src/default_options.h b/src/default_options.h |
9 | index 349338c..5ffac25 100644 | 9 | index 6e970bb..ccc8b47 100644 |
10 | --- a/default_options.h | 10 | --- a/src/default_options.h |
11 | +++ b/default_options.h | 11 | +++ b/src/default_options.h |
12 | @@ -289,7 +289,7 @@ group1 in Dropbear server too */ | 12 | @@ -311,7 +311,7 @@ group1 in Dropbear server too */ |
13 | 13 | ||
14 | /* The command to invoke for xauth when using X11 forwarding. | 14 | /* The command to invoke for xauth when using X11 forwarding. |
15 | * "-q" for quiet */ | 15 | * "-q" for quiet */ |
@@ -19,5 +19,5 @@ index 349338c..5ffac25 100644 | |||
19 | 19 | ||
20 | /* If you want to enable running an sftp server (such as the one included with | 20 | /* If you want to enable running an sftp server (such as the one included with |
21 | -- | 21 | -- |
22 | 2.25.1 | 22 | 2.34.1 |
23 | 23 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch index 32c3ea5f08..fe667ddc25 100644 --- a/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch +++ b/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch | |||
@@ -11,13 +11,13 @@ Upstream-Status: Pending | |||
11 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | 11 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
13 | --- | 13 | --- |
14 | default_options.h | 4 ++-- | 14 | src/default_options.h | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/default_options.h b/default_options.h | 17 | diff --git a/src/default_options.h b/src/default_options.h |
18 | index 0e3d027..349338c 100644 | 18 | index 0e3d027..349338c 100644 |
19 | --- a/default_options.h | 19 | --- a/src/default_options.h |
20 | +++ b/default_options.h | 20 | +++ b/src/default_options.h |
21 | @@ -210,7 +210,7 @@ group1 in Dropbear server too */ | 21 | @@ -210,7 +210,7 @@ group1 in Dropbear server too */ |
22 | 22 | ||
23 | /* Authentication Types - at least one required. | 23 | /* Authentication Types - at least one required. |
diff --git a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch index deed78ffb9..f54f634a4e 100644 --- a/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch +++ b/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch | |||
@@ -12,13 +12,13 @@ Signed-off-by: Maxin B. John <maxin.john@enea.com> | |||
12 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | 12 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> |
13 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 13 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
14 | --- | 14 | --- |
15 | svr-authpam.c | 2 +- | 15 | src/svr-authpam.c | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/svr-authpam.c b/svr-authpam.c | 18 | diff --git a/srec/svr-authpam.c b/src/svr-authpam.c |
19 | index d201bc9..165ec5c 100644 | 19 | index d201bc9..165ec5c 100644 |
20 | --- a/svr-authpam.c | 20 | --- a/src/svr-authpam.c |
21 | +++ b/svr-authpam.c | 21 | +++ b/src/svr-authpam.c |
22 | @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) { | 22 | @@ -223,7 +223,7 @@ void svr_auth_pam(int valid_user) { |
23 | } | 23 | } |
24 | 24 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch b/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch deleted file mode 100644 index ec50d69816..0000000000 --- a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch +++ /dev/null | |||
@@ -1,144 +0,0 @@ | |||
1 | From beba892bc0d4e4ded4d667ab1d2a94f4d75109a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: czurnieden <czurnieden@gmx.de> | ||
3 | Date: Fri, 8 Sep 2023 10:07:32 +0000 | ||
4 | Subject: [PATCH] Fix possible integer overflow | ||
5 | |||
6 | CVE: CVE-2023-36328 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/libtom/libtommath/commit/beba892bc0d4e4ded4d667ab1d2a94f4d75109a9] | ||
9 | |||
10 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
11 | --- | ||
12 | libtommath/bn_mp_2expt.c | 4 ++++ | ||
13 | libtommath/bn_mp_grow.c | 4 ++++ | ||
14 | libtommath/bn_mp_init_size.c | 5 +++++ | ||
15 | libtommath/bn_mp_mul_2d.c | 4 ++++ | ||
16 | libtommath/bn_s_mp_mul_digs.c | 4 ++++ | ||
17 | libtommath/bn_s_mp_mul_digs_fast.c | 4 ++++ | ||
18 | libtommath/bn_s_mp_mul_high_digs.c | 4 ++++ | ||
19 | libtommath/bn_s_mp_mul_high_digs_fast.c | 4 ++++ | ||
20 | 8 files changed, 33 insertions(+) | ||
21 | |||
22 | diff --git a/libtommath/bn_mp_2expt.c b/libtommath/bn_mp_2expt.c | ||
23 | index 0ae3df1..ca6fbc3 100644 | ||
24 | --- a/libtommath/bn_mp_2expt.c | ||
25 | +++ b/libtommath/bn_mp_2expt.c | ||
26 | @@ -12,6 +12,10 @@ mp_err mp_2expt(mp_int *a, int b) | ||
27 | { | ||
28 | mp_err err; | ||
29 | |||
30 | + if (b < 0) { | ||
31 | + return MP_VAL; | ||
32 | + } | ||
33 | + | ||
34 | /* zero a as per default */ | ||
35 | mp_zero(a); | ||
36 | |||
37 | diff --git a/libtommath/bn_mp_grow.c b/libtommath/bn_mp_grow.c | ||
38 | index 9e904c5..2b16826 100644 | ||
39 | --- a/libtommath/bn_mp_grow.c | ||
40 | +++ b/libtommath/bn_mp_grow.c | ||
41 | @@ -9,6 +9,10 @@ mp_err mp_grow(mp_int *a, int size) | ||
42 | int i; | ||
43 | mp_digit *tmp; | ||
44 | |||
45 | + if (size < 0) { | ||
46 | + return MP_VAL; | ||
47 | + } | ||
48 | + | ||
49 | /* if the alloc size is smaller alloc more ram */ | ||
50 | if (a->alloc < size) { | ||
51 | /* reallocate the array a->dp | ||
52 | diff --git a/libtommath/bn_mp_init_size.c b/libtommath/bn_mp_init_size.c | ||
53 | index d622687..5fefa96 100644 | ||
54 | --- a/libtommath/bn_mp_init_size.c | ||
55 | +++ b/libtommath/bn_mp_init_size.c | ||
56 | @@ -6,6 +6,11 @@ | ||
57 | /* init an mp_init for a given size */ | ||
58 | mp_err mp_init_size(mp_int *a, int size) | ||
59 | { | ||
60 | + | ||
61 | + if (size < 0) { | ||
62 | + return MP_VAL; | ||
63 | + } | ||
64 | + | ||
65 | size = MP_MAX(MP_MIN_PREC, size); | ||
66 | |||
67 | /* alloc mem */ | ||
68 | diff --git a/libtommath/bn_mp_mul_2d.c b/libtommath/bn_mp_mul_2d.c | ||
69 | index 87354de..2744163 100644 | ||
70 | --- a/libtommath/bn_mp_mul_2d.c | ||
71 | +++ b/libtommath/bn_mp_mul_2d.c | ||
72 | @@ -9,6 +9,10 @@ mp_err mp_mul_2d(const mp_int *a, int b, mp_int *c) | ||
73 | mp_digit d; | ||
74 | mp_err err; | ||
75 | |||
76 | + if (b < 0) { | ||
77 | + return MP_VAL; | ||
78 | + } | ||
79 | + | ||
80 | /* copy */ | ||
81 | if (a != c) { | ||
82 | if ((err = mp_copy(a, c)) != MP_OKAY) { | ||
83 | diff --git a/libtommath/bn_s_mp_mul_digs.c b/libtommath/bn_s_mp_mul_digs.c | ||
84 | index 64509d4..2d2f5b0 100644 | ||
85 | --- a/libtommath/bn_s_mp_mul_digs.c | ||
86 | +++ b/libtommath/bn_s_mp_mul_digs.c | ||
87 | @@ -16,6 +16,10 @@ mp_err s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
88 | mp_word r; | ||
89 | mp_digit tmpx, *tmpt, *tmpy; | ||
90 | |||
91 | + if (digs < 0) { | ||
92 | + return MP_VAL; | ||
93 | + } | ||
94 | + | ||
95 | /* can we use the fast multiplier? */ | ||
96 | if ((digs < MP_WARRAY) && | ||
97 | (MP_MIN(a->used, b->used) < MP_MAXFAST)) { | ||
98 | diff --git a/libtommath/bn_s_mp_mul_digs_fast.c b/libtommath/bn_s_mp_mul_digs_fast.c | ||
99 | index b2a287b..d6dd3cc 100644 | ||
100 | --- a/libtommath/bn_s_mp_mul_digs_fast.c | ||
101 | +++ b/libtommath/bn_s_mp_mul_digs_fast.c | ||
102 | @@ -26,6 +26,10 @@ mp_err s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
103 | mp_digit W[MP_WARRAY]; | ||
104 | mp_word _W; | ||
105 | |||
106 | + if (digs < 0) { | ||
107 | + return MP_VAL; | ||
108 | + } | ||
109 | + | ||
110 | /* grow the destination as required */ | ||
111 | if (c->alloc < digs) { | ||
112 | if ((err = mp_grow(c, digs)) != MP_OKAY) { | ||
113 | diff --git a/libtommath/bn_s_mp_mul_high_digs.c b/libtommath/bn_s_mp_mul_high_digs.c | ||
114 | index 2bb2a50..c9dd355 100644 | ||
115 | --- a/libtommath/bn_s_mp_mul_high_digs.c | ||
116 | +++ b/libtommath/bn_s_mp_mul_high_digs.c | ||
117 | @@ -15,6 +15,10 @@ mp_err s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) | ||
118 | mp_word r; | ||
119 | mp_digit tmpx, *tmpt, *tmpy; | ||
120 | |||
121 | + if (digs < 0) { | ||
122 | + return MP_VAL; | ||
123 | + } | ||
124 | + | ||
125 | /* can we use the fast multiplier? */ | ||
126 | if (MP_HAS(S_MP_MUL_HIGH_DIGS_FAST) | ||
127 | && ((a->used + b->used + 1) < MP_WARRAY) | ||
128 | diff --git a/libtommath/bn_s_mp_mul_high_digs_fast.c b/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
129 | index a2c4fb6..afe3e4b 100644 | ||
130 | --- a/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
131 | +++ b/libtommath/bn_s_mp_mul_high_digs_fast.c | ||
132 | @@ -19,6 +19,10 @@ mp_err s_mp_mul_high_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int | ||
133 | mp_digit W[MP_WARRAY]; | ||
134 | mp_word _W; | ||
135 | |||
136 | + if (digs < 0) { | ||
137 | + return MP_VAL; | ||
138 | + } | ||
139 | + | ||
140 | /* grow the destination as required */ | ||
141 | pa = a->used + b->used; | ||
142 | if (c->alloc < pa) { | ||
143 | -- | ||
144 | 2.35.5 | ||
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch index 5c60868ed8..f998caa255 100644 --- a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch +++ b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch | |||
@@ -10,13 +10,13 @@ and we want to support the stong algorithms. | |||
10 | Upstream-Status: Inappropriate [configuration] | 10 | Upstream-Status: Inappropriate [configuration] |
11 | Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com> | 11 | Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com> |
12 | --- | 12 | --- |
13 | default_options.h | 2 +- | 13 | src/default_options.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/default_options.h b/default_options.h | 16 | diff --git a/src/default_options.h b/src/default_options.h |
17 | index d417588..bc5200f 100644 | 17 | index d417588..bc5200f 100644 |
18 | --- a/default_options.h | 18 | --- a/src/default_options.h |
19 | +++ b/default_options.h | 19 | +++ b/src/default_options.h |
20 | @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */ | 20 | @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */ |
21 | * Small systems should generally include either curve25519 or ecdh for performance. | 21 | * Small systems should generally include either curve25519 or ecdh for performance. |
22 | * curve25519 is less widely supported but is faster | 22 | * curve25519 is less widely supported but is faster |
diff --git a/meta/recipes-core/dropbear/dropbear_2022.83.bb b/meta/recipes-core/dropbear/dropbear_2024.84.bb index 528eff1a10..3ea64b13d0 100644 --- a/meta/recipes-core/dropbear/dropbear_2022.83.bb +++ b/meta/recipes-core/dropbear/dropbear_2024.84.bb | |||
@@ -21,10 +21,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ | |||
21 | file://dropbear.default \ | 21 | file://dropbear.default \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
23 | ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ | 23 | ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \ |
24 | file://CVE-2023-36328.patch \ | ||
25 | " | 24 | " |
26 | 25 | ||
27 | SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b" | 26 | SRC_URI[sha256sum] = "16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009" |
28 | 27 | ||
29 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ | 28 | PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ |
30 | file://0006-dropbear-configuration-file.patch \ | 29 | file://0006-dropbear-configuration-file.patch \ |
@@ -77,7 +76,7 @@ do_install() { | |||
77 | ${D}${sbindir} \ | 76 | ${D}${sbindir} \ |
78 | ${D}${localstatedir} | 77 | ${D}${localstatedir} |
79 | 78 | ||
80 | install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear | 79 | install -m 0644 ${UNPACKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear |
81 | 80 | ||
82 | install -m 0755 dropbearmulti ${D}${sbindir}/ | 81 | install -m 0755 dropbearmulti ${D}${sbindir}/ |
83 | 82 | ||
@@ -95,18 +94,18 @@ do_install() { | |||
95 | -e 's,/usr/sbin,${sbindir},g' \ | 94 | -e 's,/usr/sbin,${sbindir},g' \ |
96 | -e 's,/var,${localstatedir},g' \ | 95 | -e 's,/var,${localstatedir},g' \ |
97 | -e 's,/usr/bin,${bindir},g' \ | 96 | -e 's,/usr/bin,${bindir},g' \ |
98 | -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear | 97 | -e 's,/usr,${prefix},g' ${UNPACKDIR}/init > ${D}${sysconfdir}/init.d/dropbear |
99 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 98 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
100 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 99 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
101 | install -d ${D}${sysconfdir}/pam.d | 100 | install -d ${D}${sysconfdir}/pam.d |
102 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ | 101 | install -m 0644 ${UNPACKDIR}/dropbear ${D}${sysconfdir}/pam.d/ |
103 | fi | 102 | fi |
104 | 103 | ||
105 | # deal with systemd unit files | 104 | # deal with systemd unit files |
106 | install -d ${D}${systemd_system_unitdir} | 105 | install -d ${D}${systemd_system_unitdir} |
107 | install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} | 106 | install -m 0644 ${UNPACKDIR}/dropbearkey.service ${D}${systemd_system_unitdir} |
108 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir} | 107 | install -m 0644 ${UNPACKDIR}/dropbear@.service ${D}${systemd_system_unitdir} |
109 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir} | 108 | install -m 0644 ${UNPACKDIR}/dropbear.socket ${D}${systemd_system_unitdir} |
110 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 109 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
111 | -e 's,@BINDIR@,${bindir},g' \ | 110 | -e 's,@BINDIR@,${bindir},g' \ |
112 | -e 's,@SBINDIR@,${sbindir},g' \ | 111 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta/recipes-core/ell/ell_0.63.bb b/meta/recipes-core/ell/ell_0.64.bb index 7ecb63a478..c4f16905fd 100644 --- a/meta/recipes-core/ell/ell_0.63.bb +++ b/meta/recipes-core/ell/ell_0.64.bb | |||
@@ -15,7 +15,7 @@ DEPENDS = "dbus" | |||
15 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
16 | 16 | ||
17 | SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" | 17 | SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz" |
18 | SRC_URI[sha256sum] = "7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965" | 18 | SRC_URI[sha256sum] = "760f3901078409f66cadf1bb24c8bdc60f13d53f6dd66b88631221d2494f8405" |
19 | 19 | ||
20 | do_configure:prepend () { | 20 | do_configure:prepend () { |
21 | mkdir -p ${S}/build-aux | 21 | mkdir -p ${S}/build-aux |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch b/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch new file mode 100644 index 0000000000..cd5ac287c3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From bb11d1a4ae77d93ec0743e54077cf0f990243fa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Thu, 28 Mar 2024 16:27:09 +0000 | ||
4 | Subject: [PATCH] Skip /timeout/rounding test | ||
5 | |||
6 | This test is sensitive to load because it expects certain timeout operations | ||
7 | to succeed in specific time periods. Whilst these timeouts are fairly large, | ||
8 | they're still exceeded inside a qemu on a loaded system. | ||
9 | |||
10 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=14464 | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-specific] | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | --- | ||
15 | glib/tests/timeout.c | 1 - | ||
16 | 1 file changed, 1 deletion(-) | ||
17 | |||
18 | diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c | ||
19 | index 1ae3f3a34..85a715b0f 100644 | ||
20 | --- a/glib/tests/timeout.c | ||
21 | +++ b/glib/tests/timeout.c | ||
22 | @@ -214,7 +214,6 @@ main (int argc, char *argv[]) | ||
23 | g_test_add_func ("/timeout/seconds-once", test_seconds_once); | ||
24 | g_test_add_func ("/timeout/weeks-overflow", test_weeks_overflow); | ||
25 | g_test_add_func ("/timeout/far-future-ready-time", test_far_future_ready_time); | ||
26 | - g_test_add_func ("/timeout/rounding", test_rounding); | ||
27 | |||
28 | return g_test_run (); | ||
29 | } | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb index f0fd057be7..b1669ead75 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
17 | file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ | 17 | file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ |
18 | file://memory-monitor.patch \ | 18 | file://memory-monitor.patch \ |
19 | file://fix-regex.patch \ | 19 | file://fix-regex.patch \ |
20 | file://skip-timeout.patch \ | ||
20 | " | 21 | " |
21 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | 22 | SRC_URI:append:class-native = " file://relocate-modules.patch \ |
22 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 23 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index b9516e77f0..91a3f5bcd5 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc | |||
@@ -2,7 +2,7 @@ SUMMARY = "GLIBC (GNU C Library)" | |||
2 | DESCRIPTION = "The GNU C Library is used as the system C library in most systems with the Linux kernel." | 2 | DESCRIPTION = "The GNU C Library is used as the system C library in most systems with the Linux kernel." |
3 | HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" | 3 | HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | LICENSE = "GPL-2.0-only & LGPL-2.1-only" | 5 | LICENSE = "GPL-2.0-only & LGPL-2.1-or-later" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ | 7 | LIC_FILES_CHKSUM ?= "file://LICENSES;md5=f77e878d320e99e94ae9a4aea7f491d1 \ |
8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 1ef987be0a..0c5e3b4c3d 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -69,9 +69,9 @@ inherit multilib_header | |||
69 | 69 | ||
70 | do_install() { | 70 | do_install() { |
71 | oe_runmake install_root=${D} install | 71 | oe_runmake install_root=${D} install |
72 | install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf | 72 | install -Dm 0644 ${UNPACKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf |
73 | install -d ${D}${localedir} | 73 | install -d ${D}${localedir} |
74 | make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" | 74 | make -f ${UNPACKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" |
75 | # get rid of some broken files... | 75 | # get rid of some broken files... |
76 | for i in ${GLIBC_BROKEN_LOCALES}; do | 76 | for i in ${GLIBC_BROKEN_LOCALES}; do |
77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED | 77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED |
@@ -101,7 +101,7 @@ do_install() { | |||
101 | install -d ${D}${localstatedir}/db/nscd | 101 | install -d ${D}${localstatedir}/db/nscd |
102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd | 102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd |
103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf | 103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf |
104 | install -m 0755 ${WORKDIR}/makedbs.sh ${D}${localstatedir}/db | 104 | install -m 0755 ${UNPACKDIR}/makedbs.sh ${D}${localstatedir}/db |
105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd | 105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd |
106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf | 106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf |
107 | 107 | ||
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 618a574566..1e4a323d64 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | SRCBRANCH ?= "release/2.39/master" | 1 | SRCBRANCH ?= "release/2.39/master" |
2 | PV = "2.39+git" | 2 | PV = "2.39+git" |
3 | SRCREV_glibc ?= "1b9c1a0047fb26a65a9b2a7b8cd977243f7d353c" | 3 | SRCREV_glibc ?= "273a835fe7c685cc54266bb8b502787bad5e9bae" |
4 | SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" | 4 | SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc" |
5 | 5 | ||
6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" | 6 | GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https" |
diff --git a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb b/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb index be49ca4cb7..b760230aec 100644 --- a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb +++ b/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb | |||
@@ -76,7 +76,7 @@ do_install_ptest_base () { | |||
76 | done | 76 | done |
77 | 77 | ||
78 | install -d ${D}${PTEST_PATH} | 78 | install -d ${D}${PTEST_PATH} |
79 | cp ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/ | 79 | cp ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/ |
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 066c3b1ea2..9bdfa76318 100644 --- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | |||
@@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [ OE-Specific ] | |||
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- | 14 | sysdeps/aarch64/bits/wordsize.h | 11 +++++++++-- |
15 | sysdeps/arm/bits/wordsize.h | 1 + | 15 | sysdeps/arm/bits/wordsize.h | 22 +--------------------- |
16 | 2 files changed, 7 insertions(+), 2 deletions(-) | 16 | 2 files changed, 10 insertions(+), 23 deletions(-) |
17 | create mode 120000 sysdeps/arm/bits/wordsize.h | ||
18 | 17 | ||
19 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h | 18 | diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h |
20 | index 118e59172d..b4b0692eb5 100644 | 19 | index 118e59172d..ff86359fe8 100644 |
21 | --- a/sysdeps/aarch64/bits/wordsize.h | 20 | --- a/sysdeps/aarch64/bits/wordsize.h |
22 | +++ b/sysdeps/aarch64/bits/wordsize.h | 21 | +++ b/sysdeps/aarch64/bits/wordsize.h |
23 | @@ -17,12 +17,16 @@ | 22 | @@ -17,12 +17,19 @@ |
24 | License along with the GNU C Library; if not, see | 23 | License along with the GNU C Library; if not, see |
25 | <https://www.gnu.org/licenses/>. */ | 24 | <https://www.gnu.org/licenses/>. */ |
26 | 25 | ||
@@ -33,12 +32,42 @@ index 118e59172d..b4b0692eb5 100644 | |||
33 | # define __WORDSIZE32_SIZE_ULONG 1 | 32 | # define __WORDSIZE32_SIZE_ULONG 1 |
34 | # define __WORDSIZE32_PTRDIFF_LONG 1 | 33 | # define __WORDSIZE32_PTRDIFF_LONG 1 |
35 | +#else | 34 | +#else |
36 | +# define __WORDSIZE 32 | 35 | +#define __WORDSIZE 32 |
37 | +# define __WORDSIZE32_SIZE_ULONG 0 | 36 | +#define __WORDSIZE_TIME64_COMPAT32 1 |
38 | +# define __WORDSIZE32_PTRDIFF_LONG 0 | 37 | +#define __WORDSIZE32_SIZE_ULONG 0 |
38 | +#define __WORDSIZE32_PTRDIFF_LONG 0 | ||
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | +#ifdef __aarch64__ | ||
41 | #define __WORDSIZE_TIME64_COMPAT32 0 | 42 | #define __WORDSIZE_TIME64_COMPAT32 0 |
43 | +#endif | ||
44 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h | ||
45 | deleted file mode 100644 | ||
46 | index 6ecbfe7c86..0000000000 | ||
47 | --- a/sysdeps/arm/bits/wordsize.h | ||
48 | +++ /dev/null | ||
49 | @@ -1,21 +0,0 @@ | ||
50 | -/* Copyright (C) 1999-2024 Free Software Foundation, Inc. | ||
51 | - This file is part of the GNU C Library. | ||
52 | - | ||
53 | - The GNU C Library is free software; you can redistribute it and/or | ||
54 | - modify it under the terms of the GNU Lesser General Public | ||
55 | - License as published by the Free Software Foundation; either | ||
56 | - version 2.1 of the License, or (at your option) any later version. | ||
57 | - | ||
58 | - The GNU C Library is distributed in the hope that it will be useful, | ||
59 | - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
60 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
61 | - Lesser General Public License for more details. | ||
62 | - | ||
63 | - You should have received a copy of the GNU Lesser General Public | ||
64 | - License along with the GNU C Library; if not, see | ||
65 | - <https://www.gnu.org/licenses/>. */ | ||
66 | - | ||
67 | -#define __WORDSIZE 32 | ||
68 | -#define __WORDSIZE_TIME64_COMPAT32 1 | ||
69 | -#define __WORDSIZE32_SIZE_ULONG 0 | ||
70 | -#define __WORDSIZE32_PTRDIFF_LONG 0 | ||
42 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h | 71 | diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h |
43 | new file mode 120000 | 72 | new file mode 120000 |
44 | index 0000000000..4c4a788ec2 | 73 | index 0000000000..4c4a788ec2 |
diff --git a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch b/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch deleted file mode 100644 index f6523c5498..0000000000 --- a/meta/recipes-core/glibc/glibc/0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | From 73c26018ed0ecd9c807bb363cc2c2ab4aca66a82 Mon Sep 17 00:00:00 2001 | ||
2 | From: Szabolcs Nagy <szabolcs.nagy@arm.com> | ||
3 | Date: Wed, 13 Mar 2024 14:34:14 +0000 | ||
4 | Subject: [PATCH] aarch64: fix check for SVE support in assembler | ||
5 | |||
6 | Due to GCC bug 110901 -mcpu can override -march setting when compiling | ||
7 | asm code and thus a compiler targetting a specific cpu can fail the | ||
8 | configure check even when binutils gas supports SVE. | ||
9 | |||
10 | The workaround is that explicit .arch directive overrides both -mcpu | ||
11 | and -march, and since that's what the actual SVE memcpy uses the | ||
12 | configure check should use that too even if the GCC issue is fixed | ||
13 | independently. | ||
14 | |||
15 | Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=73c26018ed0ecd9c807bb363cc2c2ab4aca66a82] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Reviewed-by: Florian Weimer <fweimer@redhat.com> | ||
18 | --- | ||
19 | sysdeps/aarch64/configure | 5 +++-- | ||
20 | sysdeps/aarch64/configure.ac | 5 +++-- | ||
21 | 2 files changed, 6 insertions(+), 4 deletions(-) | ||
22 | mode change 100644 => 100755 sysdeps/aarch64/configure | ||
23 | |||
24 | diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure | ||
25 | old mode 100644 | ||
26 | new mode 100755 | ||
27 | index ca57edce47..9606137e8d | ||
28 | --- a/sysdeps/aarch64/configure | ||
29 | +++ b/sysdeps/aarch64/configure | ||
30 | @@ -325,9 +325,10 @@ then : | ||
31 | printf %s "(cached) " >&6 | ||
32 | else $as_nop | ||
33 | cat > conftest.s <<\EOF | ||
34 | - ptrue p0.b | ||
35 | + .arch armv8.2-a+sve | ||
36 | + ptrue p0.b | ||
37 | EOF | ||
38 | -if { ac_try='${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&5' | ||
39 | +if { ac_try='${CC-cc} -c conftest.s 1>&5' | ||
40 | { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 | ||
41 | (eval $ac_try) 2>&5 | ||
42 | ac_status=$? | ||
43 | diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac | ||
44 | index 27874eceb4..56d12d661d 100644 | ||
45 | --- a/sysdeps/aarch64/configure.ac | ||
46 | +++ b/sysdeps/aarch64/configure.ac | ||
47 | @@ -90,9 +90,10 @@ LIBC_CONFIG_VAR([aarch64-variant-pcs], [$libc_cv_aarch64_variant_pcs]) | ||
48 | # Check if asm support armv8.2-a+sve | ||
49 | AC_CACHE_CHECK([for SVE support in assembler], [libc_cv_aarch64_sve_asm], [dnl | ||
50 | cat > conftest.s <<\EOF | ||
51 | - ptrue p0.b | ||
52 | + .arch armv8.2-a+sve | ||
53 | + ptrue p0.b | ||
54 | EOF | ||
55 | -if AC_TRY_COMMAND(${CC-cc} -c -march=armv8.2-a+sve conftest.s 1>&AS_MESSAGE_LOG_FD); then | ||
56 | +if AC_TRY_COMMAND(${CC-cc} -c conftest.s 1>&AS_MESSAGE_LOG_FD); then | ||
57 | libc_cv_aarch64_sve_asm=yes | ||
58 | else | ||
59 | libc_cv_aarch64_sve_asm=no | ||
60 | -- | ||
61 | 2.44.0 | ||
62 | |||
diff --git a/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch new file mode 100644 index 0000000000..c0a467fcec --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | glibc: Skip 2 qemu tests that can hang in oe-selftest | ||
2 | |||
3 | qemumips and qemuppc were leaving stale processes behind after | ||
4 | running glibc oe-selftest. During analysis, it was found that | ||
5 | it was due to "tst-scm_rights" and "tst-scm_rights-time64" tests. | ||
6 | Disable them so that there are no stale processes left behind. | ||
7 | |||
8 | [YOCTO #15423] | ||
9 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=15423 | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe-core specific] | ||
12 | Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> | ||
13 | --- | ||
14 | diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile | ||
15 | --- a/sysdeps/unix/sysv/linux/Makefile 2024-03-18 01:15:49.019202881 -0700 | ||
16 | +++ b/sysdeps/unix/sysv/linux/Makefile 2024-03-14 06:26:18.581404107 -0700 | ||
17 | @@ -222,7 +222,6 @@ | ||
18 | tst-process_mrelease \ | ||
19 | tst-quota \ | ||
20 | tst-rlimit-infinity \ | ||
21 | - tst-scm_rights \ | ||
22 | tst-sigtimedwait \ | ||
23 | tst-sync_file_range \ | ||
24 | tst-sysconf-iov_max \ | ||
25 | @@ -233,6 +232,8 @@ | ||
26 | tst-timerfd \ | ||
27 | tst-ttyname-direct \ | ||
28 | tst-ttyname-namespace \ | ||
29 | + # Skip this test to avoid stale qemu process | ||
30 | + # tst-scm_rights \ | ||
31 | # tests | ||
32 | |||
33 | # process_madvise requires CAP_SYS_ADMIN. | ||
34 | @@ -270,9 +271,10 @@ | ||
35 | tst-ntp_gettimex-time64 \ | ||
36 | tst-ppoll-time64 \ | ||
37 | tst-prctl-time64 \ | ||
38 | - tst-scm_rights-time64 \ | ||
39 | tst-sigtimedwait-time64 \ | ||
40 | tst-timerfd-time64 \ | ||
41 | + # Skip this test to avoid stale qemu process | ||
42 | + # tst-scm_rights-time64 \ | ||
43 | # tests-time64 | ||
44 | |||
45 | tests-clone-internal = \ | ||
diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb index b203060064..2484ae1cd9 100644 --- a/meta/recipes-core/glibc/glibc_2.39.bb +++ b/meta/recipes-core/glibc/glibc_2.39.bb | |||
@@ -16,6 +16,10 @@ CVE_STATUS[CVE-2019-1010025] = "disputed: \ | |||
16 | Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow \ | 16 | Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, may allow \ |
17 | easier access for another. 'ASLR bypass itself is not a vulnerability.'" | 17 | easier access for another. 'ASLR bypass itself is not a vulnerability.'" |
18 | 18 | ||
19 | CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS" | ||
20 | CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602" | ||
21 | CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash" | ||
22 | |||
19 | DEPENDS += "gperf-native bison-native" | 23 | DEPENDS += "gperf-native bison-native" |
20 | 24 | ||
21 | NATIVESDKFIXES ?= "" | 25 | NATIVESDKFIXES ?= "" |
@@ -48,7 +52,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ | |||
48 | file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ | 52 | file://0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch \ |
49 | file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ | 53 | file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ |
50 | file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ | 54 | file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \ |
51 | file://0023-aarch64-configure-Pass-mcpu-along-with-march-to-dete.patch \ | 55 | file://0023-qemu-stale-process.patch \ |
52 | " | 56 | " |
53 | S = "${WORKDIR}/git" | 57 | S = "${WORKDIR}/git" |
54 | B = "${WORKDIR}/build-${TARGET_SYS}" | 58 | B = "${WORKDIR}/build-${TARGET_SYS}" |
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb index 16425ea9e4..c7004ab41d 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb | |||
@@ -35,7 +35,7 @@ do_install () { | |||
35 | 35 | ||
36 | # If volatiles are used, then we'll also need /run/network there too. | 36 | # If volatiles are used, then we'll also need /run/network there too. |
37 | install -d ${D}/etc/default/volatiles | 37 | install -d ${D}/etc/default/volatiles |
38 | install -m 0644 ${WORKDIR}/99_network ${D}/etc/default/volatiles | 38 | install -m 0644 ${UNPACKDIR}/99_network ${D}/etc/default/volatiles |
39 | 39 | ||
40 | install -m 0755 ifup ${D}${base_sbindir}/ | 40 | install -m 0755 ifup ${D}${base_sbindir}/ |
41 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown | 41 | ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown |
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 6e222dfaa7..4cf55519cc 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
@@ -26,7 +26,7 @@ inherit core-image setuptools3 features_check | |||
26 | 26 | ||
27 | REQUIRED_DISTRO_FEATURES += "xattr" | 27 | REQUIRED_DISTRO_FEATURES += "xattr" |
28 | 28 | ||
29 | SRCREV ?= "cf69c6843fb62ab2ebee361f3d1a1141f1a6b01a" | 29 | SRCREV ?= "17723c6e34096a53fb186cc70cfc604bb30da8b9" |
30 | SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ | 30 | SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ |
31 | file://Yocto_Build_Appliance.vmx \ | 31 | file://Yocto_Build_Appliance.vmx \ |
32 | file://Yocto_Build_Appliance.vmxf \ | 32 | file://Yocto_Build_Appliance.vmxf \ |
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces index e617fcf69b..3d0f0c6768 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces +++ b/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces | |||
@@ -14,10 +14,11 @@ iface wlan0 inet dhcp | |||
14 | iface atml0 inet dhcp | 14 | iface atml0 inet dhcp |
15 | 15 | ||
16 | # Wired or wireless interfaces including predictable names | 16 | # Wired or wireless interfaces including predictable names |
17 | auto /eth0 | 17 | auto eth0 |
18 | iface eth0 inet dhcp | 18 | iface eth0 inet dhcp |
19 | iface eth1 inet dhcp | 19 | iface eth1 inet dhcp |
20 | 20 | ||
21 | # Busybox ifupdown won't process /en* correctly | ||
21 | auto /en*=eth | 22 | auto /en*=eth |
22 | iface eth inet dhcp | 23 | iface eth inet dhcp |
23 | 24 | ||
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 409b1c0403..49c7fd71b1 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "This package provides high level tools to configure network inter | |||
3 | HOMEPAGE = "http://packages.debian.org/ifupdown" | 3 | HOMEPAGE = "http://packages.debian.org/ifupdown" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "GPL-2.0-only" | 5 | LICENSE = "GPL-2.0-only" |
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" | 6 | LIC_FILES_CHKSUM = "file://${S}/copyright;md5=3dd6192d306f582dee7687da3d8748ab" |
7 | 7 | ||
8 | inherit update-rc.d | 8 | inherit update-rc.d |
9 | 9 | ||
@@ -23,9 +23,9 @@ do_install () { | |||
23 | ${D}${sysconfdir}/network/if-up.d \ | 23 | ${D}${sysconfdir}/network/if-up.d \ |
24 | ${D}${sysconfdir}/network/if-down.d \ | 24 | ${D}${sysconfdir}/network/if-down.d \ |
25 | ${D}${sysconfdir}/network/if-post-down.d | 25 | ${D}${sysconfdir}/network/if-post-down.d |
26 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking | 26 | install -m 0755 ${S}/init ${D}${sysconfdir}/init.d/networking |
27 | install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces | 27 | install -m 0644 ${S}/interfaces ${D}${sysconfdir}/network/interfaces |
28 | install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d | 28 | install -m 0755 ${S}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d |
29 | } | 29 | } |
30 | 30 | ||
31 | do_install:append:qemuall () { | 31 | do_install:append:qemuall () { |
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index 198459f2b2..01d2771e3f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "file://init-boot.sh" | |||
7 | S = "${WORKDIR}" | 7 | S = "${WORKDIR}" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init | 10 | install -m 0755 ${S}/init-boot.sh ${D}/init |
11 | 11 | ||
12 | # Create device nodes expected by some kernels in initramfs | 12 | # Create device nodes expected by some kernels in initramfs |
13 | # before even executing /init. | 13 | # before even executing /init. |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 39ea51ccbd..4dbb56a42d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |||
@@ -26,31 +26,31 @@ do_install() { | |||
26 | install -d ${D}/init.d | 26 | install -d ${D}/init.d |
27 | 27 | ||
28 | # base | 28 | # base |
29 | install -m 0755 ${WORKDIR}/init ${D}/init | 29 | install -m 0755 ${S}/init ${D}/init |
30 | install -m 0755 ${WORKDIR}/nfsrootfs ${D}/init.d/85-nfsrootfs | 30 | install -m 0755 ${S}/nfsrootfs ${D}/init.d/85-nfsrootfs |
31 | install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs | 31 | install -m 0755 ${S}/rootfs ${D}/init.d/90-rootfs |
32 | install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish | 32 | install -m 0755 ${S}/finish ${D}/init.d/99-finish |
33 | 33 | ||
34 | # exec | 34 | # exec |
35 | install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec | 35 | install -m 0755 ${S}/exec ${D}/init.d/89-exec |
36 | 36 | ||
37 | # mdev | 37 | # mdev |
38 | install -m 0755 ${WORKDIR}/mdev ${D}/init.d/01-mdev | 38 | install -m 0755 ${S}/mdev ${D}/init.d/01-mdev |
39 | 39 | ||
40 | # udev | 40 | # udev |
41 | install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev | 41 | install -m 0755 ${S}/udev ${D}/init.d/01-udev |
42 | 42 | ||
43 | # e2fs | 43 | # e2fs |
44 | install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs | 44 | install -m 0755 ${S}/e2fs ${D}/init.d/10-e2fs |
45 | 45 | ||
46 | # debug | 46 | # debug |
47 | install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug | 47 | install -m 0755 ${S}/debug ${D}/init.d/00-debug |
48 | 48 | ||
49 | # lvm | 49 | # lvm |
50 | install -m 0755 ${WORKDIR}/lvm ${D}/init.d/09-lvm | 50 | install -m 0755 ${S}/lvm ${D}/init.d/09-lvm |
51 | 51 | ||
52 | # overlayroot needs to run after rootfs module but before finish | 52 | # overlayroot needs to run after rootfs module but before finish |
53 | install -m 0755 ${WORKDIR}/overlayroot ${D}/init.d/91-overlayroot | 53 | install -m 0755 ${S}/overlayroot ${D}/init.d/91-overlayroot |
54 | 54 | ||
55 | # Create device nodes expected by some kernels in initramfs | 55 | # Create device nodes expected by some kernels in initramfs |
56 | # before even executing /init. | 56 | # before even executing /init. |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb index 847dbc0472..a06e7902ee 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh" | |||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |
10 | 10 | ||
11 | do_install() { | 11 | do_install() { |
12 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 12 | install -m 0755 ${S}/init-live.sh ${D}/init |
13 | install -d ${D}/dev | 13 | install -d ${D}/dev |
14 | mknod -m 622 ${D}/dev/console c 5 1 | 14 | mknod -m 622 ${D}/dev/console c 5 1 |
15 | } | 15 | } |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index b3b991b8fd..e1bf15d293 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | |||
@@ -9,7 +9,7 @@ SRC_URI = "file://init-live.sh" | |||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}" |
10 | 10 | ||
11 | do_install() { | 11 | do_install() { |
12 | install -m 0755 ${WORKDIR}/init-live.sh ${D}/init | 12 | install -m 0755 ${S}/init-live.sh ${D}/init |
13 | install -d ${D}/dev | 13 | install -d ${D}/dev |
14 | mknod -m 622 ${D}/dev/console c 5 1 | 14 | mknod -m 622 ${D}/dev/console c 5 1 |
15 | } | 15 | } |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index 495eccbeda..1225ce4df9 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh | 11 | install -m 0755 ${S}/init-install-efi-testfs.sh ${D}/install-efi.sh |
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index e10faadfbe..ae7d5beb2f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | |||
@@ -10,7 +10,7 @@ RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | |||
10 | S = "${WORKDIR}" | 10 | S = "${WORKDIR}" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh | 13 | install -m 0755 ${S}/init-install-efi.sh ${D}/install-efi.sh |
14 | } | 14 | } |
15 | 15 | ||
16 | # While this package maybe an allarch due to it being a | 16 | # While this package maybe an allarch due to it being a |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index d347e323b3..018911f5d1 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | |||
@@ -8,7 +8,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh | 11 | install -m 0755 ${S}/init-install-testfs.sh ${D}/install.sh |
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 9046d06c02..12b2820318 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |||
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIM | |||
10 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 10 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh | 13 | install -m 0755 ${S}/init-install.sh ${D}/install.sh |
14 | } | 14 | } |
15 | 15 | ||
16 | # While this package maybe an allarch due to it being a | 16 | # While this package maybe an allarch due to it being a |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index b7499644f0..adea2330ae 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb | |||
@@ -11,7 +11,7 @@ S = "${WORKDIR}" | |||
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -d ${D}/init.d | 13 | install -d ${D}/init.d |
14 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh | 14 | install -m 0755 ${S}/init-install-efi.sh ${D}/init.d/install-efi.sh |
15 | } | 15 | } |
16 | 16 | ||
17 | FILES:${PN} = "/init.d/install-efi.sh" | 17 | FILES:${PN} = "/init.d/install-efi.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index 11db7124af..e4ae466d7c 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}" | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -d ${D}/init.d | 18 | install -d ${D}/init.d |
19 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh | 19 | install -m 0755 ${S}/init-install.sh ${D}/init.d/install.sh |
20 | } | 20 | } |
21 | 21 | ||
22 | FILES:${PN} = "/init.d/install.sh" | 22 | FILES:${PN} = "/init.d/install.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 48a779e9aa..4d2c11f452 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb | |||
@@ -13,7 +13,7 @@ S = "${WORKDIR}" | |||
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -d ${D}/init.d | 15 | install -d ${D}/init.d |
16 | install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live | 16 | install -m 0755 ${S}/setup-live ${D}/init.d/80-setup-live |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES:${PN} = "/init.d/80-setup-live" | 19 | FILES:${PN} = "/init.d/80-setup-live" |
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index e61ac554f3..68eeb5e117 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -61,9 +61,9 @@ HALTARGS ?= "-d -f" | |||
61 | VARLIBMOUNTARGS ?= "" | 61 | VARLIBMOUNTARGS ?= "" |
62 | 62 | ||
63 | do_configure() { | 63 | do_configure() { |
64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt | 64 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/halt |
65 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot | 65 | sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${S}/reboot |
66 | sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${WORKDIR}/read-only-rootfs-hook.sh | 66 | sed -i -e "s:SED_VARLIBMOUNTARGS:${VARLIBMOUNTARGS}:g" ${S}/read-only-rootfs-hook.sh |
67 | } | 67 | } |
68 | 68 | ||
69 | do_install () { | 69 | do_install () { |
@@ -84,27 +84,27 @@ do_install () { | |||
84 | # Holds state information pertaining to urandom | 84 | # Holds state information pertaining to urandom |
85 | install -d ${D}${localstatedir}/lib/urandom | 85 | install -d ${D}${localstatedir}/lib/urandom |
86 | 86 | ||
87 | install -m 0644 ${WORKDIR}/functions ${D}${sysconfdir}/init.d | 87 | install -m 0644 ${S}/functions ${D}${sysconfdir}/init.d |
88 | install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d | 88 | install -m 0755 ${S}/bootmisc.sh ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d | 89 | install -m 0755 ${S}/checkroot.sh ${D}${sysconfdir}/init.d |
90 | install -m 0755 ${WORKDIR}/halt ${D}${sysconfdir}/init.d | 90 | install -m 0755 ${S}/halt ${D}${sysconfdir}/init.d |
91 | install -m 0755 ${WORKDIR}/hostname.sh ${D}${sysconfdir}/init.d | 91 | install -m 0755 ${S}/hostname.sh ${D}${sysconfdir}/init.d |
92 | install -m 0755 ${WORKDIR}/mountall.sh ${D}${sysconfdir}/init.d | 92 | install -m 0755 ${S}/mountall.sh ${D}${sysconfdir}/init.d |
93 | install -m 0755 ${WORKDIR}/mountnfs.sh ${D}${sysconfdir}/init.d | 93 | install -m 0755 ${S}/mountnfs.sh ${D}${sysconfdir}/init.d |
94 | install -m 0755 ${WORKDIR}/reboot ${D}${sysconfdir}/init.d | 94 | install -m 0755 ${S}/reboot ${D}${sysconfdir}/init.d |
95 | install -m 0755 ${WORKDIR}/rmnologin.sh ${D}${sysconfdir}/init.d | 95 | install -m 0755 ${S}/rmnologin.sh ${D}${sysconfdir}/init.d |
96 | install -m 0755 ${WORKDIR}/sendsigs ${D}${sysconfdir}/init.d | 96 | install -m 0755 ${S}/sendsigs ${D}${sysconfdir}/init.d |
97 | install -m 0755 ${WORKDIR}/single ${D}${sysconfdir}/init.d | 97 | install -m 0755 ${S}/single ${D}${sysconfdir}/init.d |
98 | install -m 0755 ${WORKDIR}/umountnfs.sh ${D}${sysconfdir}/init.d | 98 | install -m 0755 ${S}/umountnfs.sh ${D}${sysconfdir}/init.d |
99 | install -m 0755 ${WORKDIR}/urandom ${D}${sysconfdir}/init.d | 99 | install -m 0755 ${S}/urandom ${D}${sysconfdir}/init.d |
100 | sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' | 100 | sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g' |
101 | install -m 0755 ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d | 101 | install -m 0755 ${S}/devpts.sh ${D}${sysconfdir}/init.d |
102 | install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default | 102 | install -m 0755 ${S}/devpts ${D}${sysconfdir}/default |
103 | install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d | 103 | install -m 0755 ${S}/sysfs.sh ${D}${sysconfdir}/init.d |
104 | install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d | 104 | install -m 0755 ${S}/populate-volatile.sh ${D}${sysconfdir}/init.d |
105 | install -m 0755 ${WORKDIR}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d | 105 | install -m 0755 ${S}/read-only-rootfs-hook.sh ${D}${sysconfdir}/init.d |
106 | install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d | 106 | install -m 0755 ${S}/save-rtc.sh ${D}${sysconfdir}/init.d |
107 | install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core | 107 | install -m 0644 ${S}/volatiles ${D}${sysconfdir}/default/volatiles/00_core |
108 | if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then | 108 | if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then |
109 | sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ | 109 | sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ |
110 | ${D}${sysconfdir}/default/volatiles/00_core | 110 | ${D}${sysconfdir}/default/volatiles/00_core |
@@ -112,22 +112,22 @@ do_install () { | |||
112 | if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then | 112 | if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then |
113 | sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core | 113 | sed -i -e "/\<tmp\>/d" ${D}${sysconfdir}/default/volatiles/00_core |
114 | fi | 114 | fi |
115 | install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d | 115 | install -m 0755 ${S}/dmesg.sh ${D}${sysconfdir}/init.d |
116 | install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ | 116 | install -m 0644 ${S}/logrotate-dmesg.conf ${D}${sysconfdir}/ |
117 | 117 | ||
118 | if [ "${TARGET_ARCH}" = "arm" ]; then | 118 | if [ "${TARGET_ARCH}" = "arm" ]; then |
119 | install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d | 119 | install -m 0755 ${S}/alignment.sh ${D}${sysconfdir}/init.d |
120 | fi | 120 | fi |
121 | 121 | ||
122 | if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then | 122 | if ${@bb.utils.contains('DISTRO_FEATURES','selinux','true','false',d)}; then |
123 | install -d ${D}/${base_sbindir} | 123 | install -d ${D}/${base_sbindir} |
124 | install -m 0755 ${WORKDIR}/sushell ${D}/${base_sbindir} | 124 | install -m 0755 ${S}/sushell ${D}/${base_sbindir} |
125 | fi | 125 | fi |
126 | # | 126 | # |
127 | # Install device dependent scripts | 127 | # Install device dependent scripts |
128 | # | 128 | # |
129 | install -m 0755 ${WORKDIR}/banner.sh ${D}${sysconfdir}/init.d/banner.sh | 129 | install -m 0755 ${S}/banner.sh ${D}${sysconfdir}/init.d/banner.sh |
130 | install -m 0755 ${WORKDIR}/umountfs ${D}${sysconfdir}/init.d/umountfs | 130 | install -m 0755 ${S}/umountfs ${D}${sysconfdir}/init.d/umountfs |
131 | # | 131 | # |
132 | # Create runlevel links | 132 | # Create runlevel links |
133 | # | 133 | # |
diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch new file mode 100644 index 0000000000..de279b55f9 --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexey Gladkov <legion@kernel.org> | ||
3 | Date: Thu, 29 Feb 2024 17:38:37 +0100 | ||
4 | Subject: [PATCH] Remove non-free Agafari fonts | ||
5 | |||
6 | Based on legal analysis, we are removing non-free fonts for now. If we | ||
7 | can change the license of these fonts, we will return them back. | ||
8 | |||
9 | From: Stanislav Brabec <sbrabec@suse.com> | ||
10 | Date: Wed, 28 Feb 2024 16:47:54 +0100 | ||
11 | Subject: kbd: Legal problems of Agafari fonts | ||
12 | |||
13 | The data/consolefonts/README.Ethiopic contains a notice: | ||
14 | Agafari: | ||
15 | Donated by the Ethiopian Science and Technology Commission | ||
16 | <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed | ||
17 | for non-commercial use under Unix environments only. | ||
18 | |||
19 | According to our legal review, it makes impossible to distribute these | ||
20 | fonts as part of any commercial products, and even makes it impossible to | ||
21 | distribute kbd sources as part of any commercial product services. | ||
22 | |||
23 | Additionally, it makes the whole kbd package incompatible with GPL, so the | ||
24 | COPYING file (created during build of the tarball) cannot declare GPL | ||
25 | version 2. It also violates section 6 of GPL (no further restrictions). | ||
26 | |||
27 | That is why several GNU/Linux distributions exclude Agafari from the | ||
28 | release. To be on a safe side, SUSE even decided to repack any source | ||
29 | tarballs before putting it to their servers. | ||
30 | |||
31 | This was probably reported to the former kbd maintainer about 20 years ago, | ||
32 | but nothing changed over years. | ||
33 | |||
34 | That is why I recommend removing Agafari fonts and removing the reference | ||
35 | to them from README.Ethiopic. Alternatively, you can ask the Ethiopian | ||
36 | Science and Technology Commission for re-licensing. | ||
37 | |||
38 | Signed-off-by: Alexey Gladkov <legion@kernel.org> | ||
39 | |||
40 | Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee] | ||
41 | |||
42 | [do_configure prepend added to remove binary files] | ||
43 | |||
44 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
45 | --- | ||
46 | data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes | ||
47 | data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes | ||
48 | data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes | ||
49 | data/consolefonts/README.Ethiopic | 5 ----- | ||
50 | 4 files changed, 5 deletions(-) | ||
51 | delete mode 100644 data/consolefonts/Agafari-12.psfu | ||
52 | delete mode 100644 data/consolefonts/Agafari-14.psfu | ||
53 | delete mode 100644 data/consolefonts/Agafari-16.psfu | ||
54 | |||
55 | diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic | ||
56 | index 7502722..2810797 100644 | ||
57 | --- a/data/consolefonts/README.Ethiopic | ||
58 | +++ b/data/consolefonts/README.Ethiopic | ||
59 | @@ -14,11 +14,6 @@ Ethiopic fonts: | ||
60 | restrictions below: | ||
61 | |||
62 | |||
63 | -Agafari: | ||
64 | - Donated by the Ethiopian Science and Technology Commission | ||
65 | - <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed | ||
66 | - for non-commercial use under Unix environments only. | ||
67 | - | ||
68 | Goha and GohaClassic: | ||
69 | Donated by Yitna Firdyiwek <ybf2u@virgina.edu> of GohaTibeb Associates | ||
70 | and may be redistributed without restriction under the GNU GPL 2.0. | ||
71 | -- | ||
72 | 2.30.2 | ||
73 | |||
diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb index 790055aa96..2331b51e59 100644 --- a/meta/recipes-core/kbd/kbd_2.6.4.bb +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb | |||
@@ -1,9 +1,19 @@ | |||
1 | SUMMARY = "Keytable files and keyboard utilities" | 1 | SUMMARY = "Keytable files and keyboard utilities" |
2 | HOMEPAGE = "http://www.kbd-project.org/" | 2 | HOMEPAGE = "http://www.kbd-project.org/" |
3 | DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." | 3 | DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." |
4 | # everything minus console-fonts is GPL-2.0-or-later | 4 | |
5 | LICENSE = "GPL-2.0-or-later" | 5 | # consolefonts and keymaps contain also some public domain and author notice licenses |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 6 | LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-or-later" |
7 | LIC_FILES_CHKSUM = " \ | ||
8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
9 | file://data/keymaps/pine/en.map;beginline=2;endline=15;md5=20914a59c0546a7b77ebf959bc88ad5d \ | ||
10 | " | ||
11 | LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later" | ||
12 | LICENSE:${PN}-consolefonts = "GPL-2.0-or-later" | ||
13 | LICENSE:${PN}-consoletrans = "GPL-2.0-or-later" | ||
14 | LICENSE:${PN}-keymaps-pine = "GPL-3.0-or-later" | ||
15 | LICENSE:${PN}-keymaps = "GPL-2.0-or-later" | ||
16 | LICENSE:${PN}-unimaps = "GPL-2.0-or-later" | ||
7 | 17 | ||
8 | inherit autotools gettext pkgconfig | 18 | inherit autotools gettext pkgconfig |
9 | 19 | ||
@@ -14,6 +24,7 @@ RPROVIDES:${PN} = "console-tools" | |||
14 | RCONFLICTS:${PN} = "console-tools" | 24 | RCONFLICTS:${PN} = "console-tools" |
15 | 25 | ||
16 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | 26 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ |
27 | file://0001-Remove-non-free-Agafari-fonts.patch \ | ||
17 | " | 28 | " |
18 | 29 | ||
19 | SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" | 30 | SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" |
@@ -24,13 +35,22 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | |||
24 | 35 | ||
25 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | 36 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," |
26 | 37 | ||
27 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" | 38 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" |
28 | 39 | ||
29 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" | 40 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" |
30 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" | 41 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" |
42 | FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine" | ||
31 | FILES:${PN}-keymaps = "${datadir}/keymaps" | 43 | FILES:${PN}-keymaps = "${datadir}/keymaps" |
32 | FILES:${PN}-unimaps = "${datadir}/unimaps" | 44 | FILES:${PN}-unimaps = "${datadir}/unimaps" |
33 | 45 | ||
46 | RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" | ||
47 | |||
48 | # remove this when upgrading to newer version which has integrated | ||
49 | # https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee | ||
50 | do_configure:prepend() { | ||
51 | rm -rf ${S}/data/consolefonts/Agafari-1* | ||
52 | } | ||
53 | |||
34 | do_install:append () { | 54 | do_install:append () { |
35 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ | 55 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ |
36 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then | 56 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then |
diff --git a/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch new file mode 100644 index 0000000000..4b743f9b33 --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup/0001-include-Makefile-install-systemd.h-by-default.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 592dcdcf243576bd2517d3da9bc18990de08e37e Mon Sep 17 00:00:00 2001 | ||
2 | From: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
3 | Date: Mon, 27 Nov 2023 20:07:33 +0530 | ||
4 | Subject: [PATCH 1/1] include/Makefile: install systemd.h by default | ||
5 | |||
6 | Install systemd.h header file by default, as we have stub and defined | ||
7 | versions of the systemd functions for both non-systemd and systemd | ||
8 | enabled configurations. This will help packagers to ship package | ||
9 | without systemd support (--enable-systemd=no). | ||
10 | |||
11 | Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> | ||
12 | Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> | ||
13 | |||
14 | Upstream-Status: Backport [https://github.com/libcgroup/libcgroup/commit/592dcdcf243576bd2517d3da9bc18990de08e37e] | ||
15 | |||
16 | Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com> | ||
17 | --- | ||
18 | include/Makefile.am | 6 +----- | ||
19 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
20 | |||
21 | diff --git a/include/Makefile.am b/include/Makefile.am | ||
22 | index 23cebaac..4cb05529 100644 | ||
23 | --- a/include/Makefile.am | ||
24 | +++ b/include/Makefile.am | ||
25 | @@ -2,8 +2,4 @@ | ||
26 | nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \ | ||
27 | libcgroup/groups.h libcgroup/tasks.h \ | ||
28 | libcgroup/iterators.h libcgroup/config.h \ | ||
29 | - libcgroup/log.h libcgroup/tools.h | ||
30 | - | ||
31 | -if WITH_SYSTEMD | ||
32 | -nobase_include_HEADERS += libcgroup/systemd.h | ||
33 | -endif | ||
34 | + libcgroup/log.h libcgroup/tools.h libcgroup/systemd.h | ||
35 | -- | ||
36 | 2.39.2 | ||
37 | |||
diff --git a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb index 4b4f19e36f..a1d27c7e7f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb +++ b/meta/recipes-core/libcgroup/libcgroup_3.1.0.bb | |||
@@ -13,6 +13,7 @@ DEPENDS = "bison-native flex-native" | |||
13 | DEPENDS:append:libc-musl = " fts" | 13 | DEPENDS:append:libc-musl = " fts" |
14 | 14 | ||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
16 | file://0001-include-Makefile-install-systemd.h-by-default.patch \ | ||
16 | " | 17 | " |
17 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" | 18 | UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/tags" |
18 | 19 | ||
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb index d5546ce9ba..30ec6a4674 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.36.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # This provides libcrypto.so.1 which contains obsolete APIs, needed for uninative in particular | 2 | # This provides libcrypt.so.1 which contains obsolete APIs, needed for uninative in particular |
3 | # | 3 | # |
4 | 4 | ||
5 | require libxcrypt.inc | 5 | require libxcrypt.inc |
diff --git a/meta/recipes-core/libxml/libxml2_2.12.5.bb b/meta/recipes-core/libxml/libxml2_2.12.6.bb index 47c1a72e77..14fcff7fa4 100644 --- a/meta/recipes-core/libxml/libxml2_2.12.5.bb +++ b/meta/recipes-core/libxml/libxml2_2.12.6.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] = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21" | 23 | SRC_URI[archive.sha256sum] = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb" |
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/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 6b679489fd..92fbda335d 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -11,8 +11,11 @@ TOOLCHAIN_HOST_TASK ?= "\ | |||
11 | nativesdk-python3-git \ | 11 | nativesdk-python3-git \ |
12 | nativesdk-python3-jinja2 \ | 12 | nativesdk-python3-jinja2 \ |
13 | nativesdk-python3-testtools \ | 13 | nativesdk-python3-testtools \ |
14 | nativesdk-python3-pip \ | ||
15 | nativesdk-python3-setuptools \ | ||
14 | nativesdk-python3-subunit \ | 16 | nativesdk-python3-subunit \ |
15 | nativesdk-python3-pyyaml \ | 17 | nativesdk-python3-pyyaml \ |
18 | nativesdk-python3-websockets \ | ||
16 | nativesdk-ncurses-terminfo-base \ | 19 | nativesdk-ncurses-terminfo-base \ |
17 | nativesdk-chrpath \ | 20 | nativesdk-chrpath \ |
18 | nativesdk-tar \ | 21 | nativesdk-tar \ |
diff --git a/meta/recipes-core/ncurses/files/CVE-2023-45918.patch b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch new file mode 100644 index 0000000000..fbdae49a61 --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-45918.patch | |||
@@ -0,0 +1,180 @@ | |||
1 | From bcf02d3242f1c7d57224a95f7903fcf4b5e7695d Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas E. Dickey <dickey@invisible-island.net> | ||
3 | Date: Fri, 16 Jun 2023 02:54:29 +0530 | ||
4 | Subject: [PATCH] Fix CVE-2023-45918 | ||
5 | |||
6 | CVE: CVE-2023-45918 | ||
7 | |||
8 | Upstream-Status: Backport [https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=bcf02d3242f1c7d57224a95f7903fcf4b5e7695d] | ||
9 | |||
10 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
11 | --- | ||
12 | ncurses/tinfo/comp_error.c | 15 ++++++--- | ||
13 | ncurses/tinfo/read_entry.c | 65 ++++++++++++++++++++++++++------------ | ||
14 | 2 files changed, 56 insertions(+), 24 deletions(-) | ||
15 | |||
16 | diff --git a/ncurses/tinfo/comp_error.c b/ncurses/tinfo/comp_error.c | ||
17 | index 48f48784..ee518e28 100644 | ||
18 | --- a/ncurses/tinfo/comp_error.c | ||
19 | +++ b/ncurses/tinfo/comp_error.c | ||
20 | @@ -60,8 +60,15 @@ _nc_get_source(void) | ||
21 | NCURSES_EXPORT(void) | ||
22 | _nc_set_source(const char *const name) | ||
23 | { | ||
24 | - FreeIfNeeded(SourceName); | ||
25 | - SourceName = strdup(name); | ||
26 | + if (name == NULL) { | ||
27 | + free(SourceName); | ||
28 | + SourceName = NULL; | ||
29 | + } else if (SourceName == NULL) { | ||
30 | + SourceName = strdup(name); | ||
31 | + } else if (strcmp(name, SourceName)) { | ||
32 | + free(SourceName); | ||
33 | + SourceName = strdup(name); | ||
34 | + } | ||
35 | } | ||
36 | |||
37 | NCURSES_EXPORT(void) | ||
38 | @@ -95,9 +102,9 @@ static NCURSES_INLINE void | ||
39 | where_is_problem(void) | ||
40 | { | ||
41 | fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?"); | ||
42 | - if (_nc_curr_line >= 0) | ||
43 | + if (_nc_curr_line > 0) | ||
44 | fprintf(stderr, ", line %d", _nc_curr_line); | ||
45 | - if (_nc_curr_col >= 0) | ||
46 | + if (_nc_curr_col > 0) | ||
47 | fprintf(stderr, ", col %d", _nc_curr_col); | ||
48 | if (TermType != 0 && TermType[0] != '\0') | ||
49 | fprintf(stderr, ", terminal '%s'", TermType); | ||
50 | diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c | ||
51 | index 341337d2..b0c3ad26 100644 | ||
52 | --- a/ncurses/tinfo/read_entry.c | ||
53 | +++ b/ncurses/tinfo/read_entry.c | ||
54 | @@ -138,12 +138,13 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count) | ||
55 | } | ||
56 | #endif | ||
57 | |||
58 | -static void | ||
59 | -convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
60 | +static bool | ||
61 | +convert_strings(char *buf, char **Strings, int count, int size, | ||
62 | + char *table, bool always) | ||
63 | { | ||
64 | int i; | ||
65 | char *p; | ||
66 | - bool corrupt = FALSE; | ||
67 | + bool success = TRUE; | ||
68 | |||
69 | for (i = 0; i < count; i++) { | ||
70 | if (IS_NEG1(buf + 2 * i)) { | ||
71 | @@ -159,13 +160,10 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
72 | TR(TRACE_DATABASE, ("Strings[%d] = %s", i, | ||
73 | _nc_visbuf(Strings[i]))); | ||
74 | } else { | ||
75 | - if (!corrupt) { | ||
76 | - corrupt = TRUE; | ||
77 | - TR(TRACE_DATABASE, | ||
78 | - ("ignore out-of-range index %d to Strings[]", nn)); | ||
79 | - _nc_warning("corrupt data found in convert_strings"); | ||
80 | - } | ||
81 | - Strings[i] = ABSENT_STRING; | ||
82 | + TR(TRACE_DATABASE, | ||
83 | + ("found out-of-range index %d to Strings[%d]", nn, i)); | ||
84 | + success = FALSE; | ||
85 | + break; | ||
86 | } | ||
87 | } | ||
88 | |||
89 | @@ -175,10 +173,25 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table) | ||
90 | if (*p == '\0') | ||
91 | break; | ||
92 | /* if there is no NUL, ignore the string */ | ||
93 | - if (p >= table + size) | ||
94 | + if (p >= table + size) { | ||
95 | Strings[i] = ABSENT_STRING; | ||
96 | + } else if (p == Strings[i] && always) { | ||
97 | + TR(TRACE_DATABASE, | ||
98 | + ("found empty but required Strings[%d]", i)); | ||
99 | + success = FALSE; | ||
100 | + break; | ||
101 | + } | ||
102 | + } else if (always) { /* names are always needed */ | ||
103 | + TR(TRACE_DATABASE, | ||
104 | + ("found invalid but required Strings[%d]", i)); | ||
105 | + success = FALSE; | ||
106 | + break; | ||
107 | } | ||
108 | } | ||
109 | + if (!success) { | ||
110 | + _nc_warning("corrupt data found in convert_strings"); | ||
111 | + } | ||
112 | + return success; | ||
113 | } | ||
114 | |||
115 | static int | ||
116 | @@ -382,7 +395,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
117 | if (Read(string_table, (unsigned) str_size) != str_size) { | ||
118 | returnDB(TGETENT_NO); | ||
119 | } | ||
120 | - convert_strings(buf, ptr->Strings, str_count, str_size, string_table); | ||
121 | + if (!convert_strings(buf, ptr->Strings, str_count, str_size, | ||
122 | + string_table, FALSE)) { | ||
123 | + returnDB(TGETENT_NO); | ||
124 | + } | ||
125 | } | ||
126 | #if NCURSES_XNAMES | ||
127 | |||
128 | @@ -483,8 +499,10 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
129 | ("Before computing extended-string capabilities " | ||
130 | "str_count=%d, ext_str_count=%d", | ||
131 | str_count, ext_str_count)); | ||
132 | - convert_strings(buf, ptr->Strings + str_count, ext_str_count, | ||
133 | - ext_str_limit, ptr->ext_str_table); | ||
134 | + if (!convert_strings(buf, ptr->Strings + str_count, ext_str_count, | ||
135 | + ext_str_limit, ptr->ext_str_table, FALSE)) { | ||
136 | + returnDB(TGETENT_NO); | ||
137 | + } | ||
138 | for (i = ext_str_count - 1; i >= 0; i--) { | ||
139 | TR(TRACE_DATABASE, ("MOVE from [%d:%d] %s", | ||
140 | i, i + str_count, | ||
141 | @@ -516,10 +534,13 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit) | ||
142 | TR(TRACE_DATABASE, | ||
143 | ("ext_NAMES starting @%d in extended_strings, first = %s", | ||
144 | base, _nc_visbuf(ptr->ext_str_table + base))); | ||
145 | - convert_strings(buf + (2 * ext_str_count), | ||
146 | - ptr->ext_Names, | ||
147 | - (int) need, | ||
148 | - ext_str_limit, ptr->ext_str_table + base); | ||
149 | + if (!convert_strings(buf + (2 * ext_str_count), | ||
150 | + ptr->ext_Names, | ||
151 | + (int) need, | ||
152 | + ext_str_limit, ptr->ext_str_table + base, | ||
153 | + TRUE)) { | ||
154 | + returnDB(TGETENT_NO); | ||
155 | + } | ||
156 | } | ||
157 | |||
158 | TR(TRACE_DATABASE, | ||
159 | @@ -572,13 +593,17 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr) | ||
160 | int limit; | ||
161 | char buffer[MAX_ENTRY_SIZE + 1]; | ||
162 | |||
163 | - if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) | ||
164 | - > 0) { | ||
165 | + limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp); | ||
166 | + if (limit > 0) { | ||
167 | + const char *old_source = _nc_get_source(); | ||
168 | |||
169 | TR(TRACE_DATABASE, ("read terminfo %s", filename)); | ||
170 | + if (old_source == NULL) | ||
171 | + _nc_set_source(filename); | ||
172 | if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { | ||
173 | _nc_free_termtype2(ptr); | ||
174 | } | ||
175 | + _nc_set_source(old_source); | ||
176 | } else { | ||
177 | code = TGETENT_NO; | ||
178 | } | ||
179 | -- | ||
180 | 2.40.0 | ||
diff --git a/meta/recipes-core/ncurses/files/CVE-2023-50495.patch b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch new file mode 100644 index 0000000000..7d90ddd30f --- /dev/null +++ b/meta/recipes-core/ncurses/files/CVE-2023-50495.patch | |||
@@ -0,0 +1,301 @@ | |||
1 | From 7daae3f2139a678fe0ae0b42fcf8d807cbff485c Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Sun, 4 Feb 2024 13:42:38 +0800 | ||
4 | Subject: [PATCH] parse_entry.c: check return value of _nc_save_str | ||
5 | |||
6 | * check return value of _nc_save_str(), in special case for tic where | ||
7 | extended capabilities are processed but the terminal description was | ||
8 | not initialized (report by Ziqiao Kong). | ||
9 | |||
10 | * regenerate llib-* files. | ||
11 | |||
12 | CVE: CVE-2023-50495 | ||
13 | |||
14 | Upstream-Status: Backport [http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=7723dd6799ab10b32047ec73b14df9f107bafe99] | ||
15 | |||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
17 | --- | ||
18 | ncurses/llib-lncurses | 15 +++++++++++++++ | ||
19 | ncurses/llib-lncursest | 15 +++++++++++++++ | ||
20 | ncurses/llib-lncursestw | 15 +++++++++++++++ | ||
21 | ncurses/llib-lncursesw | 15 +++++++++++++++ | ||
22 | ncurses/llib-ltinfo | 15 +++++++++++++++ | ||
23 | ncurses/llib-ltinfot | 15 +++++++++++++++ | ||
24 | ncurses/llib-ltinfotw | 15 +++++++++++++++ | ||
25 | ncurses/llib-ltinfow | 15 +++++++++++++++ | ||
26 | ncurses/tinfo/parse_entry.c | 23 ++++++++++++++++------- | ||
27 | 9 files changed, 136 insertions(+), 7 deletions(-) | ||
28 | |||
29 | diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses | ||
30 | index 211cf3b7..e4190aa2 100644 | ||
31 | --- a/ncurses/llib-lncurses | ||
32 | +++ b/ncurses/llib-lncurses | ||
33 | @@ -3656,6 +3656,21 @@ char *tiparm( | ||
34 | ...) | ||
35 | { return(*(char **)0); } | ||
36 | |||
37 | +#undef tiparm_s | ||
38 | +char *tiparm_s( | ||
39 | + int num_expected, | ||
40 | + int tparm_type, | ||
41 | + const char *string, | ||
42 | + ...) | ||
43 | + { return(*(char **)0); } | ||
44 | + | ||
45 | +#undef tiscan_s | ||
46 | +int tiscan_s( | ||
47 | + int *num_expected, | ||
48 | + int *tparm_type, | ||
49 | + const char *string) | ||
50 | + { return(*(int *)0); } | ||
51 | + | ||
52 | #undef _nc_tiparm | ||
53 | char *_nc_tiparm( | ||
54 | int expected, | ||
55 | diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest | ||
56 | index 1b09d676..e07abba6 100644 | ||
57 | --- a/ncurses/llib-lncursest | ||
58 | +++ b/ncurses/llib-lncursest | ||
59 | @@ -3741,6 +3741,21 @@ char *tiparm( | ||
60 | ...) | ||
61 | { return(*(char **)0); } | ||
62 | |||
63 | +#undef tiparm_s | ||
64 | +char *tiparm_s( | ||
65 | + int num_expected, | ||
66 | + int tparm_type, | ||
67 | + const char *string, | ||
68 | + ...) | ||
69 | + { return(*(char **)0); } | ||
70 | + | ||
71 | +#undef tiscan_s | ||
72 | +int tiscan_s( | ||
73 | + int *num_expected, | ||
74 | + int *tparm_type, | ||
75 | + const char *string) | ||
76 | + { return(*(int *)0); } | ||
77 | + | ||
78 | #undef _nc_tiparm | ||
79 | char *_nc_tiparm( | ||
80 | int expected, | ||
81 | diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw | ||
82 | index 4576e0fc..747c6be8 100644 | ||
83 | --- a/ncurses/llib-lncursestw | ||
84 | +++ b/ncurses/llib-lncursestw | ||
85 | @@ -4702,6 +4702,21 @@ char *tiparm( | ||
86 | ...) | ||
87 | { return(*(char **)0); } | ||
88 | |||
89 | +#undef tiparm_s | ||
90 | +char *tiparm_s( | ||
91 | + int num_expected, | ||
92 | + int tparm_type, | ||
93 | + const char *string, | ||
94 | + ...) | ||
95 | + { return(*(char **)0); } | ||
96 | + | ||
97 | +#undef tiscan_s | ||
98 | +int tiscan_s( | ||
99 | + int *num_expected, | ||
100 | + int *tparm_type, | ||
101 | + const char *string) | ||
102 | + { return(*(int *)0); } | ||
103 | + | ||
104 | #undef _nc_tiparm | ||
105 | char *_nc_tiparm( | ||
106 | int expected, | ||
107 | diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw | ||
108 | index 127350d2..862305d9 100644 | ||
109 | --- a/ncurses/llib-lncursesw | ||
110 | +++ b/ncurses/llib-lncursesw | ||
111 | @@ -4617,6 +4617,21 @@ char *tiparm( | ||
112 | ...) | ||
113 | { return(*(char **)0); } | ||
114 | |||
115 | +#undef tiparm_s | ||
116 | +char *tiparm_s( | ||
117 | + int num_expected, | ||
118 | + int tparm_type, | ||
119 | + const char *string, | ||
120 | + ...) | ||
121 | + { return(*(char **)0); } | ||
122 | + | ||
123 | +#undef tiscan_s | ||
124 | +int tiscan_s( | ||
125 | + int *num_expected, | ||
126 | + int *tparm_type, | ||
127 | + const char *string) | ||
128 | + { return(*(int *)0); } | ||
129 | + | ||
130 | #undef _nc_tiparm | ||
131 | char *_nc_tiparm( | ||
132 | int expected, | ||
133 | diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo | ||
134 | index a5cd7cd3..31e5e9a6 100644 | ||
135 | --- a/ncurses/llib-ltinfo | ||
136 | +++ b/ncurses/llib-ltinfo | ||
137 | @@ -927,6 +927,21 @@ char *tiparm( | ||
138 | ...) | ||
139 | { return(*(char **)0); } | ||
140 | |||
141 | +#undef tiparm_s | ||
142 | +char *tiparm_s( | ||
143 | + int num_expected, | ||
144 | + int tparm_type, | ||
145 | + const char *string, | ||
146 | + ...) | ||
147 | + { return(*(char **)0); } | ||
148 | + | ||
149 | +#undef tiscan_s | ||
150 | +int tiscan_s( | ||
151 | + int *num_expected, | ||
152 | + int *tparm_type, | ||
153 | + const char *string) | ||
154 | + { return(*(int *)0); } | ||
155 | + | ||
156 | #undef _nc_tiparm | ||
157 | char *_nc_tiparm( | ||
158 | int expected, | ||
159 | diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot | ||
160 | index bd3de812..48e5c25a 100644 | ||
161 | --- a/ncurses/llib-ltinfot | ||
162 | +++ b/ncurses/llib-ltinfot | ||
163 | @@ -1003,6 +1003,21 @@ char *tiparm( | ||
164 | ...) | ||
165 | { return(*(char **)0); } | ||
166 | |||
167 | +#undef tiparm_s | ||
168 | +char *tiparm_s( | ||
169 | + int num_expected, | ||
170 | + int tparm_type, | ||
171 | + const char *string, | ||
172 | + ...) | ||
173 | + { return(*(char **)0); } | ||
174 | + | ||
175 | +#undef tiscan_s | ||
176 | +int tiscan_s( | ||
177 | + int *num_expected, | ||
178 | + int *tparm_type, | ||
179 | + const char *string) | ||
180 | + { return(*(int *)0); } | ||
181 | + | ||
182 | #undef _nc_tiparm | ||
183 | char *_nc_tiparm( | ||
184 | int expected, | ||
185 | diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw | ||
186 | index 4d35a1e1..64dfdfa5 100644 | ||
187 | --- a/ncurses/llib-ltinfotw | ||
188 | +++ b/ncurses/llib-ltinfotw | ||
189 | @@ -1025,6 +1025,21 @@ char *tiparm( | ||
190 | ...) | ||
191 | { return(*(char **)0); } | ||
192 | |||
193 | +#undef tiparm_s | ||
194 | +char *tiparm_s( | ||
195 | + int num_expected, | ||
196 | + int tparm_type, | ||
197 | + const char *string, | ||
198 | + ...) | ||
199 | + { return(*(char **)0); } | ||
200 | + | ||
201 | +#undef tiscan_s | ||
202 | +int tiscan_s( | ||
203 | + int *num_expected, | ||
204 | + int *tparm_type, | ||
205 | + const char *string) | ||
206 | + { return(*(int *)0); } | ||
207 | + | ||
208 | #undef _nc_tiparm | ||
209 | char *_nc_tiparm( | ||
210 | int expected, | ||
211 | diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow | ||
212 | index db846764..7e17a35f 100644 | ||
213 | --- a/ncurses/llib-ltinfow | ||
214 | +++ b/ncurses/llib-ltinfow | ||
215 | @@ -949,6 +949,21 @@ char *tiparm( | ||
216 | ...) | ||
217 | { return(*(char **)0); } | ||
218 | |||
219 | +#undef tiparm_s | ||
220 | +char *tiparm_s( | ||
221 | + int num_expected, | ||
222 | + int tparm_type, | ||
223 | + const char *string, | ||
224 | + ...) | ||
225 | + { return(*(char **)0); } | ||
226 | + | ||
227 | +#undef tiscan_s | ||
228 | +int tiscan_s( | ||
229 | + int *num_expected, | ||
230 | + int *tparm_type, | ||
231 | + const char *string) | ||
232 | + { return(*(int *)0); } | ||
233 | + | ||
234 | #undef _nc_tiparm | ||
235 | char *_nc_tiparm( | ||
236 | int expected, | ||
237 | diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c | ||
238 | index 14bcb67e..0a0b5637 100644 | ||
239 | --- a/ncurses/tinfo/parse_entry.c | ||
240 | +++ b/ncurses/tinfo/parse_entry.c | ||
241 | @@ -110,7 +110,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
242 | /* Well, we are given a cancel for a name that we don't recognize */ | ||
243 | return _nc_extend_names(entryp, name, STRING); | ||
244 | default: | ||
245 | - return 0; | ||
246 | + return NULL; | ||
247 | } | ||
248 | |||
249 | /* Adjust the 'offset' (insertion-point) to keep the lists of extended | ||
250 | @@ -142,6 +142,11 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
251 | for (last = (unsigned) (max - 1); last > tindex; last--) | ||
252 | |||
253 | if (!found) { | ||
254 | + char *saved; | ||
255 | + | ||
256 | + if ((saved = _nc_save_str(name)) == NULL) | ||
257 | + return NULL; | ||
258 | + | ||
259 | switch (token_type) { | ||
260 | case BOOLEAN: | ||
261 | tp->ext_Booleans++; | ||
262 | @@ -169,7 +174,7 @@ _nc_extend_names(ENTRY * entryp, const char *name, int token_type) | ||
263 | TYPE_REALLOC(char *, actual, tp->ext_Names); | ||
264 | while (--actual > offset) | ||
265 | tp->ext_Names[actual] = tp->ext_Names[actual - 1]; | ||
266 | - tp->ext_Names[offset] = _nc_save_str(name); | ||
267 | + tp->ext_Names[offset] = saved; | ||
268 | } | ||
269 | |||
270 | temp.nte_name = tp->ext_Names[offset]; | ||
271 | @@ -364,6 +369,8 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) | ||
272 | bool is_use = (strcmp(_nc_curr_token.tk_name, "use") == 0); | ||
273 | bool is_tc = !is_use && (strcmp(_nc_curr_token.tk_name, "tc") == 0); | ||
274 | if (is_use || is_tc) { | ||
275 | + char *saved; | ||
276 | + | ||
277 | if (!VALID_STRING(_nc_curr_token.tk_valstring) | ||
278 | || _nc_curr_token.tk_valstring[0] == '\0') { | ||
279 | _nc_warning("missing name for use-clause"); | ||
280 | @@ -377,11 +384,13 @@ _nc_parse_entry(ENTRY * entryp, int literal, bool silent) | ||
281 | _nc_curr_token.tk_valstring); | ||
282 | continue; | ||
283 | } | ||
284 | - entryp->uses[entryp->nuses].name = _nc_save_str(_nc_curr_token.tk_valstring); | ||
285 | - entryp->uses[entryp->nuses].line = _nc_curr_line; | ||
286 | - entryp->nuses++; | ||
287 | - if (entryp->nuses > 1 && is_tc) { | ||
288 | - BAD_TC_USAGE | ||
289 | + if ((saved = _nc_save_str(_nc_curr_token.tk_valstring)) != NULL) { | ||
290 | + entryp->uses[entryp->nuses].name = saved; | ||
291 | + entryp->uses[entryp->nuses].line = _nc_curr_line; | ||
292 | + entryp->nuses++; | ||
293 | + if (entryp->nuses > 1 && is_tc) { | ||
294 | + BAD_TC_USAGE | ||
295 | + } | ||
296 | } | ||
297 | } else { | ||
298 | /* normal token lookup */ | ||
299 | -- | ||
300 | 2.25.1 | ||
301 | |||
diff --git a/meta/recipes-core/ncurses/ncurses_6.4.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb index 2c621525f9..97130c06d6 100644 --- a/meta/recipes-core/ncurses/ncurses_6.4.bb +++ b/meta/recipes-core/ncurses/ncurses_6.4.bb | |||
@@ -6,6 +6,8 @@ SRC_URI += "file://0001-tic-hang.patch \ | |||
6 | file://exit_prototype.patch \ | 6 | file://exit_prototype.patch \ |
7 | file://0001-Fix-CVE-2023-29491.patch \ | 7 | file://0001-Fix-CVE-2023-29491.patch \ |
8 | file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ | 8 | file://0001-Updating-reset-code-ncurses-6.4-patch-20231104.patch \ |
9 | file://CVE-2023-50495.patch \ | ||
10 | file://CVE-2023-45918.patch \ | ||
9 | " | 11 | " |
10 | # commit id corresponds to the revision in package version | 12 | # commit id corresponds to the revision in package version |
11 | SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" | 13 | SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f" |
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 3dc031d3b6..35ca8d1834 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -26,10 +26,24 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ | |||
26 | file://0004-reproducible.patch \ | 26 | file://0004-reproducible.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | PV = "edk2-stable202308" | 29 | PV = "edk2-stable202402" |
30 | SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e" | 30 | SRCREV = "edc6681206c1a8791981a2f911d2fb8b3d2f5768" |
31 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" | 31 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" |
32 | 32 | ||
33 | CVE_PRODUCT = "edk2" | ||
34 | CVE_VERSION = "${@d.getVar('PV').split('stable')[1]}" | ||
35 | |||
36 | CVE_STATUS[CVE-2014-8271] = "fixed-version: Fixed in svn_16280, which is an unusual versioning breaking version comparison." | ||
37 | CVE_STATUS[CVE-2014-4859] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
38 | CVE_STATUS[CVE-2014-4860] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
39 | CVE_STATUS[CVE-2019-14553] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
40 | CVE_STATUS[CVE-2019-14559] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
41 | CVE_STATUS[CVE-2019-14562] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
42 | CVE_STATUS[CVE-2019-14563] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
43 | CVE_STATUS[CVE-2019-14575] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
44 | CVE_STATUS[CVE-2019-14586] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
45 | CVE_STATUS[CVE-2019-14587] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | ||
46 | |||
33 | inherit deploy | 47 | inherit deploy |
34 | 48 | ||
35 | PARALLEL_MAKE = "" | 49 | PARALLEL_MAKE = "" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index d96d2f5fff..fecc3334ea 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
@@ -37,4 +37,6 @@ RDEPENDS:${PN} = "\ | |||
37 | RRECOMMENDS:${PN} = "\ | 37 | RRECOMMENDS:${PN} = "\ |
38 | ${VIRTUAL-RUNTIME_base-utils-syslog} \ | 38 | ${VIRTUAL-RUNTIME_base-utils-syslog} \ |
39 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ | 39 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ |
40 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "init-ifupdown", "", d)}" | 40 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "init-ifupdown", "", d)} \ |
41 | ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit pni-names", "ifupdown", "", d)} \ | ||
42 | " | ||
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 40937098e6..c7b96bc6a7 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -80,7 +80,7 @@ python do_compile () { | |||
80 | import subprocess | 80 | import subprocess |
81 | 81 | ||
82 | # Build a separate executable for each splash image | 82 | # Build a separate executable for each splash image |
83 | workdir = d.getVar('WORKDIR') | 83 | workdir = d.getVar('UNPACKDIR') |
84 | convertscript = "%s/make-image-header.sh" % d.getVar('S') | 84 | convertscript = "%s/make-image-header.sh" % d.getVar('S') |
85 | destfile = "%s/psplash-poky-img.h" % d.getVar('B') | 85 | destfile = "%s/psplash-poky-img.h" % d.getVar('B') |
86 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() | 86 | localfiles = d.getVar('SPLASH_LOCALPATHS').split() |
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 4aefc5636d..555bd0876f 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -38,7 +38,7 @@ do_install:append () { | |||
38 | rmdir ${D}${datadir}/${BPN} || true | 38 | rmdir ${D}${datadir}/${BPN} || true |
39 | 39 | ||
40 | install -m 0755 -d ${D}${sysconfdir} | 40 | install -m 0755 -d ${D}${sysconfdir} |
41 | install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc | 41 | install -m 0644 ${UNPACKDIR}/inputrc ${D}${sysconfdir}/inputrc |
42 | } | 42 | } |
43 | 43 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 44 | BBCLASSEXTEND = "native nativesdk" |
@@ -54,4 +54,4 @@ ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" | |||
54 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs | 54 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs |
55 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. | 55 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. |
56 | SRC_URI:append:class-native = " file://rl-native.map" | 56 | SRC_URI:append:class-native = " file://rl-native.map" |
57 | LDFLAGS:append:class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" | 57 | LDFLAGS:append:class-native = " -Wl,--version-script=${UNPACKDIR}/rl-native.map" |
diff --git a/meta/recipes-core/readline/readline/readline82-001.patch b/meta/recipes-core/readline/readline/readline82-001.patch new file mode 100644 index 0000000000..4e9839db9c --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-001.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-001 | ||
6 | |||
7 | Bug-Reported-by: Kan-Ru Chen <koster@debian.org> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109 | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Starting a readline application with an invalid locale specification for | ||
14 | LC_ALL/LANG/LC_CTYPE can cause it crash on the first call to readline. | ||
15 | |||
16 | Patch (apply with `patch -p0'): | ||
17 | |||
18 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | |||
21 | *** ../readline-8.2-patched/nls.c 2022-08-15 09:38:51.000000000 -0400 | ||
22 | --- nls.c 2022-10-05 09:23:22.000000000 -0400 | ||
23 | *************** | ||
24 | *** 142,145 **** | ||
25 | --- 142,149 ---- | ||
26 | lspec = ""; | ||
27 | ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ | ||
28 | + if (ret == 0 || *ret == 0) | ||
29 | + ret = setlocale (LC_CTYPE, (char *)NULL); | ||
30 | + if (ret == 0 || *ret == 0) | ||
31 | + ret = RL_DEFAULT_LOCALE; | ||
32 | #else | ||
33 | ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; | ||
34 | |||
35 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
36 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
37 | *************** | ||
38 | *** 1,3 **** | ||
39 | # Do not edit -- exists only for use by patch | ||
40 | |||
41 | ! 0 | ||
42 | --- 1,3 ---- | ||
43 | # Do not edit -- exists only for use by patch | ||
44 | |||
45 | ! 1 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-002.patch b/meta/recipes-core/readline/readline/readline82-002.patch new file mode 100644 index 0000000000..5629685dc1 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-002.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-002 | ||
6 | |||
7 | Bug-Reported-by: srobertson@peratonlabs.com | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | It's possible for readline to try to zero out a line that's not null- | ||
14 | terminated, leading to a memory fault. | ||
15 | |||
16 | Patch (apply with `patch -p0'): | ||
17 | |||
18 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | |||
21 | *** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400 | ||
22 | --- display.c 2022-12-13 13:11:22.000000000 -0500 | ||
23 | *************** | ||
24 | *** 2684,2692 **** | ||
25 | |||
26 | if (visible_line) | ||
27 | ! { | ||
28 | ! temp = visible_line; | ||
29 | ! while (*temp) | ||
30 | ! *temp++ = '\0'; | ||
31 | ! } | ||
32 | rl_on_new_line (); | ||
33 | forced_display++; | ||
34 | --- 2735,2740 ---- | ||
35 | |||
36 | if (visible_line) | ||
37 | ! memset (visible_line, 0, line_size); | ||
38 | ! | ||
39 | rl_on_new_line (); | ||
40 | forced_display++; | ||
41 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
42 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
43 | *************** | ||
44 | *** 1,3 **** | ||
45 | # Do not edit -- exists only for use by patch | ||
46 | |||
47 | ! 1 | ||
48 | --- 1,3 ---- | ||
49 | # Do not edit -- exists only for use by patch | ||
50 | |||
51 | ! 2 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-003.patch b/meta/recipes-core/readline/readline/readline82-003.patch new file mode 100644 index 0000000000..61570bf4f4 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-003.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-003 | ||
6 | |||
7 | Bug-Reported-by: Stefan Klinger <readline-gnu.org@stefan-klinger.de> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Patch (apply with `patch -p0'): | ||
14 | |||
15 | The custom color prefix that readline uses to color possible completions | ||
16 | must have a leading `.'. | ||
17 | |||
18 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | |||
21 | *** ../readline-8.2-patched/colors.c 2021-12-08 11:38:25.000000000 -0500 | ||
22 | --- colors.c 2023-08-28 16:40:04.000000000 -0400 | ||
23 | *************** | ||
24 | *** 74,78 **** | ||
25 | static void restore_default_color (void); | ||
26 | |||
27 | ! #define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix" | ||
28 | |||
29 | COLOR_EXT_TYPE *_rl_color_ext_list = 0; | ||
30 | --- 74,78 ---- | ||
31 | static void restore_default_color (void); | ||
32 | |||
33 | ! #define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix" | ||
34 | |||
35 | COLOR_EXT_TYPE *_rl_color_ext_list = 0; | ||
36 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
37 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
38 | *************** | ||
39 | *** 1,3 **** | ||
40 | # Do not edit -- exists only for use by patch | ||
41 | |||
42 | ! 2 | ||
43 | --- 1,3 ---- | ||
44 | # Do not edit -- exists only for use by patch | ||
45 | |||
46 | ! 3 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-004.patch b/meta/recipes-core/readline/readline/readline82-004.patch new file mode 100644 index 0000000000..cedc3d0fe4 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-004.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-004 | ||
6 | |||
7 | Bug-Reported-by: Henry Bent <henry.r.bent@gmail.com> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00044.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Patch (apply with `patch -p0'): | ||
14 | |||
15 | There are systems that supply one of select or pselect, but not both. | ||
16 | |||
17 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | |||
20 | *** ../readline-8.2-patched/input.c 2022-04-08 15:43:24.000000000 -0400 | ||
21 | --- input.c 2022-11-28 09:41:08.000000000 -0500 | ||
22 | *************** | ||
23 | *** 152,156 **** | ||
24 | --- 152,158 ---- | ||
25 | int _rl_timeout_init (void); | ||
26 | int _rl_timeout_sigalrm_handler (void); | ||
27 | + #if defined (RL_TIMEOUT_USE_SELECT) | ||
28 | int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *); | ||
29 | + #endif | ||
30 | |||
31 | static void _rl_timeout_handle (void); | ||
32 | *************** | ||
33 | *** 249,253 **** | ||
34 | int chars_avail, k; | ||
35 | char input; | ||
36 | ! #if defined(HAVE_SELECT) | ||
37 | fd_set readfds, exceptfds; | ||
38 | struct timeval timeout; | ||
39 | --- 251,255 ---- | ||
40 | int chars_avail, k; | ||
41 | char input; | ||
42 | ! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT) | ||
43 | fd_set readfds, exceptfds; | ||
44 | struct timeval timeout; | ||
45 | *************** | ||
46 | *** 806,810 **** | ||
47 | unsigned char c; | ||
48 | int fd; | ||
49 | ! #if defined (HAVE_PSELECT) | ||
50 | sigset_t empty_set; | ||
51 | fd_set readfds; | ||
52 | --- 815,819 ---- | ||
53 | unsigned char c; | ||
54 | int fd; | ||
55 | ! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT) | ||
56 | sigset_t empty_set; | ||
57 | fd_set readfds; | ||
58 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
59 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
60 | *************** | ||
61 | *** 1,3 **** | ||
62 | # Do not edit -- exists only for use by patch | ||
63 | |||
64 | ! 3 | ||
65 | --- 1,3 ---- | ||
66 | # Do not edit -- exists only for use by patch | ||
67 | |||
68 | ! 4 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-005.patch b/meta/recipes-core/readline/readline/readline82-005.patch new file mode 100644 index 0000000000..69c2e4f77a --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-005.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-005 | ||
6 | |||
7 | Bug-Reported-by: Simon Marchi <simon.marchi@polymtl.ca> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00005.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | If an application is using readline in callback mode, and a signal arrives | ||
14 | after readline checks for it in rl_callback_read_char() but before it | ||
15 | restores the application's signal handlers, it won't get processed until the | ||
16 | next time the application calls rl_callback_read_char(). Readline needs to | ||
17 | check for and resend any pending signals after restoring the application's | ||
18 | signal handlers. | ||
19 | |||
20 | Patch (apply with `patch -p0'): | ||
21 | |||
22 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
23 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
24 | |||
25 | *** ../readline-8.2-patched/callback.c 2022-04-29 12:02:56.000000000 -0400 | ||
26 | --- callback.c 2022-10-11 10:59:06.000000000 -0400 | ||
27 | *************** | ||
28 | *** 116,120 **** | ||
29 | do { \ | ||
30 | if (rl_persistent_signal_handlers == 0) \ | ||
31 | ! rl_clear_signals (); \ | ||
32 | return; \ | ||
33 | } while (0) | ||
34 | --- 116,123 ---- | ||
35 | do { \ | ||
36 | if (rl_persistent_signal_handlers == 0) \ | ||
37 | ! { \ | ||
38 | ! rl_clear_signals (); \ | ||
39 | ! if (_rl_caught_signal) _rl_signal_handler (_rl_caught_signal); \ | ||
40 | ! } \ | ||
41 | return; \ | ||
42 | } while (0) | ||
43 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
44 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
45 | *************** | ||
46 | *** 1,3 **** | ||
47 | # Do not edit -- exists only for use by patch | ||
48 | |||
49 | ! 4 | ||
50 | --- 1,3 ---- | ||
51 | # Do not edit -- exists only for use by patch | ||
52 | |||
53 | ! 5 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-006.patch b/meta/recipes-core/readline/readline/readline82-006.patch new file mode 100644 index 0000000000..d66afe82c9 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-006.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-006 | ||
6 | |||
7 | Bug-Reported-by: Tom de Vries <tdevries@suse.de> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00001.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | This is a variant of the same issue as the one fixed by patch 5. In this | ||
14 | case, the signal arrives and is pending before readline calls rl_getc(). | ||
15 | When this happens, the pending signal will be handled by the loop, but may | ||
16 | alter or destroy some state that the callback uses. Readline needs to treat | ||
17 | this case the same way it would if a signal interrupts pselect/select, so | ||
18 | compound operations like searches and reading numeric arguments get cleaned | ||
19 | up properly. | ||
20 | |||
21 | Patch (apply with `patch -p0'): | ||
22 | |||
23 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | |||
26 | *** ../readline-8.2-patched/input.c 2022-12-22 16:15:48.000000000 -0500 | ||
27 | --- input.c 2023-01-10 11:53:45.000000000 -0500 | ||
28 | *************** | ||
29 | *** 812,816 **** | ||
30 | rl_getc (FILE *stream) | ||
31 | { | ||
32 | ! int result; | ||
33 | unsigned char c; | ||
34 | int fd; | ||
35 | --- 812,816 ---- | ||
36 | rl_getc (FILE *stream) | ||
37 | { | ||
38 | ! int result, ostate, osig; | ||
39 | unsigned char c; | ||
40 | int fd; | ||
41 | *************** | ||
42 | *** 823,828 **** | ||
43 | --- 823,842 ---- | ||
44 | while (1) | ||
45 | { | ||
46 | + osig = _rl_caught_signal; | ||
47 | + ostate = rl_readline_state; | ||
48 | + | ||
49 | RL_CHECK_SIGNALS (); | ||
50 | |||
51 | + #if defined (READLINE_CALLBACKS) | ||
52 | + /* Do signal handling post-processing here, but just in callback mode | ||
53 | + for right now because the signal cleanup can change some of the | ||
54 | + callback state, and we need to either let the application have a | ||
55 | + chance to react or abort some current operation that gets cleaned | ||
56 | + up by rl_callback_sigcleanup(). If not, we'll just run through the | ||
57 | + loop again. */ | ||
58 | + if (osig != 0 && (ostate & RL_STATE_CALLBACK)) | ||
59 | + goto postproc_signal; | ||
60 | + #endif | ||
61 | + | ||
62 | /* We know at this point that _rl_caught_signal == 0 */ | ||
63 | |||
64 | *************** | ||
65 | *** 888,891 **** | ||
66 | --- 902,908 ---- | ||
67 | |||
68 | handle_error: | ||
69 | + osig = _rl_caught_signal; | ||
70 | + ostate = rl_readline_state; | ||
71 | + | ||
72 | /* If the error that we received was EINTR, then try again, | ||
73 | this is simply an interrupted system call to read (). We allow | ||
74 | *************** | ||
75 | *** 928,933 **** | ||
76 | --- 945,959 ---- | ||
77 | #endif /* SIGALRM */ | ||
78 | |||
79 | + postproc_signal: | ||
80 | + /* POSIX says read(2)/pselect(2)/select(2) don't return EINTR for any | ||
81 | + reason other than being interrupted by a signal, so we can safely | ||
82 | + call the application's signal event hook. */ | ||
83 | if (rl_signal_event_hook) | ||
84 | (*rl_signal_event_hook) (); | ||
85 | + #if defined (READLINE_CALLBACKS) | ||
86 | + else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG))) | ||
87 | + /* just these cases for now */ | ||
88 | + _rl_abort_internal (); | ||
89 | + #endif | ||
90 | } | ||
91 | } | ||
92 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
93 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
94 | *************** | ||
95 | *** 1,3 **** | ||
96 | # Do not edit -- exists only for use by patch | ||
97 | |||
98 | ! 5 | ||
99 | --- 1,3 ---- | ||
100 | # Do not edit -- exists only for use by patch | ||
101 | |||
102 | ! 6 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-007.patch b/meta/recipes-core/readline/readline/readline82-007.patch new file mode 100644 index 0000000000..9fa1ccb552 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-007.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-007 | ||
6 | |||
7 | Bug-Reported-by: Kevin Pulo <kev@pulo.com.au> | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-11/msg00002.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | If readline is called with no prompt, it should display a newline if return | ||
14 | is typed on an empty line. It should still suppress the final newline if | ||
15 | return is typed on the last (empty) line of a multi-line command. | ||
16 | |||
17 | Patch (apply with `patch -p0'): | ||
18 | |||
19 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | |||
22 | *** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400 | ||
23 | --- display.c 2022-12-13 13:11:22.000000000 -0500 | ||
24 | *************** | ||
25 | *** 3342,3348 **** | ||
26 | &last_face[_rl_screenwidth - 1 + woff], 1); | ||
27 | } | ||
28 | ! _rl_vis_botlin = 0; | ||
29 | ! if (botline_length > 0 || _rl_last_c_pos > 0) | ||
30 | rl_crlf (); | ||
31 | fflush (rl_outstream); | ||
32 | rl_display_fixed++; | ||
33 | --- 3394,3400 ---- | ||
34 | &last_face[_rl_screenwidth - 1 + woff], 1); | ||
35 | } | ||
36 | ! if ((_rl_vis_botlin == 0 && botline_length == 0) || botline_length > 0 || _rl_last_c_pos > 0) | ||
37 | rl_crlf (); | ||
38 | + _rl_vis_botlin = 0; | ||
39 | fflush (rl_outstream); | ||
40 | rl_display_fixed++; | ||
41 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
42 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
43 | *************** | ||
44 | *** 1,3 **** | ||
45 | # Do not edit -- exists only for use by patch | ||
46 | |||
47 | ! 6 | ||
48 | --- 1,3 ---- | ||
49 | # Do not edit -- exists only for use by patch | ||
50 | |||
51 | ! 7 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-008.patch b/meta/recipes-core/readline/readline/readline82-008.patch new file mode 100644 index 0000000000..660cb1e00b --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-008.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-008 | ||
6 | |||
7 | Bug-Reported-by: | ||
8 | Bug-Reference-ID: | ||
9 | Bug-Reference-URL: | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Add missing prototypes for several function declarations. | ||
14 | |||
15 | Patch (apply with `patch -p0'): | ||
16 | |||
17 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | |||
20 | *** ../readline-8.2-patched/text.c Wed Oct 27 11:03:59 2021 | ||
21 | --- text.c Thu Nov 16 16:24:58 2023 | ||
22 | *************** | ||
23 | *** 1765,1770 **** | ||
24 | #if defined (READLINE_CALLBACKS) | ||
25 | static int | ||
26 | ! _rl_char_search_callback (data) | ||
27 | ! _rl_callback_generic_arg *data; | ||
28 | { | ||
29 | _rl_callback_func = 0; | ||
30 | --- 1765,1769 ---- | ||
31 | #if defined (READLINE_CALLBACKS) | ||
32 | static int | ||
33 | ! _rl_char_search_callback (_rl_callback_generic_arg *data) | ||
34 | { | ||
35 | _rl_callback_func = 0; | ||
36 | *** ../readline-8.2-patched/bind.c Wed Feb 9 11:02:22 2022 | ||
37 | --- bind.c Thu Nov 16 16:25:17 2023 | ||
38 | *************** | ||
39 | *** 1168,1174 **** | ||
40 | |||
41 | static int | ||
42 | ! parse_comparison_op (s, indp) | ||
43 | ! const char *s; | ||
44 | ! int *indp; | ||
45 | { | ||
46 | int i, peekc, op; | ||
47 | --- 1168,1172 ---- | ||
48 | |||
49 | static int | ||
50 | ! parse_comparison_op (const char *s, int *indp) | ||
51 | { | ||
52 | int i, peekc, op; | ||
53 | *** ../readline-8.2-patched/rltty.c Fri Feb 18 11:14:22 2022 | ||
54 | --- rltty.c Thu Nov 16 16:25:36 2023 | ||
55 | *************** | ||
56 | *** 81,86 **** | ||
57 | to get the tty settings. */ | ||
58 | static void | ||
59 | ! set_winsize (tty) | ||
60 | ! int tty; | ||
61 | { | ||
62 | #if defined (TIOCGWINSZ) | ||
63 | --- 81,85 ---- | ||
64 | to get the tty settings. */ | ||
65 | static void | ||
66 | ! set_winsize (int tty) | ||
67 | { | ||
68 | #if defined (TIOCGWINSZ) | ||
69 | |||
70 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
71 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
72 | *************** | ||
73 | *** 1,3 **** | ||
74 | # Do not edit -- exists only for use by patch | ||
75 | |||
76 | ! 7 | ||
77 | --- 1,3 ---- | ||
78 | # Do not edit -- exists only for use by patch | ||
79 | |||
80 | ! 8 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-009.patch b/meta/recipes-core/readline/readline/readline82-009.patch new file mode 100644 index 0000000000..1fcf7b3535 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-009.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-009 | ||
6 | |||
7 | Bug-Reported-by: Stefan H. Holek <stefan@epy.co.at> | ||
8 | Bug-Reference-ID: <50F8DA45-B7F3-4DE1-AB94-19AE42649CDC@epy.co.at> | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00021.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Fix issue where the directory name portion of the word to be completed (the | ||
14 | part that is passed to opendir()) requires both tilde expansion and dequoting. | ||
15 | Readline only performed tilde expansion in this case, so filename completion | ||
16 | would fail. | ||
17 | |||
18 | Patch (apply with `patch -p0'): | ||
19 | |||
20 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | |||
23 | *** ../readline-8.2-patched/complete.c 2022-04-05 10:47:06.000000000 -0400 | ||
24 | --- complete.c 2022-10-26 15:08:51.000000000 -0400 | ||
25 | *************** | ||
26 | *** 2527,2531 **** | ||
27 | xfree (dirname); | ||
28 | dirname = temp; | ||
29 | ! tilde_dirname = 1; | ||
30 | } | ||
31 | |||
32 | --- 2527,2532 ---- | ||
33 | xfree (dirname); | ||
34 | dirname = temp; | ||
35 | ! if (*dirname != '~') | ||
36 | ! tilde_dirname = 1; /* indicate successful tilde expansion */ | ||
37 | } | ||
38 | |||
39 | *************** | ||
40 | *** 2546,2554 **** | ||
41 | users_dirname = savestring (dirname); | ||
42 | } | ||
43 | ! else if (tilde_dirname == 0 && rl_completion_found_quote && rl_filename_dequoting_function) | ||
44 | { | ||
45 | ! /* delete single and double quotes */ | ||
46 | xfree (dirname); | ||
47 | ! dirname = savestring (users_dirname); | ||
48 | } | ||
49 | directory = opendir (dirname); | ||
50 | --- 2547,2560 ---- | ||
51 | users_dirname = savestring (dirname); | ||
52 | } | ||
53 | ! else if (rl_completion_found_quote && rl_filename_dequoting_function) | ||
54 | { | ||
55 | ! /* We already ran users_dirname through the dequoting function. | ||
56 | ! If tilde_dirname == 1, we successfully performed tilde expansion | ||
57 | ! on dirname. Now we need to reconcile those results. We either | ||
58 | ! just copy the already-dequoted users_dirname or tilde expand it | ||
59 | ! if we tilde-expanded dirname. */ | ||
60 | ! temp = tilde_dirname ? tilde_expand (users_dirname) : savestring (users_dirname); | ||
61 | xfree (dirname); | ||
62 | ! dirname = temp; | ||
63 | } | ||
64 | directory = opendir (dirname); | ||
65 | |||
66 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
67 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
68 | *************** | ||
69 | *** 1,3 **** | ||
70 | # Do not edit -- exists only for use by patch | ||
71 | |||
72 | ! 8 | ||
73 | --- 1,3 ---- | ||
74 | # Do not edit -- exists only for use by patch | ||
75 | |||
76 | ! 9 | ||
diff --git a/meta/recipes-core/readline/readline/readline82-010.patch b/meta/recipes-core/readline/readline/readline82-010.patch new file mode 100644 index 0000000000..6152953e91 --- /dev/null +++ b/meta/recipes-core/readline/readline/readline82-010.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | READLINE PATCH REPORT | ||
2 | ===================== | ||
3 | |||
4 | Readline-Release: 8.2 | ||
5 | Patch-ID: readline82-010 | ||
6 | |||
7 | Bug-Reported-by: Martin Castillo <castilma@uni-bremen.de> | ||
8 | Bug-Reference-ID: <2d42153b-cf65-caba-dff1-cd3bc6268c7e@uni-bremen.de> | ||
9 | Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-01/msg00000.html | ||
10 | |||
11 | Bug-Description: | ||
12 | |||
13 | Fix the case where text to be completed from the line buffer (quoted) is | ||
14 | compared to the common prefix of the possible matches (unquoted) and the | ||
15 | quoting makes the former appear to be longer than the latter. Readline | ||
16 | assumes the match doesn't add any characters to the word and doesn't display | ||
17 | multiple matches. | ||
18 | |||
19 | Patch (apply with `patch -p0'): | ||
20 | |||
21 | Upstream-Status: Submitted [https://ftp.gnu.org/gnu/readline/readline-8.2-patches/] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | |||
24 | *** ../readline-8.2-patched/complete.c Tue Apr 5 10:47:06 2022 | ||
25 | --- complete.c Sat Jan 7 14:19:45 2023 | ||
26 | *************** | ||
27 | *** 2032,2038 **** | ||
28 | text = rl_copy_text (start, end); | ||
29 | matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char); | ||
30 | /* nontrivial_lcd is set if the common prefix adds something to the word | ||
31 | being completed. */ | ||
32 | ! nontrivial_lcd = matches && compare_match (text, matches[0]) != 0; | ||
33 | if (what_to_do == '!' || what_to_do == '@') | ||
34 | tlen = strlen (text); | ||
35 | --- 2038,2060 ---- | ||
36 | text = rl_copy_text (start, end); | ||
37 | matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char); | ||
38 | + /* If TEXT contains quote characters, it will be dequoted as part of | ||
39 | + generating the matches, and the matches will not contain any quote | ||
40 | + characters. We need to dequote TEXT before performing the comparison. | ||
41 | + Since compare_match performs the dequoting, and we only want to do it | ||
42 | + once, we don't call compare_matches after dequoting TEXT; we call | ||
43 | + strcmp directly. */ | ||
44 | /* nontrivial_lcd is set if the common prefix adds something to the word | ||
45 | being completed. */ | ||
46 | ! if (rl_filename_completion_desired && rl_filename_quoting_desired && | ||
47 | ! rl_completion_found_quote && rl_filename_dequoting_function) | ||
48 | ! { | ||
49 | ! char *t; | ||
50 | ! t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character); | ||
51 | ! xfree (text); | ||
52 | ! text = t; | ||
53 | ! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; | ||
54 | ! } | ||
55 | ! else | ||
56 | ! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; | ||
57 | if (what_to_do == '!' || what_to_do == '@') | ||
58 | tlen = strlen (text); | ||
59 | |||
60 | *** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 | ||
61 | --- patchlevel 2014-03-21 08:28:40.000000000 -0400 | ||
62 | *************** | ||
63 | *** 1,3 **** | ||
64 | # Do not edit -- exists only for use by patch | ||
65 | |||
66 | ! 9 | ||
67 | --- 1,3 ---- | ||
68 | # Do not edit -- exists only for use by patch | ||
69 | |||
70 | ! 10 | ||
diff --git a/meta/recipes-core/readline/readline_8.2.bb b/meta/recipes-core/readline/readline_8.2.bb index 3a47297fe1..f0dba31251 100644 --- a/meta/recipes-core/readline/readline_8.2.bb +++ b/meta/recipes-core/readline/readline_8.2.bb | |||
@@ -2,4 +2,16 @@ require readline.inc | |||
2 | 2 | ||
3 | SRC_URI += " file://norpath.patch" | 3 | SRC_URI += " file://norpath.patch" |
4 | 4 | ||
5 | SRC_URI += "file://readline82-001.patch;striplevel=0 \ | ||
6 | file://readline82-002.patch;striplevel=0 \ | ||
7 | file://readline82-003.patch;striplevel=0 \ | ||
8 | file://readline82-004.patch;striplevel=0 \ | ||
9 | file://readline82-005.patch;striplevel=0 \ | ||
10 | file://readline82-006.patch;striplevel=0 \ | ||
11 | file://readline82-007.patch;striplevel=0 \ | ||
12 | file://readline82-008.patch;striplevel=0 \ | ||
13 | file://readline82-009.patch;striplevel=0 \ | ||
14 | file://readline82-010.patch;striplevel=0 \ | ||
15 | " | ||
16 | |||
5 | SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" | 17 | SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" |
diff --git a/meta/recipes-core/seatd/seatd_0.8.0.bb b/meta/recipes-core/seatd/seatd_0.8.0.bb index 14c5b1b7ae..df5fe35f98 100644 --- a/meta/recipes-core/seatd/seatd_0.8.0.bb +++ b/meta/recipes-core/seatd/seatd_0.8.0.bb | |||
@@ -26,7 +26,7 @@ PACKAGECONFIG[systemd] = ",,systemd" | |||
26 | 26 | ||
27 | do_install:append() { | 27 | do_install:append() { |
28 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then | 28 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
29 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/seatd | 29 | install -Dm755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/seatd |
30 | fi | 30 | fi |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index 2355936631..752ad7c2b7 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb | |||
@@ -22,18 +22,18 @@ SRC_URI = "\ | |||
22 | " | 22 | " |
23 | 23 | ||
24 | do_install() { | 24 | do_install() { |
25 | install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf | 25 | install -D -m0644 ${UNPACKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf |
26 | install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf | 26 | install -D -m0644 ${UNPACKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf |
27 | install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf | 27 | install -D -m0644 ${UNPACKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf |
28 | 28 | ||
29 | if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then | 29 | if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then |
30 | install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network | 30 | install -D -m0644 ${UNPACKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network |
31 | fi | 31 | fi |
32 | } | 32 | } |
33 | 33 | ||
34 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 | 34 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 |
35 | do_install:append:qemuall() { | 35 | do_install:append:qemuall() { |
36 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf | 36 | install -D -m0644 ${UNPACKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf |
37 | } | 37 | } |
38 | 38 | ||
39 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 44a93ac684..987a8bf89d 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -21,7 +21,7 @@ do_install() { | |||
21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` | 21 | default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` |
22 | install -d ${D}${systemd_system_unitdir}/ | 22 | install -d ${D}${systemd_system_unitdir}/ |
23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ | 23 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ |
24 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/ | 24 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/ |
25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service | 25 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service | 26 | sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service |
27 | 27 | ||
@@ -35,7 +35,7 @@ do_install() { | |||
35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service | 35 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service |
36 | else | 36 | else |
37 | # install custom service file for the non-default baudrate | 37 | # install custom service file for the non-default baudrate |
38 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service | 38 | install -m 0644 ${S}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service | 39 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service |
40 | # enable the service | 40 | # enable the service |
41 | ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \ | 41 | ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \ |
diff --git a/meta/recipes-core/systemd/systemd-systemctl-native.bb b/meta/recipes-core/systemd/systemd-systemctl-native.bb index 54283bcba1..0036e4dd8b 100644 --- a/meta/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta/recipes-core/systemd/systemd-systemctl-native.bb | |||
@@ -12,5 +12,5 @@ S = "${WORKDIR}" | |||
12 | 12 | ||
13 | do_install() { | 13 | do_install() { |
14 | install -d ${D}${bindir} | 14 | install -d ${D}${bindir} |
15 | install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} | 15 | install -m 0755 ${S}/systemctl ${D}${bindir} |
16 | } | 16 | } |
diff --git a/meta/recipes-core/systemd/systemd/0001-NamePolicy.patch b/meta/recipes-core/systemd/systemd/0001-NamePolicy.patch deleted file mode 100644 index 46955cbcbb..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-NamePolicy.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 9bb09886320eb286108fb370b2634a66b3e3b9ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Thu, 21 Mar 2024 16:28:31 +0000 | ||
4 | Subject: [PATCH] systemd: enable mac based names in NamePolicy | ||
5 | |||
6 | The default NamePolicy for network interface names does not | ||
7 | include names based on mac addresses. Some BSPs, though, do | ||
8 | not provide information to compute other names, so we enable | ||
9 | mac names as a last resort. | ||
10 | |||
11 | Upstream-Status: Inappropriate [enable feature] | ||
12 | |||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
14 | --- | ||
15 | network/99-default.link | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/network/99-default.link b/network/99-default.link | ||
19 | index 429ac31e80..543ce54661 100644 | ||
20 | --- a/network/99-default.link | ||
21 | +++ b/network/99-default.link | ||
22 | @@ -15,6 +15,6 @@ | ||
23 | OriginalName=* | ||
24 | |||
25 | [Link] | ||
26 | -NamePolicy=keep kernel database onboard slot path | ||
27 | -AlternativeNamesPolicy=database onboard slot path | ||
28 | +NamePolicy=keep kernel database onboard slot path mac | ||
29 | +AlternativeNamesPolicy=database onboard slot path mac | ||
30 | MACAddressPolicy=persistent | ||
31 | -- | ||
32 | 2.35.5 | ||
33 | |||
diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.4.bb index b02e44d9c0..62842d43c8 100644 --- a/meta/recipes-core/systemd/systemd_255.4.bb +++ b/meta/recipes-core/systemd/systemd_255.4.bb | |||
@@ -28,7 +28,6 @@ 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://0001-NamePolicy.patch \ | ||
32 | " | 31 | " |
33 | 32 | ||
34 | # patches needed by musl | 33 | # patches needed by musl |
@@ -66,7 +65,7 @@ PAM_PLUGINS = " \ | |||
66 | " | 65 | " |
67 | 66 | ||
68 | PACKAGECONFIG ??= " \ | 67 | PACKAGECONFIG ??= " \ |
69 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit seccomp', d)} \ | 68 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam pni-names selinux smack usrmerge polkit seccomp', d)} \ |
70 | ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \ | 69 | ${@bb.utils.contains('DISTRO_FEATURES', 'minidebuginfo', 'coredump elfutils', '', d)} \ |
71 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ | 70 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \ |
72 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ | 71 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ |
@@ -197,6 +196,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false" | |||
197 | PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" | 196 | PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit" |
198 | PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" | 197 | PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false" |
199 | PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" | 198 | PACKAGECONFIG[pstore] = "-Dpstore=true,-Dpstore=false" |
199 | PACKAGECONFIG[pni-names] = ",,," | ||
200 | PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" | 200 | PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode" |
201 | PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" | 201 | PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false" |
202 | PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" | 202 | PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false" |
@@ -249,6 +249,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ | |||
249 | -Dsystem-alloc-gid-min=101 \ | 249 | -Dsystem-alloc-gid-min=101 \ |
250 | -Dsystem-gid-max=999 \ | 250 | -Dsystem-gid-max=999 \ |
251 | -Dcreate-log-dirs=false \ | 251 | -Dcreate-log-dirs=false \ |
252 | ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', '-Ddefault-mdns=no -Ddefault-llmnr=no', '', d)} \ | ||
252 | " | 253 | " |
253 | 254 | ||
254 | # Hardcode target binary paths to avoid using paths from sysroot or worse | 255 | # Hardcode target binary paths to avoid using paths from sysroot or worse |
@@ -270,14 +271,16 @@ WATCHDOG_TIMEOUT ??= "60" | |||
270 | 271 | ||
271 | do_install() { | 272 | do_install() { |
272 | meson_do_install | 273 | meson_do_install |
273 | # Change the root user's home directory in /lib/sysusers.d/basic.conf. | 274 | if ${@bb.utils.contains('PACKAGECONFIG', 'sysusers', 'true', 'false', d)}; then |
274 | # This is done merely for backward compatibility with previous systemd recipes. | 275 | # Change the root user's home directory in /lib/sysusers.d/basic.conf. |
275 | # systemd hardcodes root user's HOME to be "/root". Changing to use other values | 276 | # This is done merely for backward compatibility with previous systemd recipes. |
276 | # may have unexpected runtime behaviors. | 277 | # systemd hardcodes root user's HOME to be "/root". Changing to use other values |
277 | if [ "${ROOT_HOME}" != "/root" ]; then | 278 | # may have unexpected runtime behaviors. |
278 | bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" | 279 | if [ "${ROOT_HOME}" != "/root" ]; then |
279 | sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf | 280 | bbwarn "Using ${ROOT_HOME} as root user's home directory is not fully supported by systemd" |
280 | fi | 281 | sed -i -e 's#/root#${ROOT_HOME}#g' ${D}${exec_prefix}/lib/sysusers.d/basic.conf |
282 | fi | ||
283 | fi | ||
281 | install -d ${D}/${base_sbindir} | 284 | install -d ${D}/${base_sbindir} |
282 | if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then | 285 | if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then |
283 | # Provided by a separate recipe | 286 | # Provided by a separate recipe |
@@ -290,15 +293,15 @@ do_install() { | |||
290 | 293 | ||
291 | install -d ${D}${sysconfdir}/udev/rules.d/ | 294 | install -d ${D}${sysconfdir}/udev/rules.d/ |
292 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 295 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
293 | for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do | 296 | for rule in $(find ${UNPACKDIR} -maxdepth 1 -type f -name "*.rules"); do |
294 | install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ | 297 | install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/ |
295 | done | 298 | done |
296 | 299 | ||
297 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${nonarch_libdir}/tmpfiles.d/ | 300 | install -m 0644 ${UNPACKDIR}/00-create-volatile.conf ${D}${nonarch_libdir}/tmpfiles.d/ |
298 | 301 | ||
299 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 302 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
300 | install -d ${D}${sysconfdir}/init.d | 303 | install -d ${D}${sysconfdir}/init.d |
301 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd | 304 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd |
302 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd | 305 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd |
303 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install | 306 | install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install |
304 | fi | 307 | fi |
@@ -369,9 +372,9 @@ do_install() { | |||
369 | # request hostname changes via DBUS without elevating its privileges | 372 | # request hostname changes via DBUS without elevating its privileges |
370 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then | 373 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then |
371 | install -d ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ | 374 | install -d ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ |
372 | install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ | 375 | install -m 0644 ${UNPACKDIR}/00-hostnamed-network-user.conf ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/ |
373 | install -d ${D}${datadir}/dbus-1/system.d/ | 376 | install -d ${D}${datadir}/dbus-1/system.d/ |
374 | install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ | 377 | install -m 0644 ${UNPACKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ |
375 | fi | 378 | fi |
376 | 379 | ||
377 | # create link for existing udev rules | 380 | # create link for existing udev rules |
@@ -379,15 +382,24 @@ do_install() { | |||
379 | 382 | ||
380 | # install default policy for presets | 383 | # install default policy for presets |
381 | # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto | 384 | # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto |
382 | install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset | 385 | install -Dm 0644 ${UNPACKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset |
383 | 386 | ||
384 | # add a profile fragment to disable systemd pager with busybox less | 387 | # add a profile fragment to disable systemd pager with busybox less |
385 | install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh | 388 | install -Dm 0644 ${UNPACKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh |
386 | 389 | ||
387 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then | 390 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then |
388 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ | 391 | sed -i -e 's/#RebootWatchdogSec=10min/RebootWatchdogSec=${WATCHDOG_TIMEOUT}/' \ |
389 | ${D}/${sysconfdir}/systemd/system.conf | 392 | ${D}/${sysconfdir}/systemd/system.conf |
390 | fi | 393 | fi |
394 | |||
395 | if ${@bb.utils.contains('PACKAGECONFIG', 'pni-names', 'true', 'false', d)}; then | ||
396 | if ! grep -q '^NamePolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then | ||
397 | sed -i '/^NamePolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link | ||
398 | fi | ||
399 | if ! grep -q 'AlternativeNamesPolicy=.*mac' ${D}${rootlibexecdir}/systemd/network/99-default.link; then | ||
400 | sed -i '/AlternativeNamesPolicy=/s/$/ mac/' ${D}${rootlibexecdir}/systemd/network/99-default.link | ||
401 | fi | ||
402 | fi | ||
391 | } | 403 | } |
392 | 404 | ||
393 | python populate_packages:prepend (){ | 405 | python populate_packages:prepend (){ |
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 6bbe517df1..17a01e8640 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
@@ -16,9 +16,9 @@ do_compile() { | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -d ${D}${sysconfdir} | 18 | install -d ${D}${sysconfdir} |
19 | install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | 19 | install -m 0644 ${S}/inittab ${D}${sysconfdir}/inittab |
20 | install -d ${D}${base_bindir} | 20 | install -d ${D}${base_bindir} |
21 | install -m 0755 ${WORKDIR}/start_getty ${D}${base_bindir}/start_getty | 21 | install -m 0755 ${S}/start_getty ${D}${base_bindir}/start_getty |
22 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty | 22 | sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty |
23 | 23 | ||
24 | CONSOLES="${SERIAL_CONSOLES}" | 24 | CONSOLES="${SERIAL_CONSOLES}" |
diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb index 6a612468f3..fb9d00891c 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb | |||
@@ -97,18 +97,18 @@ do_install () { | |||
97 | 97 | ||
98 | sed -e \ | 98 | sed -e \ |
99 | 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ | 99 | 's:#PSPLASH_TEXT#:${@bb.utils.contains("PACKAGECONFIG","psplash-text-updates","yes","no", d)}:g' \ |
100 | ${WORKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS | 100 | ${UNPACKDIR}/rcS-default > ${D}${sysconfdir}/default/rcS |
101 | chmod 0644 ${D}${sysconfdir}/default/rcS | 101 | chmod 0644 ${D}${sysconfdir}/default/rcS |
102 | install -m 0755 ${WORKDIR}/rc ${D}${sysconfdir}/init.d | 102 | install -m 0755 ${UNPACKDIR}/rc ${D}${sysconfdir}/init.d |
103 | install -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d | 103 | install -m 0755 ${UNPACKDIR}/rcS ${D}${sysconfdir}/init.d |
104 | install -m 0755 ${WORKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd | 104 | install -m 0755 ${UNPACKDIR}/bootlogd.init ${D}${sysconfdir}/init.d/bootlogd |
105 | ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd | 105 | ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd |
106 | 106 | ||
107 | update-rc.d -r ${D} bootlogd start 07 S . | 107 | update-rc.d -r ${D} bootlogd start 07 S . |
108 | update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . | 108 | update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . |
109 | 109 | ||
110 | install -d ${D}${sysconfdir}/default/volatiles | 110 | install -d ${D}${sysconfdir}/default/volatiles |
111 | install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles | 111 | install -m 0644 ${UNPACKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles |
112 | 112 | ||
113 | chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 113 | chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
114 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 114 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
diff --git a/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb b/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb index 122dd9d8e7..815f625a67 100644 --- a/meta/recipes-core/ttyrun/ttyrun_2.31.0.bb +++ b/meta/recipes-core/ttyrun/ttyrun_2.32.0.bb | |||
@@ -7,7 +7,9 @@ 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 = "6f15ed326491a17d83ca60cd2bda47fb5e8a0175" | 10 | SRCREV = "9eea78b3ad8ab3710fb3b2d80b9cd058d7c8aba7" |
11 | |||
12 | CVE_PRODUCT = "s390-tools" | ||
11 | 13 | ||
12 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
13 | 15 | ||
diff --git a/meta/recipes-core/udev/eudev/netifnames.patch b/meta/recipes-core/udev/eudev/netifnames.patch index 8f6e9a1538..4f8e54d12d 100644 --- a/meta/recipes-core/udev/eudev/netifnames.patch +++ b/meta/recipes-core/udev/eudev/netifnames.patch | |||
@@ -2,7 +2,7 @@ eudev: consider ID_NET_NAME_MAC as an interface name | |||
2 | 2 | ||
3 | eudev might not create names based on slot or path. | 3 | eudev might not create names based on slot or path. |
4 | 4 | ||
5 | Upstream-Status: Submitted [github.com/eudev-project/eudev/pull/274] | 5 | Upstream-Status: Backport [github.com/eudev-project/eudev/pull/274] |
6 | 6 | ||
7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
8 | 8 | ||
diff --git a/meta/recipes-core/udev/eudev_3.2.14.bb b/meta/recipes-core/udev/eudev_3.2.14.bb index 18696679c8..0e5610f77c 100644 --- a/meta/recipes-core/udev/eudev_3.2.14.bb +++ b/meta/recipes-core/udev/eudev_3.2.14.bb | |||
@@ -42,12 +42,12 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" | |||
42 | 42 | ||
43 | do_install:append() { | 43 | do_install:append() { |
44 | install -d ${D}${sysconfdir}/init.d | 44 | install -d ${D}${sysconfdir}/init.d |
45 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | 45 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/udev |
46 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev | 46 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev |
47 | sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev | 47 | sed -i s%@KMOD@%${base_bindir}/kmod% ${D}${sysconfdir}/init.d/udev |
48 | 48 | ||
49 | install -d ${D}${sysconfdir}/udev/rules.d | 49 | install -d ${D}${sysconfdir}/udev/rules.d |
50 | install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules | 50 | install -m 0644 ${UNPACKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules |
51 | 51 | ||
52 | # Use classic network interface naming scheme if no 'pni-names' distro feature | 52 | # Use classic network interface naming scheme if no 'pni-names' distro feature |
53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', 'false', 'true', d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pni-names', 'false', 'true', d)}; then |
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 30f1fe76d0..a3e5d12b81 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
@@ -20,21 +20,21 @@ MOUNT_BASE = "/run/media" | |||
20 | do_install() { | 20 | do_install() { |
21 | install -d ${D}${sysconfdir}/udev/rules.d | 21 | install -d ${D}${sysconfdir}/udev/rules.d |
22 | 22 | ||
23 | install -m 0644 ${WORKDIR}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules | 23 | install -m 0644 ${S}/automount.rules ${D}${sysconfdir}/udev/rules.d/automount.rules |
24 | install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules | 24 | install -m 0644 ${S}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules |
25 | install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules | 25 | install -m 0644 ${S}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules |
26 | 26 | ||
27 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d | 27 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d |
28 | install -m 0644 ${WORKDIR}/mount.ignorelist ${D}${sysconfdir}/udev/ | 28 | install -m 0644 ${S}/mount.ignorelist ${D}${sysconfdir}/udev/ |
29 | 29 | ||
30 | install -d ${D}${sysconfdir}/udev/scripts/ | 30 | install -d ${D}${sysconfdir}/udev/scripts/ |
31 | 31 | ||
32 | install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh | 32 | install -m 0755 ${S}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh |
33 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 33 | sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
34 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 34 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
35 | sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh | 35 | sed -i 's|@MOUNT_BASE@|${MOUNT_BASE}|g' ${D}${sysconfdir}/udev/scripts/mount.sh |
36 | 36 | ||
37 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 37 | install -m 0755 ${S}/network.sh ${D}${sysconfdir}/udev/scripts |
38 | } | 38 | } |
39 | 39 | ||
40 | pkg_postinst:${PN} () { | 40 | pkg_postinst:${PN} () { |
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index ba622fe716..27723c88ef 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb | |||
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f5354 | |||
8 | 8 | ||
9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" | 9 | SRC_URI = "git://git.yoctoproject.org/update-rc.d;branch=master;protocol=https" |
10 | SRCREV = "b8f950105010270a768aa12245d6abf166346015" | 10 | SRCREV = "b8f950105010270a768aa12245d6abf166346015" |
11 | PV .= "+git" | ||
11 | 12 | ||
12 | UPSTREAM_CHECK_COMMITS = "1" | 13 | UPSTREAM_CHECK_COMMITS = "1" |
13 | 14 | ||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 4e9d22f269..d506783f9a 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -6,14 +6,15 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
6 | 6 | ||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
9 | LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause" | 9 | LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" |
10 | LICENSE:${PN}-fcntl-lock = "MIT" | ||
10 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" | 11 | LICENSE:${PN}-fdisk = "GPL-1.0-or-later" |
11 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" | 12 | LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" |
12 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" | 13 | LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" |
13 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" | 14 | LICENSE:${PN}-libmount = "LGPL-2.1-or-later" |
14 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" | 15 | LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" |
15 | 16 | ||
16 | LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 \ | 17 | LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba \ |
17 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 18 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
18 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 19 | file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
19 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ | 20 | file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ |
@@ -29,6 +30,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=6b0e0a2320e66e62eef9b8149a6faec4 | |||
29 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" | 30 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" |
30 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 31 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
31 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 32 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
33 | file://mit-license.patch \ | ||
32 | file://configure-sbindir.patch \ | 34 | file://configure-sbindir.patch \ |
33 | file://runuser.pamd \ | 35 | file://runuser.pamd \ |
34 | file://runuser-l.pamd \ | 36 | file://runuser-l.pamd \ |
@@ -37,6 +39,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
37 | file://display_testname_for_subtest.patch \ | 39 | file://display_testname_for_subtest.patch \ |
38 | file://avoid_parallel_tests.patch \ | 40 | file://avoid_parallel_tests.patch \ |
39 | file://0001-login-utils-include-libgen.h-for-basename-API.patch \ | 41 | file://0001-login-utils-include-libgen.h-for-basename-API.patch \ |
42 | file://fcntl-lock.c \ | ||
40 | " | 43 | " |
41 | 44 | ||
42 | SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" | 45 | SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" |
diff --git a/meta/recipes-core/util-linux/util-linux/fcntl-lock.c b/meta/recipes-core/util-linux/util-linux/fcntl-lock.c new file mode 100644 index 0000000000..966d8c5ecb --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/fcntl-lock.c | |||
@@ -0,0 +1,332 @@ | |||
1 | // From https://github.com/magnumripper/fcntl-lock | ||
2 | // SPDX-License-Identifier: MIT | ||
3 | /* ----------------------------------------------------------------------- * | ||
4 | * | ||
5 | * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved | ||
6 | * Copyright 2015 magnum (fcntl version) | ||
7 | * | ||
8 | * Permission is hereby granted, free of charge, to any person | ||
9 | * obtaining a copy of this software and associated documentation | ||
10 | * files (the "Software"), to deal in the Software without | ||
11 | * restriction, including without limitation the rights to use, | ||
12 | * copy, modify, merge, publish, distribute, sublicense, and/or | ||
13 | * sell copies of the Software, and to permit persons to whom | ||
14 | * the Software is furnished to do so, subject to the following | ||
15 | * conditions: | ||
16 | * | ||
17 | * The above copyright notice and this permission notice shall | ||
18 | * be included in all copies or substantial portions of the Software. | ||
19 | * | ||
20 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
21 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
22 | * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
23 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
24 | * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
25 | * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
26 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
27 | * OTHER DEALINGS IN THE SOFTWARE. | ||
28 | * | ||
29 | * ----------------------------------------------------------------------- */ | ||
30 | |||
31 | #include <errno.h> | ||
32 | #include <stdio.h> | ||
33 | #include <stdlib.h> | ||
34 | #include <fcntl.h> | ||
35 | #include <unistd.h> | ||
36 | #include <getopt.h> | ||
37 | #include <signal.h> | ||
38 | #include <ctype.h> | ||
39 | #include <string.h> | ||
40 | #include <paths.h> | ||
41 | #include <sysexits.h> | ||
42 | #include <sys/types.h> | ||
43 | #include <sys/file.h> | ||
44 | #include <sys/time.h> | ||
45 | #include <sys/wait.h> | ||
46 | |||
47 | #define PACKAGE_STRING "magnum" | ||
48 | #define _(x) (x) | ||
49 | |||
50 | static const struct option long_options[] = { | ||
51 | { "shared", 0, NULL, 's' }, | ||
52 | { "exclusive", 0, NULL, 'x' }, | ||
53 | { "unlock", 0, NULL, 'u' }, | ||
54 | { "nonblocking", 0, NULL, 'n' }, | ||
55 | { "nb", 0, NULL, 'n' }, | ||
56 | { "timeout", 1, NULL, 'w' }, | ||
57 | { "wait", 1, NULL, 'w' }, | ||
58 | { "close", 0, NULL, 'o' }, | ||
59 | { "help", 0, NULL, 'h' }, | ||
60 | { "version", 0, NULL, 'V' }, | ||
61 | { 0, 0, 0, 0 } | ||
62 | }; | ||
63 | |||
64 | const char *program; | ||
65 | |||
66 | static void usage(int ex) | ||
67 | { | ||
68 | fputs("fcntl-lock (" PACKAGE_STRING ")\n", stderr); | ||
69 | fprintf(stderr, | ||
70 | _("Usage: %1$s [-sxun][-w #] fd#\n" | ||
71 | " %1$s [-sxon][-w #] file [-c] command...\n" | ||
72 | " %1$s [-sxon][-w #] directory [-c] command...\n" | ||
73 | " -s --shared Get a shared lock\n" | ||
74 | " -x --exclusive Get an exclusive lock\n" | ||
75 | " -u --unlock Remove a lock\n" | ||
76 | " -n --nonblock Fail rather than wait\n" | ||
77 | " -w --timeout Wait for a limited amount of time\n" | ||
78 | " -o --close Close file descriptor before running command\n" | ||
79 | " -c --command Run a single command string through the shell\n" | ||
80 | " -h --help Display this text\n" | ||
81 | " -V --version Display version\n"), | ||
82 | program); | ||
83 | exit(ex); | ||
84 | } | ||
85 | |||
86 | |||
87 | static sig_atomic_t timeout_expired = 0; | ||
88 | |||
89 | static void timeout_handler(int sig) | ||
90 | { | ||
91 | (void)sig; | ||
92 | |||
93 | timeout_expired = 1; | ||
94 | } | ||
95 | |||
96 | |||
97 | static char * strtotimeval(const char *str, struct timeval *tv) | ||
98 | { | ||
99 | char *s; | ||
100 | long fs; /* Fractional seconds */ | ||
101 | int i; | ||
102 | |||
103 | tv->tv_sec = strtol(str, &s, 10); | ||
104 | fs = 0; | ||
105 | |||
106 | if ( *s == '.' ) { | ||
107 | s++; | ||
108 | |||
109 | for ( i = 0 ; i < 6 ; i++ ) { | ||
110 | if ( !isdigit(*s) ) | ||
111 | break; | ||
112 | |||
113 | fs *= 10; | ||
114 | fs += *s++ - '0'; | ||
115 | } | ||
116 | |||
117 | for ( ; i < 6; i++ ) | ||
118 | fs *= 10; | ||
119 | |||
120 | while ( isdigit(*s) ) | ||
121 | s++; | ||
122 | } | ||
123 | |||
124 | tv->tv_usec = fs; | ||
125 | return s; | ||
126 | } | ||
127 | |||
128 | int main(int argc, char *argv[]) | ||
129 | { | ||
130 | struct itimerval timeout, old_timer; | ||
131 | int have_timeout = 0; | ||
132 | int type = F_WRLCK; | ||
133 | int block = F_SETLKW; | ||
134 | int fd = -1; | ||
135 | int opt, ix; | ||
136 | int do_close = 0; | ||
137 | int err; | ||
138 | int status; | ||
139 | char *eon; | ||
140 | char **cmd_argv = NULL, *sh_c_argv[4]; | ||
141 | struct flock lock; | ||
142 | const char *filename = NULL; | ||
143 | struct sigaction sa, old_sa; | ||
144 | |||
145 | program = argv[0]; | ||
146 | |||
147 | if ( argc < 2 ) | ||
148 | usage(EX_USAGE); | ||
149 | |||
150 | memset(&timeout, 0, sizeof timeout); | ||
151 | |||
152 | optopt = 0; | ||
153 | while ( (opt = getopt_long(argc, argv, "+sexnouw:hV?", long_options, &ix)) != EOF ) { | ||
154 | switch(opt) { | ||
155 | case 's': | ||
156 | type = F_RDLCK; | ||
157 | break; | ||
158 | case 'e': | ||
159 | case 'x': | ||
160 | type = F_WRLCK; | ||
161 | break; | ||
162 | case 'u': | ||
163 | type = F_UNLCK; | ||
164 | break; | ||
165 | case 'o': | ||
166 | do_close = 1; | ||
167 | break; | ||
168 | case 'n': | ||
169 | block = F_SETLK; | ||
170 | break; | ||
171 | case 'w': | ||
172 | have_timeout = 1; | ||
173 | eon = strtotimeval(optarg, &timeout.it_value); | ||
174 | if ( *eon ) | ||
175 | usage(EX_USAGE); | ||
176 | break; | ||
177 | case 'V': | ||
178 | printf("fcntl-lock (%s)\n", PACKAGE_STRING); | ||
179 | exit(0); | ||
180 | default: | ||
181 | /* optopt will be set if this was an unrecognized option, i.e. *not* 'h' or '?' */ | ||
182 | usage(optopt ? EX_USAGE : 0); | ||
183 | break; | ||
184 | } | ||
185 | } | ||
186 | |||
187 | if ( argc > optind+1 ) { | ||
188 | /* Run command */ | ||
189 | |||
190 | if ( !strcmp(argv[optind+1], "-c") || | ||
191 | !strcmp(argv[optind+1], "--command") ) { | ||
192 | |||
193 | if ( argc != optind+3 ) { | ||
194 | fprintf(stderr, _("%s: %s requires exactly one command argument\n"), | ||
195 | program, argv[optind+1]); | ||
196 | exit(EX_USAGE); | ||
197 | } | ||
198 | |||
199 | cmd_argv = sh_c_argv; | ||
200 | |||
201 | cmd_argv[0] = getenv("SHELL"); | ||
202 | if ( !cmd_argv[0] || !*cmd_argv[0] ) | ||
203 | cmd_argv[0] = _PATH_BSHELL; | ||
204 | |||
205 | cmd_argv[1] = "-c"; | ||
206 | cmd_argv[2] = argv[optind+2]; | ||
207 | cmd_argv[3] = 0; | ||
208 | } else { | ||
209 | cmd_argv = &argv[optind+1]; | ||
210 | } | ||
211 | |||
212 | filename = argv[optind]; | ||
213 | fd = open(filename, O_RDWR|O_NOCTTY|O_CREAT, 0666); | ||
214 | /* Linux doesn't like O_CREAT on a directory, even though it should be a | ||
215 | no-op */ | ||
216 | if (fd < 0 && errno == EISDIR) | ||
217 | fd = open(filename, O_RDONLY|O_NOCTTY); | ||
218 | |||
219 | if ( fd < 0 ) { | ||
220 | err = errno; | ||
221 | fprintf(stderr, _("%s: cannot open lock file %s: %s\n"), | ||
222 | program, argv[optind], strerror(err)); | ||
223 | exit((err == ENOMEM||err == EMFILE||err == ENFILE) ? EX_OSERR : | ||
224 | (err == EROFS||err == ENOSPC) ? EX_CANTCREAT : | ||
225 | EX_NOINPUT); | ||
226 | } | ||
227 | |||
228 | } else if (optind < argc) { | ||
229 | /* Use provided file descriptor */ | ||
230 | |||
231 | fd = (int)strtol(argv[optind], &eon, 10); | ||
232 | if ( *eon || !argv[optind] ) { | ||
233 | fprintf(stderr, _("%s: bad number: %s\n"), program, argv[optind]); | ||
234 | exit(EX_USAGE); | ||
235 | } | ||
236 | |||
237 | } else { | ||
238 | /* Bad options */ | ||
239 | |||
240 | fprintf(stderr, _("%s: requires file descriptor, file or directory\n"), | ||
241 | program); | ||
242 | exit(EX_USAGE); | ||
243 | } | ||
244 | |||
245 | |||
246 | if ( have_timeout ) { | ||
247 | if ( timeout.it_value.tv_sec == 0 && | ||
248 | timeout.it_value.tv_usec == 0 ) { | ||
249 | /* -w 0 is equivalent to -n; this has to be special-cased | ||
250 | because setting an itimer to zero means disabled! */ | ||
251 | |||
252 | have_timeout = 0; | ||
253 | block = F_SETLK; | ||
254 | } else { | ||
255 | memset(&sa, 0, sizeof sa); | ||
256 | |||
257 | sa.sa_handler = timeout_handler; | ||
258 | sa.sa_flags = SA_RESETHAND; | ||
259 | sigaction(SIGALRM, &sa, &old_sa); | ||
260 | |||
261 | setitimer(ITIMER_REAL, &timeout, &old_timer); | ||
262 | } | ||
263 | } | ||
264 | |||
265 | memset(&lock, 0, sizeof(lock)); | ||
266 | lock.l_type = type; | ||
267 | while ( fcntl(fd, block, &lock) ) { | ||
268 | switch( (err = errno) ) { | ||
269 | case EAGAIN: /* -n option set and failed to lock */ | ||
270 | case EACCES: /* -n option set and failed to lock */ | ||
271 | exit(1); | ||
272 | case EINTR: /* Signal received */ | ||
273 | if ( timeout_expired ) | ||
274 | exit(1); /* -w option set and failed to lock */ | ||
275 | continue; /* otherwise try again */ | ||
276 | default: /* Other errors */ | ||
277 | if ( filename ) | ||
278 | fprintf(stderr, "%s: %s: %s\n", program, filename, strerror(err)); | ||
279 | else | ||
280 | fprintf(stderr, "%s: %d: %s\n", program, fd, strerror(err)); | ||
281 | exit((err == ENOLCK||err == ENOMEM) ? EX_OSERR : EX_DATAERR); | ||
282 | } | ||
283 | } | ||
284 | |||
285 | if ( have_timeout ) { | ||
286 | setitimer(ITIMER_REAL, &old_timer, NULL); /* Cancel itimer */ | ||
287 | sigaction(SIGALRM, &old_sa, NULL); /* Cancel signal handler */ | ||
288 | } | ||
289 | |||
290 | status = 0; | ||
291 | |||
292 | if ( cmd_argv ) { | ||
293 | pid_t w, f; | ||
294 | |||
295 | /* Clear any inherited settings */ | ||
296 | signal(SIGCHLD, SIG_DFL); | ||
297 | f = fork(); | ||
298 | |||
299 | if ( f < 0 ) { | ||
300 | err = errno; | ||
301 | fprintf(stderr, _("%s: fork failed: %s\n"), program, strerror(err)); | ||
302 | exit(EX_OSERR); | ||
303 | } else if ( f == 0 ) { | ||
304 | if ( do_close ) | ||
305 | close(fd); | ||
306 | err = errno; | ||
307 | execvp(cmd_argv[0], cmd_argv); | ||
308 | /* execvp() failed */ | ||
309 | fprintf(stderr, "%s: %s: %s\n", program, cmd_argv[0], strerror(err)); | ||
310 | _exit((err == ENOMEM) ? EX_OSERR: EX_UNAVAILABLE); | ||
311 | } else { | ||
312 | do { | ||
313 | w = waitpid(f, &status, 0); | ||
314 | if (w == -1 && errno != EINTR) | ||
315 | break; | ||
316 | } while ( w != f ); | ||
317 | |||
318 | if (w == -1) { | ||
319 | err = errno; | ||
320 | status = EXIT_FAILURE; | ||
321 | fprintf(stderr, "%s: waitpid failed: %s\n", program, strerror(err)); | ||
322 | } else if ( WIFEXITED(status) ) | ||
323 | status = WEXITSTATUS(status); | ||
324 | else if ( WIFSIGNALED(status) ) | ||
325 | status = WTERMSIG(status) + 128; | ||
326 | else | ||
327 | status = EX_OSERR; /* WTF? */ | ||
328 | } | ||
329 | } | ||
330 | |||
331 | return status; | ||
332 | } | ||
diff --git a/meta/recipes-core/util-linux/util-linux/mit-license.patch b/meta/recipes-core/util-linux/util-linux/mit-license.patch new file mode 100644 index 0000000000..afbec98f18 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/mit-license.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 5b8fab1584017d9d9be008c23b90128bba41a7b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 28 Mar 2024 12:16:57 +0000 | ||
4 | Subject: [PATCH] README.licensing/flock: Add MIT license mention | ||
5 | |||
6 | Looking at the license text, flock.c is under the MIT license (see | ||
7 | https://spdx.org/licenses/MIT). | ||
8 | |||
9 | Add an SPDX license identifier header and add to the list of licenses the | ||
10 | source so everything is correctly listed/identified. | ||
11 | |||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2870] | ||
15 | |||
16 | --- | ||
17 | README.licensing | 2 ++ | ||
18 | sys-utils/flock.c | 4 +++- | ||
19 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/README.licensing b/README.licensing | ||
22 | index 4454f8392a..535ad34813 100644 | ||
23 | --- a/README.licensing | ||
24 | +++ b/README.licensing | ||
25 | @@ -12,6 +12,8 @@ There is code under: | ||
26 | |||
27 | * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version | ||
28 | |||
29 | + * MIT - MIT License | ||
30 | + | ||
31 | * BSD-2-Clause - Simplified BSD License | ||
32 | |||
33 | * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License | ||
34 | diff --git a/sys-utils/flock.c b/sys-utils/flock.c | ||
35 | index fed29d7270..7d878ff810 100644 | ||
36 | --- a/sys-utils/flock.c | ||
37 | +++ b/sys-utils/flock.c | ||
38 | @@ -1,4 +1,6 @@ | ||
39 | -/* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved | ||
40 | +/* SPDX-License-Identifier: MIT | ||
41 | + * | ||
42 | + * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved | ||
43 | * | ||
44 | * Permission is hereby granted, free of charge, to any person | ||
45 | * obtaining a copy of this software and associated documentation | ||
diff --git a/meta/recipes-core/util-linux/util-linux_2.39.3.bb b/meta/recipes-core/util-linux/util-linux_2.39.3.bb index 3e87dcc2c2..2cd7750afc 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.3.bb +++ b/meta/recipes-core/util-linux/util-linux_2.39.3.bb | |||
@@ -147,6 +147,11 @@ SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" | |||
147 | SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" | 147 | SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" |
148 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" | 148 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" |
149 | 149 | ||
150 | do_compile:append () { | ||
151 | cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c | ||
152 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock | ||
153 | } | ||
154 | |||
150 | do_install () { | 155 | do_install () { |
151 | # with ccache the timestamps on compiled files may | 156 | # with ccache the timestamps on compiled files may |
152 | # end up earlier than on their inputs, this allows | 157 | # end up earlier than on their inputs, this allows |
@@ -182,13 +187,15 @@ do_install () { | |||
182 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall | 187 | echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall |
183 | 188 | ||
184 | rm -f ${D}${bindir}/chkdupexe | 189 | rm -f ${D}${bindir}/chkdupexe |
190 | |||
191 | install -m 0755 ${B}/fcntl-lock ${D}${bindir} | ||
185 | } | 192 | } |
186 | 193 | ||
187 | do_install:append:class-target () { | 194 | do_install:append:class-target () { |
188 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | 195 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then |
189 | install -d ${D}${sysconfdir}/pam.d | 196 | install -d ${D}${sysconfdir}/pam.d |
190 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 197 | install -m 0644 ${UNPACKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
191 | install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l | 198 | install -m 0644 ${UNPACKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l |
192 | # Required for "su -" aka "su --login" because | 199 | # Required for "su -" aka "su --login" because |
193 | # otherwise it uses "other", which has "auth pam_deny.so" | 200 | # otherwise it uses "other", which has "auth pam_deny.so" |
194 | # and thus prevents the operation. | 201 | # and thus prevents the operation. |
@@ -275,8 +282,11 @@ blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 | |||
275 | mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ | 282 | mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ |
276 | " | 283 | " |
277 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" | 284 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" |
285 | ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'chfn-chsh', 'chfn.1 chsh.1', '', d)}" | ||
278 | 286 | ||
279 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" | 287 | ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" |
288 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" | ||
289 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" | ||
280 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" | 290 | ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" |
281 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" | 291 | ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" |
282 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | 292 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" |
@@ -312,7 +322,7 @@ do_install_ptest() { | |||
312 | cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ | 322 | cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ |
313 | cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected | 323 | cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected |
314 | cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ | 324 | cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ |
315 | cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} | 325 | cp ${B}/config.h ${D}${PTEST_PATH} |
316 | 326 | ||
317 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest | 327 | sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest |
318 | 328 | ||
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc index 5fcb4292b3..3b6f47d4ce 100644 --- a/meta/recipes-devtools/binutils/binutils-2.42.inc +++ b/meta/recipes-devtools/binutils/binutils-2.42.inc | |||
@@ -35,5 +35,6 @@ SRC_URI = "\ | |||
35 | file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ | 35 | file://0012-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ |
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 | " | 39 | " |
39 | S = "${WORKDIR}/git" | 40 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch index 8f74c639d5..05f1ed0dc5 100644 --- a/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch +++ b/meta/recipes-devtools/binutils/binutils/0008-Use-libtool-2.4.patch | |||
@@ -19543,18 +19543,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19543 | # FIXME: first we should search . and the directory the executable is in | 19543 | # FIXME: first we should search . and the directory the executable is in |
19544 | shlibpath_var=PATH | 19544 | shlibpath_var=PATH |
19545 | ;; | 19545 | ;; |
19546 | @@ -13596,7 +14245,11 @@ else | ||
19547 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19548 | lt_status=$lt_dlunknown | ||
19549 | cat > conftest.$ac_ext <<_LT_EOF | ||
19550 | +<<<<<<< HEAD | ||
19551 | #line 13599 "configure" | ||
19552 | +======= | ||
19553 | +#line $LINENO "configure" | ||
19554 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19555 | #include "confdefs.h" | ||
19556 | |||
19557 | #if HAVE_DLFCN_H | ||
19558 | @@ -13640,10 +14293,10 @@ else | 19546 | @@ -13640,10 +14293,10 @@ else |
19559 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19547 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19560 | correspondingly for the symbols needed. */ | 19548 | correspondingly for the symbols needed. */ |
@@ -19568,18 +19556,6 @@ index 3701bd8e796..9e36ae7c51c 100755 | |||
19568 | int main () | 19556 | int main () |
19569 | { | 19557 | { |
19570 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); | 19558 | void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); |
19571 | @@ -13702,7 +14355,11 @@ else | ||
19572 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | ||
19573 | lt_status=$lt_dlunknown | ||
19574 | cat > conftest.$ac_ext <<_LT_EOF | ||
19575 | +<<<<<<< HEAD | ||
19576 | #line 13705 "configure" | ||
19577 | +======= | ||
19578 | +#line $LINENO "configure" | ||
19579 | +>>>>>>> b932158cf4c (Use libtool 2.4) | ||
19580 | #include "confdefs.h" | ||
19581 | |||
19582 | #if HAVE_DLFCN_H | ||
19583 | @@ -13746,10 +14403,10 @@ else | 19559 | @@ -13746,10 +14403,10 @@ else |
19584 | /* When -fvisbility=hidden is used, assume the code has been annotated | 19560 | /* When -fvisbility=hidden is used, assume the code has been annotated |
19585 | correspondingly for the symbols needed. */ | 19561 | correspondingly for the symbols needed. */ |
diff --git a/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch b/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch new file mode 100644 index 0000000000..0d3d289eba --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0015-gprofng-change-use-of-bignum-to-bigint.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=3243d790ee32aa8eda69226d81b1e79dbd1dcd87] | ||
2 | |||
3 | Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com> | ||
4 | |||
5 | diff --git a/gprofng/gp-display-html/gp-display-html.in b/gprofng/gp-display-html/gp-display-html.in | ||
6 | index 6f37ca282e7..306c99a0ec3 100644 | ||
7 | --- a/gprofng/gp-display-html/gp-display-html.in | ||
8 | +++ b/gprofng/gp-display-html/gp-display-html.in | ||
9 | @@ -25,7 +25,7 @@ use warnings; | ||
10 | # Disable before release | ||
11 | # use Perl::Critic; | ||
12 | |||
13 | -use bignum; | ||
14 | +use bigint; | ||
15 | use List::Util qw (max); | ||
16 | use Cwd qw (abs_path cwd); | ||
17 | use File::Basename; | ||
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index 4d8ce4c741..8a211366bf 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | |||
@@ -132,7 +132,7 @@ do_install () { | |||
132 | 132 | ||
133 | oe_runmake install NO_PYTHON_COMPILE=1 | 133 | oe_runmake install NO_PYTHON_COMPILE=1 |
134 | install -d ${D}${sysconfdir}/init.d | 134 | install -d ${D}${sysconfdir}/init.d |
135 | install -m 0755 ${WORKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d | 135 | install -m 0755 ${UNPACKDIR}/bootchartd_stop.sh ${D}${sysconfdir}/init.d |
136 | 136 | ||
137 | echo 'EXIT_PROC="$EXIT_PROC matchbox-window-manager"' >> ${D}${sysconfdir}/bootchartd.conf | 137 | echo 'EXIT_PROC="$EXIT_PROC matchbox-window-manager"' >> ${D}${sysconfdir}/bootchartd.conf |
138 | 138 | ||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.7.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb index 8132c2cc72..15cc7ac244 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.7.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.bb | |||
@@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib" | |||
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 | " | 20 | " |
21 | SRCREV = "60abf7a90776c2405f616182ef6129474bbcb109" | 21 | SRCREV = "3793e987d2b4e878410da16f33d963043d137d48" |
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | PACKAGECONFIG ??= " \ | 24 | PACKAGECONFIG ??= " \ |
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb index 546d117156..7f89441fb4 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb | |||
@@ -54,9 +54,9 @@ do_install() { | |||
54 | # The following codes are here because eSDK needs to provide compatibilty | 54 | # The following codes are here because eSDK needs to provide compatibilty |
55 | # for SDK. That is, eSDK could also be used like traditional SDK. | 55 | # for SDK. That is, eSDK could also be used like traditional SDK. |
56 | mkdir -p ${D}${datadir}/cmake | 56 | mkdir -p ${D}${datadir}/cmake |
57 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 57 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
58 | mkdir -p ${D}${base_prefix}/environment-setup.d | 58 | mkdir -p ${D}${base_prefix}/environment-setup.d |
59 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh | 59 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${base_prefix}/environment-setup.d/cmake.sh |
60 | 60 | ||
61 | # Help docs create tons of files in the native sysroot and aren't needed there | 61 | # Help docs create tons of files in the native sysroot and aren't needed there |
62 | rm -rf ${D}${datadir}/cmake-*/Help | 62 | rm -rf ${D}${datadir}/cmake-*/Help |
diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb b/meta/recipes-devtools/cmake/cmake_3.28.3.bb index 6a9a3266df..9146fa8c0f 100644 --- a/meta/recipes-devtools/cmake/cmake_3.28.3.bb +++ b/meta/recipes-devtools/cmake/cmake_3.28.3.bb | |||
@@ -48,15 +48,15 @@ EXTRA_OECMAKE=" \ | |||
48 | 48 | ||
49 | do_install:append:class-nativesdk() { | 49 | do_install:append:class-nativesdk() { |
50 | mkdir -p ${D}${datadir}/cmake | 50 | mkdir -p ${D}${datadir}/cmake |
51 | install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ | 51 | install -m 644 ${UNPACKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/ |
52 | 52 | ||
53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 53 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
54 | install -m 644 ${WORKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh | 54 | install -m 644 ${UNPACKDIR}/environment.d-cmake.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh |
55 | 55 | ||
56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template | 56 | # install cmake-setup.py to create arch-specific toolchain cmake file from template |
57 | install -m 0644 ${WORKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ | 57 | install -m 0644 ${UNPACKDIR}/SDKToolchainConfig.cmake.template ${D}${datadir}/cmake/ |
58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 58 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
59 | install -m 0755 ${WORKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 59 | install -m 0755 ${UNPACKDIR}/cmake-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
60 | } | 60 | } |
61 | 61 | ||
62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" | 62 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}" |
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.4.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.0.bb index f498bcb655..1f97c99bde 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.4.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.1.0.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 = "4ade5ea5c4c636f045f29a2d8d8a57241fc5d24e" | 12 | SRCREV = "10a8a7af4f1de3f98a21a7d08fe3a46ef306d197" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
diff --git a/meta/recipes-devtools/distcc/distcc_3.4.bb b/meta/recipes-devtools/distcc/distcc_3.4.bb index 45fc7cde53..ab138b3ab6 100644 --- a/meta/recipes-devtools/distcc/distcc_3.4.bb +++ b/meta/recipes-devtools/distcc/distcc_3.4.bb | |||
@@ -50,10 +50,10 @@ do_install() { | |||
50 | oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install | 50 | oe_runmake 'DESTDIR=${D}' "GZIP_BIN=gzip -n" install |
51 | install -d ${D}${sysconfdir}/init.d/ | 51 | install -d ${D}${sysconfdir}/init.d/ |
52 | install -d ${D}${sysconfdir}/default | 52 | install -d ${D}${sysconfdir}/default |
53 | install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ | 53 | install -m 0755 ${UNPACKDIR}/distcc ${D}${sysconfdir}/init.d/ |
54 | install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc | 54 | install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/distcc |
55 | install -d ${D}${systemd_system_unitdir}/ | 55 | install -d ${D}${systemd_system_unitdir}/ |
56 | install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_system_unitdir} | 56 | install -m 0644 ${UNPACKDIR}/distcc.service ${D}${systemd_system_unitdir} |
57 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service | 57 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service |
58 | } | 58 | } |
59 | 59 | ||
diff --git a/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch b/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch new file mode 100644 index 0000000000..6bffe9af0a --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-lock.py-fix-Exception-handling.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 3881757eabfde2ff54400ab127b106ab085d83f0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Wed, 13 Mar 2024 11:22:05 +0800 | ||
4 | Subject: [PATCH] lock.py: fix Exception handling | ||
5 | |||
6 | Before, when logdir is not writable, _try_lock will raise an Exception | ||
7 | like "Permission denied: '/var/log/log_lock.pid'", and in this case, | ||
8 | _unlock_thread will not be called and the variable count will not be | ||
9 | handled, it maybe cause log_lock.pid not be deleted in case like [1]. | ||
10 | |||
11 | For [1], it is an cross compile case, when dnf install some packages to | ||
12 | rootfs, seems like some threads don't do chroot like work, some threads | ||
13 | do chroot like work. so for the threads don't do chroot, "Permission denied" | ||
14 | Exception happend, for the threads that do chroot, log_lock.pid will be | ||
15 | created under installroot/var/log/log_lock.pid, since variable count not | ||
16 | handled correct before, log_lock.pid may not be deleted correctly. | ||
17 | |||
18 | So fixed like this, if _try_lock raise Exception, _unlock_thread first, | ||
19 | then raise the Exception. | ||
20 | |||
21 | [1] https://github.com/rpm-software-management/dnf/issues/1963 | ||
22 | |||
23 | Upstream-Status: Submitted [ https://github.com/rpm-software-management/dnf/pull/2065 ] | ||
24 | |||
25 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
26 | --- | ||
27 | dnf/lock.py | 12 ++++++++++-- | ||
28 | 1 file changed, 10 insertions(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/dnf/lock.py b/dnf/lock.py | ||
31 | index 6817aac9..5718062a 100644 | ||
32 | --- a/dnf/lock.py | ||
33 | +++ b/dnf/lock.py | ||
34 | @@ -128,7 +128,11 @@ class ProcessLock(object): | ||
35 | self._lock_thread() | ||
36 | prev_pid = -1 | ||
37 | my_pid = os.getpid() | ||
38 | - pid = self._try_lock(my_pid) | ||
39 | + try: | ||
40 | + pid = self._try_lock(my_pid) | ||
41 | + except Exception: | ||
42 | + self._unlock_thread() | ||
43 | + raise | ||
44 | while pid != my_pid: | ||
45 | if pid != -1: | ||
46 | if not self.blocking: | ||
47 | @@ -140,7 +144,11 @@ class ProcessLock(object): | ||
48 | logger.info(msg) | ||
49 | prev_pid = pid | ||
50 | time.sleep(1) | ||
51 | - pid = self._try_lock(my_pid) | ||
52 | + try: | ||
53 | + pid = self._try_lock(my_pid) | ||
54 | + except Exception: | ||
55 | + self._unlock_thread() | ||
56 | + raise | ||
57 | |||
58 | def __exit__(self, *exc_args): | ||
59 | if self.count == 1: | ||
60 | -- | ||
61 | 2.25.1 | ||
62 | |||
diff --git a/meta/recipes-devtools/dnf/dnf_4.19.0.bb b/meta/recipes-devtools/dnf/dnf_4.19.2.bb index 784d7a94b3..cc91dbe400 100644 --- a/meta/recipes-devtools/dnf/dnf_4.19.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.19.2.bb | |||
@@ -15,11 +15,12 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc | |||
15 | file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 15 | file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
16 | file://0030-Run-python-scripts-using-env.patch \ | 16 | file://0030-Run-python-scripts-using-env.patch \ |
17 | file://0001-set-python-path-for-completion_helper.patch \ | 17 | file://0001-set-python-path-for-completion_helper.patch \ |
18 | file://0001-lock.py-fix-Exception-handling.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" | 21 | SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" |
21 | 22 | ||
22 | SRCREV = "566a61f9d8a2830ac6dcc3a94c59224cef1c3d03" | 23 | SRCREV = "9b2b2e8ddab99caba4bc8059cab4263163172e81" |
23 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 24 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
24 | 25 | ||
25 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index e4b4201b1f..bbd574e287 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://docbook.org" | |||
8 | # upgrading this recipe, please verify whether this is still needed. | 8 | # upgrading this recipe, please verify whether this is still needed. |
9 | 9 | ||
10 | LICENSE = "OASIS" | 10 | LICENSE = "OASIS" |
11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | 11 | LIC_FILES_CHKSUM = "file://${S}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" |
12 | 12 | ||
13 | # To support apps with xml schema backward compatibility, we must | 13 | # To support apps with xml schema backward compatibility, we must |
14 | # install a set of schemas. Install the latest based on PV and then | 14 | # install a set of schemas. Install the latest based on PV and then |
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index b3e8c05d62..4c1d42e0af 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -11,7 +11,7 @@ RDEPENDS:${PN}:class-native = "" | |||
11 | 11 | ||
12 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
13 | 13 | ||
14 | inherit autotools gettext perlnative pkgconfig perl-version update-alternatives | 14 | inherit autotools gettext perlnative pkgconfig perl-version update-alternatives bash-completion |
15 | 15 | ||
16 | PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" | 16 | PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" |
17 | 17 | ||
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 52e85705fa..b8a8697585 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 279e4c274f5f295823cf9fa95d3ba131f6d711db Mon Sep 17 00:00:00 2001 | 1 | From 21459bb8d9a997e6a92885a4ef337ede9cc5aba7 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: 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 |
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 2 files changed, 2 insertions(+) | 11 | 2 files changed, 2 insertions(+) |
12 | 12 | ||
13 | diff --git a/data/cputable b/data/cputable | 13 | diff --git a/data/cputable b/data/cputable |
14 | index 9f2a8e0..1d935b1 100644 | 14 | index 575c008e3..7a801a03a 100644 |
15 | --- a/data/cputable | 15 | --- a/data/cputable |
16 | +++ b/data/cputable | 16 | +++ b/data/cputable |
17 | @@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big | 17 | @@ -43,6 +43,7 @@ powerpc powerpc (powerpc|ppc) 32 big |
18 | powerpcel powerpcle powerpcle 32 little | 18 | powerpcel powerpcle powerpcle 32 little |
19 | ppc64 powerpc64 (powerpc|ppc)64 64 big | 19 | ppc64 powerpc64 (powerpc|ppc)64 64 big |
20 | ppc64el powerpc64le powerpc64le 64 little | 20 | ppc64el powerpc64le powerpc64le 64 little |
@@ -23,10 +23,10 @@ index 9f2a8e0..1d935b1 100644 | |||
23 | s390 s390 s390 32 big | 23 | s390 s390 s390 32 big |
24 | s390x s390x s390x 64 big | 24 | s390x s390x s390x 64 big |
25 | diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm | 25 | diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm |
26 | index a352bbd..fa1d90b 100644 | 26 | index fcf5b1e2a..175c9f436 100644 |
27 | --- a/scripts/Dpkg/Vendor/Debian.pm | 27 | --- a/scripts/Dpkg/Vendor/Debian.pm |
28 | +++ b/scripts/Dpkg/Vendor/Debian.pm | 28 | +++ b/scripts/Dpkg/Vendor/Debian.pm |
29 | @@ -306,6 +306,7 @@ sub _add_build_flags { | 29 | @@ -202,6 +202,7 @@ sub set_build_features { |
30 | powerpc | 30 | powerpc |
31 | ppc64 | 31 | ppc64 |
32 | ppc64el | 32 | ppc64el |
@@ -34,6 +34,3 @@ index a352bbd..fa1d90b 100644 | |||
34 | riscv64 | 34 | riscv64 |
35 | s390x | 35 | s390x |
36 | sparc | 36 | sparc |
37 | -- | ||
38 | 2.26.2 | ||
39 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index f2367c95e9..95a49053e8 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e3ade3464b8a1129a55c2790cf114d9ae01e3cda Mon Sep 17 00:00:00 2001 | 1 | From 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.microsoft.com> |
3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 | 3 | Date: Tue, 16 Jun 2020 03:57:25 +0000 |
4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf | 4 | Subject: [PATCH] build.c: ignore return of 1 from tar -cf |
@@ -23,16 +23,15 @@ Upstream-Status: Inappropriate [OE specific] | |||
23 | Original patch by RP 2015/3/27, rebased by Paul Eggleton | 23 | Original patch by RP 2015/3/27, rebased by Paul Eggleton |
24 | 24 | ||
25 | Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> | 25 | Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> |
26 | |||
27 | --- | 26 | --- |
28 | src/deb/build.c | 5 ++++- | 27 | src/deb/build.c | 5 ++++- |
29 | 1 file changed, 4 insertions(+), 1 deletion(-) | 28 | 1 file changed, 4 insertions(+), 1 deletion(-) |
30 | 29 | ||
31 | diff --git a/src/deb/build.c b/src/deb/build.c | 30 | diff --git a/src/deb/build.c b/src/deb/build.c |
32 | index 76613adec..7c216d1a9 100644 | 31 | index 92aba9553..6436b33da 100644 |
33 | --- a/src/deb/build.c | 32 | --- a/src/deb/build.c |
34 | +++ b/src/deb/build.c | 33 | +++ b/src/deb/build.c |
35 | @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 34 | @@ -481,6 +481,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
36 | { | 35 | { |
37 | int pipe_filenames[2], pipe_tarball[2]; | 36 | int pipe_filenames[2], pipe_tarball[2]; |
38 | pid_t pid_tar, pid_comp; | 37 | pid_t pid_tar, pid_comp; |
@@ -40,7 +39,7 @@ index 76613adec..7c216d1a9 100644 | |||
40 | 39 | ||
41 | /* Fork off a tar. We will feed it a list of filenames on stdin later. */ | 40 | /* Fork off a tar. We will feed it a list of filenames on stdin later. */ |
42 | m_pipe(pipe_filenames); | 41 | m_pipe(pipe_filenames); |
43 | @@ -534,7 +535,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 42 | @@ -533,7 +534,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
44 | /* All done, clean up wait for tar and <compress> to finish their job. */ | 43 | /* All done, clean up wait for tar and <compress> to finish their job. */ |
45 | close(pipe_filenames[1]); | 44 | close(pipe_filenames[1]); |
46 | subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); | 45 | subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); |
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 d66ab4476a..e8d8576f85 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 | 1 | From 1d192b60fc43e24e1c2d6ff452dabeee7a227cc0 Mon Sep 17 00:00:00 2001 |
2 | From: sweeaun <swee.aun.khor@intel.com> | 2 | 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 |
@@ -13,10 +13,10 @@ Signed-off-by: sweeaun <swee.aun.khor@intel.com> | |||
13 | 2 files changed, 2 insertions(+) | 13 | 2 files changed, 2 insertions(+) |
14 | 14 | ||
15 | diff --git a/data/ostable b/data/ostable | 15 | diff --git a/data/ostable b/data/ostable |
16 | index be64342..87db273 100644 | 16 | index 860355774..28779beca 100644 |
17 | --- a/data/ostable | 17 | --- a/data/ostable |
18 | +++ b/data/ostable | 18 | +++ b/data/ostable |
19 | @@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc | 19 | @@ -21,6 +21,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc |
20 | eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf | 20 | eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf |
21 | eabi-musl-linux linux-musleabi linux[^-]*-musleabi | 21 | eabi-musl-linux linux-musleabi linux[^-]*-musleabi |
22 | base-musl-linux linux-musl linux[^-]*-musl | 22 | base-musl-linux linux-musl linux[^-]*-musl |
@@ -25,17 +25,14 @@ index be64342..87db273 100644 | |||
25 | eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi | 25 | eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi |
26 | abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 | 26 | abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 |
27 | diff --git a/data/tupletable b/data/tupletable | 27 | diff --git a/data/tupletable b/data/tupletable |
28 | index 28f00bf..748ffab 100644 | 28 | index 82ae3604e..707d85bdb 100644 |
29 | --- a/data/tupletable | 29 | --- a/data/tupletable |
30 | +++ b/data/tupletable | 30 | +++ b/data/tupletable |
31 | @@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> | 31 | @@ -26,6 +26,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> |
32 | eabihf-musl-linux-arm musl-linux-armhf | 32 | eabihf-musl-linux-arm musl-linux-armhf |
33 | eabi-musl-linux-arm musl-linux-armel | 33 | eabi-musl-linux-arm musl-linux-armel |
34 | base-musl-linux-<cpu> musl-linux-<cpu> | 34 | base-musl-linux-<cpu> musl-linux-<cpu> |
35 | +x32-musl-linux-amd64 x32 | 35 | +x32-musl-linux-amd64 x32 |
36 | ilp32-gnu-linux-arm64 arm64ilp32 | ||
37 | eabihf-gnu-linux-arm armhf | 36 | eabihf-gnu-linux-arm armhf |
38 | eabi-gnu-linux-arm armel | 37 | eabi-gnu-linux-arm armel |
39 | -- | 38 | eabi-gnu-linux-armeb armeb |
40 | 2.7.4 | ||
41 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch index ef5f7c3ec3..fc097e5a66 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 | 1 | From 0cac67ce5920d6d0c9df4278bfa77da878a8a37a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 26 Aug 2015 16:16:16 +0300 | 3 | Date: Wed, 26 Aug 2015 16:16:16 +0300 |
4 | Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character | 4 | Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_' |
5 | '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). | 5 | inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). |
6 | 6 | ||
7 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | 7 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> |
8 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 8 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
@@ -32,6 +32,4 @@ index 63a36f55c..81901bd5a 100644 | |||
32 | + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) | 32 | + if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) |
33 | return dpkg_put_warn(err, _("invalid character in revision number")); | 33 | return dpkg_put_warn(err, _("invalid character in revision number")); |
34 | } | 34 | } |
35 | 35 | ||
36 | -- | ||
37 | 2.11.0 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index bd4d5d5353..916c7dfb00 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ff325b35639a797edd92b373fbebf7b8b9f3f0c3 Mon Sep 17 00:00:00 2001 | 1 | From b6c28222276704a1e1a544983e38dfa2f3fb481a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 26 Aug 2015 16:25:45 +0300 | 3 | Date: Wed, 26 Aug 2015 16:25:45 +0300 |
4 | Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a | 4 | Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a |
@@ -11,13 +11,12 @@ RP 2011/12/07 | |||
11 | ALIMON 2016/05/26 | 11 | ALIMON 2016/05/26 |
12 | ALIMON 2017/02/21 | 12 | ALIMON 2017/02/21 |
13 | KKang 2019/02/20 | 13 | KKang 2019/02/20 |
14 | |||
15 | --- | 14 | --- |
16 | src/main/script.c | 53 +++-------------------------------------------- | 15 | src/main/script.c | 53 +++-------------------------------------------- |
17 | 1 file changed, 3 insertions(+), 50 deletions(-) | 16 | 1 file changed, 3 insertions(+), 50 deletions(-) |
18 | 17 | ||
19 | diff --git a/src/main/script.c b/src/main/script.c | 18 | diff --git a/src/main/script.c b/src/main/script.c |
20 | index ecce4d842..16f4e6ff5 100644 | 19 | index 017d92efe..181e7c710 100644 |
21 | --- a/src/main/script.c | 20 | --- a/src/main/script.c |
22 | +++ b/src/main/script.c | 21 | +++ b/src/main/script.c |
23 | @@ -97,58 +97,11 @@ static const char * | 22 | @@ -97,58 +97,11 @@ static const char * |
diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch index bbd5aba418..35c0c246f6 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 | 1 | From 80ad29d22f8ca4033a6a79a726580fee17bdade9 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 26 Aug 2015 16:27:45 +0300 | 3 | Date: Wed, 26 Aug 2015 16:27:45 +0300 |
4 | Subject: [PATCH 4/5] The lutimes function doesn't work properly for all | 4 | Subject: [PATCH] The lutimes function doesn't work properly for all systems. |
5 | systems. | ||
6 | 5 | ||
7 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 6 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
8 | 7 | ||
@@ -12,10 +11,10 @@ Upstream-Status: Inappropriate [embedded specific] | |||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
13 | 12 | ||
14 | diff --git a/src/main/archives.c b/src/main/archives.c | 13 | diff --git a/src/main/archives.c b/src/main/archives.c |
15 | index 92340b9..7a55c27 100644 | 14 | index 7e399f922..ec3b6878f 100644 |
16 | --- a/src/main/archives.c | 15 | --- a/src/main/archives.c |
17 | +++ b/src/main/archives.c | 16 | +++ b/src/main/archives.c |
18 | @@ -490,8 +490,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) | 17 | @@ -491,8 +491,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) |
19 | 18 | ||
20 | if (te->type == TAR_FILETYPE_SYMLINK) { | 19 | if (te->type == TAR_FILETYPE_SYMLINK) { |
21 | #ifdef HAVE_LUTIMES | 20 | #ifdef HAVE_LUTIMES |
@@ -26,6 +25,3 @@ index 92340b9..7a55c27 100644 | |||
26 | #endif | 25 | #endif |
27 | } else { | 26 | } else { |
28 | if (utimes(path, tv)) | 27 | if (utimes(path, tv)) |
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
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 8797ea55c6..8ac646b1a1 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 | |||
@@ -1,7 +1,10 @@ | |||
1 | From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 | 1 | From 1c9e78dda91ba66fbd8fe02b66b6c603d08d3343 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 30 Dec 2015 23:05:41 +0000 | 3 | Date: Wed, 30 Dec 2015 23:05:41 +0000 |
4 | Subject: [PATCH] add musleabi to known target tripets | 4 | Subject: [PATCH] add musleabi to known target tripets |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
5 | 8 | ||
6 | helps compiling dpkg for musl/arm-softfloat | 9 | helps compiling dpkg for musl/arm-softfloat |
7 | 10 | ||
@@ -14,10 +17,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | |||
14 | 2 files changed, 2 insertions(+) | 17 | 2 files changed, 2 insertions(+) |
15 | 18 | ||
16 | diff --git a/data/ostable b/data/ostable | 19 | diff --git a/data/ostable b/data/ostable |
17 | index 99c1f889d..be6434271 100644 | 20 | index 64f424490..860355774 100644 |
18 | --- a/data/ostable | 21 | --- a/data/ostable |
19 | +++ b/data/ostable | 22 | +++ b/data/ostable |
20 | @@ -17,6 +17,7 @@ | 23 | @@ -19,6 +19,7 @@ |
21 | eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi | 24 | eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi |
22 | base-uclibc-linux linux-uclibc linux[^-]*-uclibc | 25 | base-uclibc-linux linux-uclibc linux[^-]*-uclibc |
23 | eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf | 26 | eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf |
@@ -26,17 +29,14 @@ index 99c1f889d..be6434271 100644 | |||
26 | eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf | 29 | eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf |
27 | eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi | 30 | eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi |
28 | diff --git a/data/tupletable b/data/tupletable | 31 | diff --git a/data/tupletable b/data/tupletable |
29 | index 5f500f6ca..28f00bfe6 100644 | 32 | index 7436f8056..82ae3604e 100644 |
30 | --- a/data/tupletable | 33 | --- a/data/tupletable |
31 | +++ b/data/tupletable | 34 | +++ b/data/tupletable |
32 | @@ -8,6 +8,7 @@ | 35 | @@ -24,6 +24,7 @@ |
33 | eabi-uclibc-linux-arm uclibc-linux-armel | 36 | eabi-uclibc-linux-arm uclibc-linux-armel |
34 | base-uclibc-linux-<cpu> uclibc-linux-<cpu> | 37 | base-uclibc-linux-<cpu> uclibc-linux-<cpu> |
35 | eabihf-musl-linux-arm musl-linux-armhf | 38 | eabihf-musl-linux-arm musl-linux-armhf |
36 | +eabi-musl-linux-arm musl-linux-armel | 39 | +eabi-musl-linux-arm musl-linux-armel |
37 | base-musl-linux-<cpu> musl-linux-<cpu> | 40 | base-musl-linux-<cpu> musl-linux-<cpu> |
38 | ilp32-gnu-linux-arm64 arm64ilp32 | ||
39 | eabihf-gnu-linux-arm armhf | 41 | eabihf-gnu-linux-arm armhf |
40 | -- | 42 | eabi-gnu-linux-arm armel |
41 | 2.11.0 | ||
42 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch index 117f9234ad..3d3a4f0bb9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch | |||
@@ -1,7 +1,10 @@ | |||
1 | From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 | 1 | From 6dd80236a91a505b5753bb74e5f1b47330d8b16b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | 2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> |
3 | Date: Tue, 21 Feb 2017 11:23:27 -0600 | 3 | Date: Tue, 21 Feb 2017 11:23:27 -0600 |
4 | Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar | 4 | Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar |
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
5 | 8 | ||
6 | Recently dpkg added --clamp-mtime to tar to create reproducible | 9 | Recently dpkg added --clamp-mtime to tar to create reproducible |
7 | build tarballs [1]. | 10 | build tarballs [1]. |
@@ -24,10 +27,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 27 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 28 | ||
26 | diff --git a/src/deb/build.c b/src/deb/build.c | 29 | diff --git a/src/deb/build.c b/src/deb/build.c |
27 | index 5c74ff3..76613ad 100644 | 30 | index 1f0c050ee..92aba9553 100644 |
28 | --- a/src/deb/build.c | 31 | --- a/src/deb/build.c |
29 | +++ b/src/deb/build.c | 32 | +++ b/src/deb/build.c |
30 | @@ -505,7 +505,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, | 33 | @@ -504,7 +504,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, |
31 | 34 | ||
32 | command_init(&cmd, TAR, "tar -cf"); | 35 | command_init(&cmd, TAR, "tar -cf"); |
33 | command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", | 36 | command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", |
@@ -36,6 +39,3 @@ index 5c74ff3..76613ad 100644 | |||
36 | /* Mode might become a positional argument, pass it before -T. */ | 39 | /* Mode might become a positional argument, pass it before -T. */ |
37 | if (options->mode) | 40 | if (options->mode) |
38 | command_add_args(&cmd, "--mode", options->mode, NULL); | 41 | command_add_args(&cmd, "--mode", options->mode, NULL); |
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
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 d165616a19..cbdf01dbd9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch | |||
@@ -1,5 +1,11 @@ | |||
1 | Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> | 1 | From 1c3a109df54b6092fa85a1fe2b7771e3b959655f Mon Sep 17 00:00:00 2001 |
2 | Date: Wed Apr 8 18:08:14 2015 +0530 | 2 | From: "Krishnanjanappa, Jagadeesh" |
3 | <jagadeesh.krishnanjanappa@caviumnetworks.com> | ||
4 | Date: Wed, 8 Apr 2015 18:08:14 +0530 | ||
5 | Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
3 | 9 | ||
4 | [PATCH] add armeb triplet entry into triplettable. | 10 | [PATCH] add armeb triplet entry into triplettable. |
5 | 11 | ||
@@ -25,24 +31,19 @@ Upstream-Status: Pending | |||
25 | 31 | ||
26 | Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> | 32 | Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> |
27 | 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> |
28 | |||
29 | --- | 34 | --- |
30 | data/tupletable | 1 + | 35 | data/tupletable | 1 + |
31 | 1 file changed, 1 insertion(+) | 36 | 1 file changed, 1 insertion(+) |
32 | 37 | ||
33 | diff --git a/data/tupletable b/data/tupletable | 38 | diff --git a/data/tupletable b/data/tupletable |
34 | index b7802bec3..5f500f6ca 100644 | 39 | index ae9f2ddb4..7436f8056 100644 |
35 | --- a/data/tupletable | 40 | --- a/data/tupletable |
36 | +++ b/data/tupletable | 41 | +++ b/data/tupletable |
37 | @@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu> | 42 | @@ -27,6 +27,7 @@ eabihf-musl-linux-arm musl-linux-armhf |
38 | ilp32-gnu-linux-arm64 arm64ilp32 | 43 | base-musl-linux-<cpu> musl-linux-<cpu> |
39 | eabihf-gnu-linux-arm armhf | 44 | eabihf-gnu-linux-arm armhf |
40 | eabi-gnu-linux-arm armel | 45 | eabi-gnu-linux-arm armel |
41 | +eabi-gnu-linux-armeb armeb | 46 | +eabi-gnu-linux-armeb armeb |
42 | abin32-gnu-linux-mips64r6el mipsn32r6el | 47 | abin32-gnu-linux-mips64r6el mipsn32r6el |
43 | abin32-gnu-linux-mips64r6 mipsn32r6 | 48 | abin32-gnu-linux-mips64r6 mipsn32r6 |
44 | abin32-gnu-linux-mips64el mipsn32el | 49 | abin32-gnu-linux-mips64el mipsn32el |
45 | -- | ||
46 | 2.11.0 | ||
47 | |||
48 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch index 4e0d22acbb..df2cd88ca4 100644 --- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From bdf60ebbeb433a80e6cfcbde9d83d89564e79e20 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <jslater@windriver.com> | ||
3 | Date: Mon, 26 Aug 2013 23:38:45 +0000 | ||
4 | Subject: [PATCH] dpkg: fix configuration issue for mips64 | ||
5 | |||
1 | configure cannot determine the proper cpu, os, or | 6 | configure cannot determine the proper cpu, os, or |
2 | architecture for mips64, and possibly other arch's | 7 | architecture for mips64, and possibly other arch's |
3 | because of faulty code added to Arch.pm in the latest | 8 | because of faulty code added to Arch.pm in the latest |
@@ -6,16 +11,15 @@ release from upstream. We remove that code. | |||
6 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
7 | 12 | ||
8 | Signed-off-by: Joe Slater <jslater@windriver.com> | 13 | Signed-off-by: Joe Slater <jslater@windriver.com> |
9 | |||
10 | --- | 14 | --- |
11 | scripts/Dpkg/Arch.pm | 3 --- | 15 | scripts/Dpkg/Arch.pm | 3 --- |
12 | 1 file changed, 3 deletions(-) | 16 | 1 file changed, 3 deletions(-) |
13 | 17 | ||
14 | diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm | 18 | diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm |
15 | index 1720847b8..6345ce3b9 100644 | 19 | index 0d352eeb9..4ef5fa307 100644 |
16 | --- a/scripts/Dpkg/Arch.pm | 20 | --- a/scripts/Dpkg/Arch.pm |
17 | +++ b/scripts/Dpkg/Arch.pm | 21 | +++ b/scripts/Dpkg/Arch.pm |
18 | @@ -323,9 +323,6 @@ sub _load_tupletable() | 22 | @@ -326,9 +326,6 @@ sub _load_tupletable() |
19 | (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; | 23 | (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; |
20 | (my $da = $debarch) =~ s/<cpu>/$_cpu/; | 24 | (my $da = $debarch) =~ s/<cpu>/$_cpu/; |
21 | 25 | ||
@@ -25,5 +29,3 @@ index 1720847b8..6345ce3b9 100644 | |||
25 | $debarch_to_debtuple{$da} = $dt; | 29 | $debarch_to_debtuple{$da} = $dt; |
26 | $debtuple_to_debarch{$dt} = $da; | 30 | $debtuple_to_debarch{$dt} = $da; |
27 | } | 31 | } |
28 | -- | ||
29 | 2.11.0 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index 6900716b11..e80549d740 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch | |||
@@ -1,11 +1,15 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | 1 | From 008ec5150dd086ffa3940cb520f1ca91939f138d Mon Sep 17 00:00:00 2001 |
2 | From: Chris Larson <kergoth@openedhand.com> | ||
3 | Date: Tue, 5 Sep 2006 07:24:58 +0000 | ||
4 | Subject: [PATCH] Add dpkg, modified from upstream oe. | ||
2 | 5 | ||
6 | Upstream-Status: Inappropriate [disable feature] | ||
3 | --- | 7 | --- |
4 | Makefile.am | 1 - | 8 | Makefile.am | 1 - |
5 | 1 file changed, 1 deletion(-) | 9 | 1 file changed, 1 deletion(-) |
6 | 10 | ||
7 | diff --git a/Makefile.am b/Makefile.am | 11 | diff --git a/Makefile.am b/Makefile.am |
8 | index d963a10..7cef7f5 100644 | 12 | index 7186045d4..daca9faf2 100644 |
9 | --- a/Makefile.am | 13 | --- a/Makefile.am |
10 | +++ b/Makefile.am | 14 | +++ b/Makefile.am |
11 | @@ -11,7 +11,6 @@ SUBDIRS = \ | 15 | @@ -11,7 +11,6 @@ SUBDIRS = \ |
@@ -16,6 +20,3 @@ index d963a10..7cef7f5 100644 | |||
16 | # EOL | 20 | # EOL |
17 | 21 | ||
18 | ACLOCAL_AMFLAGS = -I m4 | 22 | ACLOCAL_AMFLAGS = -I m4 |
19 | -- | ||
20 | 2.25.1 | ||
21 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg/pager.patch b/meta/recipes-devtools/dpkg/dpkg/pager.patch deleted file mode 100644 index e56b9d28af..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/pager.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | pager: Use less instead of pager | ||
2 | |||
3 | pager is a Debianism. Istead use directly pager. | ||
4 | |||
5 | Upstream-Status: Inappropriate [OE-Core integration specific] | ||
6 | |||
7 | Suggested-by: Burton, Ross <ross.burton@intel.com> | ||
8 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | ||
9 | diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h | ||
10 | index 2bb067a..6cbce80 100644 | ||
11 | --- a/lib/dpkg/dpkg.h | ||
12 | +++ b/lib/dpkg/dpkg.h | ||
13 | @@ -95,7 +95,7 @@ DPKG_BEGIN_DECLS | ||
14 | #define MAXUPDATES 250 | ||
15 | |||
16 | #define DEFAULTSHELL "sh" | ||
17 | -#define DEFAULTPAGER "pager" | ||
18 | +#define DEFAULTPAGER "less" | ||
19 | |||
20 | #define MD5HASHLEN 32 | ||
21 | #define MAXTRIGDIRECTIVE 256 | ||
diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch index ebf838ffe9..9307725e8b 100644 --- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch | |||
@@ -1,4 +1,8 @@ | |||
1 | busybox-1.19.4 tar utility doesn't support --warning=no-timestamp | 1 | From add92699ca1397205e1d7b46c3ab43de06b9a6c7 Mon Sep 17 00:00:00 2001 |
2 | From: Constantin Musca <constantinx.musca@intel.com> | ||
3 | Date: Tue, 28 Aug 2012 17:02:40 +0300 | ||
4 | Subject: [PATCH] busybox-1.19.4 tar utility doesn't support | ||
5 | --warning=no-timestamp | ||
2 | 6 | ||
3 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 7 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
4 | 8 | ||
@@ -8,10 +12,10 @@ Upstream-Status: Inappropriate [configuration] | |||
8 | 1 file changed, 1 deletion(-) | 12 | 1 file changed, 1 deletion(-) |
9 | 13 | ||
10 | diff --git a/src/deb/extract.c b/src/deb/extract.c | 14 | diff --git a/src/deb/extract.c b/src/deb/extract.c |
11 | index a1b2dc0..95e2372 100644 | 15 | index 8b78a7eab..fd7595808 100644 |
12 | --- a/src/deb/extract.c | 16 | --- a/src/deb/extract.c |
13 | +++ b/src/deb/extract.c | 17 | +++ b/src/deb/extract.c |
14 | @@ -333,7 +333,6 @@ extracthalf(const char *debar, const char *dir, | 18 | @@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir, |
15 | 19 | ||
16 | command_add_arg(&cmd, "-f"); | 20 | command_add_arg(&cmd, "-f"); |
17 | command_add_arg(&cmd, "-"); | 21 | command_add_arg(&cmd, "-"); |
@@ -19,6 +23,3 @@ index a1b2dc0..95e2372 100644 | |||
19 | 23 | ||
20 | m_dup2(p2[0],0); | 24 | m_dup2(p2[0],0); |
21 | close(p2[0]); | 25 | close(p2[0]); |
22 | -- | ||
23 | 2.25.1 | ||
24 | |||
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb index 7eaae9f22e..3f5f7395e0 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.22.0.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb | |||
@@ -12,12 +12,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main | |||
12 | file://0006-add-musleabi-to-known-target-tripets.patch \ | 12 | file://0006-add-musleabi-to-known-target-tripets.patch \ |
13 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ | 13 | file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ |
14 | file://0001-dpkg-Support-muslx32-build.patch \ | 14 | file://0001-dpkg-Support-muslx32-build.patch \ |
15 | file://pager.patch \ | ||
16 | file://0001-Add-support-for-riscv32-CPU.patch \ | 15 | file://0001-Add-support-for-riscv32-CPU.patch \ |
17 | " | 16 | " |
18 | 17 | ||
19 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" | 18 | SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" |
20 | 19 | ||
21 | SRCREV = "744487c98a622b9b38c22c6ca330315af4a30a11" | 20 | SRCREV = "b2f9600ead232a2dd3c27f8b52807a9ca5854d17" |
22 | 21 | ||
23 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch index af1d8c626c..bfb6dcd89a 100644 --- a/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch +++ b/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch | |||
@@ -3,7 +3,7 @@ From: Alexander Kanavin <alex.kanavin@gmail.com> | |||
3 | Date: Thu, 23 Mar 2017 13:44:41 +0200 | 3 | Date: Thu, 23 Mar 2017 13:44:41 +0200 |
4 | Subject: [PATCH] Resolve string formatting issues. | 4 | Subject: [PATCH] Resolve string formatting issues. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [upstream seems dead] | 6 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | --- | 8 | --- |
9 | exp_clib.c | 4 ++-- | 9 | exp_clib.c | 4 ++-- |
diff --git a/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/meta/recipes-devtools/expect/expect/0001-configure.in.patch index 7595a254a8..618c4bee8e 100644 --- a/meta/recipes-devtools/expect/expect/0001-configure.in.patch +++ b/meta/recipes-devtools/expect/expect/0001-configure.in.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Allow cross compiling. | 1 | Allow cross compiling. |
2 | 2 | ||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
5 | --- | 5 | --- |
6 | diff -uNr a/configure.in b/configure.in | 6 | diff -uNr a/configure.in b/configure.in |
7 | --- a/configure.in 2012-12-14 15:31:32.623180450 +0100 | 7 | --- a/configure.in 2012-12-14 15:31:32.623180450 +0100 |
diff --git a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch index 37512fb9bc..d73f4c3421 100644 --- a/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch +++ b/meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | |||
@@ -10,7 +10,7 @@ Aborted (core dumped) | |||
10 | 10 | ||
11 | Use PATH_MAX to fix the problem. | 11 | Use PATH_MAX to fix the problem. |
12 | 12 | ||
13 | Upstream-Status: Pending [Upstream seems dead] | 13 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
14 | 14 | ||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
16 | --- | 16 | --- |
diff --git a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch index b1d322d5c9..40f7f3bd85 100644 --- a/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch +++ b/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch | |||
@@ -42,7 +42,7 @@ Example: | |||
42 | } | 42 | } |
43 | Author: Sergei Golovan <sgolovan@debian.org> | 43 | Author: Sergei Golovan <sgolovan@debian.org> |
44 | 44 | ||
45 | Upstream-Status: Pending | 45 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
46 | This patch is backported from fedora changes for expect: | 46 | This patch is backported from fedora changes for expect: |
47 | http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ | 47 | http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ |
48 | ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3 | 48 | ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3 |
diff --git a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch index dc4c6ba406..eb178f462a 100644 --- a/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch +++ b/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Use proper -L path when cross compiling. | 1 | Use proper -L path when cross compiling. |
2 | 2 | ||
3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 3 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] |
5 | --- | 5 | --- |
6 | diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 | 6 | diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 |
7 | --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100 | 7 | --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100 |
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb index 7b610b1ff2..18904ebc10 100644 --- a/meta/recipes-devtools/expect/expect_5.45.4.bb +++ b/meta/recipes-devtools/expect/expect_5.45.4.bb | |||
@@ -81,3 +81,7 @@ FILES:${PN} += "${libdir}/libexpect${PV}.so \ | |||
81 | " | 81 | " |
82 | 82 | ||
83 | BBCLASSEXTEND = "native nativesdk" | 83 | BBCLASSEXTEND = "native nativesdk" |
84 | |||
85 | # http://errors.yoctoproject.org/Errors/Details/766950/ | ||
86 | # expect5.45.4/exp_chan.c:62:5: error: initialization of 'struct Tcl_ChannelTypeVersion_ *' from incompatible pointer type 'int (*)(void *, int)' [-Wincompatible-pointer-types] | ||
87 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch deleted file mode 100644 index 095d00b1e2..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From e7f9c9909c27d6ceed5aa4ca17023a1bc94b620a Mon Sep 17 00:00:00 2001 | ||
2 | From: Rod Smith <rodsmith@rodsbooks.com> | ||
3 | Date: Fri, 15 Apr 2022 18:10:14 -0400 | ||
4 | Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt | ||
5 | (commit 740; presumably eventually release 1.19) | ||
6 | |||
7 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] | ||
8 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | --- | ||
11 | NEWS | 8 ++++++++ | ||
12 | gptcl.cc | 2 +- | ||
13 | 2 files changed, 9 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/NEWS b/NEWS | ||
16 | index c7add56..9e153fd 100644 | ||
17 | --- a/NEWS | ||
18 | +++ b/NEWS | ||
19 | @@ -1,3 +1,11 @@ | ||
20 | +1.0.10 (?/??/2022): | ||
21 | +------------------- | ||
22 | + | ||
23 | +- Fixed problem that caused sgdisk to crash with errors about being unable | ||
24 | + to read the disk's partition table when compiled with the latest popt | ||
25 | + (commit 740, which is pre-release as I type; presumably version 1.19 and | ||
26 | + later once released). | ||
27 | + | ||
28 | 1.0.9 (4/14/2022): | ||
29 | ------------------ | ||
30 | |||
31 | diff --git a/gptcl.cc b/gptcl.cc | ||
32 | index 34c9421..0d578eb 100644 | ||
33 | --- a/gptcl.cc | ||
34 | +++ b/gptcl.cc | ||
35 | @@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
36 | } // while | ||
37 | |||
38 | // Assume first non-option argument is the device filename.... | ||
39 | - device = (char*) poptGetArg(poptCon); | ||
40 | + device = strdup((char*) poptGetArg(poptCon)); | ||
41 | poptResetContext(poptCon); | ||
42 | |||
43 | if (device != NULL) { | ||
44 | -- | ||
45 | 2.35.5 | ||
46 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch deleted file mode 100644 index f358081092..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From c640d9011a8330ebaad501784fb0ee1ce5e7a5ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Rod Smith <rodsmith@rodsbooks.com> | ||
3 | Date: Sat, 16 Apr 2022 09:32:04 -0400 | ||
4 | Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid | ||
5 | |||
6 | Upstream-Status: Backport [https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/] | ||
7 | Signed-off-by: Peter Bergin <peter@berginkonsult.se> | ||
8 | --- | ||
9 | guid.cc | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/guid.cc b/guid.cc | ||
13 | index 1e73ab7..d3e4fd5 100644 | ||
14 | --- a/guid.cc | ||
15 | +++ b/guid.cc | ||
16 | @@ -141,7 +141,7 @@ void GUIDData::Zero(void) { | ||
17 | void GUIDData::Randomize(void) { | ||
18 | int i, uuidGenerated = 0; | ||
19 | |||
20 | -#ifdef _UUID_UUID_H | ||
21 | +#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) | ||
22 | uuid_generate(uuidData); | ||
23 | ReverseBytes(&uuidData[0], 4); | ||
24 | ReverseBytes(&uuidData[4], 2); | ||
25 | -- | ||
26 | 2.34.1 | ||
27 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch deleted file mode 100644 index 80e6f1bc9c..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-Use-64bit-time_t-on-linux-as-well.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From cbdbabcc14e4ae4debcc64e41c0bb97d47b4eeef Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 12 Dec 2022 12:50:07 -0800 | ||
4 | Subject: [PATCH] Use 64bit time_t on linux as well | ||
5 | |||
6 | Alias 64bit version of stat functions to original functions | ||
7 | we are already passing -D_FILE_OFFSET_BITS=64 in linux Makefile | ||
8 | |||
9 | Upstream-Status: Submitted [https://sourceforge.net/p/gptfdisk/code/merge-requests/29/] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | diskio-unix.cc | 6 +++++- | ||
13 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/diskio-unix.cc b/diskio-unix.cc | ||
16 | index 7780aeb..0897c56 100644 | ||
17 | --- a/diskio-unix.cc | ||
18 | +++ b/diskio-unix.cc | ||
19 | @@ -37,8 +37,12 @@ | ||
20 | |||
21 | using namespace std; | ||
22 | |||
23 | -#ifdef __APPLE__ | ||
24 | +#if defined(__APPLE__) || defined(__linux__) | ||
25 | #define off64_t off_t | ||
26 | +#define stat64 stat | ||
27 | +#define fstat64 fstat | ||
28 | +#define lstat64 lstat | ||
29 | +#define lseek64 lseek | ||
30 | #endif | ||
31 | |||
32 | // Returns the official "real" name for a shortened version of same. | ||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch index 266afbfa11..011eec36f9 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch +++ b/meta/recipes-devtools/fdisk/gptfdisk/0001-gptcurses-correctly-include-curses.h.patch | |||
@@ -1,17 +1,16 @@ | |||
1 | From 6bc6e867c5b3a774c0d7819ee5a3d2885e97caa9 Mon Sep 17 00:00:00 2001 | 1 | From 510d0d27f90dfb1c4afd0722580bb8a828b52b7f Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 30 Mar 2020 17:11:19 +0200 | 3 | Date: Mon, 30 Mar 2020 17:11:19 +0200 |
4 | Subject: [PATCH] gptcurses: correctly include curses.h | 4 | Subject: [PATCH] gptcurses: correctly include curses.h |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | gptcurses.cc | 4 ---- | 9 | gptcurses.cc | 4 ---- |
11 | 1 file changed, 4 deletions(-) | 10 | 1 file changed, 4 deletions(-) |
12 | 11 | ||
13 | diff --git a/gptcurses.cc b/gptcurses.cc | 12 | diff --git a/gptcurses.cc b/gptcurses.cc |
14 | index 71aa734..4ebfde1 100644 | 13 | index b476700..476fc43 100644 |
15 | --- a/gptcurses.cc | 14 | --- a/gptcurses.cc |
16 | +++ b/gptcurses.cc | 15 | +++ b/gptcurses.cc |
17 | @@ -23,11 +23,7 @@ | 16 | @@ -23,11 +23,7 @@ |
diff --git a/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch b/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch deleted file mode 100644 index c7fa965ec9..0000000000 --- a/meta/recipes-devtools/fdisk/gptfdisk/popt-1.19-follow-up.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Damian Kurek <starfire24680@gmail.com> | ||
3 | Date: Thu, 7 Jul 2022 03:39:16 +0000 | ||
4 | Subject: [PATCH] Fix NULL dereference when duplicating string argument | ||
5 | |||
6 | poptGetArg can return NULL if there are no additional arguments, which | ||
7 | makes strdup dereference NULL on strlen | ||
8 | |||
9 | Upstream-Status: Submitted [https://sourceforge.net/p/gptfdisk/code/merge-requests/28/] | ||
10 | |||
11 | --- | ||
12 | gptcl.cc | 6 ++++-- | ||
13 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/gptcl.cc b/gptcl.cc | ||
16 | index 0d578eb..ab95239 100644 | ||
17 | --- a/gptcl.cc | ||
18 | +++ b/gptcl.cc | ||
19 | @@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
20 | } // while | ||
21 | |||
22 | // Assume first non-option argument is the device filename.... | ||
23 | - device = strdup((char*) poptGetArg(poptCon)); | ||
24 | - poptResetContext(poptCon); | ||
25 | + device = (char*) poptGetArg(poptCon); | ||
26 | |||
27 | if (device != NULL) { | ||
28 | + device = strdup(device); | ||
29 | + poptResetContext(poptCon); | ||
30 | JustLooking(); // reset as necessary | ||
31 | BeQuiet(); // Tell called functions to be less verbose & interactive | ||
32 | if (LoadPartitions((string) device)) { | ||
33 | @@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { | ||
34 | cerr << "Error encountered; not saving changes.\n"; | ||
35 | retval = 4; | ||
36 | } // if | ||
37 | + free(device); | ||
38 | } // if (device != NULL) | ||
39 | poptFreeContext(poptCon); | ||
40 | return retval; | ||
41 | |||
diff --git a/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb index cf0a60a1a9..ba891931ac 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk_1.0.9.bb +++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.10.bb | |||
@@ -9,12 +9,8 @@ DEPENDS = "util-linux" | |||
9 | 9 | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz \ |
11 | file://0001-gptcurses-correctly-include-curses.h.patch \ | 11 | file://0001-gptcurses-correctly-include-curses.h.patch \ |
12 | file://0001-Updated-guid.cc-to-deal-with-minor-change-in-libuuid.patch \ | ||
13 | file://0001-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch \ | ||
14 | file://0001-Use-64bit-time_t-on-linux-as-well.patch \ | ||
15 | file://popt-1.19-follow-up.patch \ | ||
16 | " | 12 | " |
17 | SRC_URI[sha256sum] = "dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2" | 13 | SRC_URI[sha256sum] = "2abed61bc6d2b9ec498973c0440b8b804b7a72d7144069b5a9209b2ad693a282" |
18 | 14 | ||
19 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" | 15 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" |
20 | UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" | 16 | UPSTREAM_CHECK_REGEX = "/gptfdisk/(?P<pver>(\d+[\.\-_]*)+)/" |
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index f9d864b987..95a7d5485b 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb | |||
@@ -24,7 +24,7 @@ do_compile[noexec] = "1" | |||
24 | do_install () { | 24 | do_install () { |
25 | install -d ${D}${datadir}/gnu-config \ | 25 | install -d ${D}${datadir}/gnu-config \ |
26 | ${D}${bindir} | 26 | ${D}${bindir} |
27 | cat ${WORKDIR}/gnu-configize.in | \ | 27 | cat ${UNPACKDIR}/gnu-configize.in | \ |
28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ | 28 | sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ |
29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize | 29 | -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize |
30 | # In the native case we want the system perl as perl-native can't have built yet | 30 | # In the native case we want the system perl as perl-native can't have built yet |
diff --git a/meta/recipes-devtools/go/go-1.22.1.inc b/meta/recipes-devtools/go/go-1.22.2.inc index 4330853450..b399207311 100644 --- a/meta/recipes-devtools/go/go-1.22.1.inc +++ b/meta/recipes-devtools/go/go-1.22.2.inc | |||
@@ -11,8 +11,8 @@ SRC_URI += "\ | |||
11 | file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ | 11 | file://0004-make.bash-override-CC-when-building-dist-and-go_boot.patch \ |
12 | file://0005-cmd-dist-separate-host-and-target-builds.patch \ | 12 | file://0005-cmd-dist-separate-host-and-target-builds.patch \ |
13 | file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ | 13 | file://0006-cmd-go-make-GOROOT-precious-by-default.patch \ |
14 | file://0007-exec.go-filter-out-build-specific-paths-from-linker-.patch \ | ||
14 | 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 \ |
15 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ | 16 | file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ |
16 | file://0001-exec.go-filter-out-build-specific-paths-from-linker-.patch \ | ||
17 | " | 17 | " |
18 | SRC_URI[main.sha256sum] = "79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321" | 18 | SRC_URI[main.sha256sum] = "374ea82b289ec738e968267cac59c7d5ff180f9492250254784b2044e90df5a9" |
diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.1.bb b/meta/recipes-devtools/go/go-binary-native_1.22.2.bb index 8d8248df8a..0f00509f03 100644 --- a/meta/recipes-devtools/go/go-binary-native_1.22.1.bb +++ b/meta/recipes-devtools/go/go-binary-native_1.22.2.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] = "aab8e15785c997ae20f9c88422ee35d962c4562212bb0f879d052a35c8307c7f" | 12 | SRC_URI[go_linux_amd64.sha256sum] = "5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17" |
13 | SRC_URI[go_linux_arm64.sha256sum] = "e56685a245b6a0c592fc4a55f0b7803af5b3f827aaa29feab1f40e491acf35b8" | 13 | SRC_URI[go_linux_arm64.sha256sum] = "36e720b2d564980c162a48c7e97da2e407dfcc4239e1e58d98082dfa2486a0c1" |
14 | SRC_URI[go_linux_ppc64le.sha256sum] = "ac775e19d93cc1668999b77cfe8c8964abfbc658718feccfe6e0eb87663cd668" | 14 | SRC_URI[go_linux_ppc64le.sha256sum] = "251a8886c5113be6490bdbb955ddee98763b49c9b1bf4c8364c02d3b482dab00" |
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.1.bb b/meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb index 7ac9449e47..7ac9449e47 100644 --- a/meta/recipes-devtools/go/go-cross-canadian_1.22.1.bb +++ b/meta/recipes-devtools/go/go-cross-canadian_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/go/go-cross_1.22.1.bb b/meta/recipes-devtools/go/go-cross_1.22.2.bb index 80b5a03f6c..80b5a03f6c 100644 --- a/meta/recipes-devtools/go/go-cross_1.22.1.bb +++ b/meta/recipes-devtools/go/go-cross_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/go/go-crosssdk_1.22.1.bb b/meta/recipes-devtools/go/go-crosssdk_1.22.2.bb index 1857c8a577..1857c8a577 100644 --- a/meta/recipes-devtools/go/go-crosssdk_1.22.1.bb +++ b/meta/recipes-devtools/go/go-crosssdk_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/go/go-native_1.22.1.bb b/meta/recipes-devtools/go/go-native_1.22.2.bb index ddf25b2c9b..ddf25b2c9b 100644 --- a/meta/recipes-devtools/go/go-native_1.22.1.bb +++ b/meta/recipes-devtools/go/go-native_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 3f1e795dd9..413cf6d33f 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc | |||
@@ -15,7 +15,7 @@ export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-pr | |||
15 | export GOCACHE = "${B}/.cache" | 15 | export GOCACHE = "${B}/.cache" |
16 | 16 | ||
17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" | 17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" |
18 | GO_SHLIB_LDFLAGS ?= '-ldflags="--linkmode=external -extldflags '${GO_EXTLDFLAGS}'"' | 18 | GO_SHLIB_LDFLAGS ?= '-ldflags="-extldflags '${GO_EXTLDFLAGS}'"' |
19 | 19 | ||
20 | do_configure() { | 20 | do_configure() { |
21 | : | 21 | : |
diff --git a/meta/recipes-devtools/go/go-runtime_1.22.1.bb b/meta/recipes-devtools/go/go-runtime_1.22.2.bb index 63464a1501..63464a1501 100644 --- a/meta/recipes-devtools/go/go-runtime_1.22.1.bb +++ b/meta/recipes-devtools/go/go-runtime_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch b/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch deleted file mode 100644 index 35f3a98d80..0000000000 --- a/meta/recipes-devtools/go/go/0007-exec.go-do-not-write-linker-flags-into-buildids.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 619991feab04f331d081a91243434ccd859f611d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 23 Nov 2020 19:22:04 +0000 | ||
4 | Subject: [PATCH 7/9] exec.go: do not write linker flags into buildids | ||
5 | |||
6 | The flags can contain build-specific paths, breaking reproducibility. | ||
7 | |||
8 | To make this acceptable to upstream, we probably need to trim the flags, | ||
9 | removing those known to be buildhost-specific. | ||
10 | |||
11 | Upstream-Status: Inappropriate [needs upstream discussion] | ||
12 | |||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> | ||
15 | --- | ||
16 | src/cmd/go/internal/work/exec.go | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go | ||
20 | index 544df461a2..75df5a4aa8 100644 | ||
21 | --- a/src/cmd/go/internal/work/exec.go | ||
22 | +++ b/src/cmd/go/internal/work/exec.go | ||
23 | @@ -1374,7 +1374,7 @@ func (b *Builder) linkActionID(a *Action) cache.ActionID { | ||
24 | } | ||
25 | |||
26 | // Toolchain-dependent configuration, shared with b.linkSharedActionID. | ||
27 | - b.printLinkerConfig(h, p) | ||
28 | + //b.printLinkerConfig(h, p) | ||
29 | |||
30 | // Input files. | ||
31 | for _, a1 := range a.Deps { | ||
32 | @@ -1720,7 +1720,7 @@ func (b *Builder) linkSharedActionID(a *Action) cache.ActionID { | ||
33 | fmt.Fprintf(h, "goos %s goarch %s\n", cfg.Goos, cfg.Goarch) | ||
34 | |||
35 | // Toolchain-dependent configuration, shared with b.linkActionID. | ||
36 | - b.printLinkerConfig(h, nil) | ||
37 | + //b.printLinkerConfig(h, nil) | ||
38 | |||
39 | // Input files. | ||
40 | for _, a1 := range a.Deps { | ||
41 | -- | ||
42 | 2.44.0 | ||
43 | |||
diff --git a/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch b/meta/recipes-devtools/go/go/0007-exec.go-filter-out-build-specific-paths-from-linker-.patch index c5bf28f54a..c5bf28f54a 100644 --- a/meta/recipes-devtools/go/go/0001-exec.go-filter-out-build-specific-paths-from-linker-.patch +++ b/meta/recipes-devtools/go/go/0007-exec.go-filter-out-build-specific-paths-from-linker-.patch | |||
diff --git a/meta/recipes-devtools/go/go_1.22.1.bb b/meta/recipes-devtools/go/go_1.22.2.bb index 46f5fbc6be..46f5fbc6be 100644 --- a/meta/recipes-devtools/go/go_1.22.1.bb +++ b/meta/recipes-devtools/go/go_1.22.2.bb | |||
diff --git a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb index 1826c7a40e..56a9321fb9 100644 --- a/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb +++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb | |||
@@ -30,7 +30,7 @@ S = "${WORKDIR}" | |||
30 | 30 | ||
31 | do_install() { | 31 | do_install() { |
32 | install -d ${D}/${bindir} | 32 | install -d ${D}/${bindir} |
33 | install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir} | 33 | install -m 0755 ${S}/icecc-create-env ${D}/${bindir} |
34 | } | 34 | } |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb index 034a0047d7..d03d8adcb0 100644 --- a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb +++ b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | SUMMARY = "Generates Icecream toolchain for SDK" | 3 | SUMMARY = "Generates Icecream toolchain for SDK" |
4 | DESCRIPTION = "${SUMMARY}" | 4 | DESCRIPTION = "${SUMMARY}" |
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${WORKDIR}/icecc-env.sh;beginline=2;endline=20;md5=dd6b68c1efed8a9fb04e409b3b287d47" | 6 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/icecc-env.sh;beginline=2;endline=20;md5=dd6b68c1efed8a9fb04e409b3b287d47" |
7 | 7 | ||
8 | INHIBIT_DEFAULT_DEPS = "1" | 8 | INHIBIT_DEFAULT_DEPS = "1" |
9 | 9 | ||
@@ -23,12 +23,12 @@ do_install() { | |||
23 | install -d ${D}${SDKPATHNATIVE}${datadir}/icecream/bin | 23 | install -d ${D}${SDKPATHNATIVE}${datadir}/icecream/bin |
24 | 24 | ||
25 | install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ | 25 | install -d ${D}${SDKPATHNATIVE}/environment-setup.d/ |
26 | install -m 0644 ${WORKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ | 26 | install -m 0644 ${UNPACKDIR}/icecc-env.sh ${D}${SDKPATHNATIVE}/environment-setup.d/ |
27 | sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ | 27 | sed -i ${D}${SDKPATHNATIVE}/environment-setup.d/icecc-env.sh \ |
28 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' | 28 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' |
29 | 29 | ||
30 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 30 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
31 | install -m 0755 ${WORKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 31 | install -m 0755 ${UNPACKDIR}/icecc-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
32 | sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ | 32 | sed -i ${D}${SDKPATHNATIVE}/post-relocate-setup.d/icecc-setup.sh \ |
33 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' | 33 | -e 's,@TOOLCHAIN_ENV@,${ENV_NAME},g' |
34 | } | 34 | } |
diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.20.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb index 1f59c5ea1e..91170dfbed 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.20.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;p | |||
8 | file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 8 | file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "854fbb9fe733b774981e1ffcf825b2d2ce0f8072" | 11 | SRCREV = "2e973ce22698dd64f472180e3a689755268fb06b" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.1.bb index dc2ddf9492..3ab840b1b0 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.73.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.73.1.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p | |||
13 | file://armarch.patch \ | 13 | file://armarch.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRCREV = "1f30b3479528e8b62754f9047195c8e5a31f07ed" | 16 | SRCREV = "0120e70747dcf05e716792e2e846c62eccd44319" |
17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch index 48af6fc283..a5c53b6657 100644 --- a/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch +++ b/meta/recipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 86940d87026432683fb6741cd8a34d3b9b18e40d Mon Sep 17 00:00:00 2001 | 1 | From 3b30a9bda88374e8f03bf96e972aee5bd214b98b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 27 Nov 2020 10:11:08 +0000 | 3 | Date: Fri, 27 Nov 2020 10:11:08 +0000 |
4 | Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well | 4 | Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 4 insertions(+), 1 deletion(-) | 14 | 1 file changed, 4 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 16 | diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
17 | index ccf0959389b..1f801e83b7d 100644 | 17 | index 73724e662f9e..1ca9c73415db 100644 |
18 | --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 18 | --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
19 | +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp | 19 | +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp |
20 | @@ -359,7 +359,10 @@ public: | 20 | @@ -361,7 +361,10 @@ public: |
21 | // name of a class shouldn't be significant. However, some of the backends | 21 | // name of a class shouldn't be significant. However, some of the backends |
22 | // accidentally rely on this behaviour, so it will have to stay like this | 22 | // accidentally rely on this behaviour, so it will have to stay like this |
23 | // until they are fixed. | 23 | // until they are fixed. |
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index e1d5fc47a1..6413b041a8 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -17,14 +17,14 @@ inherit cmake pkgconfig | |||
17 | # could be 'rcX' or 'git' or empty ( for release ) | 17 | # could be 'rcX' or 'git' or empty ( for release ) |
18 | VER_SUFFIX = "" | 18 | VER_SUFFIX = "" |
19 | 19 | ||
20 | PV = "18.1.2${VER_SUFFIX}" | 20 | PV = "18.1.5${VER_SUFFIX}" |
21 | 21 | ||
22 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" | 22 | MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" |
23 | 23 | ||
24 | LLVM_RELEASE = "${PV}" | 24 | LLVM_RELEASE = "${PV}" |
25 | 25 | ||
26 | BRANCH = "release/${MAJOR_VERSION}.x" | 26 | BRANCH = "release/${MAJOR_VERSION}.x" |
27 | SRCREV = "26a1d6601d727a96f4301d0d8647b5a42760ae0c" | 27 | SRCREV = "617a15a9eac96088ae5e9134248d8236e34b91b1" |
28 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ | 28 | SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ |
29 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ | 29 | file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ |
30 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ | 30 | file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ |
@@ -134,7 +134,7 @@ SYSROOT_PREPROCESS_FUNCS:append:class-target = " llvm_sysroot_preprocess" | |||
134 | 134 | ||
135 | llvm_sysroot_preprocess() { | 135 | llvm_sysroot_preprocess() { |
136 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | 136 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ |
137 | install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | 137 | install -m 0755 ${UNPACKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ |
138 | ln -sf llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} | 138 | ln -sf llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV} |
139 | } | 139 | } |
140 | 140 | ||
diff --git a/meta/recipes-devtools/lua/lua_5.4.6.bb b/meta/recipes-devtools/lua/lua_5.4.6.bb index eabfc89575..65f19ae247 100644 --- a/meta/recipes-devtools/lua/lua_5.4.6.bb +++ b/meta/recipes-devtools/lua/lua_5.4.6.bb | |||
@@ -44,8 +44,8 @@ do_install () { | |||
44 | install | 44 | install |
45 | install -d ${D}${libdir}/pkgconfig | 45 | install -d ${D}${libdir}/pkgconfig |
46 | 46 | ||
47 | sed -e s/@VERSION@/${PV}/ -e s#@LIBDIR@#${libdir}# -e s#@INCLUDEDIR@#${includedir}# ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc | 47 | sed -e s/@VERSION@/${PV}/ -e s#@LIBDIR@#${libdir}# -e s#@INCLUDEDIR@#${includedir}# ${UNPACKDIR}/lua.pc.in > ${S}/lua.pc |
48 | install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ | 48 | install -m 0644 ${S}/lua.pc ${D}${libdir}/pkgconfig/ |
49 | rmdir ${D}${datadir}/lua/5.4 | 49 | rmdir ${D}${datadir}/lua/5.4 |
50 | rmdir ${D}${datadir}/lua | 50 | rmdir ${D}${datadir}/lua |
51 | } | 51 | } |
diff --git a/meta/recipes-devtools/meson/meson_1.3.1.bb b/meta/recipes-devtools/meson/meson_1.3.1.bb index 9cc0cc31ab..3d2eedca10 100644 --- a/meta/recipes-devtools/meson/meson_1.3.1.bb +++ b/meta/recipes-devtools/meson/meson_1.3.1.bb | |||
@@ -132,11 +132,11 @@ do_install:append:class-nativesdk() { | |||
132 | install_templates | 132 | install_templates |
133 | 133 | ||
134 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 134 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
135 | install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ | 135 | install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/ |
136 | 136 | ||
137 | # We need to wrap the real meson with a thin env setup wrapper. | 137 | # We need to wrap the real meson with a thin env setup wrapper. |
138 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real | 138 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real |
139 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson | 139 | install -m 0755 ${UNPACKDIR}/meson-wrapper ${D}${bindir}/meson |
140 | } | 140 | } |
141 | 141 | ||
142 | FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" | 142 | FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" |
@@ -149,10 +149,10 @@ do_install:append:class-native() { | |||
149 | install_templates | 149 | install_templates |
150 | 150 | ||
151 | install -d ${D}${datadir}/post-relocate-setup.d | 151 | install -d ${D}${datadir}/post-relocate-setup.d |
152 | install -m 0755 ${WORKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/ | 152 | install -m 0755 ${UNPACKDIR}/meson-setup.py ${D}${datadir}/post-relocate-setup.d/ |
153 | 153 | ||
154 | # We need to wrap the real meson with a thin wrapper that substitues native/cross files | 154 | # We need to wrap the real meson with a thin wrapper that substitues native/cross files |
155 | # when running in a direct SDK environment. | 155 | # when running in a direct SDK environment. |
156 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real | 156 | mv ${D}${bindir}/meson ${D}${bindir}/meson.real |
157 | install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson | 157 | install -m 0755 ${UNPACKDIR}/meson-wrapper ${D}${bindir}/meson |
158 | } | 158 | } |
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb index a7e4d369ff..7c6be93a9c 100644 --- a/meta/recipes-devtools/mmc/mmc-utils_git.bb +++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" | |||
5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" | 5 | LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d" |
6 | 6 | ||
7 | SRCBRANCH ?= "master" | 7 | SRCBRANCH ?= "master" |
8 | SRCREV = "b5ca140312d279ad2f22068fd72a6230eea13436" | 8 | SRCREV = "f757f413dea4a143ad7c3b48b8264176f0499a82" |
9 | 9 | ||
10 | PV = "0.1+git" | 10 | PV = "0.1+git" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 4b27528f64..a40d79c864 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb | |||
@@ -11,9 +11,9 @@ inherit autotools pkgconfig update-alternatives | |||
11 | DEPENDS = "zlib e2fsprogs util-linux" | 11 | DEPENDS = "zlib e2fsprogs util-linux" |
12 | RDEPENDS:mtd-utils-tests += "bash" | 12 | RDEPENDS:mtd-utils-tests += "bash" |
13 | 13 | ||
14 | PV = "2.1.6" | 14 | PV = "2.2.0" |
15 | 15 | ||
16 | SRCREV = "219e741f40f4801bae263e0b581b64888d887b4a" | 16 | SRCREV = "31e990c56aba7584cde310685d663bb122f16003" |
17 | SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" | 17 | SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/ninja/ninja_1.11.1.bb b/meta/recipes-devtools/ninja/ninja_1.12.0.bb index 8e297ec4d4..ef7f80d0ae 100644 --- a/meta/recipes-devtools/ninja/ninja_1.11.1.bb +++ b/meta/recipes-devtools/ninja/ninja_1.12.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" | |||
6 | 6 | ||
7 | DEPENDS = "re2c-native ninja-native" | 7 | DEPENDS = "re2c-native ninja-native" |
8 | 8 | ||
9 | SRCREV = "a524bf3f6bacd1b4ad85d719eed2737d8562f27a" | 9 | SRCREV = "65d0dfcbbea6b8ca7d8a3a0f673ecb522379e43c" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" | 11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" |
12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" | 12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" |
diff --git a/meta/recipes-devtools/opkg/opkg_0.6.3.bb b/meta/recipes-devtools/opkg/opkg_0.6.3.bb index 9592ffc5d6..ef7c4f3a72 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.3.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.3.bb | |||
@@ -47,7 +47,7 @@ EXTRA_OECONF:append:class-native = " --localstatedir=/${@os.path.relpath('${loca | |||
47 | 47 | ||
48 | do_install:append () { | 48 | do_install:append () { |
49 | install -d ${D}${sysconfdir}/opkg | 49 | install -d ${D}${sysconfdir}/opkg |
50 | install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf | 50 | install -m 0644 ${UNPACKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf |
51 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf | 51 | echo "option lists_dir ${OPKGLIBDIR}/opkg/lists" >>${D}${sysconfdir}/opkg/opkg.conf |
52 | echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf | 52 | echo "option info_dir ${OPKGLIBDIR}/opkg/info" >>${D}${sysconfdir}/opkg/opkg.conf |
53 | echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf | 53 | echo "option status_file ${OPKGLIBDIR}/opkg/status" >>${D}${sysconfdir}/opkg/opkg.conf |
diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb deleted file mode 100644 index e54bb11ccd..0000000000 --- a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | SUMMARY = "Error - Error/exception handling in an OO-ish way" | ||
2 | DESCRIPTION = "The Error package provides two interfaces. Firstly \ | ||
3 | Error provides a procedural interface to exception handling. \ | ||
4 | Secondly Error is a base class for errors/exceptions that can \ | ||
5 | either be thrown, for subsequent catch, or can simply be recorded." | ||
6 | HOMEPAGE = "https://github.com/shlomif/perl-error.pm" | ||
7 | SECTION = "libs" | ||
8 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100" | ||
11 | |||
12 | |||
13 | DEPENDS += "perl" | ||
14 | |||
15 | RDEPENDS:${PN} += " \ | ||
16 | perl-module-carp \ | ||
17 | perl-module-exporter \ | ||
18 | perl-module-scalar-util \ | ||
19 | perl-module-overload \ | ||
20 | perl-module-strict \ | ||
21 | perl-module-vars \ | ||
22 | perl-module-warnings \ | ||
23 | " | ||
24 | |||
25 | RDEPENDS:${PN}-ptest += " \ | ||
26 | perl-module-base \ | ||
27 | perl-module-file-spec \ | ||
28 | perl-module-io-handle \ | ||
29 | perl-module-ipc-open3 \ | ||
30 | perl-module-lib \ | ||
31 | perl-module-test-more \ | ||
32 | " | ||
33 | |||
34 | SRC_URI = "http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Error-${PV}.tar.gz" | ||
35 | |||
36 | SRC_URI[md5sum] = "6732b1c6207e4a9a3e2987c88368039a" | ||
37 | SRC_URI[sha256sum] = "1a23f7913032aed6d4b68321373a3899ca66590f4727391a091ec19c95bf7adc" | ||
38 | |||
39 | S = "${WORKDIR}/Error-${PV}" | ||
40 | |||
41 | inherit cpan ptest-perl | ||
42 | |||
43 | do_install:prepend() { | ||
44 | # test requires "-T" (taint) command line option | ||
45 | rm -rf ${B}/t/pod-coverage.t | ||
46 | } | ||
47 | |||
48 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-devtools/perl/liburi-perl_5.27.bb b/meta/recipes-devtools/perl/liburi-perl_5.28.bb index e5db7b3cfe..1fc0efd3e5 100644 --- a/meta/recipes-devtools/perl/liburi-perl_5.27.bb +++ b/meta/recipes-devtools/perl/liburi-perl_5.28.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "${CPAN_MIRROR}/authors/id/O/OA/OALDERS/URI-${PV}.tar.gz \ | |||
12 | file://0001-Skip-TODO-test-cases-that-fail.patch \ | 12 | file://0001-Skip-TODO-test-cases-that-fail.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "11962d8a8a8496906e5d34774affc235a1c95c112d390c0b4171f3e91e9e2a97" | 15 | SRC_URI[sha256sum] = "e7985da359b15efd00917fa720292b711c396f2f9f9a7349e4e7dec74aa79765" |
16 | 16 | ||
17 | S = "${WORKDIR}/URI-${PV}" | 17 | S = "${WORKDIR}/URI-${PV}" |
18 | 18 | ||
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.1.1.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb index 33d69451bb..5f4ef73d43 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.1.1.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.2.0.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "\ | |||
20 | file://pkg-config-native.in \ | 20 | file://pkg-config-native.in \ |
21 | file://pkg-config-esdk.in \ | 21 | file://pkg-config-esdk.in \ |
22 | " | 22 | " |
23 | SRC_URI[sha256sum] = "3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5" | 23 | SRC_URI[sha256sum] = "b06ff63a83536aa8c2f6422fa80ad45e4833f590266feb14eaddfe1d4c853c69" |
24 | 24 | ||
25 | inherit autotools | 25 | inherit autotools |
26 | 26 | ||
@@ -29,18 +29,18 @@ EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig | |||
29 | do_install:append () { | 29 | do_install:append () { |
30 | # Install a wrapper which deals, as much as possible with pkgconf vs | 30 | # Install a wrapper which deals, as much as possible with pkgconf vs |
31 | # pkg-config compatibility issues. | 31 | # pkg-config compatibility issues. |
32 | install -m 0755 "${WORKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" | 32 | install -m 0755 "${UNPACKDIR}/pkg-config-wrapper" "${D}${bindir}/pkg-config" |
33 | } | 33 | } |
34 | 34 | ||
35 | do_install:append:class-native () { | 35 | do_install:append:class-native () { |
36 | # Install a pkg-config-native wrapper that will use the native sysroot instead | 36 | # Install a pkg-config-native wrapper that will use the native sysroot instead |
37 | # of the MACHINE sysroot, for using pkg-config when building native tools. | 37 | # of the MACHINE sysroot, for using pkg-config when building native tools. |
38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 38 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
39 | < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native | 39 | < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native |
40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native | 40 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native |
41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 41 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 42 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
43 | < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk | 43 | < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk |
44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk | 44 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk |
45 | } | 45 | } |
46 | 46 | ||
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 16e6c5b609..6f13d0177e 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | |||
@@ -51,11 +51,11 @@ RPROVIDES:${PN} += "pkgconfig(pkg-config)" | |||
51 | do_install:append:class-native () { | 51 | do_install:append:class-native () { |
52 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 52 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
53 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 53 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
54 | < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native | 54 | < ${UNPACKDIR}/pkg-config-native.in > ${B}/pkg-config-native |
55 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native | 55 | install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native |
56 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ | 56 | sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \ |
57 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ | 57 | -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \ |
58 | < ${WORKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk | 58 | < ${UNPACKDIR}/pkg-config-esdk.in > ${B}/pkg-config-esdk |
59 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk | 59 | install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk |
60 | } | 60 | } |
61 | 61 | ||
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 7e09b6d58c..36283ffa74 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -133,8 +133,8 @@ do_install:append:class-native () { | |||
133 | chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` | 133 | chrpath ${D}${bindir}/pseudo -r `chrpath ${D}${bindir}/pseudo | cut -d = -f 2 | sed s/XORIGIN/\\$ORIGIN/` |
134 | install -d ${D}${sysconfdir} | 134 | install -d ${D}${sysconfdir} |
135 | # The fallback files should never be modified | 135 | # The fallback files should never be modified |
136 | install -m 444 ${WORKDIR}/fallback-passwd ${D}${sysconfdir}/passwd | 136 | install -m 444 ${UNPACKDIR}/fallback-passwd ${D}${sysconfdir}/passwd |
137 | install -m 444 ${WORKDIR}/fallback-group ${D}${sysconfdir}/group | 137 | install -m 444 ${UNPACKDIR}/fallback-group ${D}${sysconfdir}/group |
138 | 138 | ||
139 | # Two native/nativesdk entries below are the same | 139 | # Two native/nativesdk entries below are the same |
140 | # If necessary install for the alternative machine arch. This is only | 140 | # If necessary install for the alternative machine arch. This is only |
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 025cf0fc9c..c70b509233 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb | |||
@@ -14,7 +14,7 @@ SRC_URI:append:class-nativesdk = " \ | |||
14 | file://older-glibc-symbols.patch" | 14 | file://older-glibc-symbols.patch" |
15 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" | 15 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" |
16 | 16 | ||
17 | SRCREV = "516a0a3c4b46f046895d27bfa019d685fe462dfa" | 17 | SRCREV = "0d292df61aeb886ae8ca33d9edc3b6d0ff5c0f0f" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | PV = "1.9.0+git" | 19 | PV = "1.9.0+git" |
20 | 20 | ||
diff --git a/meta/recipes-devtools/python/python-cython.inc b/meta/recipes-devtools/python/python-cython.inc index e54926ae6d..87a2e88a1a 100644 --- a/meta/recipes-devtools/python/python-cython.inc +++ b/meta/recipes-devtools/python/python-cython.inc | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=61c3ee8961575861fa86c7e62bc9f69c" | |||
9 | PYPI_PACKAGE = "Cython" | 9 | PYPI_PACKAGE = "Cython" |
10 | BBCLASSEXTEND = "native nativesdk" | 10 | BBCLASSEXTEND = "native nativesdk" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6" | 12 | SRC_URI[sha256sum] = "dcc96739331fb854dcf503f94607576cfe8488066c61ca50dfd55836f132de99" |
13 | UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" | 13 | UPSTREAM_CHECK_REGEX = "Cython-(?P<pver>.*)\.tar" |
14 | 14 | ||
15 | inherit pypi | 15 | inherit pypi |
diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc index 530ff1c7c3..7b269f2940 100644 --- a/meta/recipes-devtools/python/python-pyasn1.inc +++ b/meta/recipes-devtools/python/python-pyasn1.inc | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pyasn1.sourceforge.net/" | |||
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=190f79253908c986e6cacf380c3a5f6d" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c" | 6 | SRC_URI[sha256sum] = "3a35ab2c4b5ef98e17dfdec8ab074046fbda76e281c5a706ccd82328cfc8f64c" |
7 | 7 | ||
8 | RDEPENDS:${PN}:class-target += " \ | 8 | RDEPENDS:${PN}:class-target += " \ |
9 | python3-codecs \ | 9 | python3-codecs \ |
diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc deleted file mode 100644 index e9dd97ec1c..0000000000 --- a/meta/recipes-devtools/python/python-testtools.inc +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "Extensions to the Python standard library unit testing framework" | ||
2 | HOMEPAGE = "https://pypi.org/project/testtools/" | ||
3 | SECTION = "devel/python" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" | ||
6 | |||
7 | inherit pypi | ||
8 | |||
9 | SRC_URI[sha256sum] = "df6de96010e29ee21f637a147eabf30d50b25e3841dd1d68f93ee89ce77e366c" | ||
10 | |||
11 | DEPENDS += " \ | ||
12 | python3-pbr \ | ||
13 | " | ||
14 | |||
15 | # Satisfy setup.py 'setup_requires' | ||
16 | DEPENDS += " \ | ||
17 | python3-pbr-native \ | ||
18 | " | ||
19 | |||
20 | RDEPENDS:${PN} += "\ | ||
21 | python3-doctest \ | ||
22 | python3-extras \ | ||
23 | python3-pbr \ | ||
24 | python3-six \ | ||
25 | " | ||
26 | |||
27 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-beartype_0.17.2.bb b/meta/recipes-devtools/python/python3-beartype_0.18.5.bb index 05fd74543b..04fbd3139f 100644 --- a/meta/recipes-devtools/python/python3-beartype_0.17.2.bb +++ b/meta/recipes-devtools/python/python3-beartype_0.18.5.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://beartype.readthedocs.io" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e71f94261c1b39896cacacfeaf60560e" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e71f94261c1b39896cacacfeaf60560e" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "e911e1ae7de4bccd15745f7643609d8732f64de5c2fb844e89cbbed1c5a8d495" | 7 | SRC_URI[sha256sum] = "264ddc2f1da9ec94ff639141fbe33d22e12a9f75aa863b83b7046ffff1381927" |
8 | 8 | ||
9 | inherit setuptools3 pypi | 9 | inherit setuptools3 pypi |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-build_1.1.1.bb b/meta/recipes-devtools/python/python3-build_1.2.1.bb index 7fc3eef91b..0156861201 100644 --- a/meta/recipes-devtools/python/python3-build_1.1.1.bb +++ b/meta/recipes-devtools/python/python3-build_1.2.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/build" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31" | 6 | SRC_URI[sha256sum] = "526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d" |
7 | 7 | ||
8 | inherit pypi python_flit_core | 8 | inherit pypi python_flit_core |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-cython_3.0.8.bb b/meta/recipes-devtools/python/python3-cython_3.0.10.bb index 07638d7ad7..07638d7ad7 100644 --- a/meta/recipes-devtools/python/python3-cython_3.0.8.bb +++ b/meta/recipes-devtools/python/python3-cython_3.0.10.bb | |||
diff --git a/meta/recipes-devtools/python/python3-dtschema_2024.2.bb b/meta/recipes-devtools/python/python3-dtschema_2024.4.bb index 0e911dfb3d..9583cd57b9 100644 --- a/meta/recipes-devtools/python/python3-dtschema_2024.2.bb +++ b/meta/recipes-devtools/python/python3-dtschema_2024.4.bb | |||
@@ -7,7 +7,7 @@ inherit pypi python_setuptools_build_meta | |||
7 | 7 | ||
8 | PYPI_PACKAGE = "dtschema" | 8 | PYPI_PACKAGE = "dtschema" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "df4e5afb35bda93894209d2465e87fb7103f1a95a05909ebcb594fc4cf4fdd1e" | 10 | SRC_URI[sha256sum] = "18dd1d34b4a5e451291e5444e9ceb4a6febc605871cdaef22673b6f80aa4a131" |
11 | 11 | ||
12 | DEPENDS += "python3-setuptools-scm-native" | 12 | DEPENDS += "python3-setuptools-scm-native" |
13 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
diff --git a/meta/recipes-devtools/python/python3-git_3.1.42.bb b/meta/recipes-devtools/python/python3-git_3.1.43.bb index 19885a58c7..45c988117b 100644 --- a/meta/recipes-devtools/python/python3-git_3.1.42.bb +++ b/meta/recipes-devtools/python/python3-git_3.1.43.bb | |||
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "GitPython" | |||
12 | 12 | ||
13 | inherit pypi python_setuptools_build_meta | 13 | inherit pypi python_setuptools_build_meta |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "2d99869e0fef71a73cbd242528105af1d6c1b108c60dfabd994bf292f76c3ceb" | 15 | SRC_URI[sha256sum] = "35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c" |
16 | 16 | ||
17 | DEPENDS += " python3-gitdb" | 17 | DEPENDS += " python3-gitdb" |
18 | 18 | ||
diff --git a/meta/recipes-devtools/python/python3-hatchling_1.21.1.bb b/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb index 09d936aa7d..fc8d953281 100644 --- a/meta/recipes-devtools/python/python3-hatchling_1.21.1.bb +++ b/meta/recipes-devtools/python/python3-hatchling_1.24.1.bb | |||
@@ -8,7 +8,7 @@ inherit pypi python_hatchling | |||
8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" | 8 | DEPENDS += "python3-pluggy-native python3-pathspec-native python3-packaging-native python3-editables-native python3-trove-classifiers-native" |
9 | DEPENDS:remove:class-native = "python3-hatchling-native" | 9 | DEPENDS:remove:class-native = "python3-hatchling-native" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "bba440453a224e7d4478457fa2e8d8c3633765bafa02975a6b53b9bf917980bc" | 11 | SRC_URI[sha256sum] = "51f861891e98c4044eb455163a737e5d2328d7aa74890b182db2d80fee22a497" |
12 | 12 | ||
13 | do_compile:prepend() { | 13 | do_compile:prepend() { |
14 | export PYTHONPATH=src | 14 | export PYTHONPATH=src |
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.98.15.bb b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb index a17abe58c0..af7facfe7e 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.98.15.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += " \ | |||
13 | file://test_rle.py \ | 13 | file://test_rle.py \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "1e31210951511b24ce8b3b6e04d791c466385a30ac3af571bf2223954b025d77" | 16 | SRC_URI[sha256sum] = "ebff09d7fa4f1fb6a855a812baf17e578b4481b7b70ec6d96496210d1a4c6c35" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-attrs \ | 19 | python3-attrs \ |
diff --git a/meta/recipes-devtools/python/python3-idna_3.6.bb b/meta/recipes-devtools/python/python3-idna_3.7.bb index 47c080cdf8..729aff1c46 100644 --- a/meta/recipes-devtools/python/python3-idna_3.6.bb +++ b/meta/recipes-devtools/python/python3-idna_3.7.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Internationalised Domain Names in Applications" | 1 | SUMMARY = "Internationalised Domain Names in Applications" |
2 | HOMEPAGE = "https://github.com/kjd/idna" | 2 | HOMEPAGE = "https://github.com/kjd/idna" |
3 | LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" | 3 | LICENSE = "BSD-3-Clause & Python-2.0 & Unicode-TOU" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=dbec47b98e1469f6a104c82ff9698cee" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca" | 6 | SRC_URI[sha256sum] = "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc" |
7 | 7 | ||
8 | inherit pypi python_flit_core | 8 | inherit pypi python_flit_core |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-importlib-metadata_7.0.1.bb b/meta/recipes-devtools/python/python3-importlib-metadata_7.1.0.bb index 0d3f0a5001..fdb37cecef 100644 --- a/meta/recipes-devtools/python/python3-importlib-metadata_7.0.1.bb +++ b/meta/recipes-devtools/python/python3-importlib-metadata_7.1.0.bb | |||
@@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta | |||
8 | PYPI_PACKAGE = "importlib_metadata" | 8 | PYPI_PACKAGE = "importlib_metadata" |
9 | UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" | 9 | UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc" | 11 | SRC_URI[sha256sum] = "b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2" |
12 | 12 | ||
13 | S = "${WORKDIR}/importlib_metadata-${PV}" | 13 | S = "${WORKDIR}/importlib_metadata-${PV}" |
14 | 14 | ||
diff --git a/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb b/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb index eb63509fce..4ee0dd9b12 100644 --- a/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb +++ b/meta/recipes-devtools/python/python3-jsonschema-specifications_2023.12.1.bb | |||
@@ -11,6 +11,6 @@ inherit pypi python_hatchling | |||
11 | 11 | ||
12 | PYPI_PACKAGE = "jsonschema_specifications" | 12 | PYPI_PACKAGE = "jsonschema_specifications" |
13 | 13 | ||
14 | DEPENDS += "${PYTHON_PN}-hatch-vcs-native" | 14 | DEPENDS += "python3-hatch-vcs-native" |
15 | 15 | ||
16 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-libarchive-c_5.0.bb b/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb index 6ac86fc7a1..4e318e52f4 100644 --- a/meta/recipes-devtools/python/python3-libarchive-c_5.0.bb +++ b/meta/recipes-devtools/python/python3-libarchive-c_5.1.bb | |||
@@ -9,7 +9,7 @@ PYPI_PACKAGE = "libarchive-c" | |||
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "d673f56673d87ec740d1a328fa205cafad1d60f5daca4685594deb039d32b159" | 12 | SRC_URI[sha256sum] = "7bcce24ea6c0fa3bc62468476c6d2f6264156db2f04878a372027c10615a2721" |
13 | 13 | ||
14 | RDEPENDS:${PN} += "\ | 14 | RDEPENDS:${PN} += "\ |
15 | libarchive \ | 15 | libarchive \ |
diff --git a/meta/recipes-devtools/python/python3-license-expression_30.2.0.bb b/meta/recipes-devtools/python/python3-license-expression_30.3.0.bb index 7059cf76ee..f36336b592 100644 --- a/meta/recipes-devtools/python/python3-license-expression_30.2.0.bb +++ b/meta/recipes-devtools/python/python3-license-expression_30.3.0.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/nexB/license-expression" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 5 | LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "599928edd995c43fc335e0af342076144dc71cb858afa1ed9c1c30c4e81794f5" | 7 | SRC_URI[sha256sum] = "1295406f736b4f395ff069aec1cebfad53c0fcb3cf57df0f5ec58fc7b905aea5" |
8 | 8 | ||
9 | inherit pypi ptest python_setuptools_build_meta | 9 | inherit pypi ptest python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-lxml_5.0.0.bb b/meta/recipes-devtools/python/python3-lxml_5.2.1.bb index 66cb8b0938..44a10505f3 100644 --- a/meta/recipes-devtools/python/python3-lxml_5.0.0.bb +++ b/meta/recipes-devtools/python/python3-lxml_5.2.1.bb | |||
@@ -18,11 +18,10 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ | |||
18 | 18 | ||
19 | DEPENDS += "libxml2 libxslt" | 19 | DEPENDS += "libxml2 libxslt" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "2219cbf790e701acf9a21a31ead75f983e73daf0eceb9da6990212e4d20ebefe" | 21 | SRC_URI[sha256sum] = "3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306" |
22 | 22 | ||
23 | SRC_URI += "${PYPI_SRC_URI}" | 23 | SRC_URI += "${PYPI_SRC_URI}" |
24 | inherit pkgconfig pypi setuptools3 | 24 | inherit pkgconfig pypi setuptools3 |
25 | PYPI_PACKAGE_EXT = "zip" | ||
26 | 25 | ||
27 | # {standard input}: Assembler messages: | 26 | # {standard input}: Assembler messages: |
28 | # {standard input}:1488805: Error: branch out of range | 27 | # {standard input}:1488805: Error: branch out of range |
diff --git a/meta/recipes-devtools/python/python3-mako_1.3.2.bb b/meta/recipes-devtools/python/python3-mako_1.3.3.bb index 5b7df9192f..7545cbef99 100644 --- a/meta/recipes-devtools/python/python3-mako_1.3.2.bb +++ b/meta/recipes-devtools/python/python3-mako_1.3.3.bb | |||
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "Mako" | |||
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e" | 11 | SRC_URI[sha256sum] = "e16c01d9ab9c11f7290eef1cfefc093fb5a45ee4a3da09e2fec2e4d1bae54e73" |
12 | 12 | ||
13 | RDEPENDS:${PN} = "python3-html \ | 13 | RDEPENDS:${PN} = "python3-html \ |
14 | python3-markupsafe \ | 14 | python3-markupsafe \ |
diff --git a/meta/recipes-devtools/python/python3-markdown_3.5.2.bb b/meta/recipes-devtools/python/python3-markdown_3.6.bb index 1df7a98183..7c64837395 100644 --- a/meta/recipes-devtools/python/python3-markdown_3.5.2.bb +++ b/meta/recipes-devtools/python/python3-markdown_3.6.bb | |||
@@ -1,12 +1,12 @@ | |||
1 | SUMMARY = "A Python implementation of John Gruber's Markdown." | 1 | SUMMARY = "A Python implementation of John Gruber's Markdown." |
2 | HOMEPAGE = "https://python-markdown.github.io/" | 2 | HOMEPAGE = "https://python-markdown.github.io/" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ec58cdf7cfed06a21f7a9362627a5480" |
5 | 5 | ||
6 | inherit pypi python_setuptools_build_meta | 6 | inherit pypi python_setuptools_build_meta |
7 | 7 | ||
8 | PYPI_PACKAGE = "Markdown" | 8 | PYPI_PACKAGE = "Markdown" |
9 | SRC_URI[sha256sum] = "e1ac7b3dc550ee80e602e71c1d168002f062e49f1b11e26a36264dafd4df2ef8" | 9 | SRC_URI[sha256sum] = "ed4f41f6daecbeeb96e576ce414c41d2d876daa9a16cb35fa8ed8c2ddfad0224" |
10 | 10 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
12 | 12 | ||
diff --git a/meta/recipes-devtools/python/python3-maturin-crates.inc b/meta/recipes-devtools/python/python3-maturin-crates.inc index 3cb614d52a..ba207458ef 100644 --- a/meta/recipes-devtools/python/python3-maturin-crates.inc +++ b/meta/recipes-devtools/python/python3-maturin-crates.inc | |||
@@ -3,24 +3,22 @@ | |||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/adler/1.0.2 \ | 5 | crate://crates.io/adler/1.0.2 \ |
6 | crate://crates.io/ahash/0.8.6 \ | 6 | crate://crates.io/ahash/0.8.7 \ |
7 | crate://crates.io/aho-corasick/1.1.2 \ | 7 | crate://crates.io/aho-corasick/1.1.2 \ |
8 | crate://crates.io/allocator-api2/0.2.16 \ | 8 | crate://crates.io/allocator-api2/0.2.16 \ |
9 | crate://crates.io/anstream/0.3.2 \ | 9 | crate://crates.io/anstream/0.6.11 \ |
10 | crate://crates.io/anstream/0.6.4 \ | 10 | crate://crates.io/anstyle/1.0.4 \ |
11 | crate://crates.io/anstyle/1.0.2 \ | 11 | crate://crates.io/anstyle-parse/0.2.3 \ |
12 | crate://crates.io/anstyle-parse/0.2.1 \ | 12 | crate://crates.io/anstyle-query/1.0.2 \ |
13 | crate://crates.io/anstyle-query/1.0.0 \ | 13 | crate://crates.io/anstyle-wincon/3.0.2 \ |
14 | crate://crates.io/anstyle-wincon/1.0.2 \ | 14 | crate://crates.io/anyhow/1.0.80 \ |
15 | crate://crates.io/anstyle-wincon/3.0.1 \ | ||
16 | crate://crates.io/anyhow/1.0.75 \ | ||
17 | crate://crates.io/autocfg/1.1.0 \ | 15 | crate://crates.io/autocfg/1.1.0 \ |
18 | crate://crates.io/base64/0.13.1 \ | 16 | crate://crates.io/base64/0.13.1 \ |
19 | crate://crates.io/base64/0.21.5 \ | 17 | crate://crates.io/base64/0.21.7 \ |
20 | crate://crates.io/bitflags/1.3.2 \ | 18 | crate://crates.io/bitflags/1.3.2 \ |
21 | crate://crates.io/bitflags/2.4.1 \ | 19 | crate://crates.io/bitflags/2.4.2 \ |
22 | crate://crates.io/block-buffer/0.10.4 \ | 20 | crate://crates.io/block-buffer/0.10.4 \ |
23 | crate://crates.io/bstr/1.8.0 \ | 21 | crate://crates.io/bstr/1.9.0 \ |
24 | crate://crates.io/byteorder/1.5.0 \ | 22 | crate://crates.io/byteorder/1.5.0 \ |
25 | crate://crates.io/bytes/1.5.0 \ | 23 | crate://crates.io/bytes/1.5.0 \ |
26 | crate://crates.io/bytesize/1.3.0 \ | 24 | crate://crates.io/bytesize/1.3.0 \ |
@@ -28,42 +26,42 @@ SRC_URI += " \ | |||
28 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ | 26 | crate://crates.io/bzip2-sys/0.1.11+1.0.8 \ |
29 | crate://crates.io/cab/0.4.1 \ | 27 | crate://crates.io/cab/0.4.1 \ |
30 | crate://crates.io/camino/1.1.6 \ | 28 | crate://crates.io/camino/1.1.6 \ |
31 | crate://crates.io/cargo-config2/0.1.16 \ | 29 | crate://crates.io/cargo-config2/0.1.19 \ |
32 | crate://crates.io/cargo-options/0.7.2 \ | 30 | crate://crates.io/cargo-options/0.7.2 \ |
33 | crate://crates.io/cargo-platform/0.1.5 \ | 31 | crate://crates.io/cargo-platform/0.1.6 \ |
34 | crate://crates.io/cargo-xwin/0.16.2 \ | 32 | crate://crates.io/cargo-xwin/0.16.4 \ |
35 | crate://crates.io/cargo-zigbuild/0.18.0 \ | 33 | crate://crates.io/cargo-zigbuild/0.18.3 \ |
36 | crate://crates.io/cargo_metadata/0.18.1 \ | 34 | crate://crates.io/cargo_metadata/0.18.1 \ |
37 | crate://crates.io/cbindgen/0.26.0 \ | 35 | crate://crates.io/cbindgen/0.26.0 \ |
38 | crate://crates.io/cc/1.0.83 \ | 36 | crate://crates.io/cc/1.0.88 \ |
39 | crate://crates.io/cfb/0.9.0 \ | 37 | crate://crates.io/cfb/0.9.0 \ |
40 | crate://crates.io/cfg-if/1.0.0 \ | 38 | crate://crates.io/cfg-if/1.0.0 \ |
41 | crate://crates.io/charset/0.1.3 \ | 39 | crate://crates.io/charset/0.1.3 \ |
42 | crate://crates.io/chumsky/0.9.3 \ | 40 | crate://crates.io/chumsky/0.9.3 \ |
43 | crate://crates.io/clap/4.3.24 \ | 41 | crate://crates.io/clap/4.4.18 \ |
44 | crate://crates.io/clap_builder/4.3.24 \ | 42 | crate://crates.io/clap_builder/4.4.18 \ |
45 | crate://crates.io/clap_complete/4.3.2 \ | 43 | crate://crates.io/clap_complete/4.4.9 \ |
46 | crate://crates.io/clap_complete_command/0.5.1 \ | 44 | crate://crates.io/clap_complete_command/0.5.1 \ |
47 | crate://crates.io/clap_complete_fig/4.3.1 \ | ||
48 | crate://crates.io/clap_complete_nushell/0.1.11 \ | 45 | crate://crates.io/clap_complete_nushell/0.1.11 \ |
49 | crate://crates.io/clap_derive/4.3.12 \ | 46 | crate://crates.io/clap_derive/4.4.7 \ |
50 | crate://crates.io/clap_lex/0.5.0 \ | 47 | crate://crates.io/clap_lex/0.6.0 \ |
51 | crate://crates.io/cli-table/0.4.7 \ | 48 | crate://crates.io/cli-table/0.4.7 \ |
52 | crate://crates.io/colorchoice/1.0.0 \ | 49 | crate://crates.io/colorchoice/1.0.0 \ |
53 | crate://crates.io/configparser/3.0.3 \ | 50 | crate://crates.io/configparser/3.0.4 \ |
54 | crate://crates.io/console/0.15.7 \ | 51 | crate://crates.io/console/0.15.8 \ |
55 | crate://crates.io/content_inspector/0.2.4 \ | 52 | crate://crates.io/content_inspector/0.2.4 \ |
56 | crate://crates.io/core-foundation/0.9.3 \ | 53 | crate://crates.io/core-foundation/0.9.4 \ |
57 | crate://crates.io/core-foundation-sys/0.8.4 \ | 54 | crate://crates.io/core-foundation-sys/0.8.6 \ |
58 | crate://crates.io/cpufeatures/0.2.11 \ | 55 | crate://crates.io/cpufeatures/0.2.12 \ |
59 | crate://crates.io/crc32fast/1.3.2 \ | 56 | crate://crates.io/crc32fast/1.3.2 \ |
60 | crate://crates.io/crossbeam-channel/0.5.8 \ | 57 | crate://crates.io/crossbeam-channel/0.5.11 \ |
61 | crate://crates.io/crossbeam-deque/0.8.3 \ | 58 | crate://crates.io/crossbeam-deque/0.8.5 \ |
62 | crate://crates.io/crossbeam-epoch/0.9.15 \ | 59 | crate://crates.io/crossbeam-epoch/0.9.18 \ |
63 | crate://crates.io/crossbeam-utils/0.8.16 \ | 60 | crate://crates.io/crossbeam-utils/0.8.19 \ |
64 | crate://crates.io/crypto-common/0.1.6 \ | 61 | crate://crates.io/crypto-common/0.1.6 \ |
65 | crate://crates.io/data-encoding/2.5.0 \ | 62 | crate://crates.io/data-encoding/2.5.0 \ |
66 | crate://crates.io/deranged/0.3.9 \ | 63 | crate://crates.io/deranged/0.3.11 \ |
64 | crate://crates.io/derivative/2.2.0 \ | ||
67 | crate://crates.io/dialoguer/0.11.0 \ | 65 | crate://crates.io/dialoguer/0.11.0 \ |
68 | crate://crates.io/diff/0.1.13 \ | 66 | crate://crates.io/diff/0.1.13 \ |
69 | crate://crates.io/digest/0.10.7 \ | 67 | crate://crates.io/digest/0.10.7 \ |
@@ -78,8 +76,8 @@ SRC_URI += " \ | |||
78 | crate://crates.io/errno/0.3.8 \ | 76 | crate://crates.io/errno/0.3.8 \ |
79 | crate://crates.io/expect-test/1.4.1 \ | 77 | crate://crates.io/expect-test/1.4.1 \ |
80 | crate://crates.io/fastrand/2.0.1 \ | 78 | crate://crates.io/fastrand/2.0.1 \ |
81 | crate://crates.io/fat-macho/0.4.7 \ | 79 | crate://crates.io/fat-macho/0.4.8 \ |
82 | crate://crates.io/filetime/0.2.22 \ | 80 | crate://crates.io/filetime/0.2.23 \ |
83 | crate://crates.io/flate2/1.0.28 \ | 81 | crate://crates.io/flate2/1.0.28 \ |
84 | crate://crates.io/fnv/1.0.7 \ | 82 | crate://crates.io/fnv/1.0.7 \ |
85 | crate://crates.io/foreign-types/0.3.2 \ | 83 | crate://crates.io/foreign-types/0.3.2 \ |
@@ -87,47 +85,42 @@ SRC_URI += " \ | |||
87 | crate://crates.io/form_urlencoded/1.2.1 \ | 85 | crate://crates.io/form_urlencoded/1.2.1 \ |
88 | crate://crates.io/fs-err/2.11.0 \ | 86 | crate://crates.io/fs-err/2.11.0 \ |
89 | crate://crates.io/generic-array/0.14.7 \ | 87 | crate://crates.io/generic-array/0.14.7 \ |
90 | crate://crates.io/getrandom/0.2.11 \ | 88 | crate://crates.io/getrandom/0.2.12 \ |
91 | crate://crates.io/glob/0.3.1 \ | 89 | crate://crates.io/glob/0.3.1 \ |
92 | crate://crates.io/globset/0.4.14 \ | 90 | crate://crates.io/globset/0.4.14 \ |
93 | crate://crates.io/goblin/0.7.1 \ | 91 | crate://crates.io/goblin/0.8.0 \ |
94 | crate://crates.io/hashbrown/0.12.3 \ | 92 | crate://crates.io/hashbrown/0.12.3 \ |
95 | crate://crates.io/hashbrown/0.14.3 \ | 93 | crate://crates.io/hashbrown/0.14.3 \ |
96 | crate://crates.io/heck/0.4.1 \ | 94 | crate://crates.io/heck/0.4.1 \ |
97 | crate://crates.io/hermit-abi/0.3.3 \ | 95 | crate://crates.io/home/0.5.9 \ |
98 | crate://crates.io/home/0.5.5 \ | ||
99 | crate://crates.io/humantime/2.1.0 \ | 96 | crate://crates.io/humantime/2.1.0 \ |
100 | crate://crates.io/humantime-serde/1.1.1 \ | 97 | crate://crates.io/humantime-serde/1.1.1 \ |
101 | crate://crates.io/idna/0.5.0 \ | 98 | crate://crates.io/idna/0.5.0 \ |
102 | crate://crates.io/ignore/0.4.20 \ | 99 | crate://crates.io/ignore/0.4.22 \ |
103 | crate://crates.io/indexmap/1.9.3 \ | 100 | crate://crates.io/indexmap/1.9.3 \ |
104 | crate://crates.io/indexmap/2.1.0 \ | 101 | crate://crates.io/indexmap/2.2.3 \ |
105 | crate://crates.io/indicatif/0.17.7 \ | 102 | crate://crates.io/indicatif/0.17.7 \ |
106 | crate://crates.io/indoc/2.0.4 \ | 103 | crate://crates.io/indoc/2.0.4 \ |
107 | crate://crates.io/instant/0.1.12 \ | 104 | crate://crates.io/instant/0.1.12 \ |
108 | crate://crates.io/io-lifetimes/1.0.11 \ | ||
109 | crate://crates.io/is-terminal/0.4.9 \ | ||
110 | crate://crates.io/itertools/0.11.0 \ | 105 | crate://crates.io/itertools/0.11.0 \ |
111 | crate://crates.io/itertools/0.12.0 \ | 106 | crate://crates.io/itertools/0.12.1 \ |
112 | crate://crates.io/itoa/1.0.9 \ | 107 | crate://crates.io/itoa/1.0.10 \ |
113 | crate://crates.io/keyring/2.0.5 \ | 108 | crate://crates.io/keyring/2.3.2 \ |
114 | crate://crates.io/lazy_static/1.4.0 \ | 109 | crate://crates.io/lazy_static/1.4.0 \ |
115 | crate://crates.io/lddtree/0.3.3 \ | 110 | crate://crates.io/lddtree/0.3.4 \ |
116 | crate://crates.io/libc/0.2.150 \ | 111 | crate://crates.io/libc/0.2.153 \ |
117 | crate://crates.io/libredox/0.0.1 \ | 112 | crate://crates.io/libredox/0.0.1 \ |
118 | crate://crates.io/linux-keyutils/0.2.3 \ | 113 | crate://crates.io/linux-keyutils/0.2.4 \ |
119 | crate://crates.io/linux-raw-sys/0.3.8 \ | 114 | crate://crates.io/linux-raw-sys/0.4.13 \ |
120 | crate://crates.io/linux-raw-sys/0.4.11 \ | ||
121 | crate://crates.io/lock_api/0.4.11 \ | 115 | crate://crates.io/lock_api/0.4.11 \ |
122 | crate://crates.io/log/0.4.20 \ | 116 | crate://crates.io/log/0.4.20 \ |
123 | crate://crates.io/lzxd/0.1.4 \ | 117 | crate://crates.io/lzxd/0.1.4 \ |
124 | crate://crates.io/mailparse/0.14.0 \ | 118 | crate://crates.io/mailparse/0.14.1 \ |
125 | crate://crates.io/matchers/0.1.0 \ | 119 | crate://crates.io/matchers/0.1.0 \ |
126 | crate://crates.io/memchr/2.6.4 \ | 120 | crate://crates.io/memchr/2.7.1 \ |
127 | crate://crates.io/memoffset/0.9.0 \ | ||
128 | crate://crates.io/mime/0.3.17 \ | 121 | crate://crates.io/mime/0.3.17 \ |
129 | crate://crates.io/mime_guess/2.0.4 \ | 122 | crate://crates.io/mime_guess/2.0.4 \ |
130 | crate://crates.io/minijinja/1.0.10 \ | 123 | crate://crates.io/minijinja/1.0.12 \ |
131 | crate://crates.io/minimal-lexical/0.2.1 \ | 124 | crate://crates.io/minimal-lexical/0.2.1 \ |
132 | crate://crates.io/miniz_oxide/0.7.1 \ | 125 | crate://crates.io/miniz_oxide/0.7.1 \ |
133 | crate://crates.io/msi/0.7.0 \ | 126 | crate://crates.io/msi/0.7.0 \ |
@@ -137,128 +130,130 @@ SRC_URI += " \ | |||
137 | crate://crates.io/normalize-line-endings/0.3.0 \ | 130 | crate://crates.io/normalize-line-endings/0.3.0 \ |
138 | crate://crates.io/normpath/1.1.1 \ | 131 | crate://crates.io/normpath/1.1.1 \ |
139 | crate://crates.io/nu-ansi-term/0.46.0 \ | 132 | crate://crates.io/nu-ansi-term/0.46.0 \ |
133 | crate://crates.io/num-conv/0.1.0 \ | ||
140 | crate://crates.io/number_prefix/0.4.0 \ | 134 | crate://crates.io/number_prefix/0.4.0 \ |
141 | crate://crates.io/once_cell/1.18.0 \ | 135 | crate://crates.io/once_cell/1.19.0 \ |
142 | crate://crates.io/openssl/0.10.60 \ | 136 | crate://crates.io/openssl/0.10.63 \ |
143 | crate://crates.io/openssl-macros/0.1.1 \ | 137 | crate://crates.io/openssl-macros/0.1.1 \ |
144 | crate://crates.io/openssl-probe/0.1.5 \ | 138 | crate://crates.io/openssl-probe/0.1.5 \ |
145 | crate://crates.io/openssl-sys/0.9.96 \ | 139 | crate://crates.io/openssl-sys/0.9.99 \ |
146 | crate://crates.io/option-ext/0.2.0 \ | 140 | crate://crates.io/option-ext/0.2.0 \ |
147 | crate://crates.io/os_pipe/1.1.4 \ | 141 | crate://crates.io/os_pipe/1.1.5 \ |
148 | crate://crates.io/overload/0.1.1 \ | 142 | crate://crates.io/overload/0.1.1 \ |
149 | crate://crates.io/parking_lot/0.12.1 \ | 143 | crate://crates.io/parking_lot/0.12.1 \ |
150 | crate://crates.io/parking_lot_core/0.9.9 \ | 144 | crate://crates.io/parking_lot_core/0.9.9 \ |
151 | crate://crates.io/paste/1.0.14 \ | 145 | crate://crates.io/paste/1.0.14 \ |
152 | crate://crates.io/path-slash/0.2.1 \ | 146 | crate://crates.io/path-slash/0.2.1 \ |
153 | crate://crates.io/pep440_rs/0.3.12 \ | 147 | crate://crates.io/pep440_rs/0.5.0 \ |
154 | crate://crates.io/pep508_rs/0.2.3 \ | 148 | crate://crates.io/pep508_rs/0.4.2 \ |
155 | crate://crates.io/percent-encoding/2.3.1 \ | 149 | crate://crates.io/percent-encoding/2.3.1 \ |
156 | crate://crates.io/pin-project-lite/0.2.13 \ | 150 | crate://crates.io/pin-project-lite/0.2.13 \ |
157 | crate://crates.io/pkg-config/0.3.27 \ | 151 | crate://crates.io/pkg-config/0.3.29 \ |
158 | crate://crates.io/plain/0.2.3 \ | 152 | crate://crates.io/plain/0.2.3 \ |
159 | crate://crates.io/platform-info/2.0.2 \ | 153 | crate://crates.io/platform-info/2.0.2 \ |
160 | crate://crates.io/portable-atomic/1.5.1 \ | 154 | crate://crates.io/portable-atomic/1.6.0 \ |
161 | crate://crates.io/powerfmt/0.2.0 \ | 155 | crate://crates.io/powerfmt/0.2.0 \ |
162 | crate://crates.io/ppv-lite86/0.2.17 \ | 156 | crate://crates.io/ppv-lite86/0.2.17 \ |
163 | crate://crates.io/pretty_assertions/1.4.0 \ | 157 | crate://crates.io/pretty_assertions/1.4.0 \ |
164 | crate://crates.io/proc-macro2/1.0.70 \ | 158 | crate://crates.io/proc-macro2/1.0.78 \ |
165 | crate://crates.io/psm/0.1.21 \ | 159 | crate://crates.io/psm/0.1.21 \ |
166 | crate://crates.io/pyproject-toml/0.8.1 \ | 160 | crate://crates.io/pyproject-toml/0.10.0 \ |
167 | crate://crates.io/python-pkginfo/0.6.0 \ | 161 | crate://crates.io/python-pkginfo/0.6.0 \ |
168 | crate://crates.io/quote/1.0.33 \ | 162 | crate://crates.io/quote/1.0.35 \ |
169 | crate://crates.io/quoted_printable/0.4.8 \ | 163 | crate://crates.io/quoted_printable/0.4.8 \ |
164 | crate://crates.io/quoted_printable/0.5.0 \ | ||
170 | crate://crates.io/rand/0.8.5 \ | 165 | crate://crates.io/rand/0.8.5 \ |
171 | crate://crates.io/rand_chacha/0.3.1 \ | 166 | crate://crates.io/rand_chacha/0.3.1 \ |
172 | crate://crates.io/rand_core/0.6.4 \ | 167 | crate://crates.io/rand_core/0.6.4 \ |
173 | crate://crates.io/rayon/1.8.0 \ | 168 | crate://crates.io/rayon/1.8.1 \ |
174 | crate://crates.io/rayon-core/1.12.0 \ | 169 | crate://crates.io/rayon-core/1.12.1 \ |
175 | crate://crates.io/redox_syscall/0.3.5 \ | ||
176 | crate://crates.io/redox_syscall/0.4.1 \ | 170 | crate://crates.io/redox_syscall/0.4.1 \ |
177 | crate://crates.io/redox_users/0.4.4 \ | 171 | crate://crates.io/redox_users/0.4.4 \ |
178 | crate://crates.io/regex/1.10.2 \ | 172 | crate://crates.io/regex/1.10.3 \ |
179 | crate://crates.io/regex-automata/0.1.10 \ | 173 | crate://crates.io/regex-automata/0.1.10 \ |
180 | crate://crates.io/regex-automata/0.4.3 \ | 174 | crate://crates.io/regex-automata/0.4.5 \ |
181 | crate://crates.io/regex-syntax/0.6.29 \ | 175 | crate://crates.io/regex-syntax/0.6.29 \ |
182 | crate://crates.io/regex-syntax/0.8.2 \ | 176 | crate://crates.io/regex-syntax/0.8.2 \ |
183 | crate://crates.io/rfc2047-decoder/0.2.2 \ | 177 | crate://crates.io/rfc2047-decoder/0.2.2 \ |
184 | crate://crates.io/ring/0.17.6 \ | 178 | crate://crates.io/ring/0.17.7 \ |
185 | crate://crates.io/rustc_version/0.4.0 \ | 179 | crate://crates.io/rustc_version/0.4.0 \ |
186 | crate://crates.io/rustix/0.37.27 \ | 180 | crate://crates.io/rustix/0.38.32 \ |
187 | crate://crates.io/rustix/0.38.21 \ | 181 | crate://crates.io/rustls/0.22.2 \ |
188 | crate://crates.io/rustls/0.21.9 \ | 182 | crate://crates.io/rustls-pemfile/2.1.0 \ |
189 | crate://crates.io/rustls-pemfile/2.0.0 \ | 183 | crate://crates.io/rustls-pki-types/1.3.1 \ |
190 | crate://crates.io/rustls-pki-types/1.0.0 \ | 184 | crate://crates.io/rustls-webpki/0.102.1 \ |
191 | crate://crates.io/rustls-webpki/0.101.7 \ | ||
192 | crate://crates.io/rustversion/1.0.14 \ | 185 | crate://crates.io/rustversion/1.0.14 \ |
193 | crate://crates.io/ryu/1.0.15 \ | 186 | crate://crates.io/ryu/1.0.16 \ |
194 | crate://crates.io/same-file/1.0.6 \ | 187 | crate://crates.io/same-file/1.0.6 \ |
195 | crate://crates.io/schannel/0.1.22 \ | 188 | crate://crates.io/schannel/0.1.23 \ |
196 | crate://crates.io/scopeguard/1.2.0 \ | 189 | crate://crates.io/scopeguard/1.2.0 \ |
197 | crate://crates.io/scroll/0.11.0 \ | 190 | crate://crates.io/scroll/0.12.0 \ |
198 | crate://crates.io/scroll_derive/0.11.1 \ | 191 | crate://crates.io/scroll_derive/0.12.0 \ |
199 | crate://crates.io/sct/0.7.1 \ | ||
200 | crate://crates.io/security-framework/2.9.2 \ | 192 | crate://crates.io/security-framework/2.9.2 \ |
201 | crate://crates.io/security-framework-sys/2.9.1 \ | 193 | crate://crates.io/security-framework-sys/2.9.1 \ |
202 | crate://crates.io/semver/1.0.20 \ | 194 | crate://crates.io/semver/1.0.22 \ |
203 | crate://crates.io/serde/1.0.193 \ | 195 | crate://crates.io/serde/1.0.197 \ |
204 | crate://crates.io/serde_derive/1.0.193 \ | 196 | crate://crates.io/serde_derive/1.0.197 \ |
205 | crate://crates.io/serde_json/1.0.108 \ | 197 | crate://crates.io/serde_json/1.0.114 \ |
206 | crate://crates.io/serde_spanned/0.6.4 \ | 198 | crate://crates.io/serde_spanned/0.6.5 \ |
207 | crate://crates.io/sha2/0.10.8 \ | 199 | crate://crates.io/sha2/0.10.8 \ |
208 | crate://crates.io/sharded-slab/0.1.7 \ | 200 | crate://crates.io/sharded-slab/0.1.7 \ |
209 | crate://crates.io/shell-words/1.1.0 \ | 201 | crate://crates.io/shell-words/1.1.0 \ |
210 | crate://crates.io/shlex/1.2.0 \ | 202 | crate://crates.io/shlex/1.3.0 \ |
211 | crate://crates.io/similar/2.3.0 \ | 203 | crate://crates.io/similar/2.4.0 \ |
212 | crate://crates.io/smallvec/1.11.2 \ | 204 | crate://crates.io/smallvec/1.13.1 \ |
213 | crate://crates.io/smawk/0.3.2 \ | 205 | crate://crates.io/smawk/0.3.2 \ |
214 | crate://crates.io/snapbox/0.4.14 \ | 206 | crate://crates.io/snapbox/0.5.7 \ |
215 | crate://crates.io/snapbox-macros/0.3.6 \ | 207 | crate://crates.io/snapbox-macros/0.3.8 \ |
216 | crate://crates.io/socks/0.3.4 \ | 208 | crate://crates.io/socks/0.3.4 \ |
217 | crate://crates.io/spin/0.9.8 \ | 209 | crate://crates.io/spin/0.9.8 \ |
218 | crate://crates.io/stacker/0.1.15 \ | 210 | crate://crates.io/stacker/0.1.15 \ |
219 | crate://crates.io/static_assertions/1.1.0 \ | 211 | crate://crates.io/static_assertions/1.1.0 \ |
220 | crate://crates.io/strsim/0.10.0 \ | 212 | crate://crates.io/strsim/0.10.0 \ |
213 | crate://crates.io/subtle/2.5.0 \ | ||
221 | crate://crates.io/syn/1.0.109 \ | 214 | crate://crates.io/syn/1.0.109 \ |
222 | crate://crates.io/syn/2.0.39 \ | 215 | crate://crates.io/syn/2.0.48 \ |
223 | crate://crates.io/tar/0.4.40 \ | 216 | crate://crates.io/tar/0.4.40 \ |
224 | crate://crates.io/target-lexicon/0.12.12 \ | 217 | crate://crates.io/target-lexicon/0.12.14 \ |
225 | crate://crates.io/tempfile/3.8.1 \ | 218 | crate://crates.io/tempfile/3.9.0 \ |
226 | crate://crates.io/termcolor/1.4.0 \ | 219 | crate://crates.io/termcolor/1.4.1 \ |
227 | crate://crates.io/terminal_size/0.2.6 \ | 220 | crate://crates.io/terminal_size/0.3.0 \ |
228 | crate://crates.io/textwrap/0.16.0 \ | 221 | crate://crates.io/textwrap/0.16.1 \ |
229 | crate://crates.io/thiserror/1.0.50 \ | 222 | crate://crates.io/thiserror/1.0.57 \ |
230 | crate://crates.io/thiserror-impl/1.0.50 \ | 223 | crate://crates.io/thiserror-impl/1.0.57 \ |
231 | crate://crates.io/thread_local/1.1.7 \ | 224 | crate://crates.io/thread_local/1.1.7 \ |
232 | crate://crates.io/time/0.3.30 \ | 225 | crate://crates.io/time/0.3.34 \ |
233 | crate://crates.io/time-core/0.1.2 \ | 226 | crate://crates.io/time-core/0.1.2 \ |
234 | crate://crates.io/time-macros/0.2.15 \ | 227 | crate://crates.io/time-macros/0.2.17 \ |
235 | crate://crates.io/tinyvec/1.6.0 \ | 228 | crate://crates.io/tinyvec/1.6.0 \ |
236 | crate://crates.io/tinyvec_macros/0.1.1 \ | 229 | crate://crates.io/tinyvec_macros/0.1.1 \ |
237 | crate://crates.io/toml/0.5.11 \ | 230 | crate://crates.io/toml/0.5.11 \ |
238 | crate://crates.io/toml/0.8.8 \ | 231 | crate://crates.io/toml/0.8.10 \ |
239 | crate://crates.io/toml_datetime/0.6.5 \ | 232 | crate://crates.io/toml_datetime/0.6.5 \ |
240 | crate://crates.io/toml_edit/0.20.7 \ | 233 | crate://crates.io/toml_edit/0.22.6 \ |
241 | crate://crates.io/toml_edit/0.21.0 \ | ||
242 | crate://crates.io/tracing/0.1.40 \ | 234 | crate://crates.io/tracing/0.1.40 \ |
243 | crate://crates.io/tracing-attributes/0.1.27 \ | 235 | crate://crates.io/tracing-attributes/0.1.27 \ |
244 | crate://crates.io/tracing-core/0.1.32 \ | 236 | crate://crates.io/tracing-core/0.1.32 \ |
245 | crate://crates.io/tracing-log/0.2.0 \ | 237 | crate://crates.io/tracing-log/0.2.0 \ |
246 | crate://crates.io/tracing-serde/0.1.3 \ | 238 | crate://crates.io/tracing-serde/0.1.3 \ |
247 | crate://crates.io/tracing-subscriber/0.3.18 \ | 239 | crate://crates.io/tracing-subscriber/0.3.18 \ |
248 | crate://crates.io/trycmd/0.14.19 \ | 240 | crate://crates.io/trycmd/0.15.0 \ |
249 | crate://crates.io/twox-hash/1.6.3 \ | 241 | crate://crates.io/twox-hash/1.6.3 \ |
250 | crate://crates.io/typenum/1.17.0 \ | 242 | crate://crates.io/typenum/1.17.0 \ |
251 | crate://crates.io/unicase/2.7.0 \ | 243 | crate://crates.io/unicase/2.7.0 \ |
252 | crate://crates.io/unicode-bidi/0.3.13 \ | 244 | crate://crates.io/unicode-bidi/0.3.15 \ |
253 | crate://crates.io/unicode-ident/1.0.12 \ | 245 | crate://crates.io/unicode-ident/1.0.12 \ |
254 | crate://crates.io/unicode-linebreak/0.1.5 \ | 246 | crate://crates.io/unicode-linebreak/0.1.5 \ |
255 | crate://crates.io/unicode-normalization/0.1.22 \ | 247 | crate://crates.io/unicode-normalization/0.1.22 \ |
256 | crate://crates.io/unicode-width/0.1.11 \ | 248 | crate://crates.io/unicode-width/0.1.11 \ |
249 | crate://crates.io/unicode-xid/0.2.4 \ | ||
250 | crate://crates.io/unscanny/0.1.0 \ | ||
257 | crate://crates.io/untrusted/0.9.0 \ | 251 | crate://crates.io/untrusted/0.9.0 \ |
258 | crate://crates.io/ureq/2.9.1 \ | 252 | crate://crates.io/ureq/2.9.6 \ |
259 | crate://crates.io/url/2.5.0 \ | 253 | crate://crates.io/url/2.5.0 \ |
254 | crate://crates.io/urlencoding/2.1.3 \ | ||
260 | crate://crates.io/utf8parse/0.2.1 \ | 255 | crate://crates.io/utf8parse/0.2.1 \ |
261 | crate://crates.io/uuid/1.6.1 \ | 256 | crate://crates.io/uuid/1.7.0 \ |
262 | crate://crates.io/valuable/0.1.0 \ | 257 | crate://crates.io/valuable/0.1.0 \ |
263 | crate://crates.io/vcpkg/0.2.15 \ | 258 | crate://crates.io/vcpkg/0.2.15 \ |
264 | crate://crates.io/version_check/0.9.4 \ | 259 | crate://crates.io/version_check/0.9.4 \ |
@@ -266,69 +261,59 @@ SRC_URI += " \ | |||
266 | crate://crates.io/wait-timeout/0.2.0 \ | 261 | crate://crates.io/wait-timeout/0.2.0 \ |
267 | crate://crates.io/walkdir/2.4.0 \ | 262 | crate://crates.io/walkdir/2.4.0 \ |
268 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 263 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
269 | crate://crates.io/webpki-roots/0.25.3 \ | 264 | crate://crates.io/webpki-roots/0.26.0 \ |
270 | crate://crates.io/which/5.0.0 \ | 265 | crate://crates.io/which/5.0.0 \ |
271 | crate://crates.io/wild/2.2.0 \ | 266 | crate://crates.io/which/6.0.0 \ |
267 | crate://crates.io/wild/2.2.1 \ | ||
272 | crate://crates.io/winapi/0.3.9 \ | 268 | crate://crates.io/winapi/0.3.9 \ |
273 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | 269 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ |
274 | crate://crates.io/winapi-util/0.1.6 \ | 270 | crate://crates.io/winapi-util/0.1.6 \ |
275 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | 271 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ |
276 | crate://crates.io/windows-sys/0.45.0 \ | ||
277 | crate://crates.io/windows-sys/0.48.0 \ | 272 | crate://crates.io/windows-sys/0.48.0 \ |
278 | crate://crates.io/windows-sys/0.52.0 \ | 273 | crate://crates.io/windows-sys/0.52.0 \ |
279 | crate://crates.io/windows-targets/0.42.2 \ | ||
280 | crate://crates.io/windows-targets/0.48.5 \ | 274 | crate://crates.io/windows-targets/0.48.5 \ |
281 | crate://crates.io/windows-targets/0.52.0 \ | 275 | crate://crates.io/windows-targets/0.52.0 \ |
282 | crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ | ||
283 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ | 276 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ |
284 | crate://crates.io/windows_aarch64_gnullvm/0.52.0 \ | 277 | crate://crates.io/windows_aarch64_gnullvm/0.52.0 \ |
285 | crate://crates.io/windows_aarch64_msvc/0.42.2 \ | ||
286 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ | 278 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ |
287 | crate://crates.io/windows_aarch64_msvc/0.52.0 \ | 279 | crate://crates.io/windows_aarch64_msvc/0.52.0 \ |
288 | crate://crates.io/windows_i686_gnu/0.42.2 \ | ||
289 | crate://crates.io/windows_i686_gnu/0.48.5 \ | 280 | crate://crates.io/windows_i686_gnu/0.48.5 \ |
290 | crate://crates.io/windows_i686_gnu/0.52.0 \ | 281 | crate://crates.io/windows_i686_gnu/0.52.0 \ |
291 | crate://crates.io/windows_i686_msvc/0.42.2 \ | ||
292 | crate://crates.io/windows_i686_msvc/0.48.5 \ | 282 | crate://crates.io/windows_i686_msvc/0.48.5 \ |
293 | crate://crates.io/windows_i686_msvc/0.52.0 \ | 283 | crate://crates.io/windows_i686_msvc/0.52.0 \ |
294 | crate://crates.io/windows_x86_64_gnu/0.42.2 \ | ||
295 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ | 284 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ |
296 | crate://crates.io/windows_x86_64_gnu/0.52.0 \ | 285 | crate://crates.io/windows_x86_64_gnu/0.52.0 \ |
297 | crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ | ||
298 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ | 286 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ |
299 | crate://crates.io/windows_x86_64_gnullvm/0.52.0 \ | 287 | crate://crates.io/windows_x86_64_gnullvm/0.52.0 \ |
300 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ | ||
301 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ | 288 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ |
302 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ | 289 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ |
303 | crate://crates.io/winnow/0.5.19 \ | 290 | crate://crates.io/winnow/0.6.2 \ |
304 | crate://crates.io/xattr/1.0.1 \ | 291 | crate://crates.io/xattr/1.3.1 \ |
305 | crate://crates.io/xwin/0.5.0 \ | 292 | crate://crates.io/xwin/0.5.0 \ |
306 | crate://crates.io/yansi/0.5.1 \ | 293 | crate://crates.io/yansi/0.5.1 \ |
307 | crate://crates.io/zerocopy/0.7.28 \ | 294 | crate://crates.io/zerocopy/0.7.32 \ |
308 | crate://crates.io/zerocopy-derive/0.7.28 \ | 295 | crate://crates.io/zerocopy-derive/0.7.32 \ |
309 | crate://crates.io/zeroize/1.7.0 \ | 296 | crate://crates.io/zeroize/1.7.0 \ |
310 | crate://crates.io/zip/0.6.6 \ | 297 | crate://crates.io/zip/0.6.6 \ |
311 | " | 298 | " |
312 | 299 | ||
313 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | 300 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" |
314 | SRC_URI[ahash-0.8.6.sha256sum] = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" | 301 | SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" |
315 | SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" | 302 | SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" |
316 | SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" | 303 | SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" |
317 | SRC_URI[anstream-0.3.2.sha256sum] = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" | 304 | SRC_URI[anstream-0.6.11.sha256sum] = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" |
318 | SRC_URI[anstream-0.6.4.sha256sum] = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" | 305 | SRC_URI[anstyle-1.0.4.sha256sum] = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" |
319 | SRC_URI[anstyle-1.0.2.sha256sum] = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" | 306 | SRC_URI[anstyle-parse-0.2.3.sha256sum] = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" |
320 | SRC_URI[anstyle-parse-0.2.1.sha256sum] = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" | 307 | SRC_URI[anstyle-query-1.0.2.sha256sum] = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" |
321 | SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" | 308 | SRC_URI[anstyle-wincon-3.0.2.sha256sum] = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" |
322 | SRC_URI[anstyle-wincon-1.0.2.sha256sum] = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" | 309 | SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" |
323 | SRC_URI[anstyle-wincon-3.0.1.sha256sum] = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" | ||
324 | SRC_URI[anyhow-1.0.75.sha256sum] = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" | ||
325 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 310 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
326 | SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" | 311 | SRC_URI[base64-0.13.1.sha256sum] = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" |
327 | SRC_URI[base64-0.21.5.sha256sum] = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" | 312 | SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" |
328 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 313 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
329 | SRC_URI[bitflags-2.4.1.sha256sum] = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" | 314 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" |
330 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" | 315 | SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" |
331 | SRC_URI[bstr-1.8.0.sha256sum] = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" | 316 | SRC_URI[bstr-1.9.0.sha256sum] = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" |
332 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 317 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
333 | SRC_URI[bytes-1.5.0.sha256sum] = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" | 318 | SRC_URI[bytes-1.5.0.sha256sum] = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" |
334 | SRC_URI[bytesize-1.3.0.sha256sum] = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" | 319 | SRC_URI[bytesize-1.3.0.sha256sum] = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" |
@@ -336,42 +321,42 @@ SRC_URI[bzip2-0.4.4.sha256sum] = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb8849 | |||
336 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" | 321 | SRC_URI[bzip2-sys-0.1.11+1.0.8.sha256sum] = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" |
337 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" | 322 | SRC_URI[cab-0.4.1.sha256sum] = "ae6b4de23c7d39c0631fd3cc952d87951c86c75a13812d7247cb7a896e7b3551" |
338 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" | 323 | SRC_URI[camino-1.1.6.sha256sum] = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" |
339 | SRC_URI[cargo-config2-0.1.16.sha256sum] = "7f387366785e82c7ec7ef5b845a7f61324fbf5d467d6a878469eac30c1c44b1b" | 324 | SRC_URI[cargo-config2-0.1.19.sha256sum] = "3a7fb69d74d76f8c254afd1c0e76aca40c305707b28aebe3c5a0fd2ee62aeeeb" |
340 | SRC_URI[cargo-options-0.7.2.sha256sum] = "cad71bf996c8e5b9d28ef3472d7ee41f277edf4e38cd597f51ad0438d05d76ea" | 325 | SRC_URI[cargo-options-0.7.2.sha256sum] = "cad71bf996c8e5b9d28ef3472d7ee41f277edf4e38cd597f51ad0438d05d76ea" |
341 | SRC_URI[cargo-platform-0.1.5.sha256sum] = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" | 326 | SRC_URI[cargo-platform-0.1.6.sha256sum] = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" |
342 | SRC_URI[cargo-xwin-0.16.2.sha256sum] = "02bb6bf59526935e47445f959a19c2168f151284dbf7e57f5577934334e9a61d" | 327 | SRC_URI[cargo-xwin-0.16.4.sha256sum] = "5e6c3dd7f20fdd197397532ac882e918cfe1d56f262a97ded7460a50e031e06b" |
343 | SRC_URI[cargo-zigbuild-0.18.0.sha256sum] = "edc9c2fe646a29983b5f7263bd789175f2aaad7ea42525affa40e2172be93286" | 328 | SRC_URI[cargo-zigbuild-0.18.3.sha256sum] = "cb76e6ab558f9138291c7e1fa954ffd58e060712eab13f97a317da712218ca24" |
344 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" | 329 | SRC_URI[cargo_metadata-0.18.1.sha256sum] = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" |
345 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" | 330 | SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" |
346 | SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" | 331 | SRC_URI[cc-1.0.88.sha256sum] = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" |
347 | SRC_URI[cfb-0.9.0.sha256sum] = "b390793e912300f1aa713429f7fd0c391024e6c18b988962558bc4f96a349b1f" | 332 | SRC_URI[cfb-0.9.0.sha256sum] = "b390793e912300f1aa713429f7fd0c391024e6c18b988962558bc4f96a349b1f" |
348 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 333 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
349 | SRC_URI[charset-0.1.3.sha256sum] = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" | 334 | SRC_URI[charset-0.1.3.sha256sum] = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" |
350 | SRC_URI[chumsky-0.9.3.sha256sum] = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" | 335 | SRC_URI[chumsky-0.9.3.sha256sum] = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" |
351 | SRC_URI[clap-4.3.24.sha256sum] = "fb690e81c7840c0d7aade59f242ea3b41b9bc27bcd5997890e7702ae4b32e487" | 336 | SRC_URI[clap-4.4.18.sha256sum] = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" |
352 | SRC_URI[clap_builder-4.3.24.sha256sum] = "5ed2e96bc16d8d740f6f48d663eddf4b8a0983e79210fd55479b7bcd0a69860e" | 337 | SRC_URI[clap_builder-4.4.18.sha256sum] = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" |
353 | SRC_URI[clap_complete-4.3.2.sha256sum] = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" | 338 | SRC_URI[clap_complete-4.4.9.sha256sum] = "df631ae429f6613fcd3a7c1adbdb65f637271e561b03680adaa6573015dfb106" |
354 | SRC_URI[clap_complete_command-0.5.1.sha256sum] = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" | 339 | SRC_URI[clap_complete_command-0.5.1.sha256sum] = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" |
355 | SRC_URI[clap_complete_fig-4.3.1.sha256sum] = "99fee1d30a51305a6c2ed3fc5709be3c8af626c9c958e04dd9ae94e27bcbce9f" | ||
356 | SRC_URI[clap_complete_nushell-0.1.11.sha256sum] = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" | 340 | SRC_URI[clap_complete_nushell-0.1.11.sha256sum] = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" |
357 | SRC_URI[clap_derive-4.3.12.sha256sum] = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" | 341 | SRC_URI[clap_derive-4.4.7.sha256sum] = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" |
358 | SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" | 342 | SRC_URI[clap_lex-0.6.0.sha256sum] = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" |
359 | SRC_URI[cli-table-0.4.7.sha256sum] = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" | 343 | SRC_URI[cli-table-0.4.7.sha256sum] = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" |
360 | SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" | 344 | SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" |
361 | SRC_URI[configparser-3.0.3.sha256sum] = "e0e56e414a2a52ab2a104f85cd40933c2fbc278b83637facf646ecf451b49237" | 345 | SRC_URI[configparser-3.0.4.sha256sum] = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" |
362 | SRC_URI[console-0.15.7.sha256sum] = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" | 346 | SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" |
363 | SRC_URI[content_inspector-0.2.4.sha256sum] = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" | 347 | SRC_URI[content_inspector-0.2.4.sha256sum] = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" |
364 | SRC_URI[core-foundation-0.9.3.sha256sum] = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" | 348 | SRC_URI[core-foundation-0.9.4.sha256sum] = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" |
365 | SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" | 349 | SRC_URI[core-foundation-sys-0.8.6.sha256sum] = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" |
366 | SRC_URI[cpufeatures-0.2.11.sha256sum] = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" | 350 | SRC_URI[cpufeatures-0.2.12.sha256sum] = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" |
367 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" | 351 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" |
368 | SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" | 352 | SRC_URI[crossbeam-channel-0.5.11.sha256sum] = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" |
369 | SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" | 353 | SRC_URI[crossbeam-deque-0.8.5.sha256sum] = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" |
370 | SRC_URI[crossbeam-epoch-0.9.15.sha256sum] = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" | 354 | SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" |
371 | SRC_URI[crossbeam-utils-0.8.16.sha256sum] = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" | 355 | SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" |
372 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 356 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" |
373 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" | 357 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" |
374 | SRC_URI[deranged-0.3.9.sha256sum] = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" | 358 | SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" |
359 | SRC_URI[derivative-2.2.0.sha256sum] = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" | ||
375 | SRC_URI[dialoguer-0.11.0.sha256sum] = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" | 360 | SRC_URI[dialoguer-0.11.0.sha256sum] = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" |
376 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 361 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
377 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 362 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
@@ -386,8 +371,8 @@ SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca62 | |||
386 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" | 371 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" |
387 | SRC_URI[expect-test-1.4.1.sha256sum] = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" | 372 | SRC_URI[expect-test-1.4.1.sha256sum] = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" |
388 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" | 373 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" |
389 | SRC_URI[fat-macho-0.4.7.sha256sum] = "63fa117c7dcabeb8c83d5c229764cfa46518545d2dba5a9a08912014711f997b" | 374 | SRC_URI[fat-macho-0.4.8.sha256sum] = "0d4c93f393add03d72bc10dd3dea43a1610ecb29e0c0a6459c70b53b82931adf" |
390 | SRC_URI[filetime-0.2.22.sha256sum] = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" | 375 | SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" |
391 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" | 376 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" |
392 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | 377 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" |
393 | SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" | 378 | SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" |
@@ -395,47 +380,42 @@ SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70 | |||
395 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" | 380 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" |
396 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" | 381 | SRC_URI[fs-err-2.11.0.sha256sum] = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" |
397 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" | 382 | SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" |
398 | SRC_URI[getrandom-0.2.11.sha256sum] = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" | 383 | SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" |
399 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | 384 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" |
400 | SRC_URI[globset-0.4.14.sha256sum] = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" | 385 | SRC_URI[globset-0.4.14.sha256sum] = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" |
401 | SRC_URI[goblin-0.7.1.sha256sum] = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134" | 386 | SRC_URI[goblin-0.8.0.sha256sum] = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" |
402 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" | 387 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" |
403 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | 388 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" |
404 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" | 389 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" |
405 | SRC_URI[hermit-abi-0.3.3.sha256sum] = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" | 390 | SRC_URI[home-0.5.9.sha256sum] = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" |
406 | SRC_URI[home-0.5.5.sha256sum] = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" | ||
407 | SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" | 391 | SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" |
408 | SRC_URI[humantime-serde-1.1.1.sha256sum] = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" | 392 | SRC_URI[humantime-serde-1.1.1.sha256sum] = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" |
409 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" | 393 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" |
410 | SRC_URI[ignore-0.4.20.sha256sum] = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" | 394 | SRC_URI[ignore-0.4.22.sha256sum] = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" |
411 | SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" | 395 | SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" |
412 | SRC_URI[indexmap-2.1.0.sha256sum] = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" | 396 | SRC_URI[indexmap-2.2.3.sha256sum] = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" |
413 | SRC_URI[indicatif-0.17.7.sha256sum] = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" | 397 | SRC_URI[indicatif-0.17.7.sha256sum] = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" |
414 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" | 398 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" |
415 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" | 399 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" |
416 | SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" | ||
417 | SRC_URI[is-terminal-0.4.9.sha256sum] = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" | ||
418 | SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" | 400 | SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" |
419 | SRC_URI[itertools-0.12.0.sha256sum] = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" | 401 | SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" |
420 | SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" | 402 | SRC_URI[itoa-1.0.10.sha256sum] = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" |
421 | SRC_URI[keyring-2.0.5.sha256sum] = "9549a129bd08149e0a71b2d1ce2729780d47127991bfd0a78cc1df697ec72492" | 403 | SRC_URI[keyring-2.3.2.sha256sum] = "1be8bc4c6b6e9d85ecdad090fcf342a9216f53d747a537cc05e3452fd650ca46" |
422 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | 404 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" |
423 | SRC_URI[lddtree-0.3.3.sha256sum] = "2f5bfec46830ad3a95199ae6804dfe9f51fdad43d7a95fbb6c185efa9824c295" | 405 | SRC_URI[lddtree-0.3.4.sha256sum] = "f88a93876d2485ede9c97d698c164cf5c024491908483964a998faae9705dea6" |
424 | SRC_URI[libc-0.2.150.sha256sum] = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" | 406 | SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" |
425 | SRC_URI[libredox-0.0.1.sha256sum] = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" | 407 | SRC_URI[libredox-0.0.1.sha256sum] = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" |
426 | SRC_URI[linux-keyutils-0.2.3.sha256sum] = "3f27bb67f6dd1d0bb5ab582868e4f65052e58da6401188a08f0da09cf512b84b" | 408 | SRC_URI[linux-keyutils-0.2.4.sha256sum] = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e" |
427 | SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" | 409 | SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" |
428 | SRC_URI[linux-raw-sys-0.4.11.sha256sum] = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" | ||
429 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" | 410 | SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" |
430 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | 411 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" |
431 | SRC_URI[lzxd-0.1.4.sha256sum] = "784462f20dddd9dfdb45de963fa4ad4a288cb10a7889ac5d2c34fb6481c6b213" | 412 | SRC_URI[lzxd-0.1.4.sha256sum] = "784462f20dddd9dfdb45de963fa4ad4a288cb10a7889ac5d2c34fb6481c6b213" |
432 | SRC_URI[mailparse-0.14.0.sha256sum] = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" | 413 | SRC_URI[mailparse-0.14.1.sha256sum] = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" |
433 | SRC_URI[matchers-0.1.0.sha256sum] = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" | 414 | SRC_URI[matchers-0.1.0.sha256sum] = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" |
434 | SRC_URI[memchr-2.6.4.sha256sum] = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" | 415 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" |
435 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | ||
436 | SRC_URI[mime-0.3.17.sha256sum] = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" | 416 | SRC_URI[mime-0.3.17.sha256sum] = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" |
437 | SRC_URI[mime_guess-2.0.4.sha256sum] = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" | 417 | SRC_URI[mime_guess-2.0.4.sha256sum] = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" |
438 | SRC_URI[minijinja-1.0.10.sha256sum] = "208758577ef2c86cf5dd3e85730d161413ec3284e2d73b2ef65d9a24d9971bcb" | 418 | SRC_URI[minijinja-1.0.12.sha256sum] = "6fe0ff215195a22884d867b547c70a0c4815cbbcc70991f281dca604b20d10ce" |
439 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 419 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
440 | SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" | 420 | SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" |
441 | SRC_URI[msi-0.7.0.sha256sum] = "226b2404f03d2cf47375b9715c8adfae4e388bb2377cff908e8a40f31e421514" | 421 | SRC_URI[msi-0.7.0.sha256sum] = "226b2404f03d2cf47375b9715c8adfae4e388bb2377cff908e8a40f31e421514" |
@@ -445,128 +425,130 @@ SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b7382641 | |||
445 | SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" | 425 | SRC_URI[normalize-line-endings-0.3.0.sha256sum] = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" |
446 | SRC_URI[normpath-1.1.1.sha256sum] = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" | 426 | SRC_URI[normpath-1.1.1.sha256sum] = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" |
447 | SRC_URI[nu-ansi-term-0.46.0.sha256sum] = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" | 427 | SRC_URI[nu-ansi-term-0.46.0.sha256sum] = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" |
428 | SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" | ||
448 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" | 429 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" |
449 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" | 430 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
450 | SRC_URI[openssl-0.10.60.sha256sum] = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" | 431 | SRC_URI[openssl-0.10.63.sha256sum] = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" |
451 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" | 432 | SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" |
452 | SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" | 433 | SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" |
453 | SRC_URI[openssl-sys-0.9.96.sha256sum] = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" | 434 | SRC_URI[openssl-sys-0.9.99.sha256sum] = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" |
454 | SRC_URI[option-ext-0.2.0.sha256sum] = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" | 435 | SRC_URI[option-ext-0.2.0.sha256sum] = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" |
455 | SRC_URI[os_pipe-1.1.4.sha256sum] = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" | 436 | SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" |
456 | SRC_URI[overload-0.1.1.sha256sum] = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" | 437 | SRC_URI[overload-0.1.1.sha256sum] = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" |
457 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 438 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
458 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 439 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
459 | SRC_URI[paste-1.0.14.sha256sum] = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" | 440 | SRC_URI[paste-1.0.14.sha256sum] = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" |
460 | SRC_URI[path-slash-0.2.1.sha256sum] = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" | 441 | SRC_URI[path-slash-0.2.1.sha256sum] = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" |
461 | SRC_URI[pep440_rs-0.3.12.sha256sum] = "887f66cc62717ea72caac4f1eb4e6f392224da3ffff3f40ec13ab427802746d6" | 442 | SRC_URI[pep440_rs-0.5.0.sha256sum] = "15efd4d885c29126cc93e12af3087896e2518bd5ca0fb328c19c4ef9cecfa8be" |
462 | SRC_URI[pep508_rs-0.2.3.sha256sum] = "e4516b53d9ea6112ebb38b4af08d5707d30b994fb7f98ff133c5dcf7ed8fa854" | 443 | SRC_URI[pep508_rs-0.4.2.sha256sum] = "1455babf8edd3eedcdfcb39700e455a4bb189e71b4f1fa0eacc9b244cc5a55e6" |
463 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 444 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
464 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" | 445 | SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" |
465 | SRC_URI[pkg-config-0.3.27.sha256sum] = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" | 446 | SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" |
466 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" | 447 | SRC_URI[plain-0.2.3.sha256sum] = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" |
467 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" | 448 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" |
468 | SRC_URI[portable-atomic-1.5.1.sha256sum] = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" | 449 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
469 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | 450 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" |
470 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | 451 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" |
471 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" | 452 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" |
472 | SRC_URI[proc-macro2-1.0.70.sha256sum] = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" | 453 | SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" |
473 | SRC_URI[psm-0.1.21.sha256sum] = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" | 454 | SRC_URI[psm-0.1.21.sha256sum] = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" |
474 | SRC_URI[pyproject-toml-0.8.1.sha256sum] = "46d4a5e69187f23a29f8aa0ea57491d104ba541bc55f76552c2a74962aa20e04" | 455 | SRC_URI[pyproject-toml-0.10.0.sha256sum] = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898" |
475 | SRC_URI[python-pkginfo-0.6.0.sha256sum] = "037469c164f08c891bf6d69ca02f1d56210011451e229618669777df82124cfa" | 456 | SRC_URI[python-pkginfo-0.6.0.sha256sum] = "037469c164f08c891bf6d69ca02f1d56210011451e229618669777df82124cfa" |
476 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" | 457 | SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" |
477 | SRC_URI[quoted_printable-0.4.8.sha256sum] = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" | 458 | SRC_URI[quoted_printable-0.4.8.sha256sum] = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" |
459 | SRC_URI[quoted_printable-0.5.0.sha256sum] = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" | ||
478 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 460 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
479 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 461 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
480 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | 462 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" |
481 | SRC_URI[rayon-1.8.0.sha256sum] = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" | 463 | SRC_URI[rayon-1.8.1.sha256sum] = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" |
482 | SRC_URI[rayon-core-1.12.0.sha256sum] = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" | 464 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" |
483 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" | ||
484 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 465 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" |
485 | SRC_URI[redox_users-0.4.4.sha256sum] = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" | 466 | SRC_URI[redox_users-0.4.4.sha256sum] = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" |
486 | SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" | 467 | SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" |
487 | SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" | 468 | SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" |
488 | SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" | 469 | SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" |
489 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" | 470 | SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" |
490 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 471 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" |
491 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" | 472 | SRC_URI[rfc2047-decoder-0.2.2.sha256sum] = "61fc4b4e52897c3e30b12b7e9b04461215b647fbe66f6def60dd8edbce14ec2e" |
492 | SRC_URI[ring-0.17.6.sha256sum] = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" | 473 | SRC_URI[ring-0.17.7.sha256sum] = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" |
493 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 474 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
494 | SRC_URI[rustix-0.37.27.sha256sum] = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" | 475 | SRC_URI[rustix-0.38.32.sha256sum] = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" |
495 | SRC_URI[rustix-0.38.21.sha256sum] = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" | 476 | SRC_URI[rustls-0.22.2.sha256sum] = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" |
496 | SRC_URI[rustls-0.21.9.sha256sum] = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" | 477 | SRC_URI[rustls-pemfile-2.1.0.sha256sum] = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" |
497 | SRC_URI[rustls-pemfile-2.0.0.sha256sum] = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" | 478 | SRC_URI[rustls-pki-types-1.3.1.sha256sum] = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" |
498 | SRC_URI[rustls-pki-types-1.0.0.sha256sum] = "eb0a1f9b9efec70d32e6d6aa3e58ebd88c3754ec98dfe9145c63cf54cc829b83" | 479 | SRC_URI[rustls-webpki-0.102.1.sha256sum] = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" |
499 | SRC_URI[rustls-webpki-0.101.7.sha256sum] = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" | ||
500 | SRC_URI[rustversion-1.0.14.sha256sum] = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" | 480 | SRC_URI[rustversion-1.0.14.sha256sum] = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" |
501 | SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" | 481 | SRC_URI[ryu-1.0.16.sha256sum] = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" |
502 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 482 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
503 | SRC_URI[schannel-0.1.22.sha256sum] = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" | 483 | SRC_URI[schannel-0.1.23.sha256sum] = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" |
504 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 484 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
505 | SRC_URI[scroll-0.11.0.sha256sum] = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" | 485 | SRC_URI[scroll-0.12.0.sha256sum] = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" |
506 | SRC_URI[scroll_derive-0.11.1.sha256sum] = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" | 486 | SRC_URI[scroll_derive-0.12.0.sha256sum] = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" |
507 | SRC_URI[sct-0.7.1.sha256sum] = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" | ||
508 | SRC_URI[security-framework-2.9.2.sha256sum] = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" | 487 | SRC_URI[security-framework-2.9.2.sha256sum] = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" |
509 | SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" | 488 | SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" |
510 | SRC_URI[semver-1.0.20.sha256sum] = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" | 489 | SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" |
511 | SRC_URI[serde-1.0.193.sha256sum] = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" | 490 | SRC_URI[serde-1.0.197.sha256sum] = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" |
512 | SRC_URI[serde_derive-1.0.193.sha256sum] = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" | 491 | SRC_URI[serde_derive-1.0.197.sha256sum] = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" |
513 | SRC_URI[serde_json-1.0.108.sha256sum] = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" | 492 | SRC_URI[serde_json-1.0.114.sha256sum] = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" |
514 | SRC_URI[serde_spanned-0.6.4.sha256sum] = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" | 493 | SRC_URI[serde_spanned-0.6.5.sha256sum] = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" |
515 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" | 494 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" |
516 | SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" | 495 | SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" |
517 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" | 496 | SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" |
518 | SRC_URI[shlex-1.2.0.sha256sum] = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" | 497 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
519 | SRC_URI[similar-2.3.0.sha256sum] = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" | 498 | SRC_URI[similar-2.4.0.sha256sum] = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" |
520 | SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" | 499 | SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" |
521 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" | 500 | SRC_URI[smawk-0.3.2.sha256sum] = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" |
522 | SRC_URI[snapbox-0.4.14.sha256sum] = "4b377c0b6e4715c116473d8e40d51e3fa5b0a2297ca9b2a931ba800667b259ed" | 501 | SRC_URI[snapbox-0.5.7.sha256sum] = "4a99efa20de5053229642a477436cdb39828c7651c614622eb4888f9688523e6" |
523 | SRC_URI[snapbox-macros-0.3.6.sha256sum] = "ed1559baff8a696add3322b9be3e940d433e7bb4e38d79017205fd37ff28b28e" | 502 | SRC_URI[snapbox-macros-0.3.8.sha256sum] = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" |
524 | SRC_URI[socks-0.3.4.sha256sum] = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" | 503 | SRC_URI[socks-0.3.4.sha256sum] = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" |
525 | SRC_URI[spin-0.9.8.sha256sum] = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" | 504 | SRC_URI[spin-0.9.8.sha256sum] = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" |
526 | SRC_URI[stacker-0.1.15.sha256sum] = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" | 505 | SRC_URI[stacker-0.1.15.sha256sum] = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" |
527 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | 506 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" |
528 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" | 507 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" |
508 | SRC_URI[subtle-2.5.0.sha256sum] = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" | ||
529 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | 509 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" |
530 | SRC_URI[syn-2.0.39.sha256sum] = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" | 510 | SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" |
531 | SRC_URI[tar-0.4.40.sha256sum] = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" | 511 | SRC_URI[tar-0.4.40.sha256sum] = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" |
532 | SRC_URI[target-lexicon-0.12.12.sha256sum] = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" | 512 | SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" |
533 | SRC_URI[tempfile-3.8.1.sha256sum] = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" | 513 | SRC_URI[tempfile-3.9.0.sha256sum] = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" |
534 | SRC_URI[termcolor-1.4.0.sha256sum] = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" | 514 | SRC_URI[termcolor-1.4.1.sha256sum] = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" |
535 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" | 515 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" |
536 | SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" | 516 | SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" |
537 | SRC_URI[thiserror-1.0.50.sha256sum] = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" | 517 | SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" |
538 | SRC_URI[thiserror-impl-1.0.50.sha256sum] = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" | 518 | SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" |
539 | SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" | 519 | SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" |
540 | SRC_URI[time-0.3.30.sha256sum] = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" | 520 | SRC_URI[time-0.3.34.sha256sum] = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" |
541 | SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" | 521 | SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" |
542 | SRC_URI[time-macros-0.2.15.sha256sum] = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" | 522 | SRC_URI[time-macros-0.2.17.sha256sum] = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" |
543 | SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" | 523 | SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" |
544 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" | 524 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" |
545 | SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" | 525 | SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" |
546 | SRC_URI[toml-0.8.8.sha256sum] = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" | 526 | SRC_URI[toml-0.8.10.sha256sum] = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" |
547 | SRC_URI[toml_datetime-0.6.5.sha256sum] = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" | 527 | SRC_URI[toml_datetime-0.6.5.sha256sum] = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" |
548 | SRC_URI[toml_edit-0.20.7.sha256sum] = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" | 528 | SRC_URI[toml_edit-0.22.6.sha256sum] = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" |
549 | SRC_URI[toml_edit-0.21.0.sha256sum] = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" | ||
550 | SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" | 529 | SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" |
551 | SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" | 530 | SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" |
552 | SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" | 531 | SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" |
553 | SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" | 532 | SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" |
554 | SRC_URI[tracing-serde-0.1.3.sha256sum] = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" | 533 | SRC_URI[tracing-serde-0.1.3.sha256sum] = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" |
555 | SRC_URI[tracing-subscriber-0.3.18.sha256sum] = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" | 534 | SRC_URI[tracing-subscriber-0.3.18.sha256sum] = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" |
556 | SRC_URI[trycmd-0.14.19.sha256sum] = "ed009372a42fb103e6f8767b9222925485e03cca032b700d203e2c5b67bee4fb" | 535 | SRC_URI[trycmd-0.15.0.sha256sum] = "464edb3603a81a50b4c8f47b11dfade69ef48ffdc0af2f8b194ad87cbda75317" |
557 | SRC_URI[twox-hash-1.6.3.sha256sum] = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" | 536 | SRC_URI[twox-hash-1.6.3.sha256sum] = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" |
558 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" | 537 | SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" |
559 | SRC_URI[unicase-2.7.0.sha256sum] = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" | 538 | SRC_URI[unicase-2.7.0.sha256sum] = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" |
560 | SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" | 539 | SRC_URI[unicode-bidi-0.3.15.sha256sum] = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" |
561 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" | 540 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
562 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | 541 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" |
563 | SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" | 542 | SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" |
564 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" | 543 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" |
544 | SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" | ||
545 | SRC_URI[unscanny-0.1.0.sha256sum] = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" | ||
565 | SRC_URI[untrusted-0.9.0.sha256sum] = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" | 546 | SRC_URI[untrusted-0.9.0.sha256sum] = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" |
566 | SRC_URI[ureq-2.9.1.sha256sum] = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" | 547 | SRC_URI[ureq-2.9.6.sha256sum] = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35" |
567 | SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" | 548 | SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" |
549 | SRC_URI[urlencoding-2.1.3.sha256sum] = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" | ||
568 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" | 550 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" |
569 | SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" | 551 | SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" |
570 | SRC_URI[valuable-0.1.0.sha256sum] = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" | 552 | SRC_URI[valuable-0.1.0.sha256sum] = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" |
571 | SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" | 553 | SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" |
572 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | 554 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" |
@@ -574,45 +556,37 @@ SRC_URI[versions-5.0.1.sha256sum] = "c73a36bc44e3039f51fbee93e39f41225f6b17b380e | |||
574 | SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" | 556 | SRC_URI[wait-timeout-0.2.0.sha256sum] = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" |
575 | SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" | 557 | SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" |
576 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 558 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
577 | SRC_URI[webpki-roots-0.25.3.sha256sum] = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" | 559 | SRC_URI[webpki-roots-0.26.0.sha256sum] = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" |
578 | SRC_URI[which-5.0.0.sha256sum] = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" | 560 | SRC_URI[which-5.0.0.sha256sum] = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" |
579 | SRC_URI[wild-2.2.0.sha256sum] = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" | 561 | SRC_URI[which-6.0.0.sha256sum] = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" |
562 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | ||
580 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 563 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
581 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 564 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
582 | SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" | 565 | SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" |
583 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 566 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
584 | SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" | ||
585 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" | 567 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" |
586 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | 568 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" |
587 | SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" | ||
588 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" | 569 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" |
589 | SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" | 570 | SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" |
590 | SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" | ||
591 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" | 571 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" |
592 | SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" | 572 | SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" |
593 | SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" | ||
594 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" | 573 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" |
595 | SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" | 574 | SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" |
596 | SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" | ||
597 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" | 575 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" |
598 | SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" | 576 | SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" |
599 | SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" | ||
600 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" | 577 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" |
601 | SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" | 578 | SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" |
602 | SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" | ||
603 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" | 579 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" |
604 | SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" | 580 | SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" |
605 | SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" | ||
606 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" | 581 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" |
607 | SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" | 582 | SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" |
608 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" | ||
609 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" | 583 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" |
610 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" | 584 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" |
611 | SRC_URI[winnow-0.5.19.sha256sum] = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" | 585 | SRC_URI[winnow-0.6.2.sha256sum] = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" |
612 | SRC_URI[xattr-1.0.1.sha256sum] = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" | 586 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" |
613 | SRC_URI[xwin-0.5.0.sha256sum] = "c43e0202f5457b48558096cb7b36d0e473f267551a89c82ed72d73b01dfd4007" | 587 | SRC_URI[xwin-0.5.0.sha256sum] = "c43e0202f5457b48558096cb7b36d0e473f267551a89c82ed72d73b01dfd4007" |
614 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" | 588 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" |
615 | SRC_URI[zerocopy-0.7.28.sha256sum] = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" | 589 | SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" |
616 | SRC_URI[zerocopy-derive-0.7.28.sha256sum] = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" | 590 | SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" |
617 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" | 591 | SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" |
618 | SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" | 592 | SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" |
diff --git a/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch b/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch deleted file mode 100644 index a0ef0c9e22..0000000000 --- a/meta/recipes-devtools/python/python3-maturin/0001-Add-32-bit-RISC-V-support.patch +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | From a945706bd610c5400fc85a248d5e0c96ebd2e953 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Feb 2024 10:38:49 -0800 | ||
4 | Subject: [PATCH] Add 32-bit RISC-V support | ||
5 | |||
6 | Tested with qemuriscv32 and it builds fine with all tests passed on a | ||
7 | qemu machine. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/PyO3/maturin/pull/1969] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/target.rs | 11 ++++++++++- | ||
13 | 1 file changed, 10 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/target.rs b/src/target.rs | ||
16 | index fbb93531..33fa9273 100644 | ||
17 | --- a/src/target.rs | ||
18 | +++ b/src/target.rs | ||
19 | @@ -69,6 +69,7 @@ pub enum Arch { | ||
20 | X86_64, | ||
21 | S390X, | ||
22 | Wasm32, | ||
23 | + Riscv32, | ||
24 | Riscv64, | ||
25 | Mips64el, | ||
26 | Mips64, | ||
27 | @@ -91,6 +92,7 @@ impl fmt::Display for Arch { | ||
28 | Arch::X86_64 => write!(f, "x86_64"), | ||
29 | Arch::S390X => write!(f, "s390x"), | ||
30 | Arch::Wasm32 => write!(f, "wasm32"), | ||
31 | + Arch::Riscv32 => write!(f, "riscv32"), | ||
32 | Arch::Riscv64 => write!(f, "riscv64"), | ||
33 | Arch::Mips64el => write!(f, "mips64el"), | ||
34 | Arch::Mips64 => write!(f, "mips64"), | ||
35 | @@ -115,7 +117,7 @@ impl Arch { | ||
36 | Arch::Powerpc | Arch::Powerpc64Le | Arch::Powerpc64 => "powerpc", | ||
37 | Arch::X86 => "i386", | ||
38 | Arch::X86_64 => "amd64", | ||
39 | - Arch::Riscv64 => "riscv", | ||
40 | + Arch::Riscv32 | Arch::Riscv64 => "riscv", | ||
41 | Arch::Mips64el | Arch::Mips64 | Arch::Mipsel | Arch::Mips => "mips", | ||
42 | // sparc64 is unsupported since FreeBSD 13.0 | ||
43 | Arch::Sparc64 => "sparc64", | ||
44 | @@ -139,6 +141,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
45 | Arch::S390X, | ||
46 | Arch::X86, | ||
47 | Arch::X86_64, | ||
48 | + Arch::Riscv32, | ||
49 | Arch::Riscv64, | ||
50 | Arch::Mips64el, | ||
51 | Arch::Mips64, | ||
52 | @@ -158,6 +161,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
53 | Arch::Powerpc64Le, | ||
54 | Arch::X86, | ||
55 | Arch::X86_64, | ||
56 | + Arch::Riscv32, | ||
57 | Arch::Riscv64, | ||
58 | Arch::Mips64el, | ||
59 | Arch::Mipsel, | ||
60 | @@ -171,6 +175,7 @@ fn get_supported_architectures(os: &Os) -> Vec<Arch> { | ||
61 | Arch::Powerpc, | ||
62 | Arch::Powerpc64, | ||
63 | Arch::Powerpc64Le, | ||
64 | + Arch::Riscv32, | ||
65 | Arch::Riscv64, | ||
66 | Arch::Sparc64, | ||
67 | ], | ||
68 | @@ -255,6 +260,7 @@ impl Target { | ||
69 | Architecture::Powerpc64le => Arch::Powerpc64Le, | ||
70 | Architecture::S390x => Arch::S390X, | ||
71 | Architecture::Wasm32 => Arch::Wasm32, | ||
72 | + Architecture::Riscv32(_) => Arch::Riscv32, | ||
73 | Architecture::Riscv64(_) => Arch::Riscv64, | ||
74 | Architecture::Mips64(mips64_arch) => match mips64_arch { | ||
75 | Mips64Architecture::Mips64el => Arch::Mips64el, | ||
76 | @@ -343,6 +349,7 @@ impl Target { | ||
77 | Arch::X86_64 => "x86_64", | ||
78 | Arch::S390X => "s390x", | ||
79 | Arch::Wasm32 => "wasm32", | ||
80 | + Arch::Riscv32 => "riscv32", | ||
81 | Arch::Riscv64 => "riscv64", | ||
82 | // It's kinda surprising that Python doesn't include the `el` suffix | ||
83 | Arch::Mips64el | Arch::Mips64 => "mips64", | ||
84 | @@ -388,6 +395,7 @@ impl Target { | ||
85 | } | ||
86 | Arch::Armv6L | ||
87 | | Arch::Wasm32 | ||
88 | + | Arch::Riscv32 | ||
89 | | Arch::Riscv64 | ||
90 | | Arch::Mips64el | ||
91 | | Arch::Mips64 | ||
92 | @@ -418,6 +426,7 @@ impl Target { | ||
93 | | Arch::Wasm32 | ||
94 | | Arch::Mipsel | ||
95 | | Arch::Mips | ||
96 | + | Arch::Riscv32 | ||
97 | | Arch::Powerpc => 32, | ||
98 | } | ||
99 | } | ||
100 | -- | ||
101 | 2.44.0 | ||
102 | |||
diff --git a/meta/recipes-devtools/python/python3-maturin_1.4.0.bb b/meta/recipes-devtools/python/python3-maturin_1.5.1.bb index ed19ee647a..96b046feba 100644 --- a/meta/recipes-devtools/python/python3-maturin_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-maturin_1.5.1.bb | |||
@@ -5,8 +5,7 @@ LICENSE = "MIT | Apache-2.0" | |||
5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ | 5 | LIC_FILES_CHKSUM = "file://license-apache;md5=1836efb2eb779966696f473ee8540542 \ |
6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" | 6 | file://license-mit;md5=85fd3b67069cff784d98ebfc7d5c0797" |
7 | 7 | ||
8 | SRC_URI += "file://0001-Add-32-bit-RISC-V-support.patch" | 8 | SRC_URI[sha256sum] = "3dd834ece80edb866af18cbd4635e0ecac40139c726428d5f1849ae154b26dca" |
9 | SRC_URI[sha256sum] = "ed12e1768094a7adeafc3a74ebdb8dc2201fa64c4e7e31f14cfc70378bf93790" | ||
10 | 9 | ||
11 | S = "${WORKDIR}/maturin-${PV}" | 10 | S = "${WORKDIR}/maturin-${PV}" |
12 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-packaging_23.2.bb b/meta/recipes-devtools/python/python3-packaging_24.0.bb index 2d35936615..0942eeb15e 100644 --- a/meta/recipes-devtools/python/python3-packaging_23.2.bb +++ b/meta/recipes-devtools/python/python3-packaging_24.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/packaging" | |||
3 | LICENSE = "Apache-2.0 | BSD-2-Clause" | 3 | LICENSE = "Apache-2.0 | BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5" | 6 | SRC_URI[sha256sum] = "eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9" |
7 | 7 | ||
8 | inherit pypi python_flit_core | 8 | inherit pypi python_flit_core |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-pluggy_1.4.0.bb b/meta/recipes-devtools/python/python3-pluggy_1.5.0.bb index 76acc4ae27..9822cd59f3 100644 --- a/meta/recipes-devtools/python/python3-pluggy_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-pluggy_1.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pytest-dev/pluggy" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8206d16fd5cc02fa9b0bb98955e5c2" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be" | 6 | SRC_URI[sha256sum] = "2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1" |
7 | 7 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 8 | DEPENDS += "python3-setuptools-scm-native" |
9 | RDEPENDS:${PN} += "python3-importlib-metadata \ | 9 | RDEPENDS:${PN} += "python3-importlib-metadata \ |
diff --git a/meta/recipes-devtools/python/python3-pyasn1_0.5.1.bb b/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb index 0519ba5edb..0519ba5edb 100644 --- a/meta/recipes-devtools/python/python3-pyasn1_0.5.1.bb +++ b/meta/recipes-devtools/python/python3-pyasn1_0.6.0.bb | |||
diff --git a/meta/recipes-devtools/python/python3-pycparser_2.21.bb b/meta/recipes-devtools/python/python3-pycparser_2.22.bb index 00deceebf9..9a5abc42bd 100644 --- a/meta/recipes-devtools/python/python3-pycparser_2.21.bb +++ b/meta/recipes-devtools/python/python3-pycparser_2.22.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Parser of the C language, written in pure Python" | 1 | SUMMARY = "Parser of the C language, written in pure Python" |
2 | HOMEPAGE = "https://github.com/eliben/pycparser" | 2 | HOMEPAGE = "https://github.com/eliben/pycparser" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2c28cdeabcb88f5843d934381b4b4fea" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9761c3ffee7ba99c60dca0408fd3262b" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206" | 6 | SRC_URI[sha256sum] = "491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-pyelftools_0.30.bb b/meta/recipes-devtools/python/python3-pyelftools_0.31.bb index 837edb7165..551fed6876 100644 --- a/meta/recipes-devtools/python/python3-pyelftools_0.30.bb +++ b/meta/recipes-devtools/python/python3-pyelftools_0.31.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "PD" | 4 | LICENSE = "PD" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5ce2a2b07fca326bc7c146d10105ccfc" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "2fc92b0d534f8b081f58c7c370967379123d8e00984deb53c209364efd575b40" | 7 | SRC_URI[sha256sum] = "c774416b10310156879443b81187d182d8d9ee499660380e645918b50bc88f99" |
8 | 8 | ||
9 | PYPI_PACKAGE = "pyelftools" | 9 | PYPI_PACKAGE = "pyelftools" |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb b/meta/recipes-devtools/python/python3-pygobject_3.48.2.bb index 73a393051a..3d83a8a1c2 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.46.0.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.48.2.bb | |||
@@ -19,7 +19,7 @@ DEPENDS += "python3 glib-2.0" | |||
19 | SRCNAME="pygobject" | 19 | SRCNAME="pygobject" |
20 | 20 | ||
21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz" | 21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz" |
22 | SRC_URI[sha256sum] = "426008b2dad548c9af1c7b03b59df0440fde5c33f38fb5406b103a43d653cafc" | 22 | SRC_URI[sha256sum] = "0794aeb4a9be31a092ac20621b5f54ec280f9185943d328b105cdae6298ad1a7" |
23 | 23 | ||
24 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 24 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3-pyopenssl_24.0.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb index 9ea3075482..e714ad838e 100644 --- a/meta/recipes-devtools/python/python3-pyopenssl_24.0.0.bb +++ b/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
5 | 5 | ||
6 | DEPENDS += "openssl python3-cryptography" | 6 | DEPENDS += "openssl python3-cryptography" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "6aa33039a93fffa4563e655b61d11364d01264be8ccb49906101e02a334530bf" | 8 | SRC_URI[sha256sum] = "cabed4bfaa5df9f1a16c0ef64a0cb65318b5cd077a7eda7d6970131ca2f41a6f" |
9 | 9 | ||
10 | PYPI_PACKAGE = "pyOpenSSL" | 10 | PYPI_PACKAGE = "pyOpenSSL" |
11 | inherit pypi setuptools3 | 11 | inherit pypi setuptools3 |
diff --git a/meta/recipes-devtools/python/python3-pyparsing_3.1.1.bb b/meta/recipes-devtools/python/python3-pyparsing_3.1.2.bb index 6f34091c86..64210ade53 100644 --- a/meta/recipes-devtools/python/python3-pyparsing_3.1.1.bb +++ b/meta/recipes-devtools/python/python3-pyparsing_3.1.2.bb | |||
@@ -10,7 +10,7 @@ BUGTRACKER = "https://github.com/pyparsing/pyparsing/issues" | |||
10 | LICENSE = "MIT" | 10 | LICENSE = "MIT" |
11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=657a566233888513e1f07ba13e2f47f1" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db" | 13 | SRC_URI[sha256sum] = "a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "pyparsing-(?P<pver>.*)\.tar" |
16 | 16 | ||
diff --git a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb index 9d08e7acc4..c3f1fb75ed 100644 --- a/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb +++ b/meta/recipes-devtools/python/python3-pyproject-hooks_1.0.0.bb | |||
@@ -22,5 +22,3 @@ RDEPENDS:${PN} += " \ | |||
22 | do_compile:class-native () { | 22 | do_compile:class-native () { |
23 | python_flit_core_do_manual_build | 23 | python_flit_core_do_manual_build |
24 | } | 24 | } |
25 | |||
26 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
diff --git a/meta/recipes-devtools/python/python3-pytest-subtests_0.11.0.bb b/meta/recipes-devtools/python/python3-pytest-subtests_0.12.1.bb index 44fa1e2b80..0590be705f 100644 --- a/meta/recipes-devtools/python/python3-pytest-subtests_0.11.0.bb +++ b/meta/recipes-devtools/python/python3-pytest-subtests_0.12.1.bb | |||
@@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/pytest-dev/pytest-subtests/issues" | |||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "51865c88457545f51fb72011942f0a3c6901ee9e24cbfb6d1b9dc1348bafbe37" | 10 | SRC_URI[sha256sum] = "d6605dcb88647e0b7c1889d027f8ef1c17d7a2c60927ebfdc09c7b0d8120476d" |
11 | 11 | ||
12 | inherit pypi python_setuptools_build_meta | 12 | inherit pypi python_setuptools_build_meta |
13 | 13 | ||
diff --git a/meta/recipes-devtools/python/python3-pytest_8.0.2.bb b/meta/recipes-devtools/python/python3-pytest_8.2.0.bb index 57e979e909..1e6674079f 100644 --- a/meta/recipes-devtools/python/python3-pytest_8.0.2.bb +++ b/meta/recipes-devtools/python/python3-pytest_8.2.0.bb | |||
@@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "d4051d623a2e0b7e51960ba963193b09ce6daeb9759a451844a21e4ddedfc1bd" | 8 | SRC_URI[sha256sum] = "d507d4482197eac0ba2bae2e9babf0672eb333017bcedaa5fb1a3d42c1174b3f" |
9 | 9 | ||
10 | DEPENDS += "python3-setuptools-scm-native" | 10 | DEPENDS += "python3-setuptools-scm-native" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-referencing_0.33.0.bb b/meta/recipes-devtools/python/python3-referencing_0.34.0.bb index 5b50932264..6fbd10d9cf 100644 --- a/meta/recipes-devtools/python/python3-referencing_0.33.0.bb +++ b/meta/recipes-devtools/python/python3-referencing_0.34.0.bb | |||
@@ -3,11 +3,11 @@ HOMEPAGE = "https://github.com/python-jsonschema/referencing" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=93eb9740964b59e9ba30281255b044e2" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=93eb9740964b59e9ba30281255b044e2" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7" | 6 | SRC_URI[sha256sum] = "5773bd84ef41799a5a8ca72dc34590c041eb01bf9aa02632b4a973fb0181a844" |
7 | 7 | ||
8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
9 | 9 | ||
10 | DEPENDS += "${PYTHON_PN}-hatch-vcs-native" | 10 | DEPENDS += "python3-hatch-vcs-native" |
11 | 11 | ||
12 | RDEPENDS:${PN} += "python3-rpds-py" | 12 | RDEPENDS:${PN} += "python3-rpds-py" |
13 | 13 | ||
diff --git a/meta/recipes-devtools/python/python3-scons_4.6.0.bb b/meta/recipes-devtools/python/python3-scons_4.7.0.bb index c3cc3f0373..bba6c799d4 100644 --- a/meta/recipes-devtools/python/python3-scons_4.6.0.bb +++ b/meta/recipes-devtools/python/python3-scons_4.7.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7" |
6 | 6 | ||
7 | SRC_URI += " file://0001-Fix-man-page-installation.patch" | 7 | SRC_URI += " file://0001-Fix-man-page-installation.patch" |
8 | SRC_URI[sha256sum] = "7db28958b188b800f803c287d0680cc3ac7c422ed0b1cf9895042c52567803ec" | 8 | SRC_URI[sha256sum] = "d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3" |
9 | 9 | ||
10 | PYPI_PACKAGE = "SCons" | 10 | PYPI_PACKAGE = "SCons" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 2a3c71fb62..e227c2889c 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 40648dfa770f9f7b9b9efa501c9ef7af96be9f2d Mon Sep 17 00:00:00 2001 | 1 | From 80fe63816eb3bfd1f5b6d354e1f2442805cff4e0 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 | 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 |
4 | Subject: [PATCH] conditionally do not fetch code by easy_install | 4 | Subject: [PATCH] conditionally do not fetch code by easy_install |
@@ -14,10 +14,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
14 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
15 | 15 | ||
16 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | 16 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py |
17 | index 5d6fd5c..377e575 100644 | 17 | index 858fb20..62bd853 100644 |
18 | --- a/setuptools/command/easy_install.py | 18 | --- a/setuptools/command/easy_install.py |
19 | +++ b/setuptools/command/easy_install.py | 19 | +++ b/setuptools/command/easy_install.py |
20 | @@ -676,6 +676,11 @@ class easy_install(Command): | 20 | @@ -672,6 +672,11 @@ class easy_install(Command): |
21 | os.path.exists(tmpdir) and _rmtree(tmpdir) | 21 | os.path.exists(tmpdir) and _rmtree(tmpdir) |
22 | 22 | ||
23 | def easy_install(self, spec, deps=False): | 23 | def easy_install(self, spec, deps=False): |
diff --git a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_69.5.1.bb index 77d4e0aa03..8261b09d16 100644 --- a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb +++ b/meta/recipes-devtools/python/python3-setuptools_69.5.1.bb | |||
@@ -11,7 +11,7 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e | |||
11 | SRC_URI += " \ | 11 | SRC_URI += " \ |
12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" | 12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8" | 14 | SRC_URI[sha256sum] = "6c1fccdac05a97e598fb0ae3bbed5904ccb317337a51139dcd51453611bbb987" |
15 | 15 | ||
16 | DEPENDS += "python3" | 16 | DEPENDS += "python3" |
17 | 17 | ||
diff --git a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb b/meta/recipes-devtools/python/python3-testtools_2.7.1.bb index 79e46a02de..cc7e055632 100644 --- a/meta/recipes-devtools/python/python3-testtools_2.7.1.bb +++ b/meta/recipes-devtools/python/python3-testtools_2.7.1.bb | |||
@@ -1,3 +1,20 @@ | |||
1 | inherit setuptools3 | 1 | SUMMARY = "Extensions to the Python standard library unit testing framework" |
2 | require python-testtools.inc | 2 | HOMEPAGE = "https://pypi.org/project/testtools/" |
3 | SECTION = "devel/python" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" | ||
6 | |||
7 | DEPENDS += "python3-hatch-vcs-native" | ||
8 | |||
9 | inherit pypi python_hatchling | ||
10 | |||
11 | SRC_URI[sha256sum] = "df6de96010e29ee21f637a147eabf30d50b25e3841dd1d68f93ee89ce77e366c" | ||
12 | |||
13 | RDEPENDS:${PN} += "\ | ||
14 | python3-doctest \ | ||
15 | python3-extras \ | ||
16 | python3-six \ | ||
17 | " | ||
18 | |||
19 | BBCLASSEXTEND = "nativesdk" | ||
3 | 20 | ||
diff --git a/meta/recipes-devtools/python/python3-trove-classifiers_2024.2.23.bb b/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb index 8514a52616..357b428983 100644 --- a/meta/recipes-devtools/python/python3-trove-classifiers_2024.2.23.bb +++ b/meta/recipes-devtools/python/python3-trove-classifiers_2024.4.10.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/trove-classifiers" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "8385160a12aac69c93fff058fb613472ed773a24a27eb3cd4b144cfbdd79f38c" | 6 | SRC_URI[sha256sum] = "49f40bb6a746b72a1cba4f8d55ee8252169cda0f70802e3fd24f04b7fb25a492" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta ptest | 8 | inherit pypi python_setuptools_build_meta ptest |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-typing-extensions_4.10.0.bb b/meta/recipes-devtools/python/python3-typing-extensions_4.11.0.bb index 8698a80cc5..ad45b669ec 100644 --- a/meta/recipes-devtools/python/python3-typing-extensions_4.10.0.bb +++ b/meta/recipes-devtools/python/python3-typing-extensions_4.11.0.bb | |||
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" | |||
15 | # The name on PyPi is slightly different. | 15 | # The name on PyPi is slightly different. |
16 | PYPI_PACKAGE = "typing_extensions" | 16 | PYPI_PACKAGE = "typing_extensions" |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb" | 18 | SRC_URI[sha256sum] = "83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0" |
19 | 19 | ||
20 | inherit pypi python_flit_core | 20 | inherit pypi python_flit_core |
21 | 21 | ||
diff --git a/meta/recipes-devtools/python/python3-websockets_12.0.bb b/meta/recipes-devtools/python/python3-websockets_12.0.bb new file mode 100644 index 0000000000..f89c3b629e --- /dev/null +++ b/meta/recipes-devtools/python/python3-websockets_12.0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" | ||
2 | HOMEPAGE = "https://github.com/aaugustin/websockets" | ||
3 | |||
4 | LICENSE = "BSD-3-Clause" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=51924a6af4495b8cfaee1b1da869b6f4" | ||
6 | |||
7 | inherit pypi setuptools3 | ||
8 | |||
9 | SRC_URI[sha256sum] = "81df9cbcbb6c260de1e007e58c011bfebe2dafc8435107b0537f393dd38c8b1b" | ||
10 | |||
11 | BBCLASSEXTEND = "native nativesdk" | ||
12 | |||
13 | RDEPENDS:${PN} = " \ | ||
14 | python3-asyncio \ | ||
15 | python3-profile \ | ||
16 | " | ||
diff --git a/meta/recipes-devtools/python/python3-wheel_0.42.0.bb b/meta/recipes-devtools/python/python3-wheel_0.43.0.bb index 807888e6c0..ba309ae5fc 100644 --- a/meta/recipes-devtools/python/python3-wheel_0.42.0.bb +++ b/meta/recipes-devtools/python/python3-wheel_0.43.0.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ffb0db04527cfe380e4f2726bd05ebf" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7ffb0db04527cfe380e4f2726bd05ebf" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8" | 7 | SRC_URI[sha256sum] = "465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85" |
8 | 8 | ||
9 | inherit python_flit_core pypi | 9 | inherit python_flit_core pypi |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-zipp_3.17.0.bb b/meta/recipes-devtools/python/python3-zipp_3.18.1.bb index e9e220e315..e43432469d 100644 --- a/meta/recipes-devtools/python/python3-zipp_3.17.0.bb +++ b/meta/recipes-devtools/python/python3-zipp_3.18.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0" | 6 | SRC_URI[sha256sum] = "2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715" |
7 | 7 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 8 | DEPENDS += "python3-setuptools-scm-native" |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch new file mode 100644 index 0000000000..1d4cda18b1 --- /dev/null +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Wed, 8 May 2024 11:58:09 -0400 | ||
4 | Subject: [PATCH] test_shutdown: skip problematic test | ||
5 | |||
6 | This test hangs frequently when run on the Autobuilder. Disable it in | ||
7 | testing until the cause can be determined. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | Lib/test/test_concurrent_futures/test_shutdown.py | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
17 | index 7a4065afd4..6b878a48bf 100644 | ||
18 | --- a/Lib/test/test_concurrent_futures/test_shutdown.py | ||
19 | +++ b/Lib/test/test_concurrent_futures/test_shutdown.py | ||
20 | @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): | ||
21 | sys.stdout.flush() | ||
22 | |||
23 | |||
24 | +@unittest.skip("skipping problematic test") | ||
25 | class ExecutorShutdownTest: | ||
26 | def test_run_after_shutdown(self): | ||
27 | self.executor.shutdown() | ||
28 | @@ -156,6 +157,7 @@ def timeout(_signum, _frame): | ||
29 | signal.signal(signal.SIGALRM, old_handler) | ||
30 | |||
31 | |||
32 | +@unittest.skip("skipping problematic test") | ||
33 | class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): | ||
34 | def test_threads_terminate(self): | ||
35 | def acquire_lock(lock): | ||
36 | @@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self): | ||
37 | self.assertIn(out.strip(), [b"apple", b""]) | ||
38 | |||
39 | |||
40 | +@unittest.skip("skipping problematic test") | ||
41 | class ProcessPoolShutdownTest(ExecutorShutdownTest): | ||
42 | def test_processes_terminate(self): | ||
43 | def acquire_lock(lock): | ||
44 | -- | ||
45 | 2.45.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch b/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch deleted file mode 100644 index 598ef08cc4..0000000000 --- a/meta/recipes-devtools/python/python3/0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From d07ca7fbd874e230dec4d4c6d650a66ea2a9008e Mon Sep 17 00:00:00 2001 | ||
2 | From: Sebastian Pipping <sebastian@pipping.org> | ||
3 | Date: Wed, 7 Feb 2024 15:32:45 +0100 | ||
4 | Subject: [PATCH] test_xml_etree.py: Fix for Expat >=2.6.0 with reparse | ||
5 | deferral | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/115138] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Lib/test/test_xml_etree.py | 10 ++++++---- | ||
11 | .../2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | 1 + | ||
12 | 2 files changed, 7 insertions(+), 4 deletions(-) | ||
13 | create mode 100644 Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | ||
14 | |||
15 | diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py | ||
16 | index b50898f..4578367 100644 | ||
17 | --- a/Lib/test/test_xml_etree.py | ||
18 | +++ b/Lib/test/test_xml_etree.py | ||
19 | @@ -1403,6 +1403,7 @@ class XMLPullParserTest(unittest.TestCase): | ||
20 | def test_simple_xml(self): | ||
21 | for chunk_size in (None, 1, 5): | ||
22 | with self.subTest(chunk_size=chunk_size): | ||
23 | + expected_events = [] | ||
24 | parser = ET.XMLPullParser() | ||
25 | self.assert_event_tags(parser, []) | ||
26 | self._feed(parser, "<!-- comment -->\n", chunk_size) | ||
27 | @@ -1412,16 +1413,17 @@ class XMLPullParserTest(unittest.TestCase): | ||
28 | chunk_size) | ||
29 | self.assert_event_tags(parser, []) | ||
30 | self._feed(parser, ">\n", chunk_size) | ||
31 | - self.assert_event_tags(parser, [('end', 'element')]) | ||
32 | + expected_events += [('end', 'element')] | ||
33 | self._feed(parser, "<element>text</element>tail\n", chunk_size) | ||
34 | self._feed(parser, "<empty-element/>\n", chunk_size) | ||
35 | - self.assert_event_tags(parser, [ | ||
36 | + expected_events += [ | ||
37 | ('end', 'element'), | ||
38 | ('end', 'empty-element'), | ||
39 | - ]) | ||
40 | + ] | ||
41 | self._feed(parser, "</root>\n", chunk_size) | ||
42 | - self.assert_event_tags(parser, [('end', 'root')]) | ||
43 | + expected_events += [('end', 'root')] | ||
44 | self.assertIsNone(parser.close()) | ||
45 | + self.assert_event_tags(parser, expected_events) | ||
46 | |||
47 | def test_feed_while_iterating(self): | ||
48 | parser = ET.XMLPullParser() | ||
49 | diff --git a/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | ||
50 | new file mode 100644 | ||
51 | index 0000000..4dc9c13 | ||
52 | --- /dev/null | ||
53 | +++ b/Misc/NEWS.d/next/Tests/2024-02-07-15-49-37.gh-issue-115133.WBajNr.rst | ||
54 | @@ -0,0 +1 @@ | ||
55 | +Fix etree XMLPullParser tests for Expat >=2.6.0 with reparse deferral | ||
diff --git a/meta/recipes-devtools/python/python3_3.12.2.bb b/meta/recipes-devtools/python/python3_3.12.3.bb index f837f05af4..93709b207c 100644 --- a/meta/recipes-devtools/python/python3_3.12.2.bb +++ b/meta/recipes-devtools/python/python3_3.12.3.bb | |||
@@ -30,14 +30,14 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ | 30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ |
31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ | 31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ |
32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ | 32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ |
33 | file://0001-test_xml_etree.py-Fix-for-Expat-2.6.0-with-reparse-d.patch \ | 33 | file://0001-test_shutdown-skip-problematic-test.patch \ |
34 | " | 34 | " |
35 | 35 | ||
36 | SRC_URI:append:class-native = " \ | 36 | SRC_URI:append:class-native = " \ |
37 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ | 37 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | SRC_URI[sha256sum] = "be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870" | 40 | SRC_URI[sha256sum] = "56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1" |
41 | 41 | ||
42 | # exclude pre-releases for both python 2.x and 3.x | 42 | # exclude pre-releases for both python 2.x and 3.x |
43 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 43 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |
@@ -158,7 +158,7 @@ do_compile:prepend() { | |||
158 | } | 158 | } |
159 | 159 | ||
160 | do_install:prepend() { | 160 | do_install:prepend() { |
161 | ${WORKDIR}/check_build_completeness.py ${T}/log.do_compile | 161 | ${UNPACKDIR}/check_build_completeness.py ${T}/log.do_compile |
162 | } | 162 | } |
163 | 163 | ||
164 | do_install:append:class-target() { | 164 | do_install:append:class-target() { |
@@ -198,7 +198,7 @@ do_install:append:class-native() { | |||
198 | 198 | ||
199 | do_install:append() { | 199 | do_install:append() { |
200 | for c in ${D}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do | 200 | for c in ${D}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do |
201 | python3 ${WORKDIR}/reformat_sysconfig.py $c | 201 | python3 ${UNPACKDIR}/reformat_sysconfig.py $c |
202 | done | 202 | done |
203 | rm -f ${D}${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.cpython* | 203 | rm -f ${D}${libdir}/python${PYTHON_MAJMIN}/__pycache__/_sysconfigdata*.cpython* |
204 | 204 | ||
@@ -285,7 +285,7 @@ py_package_preprocess () { | |||
285 | # Reformat _sysconfigdata after modifying it so that it remains | 285 | # Reformat _sysconfigdata after modifying it so that it remains |
286 | # reproducible | 286 | # reproducible |
287 | for c in ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do | 287 | for c in ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata*.py; do |
288 | python3 ${WORKDIR}/reformat_sysconfig.py $c | 288 | python3 ${UNPACKDIR}/reformat_sysconfig.py $c |
289 | done | 289 | done |
290 | 290 | ||
291 | # Recompile _sysconfigdata after modifying it | 291 | # Recompile _sysconfigdata after modifying it |
@@ -398,6 +398,7 @@ do_create_manifest() { | |||
398 | # e.g. BerkeleyDB is an optional build dependency so it may or may not | 398 | # e.g. BerkeleyDB is an optional build dependency so it may or may not |
399 | # be present, we must ensure it is. | 399 | # be present, we must ensure it is. |
400 | 400 | ||
401 | cp ${UNPACKDIR}/create_manifest3.py ${WORKDIR} | ||
401 | cd ${WORKDIR} | 402 | cd ${WORKDIR} |
402 | # This needs to be executed by python-native and NOT by HOST's python | 403 | # This needs to be executed by python-native and NOT by HOST's python |
403 | nativepython3 create_manifest3.py ${PYTHON_MAJMIN} | 404 | nativepython3 create_manifest3.py ${PYTHON_MAJMIN} |
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb index 5d40784201..997f72e6e7 100644 --- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb | |||
@@ -28,6 +28,6 @@ do_compile() { | |||
28 | 28 | ||
29 | do_install() { | 29 | do_install() { |
30 | install -d ${D}${bindir} | 30 | install -d ${D}${bindir} |
31 | install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/ | 31 | install -m 0755 ${S}${COREBASE}/scripts/oe-* ${D}${bindir}/ |
32 | install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/ | 32 | install -m 0755 ${S}${COREBASE}/scripts/runqemu* ${D}${bindir}/ |
33 | } | 33 | } |
diff --git a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb index 1dfce0e4c7..8bb6ef0995 100644 --- a/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Helper utilities needed by the runqemu script" | |||
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | RDEPENDS:${PN} = "qemu-system-native" | 3 | RDEPENDS:${PN} = "qemu-system-native" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab86f2caaa8462eacda77f4d7" | 5 | LIC_FILES_CHKSUM = "file://${S}/qemu-oe-bridge-helper.c;endline=4;md5=ae00a3bab86f2caaa8462eacda77f4d7" |
6 | 6 | ||
7 | SRC_URI = "file://qemu-oe-bridge-helper.c" | 7 | SRC_URI = "file://qemu-oe-bridge-helper.c" |
8 | 8 | ||
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb index 0634b34242..5d2fbcbc02 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb | |||
@@ -17,7 +17,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp png \ | |||
17 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" | 17 | PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}" |
18 | 18 | ||
19 | do_install:append() { | 19 | do_install:append() { |
20 | install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu | 20 | install -Dm 0755 ${UNPACKDIR}/powerpc_rom.bin ${D}${datadir}/qemu |
21 | 21 | ||
22 | # The following is also installed by qemu-native | 22 | # The following is also installed by qemu-native |
23 | rm -f ${D}${datadir}/qemu/trace-events-all | 23 | rm -f ${D}${datadir}/qemu/trace-events-all |
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4501f84c2b..f76cbbb5cb 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -168,11 +168,11 @@ do_install () { | |||
168 | # If we built the guest agent, also install startup/udev rules | 168 | # If we built the guest agent, also install startup/udev rules |
169 | if [ -e "${D}${bindir}/qemu-ga" ]; then | 169 | if [ -e "${D}${bindir}/qemu-ga" ]; then |
170 | install -d ${D}${sysconfdir}/init.d/ | 170 | install -d ${D}${sysconfdir}/init.d/ |
171 | install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent | 171 | install -m 0755 ${UNPACKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent |
172 | sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent | 172 | sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent |
173 | 173 | ||
174 | install -d ${D}${sysconfdir}/udev/rules.d/ | 174 | install -d ${D}${sysconfdir}/udev/rules.d/ |
175 | install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules | 175 | install -m 0644 ${UNPACKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules |
176 | 176 | ||
177 | install -d ${D}${systemd_unitdir}/system/ | 177 | install -d ${D}${systemd_unitdir}/system/ |
178 | install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system | 178 | install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system |
diff --git a/meta/recipes-devtools/repo/repo_2.42.bb b/meta/recipes-devtools/repo/repo_2.45.bb index 9bb5000fab..dd12373e3a 100644 --- a/meta/recipes-devtools/repo/repo_2.42.bb +++ b/meta/recipes-devtools/repo/repo_2.45.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
11 | 11 | ||
12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ |
13 | " | 13 | " |
14 | SRCREV = "5554572f02537b8646139d59ab520e59e1d5f7b3" | 14 | SRCREV = "73356f1d5ccbebf5a33e5e9aa1ba06c5f5437fed" |
15 | 15 | ||
16 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" | 16 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" |
17 | 17 | ||
@@ -22,7 +22,7 @@ do_configure:prepend() { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | do_install() { | 24 | do_install() { |
25 | install -D ${WORKDIR}/git/repo ${D}${bindir}/repo | 25 | install -D ${S}/repo ${D}${bindir}/repo |
26 | } | 26 | } |
27 | 27 | ||
28 | RDEPENDS:${PN} = "python3 git" | 28 | RDEPENDS:${PN} = "python3 git" |
diff --git a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch index 96fe57dfeb..25aa69d7da 100644 --- a/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch +++ b/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From ecc45e3ae837ab50603088dcc8fd2f8e67a7ece6 Mon Sep 17 00:00:00 2001 | 1 | From f4cf90b5a298d6a3199e8b4c07f520aaf593ce2b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 9 Mar 2017 18:54:02 +0200 | 3 | Date: Thu, 9 Mar 2017 18:54:02 +0200 |
4 | Subject: [PATCH] Add a color setting for mips64_n32 binaries | 4 | Subject: [PATCH] Add a color setting for mips64_n32 binaries |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | build/rpmfc.c | 4 ++++ | 9 | build/rpmfc.c | 4 ++++ |
11 | rpmrc.in | 2 ++ | 10 | rpmrc.in | 2 ++ |
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch index 5053caae33..e4edc884b1 100644 --- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 | 1 | From c39a074ff3c4d21c100d387661c7d725b5eae7b0 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Wed, 29 Nov 2023 14:06:15 +0100 | 3 | Date: Wed, 29 Nov 2023 14:06:15 +0100 |
4 | Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than | 4 | Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than |
@@ -8,16 +8,15 @@ Otherwise cmake will try to find libm, badly, and fail. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
12 | --- | 11 | --- |
13 | CMakeLists.txt | 2 +- | 12 | CMakeLists.txt | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 15 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
17 | index 7f0630453..d0ea565f3 100644 | 16 | index 4a383ceba..ed847c09a 100644 |
18 | --- a/CMakeLists.txt | 17 | --- a/CMakeLists.txt |
19 | +++ b/CMakeLists.txt | 18 | +++ b/CMakeLists.txt |
20 | @@ -187,7 +187,7 @@ set(REQFUNCS | 19 | @@ -190,7 +190,7 @@ set(REQFUNCS |
21 | ) | 20 | ) |
22 | 21 | ||
23 | find_package(PkgConfig REQUIRED) | 22 | find_package(PkgConfig REQUIRED) |
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch deleted file mode 100644 index db83b176b4..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 16 Jan 2024 13:43:36 +0100 | ||
4 | Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit | ||
5 | option | ||
6 | |||
7 | This was lost in autotools -> cmake transition. The particular | ||
8 | reason to make it explicit is that readline is gpl version 3 | ||
9 | licensed, and in some builds components under that license | ||
10 | need to be excluded. | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852] | ||
13 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
14 | --- | ||
15 | CMakeLists.txt | 7 ++++++- | ||
16 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 0a474106e..89e27417f 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON) | ||
23 | option(WITH_FSVERITY "Build with fsverity support" OFF) | ||
24 | option(WITH_IMAEVM "Build with IMA support" OFF) | ||
25 | option(WITH_FAPOLICYD "Build with fapolicyd support" ON) | ||
26 | +option(WITH_READLINE "Build with readline support" ON) | ||
27 | |||
28 | set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") | ||
29 | set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string") | ||
30 | @@ -193,7 +194,11 @@ find_package(BZip2) | ||
31 | find_package(Iconv) | ||
32 | |||
33 | pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt) | ||
34 | -pkg_check_modules(READLINE IMPORTED_TARGET readline) | ||
35 | + | ||
36 | +if (WITH_READLINE) | ||
37 | + pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline) | ||
38 | +endif() | ||
39 | + | ||
40 | pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8) | ||
41 | pkg_check_modules(LIBELF IMPORTED_TARGET libelf) | ||
42 | pkg_check_modules(LIBDW IMPORTED_TARGET libdw) | ||
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch index df5543873c..d0ed711086 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d77429bf20d138ec8ce577c0080cae1f1bc2aa6f Mon Sep 17 00:00:00 2001 | 1 | From 86e585cc0dd06dfa20f584af8b59d52a59accb45 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 9 Jan 2017 18:52:11 +0200 | 3 | Date: Mon, 9 Jan 2017 18:52:11 +0200 |
4 | Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in | 4 | Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in |
@@ -9,7 +9,6 @@ hand produces rpms that way by design. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | build/pack.c | 4 ---- | 13 | build/pack.c | 4 ---- |
15 | 1 file changed, 4 deletions(-) | 14 | 1 file changed, 4 deletions(-) |
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index b056d19741..b571a0ae8c 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7948f21e08bc7552b281ed0098a9c8099d2370cb Mon Sep 17 00:00:00 2001 | 1 | From 73d6841d9ef2a8ac7bd63f9645a3efe8038dfdd4 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | 4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
@@ -6,19 +6,18 @@ Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | |||
6 | 6 | ||
7 | Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] | 7 | Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | |||
10 | --- | 9 | --- |
11 | CMakeLists.txt | 2 +- | 10 | CMakeLists.txt | 2 +- |
12 | macros.in | 2 +- | 11 | macros.in | 2 +- |
13 | 2 files changed, 2 insertions(+), 2 deletions(-) | 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
14 | 13 | ||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
16 | index 2767915fb..7f0630453 100644 | 15 | index 7808115c1..4a383ceba 100644 |
17 | --- a/CMakeLists.txt | 16 | --- a/CMakeLists.txt |
18 | +++ b/CMakeLists.txt | 17 | +++ b/CMakeLists.txt |
19 | @@ -32,7 +32,7 @@ option(WITH_FSVERITY "Build with fsverity support" OFF) | 18 | @@ -33,7 +33,7 @@ option(WITH_IMAEVM "Build with IMA support" OFF) |
20 | option(WITH_IMAEVM "Build with IMA support" OFF) | ||
21 | option(WITH_FAPOLICYD "Build with fapolicyd support" ON) | 19 | option(WITH_FAPOLICYD "Build with fapolicyd support" ON) |
20 | option(WITH_READLINE "Build with readline support" ON) | ||
22 | 21 | ||
23 | -set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") | 22 | -set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/lib/rpm" CACHE PATH "rpm home") |
24 | +set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") | 23 | +set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home") |
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch index 6a18679da2..796088df53 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From 4f34994d9ad38d96976578a9d1a006f72e5aca50 Mon Sep 17 00:00:00 2001 | 1 | From e210458d125793915abce30420d866a30305c37a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 10 Jan 2017 14:11:30 +0200 | 3 | Date: Tue, 10 Jan 2017 14:11:30 +0200 |
4 | Subject: [PATCH] Do not read config files from $HOME | 4 | Subject: [PATCH] Do not read config files from $HOME |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | lib/rpmrc.c | 6 ++---- | 9 | lib/rpmrc.c | 6 ++---- |
11 | 1 file changed, 2 insertions(+), 4 deletions(-) | 10 | 1 file changed, 2 insertions(+), 4 deletions(-) |
12 | 11 | ||
13 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | 12 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c |
14 | index 269d490ac..f39dcfc11 100644 | 13 | index 9437a0ff1..483585ae4 100644 |
15 | --- a/lib/rpmrc.c | 14 | --- a/lib/rpmrc.c |
16 | +++ b/lib/rpmrc.c | 15 | +++ b/lib/rpmrc.c |
17 | @@ -458,8 +458,7 @@ static void setDefaults(void) | 16 | @@ -459,8 +459,7 @@ static void setDefaults(void) |
18 | if (!defrcfiles) { | 17 | if (!defrcfiles) { |
19 | defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", | 18 | defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":", |
20 | confdir, "/" RPM_VENDOR "/rpmrc", ":", | 19 | confdir, "/" RPM_VENDOR "/rpmrc", ":", |
@@ -24,7 +23,7 @@ index 269d490ac..f39dcfc11 100644 | |||
24 | } | 23 | } |
25 | 24 | ||
26 | #ifndef MACROFILES | 25 | #ifndef MACROFILES |
27 | @@ -471,8 +470,7 @@ static void setDefaults(void) | 26 | @@ -472,8 +471,7 @@ static void setDefaults(void) |
28 | confdir, "/" RPM_VENDOR "/macros", ":", | 27 | confdir, "/" RPM_VENDOR "/macros", ":", |
29 | SYSCONFDIR "/rpm/macros.*", ":", | 28 | SYSCONFDIR "/rpm/macros.*", ":", |
30 | SYSCONFDIR "/rpm/macros", ":", | 29 | SYSCONFDIR "/rpm/macros", ":", |
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch index 318f65ed37..328fbf86ac 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 25beba1efc31901a3bb0b1b6f0604d6583dc0513 Mon Sep 17 00:00:00 2001 | 1 | From a8fe7a7a2e41c9f127ed26407d57076babcb89e8 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 20 Jan 2017 13:32:06 +0200 | 3 | Date: Fri, 20 Jan 2017 13:32:06 +0200 |
4 | Subject: [PATCH] Do not reset the PATH environment variable before running | 4 | Subject: [PATCH] Do not reset the PATH environment variable before running |
@@ -8,13 +8,12 @@ We add lots of native stuff into it and scriptlets rely on that. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
12 | --- | 11 | --- |
13 | lib/rpmscript.c | 2 +- | 12 | lib/rpmscript.c | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c | 15 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
17 | index 36e37cf77..37ada014c 100644 | 16 | index 57689bb68..7b7e26606 100644 |
18 | --- a/lib/rpmscript.c | 17 | --- a/lib/rpmscript.c |
19 | +++ b/lib/rpmscript.c | 18 | +++ b/lib/rpmscript.c |
20 | @@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, | 19 | @@ -252,7 +252,7 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, |
diff --git a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch b/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch deleted file mode 100644 index 8e73e07704..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 1b3a182f38895de5ea8dda5a77867345845fb967 Mon Sep 17 00:00:00 2001 | ||
2 | From: Panu Matilainen <pmatilai@redhat.com> | ||
3 | Date: Mon, 18 Dec 2023 12:25:04 +0200 | ||
4 | Subject: [PATCH] Fix unconditional dependency on non-POSIX GLOB_ONLYDIR flag | ||
5 | |||
6 | This regressed when we axed our internal glob copy in commit | ||
7 | 66fa46c006bae0f28d93238b8f7f1c923645eee5. Luckily GLOB_ONLYDIR is only | ||
8 | an optimization so we can just skip it if not available. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/57f3711846f44da0f37cbc5dd66e8fba80a3bee1] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | CMakeLists.txt | 1 + | ||
14 | config.h.in | 1 + | ||
15 | rpmio/rpmglob.c | 2 ++ | ||
16 | 3 files changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index d0ea565f3..0a474106e 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -351,6 +351,7 @@ if (LIBDW_FOUND) | ||
23 | set(HAVE_LIBDW 1) | ||
24 | endif() | ||
25 | |||
26 | +check_symbol_exists(GLOB_ONLYDIR "glob.h" HAVE_GLOB_ONLYDIR) | ||
27 | check_symbol_exists(major "sys/sysmacros.h" MAJOR_IN_SYSMACROS) | ||
28 | if (NOT MAJOR_IN_SYSMACROS) | ||
29 | check_symbol_exists(major "sys/mkdev.h" MAJOR_IN_MKDEV) | ||
30 | diff --git a/config.h.in b/config.h.in | ||
31 | index cb97827d0..ab1757a9a 100644 | ||
32 | --- a/config.h.in | ||
33 | +++ b/config.h.in | ||
34 | @@ -100,6 +100,7 @@ | ||
35 | #cmakedefine HAVE_ZSTD @HAVE_ZSTD@ | ||
36 | #cmakedefine HAVE___PROGNAME @HAVE___PROGNAME@ | ||
37 | #cmakedefine HAVE___SECURE_GETENV @HAVE___SECURE_GETENV@ | ||
38 | +#cmakedefine HAVE_GLOB_ONLYDIR @HAVE_GLOB_ONLYDIR@ | ||
39 | #cmakedefine MAJOR_IN_MKDEV @MAJOR_IN_MKDEV@ | ||
40 | #cmakedefine MAJOR_IN_SYSMACROS @MAJOR_IN_SYSMACROS@ | ||
41 | #cmakedefine RUNDIR @rundir@ | ||
42 | diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c | ||
43 | index 8276eddb4..243568766 100644 | ||
44 | --- a/rpmio/rpmglob.c | ||
45 | +++ b/rpmio/rpmglob.c | ||
46 | @@ -84,8 +84,10 @@ int rpmGlobPath(const char * pattern, rpmglobFlags flags, | ||
47 | gflags |= GLOB_BRACE; | ||
48 | if (home != NULL && strlen(home) > 0) | ||
49 | gflags |= GLOB_TILDE; | ||
50 | +#if HAVE_GLOB_ONLYDIR | ||
51 | if (dir_only) | ||
52 | gflags |= GLOB_ONLYDIR; | ||
53 | +#endif | ||
54 | if (flags & RPMGLOB_NOCHECK) | ||
55 | gflags |= GLOB_NOCHECK; | ||
56 | |||
diff --git a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch index fc89b44132..e4251a1a73 100644 --- a/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch +++ b/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 82e6d1ad126df88c58120a31fc025691039db7f3 Mon Sep 17 00:00:00 2001 | 1 | From 34c0d3263f3e0b366a2320e0823f46673f7ba928 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 17 Jan 2017 14:07:17 +0200 | 3 | Date: Tue, 17 Jan 2017 14:07:17 +0200 |
4 | Subject: [PATCH] When cross-installing, execute package scriptlets without | 4 | Subject: [PATCH] When cross-installing, execute package scriptlets without |
@@ -24,13 +24,12 @@ Amended 2018-07-03 by Olof Johansson <olofjn@axis.com>: | |||
24 | 24 | ||
25 | Upstream-Status: Inappropriate [oe-core specific] | 25 | Upstream-Status: Inappropriate [oe-core specific] |
26 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 26 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
27 | |||
28 | --- | 27 | --- |
29 | lib/rpmscript.c | 11 ++++++++--- | 28 | lib/rpmscript.c | 11 ++++++++--- |
30 | 1 file changed, 8 insertions(+), 3 deletions(-) | 29 | 1 file changed, 8 insertions(+), 3 deletions(-) |
31 | 30 | ||
32 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c | 31 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
33 | index b18f851a3..36e37cf77 100644 | 32 | index 3f6313278..57689bb68 100644 |
34 | --- a/lib/rpmscript.c | 33 | --- a/lib/rpmscript.c |
35 | +++ b/lib/rpmscript.c | 34 | +++ b/lib/rpmscript.c |
36 | @@ -448,8 +448,7 @@ exit: | 35 | @@ -448,8 +448,7 @@ exit: |
diff --git a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch index 5820b2e7e5..2f6397aa8a 100644 --- a/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch +++ b/meta/recipes-devtools/rpm/files/0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ebe65b0e8622c37463697dcec779a42290c33810 Mon Sep 17 00:00:00 2001 | 1 | From ae4fdd8e8d052835973e6ff4b7550f93bde30a98 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 31 Aug 2021 10:37:05 +0200 | 3 | Date: Tue, 31 Aug 2021 10:37:05 +0200 |
4 | Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata | 4 | Subject: [PATCH] build/pack.c: do not insert payloadflags into .rpm metadata |
@@ -9,7 +9,6 @@ host to the next and breaks reproducibility for .rpm). | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
12 | |||
13 | --- | 12 | --- |
14 | build/pack.c | 2 +- | 13 | build/pack.c | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch index 8b9f1f7294..98e52da3a8 100644 --- a/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch +++ b/meta/recipes-devtools/rpm/files/0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bfceae7386b5fec108f98ad59ad96e57aecb08d3 Mon Sep 17 00:00:00 2001 | 1 | From b04ecb793a3c859985eead5e261785b27a4c4a20 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 7 May 2020 17:40:58 +0800 | 3 | Date: Thu, 7 May 2020 17:40:58 +0800 |
4 | Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 | 4 | Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32 |
@@ -27,7 +27,6 @@ Fixed by performing a 'last-in-wins' resolution when "neither is preferred". | |||
27 | Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> | 27 | Upstream-Status: Submitted <https://github.com/rpm-software-management/rpm/issues/193> |
28 | 28 | ||
29 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 29 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
30 | |||
31 | --- | 30 | --- |
32 | lib/transaction.c | 13 ++++++++++++- | 31 | lib/transaction.c | 13 ++++++++++++- |
33 | 1 file changed, 12 insertions(+), 1 deletion(-) | 32 | 1 file changed, 12 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch index 388694d234..55108e7f1c 100644 --- a/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch +++ b/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7894b508a61bb87f05f7eb0a1e912a2422f4fcd2 Mon Sep 17 00:00:00 2001 | 1 | From 58bf006646a063837c46b695f7e7ebb69bee7238 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Hatle <mark.hatle@windriver.com> | 2 | From: Mark Hatle <mark.hatle@windriver.com> |
3 | Date: Tue, 15 Aug 2017 16:41:57 -0500 | 3 | Date: Tue, 15 Aug 2017 16:41:57 -0500 |
4 | Subject: [PATCH] perl: disable auto requires | 4 | Subject: [PATCH] perl: disable auto requires |
@@ -12,7 +12,6 @@ generation. This matches the behavior from the previous RPM5 implementation. | |||
12 | Upstream-Status: Inappropriate [OE specific configuration] | 12 | Upstream-Status: Inappropriate [OE specific configuration] |
13 | 13 | ||
14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
15 | |||
16 | --- | 15 | --- |
17 | fileattrs/perl.attr | 2 +- | 16 | fileattrs/perl.attr | 2 +- |
18 | fileattrs/perllib.attr | 2 +- | 17 | fileattrs/perllib.attr | 2 +- |
diff --git a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch index 89c23f8197..c5caa7dc5e 100644 --- a/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch +++ b/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e53c0e2586bc6f4677db3c6898a6428283a6b785 Mon Sep 17 00:00:00 2001 | 1 | From d7143dc4e75c8bcc5cc4c852a4b972942b7e4d07 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 20 Jan 2017 13:33:05 +0200 | 3 | Date: Fri, 20 Jan 2017 13:33:05 +0200 |
4 | Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR | 4 | Subject: [PATCH] Add support for prefixing /etc from RPM_ETCCONFIGDIR |
@@ -9,16 +9,15 @@ from target rootfs instead of its own native sysroot. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | lib/rpmrc.c | 19 ++++++++++++++----- | 13 | lib/rpmrc.c | 19 ++++++++++++++----- |
15 | 1 file changed, 14 insertions(+), 5 deletions(-) | 14 | 1 file changed, 14 insertions(+), 5 deletions(-) |
16 | 15 | ||
17 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | 16 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c |
18 | index f39dcfc11..f27f88753 100644 | 17 | index 483585ae4..ea858c290 100644 |
19 | --- a/lib/rpmrc.c | 18 | --- a/lib/rpmrc.c |
20 | +++ b/lib/rpmrc.c | 19 | +++ b/lib/rpmrc.c |
21 | @@ -455,10 +455,14 @@ const char * lookupInDefaultTable(const char * name, | 20 | @@ -456,10 +456,14 @@ const char * lookupInDefaultTable(const char * name, |
22 | static void setDefaults(void) | 21 | static void setDefaults(void) |
23 | { | 22 | { |
24 | const char *confdir = rpmConfigDir(); | 23 | const char *confdir = rpmConfigDir(); |
@@ -34,7 +33,7 @@ index f39dcfc11..f27f88753 100644 | |||
34 | } | 33 | } |
35 | 34 | ||
36 | #ifndef MACROFILES | 35 | #ifndef MACROFILES |
37 | @@ -468,9 +472,9 @@ static void setDefaults(void) | 36 | @@ -469,9 +473,9 @@ static void setDefaults(void) |
38 | confdir, "/platform/%{_target}/macros", ":", | 37 | confdir, "/platform/%{_target}/macros", ":", |
39 | confdir, "/fileattrs/*.attr", ":", | 38 | confdir, "/fileattrs/*.attr", ":", |
40 | confdir, "/" RPM_VENDOR "/macros", ":", | 39 | confdir, "/" RPM_VENDOR "/macros", ":", |
@@ -47,7 +46,7 @@ index f39dcfc11..f27f88753 100644 | |||
47 | } | 46 | } |
48 | #else | 47 | #else |
49 | macrofiles = MACROFILES; | 48 | macrofiles = MACROFILES; |
50 | @@ -1114,7 +1118,11 @@ static void read_auxv(void) | 49 | @@ -1115,7 +1119,11 @@ static void read_auxv(void) |
51 | */ | 50 | */ |
52 | static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) | 51 | static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) |
53 | { | 52 | { |
@@ -60,7 +59,7 @@ index f39dcfc11..f27f88753 100644 | |||
60 | static struct utsname un; | 59 | static struct utsname un; |
61 | char * chptr; | 60 | char * chptr; |
62 | canonEntry canon; | 61 | canonEntry canon; |
63 | @@ -1434,6 +1442,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) | 62 | @@ -1435,6 +1443,7 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os) |
64 | 63 | ||
65 | if (arch) *arch = un.machine; | 64 | if (arch) *arch = un.machine; |
66 | if (os) *os = un.sysname; | 65 | if (os) *os = un.sysname; |
diff --git a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch b/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch deleted file mode 100644 index e7f0adc70c..0000000000 --- a/meta/recipes-devtools/rpm/files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 4e388caabf0906f09d697b8d08623a022f7270b2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 29 Nov 2023 14:09:06 +0100 | ||
4 | Subject: [PATCH] docs/CMakeLists.txt: do not install non-existent docs/html | ||
5 | |||
6 | Building html would require doxygen-native. | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe-core specific] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | |||
11 | --- | ||
12 | docs/CMakeLists.txt | 1 - | ||
13 | 1 file changed, 1 deletion(-) | ||
14 | |||
15 | diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt | ||
16 | index 52dce7b4e..c01ff7757 100644 | ||
17 | --- a/docs/CMakeLists.txt | ||
18 | +++ b/docs/CMakeLists.txt | ||
19 | @@ -18,7 +18,6 @@ if (DOXYGEN_FOUND) | ||
20 | elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/index.html) | ||
21 | set(doxsrc ${CMAKE_CURRENT_SOURCE_DIR}) | ||
22 | endif() | ||
23 | -install(DIRECTORY ${doxsrc}/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/API) | ||
24 | |||
25 | install(FILES | ||
26 | README.md | ||
diff --git a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch index 3d4b09bedb..23dce30086 100644 --- a/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch +++ b/meta/recipes-devtools/rpm/files/0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f78e05544fb5ae9ef688963f19666f1af34c3d5c Mon Sep 17 00:00:00 2001 | 1 | From 29c2a0c18b0c773128bf62c611b4c53fe4471105 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 16 Jan 2024 09:59:26 +0100 | 3 | Date: Tue, 16 Jan 2024 09:59:26 +0100 |
4 | Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C | 4 | Subject: [PATCH] rpmio/rpmglob.c: avoid using GLOB_BRACE if undefined by C |
diff --git a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch index b3d57cc870..732202c46f 100644 --- a/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch +++ b/meta/recipes-devtools/rpm/files/0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0005ab544230020e854e9709b2bc0501702c2968 Mon Sep 17 00:00:00 2001 | 1 | From f01d9c24bb86bc47ad2453483518dbb25953cac7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 10 Jan 2019 18:14:18 +0100 | 3 | Date: Thu, 10 Jan 2019 18:14:18 +0100 |
4 | Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO | 4 | Subject: [PATCH] rpmscript.c: change logging level around scriptlets to INFO |
@@ -9,13 +9,12 @@ irrelevant noise to rootfs logs. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | lib/rpmscript.c | 8 ++++---- | 13 | lib/rpmscript.c | 8 ++++---- |
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | 14 | 1 file changed, 4 insertions(+), 4 deletions(-) |
16 | 15 | ||
17 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c | 16 | diff --git a/lib/rpmscript.c b/lib/rpmscript.c |
18 | index 37ada014c..bab0c97a6 100644 | 17 | index 7b7e26606..1dcd23be5 100644 |
19 | --- a/lib/rpmscript.c | 18 | --- a/lib/rpmscript.c |
20 | +++ b/lib/rpmscript.c | 19 | +++ b/lib/rpmscript.c |
21 | @@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) | 20 | @@ -291,7 +291,7 @@ static char * writeScript(const char *cmd, const char *script) |
diff --git a/meta/recipes-devtools/rpm/rpm_4.19.1.bb b/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb index a495f7ced2..0802f26295 100644 --- a/meta/recipes-devtools/rpm/rpm_4.19.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.19.1.1.bb | |||
@@ -37,14 +37,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.19.x;protoc | |||
37 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ | 37 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ |
38 | file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ | 38 | file://0001-build-pack.c-do-not-insert-payloadflags-into-.rpm-me.patch \ |
39 | file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ | 39 | file://0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch \ |
40 | file://0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch \ | ||
41 | file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ | 40 | file://0002-rpmio-rpmglob.c-avoid-using-GLOB_BRACE-if-undefined-.patch \ |
42 | file://0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch \ | ||
43 | file://0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch \ | ||
44 | " | 41 | " |
45 | 42 | ||
46 | PE = "1" | 43 | PE = "1" |
47 | SRCREV = "98b301ebb44fb5cabb56fc24bc3aaa437c47c038" | 44 | SRCREV = "13b4521341781293c41ac898aa9c2d2f6bc1f21d" |
48 | 45 | ||
49 | S = "${WORKDIR}/git" | 46 | S = "${WORKDIR}/git" |
50 | 47 | ||
@@ -135,6 +132,8 @@ do_install:append () { | |||
135 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ | 132 | sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ |
136 | -e 's:${STAGING_DIR_NATIVE}/::g' \ | 133 | -e 's:${STAGING_DIR_NATIVE}/::g' \ |
137 | ${D}/${libdir}/rpm/macros | 134 | ${D}/${libdir}/rpm/macros |
135 | sed -i -e 's:${RECIPE_SYSROOT}/::g' \ | ||
136 | ${D}/${libdir}/cmake/rpm/rpm-targets.cmake | ||
138 | 137 | ||
139 | } | 138 | } |
140 | 139 | ||
diff --git a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch index 8895adad74..2379de84f2 100644 --- a/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch +++ b/meta/recipes-devtools/rsync/files/0001-Add-missing-prototypes-to-function-declarations.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 651425fced0691d9063fe417388ba6ca1c38c40b Mon Sep 17 00:00:00 2001 | 1 | From 2beb35c34c45320144f37b12ef4d72fb8734280e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 29 Aug 2022 19:53:28 -0700 | 3 | Date: Mon, 29 Aug 2022 19:53:28 -0700 |
4 | Subject: [PATCH] Add missing prototypes to function declarations | 4 | Subject: [PATCH] Add missing prototypes to function declarations |
@@ -15,7 +15,6 @@ Fixes errors like | |||
15 | 15 | ||
16 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032858.html] | 16 | Upstream-Status: Submitted [https://lists.samba.org/archive/rsync/2022-August/032858.html] |
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | |||
19 | --- | 18 | --- |
20 | checksum.c | 2 +- | 19 | checksum.c | 2 +- |
21 | exclude.c | 2 +- | 20 | exclude.c | 2 +- |
@@ -30,10 +29,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
30 | 10 files changed, 12 insertions(+), 13 deletions(-) | 29 | 10 files changed, 12 insertions(+), 13 deletions(-) |
31 | 30 | ||
32 | diff --git a/checksum.c b/checksum.c | 31 | diff --git a/checksum.c b/checksum.c |
33 | index 60de365..67a9e16 100644 | 32 | index cb21882..736818b 100644 |
34 | --- a/checksum.c | 33 | --- a/checksum.c |
35 | +++ b/checksum.c | 34 | +++ b/checksum.c |
36 | @@ -778,7 +778,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list) | 35 | @@ -779,7 +779,7 @@ static void verify_digest(struct name_num_item *nni, BOOL check_auth_list) |
37 | } | 36 | } |
38 | #endif | 37 | #endif |
39 | 38 | ||
@@ -43,7 +42,7 @@ index 60de365..67a9e16 100644 | |||
43 | #if defined SUPPORT_XXH3 || defined USE_OPENSSL | 42 | #if defined SUPPORT_XXH3 || defined USE_OPENSSL |
44 | struct name_num_item *nni; | 43 | struct name_num_item *nni; |
45 | diff --git a/exclude.c b/exclude.c | 44 | diff --git a/exclude.c b/exclude.c |
46 | index ffe55b1..a85ea76 100644 | 45 | index 87edbcf..ae0de2f 100644 |
47 | --- a/exclude.c | 46 | --- a/exclude.c |
48 | +++ b/exclude.c | 47 | +++ b/exclude.c |
49 | @@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) | 48 | @@ -363,7 +363,7 @@ void implied_include_partial_string(const char *s_start, const char *s_end) |
@@ -96,10 +95,10 @@ index e4ba1cc..8482b71 100644 | |||
96 | int options = LOG_PID; | 95 | int options = LOG_PID; |
97 | 96 | ||
98 | diff --git a/main.c b/main.c | 97 | diff --git a/main.c b/main.c |
99 | index d2a7b9b..c50af45 100644 | 98 | index 0c60b86..4bc664a 100644 |
100 | --- a/main.c | 99 | --- a/main.c |
101 | +++ b/main.c | 100 | +++ b/main.c |
102 | @@ -244,7 +244,7 @@ void read_del_stats(int f) | 101 | @@ -246,7 +246,7 @@ void read_del_stats(int f) |
103 | stats.deleted_files += stats.deleted_specials = read_varint(f); | 102 | stats.deleted_files += stats.deleted_specials = read_varint(f); |
104 | } | 103 | } |
105 | 104 | ||
diff --git a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch index 92ed1f4419..0c9ce8b8e3 100644 --- a/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch +++ b/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 81700d1a0e51391028c761cc8ef1cd660084d114 Mon Sep 17 00:00:00 2001 | 1 | From f446686c26c499e15ef17d495a93cfbc20e16090 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 | 3 | Date: Tue, 12 Apr 2016 15:51:54 +0100 |
4 | Subject: [PATCH] rsync: remove upstream's rebuild logic | 4 | Subject: [PATCH] rsync: remove upstream's rebuild logic |
@@ -8,16 +8,15 @@ generally overcomplicated, and we ensure that autoreconf is invoked if required. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | Makefile.in | 54 ----------------------------------------------------- | 12 | Makefile.in | 54 ----------------------------------------------------- |
14 | 1 file changed, 54 deletions(-) | 13 | 1 file changed, 54 deletions(-) |
15 | 14 | ||
16 | diff --git a/Makefile.in b/Makefile.in | 15 | diff --git a/Makefile.in b/Makefile.in |
17 | index 3cde955..d963a70 100644 | 16 | index a1253e5..a084935 100644 |
18 | --- a/Makefile.in | 17 | --- a/Makefile.in |
19 | +++ b/Makefile.in | 18 | +++ b/Makefile.in |
20 | @@ -190,60 +190,6 @@ gensend: gen | 19 | @@ -192,60 +192,6 @@ gensend: gen |
21 | fi | 20 | fi |
22 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true | 21 | rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true |
23 | 22 | ||
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.7.bb b/meta/recipes-devtools/rsync/rsync_3.3.0.bb index 130581a785..a90d2887bd 100644 --- a/meta/recipes-devtools/rsync/rsync_3.2.7.bb +++ b/meta/recipes-devtools/rsync/rsync_3.3.0.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ | |||
16 | file://determism.patch \ | 16 | file://determism.patch \ |
17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ | 17 | file://0001-Add-missing-prototypes-to-function-declarations.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb" | 19 | SRC_URI[sha256sum] = "7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90" |
20 | 20 | ||
21 | inherit autotools-brokensep | 21 | inherit autotools-brokensep |
22 | 22 | ||
@@ -61,7 +61,7 @@ do_configure:append () { | |||
61 | 61 | ||
62 | do_install:append() { | 62 | do_install:append() { |
63 | install -d ${D}${sysconfdir} | 63 | install -d ${D}${sysconfdir} |
64 | install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir} | 64 | install -m 0644 ${UNPACKDIR}/rsyncd.conf ${D}${sysconfdir} |
65 | } | 65 | } |
66 | 66 | ||
67 | BBCLASSEXTEND = "native nativesdk" | 67 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch index 2e3156880e..7402e76333 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a6e12b25a54d112c899b70c89c0bec9c5e5ebf3c Mon Sep 17 00:00:00 2001 | 1 | From caa03f46a3204a7e0f0e5d9d9cc9113304dc0382 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Mon, 30 Sep 2019 16:57:01 +0100 | 3 | Date: Mon, 30 Sep 2019 16:57:01 +0100 |
4 | Subject: [PATCH 1/3] extmk: fix cross-compilation of external gems | 4 | Subject: [PATCH] extmk: fix cross-compilation of external gems |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -16,10 +16,10 @@ Signed-off-by: André Draszik <andre.draszik@jci.com> | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/ext/extmk.rb b/ext/extmk.rb | 18 | diff --git a/ext/extmk.rb b/ext/extmk.rb |
19 | index 1389dc4117..e4d923d7a7 100755 | 19 | index 428ffc9..87eff71 100755 |
20 | --- a/ext/extmk.rb | 20 | --- a/ext/extmk.rb |
21 | +++ b/ext/extmk.rb | 21 | +++ b/ext/extmk.rb |
22 | @@ -413,8 +413,8 @@ def $mflags.defined?(var) | 22 | @@ -420,8 +420,8 @@ else |
23 | end | 23 | end |
24 | $ruby = [$ruby] | 24 | $ruby = [$ruby] |
25 | $ruby << "-I'$(topdir)'" | 25 | $ruby << "-I'$(topdir)'" |
@@ -29,6 +29,3 @@ index 1389dc4117..e4d923d7a7 100755 | |||
29 | $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout | 29 | $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout |
30 | ENV["RUBYLIB"] = "-" | 30 | ENV["RUBYLIB"] = "-" |
31 | end | 31 | end |
32 | -- | ||
33 | 2.23.0.rc1 | ||
34 | |||
diff --git a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch b/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch deleted file mode 100644 index 1dff9c0f8c..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 6b3c202b46b9312c5bb0789145f13d8086e70948 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 15 Jan 2023 02:34:17 -0800 | ||
4 | Subject: [PATCH] fiddle: Use C11 _Alignof to define ALIGN_OF when possible | ||
5 | |||
6 | WG14 N2350 made very clear that it is an UB having type definitions | ||
7 | within "offsetof" [1]. This patch enhances the implementation of macro | ||
8 | ALIGN_OF to use builtin "_Alignof" to avoid undefined behavior | ||
9 | when using std=c11 or newer | ||
10 | |||
11 | clang 16+ has started to flag this [2] | ||
12 | |||
13 | Fixes build when using -std >= gnu11 and using clang16+ | ||
14 | |||
15 | Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it | ||
16 | may support C11, exclude those compiler versions | ||
17 | |||
18 | [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm | ||
19 | [2] https://reviews.llvm.org/D133574 | ||
20 | |||
21 | Upstream-Status: Submitted [https://github.com/ruby/fiddle/pull/120] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | ext/fiddle/fiddle.h | 12 +++++++++++- | ||
25 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h | ||
28 | index 10eb9ce..ffb395e 100644 | ||
29 | --- a/ext/fiddle/fiddle.h | ||
30 | +++ b/ext/fiddle/fiddle.h | ||
31 | @@ -196,7 +196,17 @@ | ||
32 | #endif | ||
33 | #define TYPE_UINTPTR_T (-TYPE_INTPTR_T) | ||
34 | |||
35 | -#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x) | ||
36 | +/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 | ||
37 | + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. | ||
38 | + clang versions < 8.0.0 have the same bug. */ | ||
39 | +#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ | ||
40 | + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ | ||
41 | + && !defined __clang__) \ | ||
42 | + || (defined __clang__ && __clang_major__ < 8)) | ||
43 | +# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x) | ||
44 | +#else | ||
45 | +# define ALIGN_OF(type) _Alignof(type) | ||
46 | +#endif | ||
47 | |||
48 | #define ALIGN_VOIDP ALIGN_OF(void*) | ||
49 | #define ALIGN_CHAR ALIGN_OF(char) | ||
50 | -- | ||
51 | 2.39.0 | ||
52 | |||
diff --git a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch b/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch deleted file mode 100644 index 226ef3af75..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 2368d07660a93a2c41d63f3ab6054ca4daeef820 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 17 Nov 2020 18:31:40 +0000 | ||
4 | Subject: [PATCH] template/Makefile.in: do not write host cross-cc items into | ||
5 | target config | ||
6 | |||
7 | This helps reproducibility. | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | template/Makefile.in | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/template/Makefile.in b/template/Makefile.in | ||
16 | index 10dc826..940ee07 100644 | ||
17 | --- a/template/Makefile.in | ||
18 | +++ b/template/Makefile.in | ||
19 | @@ -657,11 +657,11 @@ mjit_config.h: | ||
20 | echo '#endif'; \ | ||
21 | quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \ | ||
22 | sep=,; \ | ||
23 | - quote "MJIT_CC_COMMON " $(MJIT_CC); \ | ||
24 | + quote "MJIT_CC_COMMON " ; \ | ||
25 | quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \ | ||
26 | quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ | ||
27 | quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ | ||
28 | - quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ | ||
29 | + quote "MJIT_LDSHARED " ; \ | ||
30 | quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ | ||
31 | quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ | ||
32 | quote 'PRELOADENV "@PRELOADENV@"'; \ | ||
diff --git a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch index f7b7adb3fd..67054d6553 100644 --- a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch +++ b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001 | 1 | From 980dcc5380db6f03451357140ae1487117300156 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 25 Jan 2022 20:29:14 -0800 | 3 | Date: Tue, 25 Jan 2022 20:29:14 -0800 |
4 | Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv | 4 | Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
15 | 15 | ||
16 | diff --git a/vm_dump.c b/vm_dump.c | 16 | diff --git a/vm_dump.c b/vm_dump.c |
17 | index a98f5aa..957b785 100644 | 17 | index 444be4a..8a081a7 100644 |
18 | --- a/vm_dump.c | 18 | --- a/vm_dump.c |
19 | +++ b/vm_dump.c | 19 | +++ b/vm_dump.c |
20 | @@ -39,6 +39,11 @@ | 20 | @@ -39,6 +39,11 @@ |
@@ -29,6 +29,3 @@ index a98f5aa..957b785 100644 | |||
29 | #define VM_CFP_CNT(ec, cfp) \ | 29 | #define VM_CFP_CNT(ec, cfp) \ |
30 | ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \ | 30 | ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \ |
31 | (rb_control_frame_t *)(cfp)) | 31 | (rb_control_frame_t *)(cfp)) |
32 | -- | ||
33 | 2.35.0 | ||
34 | |||
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index 96ae86263b..f3a65e785d 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From 21d8e7700fa0a9c4bf569dd366134060ae858832 Mon Sep 17 00:00:00 2001 | 1 | From 7f7facb85bd65adec24230fe8ca7f6a9863a1fd0 Mon Sep 17 00:00:00 2001 |
2 | From: Christopher Larson <chris_larson@mentor.com> | 2 | From: Christopher Larson <chris_larson@mentor.com> |
3 | Date: Thu, 5 May 2016 10:59:07 -0700 | 3 | Date: Thu, 5 May 2016 10:59:07 -0700 |
4 | Subject: [PATCH] Obey LDFLAGS for the link of libruby | 4 | Subject: [PATCH] Obey LDFLAGS for the link of libruby |
5 | 5 | ||
6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
8 | |||
9 | --- | 8 | --- |
10 | template/Makefile.in | 2 +- | 9 | template/Makefile.in | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 11 | ||
13 | diff --git a/template/Makefile.in b/template/Makefile.in | 12 | diff --git a/template/Makefile.in b/template/Makefile.in |
14 | index 1456313..15b98a4 100644 | 13 | index 8c462f2..2200c8c 100644 |
15 | --- a/template/Makefile.in | 14 | --- a/template/Makefile.in |
16 | +++ b/template/Makefile.in | 15 | +++ b/template/Makefile.in |
17 | @@ -127,7 +127,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ | 16 | @@ -115,7 +115,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ |
18 | LDSHARED = @LIBRUBY_LDSHARED@ | 17 | LDSHARED = @LIBRUBY_LDSHARED@ |
19 | DLDSHARED = @DLDSHARED@ | 18 | DLDSHARED = @DLDSHARED@ |
20 | XDLDFLAGS = @DLDFLAGS@ | 19 | XDLDFLAGS = @DLDFLAGS@ |
@@ -22,4 +21,4 @@ index 1456313..15b98a4 100644 | |||
22 | +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) | 21 | +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) |
23 | SOLIBS = @SOLIBS@ | 22 | SOLIBS = @SOLIBS@ |
24 | ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ | 23 | ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ |
25 | MAINLIBS = $(YJIT_LIBS) @MAINLIBS@ | 24 | MAINLIBS = @MAINLIBS@ |
diff --git a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch b/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch deleted file mode 100644 index 2efbad7513..0000000000 --- a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Subject: [PATCH] template/Makefile.in: filter out -f*prefix-map | ||
2 | |||
3 | If we add DEBUG_PREFIX_MAP into LDFLAGS, ruby and ruby-dbg are no longer | ||
4 | reproducible. Fix this. | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Tony Battersby <tonyb@cybernetics.com> | ||
8 | --- | ||
9 | --- a/tool/mjit_archflag.sh | ||
10 | +++ b/tool/mjit_archflag.sh | ||
11 | @@ -7,6 +7,20 @@ quote() { | ||
12 | echo | ||
13 | } | ||
14 | |||
15 | +quote_filtered() { | ||
16 | + printf "#${indent}define $1" | ||
17 | + while shift && [ "$#" -gt 0 ]; do | ||
18 | + case "$1" in | ||
19 | + -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*) | ||
20 | + ;; | ||
21 | + *) | ||
22 | + printf ' "%s"'$sep "$1" | ||
23 | + ;; | ||
24 | + esac | ||
25 | + done | ||
26 | + echo | ||
27 | +} | ||
28 | + | ||
29 | archs="" | ||
30 | arch_flag="" | ||
31 | |||
32 | --- a/template/Makefile.in | ||
33 | +++ b/template/Makefile.in | ||
34 | @@ -666,7 +666,7 @@ mjit_config.h: | ||
35 | quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ | ||
36 | quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ | ||
37 | quote "MJIT_LDSHARED " ; \ | ||
38 | - quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ | ||
39 | + quote_filtered "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ | ||
40 | quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ | ||
41 | quote 'PRELOADENV "@PRELOADENV@"'; \ | ||
42 | indent=$${archs:+' '}; \ | ||
diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch index f92f0e1ba6..e2d5b57c25 100644 --- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch +++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch | |||
@@ -1,6 +1,7 @@ | |||
1 | From 5079e678ce2a81416088c04f9123cd8207d5def2 Mon Sep 17 00:00:00 2001 | ||
1 | From: Christian Hofstaedtler <zeha@debian.org> | 2 | From: Christian Hofstaedtler <zeha@debian.org> |
2 | Date: Tue, 10 Oct 2017 15:04:34 -0300 | 3 | Date: Tue, 10 Oct 2017 15:04:34 -0300 |
3 | Subject: rdoc: build reproducible documentation | 4 | Subject: [PATCH] rdoc: build reproducible documentation |
4 | 5 | ||
5 | - provide a fixed timestamp to the gzip compression | 6 | - provide a fixed timestamp to the gzip compression |
6 | 7 | ||
@@ -10,23 +11,24 @@ Signed-off-by: Antonio Terceiro <terceiro@debian.org> | |||
10 | Signed-off-by: Christian Hofstaedtler <zeha@debian.org> | 11 | Signed-off-by: Christian Hofstaedtler <zeha@debian.org> |
11 | --- | 12 | --- |
12 | lib/rdoc/generator/json_index.rb | 4 ++-- | 13 | lib/rdoc/generator/json_index.rb | 4 ++-- |
13 | lib/rdoc/rdoc.rb | 2 +- | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
15 | 15 | ||
16 | diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb | ||
17 | index c454910..24feab0 100644 | ||
16 | --- a/lib/rdoc/generator/json_index.rb | 18 | --- a/lib/rdoc/generator/json_index.rb |
17 | +++ b/lib/rdoc/generator/json_index.rb | 19 | +++ b/lib/rdoc/generator/json_index.rb |
18 | @@ -178,7 +178,7 @@ | 20 | @@ -178,7 +178,7 @@ class RDoc::Generator::JsonIndex |
19 | debug_msg "Writing gzipped search index to %s" % outfile | 21 | debug_msg "Writing gzipped search index to %s" % outfile |
20 | 22 | ||
21 | Zlib::GzipWriter.open(outfile) do |gz| | 23 | Zlib::GzipWriter.open(outfile) do |gz| |
22 | - gz.mtime = File.mtime(search_index_file) | 24 | - gz.mtime = File.mtime(search_index_file) |
23 | + gz.mtime = -1 | 25 | + gz.mtime = -1 |
24 | gz.orig_name = search_index_file.basename.to_s | 26 | gz.orig_name = search_index_file.basename.to_s |
25 | gz.write search_index | 27 | gz.write search_index |
26 | gz.close | 28 | gz.close |
27 | @@ -196,7 +196,7 @@ | 29 | @@ -196,7 +196,7 @@ class RDoc::Generator::JsonIndex |
28 | debug_msg "Writing gzipped file to %s" % outfile | 30 | debug_msg "Writing gzipped file to %s" % outfile |
29 | 31 | ||
30 | Zlib::GzipWriter.open(outfile) do |gz| | 32 | Zlib::GzipWriter.open(outfile) do |gz| |
31 | - gz.mtime = File.mtime(dest) | 33 | - gz.mtime = File.mtime(dest) |
32 | + gz.mtime = -1 | 34 | + gz.mtime = -1 |
diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch index e0aca0dcfc..b14a731cfb 100644 --- a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch +++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch | |||
@@ -1,6 +1,7 @@ | |||
1 | From 99734381652602f76075017576a819c427ebb5f2 Mon Sep 17 00:00:00 2001 | ||
1 | From: Reiner Herrmann <reiner@reiner-h.de> | 2 | From: Reiner Herrmann <reiner@reiner-h.de> |
2 | Date: Tue, 10 Oct 2017 15:06:13 -0300 | 3 | Date: Tue, 10 Oct 2017 15:06:13 -0300 |
3 | Subject: lib/mkmf.rb: sort list of object files in generated Makefile | 4 | Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile |
4 | 5 | ||
5 | Without sorting the list explicitly, its order is indeterministic, | 6 | Without sorting the list explicitly, its order is indeterministic, |
6 | because readdir() is also not deterministic. | 7 | because readdir() is also not deterministic. |
@@ -15,9 +16,11 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de> | |||
15 | lib/mkmf.rb | 2 +- | 16 | lib/mkmf.rb | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 18 | ||
19 | diff --git a/lib/mkmf.rb b/lib/mkmf.rb | ||
20 | index 6da7dde..3af30a9 100644 | ||
18 | --- a/lib/mkmf.rb | 21 | --- a/lib/mkmf.rb |
19 | +++ b/lib/mkmf.rb | 22 | +++ b/lib/mkmf.rb |
20 | @@ -2315,7 +2315,7 @@ | 23 | @@ -2368,7 +2368,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS} |
21 | LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} | 24 | LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} |
22 | ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')} | 25 | ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')} |
23 | SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')} | 26 | SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')} |
diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index 41f206523e..24268625a2 100644 --- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001 | 1 | From 3bc324379aa3e322bad9353da8c0064cd671cc74 Mon Sep 17 00:00:00 2001 |
2 | From: Lucas Kanashiro <kanashiro@debian.org> | 2 | From: Lucas Kanashiro <kanashiro@debian.org> |
3 | Date: Fri, 1 Nov 2019 15:25:17 -0300 | 3 | Date: Fri, 1 Nov 2019 15:25:17 -0300 |
4 | Subject: [PATCH] Make gemspecs reproducible | 4 | Subject: [PATCH] Make gemspecs reproducible |
@@ -12,20 +12,20 @@ Upstream-Status: Backport [debian] | |||
12 | 1 file changed, 3 insertions(+), 1 deletion(-) | 12 | 1 file changed, 3 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb | 14 | diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb |
15 | index 0d72cee..eb7bc25 100644 | 15 | index a0c7faa..f0722d9 100644 |
16 | --- a/lib/rubygems/specification.rb | 16 | --- a/lib/rubygems/specification.rb |
17 | +++ b/lib/rubygems/specification.rb | 17 | +++ b/lib/rubygems/specification.rb |
18 | @@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification | 18 | @@ -1774,7 +1774,9 @@ class Gem::Specification < Gem::BasicSpecification |
19 | raise(Gem::InvalidSpecificationException, | 19 | raise(Gem::InvalidSpecificationException, |
20 | "invalid date format in specification: #{date.inspect}") | 20 | "invalid date format in specification: #{date.inspect}") |
21 | end | 21 | end |
22 | - when Time, DateLike then | 22 | - when Time, DateLike then |
23 | + when Time then | 23 | + when Time then |
24 | + Time.utc(date.utc.year, date.utc.month, date.utc.day) | 24 | + Time.utc(date.utc.year, date.utc.month, date.utc.day) |
25 | + when DateLike then | 25 | + when DateLike then |
26 | Time.utc(date.year, date.month, date.day) | 26 | Time.utc(date.year, date.month, date.day) |
27 | else | 27 | else |
28 | TODAY | 28 | TODAY |
29 | -- | 29 | -- |
30 | 2.25.1 | 30 | 2.39.2 |
31 | 31 | ||
diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index 0a87cae17f..21604dfc34 100644 --- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3f60710bc29c1b08e128314d40101e87b7d2c9a1 Mon Sep 17 00:00:00 2001 | 1 | From 1dc7ef09c3c567c4adb09ccfd97e0e59c58edb9f Mon Sep 17 00:00:00 2001 |
2 | From: Lucas Kanashiro <kanashiro@debian.org> | 2 | From: Lucas Kanashiro <kanashiro@debian.org> |
3 | Date: Fri, 1 Nov 2019 15:25:17 -0300 | 3 | Date: Fri, 1 Nov 2019 15:25:17 -0300 |
4 | Subject: [PATCH] Make gemspecs reproducible | 4 | Subject: [PATCH] Make gemspecs reproducible |
@@ -7,7 +7,6 @@ Without an explicit date, they will get the current date and make the | |||
7 | build unreproducible | 7 | build unreproducible |
8 | 8 | ||
9 | Upstream-Status: Backport [debian] | 9 | Upstream-Status: Backport [debian] |
10 | |||
11 | --- | 10 | --- |
12 | ext/bigdecimal/bigdecimal.gemspec | 1 + | 11 | ext/bigdecimal/bigdecimal.gemspec | 1 + |
13 | ext/fiddle/fiddle.gemspec | 1 + | 12 | ext/fiddle/fiddle.gemspec | 1 + |
@@ -17,12 +16,12 @@ Upstream-Status: Backport [debian] | |||
17 | 5 files changed, 5 insertions(+) | 16 | 5 files changed, 5 insertions(+) |
18 | 17 | ||
19 | diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec | 18 | diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec |
20 | index d215757..5148d56 100644 | 19 | index f9f3b45..b9a469d 100644 |
21 | --- a/ext/bigdecimal/bigdecimal.gemspec | 20 | --- a/ext/bigdecimal/bigdecimal.gemspec |
22 | +++ b/ext/bigdecimal/bigdecimal.gemspec | 21 | +++ b/ext/bigdecimal/bigdecimal.gemspec |
23 | @@ -4,6 +4,7 @@ Gem::Specification.new do |s| | 22 | @@ -14,6 +14,7 @@ Gem::Specification.new do |s| |
24 | s.name = "bigdecimal" | 23 | s.name = name |
25 | s.version = "3.1.3" | 24 | s.version = source_version |
26 | s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"] | 25 | s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"] |
27 | + s.date = RUBY_RELEASE_DATE | 26 | + s.date = RUBY_RELEASE_DATE |
28 | s.email = ["mrkn@mrkn.jp"] | 27 | s.email = ["mrkn@mrkn.jp"] |
@@ -41,10 +40,10 @@ index 8781093..efdca32 100644 | |||
41 | spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] | 40 | spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] |
42 | 41 | ||
43 | diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec | 42 | diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec |
44 | index d26a757..cc88c55 100644 | 43 | index d4f5276..8f89611 100644 |
45 | --- a/ext/io/console/io-console.gemspec | 44 | --- a/ext/io/console/io-console.gemspec |
46 | +++ b/ext/io/console/io-console.gemspec | 45 | +++ b/ext/io/console/io-console.gemspec |
47 | @@ -4,6 +4,7 @@ _VERSION = "0.6.0" | 46 | @@ -4,6 +4,7 @@ _VERSION = "0.7.1" |
48 | Gem::Specification.new do |s| | 47 | Gem::Specification.new do |s| |
49 | s.name = "io-console" | 48 | s.name = "io-console" |
50 | s.version = _VERSION | 49 | s.version = _VERSION |
@@ -65,7 +64,7 @@ index 1f4798e..48743cf 100644 | |||
65 | spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] | 64 | spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] |
66 | 65 | ||
67 | diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec | 66 | diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec |
68 | index 3c96f7d..fec0872 100644 | 67 | index 93a281c..cc5c155 100644 |
69 | --- a/lib/rdoc/rdoc.gemspec | 68 | --- a/lib/rdoc/rdoc.gemspec |
70 | +++ b/lib/rdoc/rdoc.gemspec | 69 | +++ b/lib/rdoc/rdoc.gemspec |
71 | @@ -7,6 +7,7 @@ end | 70 | @@ -7,6 +7,7 @@ end |
diff --git a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch deleted file mode 100644 index b78e3db892..0000000000 --- a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From e74b57febec9bd806e29025e6eeb8091e7021d75 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 26 Jan 2020 11:27:40 -0800 | ||
4 | Subject: [PATCH] Filter out __has_include* compiler defines | ||
5 | |||
6 | They are internal to compiler and this header is later on includes in C | ||
7 | files, but newer gcc >= 10 complains about it. | ||
8 | |||
9 | error in initial header file: | ||
10 | | In file included from /tmp/20200124-86625-14hiju4.c:1: | ||
11 | | /tmp/20200124-86625-11y6l6i.h:13849:9: error: "__has_include" cannot be used as a macro name | ||
12 | | 13849 | #define __has_include __has_include | ||
13 | | | ^~~~~~~~~~~~~ | ||
14 | | compilation terminated due to -Wfatal-errors. | ||
15 | |||
16 | Upstream-Status: Pending | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | |||
19 | --- | ||
20 | common.mk | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/common.mk b/common.mk | ||
24 | index 664f750..3b8fbe6 100644 | ||
25 | --- a/common.mk | ||
26 | +++ b/common.mk | ||
27 | @@ -238,6 +238,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE | ||
28 | $(ECHO) building $(@F:.time=.h) | ||
29 | $(Q)$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ | ||
30 | $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new | ||
31 | + $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new | ||
32 | + $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new | ||
33 | $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new | ||
34 | |||
35 | $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time | ||
diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.3.0.bb index 481fe7c23d..657fc31b4d 100644 --- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb +++ b/meta/recipes-devtools/ruby/ruby_3.3.0.bb | |||
@@ -10,10 +10,10 @@ LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ |
11 | file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ | 11 | file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ |
12 | file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 12 | file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
13 | file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \ | 13 | file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | DEPENDS = "zlib openssl libyaml gdbm readline libffi" | 16 | DEPENDS = "zlib openssl libyaml libffi" |
17 | DEPENDS:append:class-target = " ruby-native" | 17 | DEPENDS:append:class-target = " ruby-native" |
18 | DEPENDS:append:class-nativesdk = " ruby-native" | 18 | DEPENDS:append:class-nativesdk = " ruby-native" |
19 | 19 | ||
@@ -21,16 +21,12 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
21 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ | 21 | SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ |
22 | file://0001-extmk-fix-cross-compilation-of-external-gems.patch \ | 22 | file://0001-extmk-fix-cross-compilation-of-external-gems.patch \ |
23 | file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ | 23 | file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ |
24 | file://remove_has_include_macros.patch \ | ||
25 | file://run-ptest \ | 24 | file://run-ptest \ |
26 | file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ | ||
27 | file://0002-template-Makefile.in-filter-out-f-prefix-map.patch \ | ||
28 | file://0003-rdoc-build-reproducible-documentation.patch \ | 25 | file://0003-rdoc-build-reproducible-documentation.patch \ |
29 | file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ | 26 | file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ |
30 | file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ | 27 | file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ |
31 | file://0006-Make-gemspecs-reproducible.patch \ | 28 | file://0006-Make-gemspecs-reproducible.patch \ |
32 | file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ | 29 | file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ |
33 | file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \ | ||
34 | " | 30 | " |
35 | UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" | 31 | UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" |
36 | 32 | ||
@@ -51,7 +47,7 @@ do_configure:prepend() { | |||
51 | 47 | ||
52 | DEPENDS:append:libc-musl = " libucontext" | 48 | DEPENDS:append:libc-musl = " libucontext" |
53 | 49 | ||
54 | SRC_URI[sha256sum] = "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" | 50 | SRC_URI[sha256sum] = "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d" |
55 | 51 | ||
56 | PACKAGECONFIG ??= "" | 52 | PACKAGECONFIG ??= "" |
57 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 53 | PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 95dccb9cae..1f3e692029 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts | |||
@@ -81,11 +81,18 @@ remove_rcsd_link=1 | |||
81 | if $pm_installed; then | 81 | if $pm_installed; then |
82 | case $pm in | 82 | case $pm in |
83 | "ipk") | 83 | "ipk") |
84 | eval opkg configure $append_log | 84 | if ! `fcntl-lock --wait 30 /run/opkg.lock true`; then |
85 | eval echo "Unable to obtain the opkg lock, deadlock?" $append_log | ||
86 | fi | ||
87 | if ! eval "opkg configure $append_log"; then | ||
88 | exit 1 | ||
89 | fi | ||
85 | ;; | 90 | ;; |
86 | 91 | ||
87 | "deb") | 92 | "deb") |
88 | eval dpkg --configure -a $append_log | 93 | if ! eval "eval dpkg --configure -a $append_log"; then |
94 | exit 1 | ||
95 | fi | ||
89 | ;; | 96 | ;; |
90 | esac | 97 | esac |
91 | else | 98 | else |
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb index 72ba8c0227..e3d63df852 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb +++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | |||
@@ -12,6 +12,8 @@ S = "${WORKDIR}" | |||
12 | 12 | ||
13 | inherit allarch systemd update-rc.d | 13 | inherit allarch systemd update-rc.d |
14 | 14 | ||
15 | RDEPENDS:${PN} = "util-linux-fcntl-lock" | ||
16 | |||
15 | INITSCRIPT_NAME = "run-postinsts" | 17 | INITSCRIPT_NAME = "run-postinsts" |
16 | INITSCRIPT_PARAMS = "start 99 S ." | 18 | INITSCRIPT_PARAMS = "start 99 S ." |
17 | 19 | ||
@@ -27,13 +29,13 @@ do_compile () { | |||
27 | 29 | ||
28 | do_install() { | 30 | do_install() { |
29 | install -d ${D}${sbindir} | 31 | install -d ${D}${sbindir} |
30 | install -m 0755 ${WORKDIR}/run-postinsts ${D}${sbindir}/ | 32 | install -m 0755 ${S}/run-postinsts ${D}${sbindir}/ |
31 | 33 | ||
32 | install -d ${D}${sysconfdir}/init.d/ | 34 | install -d ${D}${sysconfdir}/init.d/ |
33 | install -m 0755 ${WORKDIR}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts | 35 | install -m 0755 ${S}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts |
34 | 36 | ||
35 | install -d ${D}${systemd_system_unitdir}/ | 37 | install -d ${D}${systemd_system_unitdir}/ |
36 | install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_system_unitdir}/ | 38 | install -m 0644 ${S}/run-postinsts.service ${D}${systemd_system_unitdir}/ |
37 | 39 | ||
38 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ | 40 | sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ |
39 | -e 's:#SBINDIR#:${sbindir}:g' \ | 41 | -e 's:#SBINDIR#:${sbindir}:g' \ |
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 7bfef6d175..f59fee7cdd 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc | |||
@@ -46,7 +46,7 @@ do_install () { | |||
46 | # where the context is easier to do the env maniupations needed | 46 | # where the context is easier to do the env maniupations needed |
47 | install -d ${SYS_BINDIR} | 47 | install -d ${SYS_BINDIR} |
48 | outfile="${SYS_BINDIR}/target-rust-ccld" | 48 | outfile="${SYS_BINDIR}/target-rust-ccld" |
49 | ${CC} ${WORKDIR}/target-rust-ccld.c -o $outfile | 49 | ${CC} ${S}/target-rust-ccld.c -o $outfile |
50 | chmod +x "$outfile" | 50 | chmod +x "$outfile" |
51 | create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld-wrapper" "CC" | 51 | create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld-wrapper" "CC" |
52 | 52 | ||
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 6bef99039d..b14221b6cb 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc | |||
@@ -20,3 +20,5 @@ RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" | |||
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" | 21 | UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" |
22 | UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" | 22 | UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" |
23 | |||
24 | CVE_STATUS[CVE-2024-24576] = "not-applicable-platform: Issue only applies on Windows" | ||
diff --git a/meta/recipes-devtools/strace/strace_6.7.bb b/meta/recipes-devtools/strace/strace_6.8.bb index f365477ccd..b22c57b45d 100644 --- a/meta/recipes-devtools/strace/strace_6.7.bb +++ b/meta/recipes-devtools/strace/strace_6.8.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ | |||
15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ | 15 | file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ |
16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ | 16 | file://0002-tests-Replace-off64_t-with-off_t.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7" | 18 | SRC_URI[sha256sum] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149" |
19 | 19 | ||
20 | inherit autotools ptest | 20 | inherit autotools ptest |
21 | 21 | ||
diff --git a/meta/recipes-devtools/swig/swig.inc b/meta/recipes-devtools/swig/swig.inc deleted file mode 100644 index 7a6c4d7359..0000000000 --- a/meta/recipes-devtools/swig/swig.inc +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" | ||
2 | DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ | ||
3 | code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ | ||
4 | Mzscheme, Chicken, OCaml, Pike, and C#." | ||
5 | HOMEPAGE = "http://swig.sourceforge.net/" | ||
6 | LICENSE = "BSD-3-Clause & GPL-3.0-only" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ | ||
8 | file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" | ||
10 | |||
11 | SECTION = "devel" | ||
12 | |||
13 | DEPENDS = "libpcre2 bison-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" | ||
16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" | ||
17 | UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
19 | inherit autotools python3native pkgconfig | ||
20 | |||
21 | EXTRA_OECONF = " \ | ||
22 | --with-python3=${PYTHON} \ | ||
23 | --without-allegrocl \ | ||
24 | --without-android \ | ||
25 | --without-boost \ | ||
26 | --without-chicken \ | ||
27 | --without-clisp \ | ||
28 | --without-csharp \ | ||
29 | --without-d \ | ||
30 | --without-gcj \ | ||
31 | --without-go \ | ||
32 | --without-guile \ | ||
33 | --without-java \ | ||
34 | --without-lua \ | ||
35 | --without-mzscheme \ | ||
36 | --without-ocaml \ | ||
37 | --without-octave \ | ||
38 | --without-perl5 \ | ||
39 | --without-pike \ | ||
40 | --without-php \ | ||
41 | --without-r \ | ||
42 | --without-ruby \ | ||
43 | --without-tcl \ | ||
44 | " | ||
45 | |||
46 | EXTRA_AUTORECONF += "-I Tools/config" | ||
47 | |||
48 | BBCLASSEXTEND = "native nativesdk" | ||
49 | |||
50 | # necessary together with bison dependency until a new upstream version after | ||
51 | # 3.0.12 includes 0001-Fix-generated-code-for-constant-expressions-containi.patch | ||
52 | do_configure:append() { | ||
53 | mkdir -p ${B}/Source/CParse | ||
54 | } | ||
55 | |||
56 | do_install:append:class-nativesdk() { | ||
57 | cd ${D}${bindir} | ||
58 | ln -s swig swig2.0 | ||
59 | } | ||
60 | |||
61 | def swiglib_relpath(d): | ||
62 | swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') | ||
63 | return os.path.relpath(swiglib, d.getVar('bindir')) | ||
64 | |||
65 | do_install:append:class-native() { | ||
66 | create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} | ||
67 | } | ||
diff --git a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch deleted file mode 100644 index 5e83e92725..0000000000 --- a/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From b88a98348b3841f0b702e314631883d46f9f362d Mon Sep 17 00:00:00 2001 | ||
2 | From: "NODA, Kai" <nodakai@gmail.com> | ||
3 | Date: Sun, 22 Apr 2012 17:01:02 +0900 | ||
4 | Subject: [PATCH] Use /proc/self/exe for "swig -swiglib" on non-Win32 | ||
5 | platforms. | ||
6 | |||
7 | If it wasn't found, then fall back to a fixed string just as before. | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | http://sourceforge.net/mailarchive/message.php?msg_id=29179733 | ||
11 | --- | ||
12 | Source/Modules/main.cxx | 24 ++++++++++++++++++++++-- | ||
13 | 1 file changed, 22 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx | ||
16 | index 76b4f9d..de0a512 100644 | ||
17 | --- a/Source/Modules/main.cxx | ||
18 | +++ b/Source/Modules/main.cxx | ||
19 | @@ -25,6 +25,11 @@ | ||
20 | #include <ctype.h> | ||
21 | #include <errno.h> | ||
22 | #include <limits.h> // for INT_MAX | ||
23 | +#ifndef _WIN32 | ||
24 | +#include <cstddef> | ||
25 | +#include <unistd.h> // for readlink | ||
26 | +#include <sys/stat.h> // for stat | ||
27 | +#endif | ||
28 | |||
29 | // Global variables | ||
30 | |||
31 | @@ -895,9 +900,9 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { | ||
32 | |||
33 | // Check for SWIG_LIB environment variable | ||
34 | if ((c = getenv("SWIG_LIB")) == (char *) 0) { | ||
35 | + char *p; | ||
36 | #if defined(_WIN32) | ||
37 | char buf[MAX_PATH]; | ||
38 | - char *p; | ||
39 | if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) { | ||
40 | *(p + 1) = '\0'; | ||
41 | SwigLib = NewStringf("%sLib", buf); // Native windows installation path | ||
42 | @@ -907,7 +912,22 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) { | ||
43 | if (Len(SWIG_LIB_WIN_UNIX) > 0) | ||
44 | SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw) | ||
45 | #else | ||
46 | - SwigLib = NewString(SWIG_LIB); | ||
47 | + char buf[PATH_MAX]; | ||
48 | + if (0 < ::readlink("/proc/self/exe", buf, sizeof(buf)) && | ||
49 | + (p = ::strstr(buf, "/bin/swig"))) { | ||
50 | + int major, minor, patch; | ||
51 | + const int ret = ::sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch); | ||
52 | + if (3 == ret) { | ||
53 | + const ::ptrdiff_t dir_part_len = p - buf; | ||
54 | + ::snprintf(p, PATH_MAX - dir_part_len, "/share/swig/%d.%d.%d", major, minor, patch); | ||
55 | + struct ::stat stat_res; | ||
56 | + if (0 == ::stat(buf, &stat_res) && S_ISDIR(stat_res.st_mode)) { | ||
57 | + SwigLib = NewString(buf); | ||
58 | + } | ||
59 | + } | ||
60 | + } | ||
61 | + if (NULL == SwigLib) | ||
62 | + SwigLib = NewString(SWIG_LIB); | ||
63 | #endif | ||
64 | } else { | ||
65 | SwigLib = NewString(c); | ||
diff --git a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch deleted file mode 100644 index 9e16caecca..0000000000 --- a/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From 57a15651b46a0f1f84a4dd15d67d104fbfbe3f6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Tue, 17 Jun 2014 08:18:17 +0200 | ||
4 | Subject: [PATCH] configure: use pkg-config for pcre detection | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | --- | ||
10 | configure.ac | 39 +++++++-------------------------------- | ||
11 | 1 file changed, 7 insertions(+), 32 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index c060028..a330266 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -49,39 +49,14 @@ AC_MSG_RESULT([$with_pcre]) | ||
18 | |||
19 | dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script | ||
20 | if test x"${with_pcre}" = xyes ; then | ||
21 | - AC_MSG_CHECKING([whether to use local PCRE2]) | ||
22 | - local_pcre_config=no | ||
23 | - if test -z "$PCRE2_CONFIG"; then | ||
24 | - if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then | ||
25 | - PCRE2_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre2-config | ||
26 | - local_pcre_config=$PCRE2_CONFIG | ||
27 | - fi | ||
28 | - fi | ||
29 | - AC_MSG_RESULT([$local_pcre_config]) | ||
30 | -fi | ||
31 | -AS_IF([test "x$with_pcre" != xno], | ||
32 | - [AX_PATH_GENERIC([pcre2], | ||
33 | - [], dnl Minimal version of PCRE we need -- accept any | ||
34 | - [], dnl custom sed script for version parsing is not needed | ||
35 | - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library]) | ||
36 | - LIBS="$LIBS $PCRE2_LIBS" | ||
37 | - CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" | ||
38 | - ], | ||
39 | - [AC_MSG_FAILURE([ | ||
40 | - Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions) | ||
41 | - library package. This dependency is needed for configure to complete, | ||
42 | - Either: | ||
43 | - - Install the PCRE2 developer package on your system (preferred approach). | ||
44 | - - Download the PCRE2 source tarball, build and install on your system | ||
45 | - as you would for any package built from source distribution. | ||
46 | - - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically | ||
47 | - link against. Run 'Tools/pcre-build.sh --help' for instructions. | ||
48 | - (quite easy and does not require privileges to install PCRE2 on your system) | ||
49 | - - Use configure --without-pcre to disable regular expressions support in SWIG | ||
50 | - (not recommended).]) | ||
51 | - ], | ||
52 | - [],[],[--libs8]) | ||
53 | + PKG_CHECK_MODULES([PCRE], [libpcre2], [ | ||
54 | + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) | ||
55 | + LIBS="$LIBS $PCRE_LIBS" | ||
56 | + CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" | ||
57 | + ], [ | ||
58 | + AC_MSG_WARN([$PCRE_PKG_ERRORS]) | ||
59 | ]) | ||
60 | +fi | ||
61 | |||
62 | |||
63 | dnl CCache | ||
diff --git a/meta/recipes-devtools/swig/swig_4.2.1.bb b/meta/recipes-devtools/swig/swig_4.2.1.bb index 4b438a7298..b564be9b36 100644 --- a/meta/recipes-devtools/swig/swig_4.2.1.bb +++ b/meta/recipes-devtools/swig/swig_4.2.1.bb | |||
@@ -1,7 +1,45 @@ | |||
1 | require ${BPN}.inc | 1 | SUMMARY = "SWIG - Simplified Wrapper and Interface Generator" |
2 | DESCRIPTION = "SWIG is a compiler that makes it easy to integrate C and C++ \ | ||
3 | code with other languages including Perl, Tcl, Ruby, Python, Java, Guile, \ | ||
4 | Mzscheme, Chicken, OCaml, Pike, and C#." | ||
5 | HOMEPAGE = "http://swig.sourceforge.net/" | ||
6 | LICENSE = "BSD-3-Clause & GPL-3.0-only" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ | ||
8 | file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" | ||
2 | 10 | ||
3 | SRC_URI += "file://0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch \ | 11 | SECTION = "devel" |
4 | file://0001-configure-use-pkg-config-for-pcre-detection.patch \ | 12 | |
13 | DEPENDS = "libpcre2 bison-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | ||
5 | file://determinism.patch \ | 16 | file://determinism.patch \ |
6 | " | 17 | " |
7 | SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" | 18 | SRC_URI[sha256sum] = "fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8" |
19 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/swig/files/swig/" | ||
20 | UPSTREAM_CHECK_REGEX = "swig-(?P<pver>\d+(\.\d+)+)" | ||
21 | |||
22 | inherit cmake pkgconfig | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | ||
25 | |||
26 | do_install:append:class-nativesdk() { | ||
27 | cd ${D}${bindir} | ||
28 | ln -s swig swig2.0 | ||
29 | } | ||
30 | |||
31 | def swiglib_relpath(d): | ||
32 | swiglib = d.getVar('datadir') + "/" + d.getVar('BPN') + "/" + d.getVar('PV') | ||
33 | return os.path.relpath(swiglib, d.getVar('bindir')) | ||
34 | |||
35 | do_install:append:class-native() { | ||
36 | create_wrapper ${D}${bindir}/swig SWIG_LIB='`dirname $''realpath`'/${@swiglib_relpath(d)} | ||
37 | } | ||
38 | |||
39 | PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" | ||
40 | src_package_preprocess () { | ||
41 | # Trim build paths from comments and defines in generated sources to ensure reproducibility | ||
42 | sed -i -e "s,${WORKDIR},,g" \ | ||
43 | -e "s,YY_YY_.*_CPARSE_PARSER_H_INCLUDED,YY_YY_CPARSE_PARSER_H_INCLUDED,g" \ | ||
44 | ${B}/Source/CParse/parser.* | ||
45 | } | ||
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 59b9d7de78..214dd4b2a8 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | |||
@@ -54,9 +54,9 @@ CFLAGS:append:loongarch64 = " ${LCL_STOP_SERVICES}" | |||
54 | do_install() { | 54 | do_install() { |
55 | oe_runmake install INSTALLROOT=${D} | 55 | oe_runmake install INSTALLROOT=${D} |
56 | install -d ${D}${sysconfdir}/init.d/ | 56 | install -d ${D}${sysconfdir}/init.d/ |
57 | install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent | 57 | install -m 0755 ${UNPACKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent |
58 | install -d ${D}${systemd_system_unitdir} | 58 | install -d ${D}${systemd_system_unitdir} |
59 | install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} | 59 | install -m 0644 ${UNPACKDIR}/tcf-agent.service ${D}${systemd_system_unitdir} |
60 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service | 60 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service |
61 | } | 61 | } |
62 | 62 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 96d0ab2ad4..bfc718cfd3 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 27e5595c065ce3af687818555a882ab5e1dfbc2b Mon Sep 17 00:00:00 2001 | 1 | From 3130dca60636dc12d0d12df75b002fd123349e21 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Tue, 22 Nov 2022 18:48:27 +0800 | 3 | Date: Tue, 22 Nov 2022 18:48:27 +0800 |
4 | Subject: [PATCH] tcl: update the header location | 4 | Subject: [PATCH] tcl: update the header location |
@@ -19,7 +19,6 @@ to detect tcl doesn't find the header. | |||
19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 19 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 20 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
21 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 21 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
22 | |||
23 | --- | 22 | --- |
24 | unix/Makefile.in | 2 +- | 23 | unix/Makefile.in | 2 +- |
25 | unix/configure.in | 4 ++-- | 24 | unix/configure.in | 4 ++-- |
@@ -27,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
27 | 3 files changed, 4 insertions(+), 4 deletions(-) | 26 | 3 files changed, 4 insertions(+), 4 deletions(-) |
28 | 27 | ||
29 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 28 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
30 | index 0b8179f..4824b28 100644 | 29 | index a3b7d69..969ddb8 100644 |
31 | --- a/unix/Makefile.in | 30 | --- a/unix/Makefile.in |
32 | +++ b/unix/Makefile.in | 31 | +++ b/unix/Makefile.in |
33 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) | 32 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) |
@@ -40,10 +39,10 @@ index 0b8179f..4824b28 100644 | |||
40 | # Path to the private tcl header dir: | 39 | # Path to the private tcl header dir: |
41 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | 40 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
42 | diff --git a/unix/configure.in b/unix/configure.in | 41 | diff --git a/unix/configure.in b/unix/configure.in |
43 | index 0354a0b..2d0c00f 100644 | 42 | index 4974fb6..a72934f 100644 |
44 | --- a/unix/configure.in | 43 | --- a/unix/configure.in |
45 | +++ b/unix/configure.in | 44 | +++ b/unix/configure.in |
46 | @@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | 45 | @@ -776,7 +776,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
47 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 46 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
48 | 47 | ||
49 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 48 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
@@ -52,7 +51,7 @@ index 0354a0b..2d0c00f 100644 | |||
52 | HTML_DIR='$(DISTDIR)/html' | 51 | HTML_DIR='$(DISTDIR)/html' |
53 | 52 | ||
54 | # Note: in the following variable, it's important to use the absolute | 53 | # Note: in the following variable, it's important to use the absolute |
55 | @@ -895,7 +895,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" | 54 | @@ -897,7 +897,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" |
56 | TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" | 55 | TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" |
57 | 56 | ||
58 | # Install time header dir can be set via --includedir | 57 | # Install time header dir can be set via --includedir |
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch deleted file mode 100644 index 2c31cec8e3..0000000000 --- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Fixes tcl target recipe build on old distros which have glibc older than 2.14 | ||
4 | |||
5 | | + echo 'NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install' | ||
6 | | NOTE: make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install | ||
7 | | + make DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image install | ||
8 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib | ||
9 | | Installing message catalogs | ||
10 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man | ||
11 | | tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so) | ||
12 | | Making directory /srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin | ||
13 | | make: *** [install-msgs] Error 1 | ||
14 | |||
15 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
16 | 2012/04/26 | ||
17 | |||
18 | Index: unix/Makefile.in | ||
19 | =================================================================== | ||
20 | --- a/unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800 | ||
21 | +++ b/unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800 | ||
22 | @@ -686,7 +686,7 @@ | ||
23 | # tcltest executable gets the build directory burned into its ld search path. | ||
24 | # This keeps tcltest from picking up an already installed version of the Tcl | ||
25 | # library. | ||
26 | -SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \ | ||
27 | +SHELL_ENV = @LD_LIBRARY_PATH_VAR@=${@LD_LIBRARY_PATH_VAR@} \ | ||
28 | TCLLIBPATH="@abs_builddir@/pkgs" \ | ||
29 | TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}" | ||
30 | |||
31 | @@ -712,7 +712,7 @@ | ||
32 | $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | ||
33 | |||
34 | gdb-test: ${TCLTEST_EXE} | ||
35 | - @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
36 | + @echo "set env @LD_LIBRARY_PATH_VAR@=$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | ||
37 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | ||
38 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | ||
39 | $(GDB) ${TCLTEST_EXE} --command=gdb.run | ||
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index 6dbef7077f..09c49daa2c 100644 --- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch | |||
@@ -1,19 +1,18 @@ | |||
1 | From 8a6c77cdd265fe7ce35929f58f1ade0c6bc4025b Mon Sep 17 00:00:00 2001 | 1 | From 371aa300369e9ea3234cba22d5c0babc7d40dfdf Mon Sep 17 00:00:00 2001 |
2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> | 2 | From: Nitin A Kamble <nitin.a.kamble@intel.com> |
3 | Date: Fri, 13 Aug 2010 12:24:00 -0700 | 3 | Date: Fri, 13 Aug 2010 12:24:00 -0700 |
4 | Subject: [PATCH] tcl: fix a build issue | 4 | Subject: [PATCH] tcl: fix a build issue |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [upstream does not support installed tests] | 6 | Upstream-Status: Inappropriate [upstream does not support installed tests] |
7 | |||
8 | --- | 7 | --- |
9 | unix/Makefile.in | 20 ++++++++++---------- | 8 | unix/Makefile.in | 20 ++++++++++---------- |
10 | 1 file changed, 10 insertions(+), 10 deletions(-) | 9 | 1 file changed, 10 insertions(+), 10 deletions(-) |
11 | 10 | ||
12 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 11 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
13 | index b110fe9..d7b35a8 100644 | 12 | index 9dd053d..a3b7d69 100644 |
14 | --- a/unix/Makefile.in | 13 | --- a/unix/Makefile.in |
15 | +++ b/unix/Makefile.in | 14 | +++ b/unix/Makefile.in |
16 | @@ -814,23 +814,23 @@ tcltest-real: | 15 | @@ -815,7 +815,7 @@ tcltest-real: |
17 | test: test-tcl test-packages | 16 | test: test-tcl test-packages |
18 | 17 | ||
19 | test-tcl: ${TCLTEST_EXE} | 18 | test-tcl: ${TCLTEST_EXE} |
@@ -21,9 +20,11 @@ index b110fe9..d7b35a8 100644 | |||
21 | + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | 20 | + $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) |
22 | 21 | ||
23 | gdb-test: ${TCLTEST_EXE} | 22 | gdb-test: ${TCLTEST_EXE} |
24 | @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run | 23 | @printf '%s ' set env @LD_LIBRARY_PATH_VAR@=\"`pwd`$${@LD_LIBRARY_PATH_VAR@:+:$${@LD_LIBRARY_PATH_VAR}}\" > gdb.run |
25 | @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run | 24 | @@ -824,17 +824,17 @@ gdb-test: ${TCLTEST_EXE} |
26 | @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run | 25 | @printf '\n' >>gdb.run |
26 | @printf '%s ' set args $(call shquotequote,$(TOP_DIR))/tests/all.tcl\ | ||
27 | $(call shquotequote,$(TESTFLAGS)) -singleproc 1 >> gdb.run | ||
27 | - $(GDB) ./${TCLTEST_EXE} --command=gdb.run | 28 | - $(GDB) ./${TCLTEST_EXE} --command=gdb.run |
28 | + $(GDB) ${TCLTEST_EXE} --command=gdb.run | 29 | + $(GDB) ${TCLTEST_EXE} --command=gdb.run |
29 | rm gdb.run | 30 | rm gdb.run |
@@ -41,7 +42,7 @@ index b110fe9..d7b35a8 100644 | |||
41 | 42 | ||
42 | # The following target generates the shared libraries in dltest/ that are used | 43 | # The following target generates the shared libraries in dltest/ that are used |
43 | # for testing; they are included as part of the "tcltest" target (via the | 44 | # for testing; they are included as part of the "tcltest" target (via the |
44 | @@ -848,28 +848,28 @@ dltest.marker: ${STUB_LIB_FILE} | 45 | @@ -852,28 +852,28 @@ dltest.marker: ${STUB_LIB_FILE} |
45 | # This target can be used to run tclsh from the build directory | 46 | # This target can be used to run tclsh from the build directory |
46 | # via `make shell SCRIPT=/tmp/foo.tcl` | 47 | # via `make shell SCRIPT=/tmp/foo.tcl` |
47 | shell: ${TCL_EXE} | 48 | shell: ${TCL_EXE} |
diff --git a/meta/recipes-devtools/tcltk/tcl/interp.patch b/meta/recipes-devtools/tcltk/tcl/interp.patch index 95d6318f64..2e0dc94cff 100644 --- a/meta/recipes-devtools/tcltk/tcl/interp.patch +++ b/meta/recipes-devtools/tcltk/tcl/interp.patch | |||
@@ -1,11 +1,19 @@ | |||
1 | From 426aa2ff62dda77fd011e8f630b9d4ea17984817 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Mon, 12 Jul 2021 14:50:13 +0100 | ||
4 | Subject: [PATCH] tcl: fix race in interp.test | ||
5 | |||
1 | The interp-36.7 patch has race conditions and is missing cleanup. This patch by | 6 | The interp-36.7 patch has race conditions and is missing cleanup. This patch by |
2 | a Tcl maintainer should improve matters. | 7 | a Tcl maintainer should improve matters. |
3 | 8 | ||
4 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
11 | --- | ||
12 | tests/interp.test | 7 ++++--- | ||
13 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
6 | 14 | ||
7 | diff --git a/tests/interp.test b/tests/interp.test | 15 | diff --git a/tests/interp.test b/tests/interp.test |
8 | index d7424847f..fc90990f3 100644 | 16 | index d742484..fc90990 100644 |
9 | --- a/tests/interp.test | 17 | --- a/tests/interp.test |
10 | +++ b/tests/interp.test | 18 | +++ b/tests/interp.test |
11 | @@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { | 19 | @@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { |
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index 3123d289a1..a0195e263c 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From d6155ec08b355d64f1a7db407254d159037bb72a Mon Sep 17 00:00:00 2001 | 1 | From b89fd73daf9b3eb2f889f65baba5f90d8a930c82 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <rpurdie@linux.intel.com> | 2 | From: Richard Purdie <rpurdie@linux.intel.com> |
3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 | 3 | Date: Wed, 9 Dec 2009 23:59:44 +0000 |
4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function | 4 | Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | |||
8 | --- | 7 | --- |
9 | unix/Makefile.in | 5 ++++- | 8 | unix/Makefile.in | 5 ++++- |
10 | unix/tcl.m4 | 3 +++ | 9 | unix/tcl.m4 | 3 +++ |
11 | 2 files changed, 7 insertions(+), 1 deletion(-) | 10 | 2 files changed, 7 insertions(+), 1 deletion(-) |
12 | 11 | ||
13 | diff --git a/unix/Makefile.in b/unix/Makefile.in | 12 | diff --git a/unix/Makefile.in b/unix/Makefile.in |
14 | index 398afd0..804532e 100644 | 13 | index 7619afc..9dd053d 100644 |
15 | --- a/unix/Makefile.in | 14 | --- a/unix/Makefile.in |
16 | +++ b/unix/Makefile.in | 15 | +++ b/unix/Makefile.in |
17 | @@ -893,7 +893,10 @@ install-binaries: binaries | 16 | @@ -904,7 +904,10 @@ install-binaries: binaries |
18 | done | 17 | done |
19 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" | 18 | @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" |
20 | @@INSTALL_LIB@ | 19 | @@INSTALL_LIB@ |
@@ -27,10 +26,10 @@ index 398afd0..804532e 100644 | |||
27 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" | 26 | @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" |
28 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" | 27 | @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" |
29 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 | 28 | diff --git a/unix/tcl.m4 b/unix/tcl.m4 |
30 | index f3d08ec..797c93f 100644 | 29 | index 0307a06..37c4d67 100644 |
31 | --- a/unix/tcl.m4 | 30 | --- a/unix/tcl.m4 |
32 | +++ b/unix/tcl.m4 | 31 | +++ b/unix/tcl.m4 |
33 | @@ -1382,6 +1382,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ | 32 | @@ -1378,6 +1378,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ |
34 | # get rid of the warnings. | 33 | # get rid of the warnings. |
35 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" | 34 | #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
36 | 35 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch index 99c5faf02c..93e7877256 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001 | 1 | From 050fc597fbfa4da2c31bd0df58c871892a490470 Mon Sep 17 00:00:00 2001 |
2 | From: "Song.Li" <Song.Li@windriver.com> | 2 | From: "Song.Li" <Song.Li@windriver.com> |
3 | Date: Wed, 1 Aug 2012 19:05:51 +0800 | 3 | Date: Wed, 1 Aug 2012 19:05:51 +0800 |
4 | Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target | 4 | Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target |
@@ -13,15 +13,14 @@ Signed-off-by: Song.Li <Song.Li@windriver.com> | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
15 | --- | 15 | --- |
16 | configure | 2 +- | 16 | unix/configure.in | 2 +- |
17 | configure.in | 2 +- | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
19 | 18 | ||
20 | Index: unix/configure.in | 19 | diff --git a/unix/configure.in b/unix/configure.in |
21 | =================================================================== | 20 | index 4f62510..4974fb6 100644 |
22 | --- a/unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800 | 21 | --- a/unix/configure.in |
23 | +++ b/unix/configure.in 2013-11-10 23:39:41.199428131 -0800 | 22 | +++ b/unix/configure.in |
24 | @@ -790,7 +790,7 @@ | 23 | @@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
25 | 24 | ||
26 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 25 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
27 | 26 | ||
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb b/meta/recipes-devtools/tcltk/tcl_8.6.14.bb index bb75353a5a..de4f5b878f 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.13.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.14.bb | |||
@@ -19,13 +19,12 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ | |||
19 | file://tcl-add-soname.patch" | 19 | file://tcl-add-soname.patch" |
20 | SRC_URI = "${BASE_SRC_URI} \ | 20 | SRC_URI = "${BASE_SRC_URI} \ |
21 | file://fix_non_native_build_issue.patch \ | 21 | file://fix_non_native_build_issue.patch \ |
22 | file://fix_issue_with_old_distro_glibc.patch \ | ||
23 | file://tcl-remove-hardcoded-install-path.patch \ | 22 | file://tcl-remove-hardcoded-install-path.patch \ |
24 | file://alter-includedir.patch \ | 23 | file://alter-includedir.patch \ |
25 | file://interp.patch \ | 24 | file://interp.patch \ |
26 | file://run-ptest \ | 25 | file://run-ptest \ |
27 | " | 26 | " |
28 | SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" | 27 | SRC_URI[sha256sum] = "ff604f43862a778827d7ecd1ad7686950ac2ef48d9cf69d3424cea9de08d9a72" |
29 | 28 | ||
30 | SRC_URI:class-native = "${BASE_SRC_URI}" | 29 | SRC_URI:class-native = "${BASE_SRC_URI}" |
31 | 30 | ||
@@ -88,7 +87,7 @@ do_install_ptest() { | |||
88 | 87 | ||
89 | do_install_ptest:append:libc-musl () { | 88 | do_install_ptest:append:libc-musl () { |
90 | # Assumes locales other than provided by musl-locales | 89 | # Assumes locales other than provided by musl-locales |
91 | sed -i -e "s|SKIPPED_TESTS='|SKIPPED_TESTS='unixInit-3* |" ${D}${PTEST_PATH}/run-ptest | 90 | sed -i '/SKIP="$SKIP socket.*$/a # unixInit-3* is suppressed due to hardcoded locale assumptions\nSKIP="$SKIP unixInit-3\\\*"' ${D}${PTEST_PATH}/run-ptest |
92 | } | 91 | } |
93 | 92 | ||
94 | # Fix some paths that might be used by Tcl extensions | 93 | # Fix some paths that might be used by Tcl extensions |
diff --git a/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch b/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch deleted file mode 100644 index 161474086e..0000000000 --- a/meta/recipes-devtools/vala/vala/0001-gtk4-Preserve-compatibility-with-4.14.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 17349020fb95454d06f827fd555b05248f10a370 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rico Tzschichholz <ricotz@ubuntu.com> | ||
3 | Date: Thu, 7 Mar 2024 17:56:05 +0100 | ||
4 | Subject: [PATCH] gtk4: Preserve compatibility with < 4.14 | ||
5 | |||
6 | Don't prefer new accessor methods for Calendar.day/month/year | ||
7 | |||
8 | Fixes https://gitlab.gnome.org/GNOME/vala/issues/1531 | ||
9 | |||
10 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/vala/-/commit/e0c4ea8c4a0bbf859b5341a7465b395892789d9e] | ||
11 | |||
12 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
13 | --- | ||
14 | vapi/gtk4.vapi | 3 +++ | ||
15 | vapi/metadata/Gtk-4.0.metadata | 5 +++++ | ||
16 | 2 files changed, 8 insertions(+) | ||
17 | |||
18 | diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi | ||
19 | index 49f8b2078..51ecea27d 100644 | ||
20 | --- a/vapi/gtk4.vapi | ||
21 | +++ b/vapi/gtk4.vapi | ||
22 | @@ -7350,11 +7350,14 @@ namespace Gtk { | ||
23 | [Version (since = "4.14")] | ||
24 | public void set_year (int year); | ||
25 | public void unmark_day (uint day); | ||
26 | + [NoAccessorMethod] | ||
27 | public int day { get; set; } | ||
28 | + [NoAccessorMethod] | ||
29 | public int month { get; set; } | ||
30 | public bool show_day_names { get; set; } | ||
31 | public bool show_heading { get; set; } | ||
32 | public bool show_week_numbers { get; set; } | ||
33 | + [NoAccessorMethod] | ||
34 | public int year { get; set; } | ||
35 | public signal void day_selected (); | ||
36 | public signal void next_month (); | ||
37 | -- | ||
38 | 2.44.0 | ||
39 | |||
diff --git a/meta/recipes-devtools/vala/vala_0.56.15.bb b/meta/recipes-devtools/vala/vala_0.56.17.bb index 915ddd8e4d..acd6c43096 100644 --- a/meta/recipes-devtools/vala/vala_0.56.15.bb +++ b/meta/recipes-devtools/vala/vala_0.56.17.bb | |||
@@ -18,11 +18,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
18 | 18 | ||
19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 19 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
20 | 20 | ||
21 | SRC_URI = " \ | 21 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" |
22 | http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz \ | 22 | SRC_URI[sha256sum] = "26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a" |
23 | file://0001-gtk4-Preserve-compatibility-with-4.14.patch \ | ||
24 | " | ||
25 | SRC_URI[sha256sum] = "535b6452ed310fd5fb5c7dd6794b6213dac3b48e645e5bff3173741ec2cb3f2b" | ||
26 | 23 | ||
27 | inherit autotools pkgconfig upstream-version-is-even | 24 | inherit autotools pkgconfig upstream-version-is-even |
28 | 25 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch new file mode 100644 index 0000000000..80a8e3a10b --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-monitor.py-regular-expressions-should-use-r.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 027b649fdb831868e71be01cafdacc49a5f419ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Fri, 17 Nov 2023 14:01:21 +0100 | ||
4 | Subject: [PATCH 1/4] valgrind-monitor.py regular expressions should use raw | ||
5 | strings | ||
6 | |||
7 | With python 3.12 gdb will produce the following SyntaxWarning when | ||
8 | loading valgrind-monitor-def.py: | ||
9 | |||
10 | /usr/share/gdb/auto-load/valgrind-monitor-def.py:214: | ||
11 | SyntaxWarning: invalid escape sequence '\[' | ||
12 | if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
13 | |||
14 | In a future python version this will become an SyntaxError. | ||
15 | |||
16 | Use a raw strings for the regular expression. | ||
17 | |||
18 | https://bugs.kde.org/show_bug.cgi?id=476708 | ||
19 | (cherry picked from commit 0fbfbe05028ad18efda786a256a2738d2c231ed4) | ||
20 | |||
21 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=027b649fdb831868e71be01cafdacc49a5f419ab] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | NEWS | 13 +++++++++++++ | ||
25 | coregrind/m_gdbserver/valgrind-monitor-def.py | 2 +- | ||
26 | 2 files changed, 14 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/NEWS b/NEWS | ||
29 | index f11da4be8..ee5b4ff11 100644 | ||
30 | --- a/NEWS | ||
31 | +++ b/NEWS | ||
32 | @@ -1,3 +1,16 @@ | ||
33 | +Branch 3.22 | ||
34 | +~~~~~~~~~~~ | ||
35 | + | ||
36 | +* ==================== FIXED BUGS ==================== | ||
37 | + | ||
38 | +The following bugs have been fixed or resolved on this branch. | ||
39 | + | ||
40 | +476708 valgrind-monitor.py regular expressions should use raw strings | ||
41 | + | ||
42 | +To see details of a given bug, visit | ||
43 | + https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | +where XXXXXX is the bug number as listed above. | ||
45 | + | ||
46 | Release 3.22.0 (31 Oct 2023) | ||
47 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
48 | |||
49 | diff --git a/coregrind/m_gdbserver/valgrind-monitor-def.py b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
50 | index b4e7b992d..d74b1590c 100644 | ||
51 | --- a/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
52 | +++ b/coregrind/m_gdbserver/valgrind-monitor-def.py | ||
53 | @@ -211,7 +211,7 @@ class Valgrind_ADDR_LEN_opt(Valgrind_Command): | ||
54 | For compatibility reason with the Valgrind gdbserver monitor command, | ||
55 | we detect and accept usages such as 0x1234ABCD[10].""" | ||
56 | def invoke(self, arg_str : str, from_tty : bool) -> None: | ||
57 | - if re.fullmatch("^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
58 | + if re.fullmatch(r"^0x[0123456789ABCDEFabcdef]+\[[^\[\]]+\]$", arg_str): | ||
59 | arg_str = arg_str.replace("[", " ") | ||
60 | arg_str = arg_str.replace("]", " ") | ||
61 | eval_execute_2(self, arg_str, | ||
62 | -- | ||
63 | 2.44.0 | ||
64 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch b/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch new file mode 100644 index 0000000000..5759fa039a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch | |||
@@ -0,0 +1,147 @@ | |||
1 | From 1d00e5ce0fb069911c4b525ec38289fb5d9021b0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sat, 18 Nov 2023 08:49:34 +0100 | ||
4 | Subject: [PATCH 2/4] Bug 476548 - valgrind 3.22.0 fails on assertion when | ||
5 | loading debuginfo file produced by mold | ||
6 | |||
7 | (cherry picked from commit 9ea4ae66707a4dcc6f4328e11911652e4418c585) | ||
8 | |||
9 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=1d00e5ce0fb069911c4b525ec38289fb5d9021b0] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | NEWS | 2 ++ | ||
13 | coregrind/m_debuginfo/image.c | 14 +++++++++ | ||
14 | coregrind/m_debuginfo/priv_image.h | 4 +++ | ||
15 | coregrind/m_debuginfo/readelf.c | 49 ++++++++++++++++++++++++++++-- | ||
16 | 4 files changed, 66 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/NEWS b/NEWS | ||
19 | index ee5b4ff11..6cd13429a 100644 | ||
20 | --- a/NEWS | ||
21 | +++ b/NEWS | ||
22 | @@ -5,6 +5,8 @@ Branch 3.22 | ||
23 | |||
24 | The following bugs have been fixed or resolved on this branch. | ||
25 | |||
26 | +476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
27 | + file produced by mold | ||
28 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
29 | |||
30 | To see details of a given bug, visit | ||
31 | diff --git a/coregrind/m_debuginfo/image.c b/coregrind/m_debuginfo/image.c | ||
32 | index 02e509071..445f95555 100644 | ||
33 | --- a/coregrind/m_debuginfo/image.c | ||
34 | +++ b/coregrind/m_debuginfo/image.c | ||
35 | @@ -1221,6 +1221,20 @@ Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2) | ||
36 | } | ||
37 | } | ||
38 | |||
39 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n) | ||
40 | +{ | ||
41 | + ensure_valid(img, off1, 1, "ML_(img_strcmp_c)"); | ||
42 | + while (n) { | ||
43 | + UChar c1 = get(img, off1); | ||
44 | + UChar c2 = *(const UChar*)str2; | ||
45 | + if (c1 < c2) return -1; | ||
46 | + if (c1 > c2) return 1; | ||
47 | + if (c1 == 0) return 0; | ||
48 | + off1++; str2++; --n; | ||
49 | + } | ||
50 | + return 0; | ||
51 | +} | ||
52 | + | ||
53 | UChar ML_(img_get_UChar)(DiImage* img, DiOffT offset) | ||
54 | { | ||
55 | ensure_valid(img, offset, 1, "ML_(img_get_UChar)"); | ||
56 | diff --git a/coregrind/m_debuginfo/priv_image.h b/coregrind/m_debuginfo/priv_image.h | ||
57 | index a49846f14..c91e49f01 100644 | ||
58 | --- a/coregrind/m_debuginfo/priv_image.h | ||
59 | +++ b/coregrind/m_debuginfo/priv_image.h | ||
60 | @@ -115,6 +115,10 @@ Int ML_(img_strcmp)(DiImage* img, DiOffT off1, DiOffT off2); | ||
61 | cast to HChar before comparison. */ | ||
62 | Int ML_(img_strcmp_c)(DiImage* img, DiOffT off1, const HChar* str2); | ||
63 | |||
64 | +/* Do strncmp of a C string in the image vs a normal one. Chars are | ||
65 | + cast to HChar before comparison. */ | ||
66 | +Int ML_(img_strcmp_n)(DiImage* img, DiOffT off1, const HChar* str2, Word n); | ||
67 | + | ||
68 | /* Do strlen of a C string in the image. */ | ||
69 | SizeT ML_(img_strlen)(DiImage* img, DiOffT off); | ||
70 | |||
71 | diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c | ||
72 | index fb64ed976..46f8c8343 100644 | ||
73 | --- a/coregrind/m_debuginfo/readelf.c | ||
74 | +++ b/coregrind/m_debuginfo/readelf.c | ||
75 | @@ -2501,8 +2501,7 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
76 | di->rodata_avma += inrw1->bias; | ||
77 | di->rodata_bias = inrw1->bias; | ||
78 | di->rodata_debug_bias = inrw1->bias; | ||
79 | - } | ||
80 | - else { | ||
81 | + } else { | ||
82 | BAD(".rodata"); /* should not happen? */ | ||
83 | } | ||
84 | di->rodata_present = True; | ||
85 | @@ -2977,6 +2976,46 @@ Bool ML_(read_elf_object) ( struct _DebugInfo* di ) | ||
86 | return retval; | ||
87 | } | ||
88 | |||
89 | +static void find_rodata(Word i, Word shnum, DiImage* dimg, struct _DebugInfo* di, DiOffT shdr_dioff, | ||
90 | + UWord shdr_dent_szB, DiOffT shdr_strtab_dioff, PtrdiffT rw_dbias) | ||
91 | +{ | ||
92 | + ElfXX_Shdr a_shdr; | ||
93 | + ElfXX_Shdr a_extra_shdr; | ||
94 | + ML_(img_get)(&a_shdr, dimg, | ||
95 | + INDEX_BIS(shdr_dioff, i, shdr_dent_szB), | ||
96 | + sizeof(a_shdr)); | ||
97 | + if (di->rodata_present && | ||
98 | + 0 == ML_(img_strcmp_c)(dimg, shdr_strtab_dioff | ||
99 | + + a_shdr.sh_name, ".rodata")) { | ||
100 | + Word sh_size = a_shdr.sh_size; | ||
101 | + Word j; | ||
102 | + Word next_addr = a_shdr.sh_addr + a_shdr.sh_size; | ||
103 | + for (j = i + 1; j < shnum; ++j) { | ||
104 | + ML_(img_get)(&a_extra_shdr, dimg, | ||
105 | + INDEX_BIS(shdr_dioff, j, shdr_dent_szB), | ||
106 | + sizeof(a_shdr)); | ||
107 | + if (0 == ML_(img_strcmp_n)(dimg, shdr_strtab_dioff | ||
108 | + + a_extra_shdr.sh_name, ".rodata", 7)) { | ||
109 | + if (a_extra_shdr.sh_addr == | ||
110 | + VG_ROUNDUP(next_addr, a_extra_shdr.sh_addralign)) { | ||
111 | + sh_size = VG_ROUNDUP(sh_size, a_extra_shdr.sh_addralign) + a_extra_shdr.sh_size; | ||
112 | + } | ||
113 | + next_addr = a_extra_shdr.sh_addr + a_extra_shdr.sh_size; | ||
114 | + } else { | ||
115 | + break; | ||
116 | + } | ||
117 | + } | ||
118 | + vg_assert(di->rodata_size == sh_size); | ||
119 | + vg_assert(di->rodata_avma + a_shdr.sh_addr + rw_dbias); | ||
120 | + di->rodata_debug_svma = a_shdr.sh_addr; | ||
121 | + di->rodata_debug_bias = di->rodata_bias + | ||
122 | + di->rodata_svma - di->rodata_debug_svma; | ||
123 | + TRACE_SYMTAB("acquiring .rodata debug svma = %#lx .. %#lx\n", | ||
124 | + di->rodata_debug_svma, | ||
125 | + di->rodata_debug_svma + di->rodata_size - 1); | ||
126 | + TRACE_SYMTAB("acquiring .rodata debug bias = %#lx\n", (UWord)di->rodata_debug_bias); | ||
127 | + } | ||
128 | +} | ||
129 | Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
130 | { | ||
131 | Word i, j; | ||
132 | @@ -3391,7 +3430,11 @@ Bool ML_(read_elf_debug) ( struct _DebugInfo* di ) | ||
133 | FIND(text, rx) | ||
134 | FIND(data, rw) | ||
135 | FIND(sdata, rw) | ||
136 | - FIND(rodata, rw) | ||
137 | + // https://bugs.kde.org/show_bug.cgi?id=476548 | ||
138 | + // special handling for rodata as adjacent | ||
139 | + // rodata sections may have been merged in ML_(read_elf_object) | ||
140 | + //FIND(rodata, rw) | ||
141 | + find_rodata(i, ehdr_dimg.e_shnum, dimg, di, shdr_dioff, shdr_dent_szB, shdr_strtab_dioff, rw_dbias); | ||
142 | FIND(bss, rw) | ||
143 | FIND(sbss, rw) | ||
144 | |||
145 | -- | ||
146 | 2.44.0 | ||
147 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch new file mode 100644 index 0000000000..2a09ca52b7 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0003-Add-fchmodat2-syscall-on-linux.patch | |||
@@ -0,0 +1,221 @@ | |||
1 | From a43e62dddcf51ec6578a90c5988a41e856b44b05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Wielaard <mark@klomp.org> | ||
3 | Date: Sat, 18 Nov 2023 21:17:02 +0100 | ||
4 | Subject: [PATCH 3/4] Add fchmodat2 syscall on linux | ||
5 | |||
6 | fchmodat2 is a new syscall on linux 6.6. It is a variant of fchmodat | ||
7 | that takes an extra flags argument. | ||
8 | |||
9 | https://bugs.kde.org/show_bug.cgi?id=477198 | ||
10 | |||
11 | (cherry picked from commit 372d09fd9a8d76847c81092ebff71c80fd6c145d) | ||
12 | |||
13 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=a43e62dddcf51ec6578a90c5988a41e856b44b05] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | NEWS | 1 + | ||
17 | coregrind/m_syswrap/priv_syswrap-linux.h | 3 +++ | ||
18 | coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ | ||
19 | coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ | ||
20 | coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ | ||
21 | coregrind/m_syswrap/syswrap-linux.c | 11 +++++++++++ | ||
22 | coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ | ||
23 | coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + | ||
24 | coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + | ||
25 | coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ | ||
26 | coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ | ||
27 | coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ | ||
28 | coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ | ||
29 | include/vki/vki-scnums-shared-linux.h | 2 ++ | ||
30 | 14 files changed, 35 insertions(+) | ||
31 | |||
32 | diff --git a/NEWS b/NEWS | ||
33 | index 6cd13429a..da0f8c1aa 100644 | ||
34 | --- a/NEWS | ||
35 | +++ b/NEWS | ||
36 | @@ -8,6 +8,7 @@ The following bugs have been fixed or resolved on this branch. | ||
37 | 476548 valgrind 3.22.0 fails on assertion when loading debuginfo | ||
38 | file produced by mold | ||
39 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
40 | +477198 Add fchmodat2 syscall on linux | ||
41 | |||
42 | To see details of a given bug, visit | ||
43 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
44 | diff --git a/coregrind/m_syswrap/priv_syswrap-linux.h b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
45 | index 7c9decf5a..798c456c9 100644 | ||
46 | --- a/coregrind/m_syswrap/priv_syswrap-linux.h | ||
47 | +++ b/coregrind/m_syswrap/priv_syswrap-linux.h | ||
48 | @@ -331,6 +331,9 @@ DECL_TEMPLATE(linux, sys_openat2); | ||
49 | // Linux-specific (new in Linux 5.14) | ||
50 | DECL_TEMPLATE(linux, sys_memfd_secret); | ||
51 | |||
52 | +// Since Linux 6.6 | ||
53 | +DECL_TEMPLATE(linux, sys_fchmodat2); | ||
54 | + | ||
55 | /* --------------------------------------------------------------------- | ||
56 | Wrappers for sockets and ipc-ery. These are split into standalone | ||
57 | procedures because x86-linux hides them inside multiplexors | ||
58 | diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
59 | index 008600798..fe17d118b 100644 | ||
60 | --- a/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
61 | +++ b/coregrind/m_syswrap/syswrap-amd64-linux.c | ||
62 | @@ -886,6 +886,8 @@ static SyscallTableEntry syscall_table[] = { | ||
63 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
64 | |||
65 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
66 | + | ||
67 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
68 | }; | ||
69 | |||
70 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
71 | diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
72 | index 9a7a1e0d2..811931d3b 100644 | ||
73 | --- a/coregrind/m_syswrap/syswrap-arm-linux.c | ||
74 | +++ b/coregrind/m_syswrap/syswrap-arm-linux.c | ||
75 | @@ -1059,6 +1059,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
76 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
77 | |||
78 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
79 | + | ||
80 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
81 | }; | ||
82 | |||
83 | |||
84 | diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
85 | index 6af7bab83..3307bc2ca 100644 | ||
86 | --- a/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
87 | +++ b/coregrind/m_syswrap/syswrap-arm64-linux.c | ||
88 | @@ -840,6 +840,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
89 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
90 | |||
91 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
92 | + | ||
93 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
94 | }; | ||
95 | |||
96 | |||
97 | diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c | ||
98 | index d571fc327..efa47f2e6 100644 | ||
99 | --- a/coregrind/m_syswrap/syswrap-linux.c | ||
100 | +++ b/coregrind/m_syswrap/syswrap-linux.c | ||
101 | @@ -6059,6 +6059,17 @@ PRE(sys_fchmodat) | ||
102 | PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 ); | ||
103 | } | ||
104 | |||
105 | +PRE(sys_fchmodat2) | ||
106 | +{ | ||
107 | + PRINT("sys_fchmodat2 ( %ld, %#" FMT_REGWORD "x(%s), %" FMT_REGWORD "u, %" | ||
108 | + FMT_REGWORD "u )", | ||
109 | + SARG1, ARG2, (HChar*)(Addr)ARG2, ARG3, ARG4); | ||
110 | + PRE_REG_READ4(long, "fchmodat2", | ||
111 | + int, dfd, const char *, path, vki_mode_t, mode, | ||
112 | + unsigned int, flags); | ||
113 | + PRE_MEM_RASCIIZ( "fchmodat2(pathname)", ARG2 ); | ||
114 | +} | ||
115 | + | ||
116 | PRE(sys_faccessat) | ||
117 | { | ||
118 | PRINT("sys_faccessat ( %ld, %#" FMT_REGWORD "x(%s), %ld )", | ||
119 | diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
120 | index 6268a00dd..74a1f6eac 100644 | ||
121 | --- a/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
122 | +++ b/coregrind/m_syswrap/syswrap-mips32-linux.c | ||
123 | @@ -1143,6 +1143,8 @@ static SyscallTableEntry syscall_main_table[] = { | ||
124 | LINX_ (__NR_faccessat2, sys_faccessat2), // 439 | ||
125 | |||
126 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
127 | + | ||
128 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
129 | }; | ||
130 | |||
131 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
132 | diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
133 | index 6cdf25893..4e8508b7a 100644 | ||
134 | --- a/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
135 | +++ b/coregrind/m_syswrap/syswrap-mips64-linux.c | ||
136 | @@ -820,6 +820,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
137 | LINXY (__NR_close_range, sys_close_range), | ||
138 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
139 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), | ||
140 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
141 | }; | ||
142 | |||
143 | SyscallTableEntry * ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
144 | diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
145 | index d724cde74..7859900c1 100644 | ||
146 | --- a/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
147 | +++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c | ||
148 | @@ -829,6 +829,7 @@ static SyscallTableEntry syscall_main_table[] = { | ||
149 | LINXY (__NR_close_range, sys_close_range), | ||
150 | LINX_ (__NR_faccessat2, sys_faccessat2), | ||
151 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), | ||
152 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), | ||
153 | }; | ||
154 | |||
155 | SyscallTableEntry* ML_(get_linux_syscall_entry) (UInt sysno) | ||
156 | diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
157 | index c0cfef235..1e19116ee 100644 | ||
158 | --- a/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
159 | +++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c | ||
160 | @@ -1063,6 +1063,8 @@ static SyscallTableEntry syscall_table[] = { | ||
161 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
162 | |||
163 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
164 | + | ||
165 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
166 | }; | ||
167 | |||
168 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
169 | diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
170 | index f5976f30c..1097212a4 100644 | ||
171 | --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
172 | +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c | ||
173 | @@ -1032,6 +1032,8 @@ static SyscallTableEntry syscall_table[] = { | ||
174 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
175 | |||
176 | LINXY (__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
177 | + | ||
178 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
179 | }; | ||
180 | |||
181 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
182 | diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
183 | index afba154e7..3588672c7 100644 | ||
184 | --- a/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
185 | +++ b/coregrind/m_syswrap/syswrap-s390x-linux.c | ||
186 | @@ -873,6 +873,8 @@ static SyscallTableEntry syscall_table[] = { | ||
187 | LINX_(__NR_faccessat2, sys_faccessat2), // 439 | ||
188 | |||
189 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
190 | + | ||
191 | + LINX_ (__NR_fchmodat2, sys_fchmodat2), // 452 | ||
192 | }; | ||
193 | |||
194 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
195 | diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
196 | index da4fd8fa2..58badc6b0 100644 | ||
197 | --- a/coregrind/m_syswrap/syswrap-x86-linux.c | ||
198 | +++ b/coregrind/m_syswrap/syswrap-x86-linux.c | ||
199 | @@ -1658,6 +1658,8 @@ static SyscallTableEntry syscall_table[] = { | ||
200 | LINXY(__NR_epoll_pwait2, sys_epoll_pwait2), // 441 | ||
201 | |||
202 | LINXY(__NR_memfd_secret, sys_memfd_secret), // 447 | ||
203 | + | ||
204 | + LINX_(__NR_fchmodat2, sys_fchmodat2), // 452 | ||
205 | }; | ||
206 | |||
207 | SyscallTableEntry* ML_(get_linux_syscall_entry) ( UInt sysno ) | ||
208 | diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h | ||
209 | index 542382b53..a4cd87149 100644 | ||
210 | --- a/include/vki/vki-scnums-shared-linux.h | ||
211 | +++ b/include/vki/vki-scnums-shared-linux.h | ||
212 | @@ -50,4 +50,6 @@ | ||
213 | |||
214 | #define __NR_memfd_secret 447 | ||
215 | |||
216 | +#define __NR_fchmodat2 452 | ||
217 | + | ||
218 | #endif | ||
219 | -- | ||
220 | 2.44.0 | ||
221 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch b/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch new file mode 100644 index 0000000000..4e9185508a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch | |||
@@ -0,0 +1,137 @@ | |||
1 | From 41ff9aa49f6c54c66d0e6b37f265fd9cb0176057 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Floyd <pjfloyd@wanadoo.fr> | ||
3 | Date: Sun, 17 Dec 2023 14:18:51 +0100 | ||
4 | Subject: [PATCH 4/4] Bug 478624 - Valgrind incompatibility with binutils-2.42 | ||
5 | on x86 with new nop patterns (unhandled instruction bytes: 0x2E 0x8D 0xB4 | ||
6 | 0x26) | ||
7 | |||
8 | It was a bit of a struggle to get the testcase to build | ||
9 | with both clang and gcc (oddly enough gcc was more difficult) so | ||
10 | I just resorted to using .byte arrays. | ||
11 | |||
12 | (cherry picked from commit d35005cef8ad8207542738812705ceabf137d7e0) | ||
13 | |||
14 | Upstream-Status: Backport [https://sourceware.org/git/?p=valgrind.git;a=commit;h=41ff9aa49f6c54c66d0e6b37f265fd9cb0176057] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | .gitignore | 1 + | ||
18 | NEWS | 2 ++ | ||
19 | VEX/priv/guest_x86_toIR.c | 22 +++++++++++++- | ||
20 | none/tests/x86/Makefile.am | 2 ++ | ||
21 | none/tests/x86/gnu_binutils_nop.c | 34 ++++++++++++++++++++++ | ||
22 | none/tests/x86/gnu_binutils_nop.stderr.exp | 0 | ||
23 | none/tests/x86/gnu_binutils_nop.vgtest | 2 ++ | ||
24 | 7 files changed, 62 insertions(+), 1 deletion(-) | ||
25 | create mode 100644 none/tests/x86/gnu_binutils_nop.c | ||
26 | create mode 100644 none/tests/x86/gnu_binutils_nop.stderr.exp | ||
27 | create mode 100644 none/tests/x86/gnu_binutils_nop.vgtest | ||
28 | |||
29 | --- a/NEWS | ||
30 | +++ b/NEWS | ||
31 | @@ -9,6 +9,8 @@ The following bugs have been fixed or re | ||
32 | file produced by mold | ||
33 | 476708 valgrind-monitor.py regular expressions should use raw strings | ||
34 | 477198 Add fchmodat2 syscall on linux | ||
35 | +478624 Valgrind incompatibility with binutils-2.42 on x86 with new nop patterns | ||
36 | + (unhandled instruction bytes: 0x2E 0x8D 0xB4 0x26) | ||
37 | |||
38 | To see details of a given bug, visit | ||
39 | https://bugs.kde.org/show_bug.cgi?id=XXXXXX | ||
40 | --- a/VEX/priv/guest_x86_toIR.c | ||
41 | +++ b/VEX/priv/guest_x86_toIR.c | ||
42 | @@ -8198,7 +8198,7 @@ DisResult disInstr_X86_WRK ( | ||
43 | delta += 5; | ||
44 | goto decode_success; | ||
45 | } | ||
46 | - /* Don't barf on recent binutils padding, | ||
47 | + /* Don't barf on recent (2010) binutils padding, | ||
48 | all variants of which are: nopw %cs:0x0(%eax,%eax,1) | ||
49 | 66 2e 0f 1f 84 00 00 00 00 00 | ||
50 | 66 66 2e 0f 1f 84 00 00 00 00 00 | ||
51 | @@ -8222,6 +8222,26 @@ DisResult disInstr_X86_WRK ( | ||
52 | goto decode_success; | ||
53 | } | ||
54 | } | ||
55 | + | ||
56 | + /* bug478624 GNU binutils uses a leal of esi into itself with | ||
57 | + a zero offset and CS prefix as an 8 byte no-op (Dec 2023). | ||
58 | + Since the CS prefix is hardly ever used we don't do much | ||
59 | + to decode it, just a few cases for conditional branches. | ||
60 | + So add handling here with other pseudo-no-ops. | ||
61 | + */ | ||
62 | + if (code[0] == 0x2E && code[1] == 0x8D) { | ||
63 | + if (code[2] == 0x74 && code[3] == 0x26 && code[4] == 0x00) { | ||
64 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
65 | + delta += 5; | ||
66 | + goto decode_success; | ||
67 | + } | ||
68 | + if (code[2] == 0xB4 && code[3] == 0x26 && code[4] == 0x00 | ||
69 | + && code[5] == 0x00 && code[6] == 0x00 && code[7] == 0x00) { | ||
70 | + DIP("leal %%cs:0(%%esi,%%eiz,1),%%esi\n"); | ||
71 | + delta += 8; | ||
72 | + goto decode_success; | ||
73 | + } | ||
74 | + } | ||
75 | |||
76 | // Intel CET requires the following opcodes to be treated as NOPs | ||
77 | // with any prefix and ModRM, SIB and disp combination: | ||
78 | --- a/none/tests/x86/Makefile.am | ||
79 | +++ b/none/tests/x86/Makefile.am | ||
80 | @@ -52,6 +52,7 @@ EXTRA_DIST = \ | ||
81 | fxtract.stdout.exp fxtract.stderr.exp fxtract.vgtest \ | ||
82 | fxtract.stdout.exp-older-glibc \ | ||
83 | getseg.stdout.exp getseg.stderr.exp getseg.vgtest \ | ||
84 | + gnu_binutils_nop.stderr.exp gnu_binutils_nop.vgtest \ | ||
85 | incdec_alt.stdout.exp incdec_alt.stderr.exp incdec_alt.vgtest \ | ||
86 | int.stderr.exp int.stdout.exp int.disabled \ | ||
87 | $(addsuffix .stderr.exp,$(INSN_TESTS)) \ | ||
88 | @@ -100,6 +101,7 @@ check_PROGRAMS = \ | ||
89 | fpu_lazy_eflags \ | ||
90 | fxtract \ | ||
91 | getseg \ | ||
92 | + gnu_binutils_nop \ | ||
93 | incdec_alt \ | ||
94 | $(INSN_TESTS) \ | ||
95 | int \ | ||
96 | --- /dev/null | ||
97 | +++ b/none/tests/x86/gnu_binutils_nop.c | ||
98 | @@ -0,0 +1,34 @@ | ||
99 | +int main(void) | ||
100 | +{ | ||
101 | + // GNU binutils uses various opcodes as alternatives for nop | ||
102 | + // the idea is that it is faster to execute one large opcode | ||
103 | + // with no side-effects than multiple repetitions of the | ||
104 | + // single byte 'nop'. This gives more choice when code | ||
105 | + // needs to be padded. | ||
106 | + | ||
107 | + // the following is based on | ||
108 | + // https://sourceware.org/cgit/binutils-gdb/tree/gas/config/tc-i386.c#n1256 | ||
109 | + | ||
110 | + // one byte | ||
111 | + __asm__ __volatile__("nop"); | ||
112 | + // two bytes | ||
113 | + __asm__ __volatile__("xchg %ax,%ax"); | ||
114 | + // three bytes | ||
115 | + //__asm__ __volatile__("leal 0(%esi),%esi"); | ||
116 | + __asm__ __volatile__(".byte 0x8d,0x76,0x00"); | ||
117 | + // four bytes | ||
118 | + //__asm__ __volatile__("leal 0(%esi,%eiz),%esi"); | ||
119 | + __asm__ __volatile__(".byte 0x8d,0x74,0x26,0x00"); | ||
120 | + // five bytes | ||
121 | + //__asm__ __volatile__("leal %cs:0(%esi,%eiz),%esi"); | ||
122 | + __asm__ __volatile__(".byte 0x2e,0x8d,0x74,0x26,0x00"); | ||
123 | + // six bytes | ||
124 | + //__asm__ __volatile__("leal 0L(%esi),%esi"); | ||
125 | + __asm__ __volatile__(".byte 0x8d,0xb6,0x00,0x00,0x00,0x00"); | ||
126 | + // seven bytes | ||
127 | + //__asm__ __volatile__("leal 0L(%esi,%eiz),%esi"); | ||
128 | + __asm__ __volatile__(".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
129 | + // eight bytes | ||
130 | + //__asm__ __volatile__("leal %cs:0L(%esi,%eiz),%esi"); | ||
131 | + __asm__ __volatile__(".byte 0x2e,0x8d,0xb4,0x26,0x00,0x00,0x00,0x00"); | ||
132 | +} | ||
133 | --- /dev/null | ||
134 | +++ b/none/tests/x86/gnu_binutils_nop.vgtest | ||
135 | @@ -0,0 +1,2 @@ | ||
136 | +prog: gnu_binutils_nop | ||
137 | +vgopts: -q | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb index 74ac7ec9d5..563d99f0e2 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb | |||
@@ -33,6 +33,10 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
33 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ | 33 | file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ |
34 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ | 34 | file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ |
35 | file://0001-docs-Disable-manual-validation.patch \ | 35 | file://0001-docs-Disable-manual-validation.patch \ |
36 | file://0001-valgrind-monitor.py-regular-expressions-should-use-r.patch \ | ||
37 | file://0002-Bug-476548-valgrind-3.22.0-fails-on-assertion-when-l.patch \ | ||
38 | file://0003-Add-fchmodat2-syscall-on-linux.patch \ | ||
39 | file://0004-Bug-478624-Valgrind-incompatibility-with-binutils-2..patch \ | ||
36 | " | 40 | " |
37 | SRC_URI[sha256sum] = "c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c" | 41 | SRC_URI[sha256sum] = "c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c" |
38 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" | 42 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" |
diff --git a/meta/recipes-extended/acpica/acpica_20230628.bb b/meta/recipes-extended/acpica/acpica_20240322.bb index 8974bdc1f1..90e3599d32 100644 --- a/meta/recipes-extended/acpica/acpica_20230628.bb +++ b/meta/recipes-extended/acpica/acpica_20240322.bb | |||
@@ -10,19 +10,16 @@ HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/topic-technology/o | |||
10 | SECTION = "console/tools" | 10 | SECTION = "console/tools" |
11 | 11 | ||
12 | LICENSE = "Intel | BSD-3-Clause | GPL-2.0-only" | 12 | LICENSE = "Intel | BSD-3-Clause | GPL-2.0-only" |
13 | LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=79a69059b499bccc70a484459549758f" | 13 | LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=05eb845b15a27440410f456adc2ed082" |
14 | 14 | ||
15 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | 15 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" |
16 | 16 | ||
17 | DEPENDS = "m4-native flex-native bison-native" | 17 | DEPENDS = "m4-native flex-native bison-native" |
18 | 18 | ||
19 | SRC_URI = "https://downloadmirror.intel.com/783534/acpica-unix-${PV}.tar.gz" | 19 | SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master" |
20 | SRC_URI[sha256sum] = "86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce" | 20 | SRCREV = "170fc3076a86777077637f10b05c32ac21ac13aa" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://www.intel.com/content/www/us/en/download/776303/acpi-component-architecture-downloads-unix-format-source-code-and-build-environment-with-an-intel-license.html" | 22 | S = "${WORKDIR}/git" |
23 | UPSTREAM_VERSION_UNKNOWN = "1" | ||
24 | |||
25 | S = "${WORKDIR}/acpica-unix-${PV}" | ||
26 | 23 | ||
27 | inherit update-alternatives | 24 | inherit update-alternatives |
28 | 25 | ||
diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index c0c876a644..0162548d33 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb | |||
@@ -55,22 +55,22 @@ SYSTEMD_SERVICE:${PN} = "atd.service" | |||
55 | do_patch[postfuncs] += "copy_posix_files" | 55 | do_patch[postfuncs] += "copy_posix_files" |
56 | 56 | ||
57 | copy_posix_files() { | 57 | copy_posix_files() { |
58 | cp -f ${WORKDIR}/posixtm.[ch] ${S} | 58 | cp -f ${UNPACKDIR}/posixtm.[ch] ${S} |
59 | } | 59 | } |
60 | 60 | ||
61 | do_install () { | 61 | do_install () { |
62 | oe_runmake -e "IROOT=${D}" install | 62 | oe_runmake -e "IROOT=${D}" install |
63 | 63 | ||
64 | install -d ${D}${sysconfdir}/init.d | 64 | install -d ${D}${sysconfdir}/init.d |
65 | install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd | 65 | install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd |
66 | 66 | ||
67 | # install systemd unit files | 67 | # install systemd unit files |
68 | install -d ${D}${systemd_system_unitdir} | 68 | install -d ${D}${systemd_system_unitdir} |
69 | install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} | 69 | install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir} |
70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service | 70 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service |
71 | 71 | ||
72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 72 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
73 | install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd | 73 | install -D -m 0644 ${UNPACKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd |
74 | fi | 74 | fi |
75 | rm -f ${D}${datadir}/at/batch-job | 75 | rm -f ${D}${datadir}/at/batch-job |
76 | } | 76 | } |
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 7832ad052b..e541161c75 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc | |||
@@ -74,7 +74,8 @@ do_install:append () { | |||
74 | mv ${D}${bindir}/bash ${D}${base_bindir} | 74 | mv ${D}${bindir}/bash ${D}${base_bindir} |
75 | fi | 75 | fi |
76 | } | 76 | } |
77 | do_install:append:class-target () { | 77 | |
78 | fix_absolute_paths () { | ||
78 | # Clean buildhost references in bashbug | 79 | # Clean buildhost references in bashbug |
79 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ | 80 | sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ |
80 | -e "s,-I${WORKDIR}/\S* ,,g" \ | 81 | -e "s,-I${WORKDIR}/\S* ,,g" \ |
@@ -93,6 +94,14 @@ do_install:append:class-target () { | |||
93 | ${D}${libdir}/bash/Makefile.inc | 94 | ${D}${libdir}/bash/Makefile.inc |
94 | } | 95 | } |
95 | 96 | ||
97 | do_install:append:class-target () { | ||
98 | fix_absolute_paths | ||
99 | } | ||
100 | |||
101 | do_install:append:class-nativesdk () { | ||
102 | fix_absolute_paths | ||
103 | } | ||
104 | |||
96 | do_install_ptest () { | 105 | do_install_ptest () { |
97 | make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test | 106 | make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test |
98 | cp ${B}/Makefile ${D}${PTEST_PATH} | 107 | cp ${B}/Makefile ${D}${PTEST_PATH} |
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch index ea38bace9b..c1b9b8261f 100644 --- a/meta/recipes-extended/bash/bash/build-tests.patch +++ b/meta/recipes-extended/bash/bash/build-tests.patch | |||
@@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100 | |||
4 | Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking | 4 | Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking |
5 | dependencies. | 5 | dependencies. |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Inappropriate [ptest specific] |
8 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> | 8 | Signed-off-by: Anders Roxell <anders.roxell@enea.com> |
9 | 9 | ||
10 | Rebase to 5.0 | 10 | Rebase to 5.0 |
diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch new file mode 100644 index 0000000000..60f1852316 --- /dev/null +++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Fri, 7 Apr 2023 00:28:46 -0700 | ||
4 | Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit | ||
5 | enabled | ||
6 | |||
7 | This is a trimmed-down version of a commit in the bash 'devel' branch | ||
8 | [1] that contains this fix as well as other unrelated ones. | ||
9 | |||
10 | [1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=ec9447ce9392a0f93d96789c3741285fede8a150 | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Zev Weiss <zev@bewilderbeest.net> | ||
15 | --- | ||
16 | builtins/evalstring.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/builtins/evalstring.c b/builtins/evalstring.c | ||
20 | index df3dd68e2a7e..6612081cd646 100644 | ||
21 | --- a/builtins/evalstring.c | ||
22 | +++ b/builtins/evalstring.c | ||
23 | @@ -753,7 +753,7 @@ open_redir_file (r, fnp) | ||
24 | fd = open(fn, O_RDONLY); | ||
25 | if (fd < 0) | ||
26 | { | ||
27 | - file_error (fn); | ||
28 | + internal_error ("%s: %s", fn, strerror (errno)); | ||
29 | free (fn); | ||
30 | if (fnp) | ||
31 | *fnp = 0; | ||
32 | -- | ||
33 | 2.40.0 | ||
34 | |||
diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.21.bb index 46d921bbe6..532adf4c1a 100644 --- a/meta/recipes-extended/bash/bash_5.2.21.bb +++ b/meta/recipes-extended/bash/bash_5.2.21.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | |||
13 | file://fix-run-builtins.patch \ | 13 | file://fix-run-builtins.patch \ |
14 | file://use_aclocal.patch \ | 14 | file://use_aclocal.patch \ |
15 | file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ | 15 | file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ |
16 | file://fix-filesubst-errexit.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" | 19 | SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" |
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb index 819da6cda6..74387c50ab 100644 --- a/meta/recipes-extended/bc/bc_1.07.1.bb +++ b/meta/recipes-extended/bc/bc_1.07.1.bb | |||
@@ -27,7 +27,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | |||
27 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" | 27 | PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" |
28 | 28 | ||
29 | do_compile:prepend() { | 29 | do_compile:prepend() { |
30 | cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h | 30 | cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h |
31 | } | 31 | } |
32 | 32 | ||
33 | do_install_ptest() { | 33 | do_install_ptest() { |
diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch index 20572b55c4..35229ae890 100644 --- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch | |||
@@ -303,7 +303,7 @@ index 9396e1d..d0bb181 100644 | |||
303 | + PWDICT tmp_pwp; | 303 | + PWDICT tmp_pwp; |
304 | + | 304 | + |
305 | + memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); | 305 | + memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); |
306 | + HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); | 306 | + HwmsHostToBigEndian((char *)tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); |
307 | + fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); | 307 | + fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); |
308 | } | 308 | } |
309 | } | 309 | } |
diff --git a/meta/recipes-extended/cronie/cronie_1.7.1.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb index 854b68163c..e4711fa31c 100644 --- a/meta/recipes-extended/cronie/cronie_1.7.1.bb +++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ | |||
25 | PAM_SRC_URI = "file://crond_pam_config.patch" | 25 | PAM_SRC_URI = "file://crond_pam_config.patch" |
26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" | 26 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "78033100c24413f0c40f93e6138774d6a4f55bc31050567b90db45a2f9f1b954" | 28 | SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571" |
29 | 29 | ||
30 | inherit autotools update-rc.d useradd systemd github-releases | 30 | inherit autotools update-rc.d useradd systemd github-releases |
31 | UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" | 31 | UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" |
@@ -49,18 +49,18 @@ do_install:append () { | |||
49 | install -d ${D}${sysconfdir}/sysconfig/ | 49 | install -d ${D}${sysconfdir}/sysconfig/ |
50 | install -d ${D}${sysconfdir}/init.d/ | 50 | install -d ${D}${sysconfdir}/init.d/ |
51 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond | 51 | install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond |
52 | install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond | 52 | install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond |
53 | 53 | ||
54 | # install systemd unit files | 54 | # install systemd unit files |
55 | install -d ${D}${systemd_system_unitdir} | 55 | install -d ${D}${systemd_system_unitdir} |
56 | install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} | 56 | install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir} |
57 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 57 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
58 | -e 's,@SBINDIR@,${sbindir},g' \ | 58 | -e 's,@SBINDIR@,${sbindir},g' \ |
59 | ${D}${systemd_system_unitdir}/crond.service | 59 | ${D}${systemd_system_unitdir}/crond.service |
60 | 60 | ||
61 | # below are necessary for a complete cron environment | 61 | # below are necessary for a complete cron environment |
62 | install -d ${D}${localstatedir}/spool/cron | 62 | install -d ${D}${localstatedir}/spool/cron |
63 | install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ | 63 | install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/ |
64 | mkdir -p ${D}${sysconfdir}/cron.d | 64 | mkdir -p ${D}${sysconfdir}/cron.d |
65 | mkdir -p ${D}${sysconfdir}/cron.hourly | 65 | mkdir -p ${D}${sysconfdir}/cron.hourly |
66 | mkdir -p ${D}${sysconfdir}/cron.daily | 66 | mkdir -p ${D}${sysconfdir}/cron.daily |
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b70ba3ae58..9688efafae 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -84,11 +84,11 @@ do_install () { | |||
84 | rm -rf ${D}${sysconfdir}/init.d/ | 84 | rm -rf ${D}${sysconfdir}/init.d/ |
85 | rm -rf ${D}${sysconfdir}/rc* | 85 | rm -rf ${D}${sysconfdir}/rc* |
86 | install -d ${D}${sysconfdir}/tmpfiles.d | 86 | install -d ${D}${sysconfdir}/tmpfiles.d |
87 | install -m 0644 ${WORKDIR}/cups-volatiles.conf \ | 87 | install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \ |
88 | ${D}${sysconfdir}/tmpfiles.d/cups.conf | 88 | ${D}${sysconfdir}/tmpfiles.d/cups.conf |
89 | else | 89 | else |
90 | install -d ${D}${sysconfdir}/default/volatiles | 90 | install -d ${D}${sysconfdir}/default/volatiles |
91 | install -m 0644 ${WORKDIR}/volatiles.99_cups \ | 91 | install -m 0644 ${UNPACKDIR}/volatiles.99_cups \ |
92 | ${D}${sysconfdir}/default/volatiles/99_cups | 92 | ${D}${sysconfdir}/default/volatiles/99_cups |
93 | fi | 93 | fi |
94 | } | 94 | } |
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index 15c7eb5a77..67f14bd368 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 | 1 | From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Thu, 29 Mar 2018 16:02:05 +0800 | 3 | Date: Thu, 29 Mar 2018 16:02:05 +0800 |
4 | Subject: [PATCH 04/10] avoid host contamination | 4 | Subject: [PATCH] avoid host contamination |
5 | 5 | ||
6 | Remove hardcode path refer to host to avoid host contamination. | 6 | Remove hardcode path refer to host to avoid host contamination. |
7 | 7 | ||
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/devices/devs.mak b/devices/devs.mak | 17 | diff --git a/devices/devs.mak b/devices/devs.mak |
18 | index 846aa50..9570182 100644 | 18 | index 186f704..88ab8c9 100644 |
19 | --- a/devices/devs.mak | 19 | --- a/devices/devs.mak |
20 | +++ b/devices/devs.mak | 20 | +++ b/devices/devs.mak |
21 | @@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ | 21 | @@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ |
22 | ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT | 22 | ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT |
23 | 23 | ||
24 | $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) | 24 | $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) |
@@ -27,6 +27,3 @@ index 846aa50..9570182 100644 | |||
27 | 27 | ||
28 | ###### --------------- Memory-buffered printer devices --------------- ###### | 28 | ###### --------------- Memory-buffered printer devices --------------- ###### |
29 | 29 | ||
30 | -- | ||
31 | 1.8.3.1 | ||
32 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch b/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch deleted file mode 100644 index 7873396045..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | From fd37229a17822c5ad21a369f670b8a6f6cc6b95b Mon Sep 17 00:00:00 2001 | ||
2 | From: Benjamin Bara <benjamin.bara@skidata.com> | ||
3 | Date: Mon, 4 Sep 2023 12:16:39 +0200 | ||
4 | Subject: [PATCH] configure.ac: add option to explicitly disable neon | ||
5 | |||
6 | Uncomment an already existing possibility to explicitly disable neon and | ||
7 | use it on both implemented neon checks. | ||
8 | |||
9 | Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=707097] | ||
10 | |||
11 | Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com> | ||
12 | --- | ||
13 | configure.ac | 52 +++++++++++++++++++++++++++++----------------------- | ||
14 | 1 file changed, 29 insertions(+), 23 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 09d881dd1..62718e15e 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -749,6 +749,33 @@ SUBCONFIG_OPTS="--build=$build --host=$host" | ||
21 | # SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias" | ||
22 | #fi | ||
23 | |||
24 | +dnl -------------------------------------------------- | ||
25 | +dnl Check for NEON support | ||
26 | +dnl -------------------------------------------------- | ||
27 | +save_cflags=$CFLAGS | ||
28 | +AC_MSG_CHECKING([neon support]) | ||
29 | +CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53" | ||
30 | +HAVE_NEON="" | ||
31 | +AC_LINK_IFELSE( | ||
32 | + [AC_LANG_PROGRAM([#include "arm_neon.h"], [ | ||
33 | + int32x4_t round = vdupq_n_s32(10); | ||
34 | + return(0); | ||
35 | + ])], | ||
36 | + [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""]) | ||
37 | + | ||
38 | +AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon], | ||
39 | + [Do not use neon instrinsics]), [ | ||
40 | + if test "x$enable_neon" = xno; then | ||
41 | + HAVE_NEON="" | ||
42 | + fi]) | ||
43 | + | ||
44 | +if test "x$HAVE_NEON" != x; then | ||
45 | + AC_MSG_RESULT(yes) | ||
46 | +else | ||
47 | + AC_MSG_RESULT(no) | ||
48 | +fi | ||
49 | +CFLAGS=$save_cflags | ||
50 | + | ||
51 | dnl -------------------------------------------------- | ||
52 | dnl Check for libraries | ||
53 | dnl -------------------------------------------------- | ||
54 | @@ -971,11 +998,12 @@ if test x$with_tesseract != xno; then | ||
55 | [TESS_NEON="-mfpu=neon -mcpu=cortex-a53 -D__ARM_NEON__"], | ||
56 | [TESS_NEON=""]) | ||
57 | |||
58 | - if test "x$TESS_NEON" != x; then | ||
59 | + if test "x$TESS_NEON" != x && test "x$enable_neon" != xno; then | ||
60 | AC_MSG_RESULT(yes) | ||
61 | TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON" | ||
62 | else | ||
63 | AC_MSG_RESULT(no) | ||
64 | + TESS_NEON="" | ||
65 | fi | ||
66 | |||
67 | CXXFLAGS="$save_cxxflags" | ||
68 | @@ -2387,28 +2415,6 @@ if test x$WITH_CAL != x0; then | ||
69 | AC_MSG_RESULT(no) | ||
70 | fi | ||
71 | |||
72 | - AC_MSG_CHECKING([neon support]) | ||
73 | - CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53" | ||
74 | - HAVE_NEON="" | ||
75 | - AC_LINK_IFELSE( | ||
76 | - [AC_LANG_PROGRAM([#include "arm_neon.h"], [ | ||
77 | - int32x4_t round = vdupq_n_s32(10); | ||
78 | - return(0); | ||
79 | - ])], | ||
80 | - [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""]) | ||
81 | - | ||
82 | - #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon], | ||
83 | - # [Do not use neon instrinsics]), [ | ||
84 | - # if test "x$enable_neon" = xno; then | ||
85 | - # HAVE_NEON="" | ||
86 | - # fi]) | ||
87 | - | ||
88 | - if test "x$HAVE_NEON" != x; then | ||
89 | - AC_MSG_RESULT(yes) | ||
90 | - else | ||
91 | - AC_MSG_RESULT(no) | ||
92 | - fi | ||
93 | - | ||
94 | #AC_SUBST(HAVE_SSE4_2) | ||
95 | #AC_SUBST(HAVE_NEON) | ||
96 | CFLAGS=$save_cflags | ||
97 | -- | ||
98 | 2.34.1 | ||
99 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb index 3dff16eec2..ff7d38676e 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb | |||
@@ -25,10 +25,9 @@ def gs_verdir(v): | |||
25 | SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ | 25 | SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ |
26 | file://ghostscript-9.16-Werror-return-type.patch \ | 26 | file://ghostscript-9.16-Werror-return-type.patch \ |
27 | file://avoid-host-contamination.patch \ | 27 | file://avoid-host-contamination.patch \ |
28 | file://configure.ac-add-option-to-explicitly-disable-neon.patch \ | ||
29 | " | 28 | " |
30 | 29 | ||
31 | SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" | 30 | SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" |
32 | 31 | ||
33 | PACKAGECONFIG ??= "" | 32 | PACKAGECONFIG ??= "" |
34 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" | 33 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" |
diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 98cd4d8103..74f3520eae 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "MIT" | |||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
7 | 7 | ||
8 | SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" | 8 | SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" |
9 | SRCREV = "d9923f6970e9ba7e0d23aa9448ead71ea57235ae" | 9 | SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" |
10 | UPSTREAM_CHECK_COMMITS = "1" | 10 | UPSTREAM_CHECK_COMMITS = "1" |
11 | 11 | ||
12 | GO_IMPORT = "golang.org/x/example" | 12 | GO_IMPORT = "golang.org/x/example" |
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index b32584033b..62b3e2f4f9 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc | |||
@@ -8,6 +8,7 @@ inherit autotools texinfo | |||
8 | export DEFS="NO_ASM" | 8 | export DEFS="NO_ASM" |
9 | 9 | ||
10 | EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" | 10 | EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" |
11 | EXTRA_OEMAKE:append:class-nativesdk = " GREP=grep" | ||
11 | EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " | 12 | EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " |
12 | 13 | ||
13 | do_install:append () { | 14 | do_install:append () { |
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index cd2f3bce0b..5a87897742 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb | |||
@@ -52,10 +52,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" | |||
52 | 52 | ||
53 | do_install:append() { | 53 | do_install:append() { |
54 | install -d ${D}${IPTABLES_RULES_DIR} | 54 | install -d ${D}${IPTABLES_RULES_DIR} |
55 | install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} | 55 | install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} |
56 | 56 | ||
57 | install -d ${D}${systemd_system_unitdir} | 57 | install -d ${D}${systemd_system_unitdir} |
58 | install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} | 58 | install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir} |
59 | 59 | ||
60 | sed -i \ | 60 | sed -i \ |
61 | -e 's,@SBINDIR@,${sbindir},g' \ | 61 | -e 's,@SBINDIR@,${sbindir},g' \ |
@@ -63,8 +63,8 @@ do_install:append() { | |||
63 | ${D}${systemd_system_unitdir}/iptables.service | 63 | ${D}${systemd_system_unitdir}/iptables.service |
64 | 64 | ||
65 | if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then | 65 | if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then |
66 | install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} | 66 | install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} |
67 | install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} | 67 | install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir} |
68 | 68 | ||
69 | sed -i \ | 69 | sed -i \ |
70 | -e 's,@SBINDIR@,${sbindir},g' \ | 70 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240117.bb index 5a5e15528e..3880689742 100644 --- a/meta/recipes-extended/iputils/iputils_20240117.bb +++ b/meta/recipes-extended/iputils/iputils_20240117.bb | |||
@@ -35,7 +35,11 @@ ALTERNATIVE_PRIORITY = "100" | |||
35 | ALTERNATIVE:${PN}-ping = "ping" | 35 | ALTERNATIVE:${PN}-ping = "ping" |
36 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 36 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
37 | 37 | ||
38 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" | 38 | ALTERNATIVE:${PN}-ping6 = "ping6" |
39 | ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" | ||
40 | |||
41 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \ | ||
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}" | ||
39 | PACKAGES += "${SPLITPKGS}" | 43 | PACKAGES += "${SPLITPKGS}" |
40 | 44 | ||
41 | ALLOW_EMPTY:${PN} = "1" | 45 | ALLOW_EMPTY:${PN} = "1" |
@@ -43,6 +47,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}" | |||
43 | 47 | ||
44 | FILES:${PN} = "" | 48 | FILES:${PN} = "" |
45 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" | 49 | FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" |
50 | FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}" | ||
46 | FILES:${PN}-arping = "${base_bindir}/arping" | 51 | FILES:${PN}-arping = "${base_bindir}/arping" |
47 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" | 52 | FILES:${PN}-tracepath = "${base_bindir}/tracepath" |
48 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" | 53 | FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" |
54 | |||
55 | do_install:append() { | ||
56 | if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then | ||
57 | ln -sf ping ${D}/${base_bindir}/ping6 | ||
58 | fi | ||
59 | } | ||
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch index f3989d99eb..45fddd9147 100644 --- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch +++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch | |||
@@ -2,12 +2,15 @@ To work with autoconf 2.73, tweak the macro ordering in configure.in. | |||
2 | 2 | ||
3 | Upstream-Status: Pending | 3 | Upstream-Status: Pending |
4 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 4 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
5 | --- | ||
6 | configure.ac | 26 +++++++++++++------------- | ||
7 | 1 file changed, 13 insertions(+), 13 deletions(-) | ||
5 | 8 | ||
6 | Index: libarchive-3.6.2/configure.ac | 9 | diff --git a/configure.ac b/configure.ac |
7 | =================================================================== | 10 | index 503bb75..e3101da 100644 |
8 | --- libarchive-3.6.2.orig/configure.ac | 11 | --- a/configure.ac |
9 | +++ libarchive-3.6.2/configure.ac | 12 | +++ b/configure.ac |
10 | @@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then | 13 | @@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then |
11 | esac | 14 | esac |
12 | fi | 15 | fi |
13 | 16 | ||
@@ -27,9 +30,9 @@ Index: libarchive-3.6.2/configure.ac | |||
27 | AC_ARG_WITH([libb2], | 30 | AC_ARG_WITH([libb2], |
28 | AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) | 31 | AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) |
29 | 32 | ||
30 | @@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS | 33 | @@ -678,19 +691,6 @@ fi |
31 | 34 | ||
32 | AC_SUBST(GC_SECTIONS) | 35 | AC_SUBST(DEAD_CODE_REMOVAL) |
33 | 36 | ||
34 | -# Checks for typedefs, structures, and compiler characteristics. | 37 | -# Checks for typedefs, structures, and compiler characteristics. |
35 | -AC_C_CONST | 38 | -AC_C_CONST |
@@ -47,3 +50,6 @@ Index: libarchive-3.6.2/configure.ac | |||
47 | # Check for tm_gmtoff in struct tm | 50 | # Check for tm_gmtoff in struct tm |
48 | AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, | 51 | AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, |
49 | [ | 52 | [ |
53 | -- | ||
54 | 2.34.1 | ||
55 | |||
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb index 91f521fa4d..bea91b6e97 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.7.3.bb | |||
@@ -33,7 +33,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" | |||
33 | SRC_URI += "file://configurehack.patch" | 33 | SRC_URI += "file://configurehack.patch" |
34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" | 34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" |
35 | 35 | ||
36 | SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" | 36 | SRC_URI[sha256sum] = "f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2" |
37 | 37 | ||
38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" | 38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" |
39 | 39 | ||
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch index 6f0dea2e9c..da93a12ed5 100644 --- a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch +++ b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 | 1 | From e1db3c41fa84391b7ab299f7351f58b413ed2994 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 28 Oct 2021 22:28:45 -0700 | 3 | Date: Thu, 28 Oct 2021 22:28:45 -0700 |
4 | Subject: [PATCH] utils: Conside musl when wrapping qsort_r | 4 | Subject: [PATCH] utils: Conside musl when wrapping qsort_r |
@@ -29,6 +29,3 @@ index 72426e09..8f29bc5a 100644 | |||
29 | 29 | ||
30 | void | 30 | void |
31 | solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) | 31 | solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) |
32 | -- | ||
33 | 2.33.1 | ||
34 | |||
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb index 201059323a..ff0bd2d174 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \ | |||
12 | file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ | 12 | file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRCREV = "c8dbb3a77c86600ce09d4f80a504cf4e78a3c359" | 15 | SRCREV = "9c2b1a84b5a7ce0dc6e74226bdeb9527d6706791" |
16 | 16 | ||
17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
18 | 18 | ||
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.74.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb index 7460d3d716..153f451ea7 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.74.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t | |||
16 | file://lighttpd \ | 16 | file://lighttpd \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "5c08736e83088f7e019797159f306e88ec729abe976dc98fb3bed71b9d3e53b5" | 19 | SRC_URI[sha256sum] = "8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011" |
20 | 20 | ||
21 | DEPENDS = "virtual/crypt" | 21 | DEPENDS = "virtual/crypt" |
22 | 22 | ||
@@ -47,9 +47,9 @@ SYSTEMD_SERVICE:${PN} = "lighttpd.service" | |||
47 | 47 | ||
48 | do_install:append() { | 48 | do_install:append() { |
49 | install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav | 49 | install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav |
50 | install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d | 50 | install -m 0755 ${UNPACKDIR}/lighttpd ${D}${sysconfdir}/init.d |
51 | install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd | 51 | install -m 0644 ${UNPACKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd |
52 | install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html | 52 | install -m 0644 ${UNPACKDIR}/index.html.lighttpd ${D}/www/pages/index.html |
53 | 53 | ||
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} | 55 | install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} |
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240129.bb index 3e896957d1..e88e931a68 100644 --- a/meta/recipes-extended/ltp/ltp_20240129.bb +++ b/meta/recipes-extended/ltp/ltp_20240129.bb | |||
@@ -98,6 +98,7 @@ RDEPENDS:${PN} = "\ | |||
98 | gdb \ | 98 | gdb \ |
99 | gzip \ | 99 | gzip \ |
100 | iproute2 \ | 100 | iproute2 \ |
101 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'iputils-ping6', '', d)} \ | ||
101 | ldd \ | 102 | ldd \ |
102 | libaio \ | 103 | libaio \ |
103 | logrotate \ | 104 | logrotate \ |
diff --git a/meta/recipes-extended/lzip/lzip_1.24.bb b/meta/recipes-extended/lzip/lzip_1.24.1.bb index 73040a6f00..6eda012734 100644 --- a/meta/recipes-extended/lzip/lzip_1.24.bb +++ b/meta/recipes-extended/lzip/lzip_1.24.1.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ | |||
8 | " | 8 | " |
9 | 9 | ||
10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" | 10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" |
11 | SRC_URI[sha256sum] = "d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c" | 11 | SRC_URI[sha256sum] = "30c9cb6a0605f479c496c376eb629a48b0a1696d167e3c1e090c5defa481b162" |
12 | 12 | ||
13 | B = "${WORKDIR}/build" | 13 | B = "${WORKDIR}/build" |
14 | do_configure[cleandirs] = "${B}" | 14 | do_configure[cleandirs] = "${B}" |
diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch index dc6966629c..57ecd48b1f 100644 --- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch +++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001 | 1 | From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 9 Feb 2022 17:30:16 -0800 | 3 | Date: Wed, 9 Feb 2022 17:30:16 -0800 |
4 | Subject: [PATCH] man: Move local variable declaration to function scope | 4 | Subject: [PATCH] man: Move local variable declaration to function scope |
@@ -10,16 +10,15 @@ code without changing the logic, until its fixed in clang | |||
10 | 10 | ||
11 | Upstream-Status: Inappropriate [Inappropriate: Clang bug] | 11 | Upstream-Status: Inappropriate [Inappropriate: Clang bug] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | src/man.c | 4 ++-- | 14 | src/man.c | 4 ++-- |
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
17 | 16 | ||
18 | diff --git a/src/man.c b/src/man.c | 17 | diff --git a/src/man.c b/src/man.c |
19 | index f16fae8..333df03 100644 | 18 | index 195d35d..6870989 100644 |
20 | --- a/src/man.c | 19 | --- a/src/man.c |
21 | +++ b/src/man.c | 20 | +++ b/src/man.c |
22 | @@ -352,7 +352,7 @@ static void init_html_pager (void) | 21 | @@ -379,7 +379,7 @@ static void init_html_pager (void) |
23 | static error_t parse_opt (int key, char *arg, struct argp_state *state) | 22 | static error_t parse_opt (int key, char *arg, struct argp_state *state) |
24 | { | 23 | { |
25 | static bool apropos, whatis; /* retain values between calls */ | 24 | static bool apropos, whatis; /* retain values between calls */ |
@@ -28,7 +27,7 @@ index f16fae8..333df03 100644 | |||
28 | /* Please keep these keys in the same order as in options above. */ | 27 | /* Please keep these keys in the same order as in options above. */ |
29 | switch (key) { | 28 | switch (key) { |
30 | case 'C': | 29 | case 'C': |
31 | @@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) | 30 | @@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) |
32 | case OPT_WARNINGS: | 31 | case OPT_WARNINGS: |
33 | #ifdef NROFF_WARNINGS | 32 | #ifdef NROFF_WARNINGS |
34 | { | 33 | { |
diff --git a/meta/recipes-extended/man-db/man-db_2.12.0.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb index 19dbb41d16..5c6797c8f1 100644 --- a/meta/recipes-extended/man-db/man-db_2.12.0.bb +++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ | |||
11 | file://99_mandb \ | 11 | file://99_mandb \ |
12 | file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ | 12 | file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95" | 14 | SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265" |
15 | 15 | ||
16 | DEPENDS = "libpipeline gdbm groff-native base-passwd" | 16 | DEPENDS = "libpipeline gdbm groff-native base-passwd" |
17 | RDEPENDS:${PN} += "base-passwd" | 17 | RDEPENDS:${PN} += "base-passwd" |
@@ -37,7 +37,7 @@ do_install() { | |||
37 | 37 | ||
38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 38 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
39 | install -d ${D}/etc/default/volatiles | 39 | install -d ${D}/etc/default/volatiles |
40 | install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles | 40 | install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles |
41 | fi | 41 | fi |
42 | } | 42 | } |
43 | 43 | ||
diff --git a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch deleted file mode 100644 index cea435f83b..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | From ca458f4dcc4de9403298f67543466ce4bbc8f8ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:07 -0600 | ||
4 | Subject: [PATCH 1/4] DDF: Cleanup validate_geometry_ddf_container() | ||
5 | |||
6 | Move the function up so that the function declaration is not necessary | ||
7 | and remove the unused arguments to the function. | ||
8 | |||
9 | No functional changes are intended but will help with a bug fix in the | ||
10 | next patch. | ||
11 | |||
12 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
13 | Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | ||
14 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | |||
18 | Reference to upstream patch: | ||
19 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=679bd9508a30 | ||
20 | |||
21 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
22 | --- | ||
23 | super-ddf.c | 88 ++++++++++++++++++++++++----------------------------- | ||
24 | 1 file changed, 39 insertions(+), 49 deletions(-) | ||
25 | |||
26 | diff --git a/super-ddf.c b/super-ddf.c | ||
27 | index 3f304cd..65cf727 100644 | ||
28 | --- a/super-ddf.c | ||
29 | +++ b/super-ddf.c | ||
30 | @@ -503,13 +503,6 @@ struct ddf_super { | ||
31 | static int load_super_ddf_all(struct supertype *st, int fd, | ||
32 | void **sbp, char *devname); | ||
33 | static int get_svd_state(const struct ddf_super *, const struct vcl *); | ||
34 | -static int | ||
35 | -validate_geometry_ddf_container(struct supertype *st, | ||
36 | - int level, int layout, int raiddisks, | ||
37 | - int chunk, unsigned long long size, | ||
38 | - unsigned long long data_offset, | ||
39 | - char *dev, unsigned long long *freesize, | ||
40 | - int verbose); | ||
41 | |||
42 | static int validate_geometry_ddf_bvd(struct supertype *st, | ||
43 | int level, int layout, int raiddisks, | ||
44 | @@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks, | ||
45 | return 1; | ||
46 | } | ||
47 | |||
48 | +static int | ||
49 | +validate_geometry_ddf_container(struct supertype *st, | ||
50 | + int level, int raiddisks, | ||
51 | + unsigned long long data_offset, | ||
52 | + char *dev, unsigned long long *freesize, | ||
53 | + int verbose) | ||
54 | +{ | ||
55 | + int fd; | ||
56 | + unsigned long long ldsize; | ||
57 | + | ||
58 | + if (level != LEVEL_CONTAINER) | ||
59 | + return 0; | ||
60 | + if (!dev) | ||
61 | + return 1; | ||
62 | + | ||
63 | + fd = dev_open(dev, O_RDONLY|O_EXCL); | ||
64 | + if (fd < 0) { | ||
65 | + if (verbose) | ||
66 | + pr_err("ddf: Cannot open %s: %s\n", | ||
67 | + dev, strerror(errno)); | ||
68 | + return 0; | ||
69 | + } | ||
70 | + if (!get_dev_size(fd, dev, &ldsize)) { | ||
71 | + close(fd); | ||
72 | + return 0; | ||
73 | + } | ||
74 | + close(fd); | ||
75 | + if (freesize) { | ||
76 | + *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); | ||
77 | + if (*freesize == 0) | ||
78 | + return 0; | ||
79 | + } | ||
80 | + | ||
81 | + return 1; | ||
82 | +} | ||
83 | + | ||
84 | static int validate_geometry_ddf(struct supertype *st, | ||
85 | int level, int layout, int raiddisks, | ||
86 | int *chunk, unsigned long long size, | ||
87 | @@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st, | ||
88 | level = LEVEL_CONTAINER; | ||
89 | if (level == LEVEL_CONTAINER) { | ||
90 | /* Must be a fresh device to add to a container */ | ||
91 | - return validate_geometry_ddf_container(st, level, layout, | ||
92 | - raiddisks, *chunk, | ||
93 | - size, data_offset, dev, | ||
94 | - freesize, | ||
95 | - verbose); | ||
96 | + return validate_geometry_ddf_container(st, level, raiddisks, | ||
97 | + data_offset, dev, | ||
98 | + freesize, verbose); | ||
99 | } | ||
100 | |||
101 | if (!dev) { | ||
102 | @@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st, | ||
103 | return 1; | ||
104 | } | ||
105 | |||
106 | -static int | ||
107 | -validate_geometry_ddf_container(struct supertype *st, | ||
108 | - int level, int layout, int raiddisks, | ||
109 | - int chunk, unsigned long long size, | ||
110 | - unsigned long long data_offset, | ||
111 | - char *dev, unsigned long long *freesize, | ||
112 | - int verbose) | ||
113 | -{ | ||
114 | - int fd; | ||
115 | - unsigned long long ldsize; | ||
116 | - | ||
117 | - if (level != LEVEL_CONTAINER) | ||
118 | - return 0; | ||
119 | - if (!dev) | ||
120 | - return 1; | ||
121 | - | ||
122 | - fd = dev_open(dev, O_RDONLY|O_EXCL); | ||
123 | - if (fd < 0) { | ||
124 | - if (verbose) | ||
125 | - pr_err("ddf: Cannot open %s: %s\n", | ||
126 | - dev, strerror(errno)); | ||
127 | - return 0; | ||
128 | - } | ||
129 | - if (!get_dev_size(fd, dev, &ldsize)) { | ||
130 | - close(fd); | ||
131 | - return 0; | ||
132 | - } | ||
133 | - close(fd); | ||
134 | - if (freesize) { | ||
135 | - *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); | ||
136 | - if (*freesize == 0) | ||
137 | - return 0; | ||
138 | - } | ||
139 | - | ||
140 | - return 1; | ||
141 | -} | ||
142 | - | ||
143 | static int validate_geometry_ddf_bvd(struct supertype *st, | ||
144 | int level, int layout, int raiddisks, | ||
145 | int *chunk, unsigned long long size, | ||
146 | -- | ||
147 | 2.39.1 | ||
148 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch deleted file mode 100644 index 9e3a30be23..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 82c893bb9e01f914a6bdef1bef943af746cfc3e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 15 Jan 2023 12:42:18 -0800 | ||
4 | Subject: [PATCH] Define alignof using _Alignof when using C11 or newer | ||
5 | |||
6 | WG14 N2350 made very clear that it is an UB having type definitions | ||
7 | within "offsetof" [1]. This patch enhances the implementation of macro | ||
8 | alignof_slot to use builtin "_Alignof" to avoid undefined behavior on | ||
9 | when using std=c11 or newer | ||
10 | |||
11 | clang 16+ has started to flag this [2] | ||
12 | |||
13 | Fixes build when using -std >= gnu11 and using clang16+ | ||
14 | |||
15 | Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it | ||
16 | may support C11, exclude those compilers too | ||
17 | |||
18 | [1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm | ||
19 | [2] https://reviews.llvm.org/D133574 | ||
20 | |||
21 | Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20230118083236.24418-1-raj.khem@gmail.com/T/#u] | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | --- | ||
24 | sha1.c | 12 +++++++++++- | ||
25 | 1 file changed, 11 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/sha1.c b/sha1.c | ||
28 | index 89b32f4..1e4ad5d 100644 | ||
29 | --- a/sha1.c | ||
30 | +++ b/sha1.c | ||
31 | @@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) | ||
32 | if (len >= 64) | ||
33 | { | ||
34 | #if !_STRING_ARCH_unaligned | ||
35 | -# define alignof(type) offsetof (struct { char c; type x; }, x) | ||
36 | +/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 | ||
37 | + <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. | ||
38 | + clang versions < 8.0.0 have the same bug. */ | ||
39 | +# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ | ||
40 | + || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ | ||
41 | + && !defined __clang__) \ | ||
42 | + || (defined __clang__ && __clang_major__ < 8)) | ||
43 | +# define alignof(type) offsetof (struct { char c; type x; }, x) | ||
44 | +# else | ||
45 | +# define alignof(type) _Alignof(type) | ||
46 | +# endif | ||
47 | # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) | ||
48 | if (UNALIGNED_P (buffer)) | ||
49 | while (len > 64) | ||
50 | -- | ||
51 | 2.39.0 | ||
52 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch b/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch deleted file mode 100644 index 3fb46cc60a..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From 969fbb35e40100f599d4a9781911251f21792698 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Thu, 27 Jan 2022 17:53:01 +0800 | ||
4 | Subject: [PATCH] Fix parsing of "-r" in monitor/manager mode | ||
5 | |||
6 | This revert commit 546047688e1 [mdadm: fix coredump of mdadm --monitor | ||
7 | -r], and fix the coredump issue of 'mdadm --monitor -r'. | ||
8 | |||
9 | commit 546047688e1 make -r not work in manager mode, and testcase | ||
10 | 00multipath failed. | ||
11 | |||
12 | Upstream-Status: Submitted [send to maintainer jsorensen@fb.com] | ||
13 | |||
14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
15 | |||
16 | --- | ||
17 | ReadMe.c | 8 +++++--- | ||
18 | mdadm.c | 2 ++ | ||
19 | mdadm.h | 1 + | ||
20 | 3 files changed, 8 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/ReadMe.c b/ReadMe.c | ||
23 | index 8139976..070eea5 100644 | ||
24 | --- a/ReadMe.c | ||
25 | +++ b/ReadMe.c | ||
26 | @@ -81,11 +81,13 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n"; | ||
27 | * found, it is started. | ||
28 | */ | ||
29 | |||
30 | -char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k"; | ||
31 | +char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; | ||
32 | char short_bitmap_options[]= | ||
33 | - "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; | ||
34 | + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:"; | ||
35 | char short_bitmap_auto_options[]= | ||
36 | - "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; | ||
37 | + "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:"; | ||
38 | +char short_increment_options[]= | ||
39 | + "-ABCDEFGIQhVXYWZ:vqbc:i:l:r:p:m:n:x:u:c:d:z:U:N:safRSow1tye:k:"; | ||
40 | |||
41 | struct option long_options[] = { | ||
42 | {"manage", 0, 0, ManageOpt}, | ||
43 | diff --git a/mdadm.c b/mdadm.c | ||
44 | index 26299b2..2a3b2ee 100644 | ||
45 | --- a/mdadm.c | ||
46 | +++ b/mdadm.c | ||
47 | @@ -227,6 +227,7 @@ int main(int argc, char *argv[]) | ||
48 | shortopt = short_bitmap_auto_options; | ||
49 | break; | ||
50 | case 'F': newmode = MONITOR; | ||
51 | + shortopt = short_increment_options; | ||
52 | break; | ||
53 | case 'G': newmode = GROW; | ||
54 | shortopt = short_bitmap_options; | ||
55 | @@ -268,6 +269,7 @@ int main(int argc, char *argv[]) | ||
56 | |||
57 | case NoSharing: | ||
58 | newmode = MONITOR; | ||
59 | + shortopt = short_increment_options; | ||
60 | break; | ||
61 | } | ||
62 | if (mode && newmode == mode) { | ||
63 | diff --git a/mdadm.h b/mdadm.h | ||
64 | index ecfc137..42148dd 100644 | ||
65 | --- a/mdadm.h | ||
66 | +++ b/mdadm.h | ||
67 | @@ -421,6 +421,7 @@ enum mode { | ||
68 | extern char short_options[]; | ||
69 | extern char short_bitmap_options[]; | ||
70 | extern char short_bitmap_auto_options[]; | ||
71 | +extern char short_increment_options[]; | ||
72 | extern struct option long_options[]; | ||
73 | extern char Version[], Usage[], Help[], OptionHelp[], | ||
74 | *mode_help[], | ||
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch index 298f276cd6..fa1f0aa520 100644 --- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a9166bf422da1001bac9cc819386bf39b7cd1b73 Mon Sep 17 00:00:00 2001 | 1 | From 76856a34a4e339e4a53b09d028f89fcc520e3127 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 9 Feb 2016 11:44:01 +0200 | 3 | Date: Tue, 9 Feb 2016 11:44:01 +0200 |
4 | Subject: [PATCH] Fix the path of corosync and dlm header files check | 4 | Subject: [PATCH] Fix the path of corosync and dlm header files check |
@@ -9,16 +9,15 @@ Fix it. | |||
9 | Upstream-Status: Inappropriate [Yocto specific] | 9 | Upstream-Status: Inappropriate [Yocto specific] |
10 | 10 | ||
11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 11 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
12 | |||
13 | --- | 12 | --- |
14 | Makefile | 4 ++-- | 13 | Makefile | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 15 | ||
17 | diff --git a/Makefile b/Makefile | 16 | diff --git a/Makefile b/Makefile |
18 | index 2767ac6..46bf57b 100644 | 17 | index cbdba49..7bfd336 100644 |
19 | --- a/Makefile | 18 | --- a/Makefile |
20 | +++ b/Makefile | 19 | +++ b/Makefile |
21 | @@ -91,8 +91,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots | 20 | @@ -109,8 +109,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots |
22 | SYSTEMD_DIR=/lib/systemd/system | 21 | SYSTEMD_DIR=/lib/systemd/system |
23 | LIB_DIR=/usr/libexec/mdadm | 22 | LIB_DIR=/usr/libexec/mdadm |
24 | 23 | ||
diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch index 3f76ef54d8..a4be1aa8a1 100644 --- a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch +++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 97e776724ab9763c5bca9816370bb1635b7a8232 Mon Sep 17 00:00:00 2001 | 1 | From 0be066d57a7dd1aead5488d0a095863608f2e559 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Tue, 25 Jan 2022 16:25:01 +0800 | 3 | Date: Tue, 25 Jan 2022 16:25:01 +0800 |
4 | Subject: [PATCH] Makefile: install mdcheck | 4 | Subject: [PATCH] Makefile: install mdcheck |
@@ -14,10 +14,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/Makefile b/Makefile | 16 | diff --git a/Makefile b/Makefile |
17 | index 2a51d813..db40c7fd 100644 | 17 | index 1141971..f4059e2 100644 |
18 | --- a/Makefile | 18 | --- a/Makefile |
19 | +++ b/Makefile | 19 | +++ b/Makefile |
20 | @@ -303,6 +303,7 @@ install-systemd: systemd/mdmon@.service | 20 | @@ -325,6 +325,7 @@ install-systemd: systemd/mdmon@.service |
21 | install-bin: mdadm mdmon | 21 | install-bin: mdadm mdmon |
22 | $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm | 22 | $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm |
23 | $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon | 23 | $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon |
@@ -25,6 +25,3 @@ index 2a51d813..db40c7fd 100644 | |||
25 | 25 | ||
26 | uninstall: | 26 | uninstall: |
27 | rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm | 27 | rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm |
28 | -- | ||
29 | 2.17.1 | ||
30 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch deleted file mode 100644 index fb4bc165fb..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 02a41c3fd560fb5250186dd6b3cff6b21daa2e2b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Mon, 15 Jul 2019 14:12:24 +0800 | ||
4 | Subject: [PATCH] Revert "tests: wait for complete rebuild in integrity checks" | ||
5 | |||
6 | This reverts commit e2a8e9dcf67a28bc722fa5ab2c49b0bc452d4d74 | ||
7 | as the logic "check state 'U*'" will make the test enters | ||
8 | infinite loop especially in qemu env, so revert it to | ||
9 | use the previous logic "check wait" which also used | ||
10 | commonly by other tests such as tests/02r5grow, tests/07revert-grow | ||
11 | and etc. | ||
12 | |||
13 | Upstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2] | ||
14 | |||
15 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | ||
16 | --- | ||
17 | tests/01r5integ | 2 +- | ||
18 | tests/01raid6integ | 4 ++-- | ||
19 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/tests/01r5integ b/tests/01r5integ | ||
22 | index 48676a2..ffb30ce 100644 | ||
23 | --- a/tests/01r5integ | ||
24 | +++ b/tests/01r5integ | ||
25 | @@ -27,7 +27,7 @@ do | ||
26 | exit 1 | ||
27 | fi | ||
28 | mdadm $md0 -a $i | ||
29 | - while ! (check state 'U*'); do check wait; sleep 0.2; done | ||
30 | + check wait | ||
31 | done | ||
32 | mdadm -S $md0 | ||
33 | done | ||
34 | diff --git a/tests/01raid6integ b/tests/01raid6integ | ||
35 | index 12f4d81..c6fcdae 100644 | ||
36 | --- a/tests/01raid6integ | ||
37 | +++ b/tests/01raid6integ | ||
38 | @@ -47,10 +47,10 @@ do | ||
39 | exit 1 | ||
40 | fi | ||
41 | mdadm $md0 -a $first | ||
42 | - while ! (check state 'U*_U*'); do check wait; sleep 0.2; done | ||
43 | + check wait | ||
44 | done | ||
45 | mdadm $md0 -a $second | ||
46 | - while ! (check state 'U*'); do check wait; sleep 0.2; done | ||
47 | + check wait | ||
48 | totest="$totest $second" | ||
49 | done | ||
50 | mdadm -S $md0 | ||
51 | -- | ||
52 | 2.7.4 | ||
53 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch index 12bf6a5920..16fdefbbd1 100644 --- a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch +++ b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 37c35f94d9d95dbd2b5f8a919f5478be51453590 Mon Sep 17 00:00:00 2001 | 1 | From c29d086714b49a6d76ccca83b4a6fa2f139bad6e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 13 Oct 2017 10:27:34 -0700 | 3 | Date: Fri, 13 Oct 2017 10:27:34 -0700 |
4 | Subject: [PATCH] Use CC to check for implicit-fallthrough warning support | 4 | Subject: [PATCH] Use CC to check for implicit-fallthrough warning support |
@@ -10,19 +10,35 @@ cross compile used for compiling mdadm is < version 7 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | --- | 12 | --- |
13 | Makefile | 2 +- | 13 | Makefile | 6 +++--- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile b/Makefile | 16 | diff --git a/Makefile b/Makefile |
17 | index 46bf57b..a075912 100644 | 17 | index 7bfd336..9ab6a65 100644 |
18 | --- a/Makefile | 18 | --- a/Makefile |
19 | +++ b/Makefile | 19 | +++ b/Makefile |
20 | @@ -53,7 +53,7 @@ ifdef WARN_UNUSED | 20 | @@ -56,21 +56,21 @@ CWFLAGS += -Wp -O3 |
21 | CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 | ||
22 | endif | 21 | endif |
23 | 22 | ||
24 | -FALLTHROUGH := $(shell gcc -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) | 23 | ifeq ($(origin FALLTHROUGH), undefined) |
25 | +FALLTHROUGH := $(shell ${CC} -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) | 24 | - FALLTHROUGH := $(shell gcc -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l) |
26 | ifneq "$(FALLTHROUGH)" "0" | 25 | + FALLTHROUGH := $(shell ${CC} -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l) |
27 | CWFLAGS += -Wimplicit-fallthrough=0 | 26 | ifneq "$(FALLTHROUGH)" "0" |
27 | CWFLAGS += -Wimplicit-fallthrough=0 | ||
28 | endif | ||
28 | endif | 29 | endif |
30 | |||
31 | ifeq ($(origin FORMATOVERFLOW), undefined) | ||
32 | - FORMATOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l) | ||
33 | + FORMATOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l) | ||
34 | ifneq "$(FORMATOVERFLOW)" "0" | ||
35 | CWFLAGS += -Wformat-overflow | ||
36 | endif | ||
37 | endif | ||
38 | |||
39 | ifeq ($(origin STRINGOPOVERFLOW), undefined) | ||
40 | - STRINGOPOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l) | ||
41 | + STRINGOPOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l) | ||
42 | ifneq "$(STRINGOPOVERFLOW)" "0" | ||
43 | CWFLAGS += -Wstringop-overflow | ||
44 | endif | ||
diff --git a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch index fa9c8cc835..3cf295106f 100644 --- a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch +++ b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3158d3788c2e0fb75ace2c89840bd8a977fb4cb0 Mon Sep 17 00:00:00 2001 | 1 | From 78e5bb08971a5644a56af60d51ef35e13522e811 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 14 Dec 2018 15:12:31 +0800 | 3 | Date: Fri, 14 Dec 2018 15:12:31 +0800 |
4 | Subject: [PATCH] fix gcc-8 format-truncation warning | 4 | Subject: [PATCH] fix gcc-8 format-truncation warning |
@@ -22,7 +22,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/super0.c b/super0.c | 24 | diff --git a/super0.c b/super0.c |
25 | index 756cab5..12c28da 100644 | 25 | index a7c5f81..a79b6bd 100644 |
26 | --- a/super0.c | 26 | --- a/super0.c |
27 | +++ b/super0.c | 27 | +++ b/super0.c |
28 | @@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) | 28 | @@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) |
@@ -34,6 +34,3 @@ index 756cab5..12c28da 100644 | |||
34 | int wonly, failfast; | 34 | int wonly, failfast; |
35 | if (d>=0) dp = &sb->disks[d]; | 35 | if (d>=0) dp = &sb->disks[d]; |
36 | else dp = &sb->this_disk; | 36 | else dp = &sb->this_disk; |
37 | -- | ||
38 | 2.7.4 | ||
39 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch new file mode 100644 index 0000000000..70be43c15e --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 7759ceda978aba38861d4846d0c1657465b72f04 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 24 Mar 2024 23:13:32 -0700 | ||
4 | Subject: [PATCH] include libgen.h for basename API | ||
5 | |||
6 | Musl does no more provide it via string.h therefore builds with newer | ||
7 | compilers e.g. clang-18 fails due to missing prototype for basename | ||
8 | therefore add libgen.h to included headers list | ||
9 | |||
10 | Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20240325061537.275811-1-raj.khem@gmail.com/T/#u] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Monitor.c | 1 + | ||
14 | platform-intel.c | 1 + | ||
15 | super-intel.c | 1 + | ||
16 | 3 files changed, 3 insertions(+) | ||
17 | |||
18 | diff --git a/Monitor.c b/Monitor.c | ||
19 | index 824a69f..e3942e1 100644 | ||
20 | --- a/Monitor.c | ||
21 | +++ b/Monitor.c | ||
22 | @@ -26,6 +26,7 @@ | ||
23 | #include "udev.h" | ||
24 | #include "md_p.h" | ||
25 | #include "md_u.h" | ||
26 | +#include <libgen.h> | ||
27 | #include <sys/wait.h> | ||
28 | #include <limits.h> | ||
29 | #include <syslog.h> | ||
30 | diff --git a/platform-intel.c b/platform-intel.c | ||
31 | index ac282bc..5d6687d 100644 | ||
32 | --- a/platform-intel.c | ||
33 | +++ b/platform-intel.c | ||
34 | @@ -19,6 +19,7 @@ | ||
35 | #include "mdadm.h" | ||
36 | #include "platform-intel.h" | ||
37 | #include "probe_roms.h" | ||
38 | +#include <libgen.h> | ||
39 | #include <stdio.h> | ||
40 | #include <stdlib.h> | ||
41 | #include <string.h> | ||
42 | diff --git a/super-intel.c b/super-intel.c | ||
43 | index dbea235..881dbda 100644 | ||
44 | --- a/super-intel.c | ||
45 | +++ b/super-intel.c | ||
46 | @@ -23,6 +23,7 @@ | ||
47 | #include "dlink.h" | ||
48 | #include "sha1.h" | ||
49 | #include "platform-intel.h" | ||
50 | +#include <libgen.h> | ||
51 | #include <values.h> | ||
52 | #include <scsi/sg.h> | ||
53 | #include <ctype.h> | ||
54 | -- | ||
55 | 2.44.0 | ||
56 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch deleted file mode 100644 index 186d1e76f2..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:12 -0600 | ||
4 | Subject: [PATCH] mdadm: Fix optional --write-behind parameter | ||
5 | |||
6 | The commit noted below changed the behaviour of --write-behind to | ||
7 | require an argument. This broke the 06wrmostly test with the error: | ||
8 | |||
9 | mdadm: Invalid value for maximum outstanding write-behind writes: (null). | ||
10 | Must be between 0 and 16383. | ||
11 | |||
12 | To fix this, check if optarg is NULL before parising it, as the origial | ||
13 | code did. | ||
14 | |||
15 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9] | ||
16 | |||
17 | Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.") | ||
18 | Cc: Mateusz Grzonka <mateusz.grzonka@intel.com> | ||
19 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
20 | Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | ||
21 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
22 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
23 | --- | ||
24 | mdadm.c | 5 +++-- | ||
25 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/mdadm.c b/mdadm.c | ||
28 | index d0c5e6de..56722ed9 100644 | ||
29 | --- a/mdadm.c | ||
30 | +++ b/mdadm.c | ||
31 | @@ -1201,8 +1201,9 @@ int main(int argc, char *argv[]) | ||
32 | case O(BUILD, WriteBehind): | ||
33 | case O(CREATE, WriteBehind): | ||
34 | s.write_behind = DEFAULT_MAX_WRITE_BEHIND; | ||
35 | - if (parse_num(&s.write_behind, optarg) != 0 || | ||
36 | - s.write_behind < 0 || s.write_behind > 16383) { | ||
37 | + if (optarg && | ||
38 | + (parse_num(&s.write_behind, optarg) != 0 || | ||
39 | + s.write_behind < 0 || s.write_behind > 16383)) { | ||
40 | pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", | ||
41 | optarg); | ||
42 | exit(2); | ||
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch index e00287cab1..f224d0008d 100644 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch +++ b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5fdc0173cb4fcf8656f0889ad364d2549795607f Mon Sep 17 00:00:00 2001 | 1 | From c27e128fdc062ec3fcdf7b48a8c5078615c538df Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 1 Jul 2019 11:34:49 +0800 | 3 | Date: Mon, 1 Jul 2019 11:34:49 +0800 |
4 | Subject: [PATCH] mdadm: add option -y for use syslog to recive event report | 4 | Subject: [PATCH] mdadm: add option -y for use syslog to recive event report |
@@ -14,15 +14,12 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service | 16 | diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service |
17 | index 46f7b88..3fc4687 100644 | 17 | index 9c36478..d289846 100644 |
18 | --- a/systemd/mdmonitor.service | 18 | --- a/systemd/mdmonitor.service |
19 | +++ b/systemd/mdmonitor.service | 19 | +++ b/systemd/mdmonitor.service |
20 | @@ -13,4 +13,4 @@ DefaultDependencies=no | 20 | @@ -14,4 +14,4 @@ Documentation=man:mdadm(8) |
21 | Environment= MDADM_MONITOR_ARGS=--scan | 21 | Environment= MDADM_MONITOR_ARGS=--scan |
22 | EnvironmentFile=-/run/sysconfig/mdadm | 22 | EnvironmentFile=-/run/sysconfig/mdadm |
23 | ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh | 23 | ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh |
24 | -ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS | 24 | -ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS |
25 | +ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS | 25 | +ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS |
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch deleted file mode 100644 index 84517caade..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Fri, 6 Sep 2019 10:59:02 +0800 | ||
4 | Subject: [PATCH] mdadm: skip test 11spare-migration | ||
5 | |||
6 | 11spare-migration is a test series to check mdadm Monitor migrates spares | ||
7 | according to rules in /etc/mdadm.conf defined by POLICY lines. | ||
8 | |||
9 | [snip] | ||
10 | for scan in no yes; do | ||
11 | for platform in 1.2 imsm; do | ||
12 | try | ||
13 | done | ||
14 | done | ||
15 | [snip] | ||
16 | |||
17 | "try" includes near 20 sub testcase, so there are nearly 80 subcases need to run, | ||
18 | so it will take long time than ptest-runner timeout limit, skip it as workaround. | ||
19 | |||
20 | Upstream-Status: Inappropriate [oe-specific] | ||
21 | |||
22 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
23 | --- | ||
24 | test | 3 +++ | ||
25 | 1 file changed, 3 insertions(+) | ||
26 | |||
27 | diff --git a/test b/test | ||
28 | index 711a3c7..880dd1d 100755 | ||
29 | --- a/test | ||
30 | +++ b/test | ||
31 | @@ -272,6 +272,9 @@ main() { | ||
32 | else | ||
33 | for script in $testdir/$prefix $testdir/$prefix*[^~] | ||
34 | do | ||
35 | + if [ $script == "$testdir/11spare-migration" ];then | ||
36 | + continue | ||
37 | + fi | ||
38 | do_test $script | ||
39 | done | ||
40 | fi | ||
41 | -- | ||
42 | 2.7.4 | ||
43 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch index a1e7e59323..52daea2a49 100644 --- a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch +++ b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b431cb4e1ed060122fa300dc0008f74080d38f73 Mon Sep 17 00:00:00 2001 | 1 | From 4dd5c2659722b44409cee28b4cea68cdeaa1f987 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 9 May 2016 22:03:57 +0000 | 3 | Date: Mon, 9 May 2016 22:03:57 +0000 |
4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining | 4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining |
@@ -20,10 +20,10 @@ Upstream-Status: Pending | |||
20 | 1 file changed, 2 insertions(+) | 20 | 1 file changed, 2 insertions(+) |
21 | 21 | ||
22 | diff --git a/mdadm.h b/mdadm.h | 22 | diff --git a/mdadm.h b/mdadm.h |
23 | index 387e681..bb943bf 100644 | 23 | index 1f28b3e..04996e2 100644 |
24 | --- a/mdadm.h | 24 | --- a/mdadm.h |
25 | +++ b/mdadm.h | 25 | +++ b/mdadm.h |
26 | @@ -1649,11 +1649,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) | 26 | @@ -1869,11 +1869,13 @@ static inline sighandler_t signal_s(int sig, sighandler_t handler) |
27 | } | 27 | } |
28 | 28 | ||
29 | #ifdef DEBUG | 29 | #ifdef DEBUG |
diff --git a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch index 142ed355ef..13435ee418 100644 --- a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch +++ b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6b861a267a6ef6f60f6cc21e4c8e6d7cdd2451dc Mon Sep 17 00:00:00 2001 | 1 | From aa86de05cd6a75222b38e0789ac96fe00f705430 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 10 Nov 2022 12:31:22 -0800 | 3 | Date: Thu, 10 Nov 2022 12:31:22 -0800 |
4 | Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support | 4 | Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support |
@@ -10,9 +10,57 @@ the width of types | |||
10 | Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20221110225546.337164-1-raj.khem@gmail.com/] | 10 | Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20221110225546.337164-1-raj.khem@gmail.com/] |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 12 | --- |
13 | restripe.c | 13 ++++++++----- | 13 | raid6check.c | 11 +++++++---- |
14 | 1 file changed, 8 insertions(+), 5 deletions(-) | 14 | restripe.c | 13 ++++++++----- |
15 | swap_super.c | 13 +++++++------ | ||
16 | 3 files changed, 22 insertions(+), 15 deletions(-) | ||
15 | 17 | ||
18 | diff --git a/raid6check.c b/raid6check.c | ||
19 | index 9947776..8e7f142 100644 | ||
20 | --- a/raid6check.c | ||
21 | +++ b/raid6check.c | ||
22 | @@ -22,6 +22,9 @@ | ||
23 | * Based on "restripe.c" from "mdadm" codebase | ||
24 | */ | ||
25 | |||
26 | +/* Enable largefile support */ | ||
27 | +#define _FILE_OFFSET_BITS 64 | ||
28 | + | ||
29 | #include "mdadm.h" | ||
30 | #include <stdint.h> | ||
31 | #include <sys/mman.h> | ||
32 | @@ -284,9 +287,9 @@ int manual_repair(int chunk_size, int syndrome_disks, | ||
33 | } | ||
34 | |||
35 | int write_res1, write_res2; | ||
36 | - off64_t seek_res; | ||
37 | + off_t seek_res; | ||
38 | |||
39 | - seek_res = lseek64(source[fd1], | ||
40 | + seek_res = lseek(source[fd1], | ||
41 | offsets[fd1] + start * chunk_size, SEEK_SET); | ||
42 | if (seek_res < 0) { | ||
43 | fprintf(stderr, "lseek failed for failed_disk1\n"); | ||
44 | @@ -294,7 +297,7 @@ int manual_repair(int chunk_size, int syndrome_disks, | ||
45 | } | ||
46 | write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size); | ||
47 | |||
48 | - seek_res = lseek64(source[fd2], | ||
49 | + seek_res = lseek(source[fd2], | ||
50 | offsets[fd2] + start * chunk_size, SEEK_SET); | ||
51 | if (seek_res < 0) { | ||
52 | fprintf(stderr, "lseek failed for failed_disk2\n"); | ||
53 | @@ -379,7 +382,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets, | ||
54 | goto exitCheck; | ||
55 | } | ||
56 | for (i = 0 ; i < raid_disks ; i++) { | ||
57 | - off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size, | ||
58 | + off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size, | ||
59 | SEEK_SET); | ||
60 | if (seek_res < 0) { | ||
61 | fprintf(stderr, "lseek to source %d failed\n", i); | ||
62 | diff --git a/restripe.c b/restripe.c | ||
63 | index a7a7229..1c03577 100644 | ||
16 | --- a/restripe.c | 64 | --- a/restripe.c |
17 | +++ b/restripe.c | 65 | +++ b/restripe.c |
18 | @@ -22,6 +22,9 @@ | 66 | @@ -22,6 +22,9 @@ |
@@ -25,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | #include "mdadm.h" | 73 | #include "mdadm.h" |
26 | #include <stdint.h> | 74 | #include <stdint.h> |
27 | 75 | ||
28 | @@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned l | 76 | @@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned long long *offsets, |
29 | raid_disks, level, layout); | 77 | raid_disks, level, layout); |
30 | if (dnum < 0) abort(); | 78 | if (dnum < 0) abort(); |
31 | if (source[dnum] < 0 || | 79 | if (source[dnum] < 0 || |
@@ -34,7 +82,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
34 | offsets[dnum] + offset, 0) < 0 || | 82 | offsets[dnum] + offset, 0) < 0 || |
35 | read(source[dnum], buf+disk * chunk_size, | 83 | read(source[dnum], buf+disk * chunk_size, |
36 | chunk_size) != chunk_size) { | 84 | chunk_size) != chunk_size) { |
37 | @@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned | 85 | @@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned long long *offsets, |
38 | raid_disks, level, layout); | 86 | raid_disks, level, layout); |
39 | if (src_buf == NULL) { | 87 | if (src_buf == NULL) { |
40 | /* read from file */ | 88 | /* read from file */ |
@@ -45,7 +93,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
45 | rv = -1; | 93 | rv = -1; |
46 | goto abort; | 94 | goto abort; |
47 | } | 95 | } |
48 | @@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned | 96 | @@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned long long *offsets, |
49 | } | 97 | } |
50 | for (i=0; i < raid_disks ; i++) | 98 | for (i=0; i < raid_disks ; i++) |
51 | if (dest[i] >= 0) { | 99 | if (dest[i] >= 0) { |
@@ -54,7 +102,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
54 | offsets[i]+offset, 0) < 0) { | 102 | offsets[i]+offset, 0) < 0) { |
55 | rv = -1; | 103 | rv = -1; |
56 | goto abort; | 104 | goto abort; |
57 | @@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned l | 105 | @@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned long long *offsets, |
58 | int disk; | 106 | int disk; |
59 | 107 | ||
60 | for (i = 0 ; i < raid_disks ; i++) { | 108 | for (i = 0 ; i < raid_disks ; i++) { |
@@ -63,48 +111,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
63 | (read(source[i], stripes[i], chunk_size) != | 111 | (read(source[i], stripes[i], chunk_size) != |
64 | chunk_size)) { | 112 | chunk_size)) { |
65 | free(q); | 113 | free(q); |
66 | --- a/raid6check.c | 114 | diff --git a/swap_super.c b/swap_super.c |
67 | +++ b/raid6check.c | 115 | index b6db574..18c89e2 100644 |
68 | @@ -22,6 +22,9 @@ | ||
69 | * Based on "restripe.c" from "mdadm" codebase | ||
70 | */ | ||
71 | |||
72 | +/* Enable largefile support */ | ||
73 | +#define _FILE_OFFSET_BITS 64 | ||
74 | + | ||
75 | #include "mdadm.h" | ||
76 | #include <stdint.h> | ||
77 | #include <signal.h> | ||
78 | @@ -279,9 +282,9 @@ int manual_repair(int chunk_size, int sy | ||
79 | } | ||
80 | |||
81 | int write_res1, write_res2; | ||
82 | - off64_t seek_res; | ||
83 | + off_t seek_res; | ||
84 | |||
85 | - seek_res = lseek64(source[fd1], | ||
86 | + seek_res = lseek(source[fd1], | ||
87 | offsets[fd1] + start * chunk_size, SEEK_SET); | ||
88 | if (seek_res < 0) { | ||
89 | fprintf(stderr, "lseek failed for failed_disk1\n"); | ||
90 | @@ -289,7 +292,7 @@ int manual_repair(int chunk_size, int sy | ||
91 | } | ||
92 | write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size); | ||
93 | |||
94 | - seek_res = lseek64(source[fd2], | ||
95 | + seek_res = lseek(source[fd2], | ||
96 | offsets[fd2] + start * chunk_size, SEEK_SET); | ||
97 | if (seek_res < 0) { | ||
98 | fprintf(stderr, "lseek failed for failed_disk2\n"); | ||
99 | @@ -374,7 +377,7 @@ int check_stripes(struct mdinfo *info, i | ||
100 | goto exitCheck; | ||
101 | } | ||
102 | for (i = 0 ; i < raid_disks ; i++) { | ||
103 | - off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size, | ||
104 | + off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size, | ||
105 | SEEK_SET); | ||
106 | if (seek_res < 0) { | ||
107 | fprintf(stderr, "lseek to source %d failed\n", i); | ||
108 | --- a/swap_super.c | 116 | --- a/swap_super.c |
109 | +++ b/swap_super.c | 117 | +++ b/swap_super.c |
110 | @@ -1,3 +1,6 @@ | 118 | @@ -1,3 +1,6 @@ |
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch b/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch deleted file mode 100644 index 1c95834a7e..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 7539254342bc591717b0051734cc6c09c1b88640 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:13 -0600 | ||
4 | Subject: [PATCH] tests/00raid0: add a test that validates raid0 with layout | ||
5 | fails for 0.9 | ||
6 | |||
7 | 329dfc28debb disallows the creation of raid0 with layouts for 0.9 | ||
8 | metadata. This test confirms the new behavior. | ||
9 | |||
10 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=7539254342bc591717b0051734cc6c09c1b88640] | ||
11 | |||
12 | Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
13 | Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com> | ||
14 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
15 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
16 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
17 | --- | ||
18 | tests/00raid0 | 6 ++---- | ||
19 | 1 file changed, 2 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/tests/00raid0 b/tests/00raid0 | ||
22 | index 8bc18985..e6b21cc4 100644 | ||
23 | --- a/tests/00raid0 | ||
24 | +++ b/tests/00raid0 | ||
25 | @@ -6,11 +6,9 @@ check raid0 | ||
26 | testdev $md0 3 $mdsize2_l 512 | ||
27 | mdadm -S $md0 | ||
28 | |||
29 | -# now with version-0.90 superblock | ||
30 | +# verify raid0 with layouts fail for 0.90 | ||
31 | mdadm -CR $md0 -e0.90 -l0 -n4 $dev0 $dev1 $dev2 $dev3 | ||
32 | -check raid0 | ||
33 | -testdev $md0 4 $mdsize0 512 | ||
34 | -mdadm -S $md0 | ||
35 | +check opposite_result | ||
36 | |||
37 | # now with no superblock | ||
38 | mdadm -B $md0 -l0 -n5 $dev0 $dev1 $dev2 $dev3 $dev4 | ||
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch b/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch deleted file mode 100644 index c621c082e8..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 39b381252c32275079344d30de18b76fda4bba26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 27 Jul 2022 15:52:45 -0600 | ||
4 | Subject: [PATCH] tests/00readonly: Run udevadm settle before setting ro | ||
5 | |||
6 | In some recent kernel versions, 00readonly fails with: | ||
7 | |||
8 | mdadm: failed to set readonly for /dev/md0: Device or resource busy | ||
9 | ERROR: array is not read-only! | ||
10 | |||
11 | This was traced down to a race condition with udev holding a reference | ||
12 | to the block device at the same time as trying to set it read only. | ||
13 | |||
14 | To fix this, call udevadm settle before setting the array read only. | ||
15 | |||
16 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=39b381252c32275079344d30de18b76fda4bba26] | ||
17 | |||
18 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
19 | Signed-off-by: Jes Sorensen <jsorensen@fb.com> | ||
20 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
21 | --- | ||
22 | tests/00readonly | 1 + | ||
23 | 1 file changed, 1 insertion(+) | ||
24 | |||
25 | diff --git a/tests/00readonly b/tests/00readonly | ||
26 | index 39202487..afe243b3 100644 | ||
27 | --- a/tests/00readonly | ||
28 | +++ b/tests/00readonly | ||
29 | @@ -12,6 +12,7 @@ do | ||
30 | $dev1 $dev2 $dev3 $dev4 --assume-clean | ||
31 | check nosync | ||
32 | check $level | ||
33 | + udevadm settle | ||
34 | mdadm -ro $md0 | ||
35 | check readonly | ||
36 | state=$(cat /sys/block/md0/md/array_state) | ||
37 | -- | ||
38 | 2.25.1 | ||
39 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch b/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch deleted file mode 100644 index 1a7104b76d..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From a2c832465fc75202e244327b2081231dfa974617 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:16 -0600 | ||
4 | Subject: [PATCH] tests/02lineargrow: clear the superblock at every iteration | ||
5 | |||
6 | This fixes 02lineargrow test as prior metadata causes --add operation | ||
7 | to misbehave. | ||
8 | |||
9 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=a2c832465fc75202e244327b2081231dfa974617] | ||
10 | |||
11 | Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
12 | Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com> | ||
13 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
14 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
16 | --- | ||
17 | tests/02lineargrow | 2 ++ | ||
18 | 1 file changed, 2 insertions(+) | ||
19 | |||
20 | diff --git a/tests/02lineargrow b/tests/02lineargrow | ||
21 | index e05c219d..595bf9f2 100644 | ||
22 | --- a/tests/02lineargrow | ||
23 | +++ b/tests/02lineargrow | ||
24 | @@ -20,4 +20,6 @@ do | ||
25 | testdev $md0 3 $sz 1 | ||
26 | |||
27 | mdadm -S $md0 | ||
28 | + mdadm --zero /dev/loop2 | ||
29 | + mdadm --zero /dev/loop3 | ||
30 | done | ||
31 | -- | ||
32 | 2.25.1 | ||
33 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch b/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch deleted file mode 100644 index 9098fb2540..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From de045db607b1ac4b70fc2a8878463e029c2ab1dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:15 -0600 | ||
4 | Subject: [PATCH] tests/04update-metadata: avoid passing chunk size to raid1 | ||
5 | |||
6 | '04update-metadata' test fails with error, "specifying chunk size is | ||
7 | forbidden for this level" added by commit, 5b30a34aa4b5e. Hence, | ||
8 | correcting the test to ignore passing chunk size to raid1. | ||
9 | |||
10 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=de045db607b1ac4b70fc2a8878463e029c2ab1dc] | ||
11 | |||
12 | Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
13 | Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com> | ||
14 | [logang@deltatee.com: fix if/then style and dropped unrelated hunk] | ||
15 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
16 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
18 | --- | ||
19 | tests/04update-metadata | 6 +++++- | ||
20 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/tests/04update-metadata b/tests/04update-metadata | ||
23 | index 08c14af7..2b72a303 100644 | ||
24 | --- a/tests/04update-metadata | ||
25 | +++ b/tests/04update-metadata | ||
26 | @@ -11,7 +11,11 @@ dlist="$dev0 $dev1 $dev2 $dev3" | ||
27 | for ls in linear/4 raid1/1 raid5/3 raid6/2 | ||
28 | do | ||
29 | s=${ls#*/} l=${ls%/*} | ||
30 | - mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist | ||
31 | + if [[ $l == 'raid1' ]]; then | ||
32 | + mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 $dlist | ||
33 | + else | ||
34 | + mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist | ||
35 | + fi | ||
36 | testdev $md0 $s 19904 64 | ||
37 | mdadm -S $md0 | ||
38 | mdadm -A $md0 --update=metadata $dlist | ||
39 | -- | ||
40 | 2.25.1 | ||
41 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch b/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch deleted file mode 100644 index 5a6bf9e4bd..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From ee594b1a12833c06102de888248a361bc49cea09 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
3 | Date: Fri, 18 Aug 2023 12:20:40 +0300 | ||
4 | Subject: [PATCH] tests: add .broken files for 04update-uuid and | ||
5 | 07revert-inplace | ||
6 | |||
7 | 04update-uuid and 07revert-inplace tests are unreliable and fail intermittently | ||
8 | on the autobuilder. Unfortunately, the failures cannot be reproduced locally | ||
9 | and the logs cannot be retrieved from the AB. | ||
10 | |||
11 | Mark the testcases as BROKEN to skip them when running ptest. | ||
12 | |||
13 | Upstream-Status: Inappropriate | ||
14 | |||
15 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
16 | --- | ||
17 | tests/04update-uuid.broken | 1 + | ||
18 | tests/07revert-inplace.broken | 1 + | ||
19 | 2 files changed, 2 insertions(+) | ||
20 | create mode 100644 tests/04update-uuid.broken | ||
21 | create mode 100644 tests/07revert-inplace.broken | ||
22 | |||
23 | diff --git a/tests/04update-uuid.broken b/tests/04update-uuid.broken | ||
24 | new file mode 100644 | ||
25 | index 0000000..197b35b | ||
26 | --- /dev/null | ||
27 | +++ b/tests/04update-uuid.broken | ||
28 | @@ -0,0 +1 @@ | ||
29 | +fails infrequently | ||
30 | diff --git a/tests/07revert-inplace.broken b/tests/07revert-inplace.broken | ||
31 | new file mode 100644 | ||
32 | index 0000000..197b35b | ||
33 | --- /dev/null | ||
34 | +++ b/tests/07revert-inplace.broken | ||
35 | @@ -0,0 +1 @@ | ||
36 | +fails infrequently | ||
37 | -- | ||
38 | 2.39.1 | ||
39 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch b/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch deleted file mode 100644 index d2e7d8ee50..0000000000 --- a/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | From 14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:14 -0600 | ||
4 | Subject: [PATCH] tests: fix raid0 tests for 0.90 metadata | ||
5 | |||
6 | Some of the test cases fail because raid0 creation fails with the error, | ||
7 | "0.90 metadata does not support layouts for RAID0" added by commit, | ||
8 | 329dfc28debb. Fix some of the test cases by switching from raid0 to | ||
9 | linear level for 0.9 metadata where possible. | ||
10 | |||
11 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7] | ||
12 | |||
13 | Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com> | ||
14 | Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com> | ||
15 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
16 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
18 | --- | ||
19 | tests/00raid0 | 4 ++-- | ||
20 | tests/00readonly | 4 ++++ | ||
21 | tests/03r0assem | 6 +++--- | ||
22 | tests/04r0update | 4 ++-- | ||
23 | tests/04update-metadata | 2 +- | ||
24 | 5 files changed, 12 insertions(+), 8 deletions(-) | ||
25 | |||
26 | diff --git a/tests/00raid0 b/tests/00raid0 | ||
27 | index e6b21cc4..9b8896cb 100644 | ||
28 | --- a/tests/00raid0 | ||
29 | +++ b/tests/00raid0 | ||
30 | @@ -20,8 +20,8 @@ mdadm -S $md0 | ||
31 | # now same again with different chunk size | ||
32 | for chunk in 4 32 256 | ||
33 | do | ||
34 | - mdadm -CR $md0 -e0.90 -l raid0 --chunk $chunk -n3 $dev0 $dev1 $dev2 | ||
35 | - check raid0 | ||
36 | + mdadm -CR $md0 -e0.90 -l linear --chunk $chunk -n3 $dev0 $dev1 $dev2 | ||
37 | + check linear | ||
38 | testdev $md0 3 $mdsize0 $chunk | ||
39 | mdadm -S $md0 | ||
40 | |||
41 | diff --git a/tests/00readonly b/tests/00readonly | ||
42 | index 28b0fa13..39202487 100644 | ||
43 | --- a/tests/00readonly | ||
44 | +++ b/tests/00readonly | ||
45 | @@ -4,6 +4,10 @@ for metadata in 0.9 1.0 1.1 1.2 | ||
46 | do | ||
47 | for level in linear raid0 raid1 raid4 raid5 raid6 raid10 | ||
48 | do | ||
49 | + if [[ $metadata == "0.9" && $level == "raid0" ]]; | ||
50 | + then | ||
51 | + continue | ||
52 | + fi | ||
53 | mdadm -CR $md0 -l $level -n 4 --metadata=$metadata \ | ||
54 | $dev1 $dev2 $dev3 $dev4 --assume-clean | ||
55 | check nosync | ||
56 | diff --git a/tests/03r0assem b/tests/03r0assem | ||
57 | index 6744e322..44df0645 100644 | ||
58 | --- a/tests/03r0assem | ||
59 | +++ b/tests/03r0assem | ||
60 | @@ -68,9 +68,9 @@ mdadm -S $md2 | ||
61 | ### Now for version 0... | ||
62 | |||
63 | mdadm --zero-superblock $dev0 $dev1 $dev2 | ||
64 | -mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2 | ||
65 | -check raid0 | ||
66 | -tst="testdev $md2 3 $mdsize0 512" | ||
67 | +mdadm -CR $md2 -llinear --metadata=0.90 -n3 $dev0 $dev1 $dev2 | ||
68 | +check linear | ||
69 | +tst="testdev $md2 3 $mdsize0 1" | ||
70 | $tst | ||
71 | |||
72 | uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'` | ||
73 | diff --git a/tests/04r0update b/tests/04r0update | ||
74 | index 73ee3b9f..b95efb06 100644 | ||
75 | --- a/tests/04r0update | ||
76 | +++ b/tests/04r0update | ||
77 | @@ -1,7 +1,7 @@ | ||
78 | |||
79 | # create a raid0, re-assemble with a different super-minor | ||
80 | -mdadm -CR -e 0.90 $md0 -l0 -n3 $dev0 $dev1 $dev2 | ||
81 | -testdev $md0 3 $mdsize0 512 | ||
82 | +mdadm -CR -e 0.90 $md0 -llinear -n3 $dev0 $dev1 $dev2 | ||
83 | +testdev $md0 3 $mdsize0 1 | ||
84 | minor1=`mdadm -E $dev0 | sed -n -e 's/.*Preferred Minor : //p'` | ||
85 | mdadm -S /dev/md0 | ||
86 | |||
87 | diff --git a/tests/04update-metadata b/tests/04update-metadata | ||
88 | index 232fc1ff..08c14af7 100644 | ||
89 | --- a/tests/04update-metadata | ||
90 | +++ b/tests/04update-metadata | ||
91 | @@ -8,7 +8,7 @@ set -xe | ||
92 | |||
93 | dlist="$dev0 $dev1 $dev2 $dev3" | ||
94 | |||
95 | -for ls in raid0/4 linear/4 raid1/1 raid5/3 raid6/2 | ||
96 | +for ls in linear/4 raid1/1 raid5/3 raid6/2 | ||
97 | do | ||
98 | s=${ls#*/} l=${ls%/*} | ||
99 | mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist | ||
100 | -- | ||
101 | 2.25.1 | ||
102 | |||
diff --git a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch new file mode 100644 index 0000000000..0916efafdf --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 8fa7d3cb96e8833743b635fb198675ad6c020b6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 12 Mar 2024 10:51:51 +0100 | ||
4 | Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition | ||
5 | |||
6 | Upstream-Status: Submitted [mariusz.tkaczyk@linux.intel.com,linux-raid@vger.kernel.org] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | util.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/util.c b/util.c | ||
13 | index b145447..a9cb6c4 100644 | ||
14 | --- a/util.c | ||
15 | +++ b/util.c | ||
16 | @@ -36,7 +36,7 @@ | ||
17 | #include <ctype.h> | ||
18 | #include <dirent.h> | ||
19 | #include <dlfcn.h> | ||
20 | - | ||
21 | +#include <limits.h> | ||
22 | |||
23 | /* | ||
24 | * following taken from linux/blkpg.h because they aren't | ||
diff --git a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch new file mode 100644 index 0000000000..145c65477a --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From a22b2345b9773d362acd85dd4c4a6a3cda9100d4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 12 Mar 2024 10:54:08 +0100 | ||
4 | Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE | ||
5 | definition | ||
6 | |||
7 | glibc provides this through fcntl.h but musl does not - should | ||
8 | be reported and fixed there. | ||
9 | |||
10 | Upstream-Status: Inappropriate [musl-specific issue] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | Create.c | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/Create.c b/Create.c | ||
17 | index 8082f54..7071f0a 100644 | ||
18 | --- a/Create.c | ||
19 | +++ b/Create.c | ||
20 | @@ -31,6 +31,7 @@ | ||
21 | #include <signal.h> | ||
22 | #include <sys/signalfd.h> | ||
23 | #include <sys/wait.h> | ||
24 | +#include <linux/falloc.h> | ||
25 | |||
26 | static int round_size_and_verify(unsigned long long *size, int chunk) | ||
27 | { | ||
diff --git a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch deleted file mode 100644 index fafe88b49c..0000000000 --- a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 14f110f0286d38e29ef5e51d7f72e049c2f18323 Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:08 -0600 | ||
4 | Subject: [PATCH 2/4] DDF: Fix NULL pointer dereference in | ||
5 | validate_geometry_ddf() | ||
6 | |||
7 | A relatively recent patch added a call to validate_geometry() in | ||
8 | Manage_add() that has level=LEVEL_CONTAINER and chunk=NULL. | ||
9 | |||
10 | This causes some ddf tests to segfault which aborts the test suite. | ||
11 | |||
12 | To fix this, avoid dereferencing chunk when the level is | ||
13 | LEVEL_CONTAINER or LEVEL_NONE. | ||
14 | |||
15 | Fixes: 1f5d54a06df0 ("Manage: Call validate_geometry when adding drive to external container") | ||
16 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
17 | Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | ||
18 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
19 | |||
20 | Upstream-Status: Backport | ||
21 | |||
22 | Reference to upstream patch: | ||
23 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=2b93288a5650 | ||
24 | |||
25 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
26 | --- | ||
27 | super-ddf.c | 6 +++--- | ||
28 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
29 | |||
30 | diff --git a/super-ddf.c b/super-ddf.c | ||
31 | index 65cf727..3ef1293 100644 | ||
32 | --- a/super-ddf.c | ||
33 | +++ b/super-ddf.c | ||
34 | @@ -3369,9 +3369,6 @@ static int validate_geometry_ddf(struct supertype *st, | ||
35 | * If given BVDs, we make an SVD, changing all the GUIDs in the process. | ||
36 | */ | ||
37 | |||
38 | - if (*chunk == UnSet) | ||
39 | - *chunk = DEFAULT_CHUNK; | ||
40 | - | ||
41 | if (level == LEVEL_NONE) | ||
42 | level = LEVEL_CONTAINER; | ||
43 | if (level == LEVEL_CONTAINER) { | ||
44 | @@ -3381,6 +3378,9 @@ static int validate_geometry_ddf(struct supertype *st, | ||
45 | freesize, verbose); | ||
46 | } | ||
47 | |||
48 | + if (*chunk == UnSet) | ||
49 | + *chunk = DEFAULT_CHUNK; | ||
50 | + | ||
51 | if (!dev) { | ||
52 | mdu_array_info_t array = { | ||
53 | .level = level, | ||
54 | -- | ||
55 | 2.39.1 | ||
56 | |||
diff --git a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch deleted file mode 100644 index a954ab027a..0000000000 --- a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | From bd064da1469a6a07331b076a0294a8c6c3c38526 Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:09 -0600 | ||
4 | Subject: [PATCH 3/4] mdadm/Grow: Fix use after close bug by closing after fork | ||
5 | |||
6 | The test 07reshape-grow fails most of the time. But it succeeds around | ||
7 | 1 in 5 times. When it does succeed, it causes the tests to die because | ||
8 | mdadm has segfaulted. | ||
9 | |||
10 | The segfault was caused by mdadm attempting to repoen a file | ||
11 | descriptor that was already closed. The backtrace of the segfault | ||
12 | was: | ||
13 | |||
14 | #0 __strncmp_avx2 () at ../sysdeps/x86_64/multiarch/strcmp-avx2.S:101 | ||
15 | #1 0x000056146e31d44b in devnm2devid (devnm=0x0) at util.c:956 | ||
16 | #2 0x000056146e31dab4 in open_dev_flags (devnm=0x0, flags=0) | ||
17 | at util.c:1072 | ||
18 | #3 0x000056146e31db22 in open_dev (devnm=0x0) at util.c:1079 | ||
19 | #4 0x000056146e3202e8 in reopen_mddev (mdfd=4) at util.c:2244 | ||
20 | #5 0x000056146e329f36 in start_array (mdfd=4, | ||
21 | mddev=0x7ffc55342450 "/dev/md0", content=0x7ffc55342860, | ||
22 | st=0x56146fc78660, ident=0x7ffc55342f70, best=0x56146fc6f5d0, | ||
23 | bestcnt=10, chosen_drive=0, devices=0x56146fc706b0, okcnt=5, | ||
24 | sparecnt=0, rebuilding_cnt=0, journalcnt=0, c=0x7ffc55342e90, | ||
25 | clean=1, avail=0x56146fc78720 "\001\001\001\001\001", | ||
26 | start_partial_ok=0, err_ok=0, was_forced=0) | ||
27 | at Assemble.c:1206 | ||
28 | #6 0x000056146e32c36e in Assemble (st=0x56146fc78660, | ||
29 | mddev=0x7ffc55342450 "/dev/md0", ident=0x7ffc55342f70, | ||
30 | devlist=0x56146fc6e2d0, c=0x7ffc55342e90) | ||
31 | at Assemble.c:1914 | ||
32 | #7 0x000056146e312ac9 in main (argc=11, argv=0x7ffc55343238) | ||
33 | at mdadm.c:1510 | ||
34 | |||
35 | The file descriptor was closed early in Grow_continue(). The noted commit | ||
36 | moved the close() call to close the fd above the fork which caused the | ||
37 | parent process to return with a closed fd. | ||
38 | |||
39 | This meant reshape_array() and Grow_continue() would return in the parent | ||
40 | with the fd forked. The fd would eventually be passed to reopen_mddev() | ||
41 | which returned an unhandled NULL from fd2devnm() which would then be | ||
42 | dereferenced in devnm2devid. | ||
43 | |||
44 | Fix this by moving the close() call below the fork. This appears to | ||
45 | fix the 07revert-grow test. While we're at it, switch to using | ||
46 | close_fd() to invalidate the file descriptor. | ||
47 | |||
48 | Fixes: 77b72fa82813 ("mdadm/Grow: prevent md's fd from being occupied during delayed time") | ||
49 | Cc: Alex Wu <alexwu@synology.com> | ||
50 | Cc: BingJing Chang <bingjingc@synology.com> | ||
51 | Cc: Danny Shih <dannyshih@synology.com> | ||
52 | Cc: ChangSyun Peng <allenpeng@synology.com> | ||
53 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
54 | Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | ||
55 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
56 | |||
57 | Upstream-Status: Backport | ||
58 | |||
59 | Reference to upstream patch: | ||
60 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=548e9b916f86 | ||
61 | |||
62 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
63 | --- | ||
64 | Grow.c | 4 +++- | ||
65 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
66 | |||
67 | diff --git a/Grow.c b/Grow.c | ||
68 | index 9c6fc95..a8e4e83 100644 | ||
69 | --- a/Grow.c | ||
70 | +++ b/Grow.c | ||
71 | @@ -3501,7 +3501,6 @@ started: | ||
72 | return 0; | ||
73 | } | ||
74 | |||
75 | - close(fd); | ||
76 | /* Now we just need to kick off the reshape and watch, while | ||
77 | * handling backups of the data... | ||
78 | * This is all done by a forked background process. | ||
79 | @@ -3522,6 +3521,9 @@ started: | ||
80 | break; | ||
81 | } | ||
82 | |||
83 | + /* Close unused file descriptor in the forked process */ | ||
84 | + close_fd(&fd); | ||
85 | + | ||
86 | /* If another array on the same devices is busy, the | ||
87 | * reshape will wait for them. This would mean that | ||
88 | * the first section that we suspend will stay suspended | ||
89 | -- | ||
90 | 2.39.1 | ||
91 | |||
diff --git a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch deleted file mode 100644 index 72cb40f782..0000000000 --- a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 2296a4a441b4b8546e2eb32403930f1bb8f3ee4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:10 -0600 | ||
4 | Subject: [PATCH 4/4] monitor: Avoid segfault when calling NULL get_bad_blocks | ||
5 | |||
6 | Not all struct superswitch implement a get_bad_blocks() function, | ||
7 | yet mdmon seems to call it without checking for NULL and thus | ||
8 | occasionally segfaults in the test 10ddf-geometry. | ||
9 | |||
10 | Fix this by checking for NULL before calling it. | ||
11 | |||
12 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
13 | Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | ||
14 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
15 | |||
16 | Upstream-Status: Backport | ||
17 | |||
18 | Reference to upstream patch: | ||
19 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9ae62977b51d | ||
20 | |||
21 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
22 | --- | ||
23 | monitor.c | 3 +++ | ||
24 | 1 file changed, 3 insertions(+) | ||
25 | |||
26 | diff --git a/monitor.c b/monitor.c | ||
27 | index afc3e50..8e43c0d 100644 | ||
28 | --- a/monitor.c | ||
29 | +++ b/monitor.c | ||
30 | @@ -312,6 +312,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi) | ||
31 | struct md_bb *bb; | ||
32 | int i; | ||
33 | |||
34 | + if (!ss->get_bad_blocks) | ||
35 | + return -1; | ||
36 | + | ||
37 | /* | ||
38 | * Get a list of bad blocks for an array, then read list of | ||
39 | * acknowledged bad blocks from kernel and compare it against metadata | ||
40 | -- | ||
41 | 2.39.1 | ||
42 | |||
diff --git a/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch b/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch deleted file mode 100644 index c55bfb125b..0000000000 --- a/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | From feab1f72fcf032a4d21d0a69eb61b23a5ddb3352 Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:18 -0600 | ||
4 | Subject: [PATCH 5/6] mdadm/test: Mark and ignore broken test failures | ||
5 | |||
6 | Add functionality to continue if a test marked as broken fails. | ||
7 | |||
8 | To mark a test as broken, a file with the same name but with the suffix | ||
9 | '.broken' should exist. The first line in the file will be printed with | ||
10 | a KNOWN BROKEN message; the rest of the file can describe the how the | ||
11 | test is broken. | ||
12 | |||
13 | Also adds --skip-broken and --skip-always-broken to skip all the tests | ||
14 | that have a .broken file or to skip all tests whose .broken file's first | ||
15 | line contains the keyword always. | ||
16 | |||
17 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
18 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
19 | |||
20 | Upstream-Status: Backport | ||
21 | |||
22 | Reference to upstream patch: | ||
23 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3 | ||
24 | |||
25 | [OP: adjusted context for mdadm-4.2] | ||
26 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
27 | --- | ||
28 | test | 37 +++++++++++++++++++++++++++++++++++-- | ||
29 | 1 file changed, 35 insertions(+), 2 deletions(-) | ||
30 | |||
31 | diff --git a/test b/test | ||
32 | index 8f189d9..ee8fba1 100755 | ||
33 | --- a/test | ||
34 | +++ b/test | ||
35 | @@ -10,6 +10,8 @@ devlist= | ||
36 | |||
37 | savelogs=0 | ||
38 | exitonerror=1 | ||
39 | +ctrl_c_error=0 | ||
40 | +skipbroken=0 | ||
41 | prefix='[0-9][0-9]' | ||
42 | |||
43 | # use loop devices by default if doesn't specify --dev | ||
44 | @@ -35,6 +37,7 @@ die() { | ||
45 | |||
46 | ctrl_c() { | ||
47 | exitonerror=1 | ||
48 | + ctrl_c_error=1 | ||
49 | } | ||
50 | |||
51 | # mdadm always adds --quiet, and we want to see any unexpected messages | ||
52 | @@ -79,8 +82,21 @@ mdadm() { | ||
53 | do_test() { | ||
54 | _script=$1 | ||
55 | _basename=`basename $_script` | ||
56 | + _broken=0 | ||
57 | + | ||
58 | if [ -f "$_script" ] | ||
59 | then | ||
60 | + if [ -f "${_script}.broken" ]; then | ||
61 | + _broken=1 | ||
62 | + _broken_msg=$(head -n1 "${_script}.broken" | tr -d '\n') | ||
63 | + if [ "$skipbroken" == "all" ]; then | ||
64 | + return | ||
65 | + elif [ "$skipbroken" == "always" ] && | ||
66 | + [[ "$_broken_msg" == *always* ]]; then | ||
67 | + return | ||
68 | + fi | ||
69 | + fi | ||
70 | + | ||
71 | rm -f $targetdir/stderr | ||
72 | # this might have been reset: restore the default. | ||
73 | echo 2000 > /proc/sys/dev/raid/speed_limit_max | ||
74 | @@ -97,10 +113,15 @@ do_test() { | ||
75 | else | ||
76 | save_log fail | ||
77 | _fail=1 | ||
78 | + if [ "$_broken" == "1" ]; then | ||
79 | + echo " (KNOWN BROKEN TEST: $_broken_msg)" | ||
80 | + fi | ||
81 | fi | ||
82 | [ "$savelogs" == "1" ] && | ||
83 | mv -f $targetdir/log $logdir/$_basename.log | ||
84 | - [ "$_fail" == "1" -a "$exitonerror" == "1" ] && exit 1 | ||
85 | + [ "$ctrl_c_error" == "1" ] && exit 1 | ||
86 | + [ "$_fail" == "1" -a "$exitonerror" == "1" \ | ||
87 | + -a "$_broken" == "0" ] && exit 1 | ||
88 | fi | ||
89 | } | ||
90 | |||
91 | @@ -117,6 +138,8 @@ do_help() { | ||
92 | --logdir=directory Directory to save all logfiles in | ||
93 | --save-logs Usually use with --logdir together | ||
94 | --keep-going | --no-error Don't stop on error, ie. run all tests | ||
95 | + --skip-broken Skip tests that are known to be broken | ||
96 | + --skip-always-broken Skip tests that are known to always fail | ||
97 | --dev=loop|lvm|ram|disk Use loop devices (default), LVM, RAM or disk | ||
98 | --disks= Provide a bunch of physical devices for test | ||
99 | --volgroup=name LVM volume group for LVM test | ||
100 | @@ -211,6 +234,12 @@ parse_args() { | ||
101 | --keep-going | --no-error ) | ||
102 | exitonerror=0 | ||
103 | ;; | ||
104 | + --skip-broken ) | ||
105 | + skipbroken=all | ||
106 | + ;; | ||
107 | + --skip-always-broken ) | ||
108 | + skipbroken=always | ||
109 | + ;; | ||
110 | --disable-multipath ) | ||
111 | unset MULTIPATH | ||
112 | ;; | ||
113 | @@ -275,7 +304,11 @@ main() { | ||
114 | if [ $script == "$testdir/11spare-migration" ];then | ||
115 | continue | ||
116 | fi | ||
117 | - do_test $script | ||
118 | + case $script in | ||
119 | + *.broken) ;; | ||
120 | + *) | ||
121 | + do_test $script | ||
122 | + esac | ||
123 | done | ||
124 | fi | ||
125 | |||
126 | -- | ||
127 | 2.39.1 | ||
128 | |||
diff --git a/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch b/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch deleted file mode 100644 index 115b23bac5..0000000000 --- a/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch +++ /dev/null | |||
@@ -1,454 +0,0 @@ | |||
1 | From fd1c26ba129b069d9f73afaefdbe53683de3814a Mon Sep 17 00:00:00 2001 | ||
2 | From: Logan Gunthorpe <logang@deltatee.com> | ||
3 | Date: Wed, 22 Jun 2022 14:25:19 -0600 | ||
4 | Subject: [PATCH 6/6] tests: Add broken files for all broken tests | ||
5 | |||
6 | Each broken file contains the rough frequency of brokeness as well | ||
7 | as a brief explanation of what happens when it breaks. Estimates | ||
8 | of failure rates are not statistically significant and can vary | ||
9 | run to run. | ||
10 | |||
11 | This is really just a view from my window. Tests were done on a | ||
12 | small VM with the default loop devices, not real hardware. We've | ||
13 | seen different kernel configurations can cause bugs to appear as well | ||
14 | (ie. different block schedulers). It may also be that different race | ||
15 | conditions will be seen on machines with different performance | ||
16 | characteristics. | ||
17 | |||
18 | These annotations were done with the kernel currently in md/md-next: | ||
19 | |||
20 | facef3b96c5b ("md: Notify sysfs sync_completed in md_reap_sync_thread()") | ||
21 | |||
22 | Signed-off-by: Logan Gunthorpe <logang@deltatee.com> | ||
23 | Signed-off-by: Jes Sorensen <jes@trained-monkey.org> | ||
24 | |||
25 | Upstream-Status: Backport | ||
26 | |||
27 | Reference to upstream patch: | ||
28 | https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=daa86d663476 | ||
29 | |||
30 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
31 | --- | ||
32 | tests/01r5integ.broken | 7 ++++ | ||
33 | tests/01raid6integ.broken | 7 ++++ | ||
34 | tests/04r5swap.broken | 7 ++++ | ||
35 | tests/07autoassemble.broken | 8 ++++ | ||
36 | tests/07autodetect.broken | 5 +++ | ||
37 | tests/07changelevelintr.broken | 9 +++++ | ||
38 | tests/07changelevels.broken | 9 +++++ | ||
39 | tests/07reshape5intr.broken | 45 ++++++++++++++++++++++ | ||
40 | tests/07revert-grow.broken | 31 +++++++++++++++ | ||
41 | tests/07revert-shrink.broken | 9 +++++ | ||
42 | tests/07testreshape5.broken | 12 ++++++ | ||
43 | tests/09imsm-assemble.broken | 6 +++ | ||
44 | tests/09imsm-create-fail-rebuild.broken | 5 +++ | ||
45 | tests/09imsm-overlap.broken | 7 ++++ | ||
46 | tests/10ddf-assemble-missing.broken | 6 +++ | ||
47 | tests/10ddf-fail-create-race.broken | 7 ++++ | ||
48 | tests/10ddf-fail-two-spares.broken | 5 +++ | ||
49 | tests/10ddf-incremental-wrong-order.broken | 9 +++++ | ||
50 | tests/14imsm-r1_2d-grow-r1_3d.broken | 5 +++ | ||
51 | tests/14imsm-r1_2d-takeover-r0_2d.broken | 6 +++ | ||
52 | tests/18imsm-r10_4d-takeover-r0_2d.broken | 5 +++ | ||
53 | tests/18imsm-r1_2d-takeover-r0_1d.broken | 6 +++ | ||
54 | tests/19raid6auto-repair.broken | 5 +++ | ||
55 | tests/19raid6repair.broken | 5 +++ | ||
56 | 24 files changed, 226 insertions(+) | ||
57 | create mode 100644 tests/01r5integ.broken | ||
58 | create mode 100644 tests/01raid6integ.broken | ||
59 | create mode 100644 tests/04r5swap.broken | ||
60 | create mode 100644 tests/07autoassemble.broken | ||
61 | create mode 100644 tests/07autodetect.broken | ||
62 | create mode 100644 tests/07changelevelintr.broken | ||
63 | create mode 100644 tests/07changelevels.broken | ||
64 | create mode 100644 tests/07reshape5intr.broken | ||
65 | create mode 100644 tests/07revert-grow.broken | ||
66 | create mode 100644 tests/07revert-shrink.broken | ||
67 | create mode 100644 tests/07testreshape5.broken | ||
68 | create mode 100644 tests/09imsm-assemble.broken | ||
69 | create mode 100644 tests/09imsm-create-fail-rebuild.broken | ||
70 | create mode 100644 tests/09imsm-overlap.broken | ||
71 | create mode 100644 tests/10ddf-assemble-missing.broken | ||
72 | create mode 100644 tests/10ddf-fail-create-race.broken | ||
73 | create mode 100644 tests/10ddf-fail-two-spares.broken | ||
74 | create mode 100644 tests/10ddf-incremental-wrong-order.broken | ||
75 | create mode 100644 tests/14imsm-r1_2d-grow-r1_3d.broken | ||
76 | create mode 100644 tests/14imsm-r1_2d-takeover-r0_2d.broken | ||
77 | create mode 100644 tests/18imsm-r10_4d-takeover-r0_2d.broken | ||
78 | create mode 100644 tests/18imsm-r1_2d-takeover-r0_1d.broken | ||
79 | create mode 100644 tests/19raid6auto-repair.broken | ||
80 | create mode 100644 tests/19raid6repair.broken | ||
81 | |||
82 | diff --git a/tests/01r5integ.broken b/tests/01r5integ.broken | ||
83 | new file mode 100644 | ||
84 | index 0000000..2073763 | ||
85 | --- /dev/null | ||
86 | +++ b/tests/01r5integ.broken | ||
87 | @@ -0,0 +1,7 @@ | ||
88 | +fails rarely | ||
89 | + | ||
90 | +Fails about 1 in every 30 runs with a sha mismatch error: | ||
91 | + | ||
92 | + c49ab26e1b01def7874af9b8a6d6d0c29fdfafe6 /dev/md0 does not match | ||
93 | + 15dc2f73262f811ada53c65e505ceec9cf025cb9 /dev/md0 with /dev/loop3 | ||
94 | + missing | ||
95 | diff --git a/tests/01raid6integ.broken b/tests/01raid6integ.broken | ||
96 | new file mode 100644 | ||
97 | index 0000000..1df735f | ||
98 | --- /dev/null | ||
99 | +++ b/tests/01raid6integ.broken | ||
100 | @@ -0,0 +1,7 @@ | ||
101 | +fails infrequently | ||
102 | + | ||
103 | +Fails about 1 in 5 with a sha mismatch: | ||
104 | + | ||
105 | + 8286c2bc045ae2cfe9f8b7ae3a898fa25db6926f /dev/md0 does not match | ||
106 | + a083a0738b58caab37fd568b91b177035ded37df /dev/md0 with /dev/loop2 and | ||
107 | + /dev/loop3 missing | ||
108 | diff --git a/tests/04r5swap.broken b/tests/04r5swap.broken | ||
109 | new file mode 100644 | ||
110 | index 0000000..e38987d | ||
111 | --- /dev/null | ||
112 | +++ b/tests/04r5swap.broken | ||
113 | @@ -0,0 +1,7 @@ | ||
114 | +always fails | ||
115 | + | ||
116 | +Fails with errors: | ||
117 | + | ||
118 | + mdadm: /dev/loop0 has no superblock - assembly aborted | ||
119 | + | ||
120 | + ERROR: no recovery happening | ||
121 | diff --git a/tests/07autoassemble.broken b/tests/07autoassemble.broken | ||
122 | new file mode 100644 | ||
123 | index 0000000..8be0940 | ||
124 | --- /dev/null | ||
125 | +++ b/tests/07autoassemble.broken | ||
126 | @@ -0,0 +1,8 @@ | ||
127 | +always fails | ||
128 | + | ||
129 | +Prints lots of messages, but the array doesn't assemble. Error | ||
130 | +possibly related to: | ||
131 | + | ||
132 | + mdadm: /dev/md/1 is busy - skipping | ||
133 | + mdadm: no recogniseable superblock on /dev/md/testing:0 | ||
134 | + mdadm: /dev/md/2 is busy - skipping | ||
135 | diff --git a/tests/07autodetect.broken b/tests/07autodetect.broken | ||
136 | new file mode 100644 | ||
137 | index 0000000..294954a | ||
138 | --- /dev/null | ||
139 | +++ b/tests/07autodetect.broken | ||
140 | @@ -0,0 +1,5 @@ | ||
141 | +always fails | ||
142 | + | ||
143 | +Fails with error: | ||
144 | + | ||
145 | + ERROR: no resync happening | ||
146 | diff --git a/tests/07changelevelintr.broken b/tests/07changelevelintr.broken | ||
147 | new file mode 100644 | ||
148 | index 0000000..284b490 | ||
149 | --- /dev/null | ||
150 | +++ b/tests/07changelevelintr.broken | ||
151 | @@ -0,0 +1,9 @@ | ||
152 | +always fails | ||
153 | + | ||
154 | +Fails with errors: | ||
155 | + | ||
156 | + mdadm: this change will reduce the size of the array. | ||
157 | + use --grow --array-size first to truncate array. | ||
158 | + e.g. mdadm --grow /dev/md0 --array-size 56832 | ||
159 | + | ||
160 | + ERROR: no reshape happening | ||
161 | diff --git a/tests/07changelevels.broken b/tests/07changelevels.broken | ||
162 | new file mode 100644 | ||
163 | index 0000000..9b930d9 | ||
164 | --- /dev/null | ||
165 | +++ b/tests/07changelevels.broken | ||
166 | @@ -0,0 +1,9 @@ | ||
167 | +always fails | ||
168 | + | ||
169 | +Fails with errors: | ||
170 | + | ||
171 | + mdadm: /dev/loop0 is smaller than given size. 18976K < 19968K + metadata | ||
172 | + mdadm: /dev/loop1 is smaller than given size. 18976K < 19968K + metadata | ||
173 | + mdadm: /dev/loop2 is smaller than given size. 18976K < 19968K + metadata | ||
174 | + | ||
175 | + ERROR: /dev/md0 isn't a block device. | ||
176 | diff --git a/tests/07reshape5intr.broken b/tests/07reshape5intr.broken | ||
177 | new file mode 100644 | ||
178 | index 0000000..efe52a6 | ||
179 | --- /dev/null | ||
180 | +++ b/tests/07reshape5intr.broken | ||
181 | @@ -0,0 +1,45 @@ | ||
182 | +always fails | ||
183 | + | ||
184 | +This patch, recently added to md-next causes the test to always fail: | ||
185 | + | ||
186 | +7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex | ||
187 | +held") | ||
188 | + | ||
189 | +The new error is simply: | ||
190 | + | ||
191 | + ERROR: no reshape happening | ||
192 | + | ||
193 | +Before the patch, the error seen is below. | ||
194 | + | ||
195 | +-- | ||
196 | + | ||
197 | +fails infrequently | ||
198 | + | ||
199 | +Fails roughly 1 in 4 runs with errors: | ||
200 | + | ||
201 | + mdadm: Merging with already-assembled /dev/md/0 | ||
202 | + mdadm: cannot re-read metadata from /dev/loop6 - aborting | ||
203 | + | ||
204 | + ERROR: no reshape happening | ||
205 | + | ||
206 | +Also have seen a random deadlock: | ||
207 | + | ||
208 | + INFO: task mdadm:109702 blocked for more than 30 seconds. | ||
209 | + Not tainted 5.18.0-rc3-eid-vmlocalyes-dbg-00095-g3c2b5427979d #2040 | ||
210 | + "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. | ||
211 | + task:mdadm state:D stack: 0 pid:109702 ppid: 1 flags:0x00004000 | ||
212 | + Call Trace: | ||
213 | + <TASK> | ||
214 | + __schedule+0x67e/0x13b0 | ||
215 | + schedule+0x82/0x110 | ||
216 | + mddev_suspend+0x2e1/0x330 | ||
217 | + suspend_lo_store+0xbd/0x140 | ||
218 | + md_attr_store+0xcb/0x130 | ||
219 | + sysfs_kf_write+0x89/0xb0 | ||
220 | + kernfs_fop_write_iter+0x202/0x2c0 | ||
221 | + new_sync_write+0x222/0x330 | ||
222 | + vfs_write+0x3bc/0x4d0 | ||
223 | + ksys_write+0xd9/0x180 | ||
224 | + __x64_sys_write+0x43/0x50 | ||
225 | + do_syscall_64+0x3b/0x90 | ||
226 | + entry_SYSCALL_64_after_hwframe+0x44/0xae | ||
227 | diff --git a/tests/07revert-grow.broken b/tests/07revert-grow.broken | ||
228 | new file mode 100644 | ||
229 | index 0000000..9b6db86 | ||
230 | --- /dev/null | ||
231 | +++ b/tests/07revert-grow.broken | ||
232 | @@ -0,0 +1,31 @@ | ||
233 | +always fails | ||
234 | + | ||
235 | +This patch, recently added to md-next causes the test to always fail: | ||
236 | + | ||
237 | +7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex held") | ||
238 | + | ||
239 | +The errors are: | ||
240 | + | ||
241 | + mdadm: No active reshape to revert on /dev/loop0 | ||
242 | + ERROR: active raid5 not found | ||
243 | + | ||
244 | +Before the patch, the error seen is below. | ||
245 | + | ||
246 | +-- | ||
247 | + | ||
248 | +fails rarely | ||
249 | + | ||
250 | +Fails about 1 in every 30 runs with errors: | ||
251 | + | ||
252 | + mdadm: Merging with already-assembled /dev/md/0 | ||
253 | + mdadm: backup file /tmp/md-backup inaccessible: No such file or directory | ||
254 | + mdadm: failed to add /dev/loop1 to /dev/md/0: Invalid argument | ||
255 | + mdadm: failed to add /dev/loop2 to /dev/md/0: Invalid argument | ||
256 | + mdadm: failed to add /dev/loop3 to /dev/md/0: Invalid argument | ||
257 | + mdadm: failed to add /dev/loop0 to /dev/md/0: Invalid argument | ||
258 | + mdadm: /dev/md/0 assembled from 1 drive - need all 5 to start it | ||
259 | + (use --run to insist). | ||
260 | + | ||
261 | + grep: /sys/block/md*/md/sync_action: No such file or directory | ||
262 | + | ||
263 | + ERROR: active raid5 not found | ||
264 | diff --git a/tests/07revert-shrink.broken b/tests/07revert-shrink.broken | ||
265 | new file mode 100644 | ||
266 | index 0000000..c33c39e | ||
267 | --- /dev/null | ||
268 | +++ b/tests/07revert-shrink.broken | ||
269 | @@ -0,0 +1,9 @@ | ||
270 | +always fails | ||
271 | + | ||
272 | +Fails with errors: | ||
273 | + | ||
274 | + mdadm: this change will reduce the size of the array. | ||
275 | + use --grow --array-size first to truncate array. | ||
276 | + e.g. mdadm --grow /dev/md0 --array-size 53760 | ||
277 | + | ||
278 | + ERROR: active raid5 not found | ||
279 | diff --git a/tests/07testreshape5.broken b/tests/07testreshape5.broken | ||
280 | new file mode 100644 | ||
281 | index 0000000..a8ce03e | ||
282 | --- /dev/null | ||
283 | +++ b/tests/07testreshape5.broken | ||
284 | @@ -0,0 +1,12 @@ | ||
285 | +always fails | ||
286 | + | ||
287 | +Test seems to run 'test_stripe' at $dir directory, but $dir is never | ||
288 | +set. If $dir is adjusted to $PWD, the test still fails with: | ||
289 | + | ||
290 | + mdadm: /dev/loop2 is not suitable for this array. | ||
291 | + mdadm: create aborted | ||
292 | + ++ return 1 | ||
293 | + ++ cmp -s -n 8192 /dev/md0 /tmp/RandFile | ||
294 | + ++ echo cmp failed | ||
295 | + cmp failed | ||
296 | + ++ exit 2 | ||
297 | diff --git a/tests/09imsm-assemble.broken b/tests/09imsm-assemble.broken | ||
298 | new file mode 100644 | ||
299 | index 0000000..a6d4d5c | ||
300 | --- /dev/null | ||
301 | +++ b/tests/09imsm-assemble.broken | ||
302 | @@ -0,0 +1,6 @@ | ||
303 | +fails infrequently | ||
304 | + | ||
305 | +Fails roughly 1 in 10 runs with errors: | ||
306 | + | ||
307 | + mdadm: /dev/loop2 is still in use, cannot remove. | ||
308 | + /dev/loop2 removal from /dev/md/container should have succeeded | ||
309 | diff --git a/tests/09imsm-create-fail-rebuild.broken b/tests/09imsm-create-fail-rebuild.broken | ||
310 | new file mode 100644 | ||
311 | index 0000000..40c4b29 | ||
312 | --- /dev/null | ||
313 | +++ b/tests/09imsm-create-fail-rebuild.broken | ||
314 | @@ -0,0 +1,5 @@ | ||
315 | +always fails | ||
316 | + | ||
317 | +Fails with error: | ||
318 | + | ||
319 | + **Error**: Array size mismatch - expected 3072, actual 16384 | ||
320 | diff --git a/tests/09imsm-overlap.broken b/tests/09imsm-overlap.broken | ||
321 | new file mode 100644 | ||
322 | index 0000000..e7ccab7 | ||
323 | --- /dev/null | ||
324 | +++ b/tests/09imsm-overlap.broken | ||
325 | @@ -0,0 +1,7 @@ | ||
326 | +always fails | ||
327 | + | ||
328 | +Fails with errors: | ||
329 | + | ||
330 | + **Error**: Offset mismatch - expected 15360, actual 0 | ||
331 | + **Error**: Offset mismatch - expected 15360, actual 0 | ||
332 | + /dev/md/vol3 failed check | ||
333 | diff --git a/tests/10ddf-assemble-missing.broken b/tests/10ddf-assemble-missing.broken | ||
334 | new file mode 100644 | ||
335 | index 0000000..bfd8d10 | ||
336 | --- /dev/null | ||
337 | +++ b/tests/10ddf-assemble-missing.broken | ||
338 | @@ -0,0 +1,6 @@ | ||
339 | +always fails | ||
340 | + | ||
341 | +Fails with errors: | ||
342 | + | ||
343 | + ERROR: /dev/md/vol0 has unexpected state on /dev/loop10 | ||
344 | + ERROR: unexpected number of online disks on /dev/loop10 | ||
345 | diff --git a/tests/10ddf-fail-create-race.broken b/tests/10ddf-fail-create-race.broken | ||
346 | new file mode 100644 | ||
347 | index 0000000..6c0df02 | ||
348 | --- /dev/null | ||
349 | +++ b/tests/10ddf-fail-create-race.broken | ||
350 | @@ -0,0 +1,7 @@ | ||
351 | +usually fails | ||
352 | + | ||
353 | +Fails about 9 out of 10 times with many errors: | ||
354 | + | ||
355 | + mdadm: cannot open MISSING: No such file or directory | ||
356 | + ERROR: non-degraded array found | ||
357 | + ERROR: disk 0 not marked as failed in meta data | ||
358 | diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken | ||
359 | new file mode 100644 | ||
360 | index 0000000..eeea56d | ||
361 | --- /dev/null | ||
362 | +++ b/tests/10ddf-fail-two-spares.broken | ||
363 | @@ -0,0 +1,5 @@ | ||
364 | +fails infrequently | ||
365 | + | ||
366 | +Fails roughly 1 in 3 with error: | ||
367 | + | ||
368 | + ERROR: /dev/md/vol1 should be optimal in meta data | ||
369 | diff --git a/tests/10ddf-incremental-wrong-order.broken b/tests/10ddf-incremental-wrong-order.broken | ||
370 | new file mode 100644 | ||
371 | index 0000000..a5af3ba | ||
372 | --- /dev/null | ||
373 | +++ b/tests/10ddf-incremental-wrong-order.broken | ||
374 | @@ -0,0 +1,9 @@ | ||
375 | +always fails | ||
376 | + | ||
377 | +Fails with errors: | ||
378 | + ERROR: sha1sum of /dev/md/vol0 has changed | ||
379 | + ERROR: /dev/md/vol0 has unexpected state on /dev/loop10 | ||
380 | + ERROR: unexpected number of online disks on /dev/loop10 | ||
381 | + ERROR: /dev/md/vol0 has unexpected state on /dev/loop8 | ||
382 | + ERROR: unexpected number of online disks on /dev/loop8 | ||
383 | + ERROR: sha1sum of /dev/md/vol0 has changed | ||
384 | diff --git a/tests/14imsm-r1_2d-grow-r1_3d.broken b/tests/14imsm-r1_2d-grow-r1_3d.broken | ||
385 | new file mode 100644 | ||
386 | index 0000000..4ef1d40 | ||
387 | --- /dev/null | ||
388 | +++ b/tests/14imsm-r1_2d-grow-r1_3d.broken | ||
389 | @@ -0,0 +1,5 @@ | ||
390 | +always fails | ||
391 | + | ||
392 | +Fails with error: | ||
393 | + | ||
394 | + mdadm/tests/func.sh: line 325: dvsize/chunk: division by 0 (error token is "chunk") | ||
395 | diff --git a/tests/14imsm-r1_2d-takeover-r0_2d.broken b/tests/14imsm-r1_2d-takeover-r0_2d.broken | ||
396 | new file mode 100644 | ||
397 | index 0000000..89cd4e5 | ||
398 | --- /dev/null | ||
399 | +++ b/tests/14imsm-r1_2d-takeover-r0_2d.broken | ||
400 | @@ -0,0 +1,6 @@ | ||
401 | +always fails | ||
402 | + | ||
403 | +Fails with error: | ||
404 | + | ||
405 | + tests/func.sh: line 325: dvsize/chunk: division by 0 (error token | ||
406 | + is "chunk") | ||
407 | diff --git a/tests/18imsm-r10_4d-takeover-r0_2d.broken b/tests/18imsm-r10_4d-takeover-r0_2d.broken | ||
408 | new file mode 100644 | ||
409 | index 0000000..a27399f | ||
410 | --- /dev/null | ||
411 | +++ b/tests/18imsm-r10_4d-takeover-r0_2d.broken | ||
412 | @@ -0,0 +1,5 @@ | ||
413 | +fails rarely | ||
414 | + | ||
415 | +Fails about 1 run in 100 with message: | ||
416 | + | ||
417 | + ERROR: size is wrong for /dev/md/vol0: 2 * 5120 (chunk=128) = 20480, not 0 | ||
418 | diff --git a/tests/18imsm-r1_2d-takeover-r0_1d.broken b/tests/18imsm-r1_2d-takeover-r0_1d.broken | ||
419 | new file mode 100644 | ||
420 | index 0000000..aa1982e | ||
421 | --- /dev/null | ||
422 | +++ b/tests/18imsm-r1_2d-takeover-r0_1d.broken | ||
423 | @@ -0,0 +1,6 @@ | ||
424 | +always fails | ||
425 | + | ||
426 | +Fails with error: | ||
427 | + | ||
428 | + tests/func.sh: line 325: dvsize/chunk: division by 0 (error token | ||
429 | + is "chunk") | ||
430 | diff --git a/tests/19raid6auto-repair.broken b/tests/19raid6auto-repair.broken | ||
431 | new file mode 100644 | ||
432 | index 0000000..e91a142 | ||
433 | --- /dev/null | ||
434 | +++ b/tests/19raid6auto-repair.broken | ||
435 | @@ -0,0 +1,5 @@ | ||
436 | +always fails | ||
437 | + | ||
438 | +Fails with: | ||
439 | + | ||
440 | + "should detect errors" | ||
441 | diff --git a/tests/19raid6repair.broken b/tests/19raid6repair.broken | ||
442 | new file mode 100644 | ||
443 | index 0000000..e91a142 | ||
444 | --- /dev/null | ||
445 | +++ b/tests/19raid6repair.broken | ||
446 | @@ -0,0 +1,5 @@ | ||
447 | +always fails | ||
448 | + | ||
449 | +Fails with: | ||
450 | + | ||
451 | + "should detect errors" | ||
452 | -- | ||
453 | 2.39.1 | ||
454 | |||
diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch index fa90647489..b758fcd0ab 100644 --- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch +++ b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001 | 1 | From 319b3191f088cea7b0fb6038ab7625d5e049dcf7 Mon Sep 17 00:00:00 2001 |
2 | From: "martin f. krafft" <madduck@debian.org> | 2 | From: "martin f. krafft" <madduck@debian.org> |
3 | Date: Mon, 3 Jan 2022 19:14:12 +0000 | 3 | Date: Mon, 3 Jan 2022 19:14:12 +0000 |
4 | Subject: [PATCH] Remove -Werror from compiler flags | 4 | Subject: [PATCH] Remove -Werror from compiler flags |
@@ -10,21 +10,20 @@ use it to beautify the code, but remove it for out builds. | |||
10 | Signed-off-by: martin f. krafft <madduck@debian.org> | 10 | Signed-off-by: martin f. krafft <madduck@debian.org> |
11 | 11 | ||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | |||
14 | --- | 13 | --- |
15 | Makefile | 2 +- | 14 | Makefile | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 16 | ||
18 | diff --git a/Makefile b/Makefile | 17 | diff --git a/Makefile b/Makefile |
19 | index 716c97c..40354ea 100644 | 18 | index 9ab6a65..1141971 100644 |
20 | --- a/Makefile | 19 | --- a/Makefile |
21 | +++ b/Makefile | 20 | +++ b/Makefile |
22 | @@ -50,7 +50,7 @@ ifeq ($(origin CC),default) | 21 | @@ -50,7 +50,7 @@ ifeq ($(origin CC),default) |
23 | CC := $(CROSS_COMPILE)gcc | 22 | CC := $(CROSS_COMPILE)gcc |
24 | endif | 23 | endif |
25 | CXFLAGS ?= -ggdb | 24 | CXFLAGS ?= -ggdb |
26 | -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter | 25 | -CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds |
27 | +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter | 26 | +CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds |
28 | ifdef WARN_UNUSED | 27 | ifdef WARN_UNUSED |
29 | CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 | 28 | CWFLAGS += -Wp -O3 |
30 | endif | 29 | endif |
diff --git a/meta/recipes-extended/mdadm/files/include_sysmacros.patch b/meta/recipes-extended/mdadm/files/include_sysmacros.patch deleted file mode 100644 index 8a1d8342d8..0000000000 --- a/meta/recipes-extended/mdadm/files/include_sysmacros.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | include sys/sysmacros.h for major/minor macro definitions | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | --- a/mdadm.h | ||
6 | +++ b/mdadm.h | ||
7 | @@ -35,6 +35,7 @@ extern __off64_t lseek64 __P ((int __fd, | ||
8 | |||
9 | #include <sys/types.h> | ||
10 | #include <sys/stat.h> | ||
11 | +#include <sys/sysmacros.h> | ||
12 | #include <stdint.h> | ||
13 | #include <stdlib.h> | ||
14 | #include <time.h> | ||
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch index 7a2c888701..ecd1f037d0 100644 --- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch +++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e37f7f6a0f1ef1b594574d11a8b90b8c861d047b Mon Sep 17 00:00:00 2001 | 1 | From ca91d9fc07943f209988411f2596e4b69828f208 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> | 2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> |
3 | Date: Sun, 15 Mar 2015 09:02:14 +0000 | 3 | Date: Sun, 15 Mar 2015 09:02:14 +0000 |
4 | Subject: [PATCH] mdadm: Fix build in x32 ABI | 4 | Subject: [PATCH] mdadm: Fix build in x32 ABI |
@@ -12,16 +12,15 @@ data type in x32 ABI is long long int. | |||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | 13 | ||
14 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | 14 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> |
15 | |||
16 | --- | 15 | --- |
17 | monitor.c | 5 ++++- | 16 | monitor.c | 5 ++++- |
18 | 1 file changed, 4 insertions(+), 1 deletion(-) | 17 | 1 file changed, 4 insertions(+), 1 deletion(-) |
19 | 18 | ||
20 | diff --git a/monitor.c b/monitor.c | 19 | diff --git a/monitor.c b/monitor.c |
21 | index 81537ed..7c33382 100644 | 20 | index 4acec67..8dcdfd6 100644 |
22 | --- a/monitor.c | 21 | --- a/monitor.c |
23 | +++ b/monitor.c | 22 | +++ b/monitor.c |
24 | @@ -445,9 +445,12 @@ static int read_and_act(struct active_array *a, fd_set *fds) | 23 | @@ -447,9 +447,12 @@ static int read_and_act(struct active_array *a, fd_set *fds) |
25 | if (FD_ISSET(mdi->bb_fd, fds)) | 24 | if (FD_ISSET(mdi->bb_fd, fds)) |
26 | check_for_cleared_bb(a, mdi); | 25 | check_for_cleared_bb(a, mdi); |
27 | } | 26 | } |
diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 6f87249398..63c61b68c9 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb | |||
@@ -17,31 +17,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ | |||
17 | file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ | 17 | file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ |
18 | file://0001-fix-gcc-8-format-truncation-warning.patch \ | 18 | file://0001-fix-gcc-8-format-truncation-warning.patch \ |
19 | file://debian-no-Werror.patch \ | 19 | file://debian-no-Werror.patch \ |
20 | file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \ | ||
21 | file://mdadm.init \ | 20 | file://mdadm.init \ |
22 | file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ | 21 | file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ |
23 | file://include_sysmacros.patch \ | ||
24 | file://0001-mdadm-skip-test-11spare-migration.patch \ | ||
25 | file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \ | ||
26 | file://0001-Makefile-install-mdcheck.patch \ | 22 | file://0001-Makefile-install-mdcheck.patch \ |
27 | file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ | 23 | file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ |
28 | file://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ | 24 | file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ |
29 | file://0001-mdadm-Fix-optional-write-behind-parameter.patch \ | 25 | file://0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch \ |
30 | file://0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch \ | 26 | file://0001-include-libgen.h-for-basename-API.patch \ |
31 | file://0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch \ | ||
32 | file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \ | ||
33 | file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \ | ||
34 | file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \ | ||
35 | file://0001-DDF-Cleanup-validate_geometry_ddf_container.patch \ | ||
36 | file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ | ||
37 | file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ | ||
38 | file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ | ||
39 | file://0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch \ | ||
40 | file://0006-tests-Add-broken-files-for-all-broken-tests.patch \ | ||
41 | file://0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch \ | ||
42 | " | 27 | " |
43 | 28 | ||
44 | SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" | 29 | SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" |
45 | 30 | ||
46 | inherit autotools-brokensep ptest systemd | 31 | inherit autotools-brokensep ptest systemd |
47 | 32 | ||
@@ -59,7 +44,7 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' | |||
59 | CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' | 44 | CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' |
60 | 45 | ||
61 | EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ | 46 | EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ |
62 | BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"' | 47 | BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' |
63 | 48 | ||
64 | DEBUG_OPTIMIZATION:append = " -Wno-error" | 49 | DEBUG_OPTIMIZATION:append = " -Wno-error" |
65 | 50 | ||
@@ -76,7 +61,7 @@ do_install:append() { | |||
76 | install -d ${D}/${sysconfdir}/ | 61 | install -d ${D}/${sysconfdir}/ |
77 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf | 62 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf |
78 | install -d ${D}/${sysconfdir}/init.d | 63 | install -d ${D}/${sysconfdir}/init.d |
79 | install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor | 64 | install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor |
80 | } | 65 | } |
81 | 66 | ||
82 | do_install:append() { | 67 | do_install:append() { |
@@ -91,7 +76,6 @@ do_install_ptest() { | |||
91 | cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests | 76 | cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests |
92 | cp ${S}/test ${D}${PTEST_PATH} | 77 | cp ${S}/test ${D}${PTEST_PATH} |
93 | sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test | 78 | sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test |
94 | sed -e 's!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/tests/* | ||
95 | sed -i -e '/echo -ne "$_script... "/d' \ | 79 | sed -i -e '/echo -ne "$_script... "/d' \ |
96 | -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \ | 80 | -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \ |
97 | -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \ | 81 | -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \ |
diff --git a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch b/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch deleted file mode 100644 index 95c437df4f..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 9b96fcfa5748934b8b6a4db4ee25a5e3165905c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 1 Jul 2023 07:48:17 -0700 | ||
4 | Subject: [PATCH] examples: Replace use of termio.h with termios.h | ||
5 | |||
6 | Fixes build with musl and makes it portable | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | examples/tty_conv.c | 5 +++-- | ||
12 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/examples/tty_conv.c b/examples/tty_conv.c | ||
15 | index 23f0684..db22500 100644 | ||
16 | --- a/examples/tty_conv.c | ||
17 | +++ b/examples/tty_conv.c | ||
18 | @@ -6,7 +6,8 @@ | ||
19 | #include <string.h> | ||
20 | #include <errno.h> | ||
21 | #include <unistd.h> | ||
22 | -#include <termio.h> | ||
23 | +#include <termios.h> | ||
24 | +#include <sys/ioctl.h> | ||
25 | #include <security/pam_appl.h> | ||
26 | |||
27 | /*************************************** | ||
28 | @@ -16,7 +17,7 @@ | ||
29 | ***************************************/ | ||
30 | static void echoOff(int fd, int off) | ||
31 | { | ||
32 | - struct termio tty; | ||
33 | + struct termios tty; | ||
34 | if (ioctl(fd, TCGETA, &tty) < 0) | ||
35 | { | ||
36 | fprintf(stderr, "TCGETA failed: %s\n", strerror(errno)); | ||
37 | -- | ||
38 | 2.41.0 | ||
39 | |||
diff --git a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch b/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch deleted file mode 100644 index 124e5f1c3c..0000000000 --- a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jacob Heider <jacob@pkgx.dev> | ||
3 | Date: Wed, 17 Jan 2024 11:49:26 -0500 | ||
4 | Subject: [PATCH] pam_namespace: include stdint.h | ||
5 | |||
6 | pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, | ||
7 | resulting in the following build failures on 1.6.0: | ||
8 | |||
9 | pam_namespace.c: In function 'process_line': | ||
10 | pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) | ||
11 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
12 | | ^~~~~~~~ | ||
13 | pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'? | ||
14 | 40 | #include "argv_parse.h" | ||
15 | +++ |+#include <stdint.h> | ||
16 | 41 | | ||
17 | pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in | ||
18 | 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ||
19 | | ^~~~~~~~ | ||
20 | |||
21 | Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") | ||
22 | Resolves: https://github.com/linux-pam/linux-pam/issues/733 | ||
23 | |||
24 | Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13] | ||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
26 | --- | ||
27 | modules/pam_namespace/pam_namespace.c | 2 ++ | ||
28 | 1 file changed, 2 insertions(+) | ||
29 | |||
30 | diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c | ||
31 | index f72d67189..b16731c22 100644 | ||
32 | --- a/modules/pam_namespace/pam_namespace.c | ||
33 | +++ b/modules/pam_namespace/pam_namespace.c | ||
34 | @@ -34,6 +34,8 @@ | ||
35 | |||
36 | #define _ATFILE_SOURCE | ||
37 | |||
38 | +#include "config.h" | ||
39 | +#include <stdint.h> | ||
40 | #include "pam_cc_compat.h" | ||
41 | #include "pam_inline.h" | ||
42 | #include "pam_namespace.h" | ||
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch index ea145899b4..f2dafa72a5 100644 --- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch +++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch | |||
@@ -1,13 +1,21 @@ | |||
1 | This patch is used to create a new sub package libpam-xtests to do more checks. | 1 | From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001 |
2 | From: Kang Kai <kai.kang@windriver.com> | ||
3 | Date: Tue, 19 Jul 2011 17:08:31 +0800 | ||
4 | Subject: [PATCH] This patch is used to create a new sub package libpam-xtests | ||
5 | to do more checks. | ||
2 | 6 | ||
3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
4 | 8 | ||
5 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 9 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
6 | Index: Linux-PAM-1.3.0/xtests/Makefile.am | 10 | --- |
7 | =================================================================== | 11 | xtests/Makefile.am | 17 ++++++++++++++++- |
8 | --- Linux-PAM-1.3.0.orig/xtests/Makefile.am | 12 | 1 file changed, 16 insertions(+), 1 deletion(-) |
9 | +++ Linux-PAM-1.3.0/xtests/Makefile.am | 13 | |
10 | @@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src | 14 | diff --git a/xtests/Makefile.am b/xtests/Makefile.am |
15 | index acf9746..9826c9f 100644 | ||
16 | --- a/xtests/Makefile.am | ||
17 | +++ b/xtests/Makefile.am | ||
18 | @@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \ | ||
11 | LDADD = $(top_builddir)/libpam/libpam.la \ | 19 | LDADD = $(top_builddir)/libpam/libpam.la \ |
12 | $(top_builddir)/libpam_misc/libpam_misc.la | 20 | $(top_builddir)/libpam_misc/libpam_misc.la |
13 | 21 | ||
@@ -16,7 +24,7 @@ Index: Linux-PAM-1.3.0/xtests/Makefile.am | |||
16 | 24 | ||
17 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ | 25 | EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ |
18 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ | 26 | tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ |
19 | @@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) | 27 | @@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS) |
20 | 28 | ||
21 | xtests: $(XTESTS) run-xtests.sh | 29 | xtests: $(XTESTS) run-xtests.sh |
22 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} | 30 | "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} |
diff --git a/meta/recipes-extended/pam/libpam_1.5.3.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb index 2a53bb4cc5..9f2106ea73 100644 --- a/meta/recipes-extended/pam/libpam_1.5.3.bb +++ b/meta/recipes-extended/pam/libpam_1.6.1.bb | |||
@@ -21,13 +21,11 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ | |||
21 | file://pam.d/common-session-noninteractive \ | 21 | file://pam.d/common-session-noninteractive \ |
22 | file://pam.d/other \ | 22 | file://pam.d/other \ |
23 | file://libpam-xtests.patch \ | 23 | file://libpam-xtests.patch \ |
24 | file://0001-examples-Replace-use-of-termio.h-with-termios.h.patch \ | ||
25 | file://run-ptest \ | 24 | file://run-ptest \ |
26 | file://pam-volatiles.conf \ | 25 | file://pam-volatiles.conf \ |
27 | file://0001-pam_namespace-include-stdint-h.patch \ | ||
28 | " | 26 | " |
29 | 27 | ||
30 | SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283" | 28 | SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e" |
31 | 29 | ||
32 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" | 30 | DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" |
33 | 31 | ||
@@ -140,16 +138,16 @@ do_install() { | |||
140 | rm -rf ${D}${sysconfdir}/init.d/ | 138 | rm -rf ${D}${sysconfdir}/init.d/ |
141 | rm -rf ${D}${sysconfdir}/rc* | 139 | rm -rf ${D}${sysconfdir}/rc* |
142 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 140 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
143 | install -m 0644 ${WORKDIR}/pam-volatiles.conf \ | 141 | install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \ |
144 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf | 142 | ${D}${nonarch_libdir}/tmpfiles.d/pam.conf |
145 | else | 143 | else |
146 | install -d ${D}${sysconfdir}/default/volatiles | 144 | install -d ${D}${sysconfdir}/default/volatiles |
147 | install -m 0644 ${WORKDIR}/99_pam \ | 145 | install -m 0644 ${UNPACKDIR}/99_pam \ |
148 | ${D}${sysconfdir}/default/volatiles/ | 146 | ${D}${sysconfdir}/default/volatiles/ |
149 | fi | 147 | fi |
150 | 148 | ||
151 | install -d ${D}${sysconfdir}/pam.d/ | 149 | install -d ${D}${sysconfdir}/pam.d/ |
152 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 150 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
153 | 151 | ||
154 | # The lsb requires unix_chkpwd has setuid permission | 152 | # The lsb requires unix_chkpwd has setuid permission |
155 | chmod 4755 ${D}${sbindir}/unix_chkpwd | 153 | chmod 4755 ${D}${sbindir}/unix_chkpwd |
diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb index 800384f22f..789e0c2747 100644 --- a/meta/recipes-extended/procps/procps_4.0.4.bb +++ b/meta/recipes-extended/procps/procps_4.0.4.bb | |||
@@ -41,7 +41,7 @@ do_install:append () { | |||
41 | fi | 41 | fi |
42 | 42 | ||
43 | install -d ${D}${sysconfdir} | 43 | install -d ${D}${sysconfdir} |
44 | install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf | 44 | install -m 0644 ${UNPACKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf |
45 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 45 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
46 | install -d ${D}${sysconfdir}/sysctl.d | 46 | install -d ${D}${sysconfdir}/sysctl.d |
47 | ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf | 47 | ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf |
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch index ca13bdbd15..01335bdf40 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 | 1 | From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 | 3 | Date: Thu, 24 Mar 2016 15:46:14 +0000 |
4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE | 4 | Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE |
@@ -13,7 +13,7 @@ Upstream-Status: Pending | |||
13 | 1 file changed, 8 insertions(+), 5 deletions(-) | 13 | 1 file changed, 8 insertions(+), 5 deletions(-) |
14 | 14 | ||
15 | diff --git a/src/peekfd.c b/src/peekfd.c | 15 | diff --git a/src/peekfd.c b/src/peekfd.c |
16 | index 5aa990a..7e8e3fc 100644 | 16 | index 36dff04..2b4b1dc 100644 |
17 | --- a/src/peekfd.c | 17 | --- a/src/peekfd.c |
18 | +++ b/src/peekfd.c | 18 | +++ b/src/peekfd.c |
19 | @@ -30,8 +30,11 @@ | 19 | @@ -30,8 +30,11 @@ |
@@ -28,7 +28,7 @@ index 5aa990a..7e8e3fc 100644 | |||
28 | #include <getopt.h> | 28 | #include <getopt.h> |
29 | #include <ctype.h> | 29 | #include <ctype.h> |
30 | #include <dirent.h> | 30 | #include <dirent.h> |
31 | @@ -266,11 +269,11 @@ int main(int argc, char **argv) | 31 | @@ -341,11 +344,11 @@ int main(int argc, char **argv) |
32 | if (WIFSTOPPED(status)) { | 32 | if (WIFSTOPPED(status)) { |
33 | #ifdef PPC | 33 | #ifdef PPC |
34 | struct pt_regs regs; | 34 | struct pt_regs regs; |
diff --git a/meta/recipes-extended/psmisc/psmisc_23.6.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb index 2e55ad00bd..ea272cd92d 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.6.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb | |||
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
5 | SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ | 5 | SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ |
6 | file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ | 6 | file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ |
7 | " | 7 | " |
8 | SRCREV = "3098e641dc1ddb210186f53464255670b480377b" | 8 | SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c" |
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb index dbd4d32e0a..e751eb631c 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb | |||
@@ -46,9 +46,9 @@ do_install:append () { | |||
46 | install -d ${D}${sysconfdir}/init.d | 46 | install -d ${D}${sysconfdir}/init.d |
47 | sed -e 's,/etc/,${sysconfdir}/,g' \ | 47 | sed -e 's,/etc/,${sysconfdir}/,g' \ |
48 | -e 's,/sbin/,${sbindir}/,g' \ | 48 | -e 's,/sbin/,${sbindir}/,g' \ |
49 | ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind | 49 | ${UNPACKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind |
50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind | 50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind |
51 | install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf | 51 | install -m 0644 ${UNPACKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf |
52 | } | 52 | } |
53 | 53 | ||
54 | ALTERNATIVE:${PN} = "rpcinfo" | 54 | ALTERNATIVE:${PN} = "rpcinfo" |
diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_4.9.1.bb index 7b040e6b57..57d1481049 100644 --- a/meta/recipes-extended/screen/screen_4.9.1.bb +++ b/meta/recipes-extended/screen/screen_4.9.1.bb | |||
@@ -36,7 +36,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sy | |||
36 | do_install:append () { | 36 | do_install:append () { |
37 | install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc | 37 | install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc |
38 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 38 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
39 | install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen | 39 | install -D -m 644 ${UNPACKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen |
40 | fi | 40 | fi |
41 | } | 41 | } |
42 | 42 | ||
diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch index d278a4cda3..2e5503bfd4 100644 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch | |||
@@ -16,11 +16,9 @@ Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | |||
16 | lib/copydir.c | 3 ++- | 16 | lib/copydir.c | 3 ++- |
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | 17 | 1 file changed, 2 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | Index: shadow-4.14.2/lib/copydir.c | 19 | --- a/lib/copydir.c |
20 | =================================================================== | 20 | +++ b/lib/copydir.c |
21 | --- shadow-4.14.2.orig/lib/copydir.c | 21 | @@ -400,6 +400,7 @@ static int copy_entry (const struct path |
22 | +++ shadow-4.14.2/lib/copydir.c | ||
23 | @@ -415,6 +415,7 @@ static int copy_entry (const struct path | ||
24 | { | 22 | { |
25 | int err = 0; | 23 | int err = 0; |
26 | struct stat sb; | 24 | struct stat sb; |
@@ -28,12 +26,12 @@ Index: shadow-4.14.2/lib/copydir.c | |||
28 | struct link_name *lp; | 26 | struct link_name *lp; |
29 | struct timespec mt[2]; | 27 | struct timespec mt[2]; |
30 | 28 | ||
31 | @@ -436,7 +437,7 @@ static int copy_entry (const struct path | 29 | @@ -423,7 +424,7 @@ static int copy_entry (const struct path |
32 | * If the destination already exists do nothing. | 30 | * If the destination already exists do nothing. |
33 | * This is after the copy_dir above to still iterate into subdirectories. | 31 | * This is after the copy_dir above to still iterate into subdirectories. |
34 | */ | 32 | */ |
35 | - if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { | 33 | - if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { |
36 | + if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { | 34 | + if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { |
37 | return 0; | 35 | return err; |
38 | } | 36 | } |
39 | 37 | ||
diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch index 4a932d2dbb..cd99aad135 100644 --- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a773c6b240d27e23d6be41decef0edf24fcee523 Mon Sep 17 00:00:00 2001 | 1 | From f512071dd3a4c29d4bf048c5a89c4ba9160e37b1 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Thu, 17 Jul 2014 15:53:34 +0800 | 3 | Date: Thu, 17 Jul 2014 15:53:34 +0800 |
4 | Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env | 4 | Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env |
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
20 | 1 file changed, 12 insertions(+), 4 deletions(-) | 20 | 1 file changed, 12 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/lib/commonio.c b/lib/commonio.c | 22 | diff --git a/lib/commonio.c b/lib/commonio.c |
23 | index 73fdb3a..d1231e9 100644 | 23 | index 01a26c9..82b2868 100644 |
24 | --- a/lib/commonio.c | 24 | --- a/lib/commonio.c |
25 | +++ b/lib/commonio.c | 25 | +++ b/lib/commonio.c |
26 | @@ -606,10 +606,18 @@ int commonio_open (struct commonio_db *db, int mode) | 26 | @@ -601,10 +601,18 @@ int commonio_open (struct commonio_db *db, int mode) |
27 | db->cursor = NULL; | 27 | db->cursor = NULL; |
28 | db->changed = false; | 28 | db->changed = false; |
29 | 29 | ||
@@ -46,6 +46,3 @@ index 73fdb3a..d1231e9 100644 | |||
46 | db->fp = NULL; | 46 | db->fp = NULL; |
47 | if (fd >= 0) { | 47 | if (fd >= 0) { |
48 | #ifdef WITH_TCB | 48 | #ifdef WITH_TCB |
49 | -- | ||
50 | 2.30.2 | ||
51 | |||
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch index 3b61b75e5b..1eacb8a53f 100644 --- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch +++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 38882ab288fd4d2cc2e45dff222ae3412c8fe357 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kang Kai <kai.kang@windriver.com> | ||
3 | Date: Wed, 20 Jul 2011 19:18:14 +0800 | ||
4 | Subject: [PATCH] shadow: update pam related configure files | ||
5 | |||
1 | The system-auth in the configure files is from Fedora which put all the 4 pam type rules | 6 | The system-auth in the configure files is from Fedora which put all the 4 pam type rules |
2 | in one file. | 7 | in one file. |
3 | In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account, | 8 | In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account, |
@@ -9,82 +14,102 @@ See meta/recipes-extended/pam/libpam/pam.d/common-password | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | 14 | Upstream-Status: Inappropriate [oe-core specific] |
10 | 15 | ||
11 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | 16 | Signed-off-by: Kang Kai <kai.kang@windriver.com> |
17 | --- | ||
18 | etc/pam.d/chage | 2 +- | ||
19 | etc/pam.d/chgpasswd | 2 +- | ||
20 | etc/pam.d/groupadd | 2 +- | ||
21 | etc/pam.d/groupdel | 2 +- | ||
22 | etc/pam.d/groupmems | 2 +- | ||
23 | etc/pam.d/groupmod | 2 +- | ||
24 | etc/pam.d/useradd | 2 +- | ||
25 | etc/pam.d/userdel | 2 +- | ||
26 | etc/pam.d/usermod | 2 +- | ||
27 | 9 files changed, 9 insertions(+), 9 deletions(-) | ||
12 | 28 | ||
13 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chage shadow-4.1.4.3/etc/pam.d/chage | 29 | diff --git a/etc/pam.d/chage b/etc/pam.d/chage |
14 | --- shadow-4.1.4.3/etc/pam.d.orig/chage 2011-07-20 19:02:27.384844958 +0800 | 30 | index 8f49f5c..b1f365d 100644 |
15 | +++ shadow-4.1.4.3/etc/pam.d/chage 2011-07-20 19:03:08.964844958 +0800 | 31 | --- a/etc/pam.d/chage |
32 | +++ b/etc/pam.d/chage | ||
16 | @@ -1,4 +1,4 @@ | 33 | @@ -1,4 +1,4 @@ |
17 | #%PAM-1.0 | 34 | #%PAM-1.0 |
18 | auth sufficient pam_rootok.so | 35 | auth sufficient pam_rootok.so |
19 | account required pam_permit.so | 36 | account required pam_permit.so |
20 | -password include system-auth | 37 | -password include system-auth |
21 | +password include common-password | 38 | +password include common-password |
22 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chgpasswd shadow-4.1.4.3/etc/pam.d/chgpasswd | 39 | diff --git a/etc/pam.d/chgpasswd b/etc/pam.d/chgpasswd |
23 | --- shadow-4.1.4.3/etc/pam.d.orig/chgpasswd 2011-07-20 19:02:27.384844958 +0800 | 40 | index 8f49f5c..b1f365d 100644 |
24 | +++ shadow-4.1.4.3/etc/pam.d/chgpasswd 2011-07-20 19:03:26.544844958 +0800 | 41 | --- a/etc/pam.d/chgpasswd |
42 | +++ b/etc/pam.d/chgpasswd | ||
25 | @@ -1,4 +1,4 @@ | 43 | @@ -1,4 +1,4 @@ |
26 | #%PAM-1.0 | 44 | #%PAM-1.0 |
27 | auth sufficient pam_rootok.so | 45 | auth sufficient pam_rootok.so |
28 | account required pam_permit.so | 46 | account required pam_permit.so |
29 | -password include system-auth | 47 | -password include system-auth |
30 | +password include common-password | 48 | +password include common-password |
31 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupadd shadow-4.1.4.3/etc/pam.d/groupadd | 49 | diff --git a/etc/pam.d/groupadd b/etc/pam.d/groupadd |
32 | --- shadow-4.1.4.3/etc/pam.d.orig/groupadd 2011-07-20 19:02:27.384844958 +0800 | 50 | index 8f49f5c..b1f365d 100644 |
33 | +++ shadow-4.1.4.3/etc/pam.d/groupadd 2011-07-20 19:04:08.124844958 +0800 | 51 | --- a/etc/pam.d/groupadd |
52 | +++ b/etc/pam.d/groupadd | ||
34 | @@ -1,4 +1,4 @@ | 53 | @@ -1,4 +1,4 @@ |
35 | #%PAM-1.0 | 54 | #%PAM-1.0 |
36 | auth sufficient pam_rootok.so | 55 | auth sufficient pam_rootok.so |
37 | account required pam_permit.so | 56 | account required pam_permit.so |
38 | -password include system-auth | 57 | -password include system-auth |
39 | +password include common-password | 58 | +password include common-password |
40 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupdel shadow-4.1.4.3/etc/pam.d/groupdel | 59 | diff --git a/etc/pam.d/groupdel b/etc/pam.d/groupdel |
41 | --- shadow-4.1.4.3/etc/pam.d.orig/groupdel 2011-07-20 19:02:27.384844958 +0800 | 60 | index 8f49f5c..b1f365d 100644 |
42 | +++ shadow-4.1.4.3/etc/pam.d/groupdel 2011-07-20 19:04:26.114844958 +0800 | 61 | --- a/etc/pam.d/groupdel |
62 | +++ b/etc/pam.d/groupdel | ||
43 | @@ -1,4 +1,4 @@ | 63 | @@ -1,4 +1,4 @@ |
44 | #%PAM-1.0 | 64 | #%PAM-1.0 |
45 | auth sufficient pam_rootok.so | 65 | auth sufficient pam_rootok.so |
46 | account required pam_permit.so | 66 | account required pam_permit.so |
47 | -password include system-auth | 67 | -password include system-auth |
48 | +password include common-password | 68 | +password include common-password |
49 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmems shadow-4.1.4.3/etc/pam.d/groupmems | 69 | diff --git a/etc/pam.d/groupmems b/etc/pam.d/groupmems |
50 | --- shadow-4.1.4.3/etc/pam.d.orig/groupmems 2011-07-20 19:02:27.384844958 +0800 | 70 | index 8f49f5c..b1f365d 100644 |
51 | +++ shadow-4.1.4.3/etc/pam.d/groupmems 2011-07-20 19:04:35.074844958 +0800 | 71 | --- a/etc/pam.d/groupmems |
72 | +++ b/etc/pam.d/groupmems | ||
52 | @@ -1,4 +1,4 @@ | 73 | @@ -1,4 +1,4 @@ |
53 | #%PAM-1.0 | 74 | #%PAM-1.0 |
54 | auth sufficient pam_rootok.so | 75 | auth sufficient pam_rootok.so |
55 | account required pam_permit.so | 76 | account required pam_permit.so |
56 | -password include system-auth | 77 | -password include system-auth |
57 | +password include common-password | 78 | +password include common-password |
58 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmod shadow-4.1.4.3/etc/pam.d/groupmod | 79 | diff --git a/etc/pam.d/groupmod b/etc/pam.d/groupmod |
59 | --- shadow-4.1.4.3/etc/pam.d.orig/groupmod 2011-07-20 19:02:27.384844958 +0800 | 80 | index 8f49f5c..b1f365d 100644 |
60 | +++ shadow-4.1.4.3/etc/pam.d/groupmod 2011-07-20 19:04:44.864844958 +0800 | 81 | --- a/etc/pam.d/groupmod |
82 | +++ b/etc/pam.d/groupmod | ||
61 | @@ -1,4 +1,4 @@ | 83 | @@ -1,4 +1,4 @@ |
62 | #%PAM-1.0 | 84 | #%PAM-1.0 |
63 | auth sufficient pam_rootok.so | 85 | auth sufficient pam_rootok.so |
64 | account required pam_permit.so | 86 | account required pam_permit.so |
65 | -password include system-auth | 87 | -password include system-auth |
66 | +password include common-password | 88 | +password include common-password |
67 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/useradd shadow-4.1.4.3/etc/pam.d/useradd | 89 | diff --git a/etc/pam.d/useradd b/etc/pam.d/useradd |
68 | --- shadow-4.1.4.3/etc/pam.d.orig/useradd 2011-07-20 19:02:27.384844958 +0800 | 90 | index 8f49f5c..b1f365d 100644 |
69 | +++ shadow-4.1.4.3/etc/pam.d/useradd 2011-07-20 19:07:26.244844958 +0800 | 91 | --- a/etc/pam.d/useradd |
92 | +++ b/etc/pam.d/useradd | ||
70 | @@ -1,4 +1,4 @@ | 93 | @@ -1,4 +1,4 @@ |
71 | #%PAM-1.0 | 94 | #%PAM-1.0 |
72 | auth sufficient pam_rootok.so | 95 | auth sufficient pam_rootok.so |
73 | account required pam_permit.so | 96 | account required pam_permit.so |
74 | -password include system-auth | 97 | -password include system-auth |
75 | +password include common-password | 98 | +password include common-password |
76 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/userdel shadow-4.1.4.3/etc/pam.d/userdel | 99 | diff --git a/etc/pam.d/userdel b/etc/pam.d/userdel |
77 | --- shadow-4.1.4.3/etc/pam.d.orig/userdel 2011-07-20 19:02:27.384844958 +0800 | 100 | index 8f49f5c..b1f365d 100644 |
78 | +++ shadow-4.1.4.3/etc/pam.d/userdel 2011-07-20 19:07:35.734844958 +0800 | 101 | --- a/etc/pam.d/userdel |
102 | +++ b/etc/pam.d/userdel | ||
79 | @@ -1,4 +1,4 @@ | 103 | @@ -1,4 +1,4 @@ |
80 | #%PAM-1.0 | 104 | #%PAM-1.0 |
81 | auth sufficient pam_rootok.so | 105 | auth sufficient pam_rootok.so |
82 | account required pam_permit.so | 106 | account required pam_permit.so |
83 | -password include system-auth | 107 | -password include system-auth |
84 | +password include common-password | 108 | +password include common-password |
85 | diff -Nur shadow-4.1.4.3/etc/pam.d.orig/usermod shadow-4.1.4.3/etc/pam.d/usermod | 109 | diff --git a/etc/pam.d/usermod b/etc/pam.d/usermod |
86 | --- shadow-4.1.4.3/etc/pam.d.orig/usermod 2011-07-20 19:02:27.384844958 +0800 | 110 | index 8f49f5c..b1f365d 100644 |
87 | +++ shadow-4.1.4.3/etc/pam.d/usermod 2011-07-20 19:07:42.024844958 +0800 | 111 | --- a/etc/pam.d/usermod |
112 | +++ b/etc/pam.d/usermod | ||
88 | @@ -1,4 +1,4 @@ | 113 | @@ -1,4 +1,4 @@ |
89 | #%PAM-1.0 | 114 | #%PAM-1.0 |
90 | auth sufficient pam_rootok.so | 115 | auth sufficient pam_rootok.so |
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb index fe51ea1874..85c04b6af1 100644 --- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb | |||
@@ -17,7 +17,7 @@ do_install () { | |||
17 | # Ensure we add a suitable securetty file to the package that has | 17 | # Ensure we add a suitable securetty file to the package that has |
18 | # most common embedded TTYs defined. | 18 | # most common embedded TTYs defined. |
19 | install -d ${D}${sysconfdir} | 19 | install -d ${D}${sysconfdir} |
20 | install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty | 20 | install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty |
21 | if [ ! -z "${SERIAL_CONSOLES}" ]; then | 21 | if [ ! -z "${SERIAL_CONSOLES}" ]; then |
22 | # Our SERIAL_CONSOLES contains a baud rate and sometimes extra | 22 | # Our SERIAL_CONSOLES contains a baud rate and sometimes extra |
23 | # options as well. The following pearl :) takes that and converts | 23 | # options as well. The following pearl :) takes that and converts |
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 40e6ab0b30..25930b64c1 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -25,7 +25,7 @@ SRC_URI:append:class-target = " \ | |||
25 | SRC_URI:append:class-native = " \ | 25 | SRC_URI:append:class-native = " \ |
26 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ | 26 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ |
27 | " | 27 | " |
28 | SRC_URI[sha256sum] = "a305edf5d19bddbdf5e836d2d609fa8bff2d35458819de4d9f06306a1cf24342" | 28 | SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" |
29 | 29 | ||
30 | # Additional Policy files for PAM | 30 | # Additional Policy files for PAM |
31 | PAM_SRC_URI = "file://pam.d/chfn \ | 31 | PAM_SRC_URI = "file://pam.d/chfn \ |
@@ -40,7 +40,7 @@ inherit autotools gettext github-releases pkgconfig | |||
40 | 40 | ||
41 | export CONFIG_SHELL="/bin/sh" | 41 | export CONFIG_SHELL="/bin/sh" |
42 | 42 | ||
43 | EXTRA_OECONF += "--without-libcrack \ | 43 | EXTRA_OECONF += " \ |
44 | --with-group-name-max-length=24 \ | 44 | --with-group-name-max-length=24 \ |
45 | --enable-subordinate-ids=yes \ | 45 | --enable-subordinate-ids=yes \ |
46 | --without-sssd \ | 46 | --without-sssd \ |
@@ -111,7 +111,7 @@ do_install() { | |||
111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs | 111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs |
112 | 112 | ||
113 | install -d ${D}${sysconfdir}/default | 113 | install -d ${D}${sysconfdir}/default |
114 | install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default | 114 | install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default |
115 | } | 115 | } |
116 | 116 | ||
117 | do_install:append() { | 117 | do_install:append() { |
@@ -121,11 +121,11 @@ do_install:append() { | |||
121 | install -m 0775 -d ${D}${localstatedir}/spool/mail | 121 | install -m 0775 -d ${D}${localstatedir}/spool/mail |
122 | chown root:mail ${D}${localstatedir}/spool/mail | 122 | chown root:mail ${D}${localstatedir}/spool/mail |
123 | 123 | ||
124 | if [ -e ${WORKDIR}/pam.d ]; then | 124 | if [ -e ${UNPACKDIR}/pam.d ]; then |
125 | install -d ${D}${sysconfdir}/pam.d/ | 125 | install -d ${D}${sysconfdir}/pam.d/ |
126 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 126 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
127 | # Remove defaults that are not used when supporting PAM. | 127 | # Remove defaults that are not used when supporting PAM. |
128 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs | 128 | sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs |
129 | fi | 129 | fi |
130 | 130 | ||
131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | 131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} |
@@ -168,6 +168,14 @@ do_install:append:class-native() { | |||
168 | SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" | 168 | SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" |
169 | INSANE_SKIP:${PN}:class-native = "already-stripped" | 169 | INSANE_SKIP:${PN}:class-native = "already-stripped" |
170 | 170 | ||
171 | do_install:append:class-nativesdk() { | ||
172 | oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man | ||
173 | } | ||
174 | |||
175 | do_install:append:class-target() { | ||
176 | oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man | ||
177 | } | ||
178 | |||
171 | PACKAGES =+ "${PN}-base" | 179 | PACKAGES =+ "${PN}-base" |
172 | FILES:${PN}-base = "\ | 180 | FILES:${PN}-base = "\ |
173 | ${base_bindir}/login.shadow \ | 181 | ${base_bindir}/login.shadow \ |
@@ -193,6 +201,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" | |||
193 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" | 201 | ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" |
194 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" | 202 | ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" |
195 | 203 | ||
204 | ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1" | ||
205 | ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1" | ||
206 | ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1" | ||
207 | |||
196 | ALTERNATIVE:${PN}-base = "newgrp groups login su" | 208 | ALTERNATIVE:${PN}-base = "newgrp groups login su" |
197 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 209 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
198 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 210 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
diff --git a/meta/recipes-extended/shadow/shadow_4.14.2.bb b/meta/recipes-extended/shadow/shadow_4.15.0.bb index e57676c1da..e57676c1da 100644 --- a/meta/recipes-extended/shadow/shadow_4.14.2.bb +++ b/meta/recipes-extended/shadow/shadow_4.15.0.bb | |||
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.05.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb index d4a427f89d..fb88e06a7f 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.17.05.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
7 | 7 | ||
8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ | 8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ |
9 | " | 9 | " |
10 | SRCREV = "4e68895f4fe68863b360ab4a6a57e2dfcff85d60" | 10 | SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | DEPENDS = "coreutils-native libbsd" | 13 | DEPENDS = "coreutils-native libbsd" |
diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb index 8e542015ad..2fd2ae6d05 100644 --- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb +++ b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb | |||
@@ -30,7 +30,7 @@ EXTRA_OECONF += " \ | |||
30 | 30 | ||
31 | do_install:append () { | 31 | do_install:append () { |
32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 32 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
33 | install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo | 33 | install -D -m 644 ${UNPACKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo |
34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then | 34 | if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then |
35 | echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo | 35 | echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo |
36 | sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers | 36 | sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers |
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb index c9c9055142..e488603086 100644 --- a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb +++ b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb | |||
@@ -24,7 +24,7 @@ do_install:append () { | |||
24 | install -d ${D}${sysconfdir} | 24 | install -d ${D}${sysconfdir} |
25 | install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf | 25 | install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf |
26 | install -d ${D}${sysconfdir}/init.d | 26 | install -d ${D}${sysconfdir}/init.d |
27 | install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog | 27 | install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog |
28 | } | 28 | } |
29 | 29 | ||
30 | SYSTEMD_PACKAGES = "${PN}" | 30 | SYSTEMD_PACKAGES = "${PN}" |
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb index 150f4932d8..d598d5366f 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb | |||
@@ -45,7 +45,7 @@ do_install() { | |||
45 | rm -rf ${D}/var | 45 | rm -rf ${D}/var |
46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
47 | install -d ${D}/etc/default/volatiles | 47 | install -d ${D}/etc/default/volatiles |
48 | install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles | 48 | install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles |
49 | fi | 49 | fi |
50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
51 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 51 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
@@ -56,7 +56,7 @@ do_install() { | |||
56 | # systemd unit file. Otherwise the package will install one. | 56 | # systemd unit file. Otherwise the package will install one. |
57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then | 57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then |
58 | install -d ${D}${systemd_system_unitdir} | 58 | install -d ${D}${systemd_system_unitdir} |
59 | install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} | 59 | install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir} |
60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service | 60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service |
61 | fi | 61 | fi |
62 | fi | 62 | fi |
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb index bcd1d6f792..8cf927153f 100644 --- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb | |||
@@ -120,8 +120,8 @@ do_install () { | |||
120 | install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 | 120 | install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 |
121 | done | 121 | done |
122 | 122 | ||
123 | install -m 0644 ${WORKDIR}/try-from.8 ${D}${mandir}/man8/ | 123 | install -m 0644 ${UNPACKDIR}/try-from.8 ${D}${mandir}/man8/ |
124 | install -m 0644 ${WORKDIR}/safe_finger.8 ${D}${mandir}/man8/ | 124 | install -m 0644 ${UNPACKDIR}/safe_finger.8 ${D}${mandir}/man8/ |
125 | 125 | ||
126 | install -d ${D}${includedir} | 126 | install -d ${D}${includedir} |
127 | install -m 0644 tcpd.h ${D}${includedir}/ | 127 | install -m 0644 tcpd.h ${D}${includedir}/ |
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch index 3801d73883..b43a115b23 100644 --- a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch +++ b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From e5d8f6d4a7652ea95c8d069ce9333494f2db868c Mon Sep 17 00:00:00 2001 | 1 | From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001 |
2 | From: Joshua Lock <josh@linux.intel.com> | 2 | From: Joshua Lock <josh@linux.intel.com> |
3 | Date: Fri, 16 Sep 2011 15:35:48 -0700 | 3 | Date: Fri, 16 Sep 2011 15:35:48 -0700 |
4 | Subject: [PATCH] texinfo: several changes to build without zlib and ncurses | 4 | Subject: [PATCH 1/3] texinfo: several changes to build without zlib and |
5 | ncurses | ||
5 | 6 | ||
6 | We already DEPEND on the native texinfo being present before building so | 7 | We already DEPEND on the native texinfo being present before building so |
7 | there isn't any need to try and build the required native texinfo binaries | 8 | there isn't any need to try and build the required native texinfo binaries |
@@ -10,16 +11,15 @@ before cross-compiling. This simplifies the recipe somewhat! | |||
10 | Upstream-Status: Inappropriate oe specific | 11 | Upstream-Status: Inappropriate oe specific |
11 | 12 | ||
12 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | 13 | Signed-off-by: Joshua Lock <josh@linux.intel.com> |
13 | |||
14 | --- | 14 | --- |
15 | configure.ac | 24 +----------------------- | 15 | configure.ac | 24 +----------------------- |
16 | 1 file changed, 1 insertion(+), 23 deletions(-) | 16 | 1 file changed, 1 insertion(+), 23 deletions(-) |
17 | 17 | ||
18 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
19 | index 6fcd3a0..c108df7 100644 | 19 | index 8094498..5b72fc1 100644 |
20 | --- a/configure.ac | 20 | --- a/configure.ac |
21 | +++ b/configure.ac | 21 | +++ b/configure.ac |
22 | @@ -180,29 +180,7 @@ AC_CANONICAL_BUILD | 22 | @@ -247,29 +247,7 @@ AC_CANONICAL_BUILD |
23 | # $native_tools is also added to SUBDIRS in the main Makefile.am, | 23 | # $native_tools is also added to SUBDIRS in the main Makefile.am, |
24 | # so that make compiles the native tools first. | 24 | # so that make compiles the native tools first. |
25 | # | 25 | # |
@@ -50,3 +50,6 @@ index 6fcd3a0..c108df7 100644 | |||
50 | AC_SUBST(native_tools) | 50 | AC_SUBST(native_tools) |
51 | AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) | 51 | AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) |
52 | 52 | ||
53 | -- | ||
54 | 2.39.2 | ||
55 | |||
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch index 825887cc2e..f3b6827d58 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch | |||
@@ -1,33 +1,32 @@ | |||
1 | From 451a9b9c3874872d575693fc7733fae02690a7d3 Mon Sep 17 00:00:00 2001 | 1 | From e02be81fa68ddc7f939abd99de4e42759a0d5d8c Mon Sep 17 00:00:00 2001 |
2 | From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> | 2 | From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> |
3 | Date: Tue, 29 Nov 2016 13:43:24 -0600 | 3 | Date: Tue, 29 Nov 2016 13:43:24 -0600 |
4 | Subject: [PATCH] dont-depend-on-help2man | 4 | Subject: [PATCH 2/3] dont-depend-on-help2man |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | 8 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> |
9 | Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> | 9 | Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> |
10 | |||
11 | --- | 10 | --- |
12 | doc/Makefile.am | 2 +- | 11 | doc/Makefile.am | 2 +- |
13 | man/Makefile.am | 12 ++++++------ | 12 | man/Makefile.am | 12 ++++++------ |
14 | 2 files changed, 7 insertions(+), 7 deletions(-) | 13 | 2 files changed, 7 insertions(+), 7 deletions(-) |
15 | 14 | ||
16 | diff --git a/doc/Makefile.am b/doc/Makefile.am | 15 | diff --git a/doc/Makefile.am b/doc/Makefile.am |
17 | index 407a38c..6b5ff3e 100644 | 16 | index e9e6298..f1b9895 100644 |
18 | --- a/doc/Makefile.am | 17 | --- a/doc/Makefile.am |
19 | +++ b/doc/Makefile.am | 18 | +++ b/doc/Makefile.am |
20 | @@ -55,7 +55,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ | 19 | @@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex |
21 | # Include our texinfo.tex, not Automake's. | 20 | # Include our texinfo.tex, not Automake's. |
22 | EXTRA_DIST = epsf.tex texinfo.tex \ | 21 | EXTRA_DIST = epsf.tex texinfo.tex \ |
23 | fdl.texi \ | 22 | fdl.texi \ |
24 | - $(man_MANS) $(TXI_XLATE) \ | 23 | - $(man_MANS) $(TXI_XLATE) \ |
25 | + $(TXI_XLATE) \ | 24 | + $(TXI_XLATE) \ |
26 | $(refcard_files) \ | 25 | $(refcard_files) \ |
27 | gendocs.chapter/gendocs_template \ | ||
28 | texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ | 26 | texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ |
27 | texinfo-ja.tex short-sample-ja.texi \ | ||
29 | diff --git a/man/Makefile.am b/man/Makefile.am | 28 | diff --git a/man/Makefile.am b/man/Makefile.am |
30 | index d0cd72c..a19e52a 100644 | 29 | index f2c703f..61caeeb 100644 |
31 | --- a/man/Makefile.am | 30 | --- a/man/Makefile.am |
32 | +++ b/man/Makefile.am | 31 | +++ b/man/Makefile.am |
33 | @@ -11,27 +11,27 @@ | 32 | @@ -11,27 +11,27 @@ |
@@ -64,3 +63,6 @@ index d0cd72c..a19e52a 100644 | |||
64 | 63 | ||
65 | # Maintainers should be able to regenerate. | 64 | # Maintainers should be able to regenerate. |
66 | MAINTAINERCLEANFILES = $(man_MANS) | 65 | MAINTAINERCLEANFILES = $(man_MANS) |
66 | -- | ||
67 | 2.39.2 | ||
68 | |||
diff --git a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch index c6c9952c9e..f99f8b87d5 100644 --- a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch +++ b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch | |||
@@ -1,21 +1,20 @@ | |||
1 | From 81ccd162b869c20e450073fa834b5cabbea8e3d4 Mon Sep 17 00:00:00 2001 | 1 | From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Mon, 29 Jul 2013 15:02:34 -0700 | 3 | Date: Mon, 29 Jul 2013 15:02:34 -0700 |
4 | Subject: [PATCH] texinfo: Update to 5.1 | 4 | Subject: [PATCH 3/3] texinfo: Update to 5.1 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [cross build specific] | 6 | Upstream-Status: Inappropriate [cross build specific] |
7 | 7 | ||
8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
9 | |||
10 | --- | 9 | --- |
11 | info/Makefile.am | 2 +- | 10 | info/Makefile.am | 2 +- |
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 12 | ||
14 | diff --git a/info/Makefile.am b/info/Makefile.am | 13 | diff --git a/info/Makefile.am b/info/Makefile.am |
15 | index 35596b1..cae1421 100644 | 14 | index f57b341..a019aa7 100644 |
16 | --- a/info/Makefile.am | 15 | --- a/info/Makefile.am |
17 | +++ b/info/Makefile.am | 16 | +++ b/info/Makefile.am |
18 | @@ -69,7 +69,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ | 17 | @@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ |
19 | # more than once. | 18 | # more than once. |
20 | funs.h: makedoc$(EXEEXT) $(cmd_sources) | 19 | funs.h: makedoc$(EXEEXT) $(cmd_sources) |
21 | rm -f $(generated_sources) | 20 | rm -f $(generated_sources) |
@@ -24,3 +23,6 @@ index 35596b1..cae1421 100644 | |||
24 | 23 | ||
25 | # The following hack is necessary to hint make before the automatic | 24 | # The following hack is necessary to hint make before the automatic |
26 | # dependencies are built. | 25 | # dependencies are built. |
26 | -- | ||
27 | 2.39.2 | ||
28 | |||
diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/meta/recipes-extended/texinfo/texinfo/link-zip.patch deleted file mode 100644 index 72d7067aa9..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/link-zip.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From c5050ac84c8a3cc3ff8c7e558f8c2fdb57f410d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Lock <josh@linux.intel.com> | ||
3 | Date: Mon, 29 Jul 2013 15:02:34 -0700 | ||
4 | Subject: [PATCH] install-info uses symbols from zlib so must link against it. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | ||
9 | |||
10 | --- | ||
11 | install-info/Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/install-info/Makefile.am b/install-info/Makefile.am | ||
15 | index 9bcff71..68247f9 100644 | ||
16 | --- a/install-info/Makefile.am | ||
17 | +++ b/install-info/Makefile.am | ||
18 | @@ -33,4 +33,4 @@ AM_CPPFLAGS = \ | ||
19 | -I$(top_srcdir)/gnulib/lib \ | ||
20 | -I$(top_builddir)/gnulib/lib \ | ||
21 | -DLOCALEDIR=\"$(localedir)\" | ||
22 | -LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) | ||
23 | +LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz | ||
diff --git a/meta/recipes-extended/texinfo/texinfo_7.0.3.bb b/meta/recipes-extended/texinfo/texinfo_7.1.bb index b149177b72..65d8252fb9 100644 --- a/meta/recipes-extended/texinfo/texinfo_7.0.3.bb +++ b/meta/recipes-extended/texinfo/texinfo_7.1.bb | |||
@@ -25,17 +25,16 @@ RDEPENDS:info += "${@compress_pkg(d)}" | |||
25 | DEPENDS = "zlib ncurses texinfo-replacement-native" | 25 | DEPENDS = "zlib ncurses texinfo-replacement-native" |
26 | DEPENDS:class-native = "zlib-native ncurses-native" | 26 | DEPENDS:class-native = "zlib-native ncurses-native" |
27 | 27 | ||
28 | TARGET_PATCH = "file://use_host_makedoc.patch" | 28 | TARGET_PATCH = "file://0003-texinfo-Update-to-5.1.patch" |
29 | TARGET_PATCH:class-native = "" | 29 | TARGET_PATCH:class-native = "" |
30 | 30 | ||
31 | SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ | 31 | SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ |
32 | file://disable-native-tools.patch \ | 32 | file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \ |
33 | file://link-zip.patch \ | 33 | file://0002-dont-depend-on-help2man.patch \ |
34 | file://dont-depend-on-help2man.patch \ | ||
35 | ${TARGET_PATCH} \ | 34 | ${TARGET_PATCH} \ |
36 | " | 35 | " |
37 | 36 | ||
38 | SRC_URI[sha256sum] = "3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683" | 37 | SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0" |
39 | 38 | ||
40 | tex_texinfo = "texmf/tex/texinfo" | 39 | tex_texinfo = "texmf/tex/texinfo" |
41 | 40 | ||
@@ -44,6 +43,7 @@ inherit gettext autotools multilib_script | |||
44 | MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" | 43 | MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" |
45 | 44 | ||
46 | EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" | 45 | EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" |
46 | CACHED_CONFIGUREVARS += "texinfo_cv_sys_iconv_converts_euc_cn=yes" | ||
47 | 47 | ||
48 | do_configure:prepend () { | 48 | do_configure:prepend () { |
49 | # autotools_do_configure updates po/Makefile.in.in, we also need | 49 | # autotools_do_configure updates po/Makefile.in.in, we also need |
diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb index f138952128..e826a7d4a6 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb | |||
@@ -17,8 +17,8 @@ SRC_URI = " \ | |||
17 | WATCHDOG_TIMEOUT ??= "" | 17 | WATCHDOG_TIMEOUT ??= "" |
18 | 18 | ||
19 | do_install() { | 19 | do_install() { |
20 | install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog | 20 | install -Dm 0644 ${UNPACKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog |
21 | install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf | 21 | install -Dm 0644 ${UNPACKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf |
22 | 22 | ||
23 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then | 23 | if [ -n "${WATCHDOG_TIMEOUT}" ]; then |
24 | echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf | 24 | echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf |
diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb index 5325ccafda..c88ea08ade 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb | |||
@@ -50,8 +50,8 @@ do_install:append() { | |||
50 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} | 50 | install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} |
51 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} | 51 | install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} |
52 | 52 | ||
53 | install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog | 53 | install -Dm 0755 ${UNPACKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog |
54 | install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive | 54 | install -Dm 0755 ${UNPACKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive |
55 | 55 | ||
56 | # watchdog.conf is provided by the watchdog-config recipe | 56 | # watchdog.conf is provided by the watchdog-config recipe |
57 | rm ${D}${sysconfdir}/watchdog.conf | 57 | rm ${D}${sysconfdir}/watchdog.conf |
diff --git a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch index 050fc2c7e1..5438bafdcb 100644 --- a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch +++ b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7f1357529d23b356b45fbb0dd7388588162e4cb8 Mon Sep 17 00:00:00 2001 | 1 | From b86e57b68363d108fe77c6fd588a275d2696cabe Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 10 Jan 2018 14:43:20 +0800 | 3 | Date: Wed, 10 Jan 2018 14:43:20 +0800 |
4 | Subject: [PATCH] src/Makefile.am: improve reproducibility | 4 | Subject: [PATCH] src/Makefile.am: improve reproducibility |
@@ -44,10 +44,10 @@ Signed-off-by: Joe Slater <jslater@windriver.com> | |||
44 | 1 file changed, 4 insertions(+) | 44 | 1 file changed, 4 insertions(+) |
45 | 45 | ||
46 | diff --git a/src/Makefile.am b/src/Makefile.am | 46 | diff --git a/src/Makefile.am b/src/Makefile.am |
47 | index 28c0be2..44084a3 100644 | 47 | index 18ec622..38d252d 100644 |
48 | --- a/src/Makefile.am | 48 | --- a/src/Makefile.am |
49 | +++ b/src/Makefile.am | 49 | +++ b/src/Makefile.am |
50 | @@ -87,9 +87,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a | 50 | @@ -108,9 +108,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a |
51 | echo '#include "version.h"' >> $@ | 51 | echo '#include "version.h"' >> $@ |
52 | echo 'const char *version_string = "@VERSION@";' >> $@ | 52 | echo 'const char *version_string = "@VERSION@";' >> $@ |
53 | echo 'const char *compilation_string = "'$(COMPILE)'";' \ | 53 | echo 'const char *compilation_string = "'$(COMPILE)'";' \ |
@@ -61,6 +61,3 @@ index 28c0be2..44084a3 100644 | |||
61 | | $(ESCAPEQUOTE) >> $@ | 61 | | $(ESCAPEQUOTE) >> $@ |
62 | 62 | ||
63 | css.c: $(srcdir)/css.l | 63 | css.c: $(srcdir)/css.l |
64 | -- | ||
65 | 1.8.3.1 | ||
66 | |||
diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.24.5.bb index 1d31b0116d..64e6ee80af 100644 --- a/meta/recipes-extended/wget/wget_1.21.4.bb +++ b/meta/recipes-extended/wget/wget_1.24.5.bb | |||
@@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ | |||
2 | file://0002-improve-reproducibility.patch \ | 2 | file://0002-improve-reproducibility.patch \ |
3 | " | 3 | " |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" | 5 | SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de" |
6 | 6 | ||
7 | require wget.inc | 7 | require wget.inc |
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 72eb1ae067..897747379b 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | |||
@@ -37,12 +37,12 @@ CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" | |||
37 | do_install:append() { | 37 | do_install:append() { |
38 | install -d "${D}${sysconfdir}/init.d" | 38 | install -d "${D}${sysconfdir}/init.d" |
39 | install -d "${D}${sysconfdir}/default" | 39 | install -d "${D}${sysconfdir}/default" |
40 | install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" | 40 | install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" |
41 | install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" | 41 | install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" |
42 | 42 | ||
43 | # Install systemd unit files | 43 | # Install systemd unit files |
44 | install -d ${D}${systemd_system_unitdir} | 44 | install -d ${D}${systemd_system_unitdir} |
45 | install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} | 45 | install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir} |
46 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 46 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
47 | -e 's,@SBINDIR@,${sbindir},g' \ | 47 | -e 's,@SBINDIR@,${sbindir},g' \ |
48 | ${D}${systemd_system_unitdir}/xinetd.service | 48 | ${D}${systemd_system_unitdir}/xinetd.service |
diff --git a/meta/recipes-gnome/epiphany/epiphany_45.3.bb b/meta/recipes-gnome/epiphany/epiphany_46.0.bb index eec52e321a..9052fe170b 100644 --- a/meta/recipes-gnome/epiphany/epiphany_45.3.bb +++ b/meta/recipes-gnome/epiphany/epiphany_46.0.bb | |||
@@ -31,7 +31,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN | |||
31 | file://migrator.patch \ | 31 | file://migrator.patch \ |
32 | file://distributor.patch \ | 32 | file://distributor.patch \ |
33 | " | 33 | " |
34 | SRC_URI[archive.sha256sum] = "6c302e9bdd66290cb0e26f62843cd4c435a4955abdbb4f151f07dc80495d6730" | 34 | SRC_URI[archive.sha256sum] = "f4348f2cf51c07c0c106d130172d4d23f2cd4068771e1de007b758ca2ade5660" |
35 | 35 | ||
36 | # Developer mode enables debugging | 36 | # Developer mode enables debugging |
37 | PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" | 37 | PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" |
diff --git a/meta/recipes-gnome/gcr/gcr_4.2.0.bb b/meta/recipes-gnome/gcr/gcr_4.3.0.bb index c534e22f0a..50c8cfe8d6 100644 --- a/meta/recipes-gnome/gcr/gcr_4.2.0.bb +++ b/meta/recipes-gnome/gcr/gcr_4.3.0.bb | |||
@@ -20,7 +20,7 @@ inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspec | |||
20 | 20 | ||
21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" | 21 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "e15e31329e0171229d552d25563f176c5b6179795bf91fae2b141f69a9b7c480" | 23 | SRC_URI[archive.sha256sum] = "c3ee8728e4364b0397f435fa20f92f901ab139d2b264f4e059d67b3c0f43cd36" |
24 | 24 | ||
25 | PACKAGECONFIG ??= " \ | 25 | PACKAGECONFIG ??= " \ |
26 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | 26 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch index 7250fa3f62..3d685db774 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d3b374e75692da3d1d05344a1693c85a3098f47 Mon Sep 17 00:00:00 2001 | 1 | From 4bfb696fd125f044e3df9f6983c4ad518d9552c7 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 | 3 | Date: Thu, 26 Jan 2023 20:29:46 +0100 |
4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile | 4 | Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile |
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |||
19 | 2 files changed, 9 insertions(+), 7 deletions(-) | 19 | 2 files changed, 9 insertions(+), 7 deletions(-) |
20 | 20 | ||
21 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
22 | index 8a16c8f..7c8b20f 100644 | 22 | index 78f3683..e0feaee 100644 |
23 | --- a/meson.build | 23 | --- a/meson.build |
24 | +++ b/meson.build | 24 | +++ b/meson.build |
25 | @@ -369,10 +369,10 @@ subdir('gdk-pixbuf') | 25 | @@ -390,10 +390,10 @@ subdir('gdk-pixbuf') |
26 | # i18n | 26 | # i18n |
27 | subdir('po') | 27 | subdir('po') |
28 | 28 | ||
@@ -37,7 +37,7 @@ index 8a16c8f..7c8b20f 100644 | |||
37 | endif | 37 | endif |
38 | 38 | ||
39 | diff --git a/tests/meson.build b/tests/meson.build | 39 | diff --git a/tests/meson.build b/tests/meson.build |
40 | index 28c2525..c45e765 100644 | 40 | index 78d0ad9..0c9e64e 100644 |
41 | --- a/tests/meson.build | 41 | --- a/tests/meson.build |
42 | +++ b/tests/meson.build | 42 | +++ b/tests/meson.build |
43 | @@ -4,7 +4,7 @@ | 43 | @@ -4,7 +4,7 @@ |
@@ -49,7 +49,7 @@ index 28c2525..c45e765 100644 | |||
49 | # Resources; we cannot use gnome.compile_resources() here, because we need to | 49 | # Resources; we cannot use gnome.compile_resources() here, because we need to |
50 | # override the environment in order to use the utilities we just built instead | 50 | # override the environment in order to use the utilities we just built instead |
51 | # of the system ones | 51 | # of the system ones |
52 | @@ -166,9 +166,11 @@ endif | 52 | @@ -172,9 +172,11 @@ endif |
53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] | 53 | test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] |
54 | test_args = [ '-k' ] | 54 | test_args = [ '-k' ] |
55 | test_env = environment() | 55 | test_env = environment() |
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch index 23c68a0923..80c93e2166 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b511bd1efb43ffc49c753e309717a242ec686ef1 Mon Sep 17 00:00:00 2001 | 1 | From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 | 3 | Date: Tue, 1 Apr 2014 17:23:36 +0100 |
4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal | 4 | Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal |
@@ -8,13 +8,12 @@ non-zero if the loader had errors (missing libraries, generally). | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/144] | 9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/144] |
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 10 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
11 | |||
12 | --- | 11 | --- |
13 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- | 12 | gdk-pixbuf/queryloaders.c | 19 +++++++++++++++---- |
14 | 1 file changed, 15 insertions(+), 4 deletions(-) | 13 | 1 file changed, 15 insertions(+), 4 deletions(-) |
15 | 14 | ||
16 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c | 15 | diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c |
17 | index 1d39b44..2b00815 100644 | 16 | index baa9a5c..9b6fa89 100644 |
18 | --- a/gdk-pixbuf/queryloaders.c | 17 | --- a/gdk-pixbuf/queryloaders.c |
19 | +++ b/gdk-pixbuf/queryloaders.c | 18 | +++ b/gdk-pixbuf/queryloaders.c |
20 | @@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) | 19 | @@ -216,7 +216,7 @@ write_loader_info (GString *contents, const char *path, GdkPixbufFormat *info) |
@@ -77,7 +76,7 @@ index 1d39b44..2b00815 100644 | |||
77 | } | 76 | } |
78 | g_free (cwd); | 77 | g_free (cwd); |
79 | } | 78 | } |
80 | @@ -490,5 +498,8 @@ int main (int argc, char **argv) | 79 | @@ -492,5 +500,8 @@ int main (int argc, char **argv) |
81 | 80 | ||
82 | g_free (pixbuf_libdir); | 81 | g_free (pixbuf_libdir); |
83 | 82 | ||
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb index cca89a9059..ef0f23f8f7 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ | 22 | file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" | 25 | SRC_URI[sha256sum] = "49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00" |
26 | 26 | ||
27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package | 27 | inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package |
28 | 28 | ||
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb index 0bd98288f6..2f3e4e7b85 100644 --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_45.0.bb +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ | |||
12 | 12 | ||
13 | inherit gnomebase allarch gtk-icon-cache | 13 | inherit gnomebase allarch gtk-icon-cache |
14 | 14 | ||
15 | SRC_URI[archive.sha256sum] = "2442bfb06f4e6cc95bf6e2682fdff98fa5eddc688751b9d6215c623cb4e42ff1" | 15 | SRC_URI[archive.sha256sum] = "4bcb539bd75d64da385d6fa08cbaa9ddeaceb6ac8e82b85ba6c41117bf5ba64e" |
16 | 16 | ||
17 | DEPENDS += "librsvg-native" | 17 | DEPENDS += "librsvg-native" |
18 | 18 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index 4a04c06432..e1603b43fc 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc | |||
@@ -33,7 +33,10 @@ GTKDOC_MESON_OPTION = 'gtk_doc' | |||
33 | EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" | 33 | EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" |
34 | EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" | 34 | EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" |
35 | 35 | ||
36 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)}" | 36 | PACKAGECONFIG ??= " \ |
37 | ${@bb.utils.filter('DISTRO_FEATURES', 'opengl x11', d)} \ | ||
38 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \ | ||
39 | " | ||
37 | PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 40 | PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
38 | PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 41 | PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
39 | 42 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb b/meta/recipes-gnome/gtk+/gtk4_4.14.2.bb index ce733769a5..39483357b4 100644 --- a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb +++ b/meta/recipes-gnome/gtk+/gtk4_4.14.2.bb | |||
@@ -37,7 +37,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" | 37 | UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" |
38 | 38 | ||
39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" | 39 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" |
40 | SRC_URI[sha256sum] = "fcefb3f132f8cc4711a9efa5b353c9ae9bb5eeff0246fa74dbc2f2f839b9e308" | 40 | SRC_URI[sha256sum] = "22604cef2898a79e5f2143bb7aee2b7d1fa2eb946989a9d1338ecf9c8ae0e072" |
41 | 41 | ||
42 | S = "${WORKDIR}/gtk-${PV}" | 42 | S = "${WORKDIR}/gtk-${PV}" |
43 | 43 | ||
@@ -76,6 +76,10 @@ PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled | |||
76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" | 76 | PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" |
77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" | 77 | PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" |
78 | 78 | ||
79 | # Disable int-conversion warning as error until [1] is fixed | ||
80 | # [1] https://gitlab.gnome.org/GNOME/gtk/-/issues/6033 | ||
81 | CFLAGS:append = " -Wno-error=int-conversion" | ||
82 | |||
79 | LIBV = "4.0.0" | 83 | LIBV = "4.0.0" |
80 | 84 | ||
81 | FILES:${PN}:append = " \ | 85 | FILES:${PN}:append = " \ |
diff --git a/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch index da8ce68df9..27081d8749 100644 --- a/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch +++ b/meta/recipes-gnome/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001 | 1 | From 8a1aa4c318b8dbe4c0c2b1c4968f867ea6641b32 Mon Sep 17 00:00:00 2001 |
2 | From: Markus Volk <f_l_k@t-online.de> | 2 | From: Markus Volk <f_l_k@t-online.de> |
3 | Date: Sat, 16 Sep 2023 14:02:57 +0200 | 3 | Date: Sat, 16 Sep 2023 14:02:57 +0200 |
4 | Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR | 4 | Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR |
@@ -18,10 +18,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/src/xb-self-test.c b/src/xb-self-test.c | 20 | diff --git a/src/xb-self-test.c b/src/xb-self-test.c |
21 | index 47d9728..8b3dd0e 100644 | 21 | index 1daca18..2e5b251 100644 |
22 | --- a/src/xb-self-test.c | 22 | --- a/src/xb-self-test.c |
23 | +++ b/src/xb-self-test.c | 23 | +++ b/src/xb-self-test.c |
24 | @@ -2870,7 +2870,7 @@ xb_speed_func(void) | 24 | @@ -2876,7 +2876,7 @@ xb_speed_func(void) |
25 | int | 25 | int |
26 | main(int argc, char **argv) | 26 | main(int argc, char **argv) |
27 | { | 27 | { |
@@ -30,6 +30,3 @@ index 47d9728..8b3dd0e 100644 | |||
30 | 30 | ||
31 | g_test_init(&argc, &argv, NULL); | 31 | g_test_init(&argc, &argv, NULL); |
32 | 32 | ||
33 | -- | ||
34 | 2.41.0 | ||
35 | |||
diff --git a/meta/recipes-gnome/libxmlb/libxmlb_0.3.15.bb b/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb index 528e3e0bab..10ceab0721 100644 --- a/meta/recipes-gnome/libxmlb/libxmlb_0.3.15.bb +++ b/meta/recipes-gnome/libxmlb/libxmlb_0.3.18.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = " \ | |||
8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ | 8 | file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
11 | SRCREV = "25a6384ad60f7e8550292e6cb4f262cc5da74be4" | 11 | SRCREV = "59cf2e0bf3c4d0905a32e32828d6100784993621" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | DEPENDS = "glib-2.0 xz zstd" | 14 | DEPENDS = "glib-2.0 xz zstd" |
diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch index 316a57fa4a..e6bb6ec8e3 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4cede5edcff96134baf35953d58595c4aa5f1fc5 Mon Sep 17 00:00:00 2001 | 1 | From fc33f1cf032a15c07044ef932bc991c346d62d62 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 7 Feb 2021 01:30:39 +0000 | 3 | Date: Sun, 7 Feb 2021 01:30:39 +0000 |
4 | Subject: [PATCH] generate glslang pkg-config | 4 | Subject: [PATCH] generate glslang pkg-config |
@@ -15,12 +15,12 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
15 | create mode 100644 glslang/glslang.pc.cmake.in | 15 | create mode 100644 glslang/glslang.pc.cmake.in |
16 | 16 | ||
17 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt | 17 | diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt |
18 | index 37eecaad..6974935c 100644 | 18 | index e4690f09..8e660bc5 100644 |
19 | --- a/glslang/CMakeLists.txt | 19 | --- a/glslang/CMakeLists.txt |
20 | +++ b/glslang/CMakeLists.txt | 20 | +++ b/glslang/CMakeLists.txt |
21 | @@ -251,6 +251,8 @@ if(PROJECT_IS_TOP_LEVEL) | 21 | @@ -233,6 +233,8 @@ if(GLSLANG_ENABLE_INSTALL) |
22 | ") | 22 | install(TARGETS MachineIndependent EXPORT glslang-targets) |
23 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslangTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) | 23 | install(TARGETS GenericCodeGen EXPORT glslang-targets) |
24 | endif() | 24 | endif() |
25 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) | 25 | + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) |
26 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | 26 | + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb index 2fd1e72a26..637082c719 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" | |||
8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" | 8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" |
10 | 10 | ||
11 | SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a" | 11 | SRCREV = "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60" |
12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ |
13 | file://0001-generate-glslang-pkg-config.patch \ | 13 | file://0001-generate-glslang-pkg-config.patch \ |
14 | " | 14 | " |
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb index d733342682..fc6951d9ed 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" | 11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" |
12 | SRC_URI[sha256sum] = "109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847" | 12 | SRC_URI[sha256sum] = "af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e" |
13 | 13 | ||
14 | DEPENDS += "glib-2.0-native" | 14 | DEPENDS += "glib-2.0-native" |
15 | 15 | ||
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.30.0.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb index 99dbf36477..f9dacb288c 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.30.0.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" | |||
25 | 25 | ||
26 | S = "${WORKDIR}/SDL2-${PV}" | 26 | S = "${WORKDIR}/SDL2-${PV}" |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "36e2e41557e0fa4a1519315c0f5958a87ccb27e25c51776beb6f1239526447b0" | 28 | SRC_URI[sha256sum] = "891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31" |
29 | 29 | ||
30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
31 | 31 | ||
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb index 880d4ed666..c8b6f07ed0 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb | |||
@@ -34,5 +34,5 @@ EXTRA_OECONF = " --enable-startup-notification \ | |||
34 | --with-expat-includes=${STAGING_INCDIR}" | 34 | --with-expat-includes=${STAGING_INCDIR}" |
35 | 35 | ||
36 | do_install:prepend() { | 36 | do_install:prepend() { |
37 | install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig | 37 | install ${UNPACKDIR}/kbdconfig ${S}/data/kbdconfig |
38 | } | 38 | } |
diff --git a/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch index f6d95c8982..1711e22585 100644 --- a/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch +++ b/meta/recipes-graphics/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 | 1 | From 051f41beda540f0ae77b341db01a6de83c9e938a Mon Sep 17 00:00:00 2001 |
2 | From: Markus Volk <f_l_k@t-online.de> | 2 | From: Markus Volk <f_l_k@t-online.de> |
3 | Date: Fri, 8 Mar 2024 15:53:11 +0100 | 3 | Date: Fri, 8 Mar 2024 15:53:11 +0100 |
4 | Subject: [PATCH] Revert "meson: do not pull in clc for clover" | 4 | Subject: [PATCH] Revert "meson: do not pull in clc for clover" |
@@ -18,10 +18,10 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> | |||
18 | 2 files changed, 3 insertions(+), 2 deletions(-) | 18 | 2 files changed, 3 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/meson.build b/meson.build | 20 | diff --git a/meson.build b/meson.build |
21 | index 25e92ea5f95..3956e19c08f 100644 | 21 | index 2db6185..741b5d1 100644 |
22 | --- a/meson.build | 22 | --- a/meson.build |
23 | +++ b/meson.build | 23 | +++ b/meson.build |
24 | @@ -818,6 +818,7 @@ if _opencl != 'disabled' | 24 | @@ -813,6 +813,7 @@ if _opencl != 'disabled' |
25 | error('The Clover OpenCL state tracker requires rtti') | 25 | error('The Clover OpenCL state tracker requires rtti') |
26 | endif | 26 | endif |
27 | 27 | ||
@@ -29,7 +29,7 @@ index 25e92ea5f95..3956e19c08f 100644 | |||
29 | with_gallium_opencl = true | 29 | with_gallium_opencl = true |
30 | with_opencl_icd = _opencl == 'icd' | 30 | with_opencl_icd = _opencl == 'icd' |
31 | else | 31 | else |
32 | @@ -842,7 +843,7 @@ if with_gallium_rusticl | 32 | @@ -837,7 +838,7 @@ if with_gallium_rusticl |
33 | endif | 33 | endif |
34 | 34 | ||
35 | dep_clc = null_dep | 35 | dep_clc = null_dep |
@@ -39,7 +39,7 @@ index 25e92ea5f95..3956e19c08f 100644 | |||
39 | endif | 39 | endif |
40 | 40 | ||
41 | diff --git a/src/compiler/meson.build b/src/compiler/meson.build | 41 | diff --git a/src/compiler/meson.build b/src/compiler/meson.build |
42 | index 8d73544c6d8..1dae56d1b2b 100644 | 42 | index 8d73544..1dae56d 100644 |
43 | --- a/src/compiler/meson.build | 43 | --- a/src/compiler/meson.build |
44 | +++ b/src/compiler/meson.build | 44 | +++ b/src/compiler/meson.build |
45 | @@ -79,7 +79,7 @@ subdir('nir') | 45 | @@ -79,7 +79,7 @@ subdir('nir') |
@@ -51,6 +51,3 @@ index 8d73544c6d8..1dae56d1b2b 100644 | |||
51 | subdir('clc') | 51 | subdir('clc') |
52 | endif | 52 | endif |
53 | if with_gallium | 53 | if with_gallium |
54 | -- | ||
55 | 2.44.0 | ||
56 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch deleted file mode 100644 index ceb0153f8d..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 23 Jun 2023 01:20:38 -0700 | ||
4 | Subject: [PATCH] gallium: Fix build with llvm 17 | ||
5 | |||
6 | These headers are not available for C files in llvm 17+ | ||
7 | and they seem to be not needed to compile after all with llvm 17 | ||
8 | so add conditions to exclude them for llvm >= 17 | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- | ||
14 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
17 | index cd2108f..b1a4d03 100644 | ||
18 | --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
19 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c | ||
20 | @@ -46,15 +46,19 @@ | ||
21 | #if GALLIVM_USE_NEW_PASS == 1 | ||
22 | #include <llvm-c/Transforms/PassBuilder.h> | ||
23 | #elif GALLIVM_HAVE_CORO == 1 | ||
24 | +#if LLVM_VERSION_MAJOR < 17 | ||
25 | #include <llvm-c/Transforms/Scalar.h> | ||
26 | -#if LLVM_VERSION_MAJOR >= 7 | ||
27 | +#endif | ||
28 | +#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 | ||
29 | #include <llvm-c/Transforms/Utils.h> | ||
30 | #endif | ||
31 | #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) | ||
32 | #include <llvm-c/Transforms/IPO.h> | ||
33 | #endif | ||
34 | +#if LLVM_VERSION_MAJOR < 17 | ||
35 | #include <llvm-c/Transforms/Coroutines.h> | ||
36 | #endif | ||
37 | +#endif | ||
38 | |||
39 | unsigned gallivm_perf = 0; | ||
40 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_24.0.2.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a8088e6fb6..77e9c80fcb 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -17,13 +17,12 @@ PE = "2" | |||
17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ |
18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | 18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ |
19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
20 | file://0001-gallium-Fix-build-with-llvm-17.patch \ | ||
21 | file://0001-drisw-fix-build-without-dri3.patch \ | 20 | file://0001-drisw-fix-build-without-dri3.patch \ |
22 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ | 21 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ |
23 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ | 22 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ |
24 | " | 23 | " |
25 | 24 | ||
26 | SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" | 25 | SRC_URI[sha256sum] = "38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018" |
27 | 26 | ||
28 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
29 | 28 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_24.0.2.bb b/meta/recipes-graphics/mesa/mesa_24.0.5.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_24.0.2.bb +++ b/meta/recipes-graphics/mesa/mesa_24.0.5.bb | |||
diff --git a/meta/recipes-graphics/pango/pango_1.52.0.bb b/meta/recipes-graphics/pango/pango_1.52.2.bb index 7505ff9279..4f748e6554 100644 --- a/meta/recipes-graphics/pango/pango_1.52.0.bb +++ b/meta/recipes-graphics/pango/pango_1.52.2.bb | |||
@@ -23,7 +23,7 @@ SRC_URI += "file://run-ptest \ | |||
23 | file://0001-Skip-running-test-layout-test.patch \ | 23 | file://0001-Skip-running-test-layout-test.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI[archive.sha256sum] = "1ec8518879c3f43224499f08e8ecbbdf4a5d302ed6cd3853b4fa949f82b89a9b" | 26 | SRC_URI[archive.sha256sum] = "d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b" |
27 | 27 | ||
28 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" | 28 | DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" |
29 | 29 | ||
diff --git a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch index 4212512034..5c49aa7fd5 100644 --- a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch +++ b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 792a46ef27ef879a21c9f01a198eae213ea535e6 Mon Sep 17 00:00:00 2001 | 1 | From 941f5f5831e7a52c26168f81f25d0470860ca6f1 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 | 3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 |
4 | Subject: [PATCH] cmake: disable building external dependencies | 4 | Subject: [PATCH] cmake: disable building external dependencies |
@@ -15,7 +15,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
15 | 2 files changed, 25 insertions(+), 10 deletions(-) | 15 | 2 files changed, 25 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
18 | index 7bc8f5d..13fc535 100644 | 18 | index ffcb54b..cce715e 100644 |
19 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
20 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
21 | @@ -62,6 +62,7 @@ else() | 21 | @@ -62,6 +62,7 @@ else() |
@@ -26,7 +26,7 @@ index 7bc8f5d..13fc535 100644 | |||
26 | 26 | ||
27 | set (CMAKE_CXX_STANDARD 17) | 27 | set (CMAKE_CXX_STANDARD 17) |
28 | 28 | ||
29 | @@ -123,8 +124,14 @@ endif(MSVC) | 29 | @@ -119,8 +120,14 @@ endif(MSVC) |
30 | 30 | ||
31 | 31 | ||
32 | # Configure subdirectories. | 32 | # Configure subdirectories. |
@@ -43,9 +43,9 @@ index 7bc8f5d..13fc535 100644 | |||
43 | 43 | ||
44 | add_subdirectory(libshaderc_util) | 44 | add_subdirectory(libshaderc_util) |
45 | add_subdirectory(libshaderc) | 45 | add_subdirectory(libshaderc) |
46 | @@ -136,7 +143,7 @@ endif() | 46 | @@ -132,7 +139,7 @@ endif() |
47 | add_custom_target(build-version | 47 | add_custom_target(build-version |
48 | ${PYTHON_EXECUTABLE} | 48 | ${Python_EXECUTABLE} |
49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py | 49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py |
50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc | 50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc |
51 | + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} | 51 | + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} |
@@ -53,7 +53,7 @@ index 7bc8f5d..13fc535 100644 | |||
53 | 53 | ||
54 | function(define_pkg_config_file NAME LIBS) | 54 | function(define_pkg_config_file NAME LIBS) |
55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py | 55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py |
56 | index 11ee53e..d39e59d 100755 | 56 | index b7ce5b8..95b34c5 100755 |
57 | --- a/utils/update_build_version.py | 57 | --- a/utils/update_build_version.py |
58 | +++ b/utils/update_build_version.py | 58 | +++ b/utils/update_build_version.py |
59 | @@ -30,6 +30,7 @@ import re | 59 | @@ -30,6 +30,7 @@ import re |
diff --git a/meta/recipes-graphics/shaderc/shaderc_2023.8.bb b/meta/recipes-graphics/shaderc/shaderc_2024.0.bb index bc7afbdf5e..9975c608ac 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2023.8.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2024.0.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" | |||
6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
8 | 8 | ||
9 | SRCREV = "f8a25c591bf5edbb462ca4aea99dcc666f096d13" | 9 | SRCREV = "9f56ca620c07d6c4d119c65c1c1f3f1c584c9985" |
10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ | 10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ |
11 | file://0001-cmake-disable-building-external-dependencies.patch \ | 11 | file://0001-cmake-disable-building-external-dependencies.patch \ |
12 | file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ | 12 | file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ |
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.275.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb index 598a8fc209..26bfd9c4fa 100644 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.275.0.bb +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb | |||
@@ -2,9 +2,9 @@ SUMMARY = "Machine-readable files for the SPIR-V Registry" | |||
2 | SECTION = "graphics" | 2 | SECTION = "graphics" |
3 | HOMEPAGE = "https://www.khronos.org/registry/spir-v" | 3 | HOMEPAGE = "https://www.khronos.org/registry/spir-v" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741" |
6 | 6 | ||
7 | SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3" | 7 | SRCREV = "8b246ff75c6615ba4532fe4fde20f1be090c3764" |
8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" | 8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" |
9 | PE = "1" | 9 | PE = "1" |
10 | # These recipes need to be updated in lockstep with each other: | 10 | # These recipes need to be updated in lockstep with each other: |
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.275.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb index 05c6de1b50..d2b6acf946 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.275.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb | |||
@@ -7,7 +7,7 @@ SECTION = "graphics" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | 9 | ||
10 | SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" | 10 | SRCREV = "04896c462d9f3f504c99a4698605b6524af813c1" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" |
12 | PE = "1" | 12 | PE = "1" |
13 | # These recipes need to be updated in lockstep with each other: | 13 | # These recipes need to be updated in lockstep with each other: |
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb index b7fdc0d399..584a19a42a 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb | |||
@@ -26,7 +26,7 @@ do_install () { | |||
26 | done | 26 | done |
27 | 27 | ||
28 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 28 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
29 | install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ | 29 | install -m 0644 ${UNPACKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ |
30 | 30 | ||
31 | install -d ${D}${prefix}/share/doc/${BPN}/ | 31 | install -d ${D}${prefix}/share/doc/${BPN}/ |
32 | install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ | 32 | install -m 0644 LICENSE ${D}${datadir}/doc/${BPN}/ |
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.280.0.bb index aacec8cab1..371cc7304d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.280.0.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT" | |||
11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" |
13 | 13 | ||
14 | SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40" | 14 | SRCREV = "577baa05033cf1d9236b3d078ca4b3269ed87a2b" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.280.0.bb index 7caed67207..b738771801 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.280.0.bb | |||
@@ -9,8 +9,8 @@ SECTION = "libs" | |||
9 | 9 | ||
10 | LICENSE = "Apache-2.0" | 10 | LICENSE = "Apache-2.0" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.280;protocol=https" |
13 | SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229" | 13 | SRCREV = "61a9c50248e09f3a0e0be7ce6f8bb1663855f979" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.280.0.bb index f86912c903..a7e4a67aaa 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.280.0.bb | |||
@@ -6,8 +6,8 @@ SECTION = "libs" | |||
6 | 6 | ||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https" | 9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=vulkan-sdk-1.3.280;protocol=https" |
10 | SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664" | 10 | SRCREV = "136976082d0b14dad8b9687982b2a80cc6e6a633" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.280.0.bb index 759a03926b..3ab31af96a 100644 --- a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.280.0.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" |
13 | SRCREV = "4cfc176e3242b4dbdfd3f6c5680c5d8f2cb7db45" | 13 | SRCREV = "a4140c5fd47dcf3a030726a60b293db61cfb54a3" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.280.0.bb index 239589108d..c488309c91 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.280.0.bb | |||
@@ -8,8 +8,8 @@ SECTION = "libs" | |||
8 | LICENSE = "Apache-2.0 & MIT" | 8 | LICENSE = "Apache-2.0 & MIT" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.280;protocol=https" |
12 | SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2" | 12 | SRCREV = "8506077b9a25a00684e8be24b779733ae1405a54" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
diff --git a/meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.280.0.bb index f4e6e89aac..2ef12fedf8 100644 --- a/meta/recipes-graphics/vulkan/vulkan-volk_1.3.275.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.280.0.bb | |||
@@ -7,10 +7,10 @@ BUGTRACKER = "https://github.com/zeux/volk" | |||
7 | SECTION = "libs" | 7 | SECTION = "libs" |
8 | 8 | ||
9 | LICENSE = "MIT" | 9 | LICENSE = "MIT" |
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b2dd098d35668a801190a9d9d47461b0" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e6af3a0e2a5e5dbf7796aa82b64626" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https" |
13 | SRCREV = "f2a16e3e19c2349b873343b2dc38a1d4c25af23a" | 13 | SRCREV = "01986ac85fa2e5c70df09aeae9c907e27c5d50b2" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch deleted file mode 100644 index 4b3a0e7c4a..0000000000 --- a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 | ||
4 | Subject: [PATCH] meson.build: request native wayland-scanner | ||
5 | |||
6 | This matters in cross compilation, as otherwise meson will | ||
7 | try to use a cross-binary, and fail. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | |||
12 | --- | ||
13 | meson.build | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index ca6a212..3177bde 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -110,7 +110,7 @@ else | ||
21 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | ||
22 | ) | ||
23 | dep_wayland_scanner = dependency( | ||
24 | - 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), | ||
25 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, | ||
26 | ) | ||
27 | if dep_wayland_scanner.found() | ||
28 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner')) | ||
diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch index 60e6318f7a..31ac3e0dd1 100644 --- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001 | 1 | From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 | 3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 |
4 | Subject: [PATCH] waffle: do not make core protocol into the library | 4 | Subject: [PATCH] waffle: do not make core protocol into the library |
@@ -9,16 +9,15 @@ wayland.xml from the host. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
12 | |||
13 | --- | 12 | --- |
14 | src/waffle/meson.build | 7 ------- | 13 | src/waffle/meson.build | 7 ------- |
15 | 1 file changed, 7 deletions(-) | 14 | 1 file changed, 7 deletions(-) |
16 | 15 | ||
17 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build | 16 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build |
18 | index e2636c7..3ff5762 100644 | 17 | index 1cc99f6..022745a 100644 |
19 | --- a/src/waffle/meson.build | 18 | --- a/src/waffle/meson.build |
20 | +++ b/src/waffle/meson.build | 19 | +++ b/src/waffle/meson.build |
21 | @@ -88,12 +88,6 @@ if build_surfaceless | 20 | @@ -89,12 +89,6 @@ if build_surfaceless |
22 | endif | 21 | endif |
23 | 22 | ||
24 | if build_wayland | 23 | if build_wayland |
@@ -31,7 +30,7 @@ index e2636c7..3ff5762 100644 | |||
31 | wl_xdg_shell_proto_c = custom_target( | 30 | wl_xdg_shell_proto_c = custom_target( |
32 | 'wl-xdg-shell-proto.c', | 31 | 'wl-xdg-shell-proto.c', |
33 | input: wayland_xdg_shell_xml, | 32 | input: wayland_xdg_shell_xml, |
34 | @@ -114,7 +108,6 @@ if build_wayland | 33 | @@ -115,7 +109,6 @@ if build_wayland |
35 | 'wayland/wayland_wrapper.c', | 34 | 'wayland/wayland_wrapper.c', |
36 | ) | 35 | ) |
37 | files_libwaffle += [ | 36 | files_libwaffle += [ |
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.2.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb index cb917d8894..ad8649b40e 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.2.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb | |||
@@ -9,11 +9,10 @@ LICENSE = "BSD-2-Clause" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ |
10 | file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" | 10 | file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" |
11 | 11 | ||
12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \ | 12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ |
13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ | 13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ |
14 | file://0001-meson.build-request-native-wayland-scanner.patch \ | ||
15 | " | 14 | " |
16 | SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9" | 15 | SRCREV = "580b912a30085528886603942c100c7b309b3bdb" |
17 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
18 | 17 | ||
19 | inherit meson features_check lib_package bash-completion pkgconfig | 18 | inherit meson features_check lib_package bash-completion pkgconfig |
@@ -38,7 +37,7 @@ PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx | |||
38 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" | 37 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" |
39 | 38 | ||
40 | # wants gbm.pc egl.pc | 39 | # wants gbm.pc egl.pc |
41 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm udev" | 40 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm libdrm" |
42 | 41 | ||
43 | # wants egl.pc | 42 | # wants egl.pc |
44 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" | 43 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" |
diff --git a/meta/recipes-graphics/wayland/libinput_1.25.0.bb b/meta/recipes-graphics/wayland/libinput_1.25.0.bb index 517b247fed..894858e361 100644 --- a/meta/recipes-graphics/wayland/libinput_1.25.0.bb +++ b/meta/recipes-graphics/wayland/libinput_1.25.0.bb | |||
@@ -32,7 +32,7 @@ do_configure:append() { | |||
32 | 32 | ||
33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" | 34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" |
35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" | 35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" |
36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" | 36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" |
37 | 37 | ||
38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" | 38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" |
diff --git a/meta/recipes-graphics/wayland/mtdev_1.1.6.bb b/meta/recipes-graphics/wayland/mtdev_1.1.7.bb index 7c1cb5e4ec..24803c4238 100644 --- a/meta/recipes-graphics/wayland/mtdev_1.1.6.bb +++ b/meta/recipes-graphics/wayland/mtdev_1.1.7.bb | |||
@@ -12,7 +12,6 @@ LICENSE = "MIT" | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" |
13 | 13 | ||
14 | SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" | 14 | SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" |
15 | SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" | 15 | SRC_URI[sha256sum] = "a107adad2101fecac54ac7f9f0e0a0dd155d954193da55c2340c97f2ff1d814e" |
16 | SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" | ||
17 | 16 | ||
18 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.33.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb index 074ea3663a..9b008ca534 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.33.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb | |||
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ | |||
10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" | 10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" |
11 | 11 | ||
12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" | 12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a" | 13 | SRC_URI[sha256sum] = "71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig allarch | 18 | inherit meson pkgconfig allarch |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index 878c7a267e..59d414a0a6 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV} | |||
13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" | 13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig | 18 | inherit meson pkgconfig |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland_1.22.0.bb b/meta/recipes-graphics/wayland/wayland_1.22.0.bb index 6aa76063ea..e7babc9ec6 100644 --- a/meta/recipes-graphics/wayland/wayland_1.22.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.22.0.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downl | |||
20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" | 20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" | 22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" |
23 | UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 23 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
24 | 24 | ||
25 | inherit meson pkgconfig ptest | 25 | inherit meson pkgconfig ptest |
26 | 26 | ||
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 024e400665..ca3d1478dc 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -29,18 +29,18 @@ DEFAULTBACKEND:qemuall ?= "drm" | |||
29 | do_install() { | 29 | do_install() { |
30 | # Install weston-start script | 30 | # Install weston-start script |
31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then | 31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
32 | install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start | 32 | install -Dm755 ${S}/weston-start ${D}${bindir}/weston-start |
33 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start | 33 | sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start |
34 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start | 34 | sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start |
35 | install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston | 35 | install -Dm755 ${S}/init ${D}/${sysconfdir}/init.d/weston |
36 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston | 36 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston |
37 | fi | 37 | fi |
38 | 38 | ||
39 | # Install Weston systemd service | 39 | # Install Weston systemd service |
40 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 40 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
41 | install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service | 41 | install -D -p -m0644 ${S}/weston.service ${D}${systemd_system_unitdir}/weston.service |
42 | install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket | 42 | install -D -p -m0644 ${S}/weston.socket ${D}${systemd_system_unitdir}/weston.socket |
43 | install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh | 43 | install -D -p -m0644 ${S}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh |
44 | sed -i -e s:/etc:${sysconfdir}:g \ | 44 | sed -i -e s:/etc:${sysconfdir}:g \ |
45 | -e s:/usr/bin:${bindir}:g \ | 45 | -e s:/usr/bin:${bindir}:g \ |
46 | -e s:/var:${localstatedir}:g \ | 46 | -e s:/var:${localstatedir}:g \ |
@@ -48,11 +48,11 @@ do_install() { | |||
48 | fi | 48 | fi |
49 | 49 | ||
50 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 50 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
51 | install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin | 51 | install -D -p -m0644 ${S}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin |
52 | fi | 52 | fi |
53 | 53 | ||
54 | install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini | 54 | install -D -p -m0644 ${S}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini |
55 | install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston | 55 | install -Dm644 ${S}/weston.env ${D}${sysconfdir}/default/weston |
56 | 56 | ||
57 | if [ -n "${DEFAULTBACKEND}" ]; then | 57 | if [ -n "${DEFAULTBACKEND}" ]; then |
58 | sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini | 58 | sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini |
diff --git a/meta/recipes-graphics/wayland/weston_13.0.0.bb b/meta/recipes-graphics/wayland/weston_13.0.0.bb index b728bd0ef3..cb0024c5ca 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.0.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo | |||
17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" | 17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" | 19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" |
20 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 20 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
21 | 21 | ||
22 | inherit meson pkgconfig useradd | 22 | inherit meson pkgconfig useradd |
23 | 23 | ||
@@ -105,18 +105,18 @@ do_install:append() { | |||
105 | # If X11, ship a desktop file to launch it | 105 | # If X11, ship a desktop file to launch it |
106 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then | 106 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then |
107 | install -d ${D}${datadir}/applications | 107 | install -d ${D}${datadir}/applications |
108 | install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | 108 | install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications |
109 | 109 | ||
110 | install -d ${D}${datadir}/icons/hicolor/48x48/apps | 110 | install -d ${D}${datadir}/icons/hicolor/48x48/apps |
111 | install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps | 111 | install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps |
112 | fi | 112 | fi |
113 | 113 | ||
114 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then | 114 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then |
115 | install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland | 115 | install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland |
116 | fi | 116 | fi |
117 | 117 | ||
118 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then | 118 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then |
119 | install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify | 119 | install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify |
120 | fi | 120 | fi |
121 | 121 | ||
122 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then | 122 | if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then |
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 671c0a290e..4e38b4da34 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | |||
@@ -52,7 +52,7 @@ do_install() { | |||
52 | 52 | ||
53 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service | 55 | install -m 0644 ${S}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service |
56 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service | 56 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service |
57 | fi | 57 | fi |
58 | 58 | ||
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch index 86982924a8..de0862599d 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Inactive-Upstream [last commits over a decade ago] |
2 | 2 | ||
3 | From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 | 3 | From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 |
4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> | 4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> |
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 7b49668f92..0516928a76 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | |||
@@ -27,7 +27,7 @@ do_install:append() { | |||
27 | install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | 27 | install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh |
28 | 28 | ||
29 | install -d ${D}${sysconfdir}/X11/Xsession.d/ | 29 | install -d ${D}${sysconfdir}/X11/Xsession.d/ |
30 | install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ | 30 | install -m 0755 ${UNPACKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ |
31 | 31 | ||
32 | install -d ${D}${sysconfdir}/xdg/autostart | 32 | install -d ${D}${sysconfdir}/xdg/autostart |
33 | sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop | 33 | sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop |
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.3.bb index cd658ab219..aa79902a34 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.2.3.bb | |||
@@ -15,7 +15,7 @@ RPROVIDES:${PN} += "mkfontdir" | |||
15 | 15 | ||
16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
17 | 17 | ||
18 | LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934" | 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=5a60c596d1b5f3dee9f005b703b3180d" |
19 | 19 | ||
20 | SRC_URI_EXT = "xz" | 20 | SRC_URI_EXT = "xz" |
21 | SRC_URI[sha256sum] = "8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4" | 21 | SRC_URI[sha256sum] = "2921cdc344f1acee04bcd6ea1e29565c1308263006e134a9ee38cf9c9d6fe75e" |
diff --git a/meta/recipes-graphics/xorg-app/xauth_1.1.2.bb b/meta/recipes-graphics/xorg-app/xauth_1.1.3.bb index 1ad18ef63b..b0ca33bf4b 100644 --- a/meta/recipes-graphics/xorg-app/xauth_1.1.2.bb +++ b/meta/recipes-graphics/xorg-app/xauth_1.1.3.bb | |||
@@ -9,7 +9,7 @@ DEPENDS += "libxau libxext libxmu" | |||
9 | PE = "1" | 9 | PE = "1" |
10 | 10 | ||
11 | SRC_URI_EXT = "xz" | 11 | SRC_URI_EXT = "xz" |
12 | SRC_URI[sha256sum] = "78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200" | 12 | SRC_URI[sha256sum] = "e7075498bae332f917f01d660f9b940c0752b2556a8da61ccb62a44d0ffe9d33" |
13 | 13 | ||
14 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 14 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
15 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 15 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.5.bb b/meta/recipes-graphics/xorg-app/xev_1.2.6.bb index 1d2e66b7b4..182aeff1b7 100644 --- a/meta/recipes-graphics/xorg-app/xev_1.2.5.bb +++ b/meta/recipes-graphics/xorg-app/xev_1.2.6.bb | |||
@@ -12,6 +12,6 @@ PE = "1" | |||
12 | 12 | ||
13 | DEPENDS += "libxrandr xorgproto" | 13 | DEPENDS += "libxrandr xorgproto" |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "c9461a4389714e0f33974f9e75934bdc38d836a0f059b8dc089c7cbf2ce36ec1" | 15 | SRC_URI[sha256sum] = "61e1c5e008ac9973aca7cdddf36e9df7410e77083b030eb04f4dc737c51807d7" |
16 | 16 | ||
17 | SRC_URI_EXT = "xz" | 17 | SRC_URI_EXT = "xz" |
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb b/meta/recipes-graphics/xorg-font/encodings_1.1.0.bb index 5906da416a..7432c08ec0 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.7.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.1.0.bb | |||
@@ -11,7 +11,7 @@ PE = "1" | |||
11 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" | 11 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" |
12 | RDEPENDS:${PN} = "" | 12 | RDEPENDS:${PN} = "" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4" | 14 | SRC_URI[sha256sum] = "9ff13c621756cfa12e95f32ba48a5b23839e8f577d0048beda66c67dab4de975" |
15 | 15 | ||
16 | SRC_URI_EXT = "xz" | 16 | SRC_URI_EXT = "xz" |
17 | 17 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.7.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb index 056a29af25..0fc117fc58 100644 --- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.7.bb +++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb | |||
@@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" | |||
11 | DEPENDS += "zlib xorgproto font-util" | 11 | DEPENDS += "zlib xorgproto font-util" |
12 | PE = "1" | 12 | PE = "1" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "c0d36991faee06551ddbaf5d99266e97becdc05edfae87a833c3ff7bf73cfec2" | 14 | SRC_URI[sha256sum] = "7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6" |
15 | 15 | ||
16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb index 74b308c912..d311fd95e0 100644 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.bb +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb | |||
@@ -16,7 +16,7 @@ inherit features_check pkgconfig meson | |||
16 | 16 | ||
17 | REQUIRED_DISTRO_FEATURES ?= "x11" | 17 | REQUIRED_DISTRO_FEATURES ?= "x11" |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "5461b0257d495254346f52a9c329b44b346262663675d3fecdb204a7e7c262a9" | 19 | SRC_URI[sha256sum] = "4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76" |
20 | 20 | ||
21 | LICENSE = "MIT & MIT" | 21 | LICENSE = "MIT & MIT" |
22 | LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" | 22 | LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" |
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.7.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb index 5f14e62446..5dcb063473 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.7.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb | |||
@@ -24,7 +24,7 @@ XORG_PN = "libX11" | |||
24 | 24 | ||
25 | SRC_URI += "file://disable_tests.patch" | 25 | SRC_URI += "file://disable_tests.patch" |
26 | 26 | ||
27 | SRC_URI[sha256sum] = "05f267468e3c851ae2b5c830bcf74251a90f63f04dd7c709ca94dc155b7e99ee" | 27 | SRC_URI[sha256sum] = "779d8f111d144ef93e2daa5f23a762ce9555affc99592844e71c4243d3bd3262" |
28 | 28 | ||
29 | inherit gettext | 29 | inherit gettext |
30 | 30 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.16.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb index 04b1eaa910..de3290aa9f 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.16.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | |||
12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ | 12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ |
13 | file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" | 13 | file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "4348566aa0fbf196db5e0a576321c65966189210cb51328ea2bb2be39c711d71" | 15 | SRC_URI[sha256sum] = "f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311" |
16 | 16 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |
18 | 18 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.1.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb index 4fd7e949c4..159ac4f7fa 100644 --- a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb | |||
@@ -18,6 +18,6 @@ PE = "1" | |||
18 | 18 | ||
19 | XORG_PN = "libXcursor" | 19 | XORG_PN = "libXcursor" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104" | 21 | SRC_URI[sha256sum] = "53d071bd2cc56e517a30998d5e685c8a74556ddada43c6985d14da9a023a88ee" |
22 | 22 | ||
23 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb index bf5d2d6721..d1a1a2e7f9 100644 --- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb | |||
@@ -22,7 +22,7 @@ XORG_PN = "libXdmcp" | |||
22 | 22 | ||
23 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "2dce5cc317f8f0b484ec347d87d81d552cdbebb178bd13c5d8193b6b7cd6ad00" | 25 | SRC_URI[sha256sum] = "d8a5222828c3adab70adf69a5583f1d32eb5ece04304f7f8392b6a353aa2228c" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "" | 27 | PACKAGECONFIG ??= "" |
28 | PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" | 28 | PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" |
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb index 02045cc212..40cf616f0b 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "flex-native bison-native" | |||
9 | 9 | ||
10 | SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" | 10 | SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b" | 12 | SRC_URI[sha256sum] = "65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "http://xkbcommon.org/" | 14 | UPSTREAM_CHECK_URI = "http://xkbcommon.org/" |
15 | 15 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb index 3aae4030b7..51faf170bf 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb | |||
@@ -27,4 +27,4 @@ FILES:libxmuu = "${libdir}/libXmuu.so.*" | |||
27 | 27 | ||
28 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | 29 | ||
30 | SRC_URI[sha256sum] = "210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244" | 30 | SRC_URI[sha256sum] = "fcb27793248a39e5fcc5b9c4aec40cc0734b3ca76aac3d7d1c264e7f7e14e8b2" |
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb index 8a93f8c0fe..23ae0cbb27 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb | |||
@@ -40,6 +40,8 @@ EXTRA_OEMESON:append:class-target:powerpc64le = " ${@bb.utils.contains("TUNE_FEA | |||
40 | EXTRA_OEMESON:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" | 40 | EXTRA_OEMESON:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" |
41 | EXTRA_OEMESON:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" | 41 | EXTRA_OEMESON:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" |
42 | 42 | ||
43 | EXTRA_OEMESON:append:class-native = " -Dopenmp=disabled" | ||
44 | |||
43 | BBCLASSEXTEND = "native nativesdk" | 45 | BBCLASSEXTEND = "native nativesdk" |
44 | 46 | ||
45 | CVE_STATUS[CVE-2023-37769] = "not-applicable-config: stress-test is an uninstalled test" | 47 | CVE_STATUS[CVE-2023-37769] = "not-applicable-config: stress-test is an uninstalled test" |
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb index 67c1e8d97d..2a78a87e77 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.17.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz \ | |||
15 | file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ | 15 | file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ |
16 | file://0001-Fix-install-conflict-when-enable-multilib.patch \ | 16 | file://0001-Fix-install-conflict-when-enable-multilib.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "a75a1848ad2a89a82d841a51be56ce988ff3c63a8d6bf4383ae3219d8d915119" | 18 | SRC_URI[sha256sum] = "2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c" |
19 | 19 | ||
20 | inherit autotools pkgconfig python3native | 20 | inherit autotools pkgconfig python3native |
21 | 21 | ||
diff --git a/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb b/meta/recipes-graphics/xorg-proto/xorgproto_2024.1.bb index 94d37c56bc..3f56e21a55 100644 --- a/meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb +++ b/meta/recipes-graphics/xorg-proto/xorgproto_2024.1.bb | |||
@@ -9,7 +9,7 @@ LICENSE = "MIT" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=0b9fe3db4015bcbe920e7c67a39ee3f1" | 9 | LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=0b9fe3db4015bcbe920e7c67a39ee3f1" |
10 | 10 | ||
11 | SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.xz" | 11 | SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.xz" |
12 | SRC_URI[sha256sum] = "b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c" | 12 | SRC_URI[sha256sum] = "372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59" |
13 | 13 | ||
14 | inherit meson | 14 | inherit meson |
15 | 15 | ||
diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.20.1.bb index cd4bc387a2..8a0e7bec41 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.20.1.bb | |||
@@ -11,7 +11,7 @@ PE = "1" | |||
11 | 11 | ||
12 | SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" | 12 | SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74" | 14 | SRC_URI[sha256sum] = "b373f72887b1394ce2193180a60cb0d1fb8b17bc96ddd770cfd7a808cb489a15" |
15 | 15 | ||
16 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 16 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
17 | DEV_PKG_DEPENDENCY = "" | 17 | DEV_PKG_DEPENDENCY = "" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf | |||
@@ -35,4 +35,8 @@ Section "ServerLayout" | |||
35 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
36 | Screen "Default Screen" | 36 | Screen "Default Screen" |
37 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
38 | Option "BlankTime" "0" | ||
39 | Option "StandbyTime" "0" | ||
40 | Option "SuspendTime" "0" | ||
41 | Option "OffTime" "0" | ||
38 | EndSection | 42 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf | |||
@@ -35,4 +35,8 @@ Section "ServerLayout" | |||
35 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
36 | Screen "Default Screen" | 36 | Screen "Default Screen" |
37 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
38 | Option "BlankTime" "0" | ||
39 | Option "StandbyTime" "0" | ||
40 | Option "SuspendTime" "0" | ||
41 | Option "OffTime" "0" | ||
38 | EndSection | 42 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf index f4cd139e8d..3eb380a0a4 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf | |||
@@ -35,4 +35,8 @@ Section "ServerLayout" | |||
35 | Identifier "Default Layout" | 35 | Identifier "Default Layout" |
36 | Screen "Default Screen" | 36 | Screen "Default Screen" |
37 | Option "AllowEmptyInput" "no" | 37 | Option "AllowEmptyInput" "no" |
38 | Option "BlankTime" "0" | ||
39 | Option "StandbyTime" "0" | ||
40 | Option "SuspendTime" "0" | ||
41 | Option "OffTime" "0" | ||
38 | EndSection | 42 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf index c12d92c201..c01c3331c5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf | |||
@@ -30,4 +30,8 @@ Section "ServerLayout" | |||
30 | Identifier "Default Layout" | 30 | Identifier "Default Layout" |
31 | Screen "Default Screen" | 31 | Screen "Default Screen" |
32 | Option "AllowEmptyInput" "no" | 32 | Option "AllowEmptyInput" "no" |
33 | Option "BlankTime" "0" | ||
34 | Option "StandbyTime" "0" | ||
35 | Option "SuspendTime" "0" | ||
36 | Option "OffTime" "0" | ||
33 | EndSection | 37 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf index c12d92c201..c01c3331c5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf | |||
@@ -30,4 +30,8 @@ Section "ServerLayout" | |||
30 | Identifier "Default Layout" | 30 | Identifier "Default Layout" |
31 | Screen "Default Screen" | 31 | Screen "Default Screen" |
32 | Option "AllowEmptyInput" "no" | 32 | Option "AllowEmptyInput" "no" |
33 | Option "BlankTime" "0" | ||
34 | Option "StandbyTime" "0" | ||
35 | Option "SuspendTime" "0" | ||
36 | Option "OffTime" "0" | ||
33 | EndSection | 37 | EndSection |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 03f14cef2b..a3a4733785 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | |||
@@ -14,8 +14,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
14 | ALLOW_EMPTY:${PN} = "1" | 14 | ALLOW_EMPTY:${PN} = "1" |
15 | 15 | ||
16 | do_install () { | 16 | do_install () { |
17 | if test -s ${WORKDIR}/xorg.conf; then | 17 | if test -s ${S}/xorg.conf; then |
18 | install -d ${D}/${sysconfdir}/X11 | 18 | install -d ${D}/${sysconfdir}/X11 |
19 | install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ | 19 | install -m 0644 ${S}/xorg.conf ${D}/${sysconfdir}/X11/ |
20 | fi | 20 | fi |
21 | } | 21 | } |
diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.4.bb b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb index 092359172a..f51429bc8c 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.4.bb +++ b/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
11 | 11 | ||
12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" | 12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b" | 13 | SRC_URI[sha256sum] = "1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" |
16 | 16 | ||
@@ -20,10 +20,11 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" | 20 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" |
21 | 21 | ||
22 | OPENGL_PKGCONFIGS = "glx glamor dri3" | 22 | OPENGL_PKGCONFIGS = "glx glamor dri3" |
23 | PACKAGECONFIG ??= "${XORG_CRYPTO} \ | 23 | PACKAGECONFIG ??= "${XORG_CRYPTO} ${XWAYLAND_EI} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 24 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
25 | " | 25 | " |
26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" | 26 | PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" |
27 | PACKAGECONFIG[libdecor] = "-Dlibdecor=true,-Dlibdecor=false,libdecor" | ||
27 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" | 28 | PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" |
28 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" | 29 | PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" |
29 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | 30 | PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
@@ -34,6 +35,10 @@ XORG_CRYPTO ??= "openssl" | |||
34 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" | 35 | PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" |
35 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" | 36 | PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" |
36 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" | 37 | PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" |
38 | XWAYLAND_EI ??= "xwayland_ei_false" | ||
39 | PACKAGECONFIG[xwayland_ei_false] = "-Dxwayland_ei=false" | ||
40 | PACKAGECONFIG[xwayland_ei_portal] = "-Dxwayland_ei=portal,,libei" | ||
41 | PACKAGECONFIG[xwayland_ei_socket] = "-Dxwayland_ei=socket,,libei" | ||
37 | 42 | ||
38 | do_install:append() { | 43 | do_install:append() { |
39 | # remove files not needed and clashing with xserver-xorg | 44 | # remove files not needed and clashing with xserver-xorg |
diff --git a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb index 974fcba876..332525f5c9 100644 --- a/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb +++ b/meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb | |||
@@ -9,9 +9,9 @@ SRC_URI = "file://dt-doc-validate \ | |||
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -d ${D}${bindir}/ | 11 | install -d ${D}${bindir}/ |
12 | install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/ | 12 | install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/ |
13 | install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/ | 13 | install -m 755 ${UNPACKDIR}/dt-mk-schema ${D}${bindir}/ |
14 | install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/ | 14 | install -m 755 ${UNPACKDIR}/dt-validate ${D}${bindir}/ |
15 | } | 15 | } |
16 | 16 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb index dec821ea88..c39fff834d 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.28.bb | |||
@@ -44,15 +44,15 @@ do_compile:prepend() { | |||
44 | 44 | ||
45 | do_install:append () { | 45 | do_install:append () { |
46 | install -d ${D}${sysconfdir}/sysconfig | 46 | install -d ${D}${sysconfdir}/sysconfig |
47 | install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig | 47 | install -m 0644 ${UNPACKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig |
48 | 48 | ||
49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
50 | install -D -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump | 50 | install -D -m 0755 ${UNPACKDIR}/kdump ${D}${sysconfdir}/init.d/kdump |
51 | fi | 51 | fi |
52 | 52 | ||
53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
54 | install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper | 54 | install -D -m 0755 ${UNPACKDIR}/kdump ${D}${libexecdir}/kdump-helper |
55 | install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service | 55 | install -D -m 0644 ${UNPACKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service |
56 | sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service | 56 | sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service |
57 | fi | 57 | fi |
58 | } | 58 | } |
diff --git a/meta/recipes-kernel/kmod/kmod_31.bb b/meta/recipes-kernel/kmod/kmod_31.bb index 6ae83a7c66..718a5565b4 100644 --- a/meta/recipes-kernel/kmod/kmod_31.bb +++ b/meta/recipes-kernel/kmod/kmod_31.bb | |||
@@ -63,7 +63,7 @@ do_install:append () { | |||
63 | install -dm755 ${D}${sysconfdir}/modprobe.d | 63 | install -dm755 ${D}${sysconfdir}/modprobe.d |
64 | 64 | ||
65 | # install depmod.d file for search/ dir | 65 | # install depmod.d file for search/ dir |
66 | install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" | 66 | install -Dm644 "${UNPACKDIR}/depmod-search.conf" "${D}${nonarch_base_libdir}/depmod.d/search.conf" |
67 | 67 | ||
68 | # Add .debug to the exclude path for depmod | 68 | # Add .debug to the exclude path for depmod |
69 | echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf | 69 | echo "exclude .debug" > ${D}${nonarch_base_libdir}/depmod.d/exclude.conf |
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch index 38b6107136..c723c236c0 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | |||
@@ -1,14 +1,20 @@ | |||
1 | Fixes for the Meson build of libtraceevent: | 1 | From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Sun, 27 Aug 2023 20:57:44 +0100 | ||
4 | Subject: [PATCH] Fixes for the Meson build of libtraceevent: | ||
2 | 5 | ||
3 | - Make the plugin directory the same as the Makefiles | 6 | - Make the plugin directory the same as the Makefiles |
4 | - Install the plugins as modules not static and versioned shared libraries | 7 | - Install the plugins as modules not static and versioned shared libraries |
5 | - Add an option to disable building the documentation (needs asciidoc and xmlto) | ||
6 | 8 | ||
7 | Upstream-Status: Pending | 9 | Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u] |
8 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
11 | --- | ||
12 | meson.build | 2 +- | ||
13 | plugins/meson.build | 3 +-- | ||
14 | 2 files changed, 2 insertions(+), 3 deletions(-) | ||
9 | 15 | ||
10 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
11 | index b61c873..4bba4d8 100644 | 17 | index 40ce38c..1eb7912 100644 |
12 | --- a/meson.build | 18 | --- a/meson.build |
13 | +++ b/meson.build | 19 | +++ b/meson.build |
14 | @@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) | 20 | @@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) |
@@ -20,41 +26,6 @@ index b61c873..4bba4d8 100644 | |||
20 | endif | 26 | endif |
21 | 27 | ||
22 | add_project_arguments( | 28 | add_project_arguments( |
23 | @@ -45,10 +45,13 @@ if cunit_dep.found() | ||
24 | subdir('utest') | ||
25 | endif | ||
26 | subdir('samples') | ||
27 | -subdir('Documentation') | ||
28 | |||
29 | -custom_target( | ||
30 | - 'docs', | ||
31 | - output: 'docs', | ||
32 | - depends: [html, man], | ||
33 | - command: ['echo']) | ||
34 | +if get_option('docs') | ||
35 | + subdir('Documentation') | ||
36 | + | ||
37 | + custom_target( | ||
38 | + 'docs', | ||
39 | + output: 'docs', | ||
40 | + depends: [html, man], | ||
41 | + command: ['echo']) | ||
42 | +endif | ||
43 | diff --git a/meson_options.txt b/meson_options.txt | ||
44 | index b2294f6..0611216 100644 | ||
45 | --- a/meson_options.txt | ||
46 | +++ b/meson_options.txt | ||
47 | @@ -4,6 +4,10 @@ | ||
48 | |||
49 | option('plugindir', type : 'string', | ||
50 | description : 'set the plugin dir') | ||
51 | + | ||
52 | +option('docs', type : 'boolean', value: true, | ||
53 | + description : 'build documentation') | ||
54 | + | ||
55 | option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc', | ||
56 | description : 'directory for HTML documentation') | ||
57 | option('asciidoctor', type : 'boolean', value: false, | ||
58 | diff --git a/plugins/meson.build b/plugins/meson.build | 29 | diff --git a/plugins/meson.build b/plugins/meson.build |
59 | index 74ad664..4919be4 100644 | 30 | index 74ad664..4919be4 100644 |
60 | --- a/plugins/meson.build | 31 | --- a/plugins/meson.build |
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb index bee7891832..d4ace54884 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb +++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 | |||
8 | file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" | 8 | file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" |
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | 10 | ||
11 | SRCREV = "dd148189b74da3e2f45c7e536319fec97cb71213" | 11 | SRCREV = "6f6d5802f31992e7527a4c32b43a32fda6bf6bdf" |
12 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ | 12 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ |
13 | file://meson.patch" | 13 | file://meson.patch" |
14 | 14 | ||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/git" | |||
16 | 16 | ||
17 | inherit meson pkgconfig | 17 | inherit meson pkgconfig |
18 | 18 | ||
19 | EXTRA_OEMESON = "-Ddocs=false" | 19 | EXTRA_OEMESON = "-Ddoc=false" |
20 | 20 | ||
21 | PACKAGES += "${PN}-plugins" | 21 | PACKAGES += "${PN}-plugins" |
22 | 22 | ||
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb index b35802d1dc..13538afede 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20240220.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20240312.bb | |||
@@ -154,7 +154,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ | |||
154 | " | 154 | " |
155 | # WHENCE checksum is defined separately to ease overriding it if | 155 | # WHENCE checksum is defined separately to ease overriding it if |
156 | # class-devupstream is selected. | 156 | # class-devupstream is selected. |
157 | WHENCE_CHKSUM = "a344e6c28970fc7daafa81c10247aeb6" | 157 | WHENCE_CHKSUM = "514da1cd8b363373030f0c16749feb8d" |
158 | 158 | ||
159 | # These are not common licenses, set NO_GENERIC_LICENSE for them | 159 | # These are not common licenses, set NO_GENERIC_LICENSE for them |
160 | # so that the license files will be copied from fetched source | 160 | # so that the license files will be copied from fetched source |
@@ -241,7 +241,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw | |||
241 | # Pin this to the 20220509 release, override this in local.conf | 241 | # Pin this to the 20220509 release, override this in local.conf |
242 | SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" | 242 | SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" |
243 | 243 | ||
244 | SRC_URI[sha256sum] = "bf0f239dc0801e9d6bf5d5fb3e2f549575632cf4688f4348184199cb02c2bcd7" | 244 | SRC_URI[sha256sum] = "b2327a54ad1897c828008caf63af5ee15469ba723a5016be58f2b44f07bd4b94" |
245 | 245 | ||
246 | inherit allarch | 246 | inherit allarch |
247 | 247 | ||
@@ -322,7 +322,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
322 | ${PN}-cnm-license ${PN}-cnm \ | 322 | ${PN}-cnm-license ${PN}-cnm \ |
323 | ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ | 323 | ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \ |
324 | ${PN}-carl9170 \ | 324 | ${PN}-carl9170 \ |
325 | ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-qca \ | 325 | ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-ath11k ${PN}-ath12k ${PN}-qca \ |
326 | \ | 326 | \ |
327 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ | 327 | ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ |
328 | \ | 328 | \ |
@@ -343,6 +343,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ | |||
343 | ${PN}-ibt-license ${PN}-ibt \ | 343 | ${PN}-ibt-license ${PN}-ibt \ |
344 | ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ | 344 | ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ |
345 | ${PN}-ibt-17 \ | 345 | ${PN}-ibt-17 \ |
346 | ${PN}-ibt-18 \ | ||
346 | ${PN}-ibt-20 \ | 347 | ${PN}-ibt-20 \ |
347 | ${PN}-ibt-misc \ | 348 | ${PN}-ibt-misc \ |
348 | ${PN}-i915-license ${PN}-i915 \ | 349 | ${PN}-i915-license ${PN}-i915 \ |
@@ -487,6 +488,10 @@ FILES:${PN}-ath11k = " \ | |||
487 | ${nonarch_base_libdir}/firmware/ath11k \ | 488 | ${nonarch_base_libdir}/firmware/ath11k \ |
488 | " | 489 | " |
489 | 490 | ||
491 | FILES:${PN}-ath12k = " \ | ||
492 | ${nonarch_base_libdir}/firmware/ath12k \ | ||
493 | " | ||
494 | |||
490 | FILES:${PN}-qca = " \ | 495 | FILES:${PN}-qca = " \ |
491 | ${nonarch_base_libdir}/firmware/qca \ | 496 | ${nonarch_base_libdir}/firmware/qca \ |
492 | " | 497 | " |
@@ -494,6 +499,7 @@ FILES:${PN}-qca = " \ | |||
494 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" | 499 | RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license ${PN}-atheros-license" |
495 | RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" | 500 | RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license" |
496 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" | 501 | RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license" |
502 | RDEPENDS:${PN}-ath12k += "${PN}-ath10k-license" | ||
497 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" | 503 | RDEPENDS:${PN}-qca += "${PN}-ath10k-license" |
498 | 504 | ||
499 | # For ralink | 505 | # For ralink |
@@ -1272,6 +1278,7 @@ LICENSE:${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" | |||
1272 | LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware" | 1278 | LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware" |
1273 | LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware" | 1279 | LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware" |
1274 | LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware" | 1280 | LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware" |
1281 | LICENSE:${PN}-ibt-18 = "Firmware-ibt_firmware" | ||
1275 | LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware" | 1282 | LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware" |
1276 | LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware" | 1283 | LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware" |
1277 | 1284 | ||
@@ -1281,6 +1288,7 @@ FILES:${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bs | |||
1281 | FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" | 1288 | FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" |
1282 | FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" | 1289 | FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" |
1283 | FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" | 1290 | FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" |
1291 | FILES:${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-18-*.ddc" | ||
1284 | FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" | 1292 | FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" |
1285 | FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" | 1293 | FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" |
1286 | 1294 | ||
@@ -1289,6 +1297,7 @@ RDEPENDS:${PN}-ibt-hw-37.8 = "${PN}-ibt-license" | |||
1289 | RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license" | 1297 | RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license" |
1290 | RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license" | 1298 | RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license" |
1291 | RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license" | 1299 | RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license" |
1300 | RDEPENDS:${PN}-ibt-18 = "${PN}-ibt-license" | ||
1292 | RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license" | 1301 | RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license" |
1293 | RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license" | 1302 | RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license" |
1294 | 1303 | ||
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc index 0e42cea24a..9f1f03ac53 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.6.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.6.inc | |||
@@ -1,9 +1,9 @@ | |||
1 | 1 | ||
2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. | 2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. |
3 | # Generated at 2024-03-19 21:27:37.303325+00:00 for version 6.6.22 | 3 | # Generated at 2024-05-02 12:41:43.351358+00:00 for version 6.6.29 |
4 | 4 | ||
5 | python check_kernel_cve_status_version() { | 5 | python check_kernel_cve_status_version() { |
6 | this_version = "6.6.22" | 6 | this_version = "6.6.29" |
7 | kernel_version = d.getVar("LINUX_VERSION") | 7 | kernel_version = d.getVar("LINUX_VERSION") |
8 | if kernel_version != this_version: | 8 | if kernel_version != this_version: |
9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) | 9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) |
@@ -2980,6 +2980,10 @@ CVE_STATUS[CVE-2019-25044] = "fixed-version: Fixed from version 5.2rc4" | |||
2980 | 2980 | ||
2981 | CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1" | 2981 | CVE_STATUS[CVE-2019-25045] = "fixed-version: Fixed from version 5.1" |
2982 | 2982 | ||
2983 | CVE_STATUS[CVE-2019-25160] = "fixed-version: Fixed from version 5.0" | ||
2984 | |||
2985 | CVE_STATUS[CVE-2019-25162] = "fixed-version: Fixed from version 6.0rc1" | ||
2986 | |||
2983 | CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1" | 2987 | CVE_STATUS[CVE-2019-3016] = "fixed-version: Fixed from version 5.6rc1" |
2984 | 2988 | ||
2985 | CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1" | 2989 | CVE_STATUS[CVE-2019-3459] = "fixed-version: Fixed from version 5.1rc1" |
@@ -3452,6 +3456,32 @@ CVE_STATUS[CVE-2020-36694] = "fixed-version: Fixed from version 5.10" | |||
3452 | 3456 | ||
3453 | CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" | 3457 | CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" |
3454 | 3458 | ||
3459 | CVE_STATUS[CVE-2020-36775] = "fixed-version: Fixed from version 5.7rc1" | ||
3460 | |||
3461 | CVE_STATUS[CVE-2020-36776] = "fixed-version: Fixed from version 5.13rc1" | ||
3462 | |||
3463 | CVE_STATUS[CVE-2020-36777] = "fixed-version: Fixed from version 5.13rc1" | ||
3464 | |||
3465 | CVE_STATUS[CVE-2020-36778] = "fixed-version: Fixed from version 5.13rc1" | ||
3466 | |||
3467 | CVE_STATUS[CVE-2020-36779] = "fixed-version: Fixed from version 5.13rc1" | ||
3468 | |||
3469 | CVE_STATUS[CVE-2020-36780] = "fixed-version: Fixed from version 5.13rc1" | ||
3470 | |||
3471 | CVE_STATUS[CVE-2020-36781] = "fixed-version: Fixed from version 5.13rc1" | ||
3472 | |||
3473 | CVE_STATUS[CVE-2020-36782] = "fixed-version: Fixed from version 5.13rc1" | ||
3474 | |||
3475 | CVE_STATUS[CVE-2020-36783] = "fixed-version: Fixed from version 5.13rc1" | ||
3476 | |||
3477 | CVE_STATUS[CVE-2020-36784] = "fixed-version: Fixed from version 5.13rc1" | ||
3478 | |||
3479 | CVE_STATUS[CVE-2020-36785] = "fixed-version: Fixed from version 5.13rc1" | ||
3480 | |||
3481 | CVE_STATUS[CVE-2020-36786] = "fixed-version: Fixed from version 5.13rc1" | ||
3482 | |||
3483 | CVE_STATUS[CVE-2020-36787] = "fixed-version: Fixed from version 5.13rc1" | ||
3484 | |||
3455 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" | 3485 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" |
3456 | 3486 | ||
3457 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" | 3487 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" |
@@ -3940,6 +3970,540 @@ CVE_STATUS[CVE-2021-45868] = "fixed-version: Fixed from version 5.16rc1" | |||
3940 | 3970 | ||
3941 | CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7" | 3971 | CVE_STATUS[CVE-2021-46283] = "fixed-version: Fixed from version 5.13rc7" |
3942 | 3972 | ||
3973 | CVE_STATUS[CVE-2021-46904] = "fixed-version: Fixed from version 5.12rc7" | ||
3974 | |||
3975 | CVE_STATUS[CVE-2021-46905] = "fixed-version: Fixed from version 5.13rc1" | ||
3976 | |||
3977 | CVE_STATUS[CVE-2021-46906] = "fixed-version: Fixed from version 5.13rc5" | ||
3978 | |||
3979 | CVE_STATUS[CVE-2021-46908] = "fixed-version: Fixed from version 5.12rc8" | ||
3980 | |||
3981 | CVE_STATUS[CVE-2021-46909] = "fixed-version: Fixed from version 5.12rc8" | ||
3982 | |||
3983 | CVE_STATUS[CVE-2021-46910] = "fixed-version: Fixed from version 5.12rc8" | ||
3984 | |||
3985 | CVE_STATUS[CVE-2021-46911] = "fixed-version: Fixed from version 5.12rc8" | ||
3986 | |||
3987 | CVE_STATUS[CVE-2021-46912] = "fixed-version: Fixed from version 5.12rc8" | ||
3988 | |||
3989 | CVE_STATUS[CVE-2021-46913] = "fixed-version: Fixed from version 5.12rc8" | ||
3990 | |||
3991 | CVE_STATUS[CVE-2021-46914] = "fixed-version: Fixed from version 5.12rc8" | ||
3992 | |||
3993 | CVE_STATUS[CVE-2021-46915] = "fixed-version: Fixed from version 5.12rc8" | ||
3994 | |||
3995 | CVE_STATUS[CVE-2021-46916] = "fixed-version: Fixed from version 5.12rc8" | ||
3996 | |||
3997 | CVE_STATUS[CVE-2021-46917] = "fixed-version: Fixed from version 5.12rc8" | ||
3998 | |||
3999 | CVE_STATUS[CVE-2021-46918] = "fixed-version: Fixed from version 5.12rc8" | ||
4000 | |||
4001 | CVE_STATUS[CVE-2021-46919] = "fixed-version: Fixed from version 5.12rc8" | ||
4002 | |||
4003 | CVE_STATUS[CVE-2021-46920] = "fixed-version: Fixed from version 5.12rc8" | ||
4004 | |||
4005 | CVE_STATUS[CVE-2021-46921] = "fixed-version: Fixed from version 5.12" | ||
4006 | |||
4007 | CVE_STATUS[CVE-2021-46922] = "fixed-version: Fixed from version 5.12" | ||
4008 | |||
4009 | CVE_STATUS[CVE-2021-46923] = "fixed-version: Fixed from version 5.16rc8" | ||
4010 | |||
4011 | CVE_STATUS[CVE-2021-46924] = "fixed-version: Fixed from version 5.16rc8" | ||
4012 | |||
4013 | CVE_STATUS[CVE-2021-46925] = "fixed-version: Fixed from version 5.16rc8" | ||
4014 | |||
4015 | CVE_STATUS[CVE-2021-46926] = "fixed-version: Fixed from version 5.16rc7" | ||
4016 | |||
4017 | CVE_STATUS[CVE-2021-46927] = "fixed-version: Fixed from version 5.16rc8" | ||
4018 | |||
4019 | CVE_STATUS[CVE-2021-46928] = "fixed-version: Fixed from version 5.16rc7" | ||
4020 | |||
4021 | CVE_STATUS[CVE-2021-46929] = "fixed-version: Fixed from version 5.16rc8" | ||
4022 | |||
4023 | CVE_STATUS[CVE-2021-46930] = "fixed-version: Fixed from version 5.16rc8" | ||
4024 | |||
4025 | CVE_STATUS[CVE-2021-46931] = "fixed-version: Fixed from version 5.16rc8" | ||
4026 | |||
4027 | CVE_STATUS[CVE-2021-46932] = "fixed-version: Fixed from version 5.16rc8" | ||
4028 | |||
4029 | CVE_STATUS[CVE-2021-46933] = "fixed-version: Fixed from version 5.16rc8" | ||
4030 | |||
4031 | CVE_STATUS[CVE-2021-46934] = "fixed-version: Fixed from version 5.16rc8" | ||
4032 | |||
4033 | CVE_STATUS[CVE-2021-46935] = "fixed-version: Fixed from version 5.16rc8" | ||
4034 | |||
4035 | CVE_STATUS[CVE-2021-46936] = "fixed-version: Fixed from version 5.16rc8" | ||
4036 | |||
4037 | CVE_STATUS[CVE-2021-46937] = "fixed-version: Fixed from version 5.16rc8" | ||
4038 | |||
4039 | CVE_STATUS[CVE-2021-46938] = "fixed-version: Fixed from version 5.13rc1" | ||
4040 | |||
4041 | CVE_STATUS[CVE-2021-46939] = "fixed-version: Fixed from version 5.13rc1" | ||
4042 | |||
4043 | CVE_STATUS[CVE-2021-46940] = "fixed-version: Fixed from version 5.13rc1" | ||
4044 | |||
4045 | CVE_STATUS[CVE-2021-46941] = "fixed-version: Fixed from version 5.13rc1" | ||
4046 | |||
4047 | CVE_STATUS[CVE-2021-46942] = "fixed-version: Fixed from version 5.13rc1" | ||
4048 | |||
4049 | CVE_STATUS[CVE-2021-46943] = "fixed-version: Fixed from version 5.13rc1" | ||
4050 | |||
4051 | CVE_STATUS[CVE-2021-46944] = "fixed-version: Fixed from version 5.13rc1" | ||
4052 | |||
4053 | CVE_STATUS[CVE-2021-46945] = "fixed-version: Fixed from version 5.13rc1" | ||
4054 | |||
4055 | CVE_STATUS[CVE-2021-46947] = "fixed-version: Fixed from version 5.13rc1" | ||
4056 | |||
4057 | CVE_STATUS[CVE-2021-46948] = "fixed-version: Fixed from version 5.13rc1" | ||
4058 | |||
4059 | CVE_STATUS[CVE-2021-46949] = "fixed-version: Fixed from version 5.13rc1" | ||
4060 | |||
4061 | CVE_STATUS[CVE-2021-46950] = "fixed-version: Fixed from version 5.13rc1" | ||
4062 | |||
4063 | CVE_STATUS[CVE-2021-46951] = "fixed-version: Fixed from version 5.13rc1" | ||
4064 | |||
4065 | CVE_STATUS[CVE-2021-46952] = "fixed-version: Fixed from version 5.13rc1" | ||
4066 | |||
4067 | CVE_STATUS[CVE-2021-46953] = "fixed-version: Fixed from version 5.13rc1" | ||
4068 | |||
4069 | CVE_STATUS[CVE-2021-46954] = "fixed-version: Fixed from version 5.13rc1" | ||
4070 | |||
4071 | CVE_STATUS[CVE-2021-46955] = "fixed-version: Fixed from version 5.13rc1" | ||
4072 | |||
4073 | CVE_STATUS[CVE-2021-46956] = "fixed-version: Fixed from version 5.13rc1" | ||
4074 | |||
4075 | CVE_STATUS[CVE-2021-46957] = "fixed-version: Fixed from version 5.13rc1" | ||
4076 | |||
4077 | CVE_STATUS[CVE-2021-46958] = "fixed-version: Fixed from version 5.13rc1" | ||
4078 | |||
4079 | CVE_STATUS[CVE-2021-46959] = "fixed-version: Fixed from version 5.13rc1" | ||
4080 | |||
4081 | CVE_STATUS[CVE-2021-46960] = "fixed-version: Fixed from version 5.13rc1" | ||
4082 | |||
4083 | CVE_STATUS[CVE-2021-46961] = "fixed-version: Fixed from version 5.13rc1" | ||
4084 | |||
4085 | CVE_STATUS[CVE-2021-46962] = "fixed-version: Fixed from version 5.13rc1" | ||
4086 | |||
4087 | CVE_STATUS[CVE-2021-46963] = "fixed-version: Fixed from version 5.13rc1" | ||
4088 | |||
4089 | CVE_STATUS[CVE-2021-46964] = "fixed-version: Fixed from version 5.13rc1" | ||
4090 | |||
4091 | CVE_STATUS[CVE-2021-46965] = "fixed-version: Fixed from version 5.13rc1" | ||
4092 | |||
4093 | CVE_STATUS[CVE-2021-46966] = "fixed-version: Fixed from version 5.13rc1" | ||
4094 | |||
4095 | CVE_STATUS[CVE-2021-46967] = "fixed-version: Fixed from version 5.13rc1" | ||
4096 | |||
4097 | CVE_STATUS[CVE-2021-46968] = "fixed-version: Fixed from version 5.13rc1" | ||
4098 | |||
4099 | CVE_STATUS[CVE-2021-46969] = "fixed-version: Fixed from version 5.13rc1" | ||
4100 | |||
4101 | CVE_STATUS[CVE-2021-46970] = "fixed-version: Fixed from version 5.13rc1" | ||
4102 | |||
4103 | CVE_STATUS[CVE-2021-46971] = "fixed-version: Fixed from version 5.13rc1" | ||
4104 | |||
4105 | CVE_STATUS[CVE-2021-46972] = "fixed-version: Fixed from version 5.13rc1" | ||
4106 | |||
4107 | CVE_STATUS[CVE-2021-46973] = "fixed-version: Fixed from version 5.13rc1" | ||
4108 | |||
4109 | CVE_STATUS[CVE-2021-46974] = "fixed-version: Fixed from version 5.13rc1" | ||
4110 | |||
4111 | CVE_STATUS[CVE-2021-46976] = "fixed-version: Fixed from version 5.13rc2" | ||
4112 | |||
4113 | CVE_STATUS[CVE-2021-46977] = "fixed-version: Fixed from version 5.13rc2" | ||
4114 | |||
4115 | CVE_STATUS[CVE-2021-46978] = "fixed-version: Fixed from version 5.13rc2" | ||
4116 | |||
4117 | CVE_STATUS[CVE-2021-46979] = "fixed-version: Fixed from version 5.13rc2" | ||
4118 | |||
4119 | CVE_STATUS[CVE-2021-46980] = "fixed-version: Fixed from version 5.13rc2" | ||
4120 | |||
4121 | CVE_STATUS[CVE-2021-46981] = "fixed-version: Fixed from version 5.13rc2" | ||
4122 | |||
4123 | CVE_STATUS[CVE-2021-46982] = "fixed-version: Fixed from version 5.13rc2" | ||
4124 | |||
4125 | CVE_STATUS[CVE-2021-46983] = "fixed-version: Fixed from version 5.13rc2" | ||
4126 | |||
4127 | CVE_STATUS[CVE-2021-46984] = "fixed-version: Fixed from version 5.13rc2" | ||
4128 | |||
4129 | CVE_STATUS[CVE-2021-46985] = "fixed-version: Fixed from version 5.13rc2" | ||
4130 | |||
4131 | CVE_STATUS[CVE-2021-46986] = "fixed-version: Fixed from version 5.13rc2" | ||
4132 | |||
4133 | CVE_STATUS[CVE-2021-46987] = "fixed-version: Fixed from version 5.13rc2" | ||
4134 | |||
4135 | CVE_STATUS[CVE-2021-46988] = "fixed-version: Fixed from version 5.13rc2" | ||
4136 | |||
4137 | CVE_STATUS[CVE-2021-46989] = "fixed-version: Fixed from version 5.13rc2" | ||
4138 | |||
4139 | CVE_STATUS[CVE-2021-46990] = "fixed-version: Fixed from version 5.13rc2" | ||
4140 | |||
4141 | CVE_STATUS[CVE-2021-46991] = "fixed-version: Fixed from version 5.13rc1" | ||
4142 | |||
4143 | CVE_STATUS[CVE-2021-46992] = "fixed-version: Fixed from version 5.13rc1" | ||
4144 | |||
4145 | CVE_STATUS[CVE-2021-46993] = "fixed-version: Fixed from version 5.13rc1" | ||
4146 | |||
4147 | CVE_STATUS[CVE-2021-46994] = "fixed-version: Fixed from version 5.13rc1" | ||
4148 | |||
4149 | CVE_STATUS[CVE-2021-46995] = "fixed-version: Fixed from version 5.13rc1" | ||
4150 | |||
4151 | CVE_STATUS[CVE-2021-46996] = "fixed-version: Fixed from version 5.13rc1" | ||
4152 | |||
4153 | CVE_STATUS[CVE-2021-46997] = "fixed-version: Fixed from version 5.13rc1" | ||
4154 | |||
4155 | CVE_STATUS[CVE-2021-46998] = "fixed-version: Fixed from version 5.13rc1" | ||
4156 | |||
4157 | CVE_STATUS[CVE-2021-46999] = "fixed-version: Fixed from version 5.13rc1" | ||
4158 | |||
4159 | CVE_STATUS[CVE-2021-47000] = "fixed-version: Fixed from version 5.13rc1" | ||
4160 | |||
4161 | CVE_STATUS[CVE-2021-47001] = "fixed-version: Fixed from version 5.13rc1" | ||
4162 | |||
4163 | CVE_STATUS[CVE-2021-47002] = "fixed-version: Fixed from version 5.13rc1" | ||
4164 | |||
4165 | CVE_STATUS[CVE-2021-47003] = "fixed-version: Fixed from version 5.13rc1" | ||
4166 | |||
4167 | CVE_STATUS[CVE-2021-47004] = "fixed-version: Fixed from version 5.13rc1" | ||
4168 | |||
4169 | CVE_STATUS[CVE-2021-47005] = "fixed-version: Fixed from version 5.13rc1" | ||
4170 | |||
4171 | CVE_STATUS[CVE-2021-47006] = "fixed-version: Fixed from version 5.13rc1" | ||
4172 | |||
4173 | CVE_STATUS[CVE-2021-47007] = "fixed-version: Fixed from version 5.13rc1" | ||
4174 | |||
4175 | CVE_STATUS[CVE-2021-47008] = "fixed-version: Fixed from version 5.13rc1" | ||
4176 | |||
4177 | CVE_STATUS[CVE-2021-47009] = "fixed-version: Fixed from version 5.13rc2" | ||
4178 | |||
4179 | CVE_STATUS[CVE-2021-47010] = "fixed-version: Fixed from version 5.13rc1" | ||
4180 | |||
4181 | CVE_STATUS[CVE-2021-47011] = "fixed-version: Fixed from version 5.13rc1" | ||
4182 | |||
4183 | CVE_STATUS[CVE-2021-47012] = "fixed-version: Fixed from version 5.13rc1" | ||
4184 | |||
4185 | CVE_STATUS[CVE-2021-47013] = "fixed-version: Fixed from version 5.13rc1" | ||
4186 | |||
4187 | CVE_STATUS[CVE-2021-47014] = "fixed-version: Fixed from version 5.13rc1" | ||
4188 | |||
4189 | CVE_STATUS[CVE-2021-47015] = "fixed-version: Fixed from version 5.13rc1" | ||
4190 | |||
4191 | CVE_STATUS[CVE-2021-47016] = "fixed-version: Fixed from version 5.13rc1" | ||
4192 | |||
4193 | CVE_STATUS[CVE-2021-47017] = "fixed-version: Fixed from version 5.13rc1" | ||
4194 | |||
4195 | CVE_STATUS[CVE-2021-47018] = "fixed-version: Fixed from version 5.13rc1" | ||
4196 | |||
4197 | CVE_STATUS[CVE-2021-47019] = "fixed-version: Fixed from version 5.13rc1" | ||
4198 | |||
4199 | CVE_STATUS[CVE-2021-47020] = "fixed-version: Fixed from version 5.13rc1" | ||
4200 | |||
4201 | CVE_STATUS[CVE-2021-47021] = "fixed-version: Fixed from version 5.13rc1" | ||
4202 | |||
4203 | CVE_STATUS[CVE-2021-47022] = "fixed-version: Fixed from version 5.13rc1" | ||
4204 | |||
4205 | CVE_STATUS[CVE-2021-47023] = "fixed-version: Fixed from version 5.13rc1" | ||
4206 | |||
4207 | CVE_STATUS[CVE-2021-47024] = "fixed-version: Fixed from version 5.13rc1" | ||
4208 | |||
4209 | CVE_STATUS[CVE-2021-47025] = "fixed-version: Fixed from version 5.13rc1" | ||
4210 | |||
4211 | CVE_STATUS[CVE-2021-47026] = "fixed-version: Fixed from version 5.13rc1" | ||
4212 | |||
4213 | CVE_STATUS[CVE-2021-47027] = "fixed-version: Fixed from version 5.13rc1" | ||
4214 | |||
4215 | CVE_STATUS[CVE-2021-47028] = "fixed-version: Fixed from version 5.13rc1" | ||
4216 | |||
4217 | CVE_STATUS[CVE-2021-47029] = "fixed-version: Fixed from version 5.13rc1" | ||
4218 | |||
4219 | CVE_STATUS[CVE-2021-47030] = "fixed-version: Fixed from version 5.13rc1" | ||
4220 | |||
4221 | CVE_STATUS[CVE-2021-47031] = "fixed-version: Fixed from version 5.13rc1" | ||
4222 | |||
4223 | CVE_STATUS[CVE-2021-47032] = "fixed-version: Fixed from version 5.13rc1" | ||
4224 | |||
4225 | CVE_STATUS[CVE-2021-47033] = "fixed-version: Fixed from version 5.13rc1" | ||
4226 | |||
4227 | CVE_STATUS[CVE-2021-47034] = "fixed-version: Fixed from version 5.13rc1" | ||
4228 | |||
4229 | CVE_STATUS[CVE-2021-47035] = "fixed-version: Fixed from version 5.13rc1" | ||
4230 | |||
4231 | CVE_STATUS[CVE-2021-47036] = "fixed-version: Fixed from version 5.13rc1" | ||
4232 | |||
4233 | CVE_STATUS[CVE-2021-47037] = "fixed-version: Fixed from version 5.13rc1" | ||
4234 | |||
4235 | CVE_STATUS[CVE-2021-47038] = "fixed-version: Fixed from version 5.13rc1" | ||
4236 | |||
4237 | CVE_STATUS[CVE-2021-47039] = "fixed-version: Fixed from version 5.13rc1" | ||
4238 | |||
4239 | CVE_STATUS[CVE-2021-47040] = "fixed-version: Fixed from version 5.13rc1" | ||
4240 | |||
4241 | CVE_STATUS[CVE-2021-47041] = "fixed-version: Fixed from version 5.13rc1" | ||
4242 | |||
4243 | CVE_STATUS[CVE-2021-47042] = "fixed-version: Fixed from version 5.13rc1" | ||
4244 | |||
4245 | CVE_STATUS[CVE-2021-47043] = "fixed-version: Fixed from version 5.13rc1" | ||
4246 | |||
4247 | CVE_STATUS[CVE-2021-47044] = "fixed-version: Fixed from version 5.13rc1" | ||
4248 | |||
4249 | CVE_STATUS[CVE-2021-47045] = "fixed-version: Fixed from version 5.13rc1" | ||
4250 | |||
4251 | CVE_STATUS[CVE-2021-47046] = "fixed-version: Fixed from version 5.13rc1" | ||
4252 | |||
4253 | CVE_STATUS[CVE-2021-47047] = "fixed-version: Fixed from version 5.13rc1" | ||
4254 | |||
4255 | CVE_STATUS[CVE-2021-47048] = "fixed-version: Fixed from version 5.13rc1" | ||
4256 | |||
4257 | CVE_STATUS[CVE-2021-47049] = "fixed-version: Fixed from version 5.13rc1" | ||
4258 | |||
4259 | CVE_STATUS[CVE-2021-47050] = "fixed-version: Fixed from version 5.13rc1" | ||
4260 | |||
4261 | CVE_STATUS[CVE-2021-47051] = "fixed-version: Fixed from version 5.13rc1" | ||
4262 | |||
4263 | CVE_STATUS[CVE-2021-47052] = "fixed-version: Fixed from version 5.13rc1" | ||
4264 | |||
4265 | CVE_STATUS[CVE-2021-47053] = "fixed-version: Fixed from version 5.13rc1" | ||
4266 | |||
4267 | CVE_STATUS[CVE-2021-47054] = "fixed-version: Fixed from version 5.13rc1" | ||
4268 | |||
4269 | CVE_STATUS[CVE-2021-47055] = "fixed-version: Fixed from version 5.13rc1" | ||
4270 | |||
4271 | CVE_STATUS[CVE-2021-47056] = "fixed-version: Fixed from version 5.13rc1" | ||
4272 | |||
4273 | CVE_STATUS[CVE-2021-47057] = "fixed-version: Fixed from version 5.13rc1" | ||
4274 | |||
4275 | CVE_STATUS[CVE-2021-47058] = "fixed-version: Fixed from version 5.13rc1" | ||
4276 | |||
4277 | CVE_STATUS[CVE-2021-47059] = "fixed-version: Fixed from version 5.13rc1" | ||
4278 | |||
4279 | CVE_STATUS[CVE-2021-47060] = "fixed-version: Fixed from version 5.13rc1" | ||
4280 | |||
4281 | CVE_STATUS[CVE-2021-47061] = "fixed-version: Fixed from version 5.13rc1" | ||
4282 | |||
4283 | CVE_STATUS[CVE-2021-47062] = "fixed-version: Fixed from version 5.13rc1" | ||
4284 | |||
4285 | CVE_STATUS[CVE-2021-47063] = "fixed-version: Fixed from version 5.13rc1" | ||
4286 | |||
4287 | CVE_STATUS[CVE-2021-47064] = "fixed-version: Fixed from version 5.13rc1" | ||
4288 | |||
4289 | CVE_STATUS[CVE-2021-47065] = "fixed-version: Fixed from version 5.13rc1" | ||
4290 | |||
4291 | CVE_STATUS[CVE-2021-47066] = "fixed-version: Fixed from version 5.13rc1" | ||
4292 | |||
4293 | CVE_STATUS[CVE-2021-47067] = "fixed-version: Fixed from version 5.13rc1" | ||
4294 | |||
4295 | CVE_STATUS[CVE-2021-47068] = "fixed-version: Fixed from version 5.13rc1" | ||
4296 | |||
4297 | CVE_STATUS[CVE-2021-47069] = "fixed-version: Fixed from version 5.13rc3" | ||
4298 | |||
4299 | CVE_STATUS[CVE-2021-47070] = "fixed-version: Fixed from version 5.13rc3" | ||
4300 | |||
4301 | CVE_STATUS[CVE-2021-47071] = "fixed-version: Fixed from version 5.13rc3" | ||
4302 | |||
4303 | CVE_STATUS[CVE-2021-47072] = "fixed-version: Fixed from version 5.13rc3" | ||
4304 | |||
4305 | CVE_STATUS[CVE-2021-47073] = "fixed-version: Fixed from version 5.13rc3" | ||
4306 | |||
4307 | CVE_STATUS[CVE-2021-47074] = "fixed-version: Fixed from version 5.13rc3" | ||
4308 | |||
4309 | CVE_STATUS[CVE-2021-47075] = "fixed-version: Fixed from version 5.13rc3" | ||
4310 | |||
4311 | CVE_STATUS[CVE-2021-47076] = "fixed-version: Fixed from version 5.13rc3" | ||
4312 | |||
4313 | CVE_STATUS[CVE-2021-47077] = "fixed-version: Fixed from version 5.13rc3" | ||
4314 | |||
4315 | CVE_STATUS[CVE-2021-47078] = "fixed-version: Fixed from version 5.13rc3" | ||
4316 | |||
4317 | CVE_STATUS[CVE-2021-47079] = "fixed-version: Fixed from version 5.13rc3" | ||
4318 | |||
4319 | CVE_STATUS[CVE-2021-47080] = "fixed-version: Fixed from version 5.13rc3" | ||
4320 | |||
4321 | CVE_STATUS[CVE-2021-47081] = "fixed-version: Fixed from version 5.13rc3" | ||
4322 | |||
4323 | CVE_STATUS[CVE-2021-47082] = "fixed-version: Fixed from version 5.16rc7" | ||
4324 | |||
4325 | CVE_STATUS[CVE-2021-47083] = "fixed-version: Fixed from version 5.16rc7" | ||
4326 | |||
4327 | CVE_STATUS[CVE-2021-47086] = "fixed-version: Fixed from version 5.16rc7" | ||
4328 | |||
4329 | CVE_STATUS[CVE-2021-47087] = "fixed-version: Fixed from version 5.16rc7" | ||
4330 | |||
4331 | CVE_STATUS[CVE-2021-47088] = "fixed-version: Fixed from version 5.16rc7" | ||
4332 | |||
4333 | CVE_STATUS[CVE-2021-47089] = "fixed-version: Fixed from version 5.16rc7" | ||
4334 | |||
4335 | CVE_STATUS[CVE-2021-47090] = "fixed-version: Fixed from version 5.16rc7" | ||
4336 | |||
4337 | CVE_STATUS[CVE-2021-47091] = "fixed-version: Fixed from version 5.16rc7" | ||
4338 | |||
4339 | CVE_STATUS[CVE-2021-47092] = "fixed-version: Fixed from version 5.16rc7" | ||
4340 | |||
4341 | CVE_STATUS[CVE-2021-47093] = "fixed-version: Fixed from version 5.16rc7" | ||
4342 | |||
4343 | CVE_STATUS[CVE-2021-47094] = "fixed-version: Fixed from version 5.16rc7" | ||
4344 | |||
4345 | CVE_STATUS[CVE-2021-47095] = "fixed-version: Fixed from version 5.16rc7" | ||
4346 | |||
4347 | CVE_STATUS[CVE-2021-47096] = "fixed-version: Fixed from version 5.16rc7" | ||
4348 | |||
4349 | CVE_STATUS[CVE-2021-47097] = "fixed-version: Fixed from version 5.16rc7" | ||
4350 | |||
4351 | CVE_STATUS[CVE-2021-47098] = "fixed-version: Fixed from version 5.16rc7" | ||
4352 | |||
4353 | CVE_STATUS[CVE-2021-47099] = "fixed-version: Fixed from version 5.16rc7" | ||
4354 | |||
4355 | CVE_STATUS[CVE-2021-47100] = "fixed-version: Fixed from version 5.16rc7" | ||
4356 | |||
4357 | CVE_STATUS[CVE-2021-47101] = "fixed-version: Fixed from version 5.16rc7" | ||
4358 | |||
4359 | CVE_STATUS[CVE-2021-47102] = "fixed-version: Fixed from version 5.16rc7" | ||
4360 | |||
4361 | CVE_STATUS[CVE-2021-47103] = "fixed-version: Fixed from version 5.16rc7" | ||
4362 | |||
4363 | CVE_STATUS[CVE-2021-47104] = "fixed-version: Fixed from version 5.16rc7" | ||
4364 | |||
4365 | CVE_STATUS[CVE-2021-47105] = "fixed-version: Fixed from version 5.16rc7" | ||
4366 | |||
4367 | CVE_STATUS[CVE-2021-47106] = "fixed-version: Fixed from version 5.16rc7" | ||
4368 | |||
4369 | CVE_STATUS[CVE-2021-47107] = "fixed-version: Fixed from version 5.16rc7" | ||
4370 | |||
4371 | CVE_STATUS[CVE-2021-47108] = "fixed-version: Fixed from version 5.16rc7" | ||
4372 | |||
4373 | CVE_STATUS[CVE-2021-47109] = "fixed-version: Fixed from version 5.13rc7" | ||
4374 | |||
4375 | CVE_STATUS[CVE-2021-47110] = "fixed-version: Fixed from version 5.13rc2" | ||
4376 | |||
4377 | CVE_STATUS[CVE-2021-47111] = "fixed-version: Fixed from version 5.13rc6" | ||
4378 | |||
4379 | CVE_STATUS[CVE-2021-47112] = "fixed-version: Fixed from version 5.13rc2" | ||
4380 | |||
4381 | CVE_STATUS[CVE-2021-47113] = "fixed-version: Fixed from version 5.13rc5" | ||
4382 | |||
4383 | CVE_STATUS[CVE-2021-47114] = "fixed-version: Fixed from version 5.13rc5" | ||
4384 | |||
4385 | CVE_STATUS[CVE-2021-47116] = "fixed-version: Fixed from version 5.13rc5" | ||
4386 | |||
4387 | CVE_STATUS[CVE-2021-47117] = "fixed-version: Fixed from version 5.13rc5" | ||
4388 | |||
4389 | CVE_STATUS[CVE-2021-47118] = "fixed-version: Fixed from version 5.13rc5" | ||
4390 | |||
4391 | CVE_STATUS[CVE-2021-47119] = "fixed-version: Fixed from version 5.13rc5" | ||
4392 | |||
4393 | CVE_STATUS[CVE-2021-47120] = "fixed-version: Fixed from version 5.13rc5" | ||
4394 | |||
4395 | CVE_STATUS[CVE-2021-47121] = "fixed-version: Fixed from version 5.13rc5" | ||
4396 | |||
4397 | CVE_STATUS[CVE-2021-47122] = "fixed-version: Fixed from version 5.13rc5" | ||
4398 | |||
4399 | CVE_STATUS[CVE-2021-47123] = "fixed-version: Fixed from version 5.13rc2" | ||
4400 | |||
4401 | CVE_STATUS[CVE-2021-47124] = "fixed-version: Fixed from version 5.13rc2" | ||
4402 | |||
4403 | CVE_STATUS[CVE-2021-47125] = "fixed-version: Fixed from version 5.13rc5" | ||
4404 | |||
4405 | CVE_STATUS[CVE-2021-47126] = "fixed-version: Fixed from version 5.13rc5" | ||
4406 | |||
4407 | CVE_STATUS[CVE-2021-47127] = "fixed-version: Fixed from version 5.13rc5" | ||
4408 | |||
4409 | CVE_STATUS[CVE-2021-47128] = "fixed-version: Fixed from version 5.13rc5" | ||
4410 | |||
4411 | CVE_STATUS[CVE-2021-47129] = "fixed-version: Fixed from version 5.13rc5" | ||
4412 | |||
4413 | CVE_STATUS[CVE-2021-47130] = "fixed-version: Fixed from version 5.13rc5" | ||
4414 | |||
4415 | CVE_STATUS[CVE-2021-47131] = "fixed-version: Fixed from version 5.13rc5" | ||
4416 | |||
4417 | CVE_STATUS[CVE-2021-47132] = "fixed-version: Fixed from version 5.13rc5" | ||
4418 | |||
4419 | CVE_STATUS[CVE-2021-47133] = "fixed-version: Fixed from version 5.13rc5" | ||
4420 | |||
4421 | CVE_STATUS[CVE-2021-47134] = "fixed-version: Fixed from version 5.13rc5" | ||
4422 | |||
4423 | CVE_STATUS[CVE-2021-47135] = "fixed-version: Fixed from version 5.13rc5" | ||
4424 | |||
4425 | CVE_STATUS[CVE-2021-47136] = "fixed-version: Fixed from version 5.13rc4" | ||
4426 | |||
4427 | CVE_STATUS[CVE-2021-47137] = "fixed-version: Fixed from version 5.13rc4" | ||
4428 | |||
4429 | CVE_STATUS[CVE-2021-47138] = "fixed-version: Fixed from version 5.13rc4" | ||
4430 | |||
4431 | CVE_STATUS[CVE-2021-47139] = "fixed-version: Fixed from version 5.13rc4" | ||
4432 | |||
4433 | CVE_STATUS[CVE-2021-47140] = "fixed-version: Fixed from version 5.13rc4" | ||
4434 | |||
4435 | CVE_STATUS[CVE-2021-47141] = "fixed-version: Fixed from version 5.13rc4" | ||
4436 | |||
4437 | CVE_STATUS[CVE-2021-47142] = "fixed-version: Fixed from version 5.13rc3" | ||
4438 | |||
4439 | CVE_STATUS[CVE-2021-47143] = "fixed-version: Fixed from version 5.13rc4" | ||
4440 | |||
4441 | CVE_STATUS[CVE-2021-47144] = "fixed-version: Fixed from version 5.13rc3" | ||
4442 | |||
4443 | CVE_STATUS[CVE-2021-47145] = "fixed-version: Fixed from version 5.13rc3" | ||
4444 | |||
4445 | CVE_STATUS[CVE-2021-47146] = "fixed-version: Fixed from version 5.13rc4" | ||
4446 | |||
4447 | CVE_STATUS[CVE-2021-47147] = "fixed-version: Fixed from version 5.13rc4" | ||
4448 | |||
4449 | CVE_STATUS[CVE-2021-47148] = "fixed-version: Fixed from version 5.13rc4" | ||
4450 | |||
4451 | CVE_STATUS[CVE-2021-47149] = "fixed-version: Fixed from version 5.13rc3" | ||
4452 | |||
4453 | CVE_STATUS[CVE-2021-47150] = "fixed-version: Fixed from version 5.13rc4" | ||
4454 | |||
4455 | CVE_STATUS[CVE-2021-47151] = "fixed-version: Fixed from version 5.13rc4" | ||
4456 | |||
4457 | CVE_STATUS[CVE-2021-47152] = "fixed-version: Fixed from version 5.13rc4" | ||
4458 | |||
4459 | CVE_STATUS[CVE-2021-47153] = "fixed-version: Fixed from version 5.13rc4" | ||
4460 | |||
4461 | CVE_STATUS[CVE-2021-47158] = "fixed-version: Fixed from version 5.13rc4" | ||
4462 | |||
4463 | CVE_STATUS[CVE-2021-47159] = "fixed-version: Fixed from version 5.13rc4" | ||
4464 | |||
4465 | CVE_STATUS[CVE-2021-47160] = "fixed-version: Fixed from version 5.13rc4" | ||
4466 | |||
4467 | CVE_STATUS[CVE-2021-47161] = "fixed-version: Fixed from version 5.13rc4" | ||
4468 | |||
4469 | CVE_STATUS[CVE-2021-47162] = "fixed-version: Fixed from version 5.13rc4" | ||
4470 | |||
4471 | CVE_STATUS[CVE-2021-47163] = "fixed-version: Fixed from version 5.13rc4" | ||
4472 | |||
4473 | CVE_STATUS[CVE-2021-47164] = "fixed-version: Fixed from version 5.13rc4" | ||
4474 | |||
4475 | CVE_STATUS[CVE-2021-47165] = "fixed-version: Fixed from version 5.13rc4" | ||
4476 | |||
4477 | CVE_STATUS[CVE-2021-47166] = "fixed-version: Fixed from version 5.13rc4" | ||
4478 | |||
4479 | CVE_STATUS[CVE-2021-47167] = "fixed-version: Fixed from version 5.13rc4" | ||
4480 | |||
4481 | CVE_STATUS[CVE-2021-47168] = "fixed-version: Fixed from version 5.13rc4" | ||
4482 | |||
4483 | CVE_STATUS[CVE-2021-47169] = "fixed-version: Fixed from version 5.13rc4" | ||
4484 | |||
4485 | CVE_STATUS[CVE-2021-47170] = "fixed-version: Fixed from version 5.13rc4" | ||
4486 | |||
4487 | CVE_STATUS[CVE-2021-47171] = "fixed-version: Fixed from version 5.13rc4" | ||
4488 | |||
4489 | CVE_STATUS[CVE-2021-47172] = "fixed-version: Fixed from version 5.13rc4" | ||
4490 | |||
4491 | CVE_STATUS[CVE-2021-47173] = "fixed-version: Fixed from version 5.13rc4" | ||
4492 | |||
4493 | CVE_STATUS[CVE-2021-47174] = "fixed-version: Fixed from version 5.13rc4" | ||
4494 | |||
4495 | CVE_STATUS[CVE-2021-47175] = "fixed-version: Fixed from version 5.13rc4" | ||
4496 | |||
4497 | CVE_STATUS[CVE-2021-47176] = "fixed-version: Fixed from version 5.13rc4" | ||
4498 | |||
4499 | CVE_STATUS[CVE-2021-47177] = "fixed-version: Fixed from version 5.13rc4" | ||
4500 | |||
4501 | CVE_STATUS[CVE-2021-47178] = "fixed-version: Fixed from version 5.13rc4" | ||
4502 | |||
4503 | CVE_STATUS[CVE-2021-47179] = "fixed-version: Fixed from version 5.13rc4" | ||
4504 | |||
4505 | CVE_STATUS[CVE-2021-47180] = "fixed-version: Fixed from version 5.13rc4" | ||
4506 | |||
3943 | CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8" | 4507 | CVE_STATUS[CVE-2022-0001] = "fixed-version: Fixed from version 5.17rc8" |
3944 | 4508 | ||
3945 | CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8" | 4509 | CVE_STATUS[CVE-2022-0002] = "fixed-version: Fixed from version 5.17rc8" |
@@ -4590,6 +5154,16 @@ CVE_STATUS[CVE-2022-48502] = "fixed-version: Fixed from version 6.2rc1" | |||
4590 | 5154 | ||
4591 | CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" | 5155 | CVE_STATUS[CVE-2022-48619] = "fixed-version: Fixed from version 5.18rc1" |
4592 | 5156 | ||
5157 | CVE_STATUS[CVE-2022-48626] = "fixed-version: Fixed from version 5.17rc4" | ||
5158 | |||
5159 | CVE_STATUS[CVE-2022-48627] = "fixed-version: Fixed from version 5.19rc7" | ||
5160 | |||
5161 | CVE_STATUS[CVE-2022-48628] = "fixed-version: Fixed from version 6.6rc1" | ||
5162 | |||
5163 | CVE_STATUS[CVE-2022-48629] = "fixed-version: Fixed from version 5.17" | ||
5164 | |||
5165 | CVE_STATUS[CVE-2022-48630] = "fixed-version: Fixed from version 5.18" | ||
5166 | |||
4593 | CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" | 5167 | CVE_STATUS[CVE-2023-0030] = "fixed-version: Fixed from version 5.0rc1" |
4594 | 5168 | ||
4595 | CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3" | 5169 | CVE_STATUS[CVE-2023-0045] = "fixed-version: Fixed from version 6.2rc3" |
@@ -4834,6 +5408,8 @@ CVE_STATUS[CVE-2023-28466] = "fixed-version: Fixed from version 6.3rc2" | |||
4834 | 5408 | ||
4835 | CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5" | 5409 | CVE_STATUS[CVE-2023-2860] = "fixed-version: Fixed from version 6.0rc5" |
4836 | 5410 | ||
5411 | CVE_STATUS[CVE-2023-28746] = "cpe-stable-backport: Backported in 6.6.22" | ||
5412 | |||
4837 | CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1" | 5413 | CVE_STATUS[CVE-2023-28772] = "fixed-version: Fixed from version 5.14rc1" |
4838 | 5414 | ||
4839 | CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4" | 5415 | CVE_STATUS[CVE-2023-28866] = "fixed-version: Fixed from version 6.3rc4" |
@@ -5112,7 +5688,7 @@ CVE_STATUS[CVE-2023-46838] = "cpe-stable-backport: Backported in 6.6.14" | |||
5112 | 5688 | ||
5113 | CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6" | 5689 | CVE_STATUS[CVE-2023-46862] = "fixed-version: Fixed from version 6.6" |
5114 | 5690 | ||
5115 | # CVE-2023-47233 has no known resolution | 5691 | CVE_STATUS[CVE-2023-47233] = "cpe-stable-backport: Backported in 6.6.24" |
5116 | 5692 | ||
5117 | CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1" | 5693 | CVE_STATUS[CVE-2023-4732] = "fixed-version: Fixed from version 5.14rc1" |
5118 | 5694 | ||
@@ -5208,6 +5784,294 @@ CVE_STATUS[CVE-2023-52463] = "cpe-stable-backport: Backported in 6.6.14" | |||
5208 | 5784 | ||
5209 | CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14" | 5785 | CVE_STATUS[CVE-2023-52464] = "cpe-stable-backport: Backported in 6.6.14" |
5210 | 5786 | ||
5787 | CVE_STATUS[CVE-2023-52465] = "cpe-stable-backport: Backported in 6.6.14" | ||
5788 | |||
5789 | CVE_STATUS[CVE-2023-52467] = "cpe-stable-backport: Backported in 6.6.14" | ||
5790 | |||
5791 | CVE_STATUS[CVE-2023-52468] = "cpe-stable-backport: Backported in 6.6.14" | ||
5792 | |||
5793 | CVE_STATUS[CVE-2023-52469] = "cpe-stable-backport: Backported in 6.6.14" | ||
5794 | |||
5795 | CVE_STATUS[CVE-2023-52470] = "cpe-stable-backport: Backported in 6.6.14" | ||
5796 | |||
5797 | CVE_STATUS[CVE-2023-52471] = "fixed-version: only affects 6.7rc1 onwards" | ||
5798 | |||
5799 | CVE_STATUS[CVE-2023-52472] = "cpe-stable-backport: Backported in 6.6.14" | ||
5800 | |||
5801 | CVE_STATUS[CVE-2023-52473] = "cpe-stable-backport: Backported in 6.6.14" | ||
5802 | |||
5803 | CVE_STATUS[CVE-2023-52474] = "fixed-version: Fixed from version 6.4rc1" | ||
5804 | |||
5805 | CVE_STATUS[CVE-2023-52475] = "fixed-version: Fixed from version 6.6rc6" | ||
5806 | |||
5807 | CVE_STATUS[CVE-2023-52476] = "fixed-version: Fixed from version 6.6rc6" | ||
5808 | |||
5809 | CVE_STATUS[CVE-2023-52477] = "fixed-version: Fixed from version 6.6rc6" | ||
5810 | |||
5811 | CVE_STATUS[CVE-2023-52478] = "fixed-version: Fixed from version 6.6rc6" | ||
5812 | |||
5813 | CVE_STATUS[CVE-2023-52479] = "fixed-version: Fixed from version 6.6rc5" | ||
5814 | |||
5815 | CVE_STATUS[CVE-2023-52480] = "fixed-version: Fixed from version 6.6rc5" | ||
5816 | |||
5817 | CVE_STATUS[CVE-2023-52481] = "fixed-version: Fixed from version 6.6rc5" | ||
5818 | |||
5819 | CVE_STATUS[CVE-2023-52482] = "fixed-version: Fixed from version 6.6rc4" | ||
5820 | |||
5821 | CVE_STATUS[CVE-2023-52483] = "fixed-version: Fixed from version 6.6rc6" | ||
5822 | |||
5823 | CVE_STATUS[CVE-2023-52484] = "fixed-version: Fixed from version 6.6rc5" | ||
5824 | |||
5825 | # CVE-2023-52485 needs backporting (fixed from 6.8rc1) | ||
5826 | |||
5827 | CVE_STATUS[CVE-2023-52486] = "cpe-stable-backport: Backported in 6.6.15" | ||
5828 | |||
5829 | CVE_STATUS[CVE-2023-52487] = "cpe-stable-backport: Backported in 6.6.15" | ||
5830 | |||
5831 | CVE_STATUS[CVE-2023-52488] = "cpe-stable-backport: Backported in 6.6.15" | ||
5832 | |||
5833 | CVE_STATUS[CVE-2023-52489] = "cpe-stable-backport: Backported in 6.6.15" | ||
5834 | |||
5835 | CVE_STATUS[CVE-2023-52490] = "cpe-stable-backport: Backported in 6.6.15" | ||
5836 | |||
5837 | CVE_STATUS[CVE-2023-52491] = "cpe-stable-backport: Backported in 6.6.15" | ||
5838 | |||
5839 | CVE_STATUS[CVE-2023-52492] = "cpe-stable-backport: Backported in 6.6.15" | ||
5840 | |||
5841 | CVE_STATUS[CVE-2023-52493] = "cpe-stable-backport: Backported in 6.6.15" | ||
5842 | |||
5843 | CVE_STATUS[CVE-2023-52494] = "cpe-stable-backport: Backported in 6.6.15" | ||
5844 | |||
5845 | CVE_STATUS[CVE-2023-52495] = "cpe-stable-backport: Backported in 6.6.15" | ||
5846 | |||
5847 | CVE_STATUS[CVE-2023-52497] = "cpe-stable-backport: Backported in 6.6.15" | ||
5848 | |||
5849 | CVE_STATUS[CVE-2023-52498] = "cpe-stable-backport: Backported in 6.6.15" | ||
5850 | |||
5851 | CVE_STATUS[CVE-2023-52499] = "fixed-version: Fixed from version 6.6rc6" | ||
5852 | |||
5853 | CVE_STATUS[CVE-2023-52500] = "fixed-version: Fixed from version 6.6rc2" | ||
5854 | |||
5855 | CVE_STATUS[CVE-2023-52501] = "fixed-version: Fixed from version 6.6rc2" | ||
5856 | |||
5857 | CVE_STATUS[CVE-2023-52502] = "fixed-version: Fixed from version 6.6rc6" | ||
5858 | |||
5859 | CVE_STATUS[CVE-2023-52503] = "fixed-version: Fixed from version 6.6rc6" | ||
5860 | |||
5861 | CVE_STATUS[CVE-2023-52504] = "fixed-version: Fixed from version 6.6rc6" | ||
5862 | |||
5863 | CVE_STATUS[CVE-2023-52505] = "fixed-version: Fixed from version 6.6rc6" | ||
5864 | |||
5865 | CVE_STATUS[CVE-2023-52506] = "fixed-version: Fixed from version 6.6rc3" | ||
5866 | |||
5867 | CVE_STATUS[CVE-2023-52507] = "fixed-version: Fixed from version 6.6rc6" | ||
5868 | |||
5869 | CVE_STATUS[CVE-2023-52508] = "fixed-version: Fixed from version 6.6rc2" | ||
5870 | |||
5871 | CVE_STATUS[CVE-2023-52509] = "fixed-version: Fixed from version 6.6rc6" | ||
5872 | |||
5873 | CVE_STATUS[CVE-2023-52510] = "fixed-version: Fixed from version 6.6rc6" | ||
5874 | |||
5875 | CVE_STATUS[CVE-2023-52511] = "fixed-version: Fixed from version 6.6rc1" | ||
5876 | |||
5877 | CVE_STATUS[CVE-2023-52512] = "fixed-version: Fixed from version 6.6rc6" | ||
5878 | |||
5879 | CVE_STATUS[CVE-2023-52513] = "fixed-version: Fixed from version 6.6rc5" | ||
5880 | |||
5881 | CVE_STATUS[CVE-2023-52515] = "fixed-version: Fixed from version 6.6rc5" | ||
5882 | |||
5883 | CVE_STATUS[CVE-2023-52516] = "fixed-version: Fixed from version 6.6rc1" | ||
5884 | |||
5885 | CVE_STATUS[CVE-2023-52517] = "fixed-version: Fixed from version 6.6rc1" | ||
5886 | |||
5887 | CVE_STATUS[CVE-2023-52518] = "fixed-version: Fixed from version 6.6rc5" | ||
5888 | |||
5889 | CVE_STATUS[CVE-2023-52519] = "fixed-version: Fixed from version 6.6rc5" | ||
5890 | |||
5891 | CVE_STATUS[CVE-2023-52520] = "fixed-version: Fixed from version 6.6rc5" | ||
5892 | |||
5893 | CVE_STATUS[CVE-2023-52522] = "fixed-version: Fixed from version 6.6rc5" | ||
5894 | |||
5895 | CVE_STATUS[CVE-2023-52523] = "fixed-version: Fixed from version 6.6rc5" | ||
5896 | |||
5897 | CVE_STATUS[CVE-2023-52524] = "fixed-version: Fixed from version 6.6rc5" | ||
5898 | |||
5899 | CVE_STATUS[CVE-2023-52525] = "fixed-version: Fixed from version 6.6rc5" | ||
5900 | |||
5901 | CVE_STATUS[CVE-2023-52526] = "fixed-version: Fixed from version 6.6rc5" | ||
5902 | |||
5903 | CVE_STATUS[CVE-2023-52527] = "fixed-version: Fixed from version 6.6rc5" | ||
5904 | |||
5905 | CVE_STATUS[CVE-2023-52528] = "fixed-version: Fixed from version 6.6rc5" | ||
5906 | |||
5907 | CVE_STATUS[CVE-2023-52529] = "fixed-version: Fixed from version 6.6rc5" | ||
5908 | |||
5909 | CVE_STATUS[CVE-2023-52530] = "fixed-version: Fixed from version 6.6rc5" | ||
5910 | |||
5911 | CVE_STATUS[CVE-2023-52531] = "fixed-version: Fixed from version 6.6rc5" | ||
5912 | |||
5913 | CVE_STATUS[CVE-2023-52532] = "fixed-version: Fixed from version 6.6rc5" | ||
5914 | |||
5915 | CVE_STATUS[CVE-2023-52559] = "fixed-version: Fixed from version 6.6rc5" | ||
5916 | |||
5917 | CVE_STATUS[CVE-2023-52560] = "fixed-version: Fixed from version 6.6rc4" | ||
5918 | |||
5919 | CVE_STATUS[CVE-2023-52561] = "fixed-version: Fixed from version 6.6rc1" | ||
5920 | |||
5921 | CVE_STATUS[CVE-2023-52562] = "fixed-version: Fixed from version 6.6rc4" | ||
5922 | |||
5923 | CVE_STATUS[CVE-2023-52563] = "fixed-version: Fixed from version 6.6rc3" | ||
5924 | |||
5925 | CVE_STATUS[CVE-2023-52564] = "fixed-version: Fixed from version 6.6rc4" | ||
5926 | |||
5927 | CVE_STATUS[CVE-2023-52565] = "fixed-version: Fixed from version 6.6rc3" | ||
5928 | |||
5929 | CVE_STATUS[CVE-2023-52566] = "fixed-version: Fixed from version 6.6rc4" | ||
5930 | |||
5931 | CVE_STATUS[CVE-2023-52567] = "fixed-version: Fixed from version 6.6rc4" | ||
5932 | |||
5933 | CVE_STATUS[CVE-2023-52568] = "fixed-version: Fixed from version 6.6rc4" | ||
5934 | |||
5935 | CVE_STATUS[CVE-2023-52569] = "fixed-version: Fixed from version 6.6rc2" | ||
5936 | |||
5937 | CVE_STATUS[CVE-2023-52570] = "fixed-version: Fixed from version 6.6rc4" | ||
5938 | |||
5939 | CVE_STATUS[CVE-2023-52571] = "fixed-version: Fixed from version 6.6rc4" | ||
5940 | |||
5941 | CVE_STATUS[CVE-2023-52572] = "fixed-version: Fixed from version 6.6rc3" | ||
5942 | |||
5943 | CVE_STATUS[CVE-2023-52573] = "fixed-version: Fixed from version 6.6rc3" | ||
5944 | |||
5945 | CVE_STATUS[CVE-2023-52574] = "fixed-version: Fixed from version 6.6rc3" | ||
5946 | |||
5947 | CVE_STATUS[CVE-2023-52575] = "fixed-version: Fixed from version 6.6rc3" | ||
5948 | |||
5949 | CVE_STATUS[CVE-2023-52576] = "fixed-version: Fixed from version 6.6rc3" | ||
5950 | |||
5951 | CVE_STATUS[CVE-2023-52577] = "fixed-version: Fixed from version 6.6rc3" | ||
5952 | |||
5953 | CVE_STATUS[CVE-2023-52578] = "fixed-version: Fixed from version 6.6rc3" | ||
5954 | |||
5955 | CVE_STATUS[CVE-2023-52580] = "fixed-version: Fixed from version 6.6rc3" | ||
5956 | |||
5957 | CVE_STATUS[CVE-2023-52581] = "fixed-version: Fixed from version 6.6rc3" | ||
5958 | |||
5959 | CVE_STATUS[CVE-2023-52582] = "fixed-version: Fixed from version 6.6rc3" | ||
5960 | |||
5961 | CVE_STATUS[CVE-2023-52583] = "cpe-stable-backport: Backported in 6.6.16" | ||
5962 | |||
5963 | CVE_STATUS[CVE-2023-52584] = "cpe-stable-backport: Backported in 6.6.16" | ||
5964 | |||
5965 | # CVE-2023-52585 needs backporting (fixed from 6.8rc1) | ||
5966 | |||
5967 | # CVE-2023-52586 needs backporting (fixed from 6.8rc1) | ||
5968 | |||
5969 | CVE_STATUS[CVE-2023-52587] = "cpe-stable-backport: Backported in 6.6.16" | ||
5970 | |||
5971 | CVE_STATUS[CVE-2023-52588] = "cpe-stable-backport: Backported in 6.6.16" | ||
5972 | |||
5973 | CVE_STATUS[CVE-2023-52589] = "cpe-stable-backport: Backported in 6.6.16" | ||
5974 | |||
5975 | # CVE-2023-52590 needs backporting (fixed from 6.8rc1) | ||
5976 | |||
5977 | CVE_STATUS[CVE-2023-52591] = "cpe-stable-backport: Backported in 6.6.16" | ||
5978 | |||
5979 | CVE_STATUS[CVE-2023-52593] = "cpe-stable-backport: Backported in 6.6.16" | ||
5980 | |||
5981 | CVE_STATUS[CVE-2023-52594] = "cpe-stable-backport: Backported in 6.6.16" | ||
5982 | |||
5983 | CVE_STATUS[CVE-2023-52595] = "cpe-stable-backport: Backported in 6.6.16" | ||
5984 | |||
5985 | CVE_STATUS[CVE-2023-52596] = "cpe-stable-backport: Backported in 6.6.16" | ||
5986 | |||
5987 | CVE_STATUS[CVE-2023-52597] = "cpe-stable-backport: Backported in 6.6.16" | ||
5988 | |||
5989 | CVE_STATUS[CVE-2023-52598] = "cpe-stable-backport: Backported in 6.6.16" | ||
5990 | |||
5991 | CVE_STATUS[CVE-2023-52599] = "cpe-stable-backport: Backported in 6.6.16" | ||
5992 | |||
5993 | CVE_STATUS[CVE-2023-52600] = "cpe-stable-backport: Backported in 6.6.16" | ||
5994 | |||
5995 | CVE_STATUS[CVE-2023-52601] = "cpe-stable-backport: Backported in 6.6.16" | ||
5996 | |||
5997 | CVE_STATUS[CVE-2023-52602] = "cpe-stable-backport: Backported in 6.6.16" | ||
5998 | |||
5999 | CVE_STATUS[CVE-2023-52603] = "cpe-stable-backport: Backported in 6.6.16" | ||
6000 | |||
6001 | CVE_STATUS[CVE-2023-52604] = "cpe-stable-backport: Backported in 6.6.16" | ||
6002 | |||
6003 | CVE_STATUS[CVE-2023-52606] = "cpe-stable-backport: Backported in 6.6.16" | ||
6004 | |||
6005 | CVE_STATUS[CVE-2023-52607] = "cpe-stable-backport: Backported in 6.6.16" | ||
6006 | |||
6007 | CVE_STATUS[CVE-2023-52608] = "cpe-stable-backport: Backported in 6.6.15" | ||
6008 | |||
6009 | CVE_STATUS[CVE-2023-52609] = "cpe-stable-backport: Backported in 6.6.14" | ||
6010 | |||
6011 | CVE_STATUS[CVE-2023-52610] = "cpe-stable-backport: Backported in 6.6.14" | ||
6012 | |||
6013 | CVE_STATUS[CVE-2023-52611] = "cpe-stable-backport: Backported in 6.6.14" | ||
6014 | |||
6015 | CVE_STATUS[CVE-2023-52612] = "cpe-stable-backport: Backported in 6.6.14" | ||
6016 | |||
6017 | CVE_STATUS[CVE-2023-52613] = "cpe-stable-backport: Backported in 6.6.14" | ||
6018 | |||
6019 | CVE_STATUS[CVE-2023-52614] = "cpe-stable-backport: Backported in 6.6.15" | ||
6020 | |||
6021 | CVE_STATUS[CVE-2023-52615] = "cpe-stable-backport: Backported in 6.6.15" | ||
6022 | |||
6023 | CVE_STATUS[CVE-2023-52616] = "cpe-stable-backport: Backported in 6.6.15" | ||
6024 | |||
6025 | CVE_STATUS[CVE-2023-52617] = "cpe-stable-backport: Backported in 6.6.16" | ||
6026 | |||
6027 | CVE_STATUS[CVE-2023-52618] = "cpe-stable-backport: Backported in 6.6.16" | ||
6028 | |||
6029 | CVE_STATUS[CVE-2023-52619] = "cpe-stable-backport: Backported in 6.6.16" | ||
6030 | |||
6031 | CVE_STATUS[CVE-2023-52620] = "fixed-version: Fixed from version 6.4" | ||
6032 | |||
6033 | CVE_STATUS[CVE-2023-52621] = "cpe-stable-backport: Backported in 6.6.16" | ||
6034 | |||
6035 | CVE_STATUS[CVE-2023-52622] = "cpe-stable-backport: Backported in 6.6.16" | ||
6036 | |||
6037 | CVE_STATUS[CVE-2023-52623] = "cpe-stable-backport: Backported in 6.6.16" | ||
6038 | |||
6039 | # CVE-2023-52624 needs backporting (fixed from 6.8rc1) | ||
6040 | |||
6041 | # CVE-2023-52625 needs backporting (fixed from 6.8rc1) | ||
6042 | |||
6043 | CVE_STATUS[CVE-2023-52626] = "fixed-version: only affects 6.7rc2 onwards" | ||
6044 | |||
6045 | CVE_STATUS[CVE-2023-52627] = "cpe-stable-backport: Backported in 6.6.15" | ||
6046 | |||
6047 | CVE_STATUS[CVE-2023-52628] = "fixed-version: Fixed from version 6.6rc1" | ||
6048 | |||
6049 | CVE_STATUS[CVE-2023-52629] = "fixed-version: Fixed from version 6.6rc1" | ||
6050 | |||
6051 | CVE_STATUS[CVE-2023-52630] = "cpe-stable-backport: Backported in 6.6.17" | ||
6052 | |||
6053 | CVE_STATUS[CVE-2023-52631] = "cpe-stable-backport: Backported in 6.6.17" | ||
6054 | |||
6055 | CVE_STATUS[CVE-2023-52632] = "cpe-stable-backport: Backported in 6.6.16" | ||
6056 | |||
6057 | CVE_STATUS[CVE-2023-52633] = "cpe-stable-backport: Backported in 6.6.16" | ||
6058 | |||
6059 | # CVE-2023-52634 needs backporting (fixed from 6.8rc1) | ||
6060 | |||
6061 | CVE_STATUS[CVE-2023-52635] = "cpe-stable-backport: Backported in 6.6.16" | ||
6062 | |||
6063 | CVE_STATUS[CVE-2023-52636] = "cpe-stable-backport: Backported in 6.6.17" | ||
6064 | |||
6065 | CVE_STATUS[CVE-2023-52637] = "cpe-stable-backport: Backported in 6.6.18" | ||
6066 | |||
6067 | CVE_STATUS[CVE-2023-52638] = "cpe-stable-backport: Backported in 6.6.18" | ||
6068 | |||
6069 | CVE_STATUS[CVE-2023-52639] = "cpe-stable-backport: Backported in 6.6.22" | ||
6070 | |||
6071 | CVE_STATUS[CVE-2023-52640] = "cpe-stable-backport: Backported in 6.6.19" | ||
6072 | |||
6073 | CVE_STATUS[CVE-2023-52641] = "cpe-stable-backport: Backported in 6.6.19" | ||
6074 | |||
5211 | CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4" | 6075 | CVE_STATUS[CVE-2023-5345] = "fixed-version: Fixed from version 6.6rc4" |
5212 | 6076 | ||
5213 | CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6" | 6077 | CVE_STATUS[CVE-2023-5633] = "fixed-version: Fixed from version 6.6rc6" |
@@ -5232,15 +6096,15 @@ CVE_STATUS[CVE-2023-6200] = "cpe-stable-backport: Backported in 6.6.9" | |||
5232 | 6096 | ||
5233 | # CVE-2023-6240 has no known resolution | 6097 | # CVE-2023-6240 has no known resolution |
5234 | 6098 | ||
5235 | # CVE-2023-6270 has no known resolution | 6099 | CVE_STATUS[CVE-2023-6270] = "cpe-stable-backport: Backported in 6.6.23" |
5236 | 6100 | ||
5237 | # CVE-2023-6356 has no known resolution | 6101 | CVE_STATUS[CVE-2023-6356] = "cpe-stable-backport: Backported in 6.6.14" |
5238 | 6102 | ||
5239 | CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7" | 6103 | CVE_STATUS[CVE-2023-6531] = "cpe-stable-backport: Backported in 6.6.7" |
5240 | 6104 | ||
5241 | # CVE-2023-6535 has no known resolution | 6105 | # CVE-2023-6535 has no known resolution |
5242 | 6106 | ||
5243 | # CVE-2023-6536 has no known resolution | 6107 | CVE_STATUS[CVE-2023-6536] = "cpe-stable-backport: Backported in 6.6.14" |
5244 | 6108 | ||
5245 | CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7" | 6109 | CVE_STATUS[CVE-2023-6546] = "fixed-version: Fixed from version 6.5rc7" |
5246 | 6110 | ||
@@ -5262,7 +6126,7 @@ CVE_STATUS[CVE-2023-6931] = "cpe-stable-backport: Backported in 6.6.7" | |||
5262 | 6126 | ||
5263 | CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5" | 6127 | CVE_STATUS[CVE-2023-6932] = "cpe-stable-backport: Backported in 6.6.5" |
5264 | 6128 | ||
5265 | # CVE-2023-7042 has no known resolution | 6129 | CVE_STATUS[CVE-2023-7042] = "cpe-stable-backport: Backported in 6.6.23" |
5266 | 6130 | ||
5267 | CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1" | 6131 | CVE_STATUS[CVE-2023-7192] = "fixed-version: Fixed from version 6.3rc1" |
5268 | 6132 | ||
@@ -5292,7 +6156,7 @@ CVE_STATUS[CVE-2024-0646] = "cpe-stable-backport: Backported in 6.6.7" | |||
5292 | 6156 | ||
5293 | CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2" | 6157 | CVE_STATUS[CVE-2024-0775] = "fixed-version: Fixed from version 6.4rc2" |
5294 | 6158 | ||
5295 | # CVE-2024-0841 has no known resolution | 6159 | CVE_STATUS[CVE-2024-0841] = "cpe-stable-backport: Backported in 6.6.18" |
5296 | 6160 | ||
5297 | CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14" | 6161 | CVE_STATUS[CVE-2024-1085] = "cpe-stable-backport: Backported in 6.6.14" |
5298 | 6162 | ||
@@ -5304,15 +6168,17 @@ CVE_STATUS[CVE-2024-1312] = "fixed-version: Fixed from version 6.5rc4" | |||
5304 | 6168 | ||
5305 | # CVE-2024-21803 has no known resolution | 6169 | # CVE-2024-21803 has no known resolution |
5306 | 6170 | ||
5307 | # CVE-2024-22099 has no known resolution | 6171 | # CVE-2024-2193 has no known resolution |
6172 | |||
6173 | CVE_STATUS[CVE-2024-22099] = "cpe-stable-backport: Backported in 6.6.23" | ||
5308 | 6174 | ||
5309 | # CVE-2024-22386 has no known resolution | 6175 | # CVE-2024-22386 has no known resolution |
5310 | 6176 | ||
5311 | CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10" | 6177 | CVE_STATUS[CVE-2024-22705] = "cpe-stable-backport: Backported in 6.6.10" |
5312 | 6178 | ||
5313 | # CVE-2024-23196 has no known resolution | 6179 | CVE_STATUS[CVE-2024-23196] = "fixed-version: Fixed from version 6.5rc1" |
5314 | 6180 | ||
5315 | # CVE-2024-23307 has no known resolution | 6181 | CVE_STATUS[CVE-2024-23307] = "cpe-stable-backport: Backported in 6.6.24" |
5316 | 6182 | ||
5317 | # CVE-2024-23848 has no known resolution | 6183 | # CVE-2024-23848 has no known resolution |
5318 | 6184 | ||
@@ -5332,7 +6198,7 @@ CVE_STATUS[CVE-2024-24855] = "fixed-version: Fixed from version 6.5rc2" | |||
5332 | 6198 | ||
5333 | CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14" | 6199 | CVE_STATUS[CVE-2024-24860] = "cpe-stable-backport: Backported in 6.6.14" |
5334 | 6200 | ||
5335 | # CVE-2024-24861 has no known resolution | 6201 | CVE_STATUS[CVE-2024-24861] = "cpe-stable-backport: Backported in 6.6.24" |
5336 | 6202 | ||
5337 | # CVE-2024-24864 has no known resolution | 6203 | # CVE-2024-24864 has no known resolution |
5338 | 6204 | ||
@@ -5382,3 +6248,413 @@ CVE_STATUS[CVE-2024-26598] = "cpe-stable-backport: Backported in 6.6.14" | |||
5382 | 6248 | ||
5383 | CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14" | 6249 | CVE_STATUS[CVE-2024-26599] = "cpe-stable-backport: Backported in 6.6.14" |
5384 | 6250 | ||
6251 | CVE_STATUS[CVE-2024-26600] = "cpe-stable-backport: Backported in 6.6.17" | ||
6252 | |||
6253 | CVE_STATUS[CVE-2024-26601] = "cpe-stable-backport: Backported in 6.6.17" | ||
6254 | |||
6255 | CVE_STATUS[CVE-2024-26602] = "cpe-stable-backport: Backported in 6.6.18" | ||
6256 | |||
6257 | CVE_STATUS[CVE-2024-26603] = "cpe-stable-backport: Backported in 6.6.18" | ||
6258 | |||
6259 | CVE_STATUS[CVE-2024-26604] = "cpe-stable-backport: Backported in 6.6.18" | ||
6260 | |||
6261 | CVE_STATUS[CVE-2024-26605] = "fixed-version: only affects 6.7 onwards" | ||
6262 | |||
6263 | CVE_STATUS[CVE-2024-26606] = "cpe-stable-backport: Backported in 6.6.18" | ||
6264 | |||
6265 | CVE_STATUS[CVE-2024-26607] = "cpe-stable-backport: Backported in 6.6.15" | ||
6266 | |||
6267 | CVE_STATUS[CVE-2024-26608] = "cpe-stable-backport: Backported in 6.6.15" | ||
6268 | |||
6269 | CVE_STATUS[CVE-2024-26610] = "cpe-stable-backport: Backported in 6.6.15" | ||
6270 | |||
6271 | CVE_STATUS[CVE-2024-26611] = "cpe-stable-backport: Backported in 6.6.15" | ||
6272 | |||
6273 | CVE_STATUS[CVE-2024-26612] = "cpe-stable-backport: Backported in 6.6.15" | ||
6274 | |||
6275 | CVE_STATUS[CVE-2024-26614] = "cpe-stable-backport: Backported in 6.6.15" | ||
6276 | |||
6277 | CVE_STATUS[CVE-2024-26615] = "cpe-stable-backport: Backported in 6.6.15" | ||
6278 | |||
6279 | CVE_STATUS[CVE-2024-26616] = "cpe-stable-backport: Backported in 6.6.15" | ||
6280 | |||
6281 | CVE_STATUS[CVE-2024-26617] = "fixed-version: only affects 6.7rc1 onwards" | ||
6282 | |||
6283 | CVE_STATUS[CVE-2024-26618] = "cpe-stable-backport: Backported in 6.6.15" | ||
6284 | |||
6285 | CVE_STATUS[CVE-2024-26619] = "fixed-version: only affects 6.7rc5 onwards" | ||
6286 | |||
6287 | CVE_STATUS[CVE-2024-26620] = "cpe-stable-backport: Backported in 6.6.15" | ||
6288 | |||
6289 | CVE_STATUS[CVE-2024-26621] = "fixed-version: only affects 6.7 onwards" | ||
6290 | |||
6291 | CVE_STATUS[CVE-2024-26622] = "cpe-stable-backport: Backported in 6.6.21" | ||
6292 | |||
6293 | CVE_STATUS[CVE-2024-26623] = "cpe-stable-backport: Backported in 6.6.16" | ||
6294 | |||
6295 | CVE_STATUS[CVE-2024-26625] = "cpe-stable-backport: Backported in 6.6.16" | ||
6296 | |||
6297 | CVE_STATUS[CVE-2024-26626] = "fixed-version: only affects 6.8rc1 onwards" | ||
6298 | |||
6299 | CVE_STATUS[CVE-2024-26627] = "cpe-stable-backport: Backported in 6.6.16" | ||
6300 | |||
6301 | CVE_STATUS[CVE-2024-26629] = "cpe-stable-backport: Backported in 6.6.15" | ||
6302 | |||
6303 | CVE_STATUS[CVE-2024-26630] = "cpe-stable-backport: Backported in 6.6.21" | ||
6304 | |||
6305 | CVE_STATUS[CVE-2024-26631] = "cpe-stable-backport: Backported in 6.6.14" | ||
6306 | |||
6307 | CVE_STATUS[CVE-2024-26632] = "cpe-stable-backport: Backported in 6.6.14" | ||
6308 | |||
6309 | CVE_STATUS[CVE-2024-26633] = "cpe-stable-backport: Backported in 6.6.14" | ||
6310 | |||
6311 | CVE_STATUS[CVE-2024-26634] = "cpe-stable-backport: Backported in 6.6.15" | ||
6312 | |||
6313 | CVE_STATUS[CVE-2024-26635] = "cpe-stable-backport: Backported in 6.6.15" | ||
6314 | |||
6315 | CVE_STATUS[CVE-2024-26636] = "cpe-stable-backport: Backported in 6.6.15" | ||
6316 | |||
6317 | CVE_STATUS[CVE-2024-26637] = "fixed-version: only affects 6.7 onwards" | ||
6318 | |||
6319 | CVE_STATUS[CVE-2024-26638] = "cpe-stable-backport: Backported in 6.6.15" | ||
6320 | |||
6321 | CVE_STATUS[CVE-2024-26639] = "fixed-version: only affects 6.8rc1 onwards" | ||
6322 | |||
6323 | CVE_STATUS[CVE-2024-26640] = "cpe-stable-backport: Backported in 6.6.16" | ||
6324 | |||
6325 | CVE_STATUS[CVE-2024-26641] = "cpe-stable-backport: Backported in 6.6.16" | ||
6326 | |||
6327 | CVE_STATUS[CVE-2024-26642] = "cpe-stable-backport: Backported in 6.6.24" | ||
6328 | |||
6329 | CVE_STATUS[CVE-2024-26643] = "cpe-stable-backport: Backported in 6.6.24" | ||
6330 | |||
6331 | CVE_STATUS[CVE-2024-26644] = "cpe-stable-backport: Backported in 6.6.15" | ||
6332 | |||
6333 | CVE_STATUS[CVE-2024-26645] = "cpe-stable-backport: Backported in 6.6.15" | ||
6334 | |||
6335 | CVE_STATUS[CVE-2024-26646] = "cpe-stable-backport: Backported in 6.6.15" | ||
6336 | |||
6337 | CVE_STATUS[CVE-2024-26647] = "cpe-stable-backport: Backported in 6.6.15" | ||
6338 | |||
6339 | CVE_STATUS[CVE-2024-26648] = "cpe-stable-backport: Backported in 6.6.15" | ||
6340 | |||
6341 | CVE_STATUS[CVE-2024-26649] = "cpe-stable-backport: Backported in 6.6.15" | ||
6342 | |||
6343 | CVE_STATUS[CVE-2024-26650] = "cpe-stable-backport: Backported in 6.6.15" | ||
6344 | |||
6345 | CVE_STATUS[CVE-2024-26651] = "cpe-stable-backport: Backported in 6.6.23" | ||
6346 | |||
6347 | CVE_STATUS[CVE-2024-26652] = "cpe-stable-backport: Backported in 6.6.22" | ||
6348 | |||
6349 | CVE_STATUS[CVE-2024-26653] = "fixed-version: only affects 6.7rc1 onwards" | ||
6350 | |||
6351 | CVE_STATUS[CVE-2024-26654] = "cpe-stable-backport: Backported in 6.6.24" | ||
6352 | |||
6353 | # CVE-2024-26655 needs backporting (fixed from 6.9rc2) | ||
6354 | |||
6355 | CVE_STATUS[CVE-2024-26656] = "cpe-stable-backport: Backported in 6.6.24" | ||
6356 | |||
6357 | CVE_STATUS[CVE-2024-26657] = "fixed-version: only affects 6.7rc1 onwards" | ||
6358 | |||
6359 | # CVE-2024-26658 needs backporting (fixed from 6.8rc1) | ||
6360 | |||
6361 | CVE_STATUS[CVE-2024-26659] = "cpe-stable-backport: Backported in 6.6.17" | ||
6362 | |||
6363 | CVE_STATUS[CVE-2024-26660] = "cpe-stable-backport: Backported in 6.6.17" | ||
6364 | |||
6365 | CVE_STATUS[CVE-2024-26661] = "cpe-stable-backport: Backported in 6.6.17" | ||
6366 | |||
6367 | CVE_STATUS[CVE-2024-26662] = "cpe-stable-backport: Backported in 6.6.17" | ||
6368 | |||
6369 | CVE_STATUS[CVE-2024-26663] = "cpe-stable-backport: Backported in 6.6.17" | ||
6370 | |||
6371 | CVE_STATUS[CVE-2024-26664] = "cpe-stable-backport: Backported in 6.6.17" | ||
6372 | |||
6373 | CVE_STATUS[CVE-2024-26665] = "cpe-stable-backport: Backported in 6.6.17" | ||
6374 | |||
6375 | CVE_STATUS[CVE-2024-26666] = "cpe-stable-backport: Backported in 6.6.17" | ||
6376 | |||
6377 | CVE_STATUS[CVE-2024-26667] = "cpe-stable-backport: Backported in 6.6.17" | ||
6378 | |||
6379 | CVE_STATUS[CVE-2024-26668] = "cpe-stable-backport: Backported in 6.6.15" | ||
6380 | |||
6381 | CVE_STATUS[CVE-2024-26669] = "cpe-stable-backport: Backported in 6.6.15" | ||
6382 | |||
6383 | CVE_STATUS[CVE-2024-26670] = "cpe-stable-backport: Backported in 6.6.15" | ||
6384 | |||
6385 | CVE_STATUS[CVE-2024-26671] = "cpe-stable-backport: Backported in 6.6.16" | ||
6386 | |||
6387 | # CVE-2024-26672 needs backporting (fixed from 6.8rc1) | ||
6388 | |||
6389 | CVE_STATUS[CVE-2024-26673] = "cpe-stable-backport: Backported in 6.6.16" | ||
6390 | |||
6391 | CVE_STATUS[CVE-2024-26674] = "cpe-stable-backport: Backported in 6.6.17" | ||
6392 | |||
6393 | CVE_STATUS[CVE-2024-26675] = "cpe-stable-backport: Backported in 6.6.17" | ||
6394 | |||
6395 | CVE_STATUS[CVE-2024-26676] = "cpe-stable-backport: Backported in 6.6.17" | ||
6396 | |||
6397 | CVE_STATUS[CVE-2024-26677] = "cpe-stable-backport: Backported in 6.6.17" | ||
6398 | |||
6399 | CVE_STATUS[CVE-2024-26678] = "fixed-version: only affects 6.7rc1 onwards" | ||
6400 | |||
6401 | CVE_STATUS[CVE-2024-26679] = "cpe-stable-backport: Backported in 6.6.17" | ||
6402 | |||
6403 | CVE_STATUS[CVE-2024-26680] = "cpe-stable-backport: Backported in 6.6.17" | ||
6404 | |||
6405 | CVE_STATUS[CVE-2024-26681] = "cpe-stable-backport: Backported in 6.6.17" | ||
6406 | |||
6407 | CVE_STATUS[CVE-2024-26682] = "fixed-version: only affects 6.7rc1 onwards" | ||
6408 | |||
6409 | CVE_STATUS[CVE-2024-26683] = "fixed-version: only affects 6.7rc1 onwards" | ||
6410 | |||
6411 | CVE_STATUS[CVE-2024-26684] = "cpe-stable-backport: Backported in 6.6.17" | ||
6412 | |||
6413 | CVE_STATUS[CVE-2024-26685] = "cpe-stable-backport: Backported in 6.6.18" | ||
6414 | |||
6415 | # CVE-2024-26686 needs backporting (fixed from 6.8rc4) | ||
6416 | |||
6417 | CVE_STATUS[CVE-2024-26687] = "cpe-stable-backport: Backported in 6.6.19" | ||
6418 | |||
6419 | CVE_STATUS[CVE-2024-26688] = "cpe-stable-backport: Backported in 6.6.18" | ||
6420 | |||
6421 | CVE_STATUS[CVE-2024-26689] = "cpe-stable-backport: Backported in 6.6.18" | ||
6422 | |||
6423 | CVE_STATUS[CVE-2024-26690] = "cpe-stable-backport: Backported in 6.6.18" | ||
6424 | |||
6425 | CVE_STATUS[CVE-2024-26691] = "cpe-stable-backport: Backported in 6.6.18" | ||
6426 | |||
6427 | CVE_STATUS[CVE-2024-26692] = "cpe-stable-backport: Backported in 6.6.18" | ||
6428 | |||
6429 | CVE_STATUS[CVE-2024-26693] = "cpe-stable-backport: Backported in 6.6.18" | ||
6430 | |||
6431 | CVE_STATUS[CVE-2024-26694] = "cpe-stable-backport: Backported in 6.6.18" | ||
6432 | |||
6433 | CVE_STATUS[CVE-2024-26695] = "cpe-stable-backport: Backported in 6.6.18" | ||
6434 | |||
6435 | CVE_STATUS[CVE-2024-26696] = "cpe-stable-backport: Backported in 6.6.18" | ||
6436 | |||
6437 | CVE_STATUS[CVE-2024-26697] = "cpe-stable-backport: Backported in 6.6.18" | ||
6438 | |||
6439 | CVE_STATUS[CVE-2024-26698] = "cpe-stable-backport: Backported in 6.6.18" | ||
6440 | |||
6441 | # CVE-2024-26699 needs backporting (fixed from 6.8rc5) | ||
6442 | |||
6443 | CVE_STATUS[CVE-2024-26700] = "cpe-stable-backport: Backported in 6.6.18" | ||
6444 | |||
6445 | CVE_STATUS[CVE-2024-26702] = "cpe-stable-backport: Backported in 6.6.18" | ||
6446 | |||
6447 | CVE_STATUS[CVE-2024-26703] = "cpe-stable-backport: Backported in 6.6.18" | ||
6448 | |||
6449 | CVE_STATUS[CVE-2024-26704] = "cpe-stable-backport: Backported in 6.6.18" | ||
6450 | |||
6451 | CVE_STATUS[CVE-2024-26705] = "cpe-stable-backport: Backported in 6.6.18" | ||
6452 | |||
6453 | CVE_STATUS[CVE-2024-26706] = "cpe-stable-backport: Backported in 6.6.18" | ||
6454 | |||
6455 | CVE_STATUS[CVE-2024-26707] = "cpe-stable-backport: Backported in 6.6.18" | ||
6456 | |||
6457 | CVE_STATUS[CVE-2024-26708] = "cpe-stable-backport: Backported in 6.6.18" | ||
6458 | |||
6459 | CVE_STATUS[CVE-2024-26709] = "fixed-version: only affects 6.7rc1 onwards" | ||
6460 | |||
6461 | CVE_STATUS[CVE-2024-26710] = "fixed-version: only affects 6.8rc1 onwards" | ||
6462 | |||
6463 | CVE_STATUS[CVE-2024-26711] = "cpe-stable-backport: Backported in 6.6.18" | ||
6464 | |||
6465 | CVE_STATUS[CVE-2024-26712] = "cpe-stable-backport: Backported in 6.6.18" | ||
6466 | |||
6467 | CVE_STATUS[CVE-2024-26713] = "cpe-stable-backport: Backported in 6.6.18" | ||
6468 | |||
6469 | CVE_STATUS[CVE-2024-26714] = "cpe-stable-backport: Backported in 6.6.18" | ||
6470 | |||
6471 | CVE_STATUS[CVE-2024-26715] = "cpe-stable-backport: Backported in 6.6.18" | ||
6472 | |||
6473 | CVE_STATUS[CVE-2024-26716] = "cpe-stable-backport: Backported in 6.6.18" | ||
6474 | |||
6475 | CVE_STATUS[CVE-2024-26717] = "cpe-stable-backport: Backported in 6.6.18" | ||
6476 | |||
6477 | CVE_STATUS[CVE-2024-26718] = "cpe-stable-backport: Backported in 6.6.18" | ||
6478 | |||
6479 | CVE_STATUS[CVE-2024-26719] = "cpe-stable-backport: Backported in 6.6.18" | ||
6480 | |||
6481 | CVE_STATUS[CVE-2024-26720] = "cpe-stable-backport: Backported in 6.6.18" | ||
6482 | |||
6483 | CVE_STATUS[CVE-2024-26721] = "fixed-version: only affects 6.7rc1 onwards" | ||
6484 | |||
6485 | CVE_STATUS[CVE-2024-26722] = "fixed-version: only affects 6.7rc5 onwards" | ||
6486 | |||
6487 | CVE_STATUS[CVE-2024-26723] = "cpe-stable-backport: Backported in 6.6.18" | ||
6488 | |||
6489 | CVE_STATUS[CVE-2024-26724] = "fixed-version: only affects 6.7rc1 onwards" | ||
6490 | |||
6491 | CVE_STATUS[CVE-2024-26725] = "fixed-version: only affects 6.7rc1 onwards" | ||
6492 | |||
6493 | CVE_STATUS[CVE-2024-26726] = "cpe-stable-backport: Backported in 6.6.18" | ||
6494 | |||
6495 | CVE_STATUS[CVE-2024-26727] = "cpe-stable-backport: Backported in 6.6.18" | ||
6496 | |||
6497 | CVE_STATUS[CVE-2024-26728] = "fixed-version: only affects 6.7rc1 onwards" | ||
6498 | |||
6499 | CVE_STATUS[CVE-2024-26729] = "fixed-version: only affects 6.7rc1 onwards" | ||
6500 | |||
6501 | CVE_STATUS[CVE-2024-26730] = "cpe-stable-backport: Backported in 6.6.19" | ||
6502 | |||
6503 | CVE_STATUS[CVE-2024-26731] = "cpe-stable-backport: Backported in 6.6.19" | ||
6504 | |||
6505 | CVE_STATUS[CVE-2024-26732] = "fixed-version: only affects 6.7rc1 onwards" | ||
6506 | |||
6507 | CVE_STATUS[CVE-2024-26733] = "cpe-stable-backport: Backported in 6.6.19" | ||
6508 | |||
6509 | CVE_STATUS[CVE-2024-26734] = "cpe-stable-backport: Backported in 6.6.19" | ||
6510 | |||
6511 | CVE_STATUS[CVE-2024-26735] = "cpe-stable-backport: Backported in 6.6.19" | ||
6512 | |||
6513 | CVE_STATUS[CVE-2024-26736] = "cpe-stable-backport: Backported in 6.6.19" | ||
6514 | |||
6515 | CVE_STATUS[CVE-2024-26737] = "cpe-stable-backport: Backported in 6.6.19" | ||
6516 | |||
6517 | CVE_STATUS[CVE-2024-26738] = "cpe-stable-backport: Backported in 6.6.19" | ||
6518 | |||
6519 | CVE_STATUS[CVE-2024-26739] = "cpe-stable-backport: Backported in 6.6.19" | ||
6520 | |||
6521 | CVE_STATUS[CVE-2024-26740] = "cpe-stable-backport: Backported in 6.6.19" | ||
6522 | |||
6523 | CVE_STATUS[CVE-2024-26741] = "cpe-stable-backport: Backported in 6.6.19" | ||
6524 | |||
6525 | CVE_STATUS[CVE-2024-26742] = "cpe-stable-backport: Backported in 6.6.19" | ||
6526 | |||
6527 | CVE_STATUS[CVE-2024-26743] = "cpe-stable-backport: Backported in 6.6.19" | ||
6528 | |||
6529 | CVE_STATUS[CVE-2024-26744] = "cpe-stable-backport: Backported in 6.6.19" | ||
6530 | |||
6531 | CVE_STATUS[CVE-2024-26745] = "cpe-stable-backport: Backported in 6.6.21" | ||
6532 | |||
6533 | CVE_STATUS[CVE-2024-26746] = "cpe-stable-backport: Backported in 6.6.21" | ||
6534 | |||
6535 | CVE_STATUS[CVE-2024-26747] = "cpe-stable-backport: Backported in 6.6.19" | ||
6536 | |||
6537 | CVE_STATUS[CVE-2024-26748] = "cpe-stable-backport: Backported in 6.6.19" | ||
6538 | |||
6539 | CVE_STATUS[CVE-2024-26749] = "cpe-stable-backport: Backported in 6.6.19" | ||
6540 | |||
6541 | CVE_STATUS[CVE-2024-26750] = "fixed-version: only affects 6.8rc5 onwards" | ||
6542 | |||
6543 | CVE_STATUS[CVE-2024-26751] = "cpe-stable-backport: Backported in 6.6.19" | ||
6544 | |||
6545 | CVE_STATUS[CVE-2024-26752] = "cpe-stable-backport: Backported in 6.6.19" | ||
6546 | |||
6547 | CVE_STATUS[CVE-2024-26753] = "cpe-stable-backport: Backported in 6.6.19" | ||
6548 | |||
6549 | CVE_STATUS[CVE-2024-26754] = "cpe-stable-backport: Backported in 6.6.19" | ||
6550 | |||
6551 | CVE_STATUS[CVE-2024-26755] = "fixed-version: only affects 6.7rc1 onwards" | ||
6552 | |||
6553 | # CVE-2024-26756 needs backporting (fixed from 6.8rc6) | ||
6554 | |||
6555 | # CVE-2024-26757 needs backporting (fixed from 6.8rc6) | ||
6556 | |||
6557 | # CVE-2024-26758 needs backporting (fixed from 6.8rc6) | ||
6558 | |||
6559 | CVE_STATUS[CVE-2024-26759] = "cpe-stable-backport: Backported in 6.6.19" | ||
6560 | |||
6561 | CVE_STATUS[CVE-2024-26760] = "cpe-stable-backport: Backported in 6.6.19" | ||
6562 | |||
6563 | CVE_STATUS[CVE-2024-26761] = "cpe-stable-backport: Backported in 6.6.19" | ||
6564 | |||
6565 | CVE_STATUS[CVE-2024-26762] = "fixed-version: only affects 6.7rc1 onwards" | ||
6566 | |||
6567 | CVE_STATUS[CVE-2024-26763] = "cpe-stable-backport: Backported in 6.6.19" | ||
6568 | |||
6569 | CVE_STATUS[CVE-2024-26764] = "cpe-stable-backport: Backported in 6.6.19" | ||
6570 | |||
6571 | CVE_STATUS[CVE-2024-26765] = "cpe-stable-backport: Backported in 6.6.19" | ||
6572 | |||
6573 | CVE_STATUS[CVE-2024-26766] = "cpe-stable-backport: Backported in 6.6.19" | ||
6574 | |||
6575 | CVE_STATUS[CVE-2024-26767] = "cpe-stable-backport: Backported in 6.6.19" | ||
6576 | |||
6577 | CVE_STATUS[CVE-2024-26768] = "cpe-stable-backport: Backported in 6.6.19" | ||
6578 | |||
6579 | CVE_STATUS[CVE-2024-26769] = "cpe-stable-backport: Backported in 6.6.19" | ||
6580 | |||
6581 | CVE_STATUS[CVE-2024-26770] = "cpe-stable-backport: Backported in 6.6.19" | ||
6582 | |||
6583 | CVE_STATUS[CVE-2024-26771] = "cpe-stable-backport: Backported in 6.6.19" | ||
6584 | |||
6585 | CVE_STATUS[CVE-2024-26772] = "cpe-stable-backport: Backported in 6.6.19" | ||
6586 | |||
6587 | CVE_STATUS[CVE-2024-26773] = "cpe-stable-backport: Backported in 6.6.19" | ||
6588 | |||
6589 | CVE_STATUS[CVE-2024-26774] = "cpe-stable-backport: Backported in 6.6.19" | ||
6590 | |||
6591 | CVE_STATUS[CVE-2024-26775] = "cpe-stable-backport: Backported in 6.6.19" | ||
6592 | |||
6593 | CVE_STATUS[CVE-2024-26776] = "cpe-stable-backport: Backported in 6.6.19" | ||
6594 | |||
6595 | CVE_STATUS[CVE-2024-26777] = "cpe-stable-backport: Backported in 6.6.19" | ||
6596 | |||
6597 | CVE_STATUS[CVE-2024-26778] = "cpe-stable-backport: Backported in 6.6.19" | ||
6598 | |||
6599 | CVE_STATUS[CVE-2024-26779] = "cpe-stable-backport: Backported in 6.6.19" | ||
6600 | |||
6601 | CVE_STATUS[CVE-2024-26780] = "fixed-version: only affects 6.8rc4 onwards" | ||
6602 | |||
6603 | CVE_STATUS[CVE-2024-26781] = "fixed-version: only affects 6.8rc6 onwards" | ||
6604 | |||
6605 | CVE_STATUS[CVE-2024-26782] = "cpe-stable-backport: Backported in 6.6.21" | ||
6606 | |||
6607 | CVE_STATUS[CVE-2024-26783] = "cpe-stable-backport: Backported in 6.6.22" | ||
6608 | |||
6609 | # CVE-2024-26784 needs backporting (fixed from 6.8rc7) | ||
6610 | |||
6611 | # CVE-2024-26785 needs backporting (fixed from 6.8rc7) | ||
6612 | |||
6613 | CVE_STATUS[CVE-2024-26786] = "cpe-stable-backport: Backported in 6.6.21" | ||
6614 | |||
6615 | CVE_STATUS[CVE-2024-26787] = "cpe-stable-backport: Backported in 6.6.21" | ||
6616 | |||
6617 | CVE_STATUS[CVE-2024-26788] = "cpe-stable-backport: Backported in 6.6.21" | ||
6618 | |||
6619 | CVE_STATUS[CVE-2024-26789] = "cpe-stable-backport: Backported in 6.6.21" | ||
6620 | |||
6621 | CVE_STATUS[CVE-2024-26790] = "cpe-stable-backport: Backported in 6.6.21" | ||
6622 | |||
6623 | CVE_STATUS[CVE-2024-26791] = "cpe-stable-backport: Backported in 6.6.21" | ||
6624 | |||
6625 | CVE_STATUS[CVE-2024-26792] = "fixed-version: only affects 6.8rc4 onwards" | ||
6626 | |||
6627 | CVE_STATUS[CVE-2024-26793] = "cpe-stable-backport: Backported in 6.6.21" | ||
6628 | |||
6629 | CVE_STATUS[CVE-2024-26794] = "fixed-version: only affects 6.8rc6 onwards" | ||
6630 | |||
6631 | CVE_STATUS[CVE-2024-26795] = "cpe-stable-backport: Backported in 6.6.21" | ||
6632 | |||
6633 | CVE_STATUS[CVE-2024-26796] = "cpe-stable-backport: Backported in 6.6.21" | ||
6634 | |||
6635 | # CVE-2024-26797 needs backporting (fixed from 6.8rc7) | ||
6636 | |||
6637 | CVE_STATUS[CVE-2024-26798] = "cpe-stable-backport: Backported in 6.6.21" | ||
6638 | |||
6639 | CVE_STATUS[CVE-2024-26799] = "cpe-stable-backport: Backported in 6.6.21" | ||
6640 | |||
6641 | CVE_STATUS[CVE-2024-26800] = "fixed-version: only affects 6.8rc5 onwards" | ||
6642 | |||
6643 | CVE_STATUS[CVE-2024-26801] = "cpe-stable-backport: Backported in 6.6.21" | ||
6644 | |||
6645 | CVE_STATUS[CVE-2024-26802] = "cpe-stable-backport: Backported in 6.6.21" | ||
6646 | |||
6647 | CVE_STATUS[CVE-2024-26803] = "cpe-stable-backport: Backported in 6.6.21" | ||
6648 | |||
6649 | CVE_STATUS[CVE-2024-26804] = "cpe-stable-backport: Backported in 6.6.21" | ||
6650 | |||
6651 | CVE_STATUS[CVE-2024-26805] = "cpe-stable-backport: Backported in 6.6.21" | ||
6652 | |||
6653 | # CVE-2024-26806 needs backporting (fixed from 6.8rc7) | ||
6654 | |||
6655 | CVE_STATUS[CVE-2024-26807] = "cpe-stable-backport: Backported in 6.6.21" | ||
6656 | |||
6657 | CVE_STATUS[CVE-2024-26808] = "cpe-stable-backport: Backported in 6.6.15" | ||
6658 | |||
6659 | CVE_STATUS[CVE-2024-26809] = "cpe-stable-backport: Backported in 6.6.23" | ||
6660 | |||
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index bd3e5a9406..d5cba42a5c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb | |||
@@ -14,7 +14,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
14 | # provide this .inc to set specific revisions | 14 | # provide this .inc to set specific revisions |
15 | include recipes-kernel/linux/linux-yocto-dev-revisions.inc | 15 | include recipes-kernel/linux/linux-yocto-dev-revisions.inc |
16 | 16 | ||
17 | KBRANCH = "v6.8/standard/base" | 17 | KBRANCH = "v6.9/standard/base" |
18 | KMETA = "kernel-meta" | 18 | KMETA = "kernel-meta" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;protocol=https \ |
@@ -28,17 +28,12 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name | |||
28 | SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' | 28 | SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' |
29 | SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' | 29 | SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' |
30 | 30 | ||
31 | LINUX_VERSION ?= "6.8" | 31 | LINUX_VERSION ?= "6.9" |
32 | LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" | 32 | LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" |
33 | PV = "${LINUX_VERSION}+git" | 33 | PV = "${LINUX_VERSION}+git" |
34 | 34 | ||
35 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 35 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
36 | 36 | ||
37 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | ||
38 | DEPENDS += "${@bb.utils.contains('ARCH', 'powerpc', 'elfutils-native', '', d)}" | ||
39 | DEPENDS += "openssl-native util-linux-native" | ||
40 | DEPENDS += "gmp-native libmpc-native" | ||
41 | |||
42 | # yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked | 37 | # yaml and dtschema are required for 5.16+ device tree validation, libyaml is checked |
43 | # via pkgconfig, so must always be present, but we can wrap the others to make them | 38 | # via pkgconfig, so must always be present, but we can wrap the others to make them |
44 | # conditional | 39 | # conditional |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb index eb5e1da33c..53f413407d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb | |||
@@ -14,13 +14,13 @@ python () { | |||
14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "1c3234ba160c59eb50739f23591a87daf09fac35" | 17 | SRCREV_machine ?= "9bdb085cb6fcfd49586b980ba27cb81e5c76689e" |
18 | SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" | 18 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" |
22 | 22 | ||
23 | LINUX_VERSION ?= "6.6.22" | 23 | LINUX_VERSION ?= "6.6.29" |
24 | 24 | ||
25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
26 | 26 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb index 7d6197db5e..44c9a7b1e0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb | |||
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
8 | # CVE exclusions | 8 | # CVE exclusions |
9 | include recipes-kernel/linux/cve-exclusion_6.6.inc | 9 | include recipes-kernel/linux/cve-exclusion_6.6.inc |
10 | 10 | ||
11 | LINUX_VERSION ?= "6.6.22" | 11 | LINUX_VERSION ?= "6.6.29" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
13 | 13 | ||
14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 20 | SRCREV_machine ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
21 | SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" | 21 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb index 01cb6a860c..817639bce0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb | |||
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.6/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "0873b6f725956acf2e6d57d720edd8a2177e18ce" | 21 | SRCREV_machine:qemuarm ?= "0b90bbe1359b3fd590780119f19dbd0a01e58560" |
22 | SRCREV_machine:qemuarm64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 22 | SRCREV_machine:qemuarm64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
23 | SRCREV_machine:qemuloongarch64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 23 | SRCREV_machine:qemuloongarch64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
24 | SRCREV_machine:qemumips ?= "6a81581711b1cb35046c637ecfbb6b17a8abbcb5" | 24 | SRCREV_machine:qemumips ?= "ab44de80a320e30a49150ea74554a937affaf78d" |
25 | SRCREV_machine:qemuppc ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 25 | SRCREV_machine:qemuppc ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
26 | SRCREV_machine:qemuriscv64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 26 | SRCREV_machine:qemuriscv64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
27 | SRCREV_machine:qemuriscv32 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 27 | SRCREV_machine:qemuriscv32 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
28 | SRCREV_machine:qemux86 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 28 | SRCREV_machine:qemux86 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
29 | SRCREV_machine:qemux86-64 ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 29 | SRCREV_machine:qemux86-64 ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
30 | SRCREV_machine:qemumips64 ?= "6cb075269e42d03857c95ebc8b5f8e154f155add" | 30 | SRCREV_machine:qemumips64 ?= "75da5d44c2e54a85a1221ea7d0c04be9aefb7fa1" |
31 | SRCREV_machine ?= "ca83799fcbc094fdd52caec7c4dca64189acd842" | 31 | SRCREV_machine ?= "7c76aad68f6d1247e72f024f1e0291067a404f8d" |
32 | SRCREV_meta ?= "a1711f65dcd5f88160d30447dcab3b88a1562690" | 32 | SRCREV_meta ?= "a78c74a3510067017dda1926f88bd914f0a053b3" |
33 | 33 | ||
34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |
36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the | 36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the |
37 | # normal PREFERRED_VERSION settings. | 37 | # normal PREFERRED_VERSION settings. |
38 | BBCLASSEXTEND = "devupstream:target" | 38 | BBCLASSEXTEND = "devupstream:target" |
39 | SRCREV_machine:class-devupstream ?= "6a646d9fe8a2bf8d25817ceddf96dfc5eb5446db" | 39 | SRCREV_machine:class-devupstream ?= "a3463f08104612fc979c41fa54733e925205d3d7" |
40 | PN:class-devupstream = "linux-yocto-upstream" | 40 | PN:class-devupstream = "linux-yocto-upstream" |
41 | KBRANCH:class-devupstream = "v6.6/base" | 41 | KBRANCH:class-devupstream = "v6.6/base" |
42 | 42 | ||
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA | |||
44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" | 44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https" |
45 | 45 | ||
46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
47 | LINUX_VERSION ?= "6.6.22" | 47 | LINUX_VERSION ?= "6.6.29" |
48 | 48 | ||
49 | PV = "${LINUX_VERSION}+git" | 49 | PV = "${LINUX_VERSION}+git" |
50 | 50 | ||
@@ -62,7 +62,7 @@ KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc | |||
62 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 62 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
63 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 63 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 64 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
65 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 65 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}" |
66 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" | 66 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}" |
67 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" | 67 | KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc" |
68 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" | 68 | KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc" |
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb index 9a4007fb25..d6c75d7580 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=http | |||
12 | file://0001-tests-do-not-run-test-applications-from-.libs.patch \ | 12 | file://0001-tests-do-not-run-test-applications-from-.libs.patch \ |
13 | file://0001-Make-manpages-multilib-identical.patch \ | 13 | file://0001-Make-manpages-multilib-identical.patch \ |
14 | " | 14 | " |
15 | SRCREV = "66e76d1ea601705928899138f02730a3a2a3153d" | 15 | SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4" |
16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch new file mode 100644 index 0000000000..9d5fd0de60 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch | |||
@@ -0,0 +1,93 @@ | |||
1 | From fec007d9630e010062cf5699a08460f71f46b527 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 25 Mar 2024 08:54:42 -0400 | ||
4 | Subject: [PATCH 1/4] Fix: ASoC snd_doc_dapm on linux 6.9-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit 7df3eb4cdb6bbfa482f51548b9fd47c2723c68ba | ||
9 | Author: Luca Ceresoli <luca.ceresoli@bootlin.com> | ||
10 | Date: Wed Mar 6 10:30:01 2024 +0100 | ||
11 | |||
12 | ASoC: trace: add event to snd_soc_dapm trace events | ||
13 | |||
14 | Add the event value to the snd_soc_dapm_start and snd_soc_dapm_done trace | ||
15 | events to make them more informative. | ||
16 | |||
17 | Trace before: | ||
18 | |||
19 | aplay-229 [000] 250.140309: snd_soc_dapm_start: card=vscn-2046 | ||
20 | aplay-229 [000] 250.167531: snd_soc_dapm_done: card=vscn-2046 | ||
21 | aplay-229 [000] 251.169588: snd_soc_dapm_start: card=vscn-2046 | ||
22 | aplay-229 [000] 251.195245: snd_soc_dapm_done: card=vscn-2046 | ||
23 | |||
24 | Trace after: | ||
25 | |||
26 | aplay-214 [000] 693.290612: snd_soc_dapm_start: card=vscn-2046 event=1 | ||
27 | aplay-214 [000] 693.315508: snd_soc_dapm_done: card=vscn-2046 event=1 | ||
28 | aplay-214 [000] 694.537349: snd_soc_dapm_start: card=vscn-2046 event=2 | ||
29 | aplay-214 [000] 694.563241: snd_soc_dapm_done: card=vscn-2046 event=2 | ||
30 | |||
31 | Upstream-Status: Backport [88c4e0fe Fix: ASoC snd_doc_dapm on linux 6.9-rc1] | ||
32 | |||
33 | Change-Id: If0d33544b8dd1dfb3d12ca9390892190fc0444b0 | ||
34 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
35 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
36 | --- | ||
37 | include/instrumentation/events/asoc.h | 33 +++++++++++++++++++++++++++ | ||
38 | 1 file changed, 33 insertions(+) | ||
39 | |||
40 | diff --git a/include/instrumentation/events/asoc.h b/include/instrumentation/events/asoc.h | ||
41 | index 21d13a0f..5126d4c1 100644 | ||
42 | --- a/include/instrumentation/events/asoc.h | ||
43 | +++ b/include/instrumentation/events/asoc.h | ||
44 | @@ -51,6 +51,38 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_card, snd_soc_bias_level_done, | ||
45 | |||
46 | ) | ||
47 | |||
48 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) | ||
49 | +LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, | ||
50 | + | ||
51 | + TP_PROTO(struct snd_soc_card *card, int event), | ||
52 | + | ||
53 | + TP_ARGS(card, event), | ||
54 | + | ||
55 | + TP_FIELDS( | ||
56 | + ctf_string(name, card->name) | ||
57 | + ctf_integer(int, event, event) | ||
58 | + ) | ||
59 | +) | ||
60 | +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_start, | ||
61 | + | ||
62 | + asoc_snd_soc_dapm_start, | ||
63 | + | ||
64 | + TP_PROTO(struct snd_soc_card *card, int event), | ||
65 | + | ||
66 | + TP_ARGS(card, event) | ||
67 | + | ||
68 | +) | ||
69 | + | ||
70 | +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, | ||
71 | + | ||
72 | + asoc_snd_soc_dapm_done, | ||
73 | + | ||
74 | + TP_PROTO(struct snd_soc_card *card, int event), | ||
75 | + | ||
76 | + TP_ARGS(card, event) | ||
77 | + | ||
78 | +) | ||
79 | +#else | ||
80 | LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, | ||
81 | |||
82 | TP_PROTO(struct snd_soc_card *card), | ||
83 | @@ -81,6 +113,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_basic, snd_soc_dapm_done, | ||
84 | TP_ARGS(card) | ||
85 | |||
86 | ) | ||
87 | +#endif | ||
88 | |||
89 | LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_widget, | ||
90 | |||
91 | -- | ||
92 | 2.39.2 | ||
93 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch deleted file mode 100644 index a0d932c7b7..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From 9e59c2f6387aeb832ae3af3095f987529722e08f Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 22 Jan 2024 11:10:37 -0500 | ||
4 | Subject: [PATCH 1/5] Fix: sched_stat_runtime changed in linux 6.8.0-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit 5fe6ec8f6ab549b6422e41551abb51802bd48bc7 | ||
9 | Author: Peter Zijlstra <peterz@infradead.org> | ||
10 | Date: Mon Nov 6 13:41:43 2023 +0100 | ||
11 | |||
12 | sched: Remove vruntime from trace_sched_stat_runtime() | ||
13 | |||
14 | Tracing the runtime delta makes sense, observer can sum over time. | ||
15 | Tracing the absolute vruntime makes less sense, inconsistent: | ||
16 | absolute-vs-delta, but also vruntime delta can be computed from | ||
17 | runtime delta. | ||
18 | |||
19 | Removing the vruntime thing also makes the two tracepoint sites | ||
20 | identical, allowing to unify the code in a later patch. | ||
21 | |||
22 | Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700] | ||
23 | |||
24 | Change-Id: I24ebb4e06dbb646a1af75ac62b74f3821ff197de | ||
25 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
26 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
27 | --- | ||
28 | include/instrumentation/events/sched.h | 19 +++++++++++++++++++ | ||
29 | 1 file changed, 19 insertions(+) | ||
30 | |||
31 | diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h | ||
32 | index 066a0f8..24cf37c 100644 | ||
33 | --- a/include/instrumentation/events/sched.h | ||
34 | +++ b/include/instrumentation/events/sched.h | ||
35 | @@ -646,6 +646,24 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_stat_template, sched_stat_blocked, | ||
36 | TP_ARGS(tsk, delay)) | ||
37 | #endif | ||
38 | |||
39 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
40 | +/* | ||
41 | + * Tracepoint for accounting runtime (time the task is executing | ||
42 | + * on a CPU). | ||
43 | + */ | ||
44 | +LTTNG_TRACEPOINT_EVENT(sched_stat_runtime, | ||
45 | + | ||
46 | + TP_PROTO(struct task_struct *tsk, u64 runtime), | ||
47 | + | ||
48 | + TP_ARGS(tsk, runtime), | ||
49 | + | ||
50 | + TP_FIELDS( | ||
51 | + ctf_array_text(char, comm, tsk->comm, TASK_COMM_LEN) | ||
52 | + ctf_integer(pid_t, tid, tsk->pid) | ||
53 | + ctf_integer(u64, runtime, runtime) | ||
54 | + ) | ||
55 | +) | ||
56 | +#else | ||
57 | /* | ||
58 | * Tracepoint for accounting runtime (time the task is executing | ||
59 | * on a CPU). | ||
60 | @@ -663,6 +681,7 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime, | ||
61 | ctf_integer(u64, vruntime, vruntime) | ||
62 | ) | ||
63 | ) | ||
64 | +#endif | ||
65 | |||
66 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,12,0) || \ | ||
67 | LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \ | ||
68 | -- | ||
69 | 2.39.2 | ||
70 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch new file mode 100644 index 0000000000..6ea10ffc91 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch | |||
@@ -0,0 +1,132 @@ | |||
1 | From d8379ec6365a925db33cae94fb6783cdbdb6a922 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 25 Mar 2024 09:40:29 -0400 | ||
4 | Subject: [PATCH 2/4] Fix: ASoC add component to set_bias_level events in linux | ||
5 | 6.9-rc1 | ||
6 | |||
7 | See upstream commit: | ||
8 | |||
9 | commit 6ef46a69ec32fe1cf56de67742fcd01af4bf48af | ||
10 | Author: Luca Ceresoli <luca.ceresoli@bootlin.com> | ||
11 | Date: Wed Mar 6 10:30:00 2024 +0100 | ||
12 | |||
13 | ASoC: trace: add component to set_bias_level trace events | ||
14 | |||
15 | The snd_soc_bias_level_start and snd_soc_bias_level_done trace events | ||
16 | currently look like: | ||
17 | |||
18 | aplay-229 [000] 1250.140778: snd_soc_bias_level_start: card=vscn-2046 val=1 | ||
19 | aplay-229 [000] 1250.140784: snd_soc_bias_level_done: card=vscn-2046 val=1 | ||
20 | aplay-229 [000] 1250.140786: snd_soc_bias_level_start: card=vscn-2046 val=2 | ||
21 | aplay-229 [000] 1250.140788: snd_soc_bias_level_done: card=vscn-2046 val=2 | ||
22 | kworker/u8:1-21 [000] 1250.140871: snd_soc_bias_level_start: card=vscn-2046 val=1 | ||
23 | kworker/u8:0-11 [000] 1250.140951: snd_soc_bias_level_start: card=vscn-2046 val=1 | ||
24 | kworker/u8:0-11 [000] 1250.140956: snd_soc_bias_level_done: card=vscn-2046 val=1 | ||
25 | kworker/u8:0-11 [000] 1250.140959: snd_soc_bias_level_start: card=vscn-2046 val=2 | ||
26 | kworker/u8:0-11 [000] 1250.140961: snd_soc_bias_level_done: card=vscn-2046 val=2 | ||
27 | kworker/u8:1-21 [000] 1250.167219: snd_soc_bias_level_done: card=vscn-2046 val=1 | ||
28 | kworker/u8:1-21 [000] 1250.167222: snd_soc_bias_level_start: card=vscn-2046 val=2 | ||
29 | kworker/u8:1-21 [000] 1250.167232: snd_soc_bias_level_done: card=vscn-2046 val=2 | ||
30 | kworker/u8:0-11 [000] 1250.167440: snd_soc_bias_level_start: card=vscn-2046 val=3 | ||
31 | kworker/u8:0-11 [000] 1250.167444: snd_soc_bias_level_done: card=vscn-2046 val=3 | ||
32 | kworker/u8:1-21 [000] 1250.167497: snd_soc_bias_level_start: card=vscn-2046 val=3 | ||
33 | kworker/u8:1-21 [000] 1250.167506: snd_soc_bias_level_done: card=vscn-2046 val=3 | ||
34 | |||
35 | There are clearly multiple calls, one per component, but they cannot be | ||
36 | discriminated from each other. | ||
37 | |||
38 | Change the ftrace events to also print the component name, to make it clear | ||
39 | which part of the code is involved. This requires changing the passed value | ||
40 | from a struct snd_soc_card, where the DAPM context is not kwown, to a | ||
41 | struct snd_soc_dapm_context where it is obviously known but the a card | ||
42 | pointer is also available. | ||
43 | |||
44 | With this change, the resulting trace becomes: | ||
45 | |||
46 | aplay-247 [000] 1436.357332: snd_soc_bias_level_start: card=vscn-2046 component=(none) val=1 | ||
47 | aplay-247 [000] 1436.357338: snd_soc_bias_level_done: card=vscn-2046 component=(none) val=1 | ||
48 | aplay-247 [000] 1436.357340: snd_soc_bias_level_start: card=vscn-2046 component=(none) val=2 | ||
49 | aplay-247 [000] 1436.357343: snd_soc_bias_level_done: card=vscn-2046 component=(none) val=2 | ||
50 | kworker/u8:4-215 [000] 1436.357437: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=1 | ||
51 | kworker/u8:5-231 [000] 1436.357518: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=1 | ||
52 | kworker/u8:5-231 [000] 1436.357523: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=1 | ||
53 | kworker/u8:5-231 [000] 1436.357526: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=2 | ||
54 | kworker/u8:5-231 [000] 1436.357528: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=2 | ||
55 | kworker/u8:4-215 [000] 1436.383217: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=1 | ||
56 | kworker/u8:4-215 [000] 1436.383221: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=2 | ||
57 | kworker/u8:4-215 [000] 1436.383231: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=2 | ||
58 | kworker/u8:5-231 [000] 1436.383468: snd_soc_bias_level_start: card=vscn-2046 component=ff320000.i2s val=3 | ||
59 | kworker/u8:5-231 [000] 1436.383472: snd_soc_bias_level_done: card=vscn-2046 component=ff320000.i2s val=3 | ||
60 | kworker/u8:4-215 [000] 1436.383503: snd_soc_bias_level_start: card=vscn-2046 component=ff560000.codec val=3 | ||
61 | kworker/u8:4-215 [000] 1436.383513: snd_soc_bias_level_done: card=vscn-2046 component=ff560000.codec val=3 | ||
62 | |||
63 | Upstream-Status: Backport [303434ab Fix: ASoC add component to set_bias_level events in linux 6.9-rc1] | ||
64 | |||
65 | Change-Id: I959f1680c002acdf29828b968d3975247f5433d8 | ||
66 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
67 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
68 | --- | ||
69 | include/instrumentation/events/asoc.h | 36 +++++++++++++++++++++++++++ | ||
70 | 1 file changed, 36 insertions(+) | ||
71 | |||
72 | Index: lttng-modules-2.13.12/include/instrumentation/events/asoc.h | ||
73 | =================================================================== | ||
74 | --- lttng-modules-2.13.12.orig/include/instrumentation/events/asoc.h | ||
75 | +++ lttng-modules-2.13.12/include/instrumentation/events/asoc.h | ||
76 | @@ -10,6 +10,7 @@ | ||
77 | #include <lttng/kernel-version.h> | ||
78 | |||
79 | #define DAPM_DIRECT "(direct)" | ||
80 | +#define DAPM_COMPONENT_NONE "(none)" | ||
81 | |||
82 | #ifndef _TRACE_ASOC_DEF | ||
83 | #define _TRACE_ASOC_DEF | ||
84 | @@ -119,6 +120,40 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc | ||
85 | ) | ||
86 | #endif | ||
87 | |||
88 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) | ||
89 | +LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_context, | ||
90 | + | ||
91 | + TP_PROTO(struct snd_soc_dapm_context *dapm, int val), | ||
92 | + | ||
93 | + TP_ARGS(dapm, val), | ||
94 | + | ||
95 | + TP_FIELDS( | ||
96 | + ctf_string(name, dapm->card->name) | ||
97 | + ctf_string(component, dapm->component ? dapm->component->name : DAPM_COMPONENT_NONE) | ||
98 | + ctf_integer(int, val, val) | ||
99 | + ) | ||
100 | +) | ||
101 | + | ||
102 | +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_start, | ||
103 | + | ||
104 | + asoc_snd_soc_bias_level_start, | ||
105 | + | ||
106 | + TP_PROTO(struct snd_soc_dapm_context *dapm, int val), | ||
107 | + | ||
108 | + TP_ARGS(dapm, val) | ||
109 | + | ||
110 | +) | ||
111 | + | ||
112 | +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc_snd_soc_dapm_context, snd_soc_bias_level_done, | ||
113 | + | ||
114 | + asoc_snd_soc_bias_level_done, | ||
115 | + | ||
116 | + TP_PROTO(struct snd_soc_dapm_context *dapm, int val), | ||
117 | + | ||
118 | + TP_ARGS(dapm, val) | ||
119 | + | ||
120 | +) | ||
121 | +#else | ||
122 | LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_card, | ||
123 | |||
124 | TP_PROTO(struct snd_soc_card *card, int val), | ||
125 | @@ -150,6 +185,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(asoc | ||
126 | TP_ARGS(card, val) | ||
127 | |||
128 | ) | ||
129 | +#endif | ||
130 | |||
131 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) | ||
132 | LTTNG_TRACEPOINT_EVENT_CLASS(asoc_snd_soc_dapm_basic, | ||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch deleted file mode 100644 index 5a4294db02..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | From d52ab4b9a71a4bef535dadb8e7062112ac5c0c88 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 22 Jan 2024 11:33:39 -0500 | ||
4 | Subject: [PATCH 2/5] Fix: timer_start changed in linux 6.8.0-rc1 | ||
5 | |||
6 | See upstream commit | ||
7 | |||
8 | commit dbcdcb62b59db2cf6a24113873b90da15c6f0b19 | ||
9 | Author: Anna-Maria Behnsen <anna-maria@linutronix.de> | ||
10 | Date: Fri Dec 1 10:26:26 2023 +0100 | ||
11 | |||
12 | tracing/timers: Enhance timer_start tracepoint | ||
13 | |||
14 | For starting a timer, the timer is enqueued into a bucket of the timer | ||
15 | wheel. The bucket expiry is the defacto expiry of the timer but it is not | ||
16 | equal the timer expiry because of increasing granularity when bucket is in | ||
17 | a higher level of the wheel. To be able to figure out in a trace whether a | ||
18 | timer expired in time or not, the bucket expiry time is required as well. | ||
19 | |||
20 | Add bucket expiry time to the timer_start tracepoint and thereby simplify | ||
21 | the arguments. | ||
22 | |||
23 | Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700] | ||
24 | |||
25 | Change-Id: I4868092765745b1efd0c48f13c0b837f2007dcb6 | ||
26 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
27 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
28 | --- | ||
29 | include/instrumentation/events/timer.h | 24 +++++++++++++----------- | ||
30 | 1 file changed, 13 insertions(+), 11 deletions(-) | ||
31 | |||
32 | diff --git a/include/instrumentation/events/timer.h b/include/instrumentation/events/timer.h | ||
33 | index 91a2cd9..ce571f5 100644 | ||
34 | --- a/include/instrumentation/events/timer.h | ||
35 | +++ b/include/instrumentation/events/timer.h | ||
36 | @@ -45,8 +45,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init, | ||
37 | TP_ARGS(timer) | ||
38 | ) | ||
39 | |||
40 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0) || \ | ||
41 | - LTTNG_RHEL_KERNEL_RANGE(3,10,0,957,0,0, 3,11,0,0,0,0)) | ||
42 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
43 | /** | ||
44 | * timer_start - called when the timer is started | ||
45 | * @timer: pointer to struct timer_list | ||
46 | @@ -55,39 +54,42 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(timer_class, timer_init, | ||
47 | */ | ||
48 | LTTNG_TRACEPOINT_EVENT(timer_start, | ||
49 | |||
50 | - TP_PROTO(struct timer_list *timer, unsigned long expires, | ||
51 | - unsigned int flags), | ||
52 | + TP_PROTO(struct timer_list *timer, unsigned long bucket_expiry), | ||
53 | |||
54 | - TP_ARGS(timer, expires, flags), | ||
55 | + TP_ARGS(timer, bucket_expiry), | ||
56 | |||
57 | TP_FIELDS( | ||
58 | ctf_integer_hex(void *, timer, timer) | ||
59 | ctf_integer_hex(void *, function, timer->function) | ||
60 | - ctf_integer(unsigned long, expires, expires) | ||
61 | + ctf_integer(unsigned long, expires, timer->expires) | ||
62 | + ctf_integer(unsigned long, bucket_expiry, bucket_expiry) | ||
63 | ctf_integer(unsigned long, now, jiffies) | ||
64 | - ctf_integer(unsigned int, flags, flags) | ||
65 | + ctf_integer(unsigned int, flags, timer->flags) | ||
66 | ) | ||
67 | ) | ||
68 | -#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */ | ||
69 | +#else | ||
70 | /** | ||
71 | * timer_start - called when the timer is started | ||
72 | * @timer: pointer to struct timer_list | ||
73 | * @expires: the timers expiry time | ||
74 | + * @flags: the timers expiry time | ||
75 | */ | ||
76 | LTTNG_TRACEPOINT_EVENT(timer_start, | ||
77 | |||
78 | - TP_PROTO(struct timer_list *timer, unsigned long expires), | ||
79 | + TP_PROTO(struct timer_list *timer, unsigned long expires, | ||
80 | + unsigned int flags), | ||
81 | |||
82 | - TP_ARGS(timer, expires), | ||
83 | + TP_ARGS(timer, expires, flags), | ||
84 | |||
85 | TP_FIELDS( | ||
86 | ctf_integer_hex(void *, timer, timer) | ||
87 | ctf_integer_hex(void *, function, timer->function) | ||
88 | ctf_integer(unsigned long, expires, expires) | ||
89 | ctf_integer(unsigned long, now, jiffies) | ||
90 | + ctf_integer(unsigned int, flags, flags) | ||
91 | ) | ||
92 | ) | ||
93 | -#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,2,0)) */ | ||
94 | +#endif | ||
95 | |||
96 | #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0) || \ | ||
97 | LTTNG_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0)) | ||
98 | -- | ||
99 | 2.39.2 | ||
100 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch new file mode 100644 index 0000000000..66c48ebe8f --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From f4a6415f8d5fa447868d1fdc7119e0a328966379 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 25 Mar 2024 10:30:32 -0400 | ||
4 | Subject: [PATCH 3/4] Fix: mm_compaction_migratepages changed in linux 6.9-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit ab755bf4249b992fc2140d615ab0a686d50765b4 | ||
9 | Author: Baolin Wang <baolin.wang@linux.alibaba.com> | ||
10 | Date: Tue Feb 20 14:16:31 2024 +0800 | ||
11 | |||
12 | mm: compaction: update the cc->nr_migratepages when allocating or freeing the freepages | ||
13 | |||
14 | Currently we will use 'cc->nr_freepages >= cc->nr_migratepages' comparison | ||
15 | to ensure that enough freepages are isolated in isolate_freepages(), | ||
16 | however it just decreases the cc->nr_freepages without updating | ||
17 | cc->nr_migratepages in compaction_alloc(), which will waste more CPU | ||
18 | cycles and cause too many freepages to be isolated. | ||
19 | |||
20 | So we should also update the cc->nr_migratepages when allocating or | ||
21 | freeing the freepages to avoid isolating excess freepages. And I can see | ||
22 | fewer free pages are scanned and isolated when running thpcompact on my | ||
23 | Arm64 server: | ||
24 | |||
25 | k6.7 k6.7_patched | ||
26 | Ops Compaction pages isolated 120692036.00 118160797.00 | ||
27 | Ops Compaction migrate scanned 131210329.00 154093268.00 | ||
28 | Ops Compaction free scanned 1090587971.00 1080632536.00 | ||
29 | Ops Compact scan efficiency 12.03 14.26 | ||
30 | |||
31 | Moreover, I did not see an obvious latency improvements, this is likely | ||
32 | because isolating freepages is not the bottleneck in the thpcompact test | ||
33 | case. | ||
34 | |||
35 | k6.7 k6.7_patched | ||
36 | Amean fault-both-1 1089.76 ( 0.00%) 1080.16 * 0.88%* | ||
37 | Amean fault-both-3 1616.48 ( 0.00%) 1636.65 * -1.25%* | ||
38 | Amean fault-both-5 2266.66 ( 0.00%) 2219.20 * 2.09%* | ||
39 | Amean fault-both-7 2909.84 ( 0.00%) 2801.90 * 3.71%* | ||
40 | Amean fault-both-12 4861.26 ( 0.00%) 4733.25 * 2.63%* | ||
41 | Amean fault-both-18 7351.11 ( 0.00%) 6950.51 * 5.45%* | ||
42 | Amean fault-both-24 9059.30 ( 0.00%) 9159.99 * -1.11%* | ||
43 | Amean fault-both-30 10685.68 ( 0.00%) 11399.02 * -6.68%* | ||
44 | |||
45 | Upstream-Status: Backport [175fe77c Fix: mm_compaction_migratepages changed in linux 6.9-rc1] | ||
46 | |||
47 | Change-Id: I103a43fd1b549360b3fc978fd409b7c17ef3e192 | ||
48 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
49 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
50 | --- | ||
51 | include/instrumentation/events/compaction.h | 17 ++++++++++++++++- | ||
52 | 1 file changed, 16 insertions(+), 1 deletion(-) | ||
53 | |||
54 | Index: lttng-modules-2.13.12/include/instrumentation/events/compaction.h | ||
55 | =================================================================== | ||
56 | --- lttng-modules-2.13.12.orig/include/instrumentation/events/compaction.h | ||
57 | +++ lttng-modules-2.13.12/include/instrumentation/events/compaction.h | ||
58 | @@ -97,7 +97,22 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(comp | ||
59 | |||
60 | #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ | ||
61 | |||
62 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \ | ||
63 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) | ||
64 | +LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, | ||
65 | + | ||
66 | + compaction_migratepages, | ||
67 | + | ||
68 | + TP_PROTO(unsigned int nr_migratepages, | ||
69 | + unsigned int nr_succeeded), | ||
70 | + | ||
71 | + TP_ARGS(nr_migratepages, nr_succeeded), | ||
72 | + | ||
73 | + TP_FIELDS( | ||
74 | + ctf_integer(unsigned long, nr_migrated, nr_succeeded) | ||
75 | + ctf_integer(unsigned long, nr_failed, nr_migratepages - nr_succeeded) | ||
76 | + ) | ||
77 | +) | ||
78 | +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) || \ | ||
79 | LTTNG_RHEL_KERNEL_RANGE(5,14,0,163,0,0, 5,15,0,0,0,0)) | ||
80 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, | ||
81 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch deleted file mode 100644 index 4ad9adc5c2..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 7432f583674294b676577b6505b89fc74dc5c7ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 22 Jan 2024 11:47:40 -0500 | ||
4 | Subject: [PATCH 3/5] Fix: strlcopy removed in linux 6.8.0-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit d26270061ae66b915138af7cd73ca6f8b85e6b44 | ||
9 | Author: Kees Cook <keescook@chromium.org> | ||
10 | Date: Thu Jan 18 12:31:55 2024 -0800 | ||
11 | |||
12 | string: Remove strlcpy() | ||
13 | |||
14 | With all the users of strlcpy() removed[1] from the kernel, remove the | ||
15 | API, self-tests, and other references. Leave mentions in Documentation | ||
16 | (about its deprecation), and in checkpatch.pl (to help migrate host-only | ||
17 | tools/ usage). Long live strscpy(). | ||
18 | |||
19 | Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700] | ||
20 | |||
21 | Change-Id: I27cdff70a504b25340cc59150ed8e959d9629e43 | ||
22 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
23 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
24 | --- | ||
25 | src/lib/ringbuffer/ring_buffer_backend.c | 4 ++++ | ||
26 | 1 file changed, 4 insertions(+) | ||
27 | |||
28 | diff --git a/src/lib/ringbuffer/ring_buffer_backend.c b/src/lib/ringbuffer/ring_buffer_backend.c | ||
29 | index 9a339be..2181145 100644 | ||
30 | --- a/src/lib/ringbuffer/ring_buffer_backend.c | ||
31 | +++ b/src/lib/ringbuffer/ring_buffer_backend.c | ||
32 | @@ -405,7 +405,11 @@ int channel_backend_init(struct channel_backend *chanb, | ||
33 | chanb->extra_reader_sb = | ||
34 | (config->mode == RING_BUFFER_OVERWRITE) ? 1 : 0; | ||
35 | chanb->num_subbuf = num_subbuf; | ||
36 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
37 | + strscpy(chanb->name, name, NAME_MAX); | ||
38 | +#else | ||
39 | strlcpy(chanb->name, name, NAME_MAX); | ||
40 | +#endif | ||
41 | memcpy(&chanb->config, config, sizeof(chanb->config)); | ||
42 | |||
43 | if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) { | ||
44 | -- | ||
45 | 2.39.2 | ||
46 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch deleted file mode 100644 index c9b1af37c8..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | From c8198382fe1cede3e16aae9978642a113a217e4c Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 22 Jan 2024 12:17:33 -0500 | ||
4 | Subject: [PATCH 4/5] Fix: btrfs_chunk tracepoints changed in linux 6.8.0-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit 7dc66abb5a47778d7db327783a0ba172b8cff0b5 | ||
9 | Author: Filipe Manana <fdmanana@suse.com> | ||
10 | Date: Tue Nov 21 13:38:38 2023 +0000 | ||
11 | |||
12 | btrfs: use a dedicated data structure for chunk maps | ||
13 | |||
14 | Currently we abuse the extent_map structure for two purposes: | ||
15 | |||
16 | 1) To actually represent extents for inodes; | ||
17 | 2) To represent chunk mappings. | ||
18 | |||
19 | This is odd and has several disadvantages: | ||
20 | |||
21 | 1) To create a chunk map, we need to do two memory allocations: one for | ||
22 | an extent_map structure and another one for a map_lookup structure, so | ||
23 | more potential for an allocation failure and more complicated code to | ||
24 | manage and link two structures; | ||
25 | |||
26 | 2) For a chunk map we actually only use 3 fields (24 bytes) of the | ||
27 | respective extent map structure: the 'start' field to have the logical | ||
28 | start address of the chunk, the 'len' field to have the chunk's size, | ||
29 | and the 'orig_block_len' field to contain the chunk's stripe size. | ||
30 | |||
31 | Besides wasting a memory, it's also odd and not intuitive at all to | ||
32 | have the stripe size in a field named 'orig_block_len'. | ||
33 | |||
34 | We are also using 'block_len' of the extent_map structure to contain | ||
35 | the chunk size, so we have 2 fields for the same value, 'len' and | ||
36 | 'block_len', which is pointless; | ||
37 | |||
38 | 3) When an extent map is associated to a chunk mapping, we set the bit | ||
39 | EXTENT_FLAG_FS_MAPPING on its flags and then make its member named | ||
40 | 'map_lookup' point to the associated map_lookup structure. This means | ||
41 | that for an extent map associated to an inode extent, we are not using | ||
42 | this 'map_lookup' pointer, so wasting 8 bytes (on a 64 bits platform); | ||
43 | |||
44 | 4) Extent maps associated to a chunk mapping are never merged or split so | ||
45 | it's pointless to use the existing extent map infrastructure. | ||
46 | |||
47 | So add a dedicated data structure named 'btrfs_chunk_map' to represent | ||
48 | chunk mappings, this is basically the existing map_lookup structure with | ||
49 | some extra fields: | ||
50 | |||
51 | 1) 'start' to contain the chunk logical address; | ||
52 | 2) 'chunk_len' to contain the chunk's length; | ||
53 | 3) 'stripe_size' for the stripe size; | ||
54 | 4) 'rb_node' for insertion into a rb tree; | ||
55 | 5) 'refs' for reference counting. | ||
56 | |||
57 | This way we do a single memory allocation for chunk mappings and we don't | ||
58 | waste memory for them with unused/unnecessary fields from an extent_map. | ||
59 | |||
60 | We also save 8 bytes from the extent_map structure by removing the | ||
61 | 'map_lookup' pointer, so the size of struct extent_map is reduced from | ||
62 | 144 bytes down to 136 bytes, and we can now have 30 extents map per 4K | ||
63 | page instead of 28. | ||
64 | |||
65 | Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700] | ||
66 | |||
67 | Change-Id: Ie52b5ac83df4bc6abeb84d958c4f5d24ae0d8c75 | ||
68 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
69 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
70 | --- | ||
71 | include/instrumentation/events/btrfs.h | 37 +++++++++++++++++++++++++- | ||
72 | 1 file changed, 36 insertions(+), 1 deletion(-) | ||
73 | |||
74 | diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h | ||
75 | index 7c7b9b0..a2a412b 100644 | ||
76 | --- a/include/instrumentation/events/btrfs.h | ||
77 | +++ b/include/instrumentation/events/btrfs.h | ||
78 | @@ -1609,7 +1609,42 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head, | ||
79 | ) | ||
80 | #endif | ||
81 | |||
82 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0)) | ||
83 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
84 | + | ||
85 | +LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, | ||
86 | + | ||
87 | + TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map, | ||
88 | + u64 offset, u64 size), | ||
89 | + | ||
90 | + TP_ARGS(fs_info, map, offset, size), | ||
91 | + | ||
92 | + TP_FIELDS( | ||
93 | + ctf_integer(int, num_stripes, map->num_stripes) | ||
94 | + ctf_integer(u64, type, map->type) | ||
95 | + ctf_integer(int, sub_stripes, map->sub_stripes) | ||
96 | + ctf_integer(u64, offset, offset) | ||
97 | + ctf_integer(u64, size, size) | ||
98 | + ctf_integer(u64, root_objectid, fs_info->chunk_root->root_key.objectid) | ||
99 | + ) | ||
100 | +) | ||
101 | + | ||
102 | +LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_alloc, | ||
103 | + | ||
104 | + TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map, | ||
105 | + u64 offset, u64 size), | ||
106 | + | ||
107 | + TP_ARGS(fs_info, map, offset, size) | ||
108 | +) | ||
109 | + | ||
110 | +LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk, btrfs_chunk_free, | ||
111 | + | ||
112 | + TP_PROTO(const struct btrfs_fs_info *fs_info, const struct btrfs_chunk_map *map, | ||
113 | + u64 offset, u64 size), | ||
114 | + | ||
115 | + TP_ARGS(fs_info, map, offset, size) | ||
116 | +) | ||
117 | + | ||
118 | +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0)) | ||
119 | |||
120 | LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, | ||
121 | |||
122 | -- | ||
123 | 2.39.2 | ||
124 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch new file mode 100644 index 0000000000..59ef4f9313 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 217bc2e4685050dddce9bdd2557b64f6b8c16622 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 25 Mar 2024 10:53:46 -0400 | ||
4 | Subject: [PATCH 4/4] Fix: dev_base_lock removed in linux 6.9-rc1 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit 1b3ef46cb7f2618cc0b507393220a69810f6da12 | ||
9 | Author: Eric Dumazet <edumazet@google.com> | ||
10 | Date: Tue Feb 13 06:32:45 2024 +0000 | ||
11 | |||
12 | net: remove dev_base_lock | ||
13 | |||
14 | dev_base_lock is not needed anymore, all remaining users also hold RTNL. | ||
15 | |||
16 | Upstream-Status: Backport [52eb2ee9 Fix: dev_base_lock removed in linux 6.9-rc1] | ||
17 | |||
18 | Change-Id: I6b07e6eed07fd398302ca14d23162ed24d74df15 | ||
19 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
20 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
21 | --- | ||
22 | src/lttng-statedump-impl.c | 15 +++++++++++++++ | ||
23 | 1 file changed, 15 insertions(+) | ||
24 | |||
25 | Index: lttng-modules-2.13.12/src/lttng-statedump-impl.c | ||
26 | =================================================================== | ||
27 | --- lttng-modules-2.13.12.orig/src/lttng-statedump-impl.c | ||
28 | +++ lttng-modules-2.13.12/src/lttng-statedump-impl.c | ||
29 | @@ -392,6 +392,20 @@ void lttng_enumerate_device(struct lttng | ||
30 | } | ||
31 | } | ||
32 | |||
33 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) | ||
34 | +static | ||
35 | +int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) | ||
36 | +{ | ||
37 | + struct net_device *dev; | ||
38 | + | ||
39 | + rtnl_lock(); | ||
40 | + for_each_netdev(&init_net, dev) | ||
41 | + lttng_enumerate_device(session, dev); | ||
42 | + rtnl_unlock(); | ||
43 | + | ||
44 | + return 0; | ||
45 | +} | ||
46 | +#else | ||
47 | static | ||
48 | int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) | ||
49 | { | ||
50 | @@ -404,6 +418,7 @@ int lttng_enumerate_network_ip_interface | ||
51 | |||
52 | return 0; | ||
53 | } | ||
54 | +#endif /* (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,9,0)) */ | ||
55 | #else /* CONFIG_INET */ | ||
56 | static inline | ||
57 | int lttng_enumerate_network_ip_interface(struct lttng_kernel_session *session) | ||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch deleted file mode 100644 index 65c33dafef..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | From 86db094386b43bb5c6b47552f9a4826ca8ba917d Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 22 Jan 2024 13:13:36 -0500 | ||
4 | Subject: [PATCH 5/5] Fix: btrfs_get_extent flags and compress_type changed in | ||
5 | linux 6.8.0-rc1 | ||
6 | |||
7 | See upstream commit: | ||
8 | |||
9 | commit f86f7a75e2fb5fd7d31d00eab8a392f97ba42ce9 | ||
10 | Author: Filipe Manana <fdmanana@suse.com> | ||
11 | Date: Mon Dec 4 16:20:33 2023 +0000 | ||
12 | |||
13 | btrfs: use the flags of an extent map to identify the compression type | ||
14 | |||
15 | Currently, in struct extent_map, we use an unsigned int (32 bits) to | ||
16 | identify the compression type of an extent and an unsigned long (64 bits | ||
17 | on a 64 bits platform, 32 bits otherwise) for flags. We are only using | ||
18 | 6 different flags, so an unsigned long is excessive and we can use flags | ||
19 | to identify the compression type instead of using a dedicated 32 bits | ||
20 | field. | ||
21 | |||
22 | We can easily have tens or hundreds of thousands (or more) of extent maps | ||
23 | on busy and large filesystems, specially with compression enabled or many | ||
24 | or large files with tons of small extents. So it's convenient to have the | ||
25 | extent_map structure as small as possible in order to use less memory. | ||
26 | |||
27 | So remove the compression type field from struct extent_map, use flags | ||
28 | to identify the compression type and shorten the flags field from an | ||
29 | unsigned long to a u32. This saves 8 bytes (on 64 bits platforms) and | ||
30 | reduces the size of the structure from 136 bytes down to 128 bytes, using | ||
31 | now only two cache lines, and increases the number of extent maps we can | ||
32 | have per 4K page from 30 to 32. By using a u32 for the flags instead of | ||
33 | an unsigned long, we no longer use test_bit(), set_bit() and clear_bit(), | ||
34 | but that level of atomicity is not needed as most flags are never cleared | ||
35 | once set (before adding an extent map to the tree), and the ones that can | ||
36 | be cleared or set after an extent map is added to the tree, are always | ||
37 | performed while holding the write lock on the extent map tree, while the | ||
38 | reader holds a lock on the tree or tests for a flag that never changes | ||
39 | once the extent map is in the tree (such as compression flags). | ||
40 | |||
41 | Upstream-Status: Backport [Uhttps://review.lttng.org/c/lttng-modules/+/11700] | ||
42 | |||
43 | Change-Id: I95402d43f064c016b423b48652e4968d3db9b8a9 | ||
44 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
45 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
46 | --- | ||
47 | include/instrumentation/events/btrfs.h | 25 ++++++++++++++++++++++++- | ||
48 | 1 file changed, 24 insertions(+), 1 deletion(-) | ||
49 | |||
50 | diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h | ||
51 | index a2a412b..ffb1b64 100644 | ||
52 | --- a/include/instrumentation/events/btrfs.h | ||
53 | +++ b/include/instrumentation/events/btrfs.h | ||
54 | @@ -177,7 +177,30 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict, | ||
55 | ) | ||
56 | #endif | ||
57 | |||
58 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0)) | ||
59 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
60 | + | ||
61 | +LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, | ||
62 | + | ||
63 | + TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode, | ||
64 | + const struct extent_map *map), | ||
65 | + | ||
66 | + TP_ARGS(root, inode, map), | ||
67 | + | ||
68 | + TP_FIELDS( | ||
69 | + ctf_integer(u64, root_objectid, root->root_key.objectid) | ||
70 | + ctf_integer(u64, ino, btrfs_ino(inode)) | ||
71 | + ctf_integer(u64, start, map->start) | ||
72 | + ctf_integer(u64, len, map->len) | ||
73 | + ctf_integer(u64, orig_start, map->orig_start) | ||
74 | + ctf_integer(u64, block_start, map->block_start) | ||
75 | + ctf_integer(u64, block_len, map->block_len) | ||
76 | + ctf_integer(unsigned int, flags, map->flags) | ||
77 | + ctf_integer(int, refs, refcount_read(&map->refs)) | ||
78 | + ctf_integer(unsigned int, compress_type, extent_map_compression(map)) | ||
79 | + ) | ||
80 | +) | ||
81 | + | ||
82 | +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0)) | ||
83 | |||
84 | LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, | ||
85 | |||
86 | -- | ||
87 | 2.39.2 | ||
88 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch deleted file mode 100644 index c35f5b61fa..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From c1e074414f087b6ecc229a9385a44eb3b3dfeaea Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 5 Feb 2024 08:52:29 -0500 | ||
4 | Subject: [PATCH] Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit f0e54b6087de9571ec61c189d6c378b81edbe3b2 | ||
9 | Author: Kemeng Shi <shikemeng@huaweicloud.com> | ||
10 | Date: Fri Jan 5 17:21:02 2024 +0800 | ||
11 | |||
12 | ext4: remove 'needed' in trace_ext4_discard_preallocations | ||
13 | |||
14 | As 'needed' to trace_ext4_discard_preallocations is always 0 which | ||
15 | is meaningless. Just remove it. | ||
16 | |||
17 | Change-Id: Ib6b698ca553c4beebd4ca791c83bbbb927901758 | ||
18 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
19 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2da4de37de6382b4440737fdf4320e08a089afcd] | ||
22 | |||
23 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
24 | --- | ||
25 | include/instrumentation/events/ext4.h | 14 +++++++++++++- | ||
26 | 1 file changed, 13 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h | ||
29 | index 222416e..05a6453 100644 | ||
30 | --- a/include/instrumentation/events/ext4.h | ||
31 | +++ b/include/instrumentation/events/ext4.h | ||
32 | @@ -490,7 +490,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, | ||
33 | ) | ||
34 | #endif | ||
35 | |||
36 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ | ||
37 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
38 | +LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, | ||
39 | + TP_PROTO(struct inode *inode, unsigned int len), | ||
40 | + | ||
41 | + TP_ARGS(inode, len), | ||
42 | + | ||
43 | + TP_FIELDS( | ||
44 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | ||
45 | + ctf_integer(ino_t, ino, inode->i_ino) | ||
46 | + ctf_integer(unsigned int, len, len) | ||
47 | + ) | ||
48 | +) | ||
49 | +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ | ||
50 | LTTNG_KERNEL_RANGE(5,8,6, 5,9,0)) | ||
51 | LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, | ||
52 | TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), | ||
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.11.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb index 5d2379df84..95d5e2d615 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.11.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.12.bb | |||
@@ -10,18 +10,16 @@ inherit module | |||
10 | include lttng-platforms.inc | 10 | include lttng-platforms.inc |
11 | 11 | ||
12 | SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ | 12 | SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ |
13 | file://0001-Fix-sched_stat_runtime-changed-in-linux-6.8.0-rc1.patch \ | 13 | file://0001-Fix-ASoC-snd_doc_dapm-on-linux-6.9-rc1.patch \ |
14 | file://0002-Fix-timer_start-changed-in-linux-6.8.0-rc1.patch \ | 14 | file://0002-Fix-ASoC-add-component-to-set_bias_level-events-in-l.patch \ |
15 | file://0003-Fix-strlcopy-removed-in-linux-6.8.0-rc1.patch \ | 15 | file://0003-Fix-mm_compaction_migratepages-changed-in-linux-6.9-.patch \ |
16 | file://0004-Fix-btrfs_chunk-tracepoints-changed-in-linux-6.8.0-r.patch \ | 16 | file://0004-Fix-dev_base_lock-removed-in-linux-6.9-rc1.patch \ |
17 | file://0005-Fix-btrfs_get_extent-flags-and-compress_type-changed.patch \ | ||
18 | file://0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch \ | ||
19 | " | 17 | " |
20 | 18 | ||
21 | # Use :append here so that the patch is applied also when using devupstream | 19 | # Use :append here so that the patch is applied also when using devupstream |
22 | SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" | 20 | SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" |
23 | 21 | ||
24 | SRC_URI[sha256sum] = "297211d6fda459c85793c1f498c90fad2939cda7939d503f3ec5eaaf5fbec3c7" | 22 | SRC_URI[sha256sum] = "d85fcb66c7bd31003ab8735e8c77700e5e4f417b4c22fe1f20112cf435abad79" |
25 | 23 | ||
26 | export INSTALL_MOD_DIR="kernel/lttng-modules" | 24 | export INSTALL_MOD_DIR="kernel/lttng-modules" |
27 | 25 | ||
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch new file mode 100644 index 0000000000..3286dfb5c1 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 6b45c5f80d20e7bbf3d98c1fa17d2cf8716af3bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Xiangyu Chen <xiangyu.chen@windriver.com> | ||
3 | Date: Mon, 25 Mar 2024 18:20:14 +0800 | ||
4 | Subject: [PATCH] Fix: rotation-destroy-flush: fix session daemon abort if no | ||
5 | kernel module present | ||
6 | |||
7 | Testing rotation-destroy-flush when no lttng kernel modules present, it would | ||
8 | be failed with error message: | ||
9 | |||
10 | Error: Unable to load required module lttng-ring-buffer-client-discard | ||
11 | not ok 1 - Start session daemon | ||
12 | Failed test 'Start session daemon' | ||
13 | not ok 2 - Create session rotation_destroy_flush in -o /tmp/tmp.test_rot ... | ||
14 | ... | ||
15 | |||
16 | This because test script that sets the LTTNG_ABORT_ON_ERROR environment | ||
17 | variable. It's this environment variable that causes the sessiond to handle the | ||
18 | kernel module loading failure as an abort rather than a warning. | ||
19 | |||
20 | Using "check_skip_kernel_test" to detect whether the kernel module fails to | ||
21 | load is expected or not. If the failure is expected, the script won't set that | ||
22 | environment variable any more. | ||
23 | |||
24 | Fixes: 3a174400 | ||
25 | ("tests:add check_skip_kernel_test to check root user and lttng kernel modules") | ||
26 | |||
27 | Upstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/12155] | ||
28 | |||
29 | Change-Id: I371e9ba717613e2940186f710cf3cccd35baed6c | ||
30 | Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | ||
31 | --- | ||
32 | .../ust/rotation-destroy-flush/test_rotation_destroy_flush | 6 +++--- | ||
33 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
34 | |||
35 | diff --git a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush | ||
36 | index 669bcbc43..64161768f 100755 | ||
37 | --- a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush | ||
38 | +++ b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush | ||
39 | @@ -23,11 +23,11 @@ SIZE_LIMIT=$PAGE_SIZE | ||
40 | NR_ITER=10 | ||
41 | NUM_TESTS=$((15*$NR_ITER)) | ||
42 | |||
43 | -# Ensure the daemons invoke abort on error. | ||
44 | -export LTTNG_ABORT_ON_ERROR=1 | ||
45 | - | ||
46 | source $TESTDIR/utils/utils.sh | ||
47 | |||
48 | +# Ensure the daemons invoke abort on error. | ||
49 | +check_skip_kernel_test || export LTTNG_ABORT_ON_ERROR=1 | ||
50 | + | ||
51 | # MUST set TESTDIR before calling those functions | ||
52 | function run_app() | ||
53 | { | ||
54 | -- | ||
55 | 2.25.1 | ||
56 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch index 2d08b08879..2f95889c4b 100644 --- a/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch +++ b/meta/recipes-kernel/lttng/lttng-tools/0001-tests-do-not-strip-a-helper-library.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ab238c213fac190972f55e73cf3e0bb1c7846eb8 Mon Sep 17 00:00:00 2001 | 1 | From 2237748af00467ad8250a7ccd944200f811db69a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 12 Dec 2019 16:52:07 +0100 | 3 | Date: Thu, 12 Dec 2019 16:52:07 +0100 |
4 | Subject: [PATCH] tests: do not strip a helper library | 4 | Subject: [PATCH] tests: do not strip a helper library |
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 12 | diff --git a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am |
13 | index 03f5d5a..d12c343 100644 | 13 | index 836f13e..e19a554 100644 |
14 | --- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 14 | --- a/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am |
15 | +++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am | 15 | +++ b/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am |
16 | @@ -12,7 +12,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la | 16 | @@ -14,7 +14,7 @@ userspace_probe_elf_binary_LDADD = libfoo.la |
17 | libfoo.strip: libfoo.la | 17 | libfoo.strip: libfoo.la |
18 | $(OBJCOPY) --strip-all .libs/libfoo.so | 18 | $(OBJCOPY) --strip-all .libs/libfoo.so |
19 | 19 | ||
@@ -22,6 +22,3 @@ index 03f5d5a..d12c343 100644 | |||
22 | @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ | 22 | @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ |
23 | for script in $(EXTRA_DIST); do \ | 23 | for script in $(EXTRA_DIST); do \ |
24 | cp -f $(srcdir)/$$script $(builddir); \ | 24 | cp -f $(srcdir)/$$script $(builddir); \ |
25 | -- | ||
26 | 2.17.1 | ||
27 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.11.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb index 08144e271c..e73dd4801a 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.13.11.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.13.bb | |||
@@ -38,9 +38,10 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ | |||
38 | file://disable-tests.patch \ | 38 | file://disable-tests.patch \ |
39 | file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \ | 39 | file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \ |
40 | file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \ | 40 | file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \ |
41 | file://0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch \ | ||
41 | " | 42 | " |
42 | 43 | ||
43 | SRC_URI[sha256sum] = "ac5baeef9fa690936b1ca01ecd1742da762c2c08511ff1b4e923938d94d0f979" | 44 | SRC_URI[sha256sum] = "ff5f4f00b081dac66092afe8e72b7c790670931cf1c1ee0deaa7f80fbc53883e" |
44 | 45 | ||
45 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd | 46 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd |
46 | 47 | ||
@@ -68,7 +69,7 @@ PRIVATE_LIBS:${PN}-ptest = "libfoo.so" | |||
68 | do_install:append () { | 69 | do_install:append () { |
69 | # install systemd unit file | 70 | # install systemd unit file |
70 | install -d ${D}${systemd_system_unitdir} | 71 | install -d ${D}${systemd_system_unitdir} |
71 | install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir} | 72 | install -m 0644 ${UNPACKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir} |
72 | } | 73 | } |
73 | 74 | ||
74 | do_install_ptest () { | 75 | do_install_ptest () { |
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb index 9509185bad..dddd3a5004 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ | |||
34 | file://0001-Makefile.am-update-rpath-link.patch \ | 34 | file://0001-Makefile.am-update-rpath-link.patch \ |
35 | " | 35 | " |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" | 37 | SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937" |
38 | 38 | ||
39 | CVE_PRODUCT = "ust" | 39 | CVE_PRODUCT = "ust" |
40 | 40 | ||
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index b630a402ff..0a05770408 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | |||
@@ -17,7 +17,7 @@ do_compile () { | |||
17 | 17 | ||
18 | do_install () { | 18 | do_install () { |
19 | install -d ${D}${sysconfdir}/init.d/ | 19 | install -d ${D}${sysconfdir}/init.d/ |
20 | install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ | 20 | install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/ |
21 | } | 21 | } |
22 | 22 | ||
23 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 23 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 4f26813de0..11fa917649 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -129,6 +129,10 @@ EXTRA_OEMAKE += "\ | |||
129 | # honour a JOBS variable. | 129 | # honour a JOBS variable. |
130 | EXTRA_OEMAKE:append:task-configure = " JOBS=1" | 130 | EXTRA_OEMAKE:append:task-configure = " JOBS=1" |
131 | 131 | ||
132 | # the architectures that need this file can be found in | ||
133 | # tools/include/uapi/asm/bpf_perf_event.h | ||
134 | # We are only listing supported arches at the moment | ||
135 | PERF_BPF_EVENT_SRC ?= '${@bb.utils.contains_any("ARCH", [ "riscv", "arm64" ], "arch/${ARCH}/include/uapi/asm/bpf_perf_event.h", "", d)}' | ||
132 | PERF_SRC ?= "Makefile \ | 136 | PERF_SRC ?= "Makefile \ |
133 | tools/arch \ | 137 | tools/arch \ |
134 | tools/build \ | 138 | tools/build \ |
@@ -139,6 +143,7 @@ PERF_SRC ?= "Makefile \ | |||
139 | tools/scripts \ | 143 | tools/scripts \ |
140 | scripts/ \ | 144 | scripts/ \ |
141 | arch/arm64/tools \ | 145 | arch/arm64/tools \ |
146 | ${PERF_BPF_EVENT_SRC} \ | ||
142 | arch/${ARCH}/Makefile \ | 147 | arch/${ARCH}/Makefile \ |
143 | " | 148 | " |
144 | 149 | ||
@@ -230,14 +235,18 @@ do_configure:prepend () { | |||
230 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then | 235 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then |
231 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ | 236 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
232 | ${S}/tools/perf/Makefile.perf | 237 | ${S}/tools/perf/Makefile.perf |
238 | # Variant with linux-yocto-specific patch | ||
233 | sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ | 239 | sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ |
234 | ${S}/tools/perf/Makefile.perf | 240 | ${S}/tools/perf/Makefile.perf |
241 | # Variant for mainline Linux | ||
242 | sed -i -e "s,root='/\$(DESTDIR_SQ)',prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='/\$(DESTDIR_SQ)',g" \ | ||
243 | ${S}/tools/perf/Makefile.perf | ||
235 | # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 | 244 | # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 |
236 | sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ | 245 | sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ |
237 | ${S}/tools/perf/Makefile.perf | 246 | ${S}/tools/perf/Makefile.perf |
238 | fi | 247 | fi |
239 | sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ | 248 | sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ |
240 | ${S}/tools/perf/Makefile* | 249 | ${S}/tools/perf/Makefile |
241 | 250 | ||
242 | if [ -e "${S}/tools/build/Makefile.build" ]; then | 251 | if [ -e "${S}/tools/build/Makefile.build" ]; then |
243 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ | 252 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
@@ -382,7 +391,7 @@ RDEPENDS:${PN} += "elfutils bash" | |||
382 | RDEPENDS:${PN}-archive =+ "bash" | 391 | RDEPENDS:${PN}-archive =+ "bash" |
383 | RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" | 392 | RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" |
384 | RDEPENDS:${PN}-perl =+ "bash perl perl-modules" | 393 | RDEPENDS:${PN}-perl =+ "bash perl perl-modules" |
385 | RDEPENDS:${PN}-tests =+ "python3 bash" | 394 | RDEPENDS:${PN}-tests =+ "python3 bash perl" |
386 | 395 | ||
387 | RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \ | 396 | RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests \ |
388 | ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \ | 397 | ${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl', '', d)} \ |
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch new file mode 100644 index 0000000000..bfc894563c --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | From cafb4c554845332eeb33284cf6498049997dc67e Mon Sep 17 00:00:00 2001 | ||
2 | From: Mark Thompson <sw@jkqxz.net> | ||
3 | Date: Wed, 20 Mar 2024 20:35:28 +0000 | ||
4 | Subject: [PATCH] lavc/cbs_av1: Save more frame ordering information | ||
5 | |||
6 | This is wanted by the Vulkan decoder. | ||
7 | |||
8 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
9 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] | ||
10 | --- | ||
11 | libavcodec/cbs_av1.h | 5 +++++ | ||
12 | libavcodec/cbs_av1_syntax_template.c | 25 +++++++++++++++++++++---- | ||
13 | 2 files changed, 26 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h | ||
16 | index a5402f069d..a027013bc7 100644 | ||
17 | --- a/libavcodec/cbs_av1.h | ||
18 | +++ b/libavcodec/cbs_av1.h | ||
19 | @@ -427,6 +427,8 @@ typedef struct AV1ReferenceFrameState { | ||
20 | int bit_depth; // RefBitDepth | ||
21 | int order_hint; // RefOrderHint | ||
22 | |||
23 | + int saved_order_hints[AV1_TOTAL_REFS_PER_FRAME]; // SavedOrderHints[ref] | ||
24 | + | ||
25 | int8_t loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME]; | ||
26 | int8_t loop_filter_mode_deltas[2]; | ||
27 | uint8_t feature_enabled[AV1_MAX_SEGMENTS][AV1_SEG_LVL_MAX]; | ||
28 | @@ -464,6 +466,9 @@ typedef struct CodedBitstreamAV1Context { | ||
29 | int tile_rows; | ||
30 | int tile_num; | ||
31 | |||
32 | + int order_hints[AV1_TOTAL_REFS_PER_FRAME]; // OrderHints | ||
33 | + int ref_frame_sign_bias[AV1_TOTAL_REFS_PER_FRAME]; // RefFrameSignBias | ||
34 | + | ||
35 | AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES]; | ||
36 | |||
37 | // AVOptions | ||
38 | diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c | ||
39 | index 3be1f2d30f..2979c5d98f 100644 | ||
40 | --- a/libavcodec/cbs_av1_syntax_template.c | ||
41 | +++ b/libavcodec/cbs_av1_syntax_template.c | ||
42 | @@ -1414,6 +1414,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, | ||
43 | priv->ref[i].valid = 0; | ||
44 | priv->ref[i].order_hint = 0; | ||
45 | } | ||
46 | + for (i = 0; i < AV1_REFS_PER_FRAME; i++) | ||
47 | + priv->order_hints[i + AV1_REF_FRAME_LAST] = 0; | ||
48 | } | ||
49 | |||
50 | flag(disable_cdf_update); | ||
51 | @@ -1568,11 +1570,20 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, | ||
52 | else | ||
53 | flag(use_ref_frame_mvs); | ||
54 | |||
55 | - infer(allow_intrabc, 0); | ||
56 | - } | ||
57 | + for (i = 0; i < AV1_REFS_PER_FRAME; i++) { | ||
58 | + int ref_frame = AV1_REF_FRAME_LAST + i; | ||
59 | + int hint = priv->ref[current->ref_frame_idx[i]].order_hint; | ||
60 | + priv->order_hints[ref_frame] = hint; | ||
61 | + if (!seq->enable_order_hint) { | ||
62 | + priv->ref_frame_sign_bias[ref_frame] = 0; | ||
63 | + } else { | ||
64 | + priv->ref_frame_sign_bias[ref_frame] = | ||
65 | + cbs_av1_get_relative_dist(seq, hint, | ||
66 | + current->order_hint) > 0; | ||
67 | + } | ||
68 | + } | ||
69 | |||
70 | - if (!frame_is_intra) { | ||
71 | - // Derive reference frame sign biases. | ||
72 | + infer(allow_intrabc, 0); | ||
73 | } | ||
74 | |||
75 | if (seq->reduced_still_picture_header || current->disable_cdf_update) | ||
76 | @@ -1674,6 +1685,12 @@ update_refs: | ||
77 | .bit_depth = priv->bit_depth, | ||
78 | .order_hint = priv->order_hint, | ||
79 | }; | ||
80 | + | ||
81 | + for (int j = 0; j < AV1_REFS_PER_FRAME; j++) { | ||
82 | + priv->ref[i].saved_order_hints[j + AV1_REF_FRAME_LAST] = | ||
83 | + priv->order_hints[j + AV1_REF_FRAME_LAST]; | ||
84 | + } | ||
85 | + | ||
86 | memcpy(priv->ref[i].loop_filter_ref_deltas, current->loop_filter_ref_deltas, | ||
87 | sizeof(current->loop_filter_ref_deltas)); | ||
88 | memcpy(priv->ref[i].loop_filter_mode_deltas, current->loop_filter_mode_deltas, | ||
89 | -- | ||
90 | 2.25.1 | ||
91 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch new file mode 100644 index 0000000000..74db148b3b --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch | |||
@@ -0,0 +1,1382 @@ | |||
1 | From ecdc94b97f809d5f2b88640842fd0541951ad295 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lynne <dev@lynne.ee> | ||
3 | Date: Fri, 19 Jan 2024 10:49:02 +1000 | ||
4 | Subject: [PATCH] vulkan_av1: port to the new stable API | ||
5 | |||
6 | Co-Authored-by: Dave Airlie <airlied@redhat.com> | ||
7 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
8 | Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] | ||
9 | --- | ||
10 | configure | 4 +- | ||
11 | libavcodec/Makefile | 5 +- | ||
12 | libavcodec/vulkan_av1.c | 514 ++++++++++-------- | ||
13 | libavcodec/vulkan_decode.c | 31 +- | ||
14 | libavcodec/vulkan_decode.h | 2 +- | ||
15 | libavcodec/vulkan_video.h | 2 - | ||
16 | .../vulkan_video_codec_av1std_decode_mesa.h | 36 -- | ||
17 | libavcodec/vulkan_video_codec_av1std_mesa.h | 403 -------------- | ||
18 | libavutil/hwcontext_vulkan.c | 2 +- | ||
19 | libavutil/vulkan_functions.h | 2 +- | ||
20 | libavutil/vulkan_loader.h | 2 +- | ||
21 | 11 files changed, 306 insertions(+), 697 deletions(-) | ||
22 | delete mode 100644 libavcodec/vulkan_video_codec_av1std_decode_mesa.h | ||
23 | delete mode 100644 libavcodec/vulkan_video_codec_av1std_mesa.h | ||
24 | |||
25 | diff --git a/configure b/configure | ||
26 | index e853deb51d..9fa639fca6 100755 | ||
27 | --- a/configure | ||
28 | +++ b/configure | ||
29 | @@ -7300,8 +7300,8 @@ enabled vdpau && | ||
30 | "in maintaining it." | ||
31 | |||
32 | if enabled vulkan; then | ||
33 | - check_pkg_config_header_only vulkan "vulkan >= 1.3.255" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || | ||
34 | - check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 255)" | ||
35 | + check_pkg_config_header_only vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || | ||
36 | + check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" | ||
37 | fi | ||
38 | |||
39 | if disabled vulkan; then | ||
40 | diff --git a/libavcodec/Makefile b/libavcodec/Makefile | ||
41 | index 7ef2e03ca6..9ce6d445c1 100644 | ||
42 | --- a/libavcodec/Makefile | ||
43 | +++ b/libavcodec/Makefile | ||
44 | @@ -1258,8 +1258,7 @@ SKIPHEADERS += %_tablegen.h \ | ||
45 | aacenc_quantization.h \ | ||
46 | aacenc_quantization_misc.h \ | ||
47 | bitstream_template.h \ | ||
48 | - vulkan_video_codec_av1std.h \ | ||
49 | - $(ARCH)/vpx_arith.h \ | ||
50 | + $(ARCH)/vpx_arith.h \ | ||
51 | |||
52 | SKIPHEADERS-$(CONFIG_AMF) += amfenc.h | ||
53 | SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h | ||
54 | @@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h | ||
55 | SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h | ||
56 | SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h | ||
57 | SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h | ||
58 | -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h | ||
59 | +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h | ||
60 | SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h | ||
61 | SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h | ||
62 | |||
63 | diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c | ||
64 | index 5afd5353cc..c9e398eaec 100644 | ||
65 | --- a/libavcodec/vulkan_av1.c | ||
66 | +++ b/libavcodec/vulkan_av1.c | ||
67 | @@ -36,33 +36,47 @@ const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc = { | ||
68 | typedef struct AV1VulkanDecodePicture { | ||
69 | FFVulkanDecodePicture vp; | ||
70 | |||
71 | - /* Workaround for a spec issue. | ||
72 | - *Can be removed once no longer needed, and threading can be enabled. */ | ||
73 | + /* TODO: investigate if this can be removed to make decoding completely | ||
74 | + * independent. */ | ||
75 | FFVulkanDecodeContext *dec; | ||
76 | |||
77 | - StdVideoAV1MESATile tiles[MAX_TILES]; | ||
78 | - StdVideoAV1MESATileList tile_list; | ||
79 | - const uint32_t *tile_offsets; | ||
80 | + uint32_t tile_sizes[MAX_TILES]; | ||
81 | |||
82 | /* Current picture */ | ||
83 | - VkVideoDecodeAV1DpbSlotInfoMESA vkav1_ref; | ||
84 | - StdVideoAV1MESAFrameHeader av1_frame_header; | ||
85 | - VkVideoDecodeAV1PictureInfoMESA av1_pic_info; | ||
86 | + StdVideoDecodeAV1ReferenceInfo std_ref; | ||
87 | + VkVideoDecodeAV1DpbSlotInfoKHR vkav1_ref; | ||
88 | + uint16_t width_in_sbs_minus1[64]; | ||
89 | + uint16_t height_in_sbs_minus1[64]; | ||
90 | + uint16_t mi_col_starts[64]; | ||
91 | + uint16_t mi_row_starts[64]; | ||
92 | + StdVideoAV1TileInfo tile_info; | ||
93 | + StdVideoAV1Quantization quantization; | ||
94 | + StdVideoAV1Segmentation segmentation; | ||
95 | + StdVideoAV1LoopFilter loop_filter; | ||
96 | + StdVideoAV1CDEF cdef; | ||
97 | + StdVideoAV1LoopRestoration loop_restoration; | ||
98 | + StdVideoAV1GlobalMotion global_motion; | ||
99 | + StdVideoAV1FilmGrain film_grain; | ||
100 | + StdVideoDecodeAV1PictureInfo std_pic_info; | ||
101 | + VkVideoDecodeAV1PictureInfoKHR av1_pic_info; | ||
102 | |||
103 | /* Picture refs */ | ||
104 | const AV1Frame *ref_src [AV1_NUM_REF_FRAMES]; | ||
105 | - VkVideoDecodeAV1DpbSlotInfoMESA vkav1_refs[AV1_NUM_REF_FRAMES]; | ||
106 | + StdVideoDecodeAV1ReferenceInfo std_refs [AV1_NUM_REF_FRAMES]; | ||
107 | + VkVideoDecodeAV1DpbSlotInfoKHR vkav1_refs[AV1_NUM_REF_FRAMES]; | ||
108 | |||
109 | uint8_t frame_id_set; | ||
110 | uint8_t frame_id; | ||
111 | + uint8_t ref_frame_sign_bias_mask; | ||
112 | } AV1VulkanDecodePicture; | ||
113 | |||
114 | static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src, | ||
115 | VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */ | ||
116 | VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */ | ||
117 | - VkVideoDecodeAV1DpbSlotInfoMESA *vkav1_ref, /* Goes in ^ */ | ||
118 | + StdVideoDecodeAV1ReferenceInfo *vkav1_std_ref, | ||
119 | + VkVideoDecodeAV1DpbSlotInfoKHR *vkav1_ref, /* Goes in ^ */ | ||
120 | const AV1Frame *pic, int is_current, int has_grain, | ||
121 | - int dpb_slot_index) | ||
122 | + int *saved_order_hints) | ||
123 | { | ||
124 | FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data; | ||
125 | AV1VulkanDecodePicture *hp = pic->hwaccel_picture_private; | ||
126 | @@ -73,31 +87,42 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src, | ||
127 | if (err < 0) | ||
128 | return err; | ||
129 | |||
130 | - *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoMESA) { | ||
131 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA, | ||
132 | - .frameIdx = hp->frame_id, | ||
133 | + *vkav1_std_ref = (StdVideoDecodeAV1ReferenceInfo) { | ||
134 | + .flags = (StdVideoDecodeAV1ReferenceInfoFlags) { | ||
135 | + .disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf, | ||
136 | + .segmentation_enabled = pic->raw_frame_header->segmentation_enabled, | ||
137 | + }, | ||
138 | + .frame_type = pic->raw_frame_header->frame_type, | ||
139 | + .OrderHint = pic->raw_frame_header->order_hint, | ||
140 | + .RefFrameSignBias = hp->ref_frame_sign_bias_mask, | ||
141 | }; | ||
142 | |||
143 | - for (unsigned i = 0; i < 7; i++) { | ||
144 | - const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
145 | - vkav1_ref->ref_order_hint[i] = pic->raw_frame_header->ref_order_hint[idx]; | ||
146 | - } | ||
147 | + if (saved_order_hints) | ||
148 | + for (int i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++) | ||
149 | + vkav1_std_ref->SavedOrderHints[i] = saved_order_hints[i]; | ||
150 | + | ||
151 | + *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoKHR) { | ||
152 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR, | ||
153 | + .pStdReferenceInfo = vkav1_std_ref, | ||
154 | + }; | ||
155 | |||
156 | - vkav1_ref->disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf; | ||
157 | + vkav1_std_ref->flags.disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf; | ||
158 | + vkav1_std_ref->flags.segmentation_enabled = pic->raw_frame_header->segmentation_enabled; | ||
159 | + vkav1_std_ref->frame_type = pic->raw_frame_header->frame_type; | ||
160 | |||
161 | *ref = (VkVideoPictureResourceInfoKHR) { | ||
162 | .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR, | ||
163 | .codedOffset = (VkOffset2D){ 0, 0 }, | ||
164 | .codedExtent = (VkExtent2D){ pic->f->width, pic->f->height }, | ||
165 | .baseArrayLayer = ((has_grain || dec->dedicated_dpb) && dec->layered_dpb) ? | ||
166 | - dpb_slot_index : 0, | ||
167 | + hp->frame_id : 0, | ||
168 | .imageViewBinding = vkpic->img_view_ref, | ||
169 | }; | ||
170 | |||
171 | *ref_slot = (VkVideoReferenceSlotInfoKHR) { | ||
172 | .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR, | ||
173 | .pNext = vkav1_ref, | ||
174 | - .slotIndex = dpb_slot_index, | ||
175 | + .slotIndex = hp->frame_id, | ||
176 | .pPictureResource = ref, | ||
177 | }; | ||
178 | |||
179 | @@ -115,15 +140,40 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
180 | |||
181 | const AV1RawSequenceHeader *seq = s->raw_seq; | ||
182 | |||
183 | - StdVideoAV1MESASequenceHeader av1_sequence_header; | ||
184 | - VkVideoDecodeAV1SessionParametersAddInfoMESA av1_params_info; | ||
185 | - VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params; | ||
186 | + StdVideoAV1SequenceHeader av1_sequence_header; | ||
187 | + StdVideoAV1TimingInfo av1_timing_info; | ||
188 | + StdVideoAV1ColorConfig av1_color_config; | ||
189 | + VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params; | ||
190 | VkVideoSessionParametersCreateInfoKHR session_params_create; | ||
191 | |||
192 | int err; | ||
193 | |||
194 | - av1_sequence_header = (StdVideoAV1MESASequenceHeader) { | ||
195 | - .flags = (StdVideoAV1MESASequenceHeaderFlags) { | ||
196 | + av1_timing_info = (StdVideoAV1TimingInfo) { | ||
197 | + .flags = (StdVideoAV1TimingInfoFlags) { | ||
198 | + .equal_picture_interval = seq->timing_info.equal_picture_interval, | ||
199 | + }, | ||
200 | + .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick, | ||
201 | + .time_scale = seq->timing_info.time_scale, | ||
202 | + .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1, | ||
203 | + }; | ||
204 | + | ||
205 | + av1_color_config = (StdVideoAV1ColorConfig) { | ||
206 | + .flags = (StdVideoAV1ColorConfigFlags) { | ||
207 | + .mono_chrome = seq->color_config.mono_chrome, | ||
208 | + .color_range = seq->color_config.color_range, | ||
209 | + .separate_uv_delta_q = seq->color_config.separate_uv_delta_q, | ||
210 | + }, | ||
211 | + .BitDepth = seq->color_config.twelve_bit ? 12 : | ||
212 | + seq->color_config.high_bitdepth ? 10 : 8, | ||
213 | + .subsampling_x = seq->color_config.subsampling_x, | ||
214 | + .subsampling_y = seq->color_config.subsampling_y, | ||
215 | + .color_primaries = seq->color_config.color_primaries, | ||
216 | + .transfer_characteristics = seq->color_config.transfer_characteristics, | ||
217 | + .matrix_coefficients = seq->color_config.matrix_coefficients, | ||
218 | + }; | ||
219 | + | ||
220 | + av1_sequence_header = (StdVideoAV1SequenceHeader) { | ||
221 | + .flags = (StdVideoAV1SequenceHeaderFlags) { | ||
222 | .still_picture = seq->still_picture, | ||
223 | .reduced_still_picture_header = seq->reduced_still_picture_header, | ||
224 | .use_128x128_superblock = seq->use_128x128_superblock, | ||
225 | @@ -152,34 +202,15 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf) | ||
226 | .delta_frame_id_length_minus_2 = seq->delta_frame_id_length_minus_2, | ||
227 | .additional_frame_id_length_minus_1 = seq->additional_frame_id_length_minus_1, | ||
228 | .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1, | ||
229 | - .timing_info = (StdVideoAV1MESATimingInfo) { | ||
230 | - .flags = (StdVideoAV1MESATimingInfoFlags) { | ||
231 | - .equal_picture_interval = seq->timing_info.equal_picture_interval, | ||
232 | - }, | ||
233 | - .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick, | ||
234 | - .time_scale = seq->timing_info.time_scale, | ||
235 | - .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1, | ||
236 | - }, | ||
237 | - .color_config = (StdVideoAV1MESAColorConfig) { | ||
238 | - .flags = (StdVideoAV1MESAColorConfigFlags) { | ||
239 | - .mono_chrome = seq->color_config.mono_chrome, | ||
240 | - .color_range = seq->color_config.color_range, | ||
241 | - .separate_uv_delta_q = seq->color_config.separate_uv_delta_q, | ||
242 | - }, | ||
243 | - .bit_depth = seq->color_config.twelve_bit ? 12 : | ||
244 | - seq->color_config.high_bitdepth ? 10 : 8, | ||
245 | - .subsampling_x = seq->color_config.subsampling_x, | ||
246 | - .subsampling_y = seq->color_config.subsampling_y, | ||
247 | - }, | ||
248 | + .seq_force_integer_mv = seq->seq_force_integer_mv, | ||
249 | + .seq_force_screen_content_tools = seq->seq_force_screen_content_tools, | ||
250 | + .pTimingInfo = &av1_timing_info, | ||
251 | + .pColorConfig = &av1_color_config, | ||
252 | }; | ||
253 | |||
254 | - av1_params_info = (VkVideoDecodeAV1SessionParametersAddInfoMESA) { | ||
255 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA, | ||
256 | - .sequence_header = &av1_sequence_header, | ||
257 | - }; | ||
258 | - av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoMESA) { | ||
259 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA, | ||
260 | - .pParametersAddInfo = &av1_params_info, | ||
261 | + av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoKHR) { | ||
262 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
263 | + .pStdSequenceHeader = &av1_sequence_header, | ||
264 | }; | ||
265 | session_params_create = (VkVideoSessionParametersCreateInfoKHR) { | ||
266 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
267 | @@ -211,8 +242,14 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
268 | |||
269 | const AV1RawFrameHeader *frame_header = s->raw_frame_header; | ||
270 | const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain; | ||
271 | + CodedBitstreamAV1Context *cbs_ctx = (CodedBitstreamAV1Context *)(s->cbc->priv_data); | ||
272 | + | ||
273 | const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && | ||
274 | film_grain->apply_grain; | ||
275 | + StdVideoAV1FrameRestorationType remap_lr_type[4] = { STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE, | ||
276 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE, | ||
277 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER, | ||
278 | + STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ }; | ||
279 | |||
280 | if (!dec->session_params) { | ||
281 | err = vk_av1_create_params(avctx, &dec->session_params); | ||
282 | @@ -233,15 +270,31 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
283 | dec->frame_id_alloc_mask |= (1 << slot_idx); | ||
284 | } | ||
285 | |||
286 | - /* Fill in references */ | ||
287 | - for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) { | ||
288 | - const AV1Frame *ref_frame = &s->ref[i]; | ||
289 | - if (s->ref[i].f->pict_type == AV_PICTURE_TYPE_NONE) | ||
290 | + ap->ref_frame_sign_bias_mask = 0x0; | ||
291 | + for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++) | ||
292 | + ap->ref_frame_sign_bias_mask |= cbs_ctx->ref_frame_sign_bias[i] << i; | ||
293 | + | ||
294 | + for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) { | ||
295 | + const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
296 | + const AV1Frame *ref_frame = &s->ref[idx]; | ||
297 | + AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; | ||
298 | + int found = 0; | ||
299 | + | ||
300 | + if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) | ||
301 | + continue; | ||
302 | + | ||
303 | + for (int j = 0; j < ref_count; j++) { | ||
304 | + if (vp->ref_slots[j].slotIndex == hp->frame_id) { | ||
305 | + found = 1; | ||
306 | + break; | ||
307 | + } | ||
308 | + } | ||
309 | + if (found) | ||
310 | continue; | ||
311 | |||
312 | - err = vk_av1_fill_pict(avctx, &ap->ref_src[i], &vp->ref_slots[i], | ||
313 | - &vp->refs[i], &ap->vkav1_refs[i], | ||
314 | - ref_frame, 0, 0, i); | ||
315 | + err = vk_av1_fill_pict(avctx, &ap->ref_src[ref_count], &vp->ref_slots[ref_count], | ||
316 | + &vp->refs[ref_count], &ap->std_refs[ref_count], &ap->vkav1_refs[ref_count], | ||
317 | + ref_frame, 0, 0, cbs_ctx->ref[idx].saved_order_hints); | ||
318 | if (err < 0) | ||
319 | return err; | ||
320 | |||
321 | @@ -249,20 +302,32 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
322 | } | ||
323 | |||
324 | err = vk_av1_fill_pict(avctx, NULL, &vp->ref_slot, &vp->ref, | ||
325 | + &ap->std_ref, | ||
326 | &ap->vkav1_ref, | ||
327 | - pic, 1, apply_grain, 8); | ||
328 | + pic, 1, apply_grain, NULL); | ||
329 | if (err < 0) | ||
330 | return err; | ||
331 | |||
332 | - ap->tile_list.nb_tiles = 0; | ||
333 | - ap->tile_list.tile_list = ap->tiles; | ||
334 | - | ||
335 | - ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoMESA) { | ||
336 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA, | ||
337 | - .frame_header = &ap->av1_frame_header, | ||
338 | - .tile_list = &ap->tile_list, | ||
339 | + ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoKHR) { | ||
340 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR, | ||
341 | + .pStdPictureInfo = &ap->std_pic_info, | ||
342 | + .frameHeaderOffset = 0, | ||
343 | + .tileCount = 0, | ||
344 | + .pTileOffsets = NULL, | ||
345 | + .pTileSizes = ap->tile_sizes, | ||
346 | }; | ||
347 | |||
348 | + for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) { | ||
349 | + const int idx = pic->raw_frame_header->ref_frame_idx[i]; | ||
350 | + const AV1Frame *ref_frame = &s->ref[idx]; | ||
351 | + AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private; | ||
352 | + | ||
353 | + if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE) | ||
354 | + ap->av1_pic_info.referenceNameSlotIndices[i] = -1; | ||
355 | + else | ||
356 | + ap->av1_pic_info.referenceNameSlotIndices[i] = hp->frame_id; | ||
357 | + } | ||
358 | + | ||
359 | vp->decode_info = (VkVideoDecodeInfoKHR) { | ||
360 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR, | ||
361 | .pNext = &ap->av1_pic_info, | ||
362 | @@ -279,9 +344,87 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
363 | }, | ||
364 | }; | ||
365 | |||
366 | + ap->tile_info = (StdVideoAV1TileInfo) { | ||
367 | + .flags = (StdVideoAV1TileInfoFlags) { | ||
368 | + .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag, | ||
369 | + }, | ||
370 | + .TileCols = frame_header->tile_cols, | ||
371 | + .TileRows = frame_header->tile_rows, | ||
372 | + .context_update_tile_id = frame_header->context_update_tile_id, | ||
373 | + .tile_size_bytes_minus_1 = frame_header->tile_size_bytes_minus1, | ||
374 | + .pWidthInSbsMinus1 = ap->width_in_sbs_minus1, | ||
375 | + .pHeightInSbsMinus1 = ap->height_in_sbs_minus1, | ||
376 | + .pMiColStarts = ap->mi_col_starts, | ||
377 | + .pMiRowStarts = ap->mi_row_starts, | ||
378 | + }; | ||
379 | + | ||
380 | + ap->quantization = (StdVideoAV1Quantization) { | ||
381 | + .flags.using_qmatrix = frame_header->using_qmatrix, | ||
382 | + .flags.diff_uv_delta = frame_header->diff_uv_delta, | ||
383 | + .base_q_idx = frame_header->base_q_idx, | ||
384 | + .DeltaQYDc = frame_header->delta_q_y_dc, | ||
385 | + .DeltaQUDc = frame_header->delta_q_u_dc, | ||
386 | + .DeltaQUAc = frame_header->delta_q_u_ac, | ||
387 | + .DeltaQVDc = frame_header->delta_q_v_dc, | ||
388 | + .DeltaQVAc = frame_header->delta_q_v_ac, | ||
389 | + .qm_y = frame_header->qm_y, | ||
390 | + .qm_u = frame_header->qm_u, | ||
391 | + .qm_v = frame_header->qm_v, | ||
392 | + }; | ||
393 | + | ||
394 | + ap->loop_filter = (StdVideoAV1LoopFilter) { | ||
395 | + .flags = (StdVideoAV1LoopFilterFlags) { | ||
396 | + .loop_filter_delta_enabled = frame_header->loop_filter_delta_enabled, | ||
397 | + .loop_filter_delta_update = frame_header->loop_filter_delta_update, | ||
398 | + }, | ||
399 | + .loop_filter_sharpness = frame_header->loop_filter_sharpness, | ||
400 | + }; | ||
401 | + | ||
402 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS; i++) | ||
403 | + ap->loop_filter.loop_filter_level[i] = frame_header->loop_filter_level[i]; | ||
404 | + for (int i = 0; i < STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS; i++) | ||
405 | + ap->loop_filter.loop_filter_mode_deltas[i] = frame_header->loop_filter_mode_deltas[i]; | ||
406 | + | ||
407 | + ap->cdef = (StdVideoAV1CDEF) { | ||
408 | + .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3, | ||
409 | + .cdef_bits = frame_header->cdef_bits, | ||
410 | + }; | ||
411 | + | ||
412 | + ap->loop_restoration = (StdVideoAV1LoopRestoration) { | ||
413 | + .FrameRestorationType[0] = remap_lr_type[frame_header->lr_type[0]], | ||
414 | + .FrameRestorationType[1] = remap_lr_type[frame_header->lr_type[1]], | ||
415 | + .FrameRestorationType[2] = remap_lr_type[frame_header->lr_type[2]], | ||
416 | + .LoopRestorationSize[0] = 1 + frame_header->lr_unit_shift, | ||
417 | + .LoopRestorationSize[1] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift, | ||
418 | + .LoopRestorationSize[2] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift, | ||
419 | + }; | ||
420 | + | ||
421 | + ap->film_grain = (StdVideoAV1FilmGrain) { | ||
422 | + .flags = (StdVideoAV1FilmGrainFlags) { | ||
423 | + .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, | ||
424 | + .overlap_flag = film_grain->overlap_flag, | ||
425 | + .clip_to_restricted_range = film_grain->clip_to_restricted_range, | ||
426 | + }, | ||
427 | + .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8, | ||
428 | + .ar_coeff_lag = film_grain->ar_coeff_lag, | ||
429 | + .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6, | ||
430 | + .grain_scale_shift = film_grain->grain_scale_shift, | ||
431 | + .grain_seed = film_grain->grain_seed, | ||
432 | + .film_grain_params_ref_idx = film_grain->film_grain_params_ref_idx, | ||
433 | + .num_y_points = film_grain->num_y_points, | ||
434 | + .num_cb_points = film_grain->num_cb_points, | ||
435 | + .num_cr_points = film_grain->num_cr_points, | ||
436 | + .cb_mult = film_grain->cb_mult, | ||
437 | + .cb_luma_mult = film_grain->cb_luma_mult, | ||
438 | + .cb_offset = film_grain->cb_offset, | ||
439 | + .cr_mult = film_grain->cr_mult, | ||
440 | + .cr_luma_mult = film_grain->cr_luma_mult, | ||
441 | + .cr_offset = film_grain->cr_offset, | ||
442 | + }; | ||
443 | + | ||
444 | /* Setup frame header */ | ||
445 | - ap->av1_frame_header = (StdVideoAV1MESAFrameHeader) { | ||
446 | - .flags = (StdVideoAV1MESAFrameHeaderFlags) { | ||
447 | + ap->std_pic_info = (StdVideoDecodeAV1PictureInfo) { | ||
448 | + .flags = (StdVideoDecodeAV1PictureInfoFlags) { | ||
449 | .error_resilient_mode = frame_header->error_resilient_mode, | ||
450 | .disable_cdf_update = frame_header->disable_cdf_update, | ||
451 | .use_superres = frame_header->use_superres, | ||
452 | @@ -302,174 +445,92 @@ static int vk_av1_start_frame(AVCodecContext *avctx, | ||
453 | .reference_select = frame_header->reference_select, | ||
454 | .skip_mode_present = frame_header->skip_mode_present, | ||
455 | .delta_q_present = frame_header->delta_q_present, | ||
456 | + .delta_lf_present = frame_header->delta_lf_present, | ||
457 | + .delta_lf_multi = frame_header->delta_lf_multi, | ||
458 | + .segmentation_enabled = frame_header->segmentation_enabled, | ||
459 | + .segmentation_update_map = frame_header->segmentation_update_map, | ||
460 | + .segmentation_temporal_update = frame_header->segmentation_temporal_update, | ||
461 | + .segmentation_update_data = frame_header->segmentation_update_data, | ||
462 | + .UsesLr = frame_header->lr_type[0] || frame_header->lr_type[1] || frame_header->lr_type[2], | ||
463 | + .apply_grain = apply_grain, | ||
464 | }, | ||
465 | - .frame_to_show_map_idx = frame_header->frame_to_show_map_idx, | ||
466 | - .frame_presentation_time = frame_header->frame_presentation_time, | ||
467 | - .display_frame_id = frame_header->display_frame_id, | ||
468 | .frame_type = frame_header->frame_type, | ||
469 | .current_frame_id = frame_header->current_frame_id, | ||
470 | - .order_hint = frame_header->order_hint, | ||
471 | + .OrderHint = frame_header->order_hint, | ||
472 | .primary_ref_frame = frame_header->primary_ref_frame, | ||
473 | - .frame_width_minus_1 = frame_header->frame_width_minus_1, | ||
474 | - .frame_height_minus_1 = frame_header->frame_height_minus_1, | ||
475 | - .coded_denom = frame_header->coded_denom, | ||
476 | - .render_width_minus_1 = frame_header->render_width_minus_1, | ||
477 | - .render_height_minus_1 = frame_header->render_height_minus_1, | ||
478 | .refresh_frame_flags = frame_header->refresh_frame_flags, | ||
479 | .interpolation_filter = frame_header->interpolation_filter, | ||
480 | - .tx_mode = frame_header->tx_mode, | ||
481 | - .tiling = (StdVideoAV1MESATileInfo) { | ||
482 | - .flags = (StdVideoAV1MESATileInfoFlags) { | ||
483 | - .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag, | ||
484 | - }, | ||
485 | - .tile_cols = frame_header->tile_cols, | ||
486 | - .tile_rows = frame_header->tile_rows, | ||
487 | - .context_update_tile_id = frame_header->context_update_tile_id, | ||
488 | - .tile_size_bytes_minus1 = frame_header->tile_size_bytes_minus1, | ||
489 | - }, | ||
490 | - .quantization = (StdVideoAV1MESAQuantization) { | ||
491 | - .flags.using_qmatrix = frame_header->using_qmatrix, | ||
492 | - .base_q_idx = frame_header->base_q_idx, | ||
493 | - .delta_q_y_dc = frame_header->delta_q_y_dc, | ||
494 | - .diff_uv_delta = frame_header->diff_uv_delta, | ||
495 | - .delta_q_u_dc = frame_header->delta_q_u_dc, | ||
496 | - .delta_q_u_ac = frame_header->delta_q_u_ac, | ||
497 | - .delta_q_v_dc = frame_header->delta_q_v_dc, | ||
498 | - .delta_q_v_ac = frame_header->delta_q_v_ac, | ||
499 | - .qm_y = frame_header->qm_y, | ||
500 | - .qm_u = frame_header->qm_u, | ||
501 | - .qm_v = frame_header->qm_v, | ||
502 | - }, | ||
503 | - .delta_q = (StdVideoAV1MESADeltaQ) { | ||
504 | - .flags = (StdVideoAV1MESADeltaQFlags) { | ||
505 | - .delta_lf_present = frame_header->delta_lf_present, | ||
506 | - .delta_lf_multi = frame_header->delta_lf_multi, | ||
507 | - }, | ||
508 | - .delta_q_res = frame_header->delta_q_res, | ||
509 | - .delta_lf_res = frame_header->delta_lf_res, | ||
510 | - }, | ||
511 | - .loop_filter = (StdVideoAV1MESALoopFilter) { | ||
512 | - .flags = (StdVideoAV1MESALoopFilterFlags) { | ||
513 | - .delta_enabled = frame_header->loop_filter_delta_enabled, | ||
514 | - .delta_update = frame_header->loop_filter_delta_update, | ||
515 | - }, | ||
516 | - .level = { | ||
517 | - frame_header->loop_filter_level[0], frame_header->loop_filter_level[1], | ||
518 | - frame_header->loop_filter_level[2], frame_header->loop_filter_level[3], | ||
519 | - }, | ||
520 | - .sharpness = frame_header->loop_filter_sharpness, | ||
521 | - .mode_deltas = { | ||
522 | - frame_header->loop_filter_mode_deltas[0], frame_header->loop_filter_mode_deltas[1], | ||
523 | - }, | ||
524 | - }, | ||
525 | - .cdef = (StdVideoAV1MESACDEF) { | ||
526 | - .damping_minus_3 = frame_header->cdef_damping_minus_3, | ||
527 | - .bits = frame_header->cdef_bits, | ||
528 | - }, | ||
529 | - .lr = (StdVideoAV1MESALoopRestoration) { | ||
530 | - .lr_unit_shift = frame_header->lr_unit_shift, | ||
531 | - .lr_uv_shift = frame_header->lr_uv_shift, | ||
532 | - .lr_type = { frame_header->lr_type[0], frame_header->lr_type[1], frame_header->lr_type[2] }, | ||
533 | - }, | ||
534 | - .segmentation = (StdVideoAV1MESASegmentation) { | ||
535 | - .flags = (StdVideoAV1MESASegmentationFlags) { | ||
536 | - .enabled = frame_header->segmentation_enabled, | ||
537 | - .update_map = frame_header->segmentation_update_map, | ||
538 | - .temporal_update = frame_header->segmentation_temporal_update, | ||
539 | - .update_data = frame_header->segmentation_update_data, | ||
540 | - }, | ||
541 | - }, | ||
542 | - .film_grain = (StdVideoAV1MESAFilmGrainParameters) { | ||
543 | - .flags = (StdVideoAV1MESAFilmGrainFlags) { | ||
544 | - .apply_grain = apply_grain, | ||
545 | - .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma, | ||
546 | - .overlap_flag = film_grain->overlap_flag, | ||
547 | - .clip_to_restricted_range = film_grain->clip_to_restricted_range, | ||
548 | - }, | ||
549 | - .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8, | ||
550 | - .ar_coeff_lag = film_grain->ar_coeff_lag, | ||
551 | - .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6, | ||
552 | - .grain_scale_shift = film_grain->grain_scale_shift, | ||
553 | - .grain_seed = film_grain->grain_seed, | ||
554 | - .num_y_points = film_grain->num_y_points, | ||
555 | - .num_cb_points = film_grain->num_cb_points, | ||
556 | - .num_cr_points = film_grain->num_cr_points, | ||
557 | - .cb_mult = film_grain->cb_mult, | ||
558 | - .cb_luma_mult = film_grain->cb_luma_mult, | ||
559 | - .cb_offset = film_grain->cb_offset, | ||
560 | - .cr_mult = film_grain->cr_mult, | ||
561 | - .cr_luma_mult = film_grain->cr_luma_mult, | ||
562 | - .cr_offset = film_grain->cr_offset, | ||
563 | - }, | ||
564 | + .TxMode = frame_header->tx_mode, | ||
565 | + .delta_q_res = frame_header->delta_q_res, | ||
566 | + .delta_lf_res = frame_header->delta_lf_res, | ||
567 | + .SkipModeFrame[0] = s->cur_frame.skip_mode_frame_idx[0], | ||
568 | + .SkipModeFrame[1] = s->cur_frame.skip_mode_frame_idx[1], | ||
569 | + .coded_denom = frame_header->coded_denom, | ||
570 | + .pTileInfo = &ap->tile_info, | ||
571 | + .pQuantization = &ap->quantization, | ||
572 | + .pSegmentation = &ap->segmentation, | ||
573 | + .pLoopFilter = &ap->loop_filter, | ||
574 | + .pCDEF = &ap->cdef, | ||
575 | + .pLoopRestoration = &ap->loop_restoration, | ||
576 | + .pGlobalMotion = &ap->global_motion, | ||
577 | + .pFilmGrain = apply_grain ? &ap->film_grain : NULL, | ||
578 | }; | ||
579 | |||
580 | for (int i = 0; i < 64; i++) { | ||
581 | - ap->av1_frame_header.tiling.width_in_sbs_minus_1[i] = frame_header->width_in_sbs_minus_1[i]; | ||
582 | - ap->av1_frame_header.tiling.height_in_sbs_minus_1[i] = frame_header->height_in_sbs_minus_1[i]; | ||
583 | - ap->av1_frame_header.tiling.tile_start_col_sb[i] = frame_header->tile_start_col_sb[i]; | ||
584 | - ap->av1_frame_header.tiling.tile_start_row_sb[i] = frame_header->tile_start_row_sb[i]; | ||
585 | + ap->width_in_sbs_minus1[i] = frame_header->width_in_sbs_minus_1[i]; | ||
586 | + ap->height_in_sbs_minus1[i] = frame_header->height_in_sbs_minus_1[i]; | ||
587 | + ap->mi_col_starts[i] = frame_header->tile_start_col_sb[i]; | ||
588 | + ap->mi_row_starts[i] = frame_header->tile_start_row_sb[i]; | ||
589 | } | ||
590 | |||
591 | - for (int i = 0; i < 8; i++) { | ||
592 | - ap->av1_frame_header.segmentation.feature_enabled_bits[i] = 0; | ||
593 | - for (int j = 0; j < 8; j++) { | ||
594 | - ap->av1_frame_header.segmentation.feature_enabled_bits[i] |= (frame_header->feature_enabled[i][j] << j); | ||
595 | - ap->av1_frame_header.segmentation.feature_data[i][j] = frame_header->feature_value[i][j]; | ||
596 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_SEGMENTS; i++) { | ||
597 | + ap->segmentation.FeatureEnabled[i] = 0x0; | ||
598 | + for (int j = 0; j < STD_VIDEO_AV1_SEG_LVL_MAX; j++) { | ||
599 | + ap->segmentation.FeatureEnabled[i] |= (frame_header->feature_enabled[i][j] << j); | ||
600 | + ap->segmentation.FeatureData[i][j] = frame_header->feature_value[i][j]; | ||
601 | } | ||
602 | - | ||
603 | - ap->av1_frame_header.loop_filter.ref_deltas[i] = frame_header->loop_filter_ref_deltas[i]; | ||
604 | - | ||
605 | - ap->av1_frame_header.cdef.y_pri_strength[i] = frame_header->cdef_y_pri_strength[i]; | ||
606 | - ap->av1_frame_header.cdef.y_sec_strength[i] = frame_header->cdef_y_sec_strength[i]; | ||
607 | - ap->av1_frame_header.cdef.uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i]; | ||
608 | - ap->av1_frame_header.cdef.uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i]; | ||
609 | - | ||
610 | - ap->av1_frame_header.ref_order_hint[i] = frame_header->ref_order_hint[i]; | ||
611 | - ap->av1_frame_header.global_motion[i] = (StdVideoAV1MESAGlobalMotion) { | ||
612 | - .flags = (StdVideoAV1MESAGlobalMotionFlags) { | ||
613 | - .gm_invalid = s->cur_frame.gm_invalid[i], | ||
614 | - }, | ||
615 | - .gm_type = s->cur_frame.gm_type[i], | ||
616 | - .gm_params = { | ||
617 | - s->cur_frame.gm_params[i][0], s->cur_frame.gm_params[i][1], | ||
618 | - s->cur_frame.gm_params[i][2], s->cur_frame.gm_params[i][3], | ||
619 | - s->cur_frame.gm_params[i][4], s->cur_frame.gm_params[i][5], | ||
620 | - }, | ||
621 | - }; | ||
622 | } | ||
623 | |||
624 | - for (int i = 0; i < 7; i++) { | ||
625 | - ap->av1_frame_header.ref_frame_idx[i] = frame_header->ref_frame_idx[i]; | ||
626 | - ap->av1_frame_header.delta_frame_id_minus1[i] = frame_header->delta_frame_id_minus1[i]; | ||
627 | + for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++) | ||
628 | + ap->loop_filter.loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i]; | ||
629 | + | ||
630 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS; i++) { | ||
631 | + ap->cdef.cdef_y_pri_strength[i] = frame_header->cdef_y_pri_strength[i]; | ||
632 | + ap->cdef.cdef_y_sec_strength[i] = frame_header->cdef_y_sec_strength[i]; | ||
633 | + ap->cdef.cdef_uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i]; | ||
634 | + ap->cdef.cdef_uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i]; | ||
635 | } | ||
636 | |||
637 | - ap->av1_pic_info.skip_mode_frame_idx[0] = s->cur_frame.skip_mode_frame_idx[0]; | ||
638 | - ap->av1_pic_info.skip_mode_frame_idx[1] = s->cur_frame.skip_mode_frame_idx[1]; | ||
639 | + for (int i = 0; i < STD_VIDEO_AV1_NUM_REF_FRAMES; i++) { | ||
640 | + ap->std_pic_info.OrderHints[i] = frame_header->ref_order_hint[i]; | ||
641 | + ap->global_motion.GmType[i] = s->cur_frame.gm_type[i]; | ||
642 | + for (int j = 0; j < STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS; j++) { | ||
643 | + ap->global_motion.gm_params[i][j] = s->cur_frame.gm_params[i][j]; | ||
644 | + } | ||
645 | + } | ||
646 | |||
647 | if (apply_grain) { | ||
648 | - for (int i = 0; i < 14; i++) { | ||
649 | - ap->av1_frame_header.film_grain.point_y_value[i] = film_grain->point_y_value[i]; | ||
650 | - ap->av1_frame_header.film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i]; | ||
651 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_Y_POINTS; i++) { | ||
652 | + ap->film_grain.point_y_value[i] = film_grain->point_y_value[i]; | ||
653 | + ap->film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i]; | ||
654 | } | ||
655 | |||
656 | - for (int i = 0; i < 10; i++) { | ||
657 | - ap->av1_frame_header.film_grain.point_cb_value[i] = film_grain->point_cb_value[i]; | ||
658 | - ap->av1_frame_header.film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i]; | ||
659 | - ap->av1_frame_header.film_grain.point_cr_value[i] = film_grain->point_cr_value[i]; | ||
660 | - ap->av1_frame_header.film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i]; | ||
661 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_CB_POINTS; i++) { | ||
662 | + ap->film_grain.point_cb_value[i] = film_grain->point_cb_value[i]; | ||
663 | + ap->film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i]; | ||
664 | + ap->film_grain.point_cr_value[i] = film_grain->point_cr_value[i]; | ||
665 | + ap->film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i]; | ||
666 | } | ||
667 | |||
668 | - for (int i = 0; i < 24; i++) { | ||
669 | - ap->av1_frame_header.film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i]; | ||
670 | - ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i]; | ||
671 | - ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i]; | ||
672 | - } | ||
673 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_LUMA; i++) | ||
674 | + ap->film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i]; | ||
675 | |||
676 | - ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[24] = film_grain->ar_coeffs_cb_plus_128[24]; | ||
677 | - ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[24] = film_grain->ar_coeffs_cr_plus_128[24]; | ||
678 | + for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_CHROMA; i++) { | ||
679 | + ap->film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i]; | ||
680 | + ap->film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i]; | ||
681 | + } | ||
682 | } | ||
683 | |||
684 | - /* Workaround for a spec issue. */ | ||
685 | ap->dec = dec; | ||
686 | |||
687 | return 0; | ||
688 | @@ -484,25 +545,20 @@ static int vk_av1_decode_slice(AVCodecContext *avctx, | ||
689 | AV1VulkanDecodePicture *ap = s->cur_frame.hwaccel_picture_private; | ||
690 | FFVulkanDecodePicture *vp = &ap->vp; | ||
691 | |||
692 | + /* Too many tiles, exceeding all defined levels in the AV1 spec */ | ||
693 | + if (ap->av1_pic_info.tileCount > MAX_TILES) | ||
694 | + return AVERROR(ENOSYS); | ||
695 | + | ||
696 | for (int i = s->tg_start; i <= s->tg_end; i++) { | ||
697 | - ap->tiles[ap->tile_list.nb_tiles] = (StdVideoAV1MESATile) { | ||
698 | - .size = s->tile_group_info[i].tile_size, | ||
699 | - .offset = s->tile_group_info[i].tile_offset, | ||
700 | - .row = s->tile_group_info[i].tile_row, | ||
701 | - .column = s->tile_group_info[i].tile_column, | ||
702 | - .tg_start = s->tg_start, | ||
703 | - .tg_end = s->tg_end, | ||
704 | - }; | ||
705 | + ap->tile_sizes[ap->av1_pic_info.tileCount] = s->tile_group_info[i].tile_size; | ||
706 | |||
707 | err = ff_vk_decode_add_slice(avctx, vp, | ||
708 | data + s->tile_group_info[i].tile_offset, | ||
709 | s->tile_group_info[i].tile_size, 0, | ||
710 | - &ap->tile_list.nb_tiles, | ||
711 | - &ap->tile_offsets); | ||
712 | + &ap->av1_pic_info.tileCount, | ||
713 | + &ap->av1_pic_info.pTileOffsets); | ||
714 | if (err < 0) | ||
715 | return err; | ||
716 | - | ||
717 | - ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; | ||
718 | } | ||
719 | |||
720 | return 0; | ||
721 | @@ -518,7 +574,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx) | ||
722 | FFVulkanDecodePicture *rvp[AV1_NUM_REF_FRAMES] = { 0 }; | ||
723 | AVFrame *rav[AV1_NUM_REF_FRAMES] = { 0 }; | ||
724 | |||
725 | - if (!ap->tile_list.nb_tiles) | ||
726 | + if (!ap->av1_pic_info.tileCount) | ||
727 | return 0; | ||
728 | |||
729 | if (!dec->session_params) { | ||
730 | @@ -536,7 +592,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx) | ||
731 | } | ||
732 | |||
733 | av_log(avctx, AV_LOG_VERBOSE, "Decoding frame, %"SIZE_SPECIFIER" bytes, %i tiles\n", | ||
734 | - vp->slices_size, ap->tile_list.nb_tiles); | ||
735 | + vp->slices_size, ap->av1_pic_info.tileCount); | ||
736 | |||
737 | return ff_vk_decode_frame(avctx, pic->f, vp, rav, rvp); | ||
738 | } | ||
739 | @@ -580,8 +636,6 @@ const FFHWAccel ff_av1_vulkan_hwaccel = { | ||
740 | * flexibility, this index cannot be present anywhere. | ||
741 | * The current implementation tracks the index for the driver and submits it | ||
742 | * as necessary information. Due to needing to modify the decoding context, | ||
743 | - * which is not thread-safe, on frame free, threading is disabled. | ||
744 | - * In the future, once this is fixed in the spec, the workarounds may be removed | ||
745 | - * and threading enabled. */ | ||
746 | + * which is not thread-safe, on frame free, threading is disabled. */ | ||
747 | .caps_internal = HWACCEL_CAP_ASYNC_SAFE, | ||
748 | }; | ||
749 | diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c | ||
750 | index 91929d165f..4561f26b62 100644 | ||
751 | --- a/libavcodec/vulkan_decode.c | ||
752 | +++ b/libavcodec/vulkan_decode.c | ||
753 | @@ -61,7 +61,7 @@ static const VkVideoProfileInfoKHR *get_video_profile(FFVulkanDecodeShared *ctx, | ||
754 | VkStructureType profile_struct_type = | ||
755 | codec_id == AV_CODEC_ID_H264 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR : | ||
756 | codec_id == AV_CODEC_ID_HEVC ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR : | ||
757 | - codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA : | ||
758 | + codec_id == AV_CODEC_ID_AV1 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR : | ||
759 | 0; | ||
760 | |||
761 | profile_list = ff_vk_find_struct(ctx->s.hwfc->create_pnext, | ||
762 | @@ -674,7 +674,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
763 | const struct FFVkCodecMap *vk_codec, | ||
764 | VkVideoDecodeH264CapabilitiesKHR *h264_caps, | ||
765 | VkVideoDecodeH265CapabilitiesKHR *h265_caps, | ||
766 | - VkVideoDecodeAV1CapabilitiesMESA *av1_caps, | ||
767 | + VkVideoDecodeAV1CapabilitiesKHR *av1_caps, | ||
768 | VkVideoCapabilitiesKHR *caps, | ||
769 | VkVideoDecodeCapabilitiesKHR *dec_caps, | ||
770 | int cur_profile) | ||
771 | @@ -685,7 +685,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
772 | |||
773 | VkVideoDecodeH264ProfileInfoKHR *h264_profile = &prof->h264_profile; | ||
774 | VkVideoDecodeH265ProfileInfoKHR *h265_profile = &prof->h265_profile; | ||
775 | - VkVideoDecodeAV1ProfileInfoMESA *av1_profile = &prof->av1_profile; | ||
776 | + VkVideoDecodeAV1ProfileInfoKHR *av1_profile = &prof->av1_profile; | ||
777 | |||
778 | const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt); | ||
779 | if (!desc) | ||
780 | @@ -713,8 +713,9 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, | ||
781 | } else if (avctx->codec_id == AV_CODEC_ID_AV1) { | ||
782 | dec_caps->pNext = av1_caps; | ||
783 | usage->pNext = av1_profile; | ||
784 | - av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA; | ||
785 | - av1_profile->stdProfileIdc = cur_profile; | ||
786 | + av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR; | ||
787 | + av1_profile->stdProfile = cur_profile; | ||
788 | + av1_profile->filmGrainSupport = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN); | ||
789 | } | ||
790 | |||
791 | usage->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR; | ||
792 | @@ -769,8 +770,8 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
793 | VkVideoDecodeH265CapabilitiesKHR h265_caps = { | ||
794 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR, | ||
795 | }; | ||
796 | - VkVideoDecodeAV1CapabilitiesMESA av1_caps = { | ||
797 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA, | ||
798 | + VkVideoDecodeAV1CapabilitiesKHR av1_caps = { | ||
799 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR, | ||
800 | }; | ||
801 | |||
802 | VkPhysicalDeviceVideoFormatInfoKHR fmt_info = { | ||
803 | @@ -789,7 +790,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
804 | cur_profile = avctx->profile; | ||
805 | base_profile = avctx->codec_id == AV_CODEC_ID_H264 ? AV_PROFILE_H264_CONSTRAINED_BASELINE : | ||
806 | avctx->codec_id == AV_CODEC_ID_H265 ? AV_PROFILE_HEVC_MAIN : | ||
807 | - avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_MESA_PROFILE_MAIN : | ||
808 | + avctx->codec_id == AV_CODEC_ID_AV1 ? STD_VIDEO_AV1_PROFILE_MAIN : | ||
809 | 0; | ||
810 | |||
811 | ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec, | ||
812 | @@ -837,7 +838,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
813 | |||
814 | max_level = avctx->codec_id == AV_CODEC_ID_H264 ? ff_vk_h264_level_to_av(h264_caps.maxLevelIdc) : | ||
815 | avctx->codec_id == AV_CODEC_ID_H265 ? ff_vk_h265_level_to_av(h265_caps.maxLevelIdc) : | ||
816 | - avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevelIdc : | ||
817 | + avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevel : | ||
818 | 0; | ||
819 | |||
820 | av_log(avctx, AV_LOG_VERBOSE, "Decoder capabilities for %s profile \"%s\":\n", | ||
821 | @@ -908,17 +909,11 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ | ||
822 | "VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR set " | ||
823 | "but VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR is unset!\n"); | ||
824 | return AVERROR_EXTERNAL; | ||
825 | - } else if (!(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR) && | ||
826 | - avctx->codec_id == AV_CODEC_ID_AV1) { | ||
827 | - av_log(avctx, AV_LOG_ERROR, "Cannot initialize Vulkan decoding session, buggy driver: " | ||
828 | - "codec is AV1, but VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR isn't set!\n"); | ||
829 | - return AVERROR_EXTERNAL; | ||
830 | } | ||
831 | |||
832 | /* TODO: make dedicated_dpb tunable */ | ||
833 | dec->dedicated_dpb = !(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR); | ||
834 | dec->layered_dpb = !(caps->flags & VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR); | ||
835 | - dec->external_fg = av1_caps.flags & VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA; | ||
836 | |||
837 | if (dec->dedicated_dpb) { | ||
838 | fmt_info.imageUsage = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR; | ||
839 | @@ -1126,8 +1121,10 @@ int ff_vk_decode_init(AVCodecContext *avctx) | ||
840 | VkVideoDecodeH265SessionParametersCreateInfoKHR h265_params = { | ||
841 | .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
842 | }; | ||
843 | - VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params = { | ||
844 | - .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA, | ||
845 | + StdVideoAV1SequenceHeader av1_empty_seq = { 0 }; | ||
846 | + VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params = { | ||
847 | + .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
848 | + .pStdSequenceHeader = &av1_empty_seq, | ||
849 | }; | ||
850 | VkVideoSessionParametersCreateInfoKHR session_params_create = { | ||
851 | .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
852 | diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h | ||
853 | index a43e328d73..7ba8b239cb 100644 | ||
854 | --- a/libavcodec/vulkan_decode.h | ||
855 | +++ b/libavcodec/vulkan_decode.h | ||
856 | @@ -37,7 +37,7 @@ typedef struct FFVulkanDecodeDescriptor { | ||
857 | typedef struct FFVulkanDecodeProfileData { | ||
858 | VkVideoDecodeH264ProfileInfoKHR h264_profile; | ||
859 | VkVideoDecodeH265ProfileInfoKHR h265_profile; | ||
860 | - VkVideoDecodeAV1ProfileInfoMESA av1_profile; | ||
861 | + VkVideoDecodeAV1ProfileInfoKHR av1_profile; | ||
862 | VkVideoDecodeUsageInfoKHR usage; | ||
863 | VkVideoProfileInfoKHR profile; | ||
864 | VkVideoProfileListInfoKHR profile_list; | ||
865 | diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h | ||
866 | index bb69e920bb..01a1de7d9d 100644 | ||
867 | --- a/libavcodec/vulkan_video.h | ||
868 | +++ b/libavcodec/vulkan_video.h | ||
869 | @@ -22,8 +22,6 @@ | ||
870 | #include "vulkan.h" | ||
871 | |||
872 | #include <vk_video/vulkan_video_codecs_common.h> | ||
873 | -#include "vulkan_video_codec_av1std.h" | ||
874 | -#include "vulkan_video_codec_av1std_decode.h" | ||
875 | |||
876 | #define CODEC_VER_MAJ(ver) (ver >> 22) | ||
877 | #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1)) | ||
878 | diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h | ||
879 | deleted file mode 100644 | ||
880 | index e2f37b4e6e..0000000000 | ||
881 | --- a/libavcodec/vulkan_video_codec_av1std_decode.h | ||
882 | +++ /dev/null | ||
883 | @@ -1,36 +0,0 @@ | ||
884 | -/* Copyright 2023 Lynne | ||
885 | - * Copyright 2023 Dave Airlie | ||
886 | - * | ||
887 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
888 | - * you may not use this file except in compliance with the License. | ||
889 | - * You may obtain a copy of the License at | ||
890 | - * | ||
891 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
892 | - * | ||
893 | - * Unless required by applicable law or agreed to in writing, software | ||
894 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
895 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
896 | - * See the License for the specific language governing permissions and | ||
897 | - * limitations under the License. | ||
898 | - */ | ||
899 | - | ||
900 | -#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ | ||
901 | -#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 | ||
902 | - | ||
903 | -/* | ||
904 | -** This header is NOT YET generated from the Khronos Vulkan XML API Registry. | ||
905 | -** | ||
906 | -*/ | ||
907 | - | ||
908 | -#ifdef __cplusplus | ||
909 | -extern "C" { | ||
910 | -#endif | ||
911 | -#define vulkan_video_codec_av1std_decode 1 | ||
912 | - | ||
913 | - | ||
914 | - | ||
915 | -#ifdef __cplusplus | ||
916 | -} | ||
917 | -#endif | ||
918 | - | ||
919 | -#endif | ||
920 | diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h | ||
921 | deleted file mode 100644 | ||
922 | index c91589eee2..0000000000 | ||
923 | --- a/libavcodec/vulkan_video_codec_av1std.h | ||
924 | +++ /dev/null | ||
925 | @@ -1,403 +0,0 @@ | ||
926 | -/* Copyright 2023 Lynne | ||
927 | - * Copyright 2023 Dave Airlie | ||
928 | - * | ||
929 | - * Licensed under the Apache License, Version 2.0 (the "License"); | ||
930 | - * you may not use this file except in compliance with the License. | ||
931 | - * You may obtain a copy of the License at | ||
932 | - * | ||
933 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
934 | - * | ||
935 | - * Unless required by applicable law or agreed to in writing, software | ||
936 | - * distributed under the License is distributed on an "AS IS" BASIS, | ||
937 | - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
938 | - * See the License for the specific language governing permissions and | ||
939 | - * limitations under the License. | ||
940 | - */ | ||
941 | - | ||
942 | -#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ | ||
943 | -#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 | ||
944 | - | ||
945 | -/* | ||
946 | -** This header is NOT YET generated from the Khronos Vulkan XML API Registry. | ||
947 | -** | ||
948 | -*/ | ||
949 | - | ||
950 | -#ifdef __cplusplus | ||
951 | -extern "C" { | ||
952 | -#endif | ||
953 | -#define vulkan_video_codec_av1std 1 | ||
954 | - | ||
955 | -#define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \ | ||
956 | - ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch))) | ||
957 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 VK_MAKE_VIDEO_STD_VERSION(0, 1, 0) | ||
958 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 | ||
959 | -#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode" | ||
960 | - | ||
961 | -typedef enum StdVideoAV1MESAProfile { | ||
962 | - STD_VIDEO_AV1_MESA_PROFILE_MAIN = 0, | ||
963 | - STD_VIDEO_AV1_MESA_PROFILE_HIGH = 1, | ||
964 | - STD_VIDEO_AV1_MESA_PROFILE_PROFESSIONAL = 2, | ||
965 | -} StdVideoAV1MESAProfile; | ||
966 | - | ||
967 | -typedef enum StdVideoAV1MESALevel { | ||
968 | - STD_VIDEO_AV1_MESA_LEVEL_2_0 = 0, | ||
969 | - STD_VIDEO_AV1_MESA_LEVEL_2_1 = 1, | ||
970 | - STD_VIDEO_AV1_MESA_LEVEL_2_2 = 2, | ||
971 | - STD_VIDEO_AV1_MESA_LEVEL_2_3 = 3, | ||
972 | - STD_VIDEO_AV1_MESA_LEVEL_3_0 = 4, | ||
973 | - STD_VIDEO_AV1_MESA_LEVEL_3_1 = 5, | ||
974 | - STD_VIDEO_AV1_MESA_LEVEL_3_2 = 6, | ||
975 | - STD_VIDEO_AV1_MESA_LEVEL_3_3 = 7, | ||
976 | - STD_VIDEO_AV1_MESA_LEVEL_4_0 = 8, | ||
977 | - STD_VIDEO_AV1_MESA_LEVEL_4_1 = 9, | ||
978 | - STD_VIDEO_AV1_MESA_LEVEL_4_2 = 10, | ||
979 | - STD_VIDEO_AV1_MESA_LEVEL_4_3 = 11, | ||
980 | - STD_VIDEO_AV1_MESA_LEVEL_5_0 = 12, | ||
981 | - STD_VIDEO_AV1_MESA_LEVEL_5_1 = 13, | ||
982 | - STD_VIDEO_AV1_MESA_LEVEL_5_2 = 14, | ||
983 | - STD_VIDEO_AV1_MESA_LEVEL_5_3 = 15, | ||
984 | - STD_VIDEO_AV1_MESA_LEVEL_6_0 = 16, | ||
985 | - STD_VIDEO_AV1_MESA_LEVEL_6_1 = 17, | ||
986 | - STD_VIDEO_AV1_MESA_LEVEL_6_2 = 18, | ||
987 | - STD_VIDEO_AV1_MESA_LEVEL_6_3 = 19, | ||
988 | - STD_VIDEO_AV1_MESA_LEVEL_7_0 = 20, | ||
989 | - STD_VIDEO_AV1_MESA_LEVEL_7_1 = 21, | ||
990 | - STD_VIDEO_AV1_MESA_LEVEL_7_2 = 22, | ||
991 | - STD_VIDEO_AV1_MESA_LEVEL_7_3 = 23, | ||
992 | - STD_VIDEO_AV1_MESA_LEVEL_MAX = 31, | ||
993 | -} StdVideoAV1MESALevel; | ||
994 | - | ||
995 | -typedef struct StdVideoAV1MESAFilmGrainFlags { | ||
996 | - uint8_t apply_grain; | ||
997 | - uint8_t chroma_scaling_from_luma; | ||
998 | - uint8_t overlap_flag; | ||
999 | - uint8_t clip_to_restricted_range; | ||
1000 | -} StdVideoAV1MESAFilmGrainFlags; | ||
1001 | - | ||
1002 | -typedef struct StdVideoAV1MESAFilmGrainParameters { | ||
1003 | - StdVideoAV1MESAFilmGrainFlags flags; | ||
1004 | - uint32_t grain_scaling_minus_8; | ||
1005 | - uint32_t ar_coeff_lag; | ||
1006 | - uint32_t ar_coeff_shift_minus_6; | ||
1007 | - uint32_t grain_scale_shift; | ||
1008 | - | ||
1009 | - uint16_t grain_seed; | ||
1010 | - uint8_t num_y_points; | ||
1011 | - uint8_t point_y_value[14]; | ||
1012 | - uint8_t point_y_scaling[14]; | ||
1013 | - | ||
1014 | - uint8_t num_cb_points; | ||
1015 | - uint8_t point_cb_value[10]; | ||
1016 | - uint8_t point_cb_scaling[10]; | ||
1017 | - | ||
1018 | - uint8_t num_cr_points; | ||
1019 | - uint8_t point_cr_value[10]; | ||
1020 | - uint8_t point_cr_scaling[10]; | ||
1021 | - | ||
1022 | - int8_t ar_coeffs_y_plus_128[24]; | ||
1023 | - int8_t ar_coeffs_cb_plus_128[25]; | ||
1024 | - int8_t ar_coeffs_cr_plus_128[25]; | ||
1025 | - uint8_t cb_mult; | ||
1026 | - uint8_t cb_luma_mult; | ||
1027 | - uint16_t cb_offset; | ||
1028 | - uint8_t cr_mult; | ||
1029 | - uint8_t cr_luma_mult; | ||
1030 | - uint16_t cr_offset; | ||
1031 | -} StdVideoAV1MESAFilmGrainParameters; | ||
1032 | - | ||
1033 | -typedef struct StdVideoAV1MESAGlobalMotionFlags { | ||
1034 | - uint8_t gm_invalid; | ||
1035 | -} StdVideoAV1MESAGlobalMotionFlags; | ||
1036 | - | ||
1037 | -typedef struct StdVideoAV1MESAGlobalMotion { | ||
1038 | - StdVideoAV1MESAGlobalMotionFlags flags; | ||
1039 | - uint8_t gm_type; | ||
1040 | - uint32_t gm_params[6]; | ||
1041 | -} StdVideoAV1MESAGlobalMotion; | ||
1042 | - | ||
1043 | -typedef struct StdVideoAV1MESALoopRestoration { | ||
1044 | - uint8_t lr_type[3]; | ||
1045 | - uint8_t lr_unit_shift; | ||
1046 | - uint8_t lr_uv_shift; | ||
1047 | -} StdVideoAV1MESALoopRestoration; | ||
1048 | - | ||
1049 | -typedef struct StdVideoAV1MESATileInfoFlags { | ||
1050 | - uint8_t uniform_tile_spacing_flag; | ||
1051 | -} StdVideoAV1MESATileInfoFlags; | ||
1052 | - | ||
1053 | -typedef struct StdVideoAV1MESATileInfo { | ||
1054 | - StdVideoAV1MESATileInfoFlags flags; | ||
1055 | - uint8_t tile_cols; | ||
1056 | - uint8_t tile_rows; | ||
1057 | - uint8_t tile_start_col_sb[64]; | ||
1058 | - uint8_t tile_start_row_sb[64]; | ||
1059 | - uint8_t width_in_sbs_minus_1[64]; | ||
1060 | - uint8_t height_in_sbs_minus_1[64]; | ||
1061 | - uint16_t context_update_tile_id; | ||
1062 | - uint8_t tile_size_bytes_minus1; | ||
1063 | -} StdVideoAV1MESATileInfo; | ||
1064 | - | ||
1065 | -typedef struct StdVideoAV1MESAQuantizationFlags { | ||
1066 | - uint8_t using_qmatrix; | ||
1067 | -} StdVideoAV1MESAQuantizationFlags; | ||
1068 | - | ||
1069 | -typedef struct StdVideoAV1MESAQuantization { | ||
1070 | - StdVideoAV1MESAQuantizationFlags flags; | ||
1071 | - uint8_t base_q_idx; | ||
1072 | - int8_t delta_q_y_dc; | ||
1073 | - uint8_t diff_uv_delta; | ||
1074 | - int8_t delta_q_u_dc; | ||
1075 | - int8_t delta_q_u_ac; | ||
1076 | - int8_t delta_q_v_dc; | ||
1077 | - int8_t delta_q_v_ac; | ||
1078 | - uint8_t qm_y; | ||
1079 | - uint8_t qm_u; | ||
1080 | - uint8_t qm_v; | ||
1081 | -} StdVideoAV1MESAQuantization; | ||
1082 | - | ||
1083 | -typedef struct StdVideoAV1MESACDEF { | ||
1084 | - uint8_t damping_minus_3; | ||
1085 | - uint8_t bits; | ||
1086 | - uint8_t y_pri_strength[8]; | ||
1087 | - uint8_t y_sec_strength[8]; | ||
1088 | - uint8_t uv_pri_strength[8]; | ||
1089 | - uint8_t uv_sec_strength[8]; | ||
1090 | -} StdVideoAV1MESACDEF; | ||
1091 | - | ||
1092 | -typedef struct StdVideoAV1MESADeltaQFlags { | ||
1093 | - uint8_t delta_lf_present; | ||
1094 | - uint8_t delta_lf_multi; | ||
1095 | -} StdVideoAV1MESADeltaQFlags; | ||
1096 | - | ||
1097 | -typedef struct StdVideoAV1MESADeltaQ { | ||
1098 | - StdVideoAV1MESADeltaQFlags flags; | ||
1099 | - uint8_t delta_q_res; | ||
1100 | - uint8_t delta_lf_res; | ||
1101 | -} StdVideoAV1MESADeltaQ; | ||
1102 | - | ||
1103 | -typedef struct StdVideoAV1MESASegmentationFlags { | ||
1104 | - uint8_t enabled; | ||
1105 | - uint8_t update_map; | ||
1106 | - uint8_t temporal_update; | ||
1107 | - uint8_t update_data; | ||
1108 | -} StdVideoAV1MESASegmentationFlags; | ||
1109 | - | ||
1110 | -typedef struct StdVideoAV1MESASegmentation { | ||
1111 | - StdVideoAV1MESASegmentationFlags flags; | ||
1112 | - uint8_t feature_enabled_bits[8]; | ||
1113 | - int16_t feature_data[8][8]; | ||
1114 | -} StdVideoAV1MESASegmentation; | ||
1115 | - | ||
1116 | -typedef struct StdVideoAV1MESALoopFilterFlags { | ||
1117 | - uint8_t delta_enabled; | ||
1118 | - uint8_t delta_update; | ||
1119 | -} StdVideoAV1MESALoopFilterFlags; | ||
1120 | - | ||
1121 | -typedef struct StdVideoAV1MESALoopFilter { | ||
1122 | - StdVideoAV1MESALoopFilterFlags flags; | ||
1123 | - uint8_t level[4]; | ||
1124 | - uint8_t sharpness; | ||
1125 | - int8_t ref_deltas[8]; | ||
1126 | - int8_t mode_deltas[2]; | ||
1127 | -} StdVideoAV1MESALoopFilter; | ||
1128 | - | ||
1129 | -typedef struct StdVideoAV1MESAFrameHeaderFlags { | ||
1130 | - uint8_t error_resilient_mode; | ||
1131 | - uint8_t disable_cdf_update; | ||
1132 | - uint8_t use_superres; | ||
1133 | - uint8_t render_and_frame_size_different; | ||
1134 | - uint8_t allow_screen_content_tools; | ||
1135 | - uint8_t is_filter_switchable; | ||
1136 | - uint8_t force_integer_mv; | ||
1137 | - uint8_t frame_size_override_flag; | ||
1138 | - uint8_t buffer_removal_time_present_flag; | ||
1139 | - uint8_t allow_intrabc; | ||
1140 | - uint8_t frame_refs_short_signaling; | ||
1141 | - uint8_t allow_high_precision_mv; | ||
1142 | - uint8_t is_motion_mode_switchable; | ||
1143 | - uint8_t use_ref_frame_mvs; | ||
1144 | - uint8_t disable_frame_end_update_cdf; | ||
1145 | - uint8_t allow_warped_motion; | ||
1146 | - uint8_t reduced_tx_set; | ||
1147 | - uint8_t reference_select; | ||
1148 | - uint8_t skip_mode_present; | ||
1149 | - uint8_t delta_q_present; | ||
1150 | - uint8_t UsesLr; | ||
1151 | -} StdVideoAV1MESAFrameHeaderFlags; | ||
1152 | - | ||
1153 | -typedef struct StdVideoAV1MESAFrameHeader { | ||
1154 | - StdVideoAV1MESAFrameHeaderFlags flags; | ||
1155 | - | ||
1156 | - uint32_t frame_presentation_time; | ||
1157 | - uint32_t display_frame_id; | ||
1158 | - uint32_t current_frame_id; | ||
1159 | - uint8_t frame_to_show_map_idx; | ||
1160 | - uint8_t frame_type; | ||
1161 | - uint8_t order_hint; | ||
1162 | - uint8_t primary_ref_frame; | ||
1163 | - uint16_t frame_width_minus_1; | ||
1164 | - uint16_t frame_height_minus_1; | ||
1165 | - uint16_t render_width_minus_1; | ||
1166 | - uint16_t render_height_minus_1; | ||
1167 | - uint8_t coded_denom; | ||
1168 | - | ||
1169 | - uint8_t refresh_frame_flags; | ||
1170 | - uint8_t ref_order_hint[8]; | ||
1171 | - int8_t ref_frame_idx[7]; | ||
1172 | - uint32_t delta_frame_id_minus1[7]; | ||
1173 | - | ||
1174 | - uint8_t interpolation_filter; | ||
1175 | - uint8_t tx_mode; | ||
1176 | - | ||
1177 | - StdVideoAV1MESATileInfo tiling; | ||
1178 | - StdVideoAV1MESAQuantization quantization; | ||
1179 | - StdVideoAV1MESASegmentation segmentation; | ||
1180 | - StdVideoAV1MESADeltaQ delta_q; | ||
1181 | - StdVideoAV1MESALoopFilter loop_filter; | ||
1182 | - StdVideoAV1MESACDEF cdef; | ||
1183 | - StdVideoAV1MESALoopRestoration lr; | ||
1184 | - StdVideoAV1MESAGlobalMotion global_motion[8]; // One per ref frame | ||
1185 | - StdVideoAV1MESAFilmGrainParameters film_grain; | ||
1186 | -} StdVideoAV1MESAFrameHeader; | ||
1187 | - | ||
1188 | -typedef struct StdVideoAV1MESAScreenCoding { | ||
1189 | - uint8_t seq_force_screen_content_tools; | ||
1190 | -} StdVideoAV1MESAScreenCoding; | ||
1191 | - | ||
1192 | -typedef struct StdVideoAV1MESATimingInfoFlags { | ||
1193 | - uint8_t equal_picture_interval; | ||
1194 | -} StdVideoAV1MESATimingInfoFlags; | ||
1195 | - | ||
1196 | -typedef struct StdVideoAV1MESATimingInfo { | ||
1197 | - StdVideoAV1MESATimingInfoFlags flags; | ||
1198 | - uint32_t num_units_in_display_tick; | ||
1199 | - uint32_t time_scale; | ||
1200 | - uint32_t num_ticks_per_picture_minus_1; | ||
1201 | -} StdVideoAV1MESATimingInfo; | ||
1202 | - | ||
1203 | -typedef struct StdVideoAV1MESAColorConfigFlags { | ||
1204 | - uint8_t mono_chrome; | ||
1205 | - uint8_t color_range; | ||
1206 | - uint8_t separate_uv_delta_q; | ||
1207 | -} StdVideoAV1MESAColorConfigFlags; | ||
1208 | - | ||
1209 | -typedef struct StdVideoAV1MESAColorConfig { | ||
1210 | - StdVideoAV1MESAColorConfigFlags flags; | ||
1211 | - uint8_t bit_depth; | ||
1212 | - uint8_t subsampling_x; | ||
1213 | - uint8_t subsampling_y; | ||
1214 | -} StdVideoAV1MESAColorConfig; | ||
1215 | - | ||
1216 | -typedef struct StdVideoAV1MESASequenceHeaderFlags { | ||
1217 | - uint8_t still_picture; | ||
1218 | - uint8_t reduced_still_picture_header; | ||
1219 | - uint8_t use_128x128_superblock; | ||
1220 | - uint8_t enable_filter_intra; | ||
1221 | - uint8_t enable_intra_edge_filter; | ||
1222 | - uint8_t enable_interintra_compound; | ||
1223 | - uint8_t enable_masked_compound; | ||
1224 | - uint8_t enable_warped_motion; | ||
1225 | - uint8_t enable_dual_filter; | ||
1226 | - uint8_t enable_order_hint; | ||
1227 | - uint8_t enable_jnt_comp; | ||
1228 | - uint8_t enable_ref_frame_mvs; | ||
1229 | - uint8_t frame_id_numbers_present_flag; | ||
1230 | - uint8_t enable_superres; | ||
1231 | - uint8_t enable_cdef; | ||
1232 | - uint8_t enable_restoration; | ||
1233 | - uint8_t film_grain_params_present; | ||
1234 | - uint8_t timing_info_present_flag; | ||
1235 | - uint8_t initial_display_delay_present_flag; | ||
1236 | -} StdVideoAV1MESASequenceHeaderFlags; | ||
1237 | - | ||
1238 | -typedef struct StdVideoAV1MESASequenceHeader { | ||
1239 | - StdVideoAV1MESASequenceHeaderFlags flags; | ||
1240 | - | ||
1241 | - StdVideoAV1MESAProfile seq_profile; | ||
1242 | - uint8_t frame_width_bits_minus_1; | ||
1243 | - uint8_t frame_height_bits_minus_1; | ||
1244 | - uint16_t max_frame_width_minus_1; | ||
1245 | - uint16_t max_frame_height_minus_1; | ||
1246 | - uint8_t delta_frame_id_length_minus_2; | ||
1247 | - uint8_t additional_frame_id_length_minus_1; | ||
1248 | - uint8_t order_hint_bits_minus_1; | ||
1249 | - uint8_t seq_choose_integer_mv; | ||
1250 | - uint8_t seq_force_integer_mv; | ||
1251 | - | ||
1252 | - StdVideoAV1MESATimingInfo timing_info; | ||
1253 | - StdVideoAV1MESAColorConfig color_config; | ||
1254 | -} StdVideoAV1MESASequenceHeader; | ||
1255 | - | ||
1256 | -typedef struct StdVideoAV1MESATile { | ||
1257 | - uint16_t tg_start; | ||
1258 | - uint16_t tg_end; | ||
1259 | - uint16_t row; | ||
1260 | - uint16_t column; | ||
1261 | - uint32_t size; | ||
1262 | - uint32_t offset; | ||
1263 | -} StdVideoAV1MESATile; | ||
1264 | - | ||
1265 | -typedef struct StdVideoAV1MESATileList { | ||
1266 | - StdVideoAV1MESATile *tile_list; | ||
1267 | - uint32_t nb_tiles; | ||
1268 | -} StdVideoAV1MESATileList; | ||
1269 | - | ||
1270 | -typedef struct VkVideoDecodeAV1PictureInfoMESA { | ||
1271 | - VkStructureType sType; | ||
1272 | - const void *pNext; | ||
1273 | - StdVideoAV1MESAFrameHeader *frame_header; | ||
1274 | - StdVideoAV1MESATileList *tile_list; | ||
1275 | - uint8_t skip_mode_frame_idx[2]; | ||
1276 | -} VkVideoDecodeAV1PictureInfoMESA; | ||
1277 | - | ||
1278 | -typedef struct VkVideoDecodeAV1DpbSlotInfoMESA { | ||
1279 | - VkStructureType sType; | ||
1280 | - const void *pNext; | ||
1281 | - uint8_t frameIdx; | ||
1282 | - uint8_t ref_order_hint[7]; | ||
1283 | - uint8_t disable_frame_end_update_cdf; | ||
1284 | -} VkVideoDecodeAV1DpbSlotInfoMESA; | ||
1285 | - | ||
1286 | -typedef struct VkVideoDecodeAV1SessionParametersAddInfoMESA { | ||
1287 | - VkStructureType sType; | ||
1288 | - const void *pNext; | ||
1289 | - StdVideoAV1MESASequenceHeader *sequence_header; | ||
1290 | -} VkVideoDecodeAV1SessionParametersAddInfoMESA; | ||
1291 | - | ||
1292 | -typedef struct VkVideoDecodeAV1SessionParametersCreateInfoMESA { | ||
1293 | - VkStructureType sType; | ||
1294 | - const void *pNext; | ||
1295 | - const VkVideoDecodeAV1SessionParametersAddInfoMESA *pParametersAddInfo; | ||
1296 | -} VkVideoDecodeAV1SessionParametersCreateInfoMESA; | ||
1297 | - | ||
1298 | -typedef struct VkVideoDecodeAV1ProfileInfoMESA { | ||
1299 | - VkStructureType sType; | ||
1300 | - const void *pNext; | ||
1301 | - StdVideoAV1MESAProfile stdProfileIdc; | ||
1302 | -} VkVideoDecodeAV1ProfileInfoMESA; | ||
1303 | - | ||
1304 | -typedef enum VkVideoDecodeAV1CapabilityFlagBitsMESA { | ||
1305 | - VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA = 0x00000001, | ||
1306 | - VK_VIDEO_DECODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_MESA = 0x7FFFFFFF | ||
1307 | -} VkVideoDecodeAV1CapabilityFlagBitsMESA; | ||
1308 | -typedef VkFlags VkVideoDecodeAV1CapabilityFlagsMESA; | ||
1309 | - | ||
1310 | -typedef struct VkVideoDecodeAV1CapabilitiesMESA { | ||
1311 | - VkStructureType sType; | ||
1312 | - const void *pNext; | ||
1313 | - VkVideoDecodeAV1CapabilityFlagsMESA flags; | ||
1314 | - StdVideoAV1MESALevel maxLevelIdc; | ||
1315 | -} VkVideoDecodeAV1CapabilitiesMESA; | ||
1316 | - | ||
1317 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA 1000509000 | ||
1318 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA 1000509001 | ||
1319 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA 1000509002 | ||
1320 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA 1000509003 | ||
1321 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA 1000509004 | ||
1322 | -#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA 1000509005 | ||
1323 | - | ||
1324 | -#ifdef __cplusplus | ||
1325 | -} | ||
1326 | -#endif | ||
1327 | - | ||
1328 | -#endif | ||
1329 | diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c | ||
1330 | index 91b9f96ccf..6e3b96b73a 100644 | ||
1331 | --- a/libavutil/hwcontext_vulkan.c | ||
1332 | +++ b/libavutil/hwcontext_vulkan.c | ||
1333 | @@ -446,7 +446,7 @@ static const VulkanOptExtension optional_device_exts[] = { | ||
1334 | { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE }, | ||
1335 | { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 }, | ||
1336 | { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 }, | ||
1337 | - { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1338 | + { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1339 | }; | ||
1340 | |||
1341 | static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity, | ||
1342 | diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h | ||
1343 | index 65021b04b1..6b379acf93 100644 | ||
1344 | --- a/libavutil/vulkan_functions.h | ||
1345 | +++ b/libavutil/vulkan_functions.h | ||
1346 | @@ -43,7 +43,7 @@ typedef enum FFVulkanExtensions { | ||
1347 | FF_VK_EXT_VIDEO_DECODE_QUEUE = 1ULL << 11, /* VK_KHR_video_decode_queue */ | ||
1348 | FF_VK_EXT_VIDEO_DECODE_H264 = 1ULL << 12, /* VK_EXT_video_decode_h264 */ | ||
1349 | FF_VK_EXT_VIDEO_DECODE_H265 = 1ULL << 13, /* VK_EXT_video_decode_h265 */ | ||
1350 | - FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_MESA_video_decode_av1 */ | ||
1351 | + FF_VK_EXT_VIDEO_DECODE_AV1 = 1ULL << 14, /* VK_KHR_video_decode_av1 */ | ||
1352 | FF_VK_EXT_ATOMIC_FLOAT = 1ULL << 15, /* VK_EXT_shader_atomic_float */ | ||
1353 | FF_VK_EXT_COOP_MATRIX = 1ULL << 16, /* VK_KHR_cooperative_matrix */ | ||
1354 | |||
1355 | diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h | ||
1356 | index f9e739e1e3..73cf03935d 100644 | ||
1357 | --- a/libavutil/vulkan_loader.h | ||
1358 | +++ b/libavutil/vulkan_loader.h | ||
1359 | @@ -58,7 +58,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions, | ||
1360 | { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_QUEUE }, | ||
1361 | { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H264 }, | ||
1362 | { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_H265 }, | ||
1363 | - { "VK_MESA_video_decode_av1", FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1364 | + { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME, FF_VK_EXT_VIDEO_DECODE_AV1 }, | ||
1365 | }; | ||
1366 | |||
1367 | FFVulkanExtensions mask = 0x0; | ||
1368 | diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c | ||
1369 | --- ffmpeg-6.1.1.orig/libavcodec/vulkan_video.c | ||
1370 | +++ ffmpeg-6.1.1/libavcodec/vulkan_video.c | ||
1371 | @@ -37,7 +37,7 @@ const FFVkCodecMap ff_vk_codec_map[AV_CO | ||
1372 | 0, | ||
1373 | 0, | ||
1374 | FF_VK_EXT_VIDEO_DECODE_AV1, | ||
1375 | - 0x01000000 /* TODO fix this */ | ||
1376 | + VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR | ||
1377 | }, | ||
1378 | }; | ||
1379 | |||
1380 | -- | ||
1381 | 2.25.1 | ||
1382 | |||
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb index aa59755034..c0bce2db7a 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb | |||
@@ -22,7 +22,11 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ | 22 | file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ |
23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" | 23 | file://COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" |
24 | 24 | ||
25 | SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz" | 25 | SRC_URI = " \ |
26 | https://www.ffmpeg.org/releases/${BP}.tar.xz \ | ||
27 | file://av1_ordering_info.patch \ | ||
28 | file://vulkan_av1_stable_API.patch \ | ||
29 | " | ||
26 | 30 | ||
27 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" | 31 | SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" |
28 | 32 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bb index 363d12612f..2be406192f 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.11.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] = "0e1ec0d0b8f2d3d314a397399cd01dfc50c02ac088176996f934758119075ea9" | 15 | SRC_URI[sha256sum] = "07766425ecb5bf857ab5ad3962321c55cd89f9386b720843f9df71c0a455eb9b" |
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/gst-examples_1.18.6.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb index 02282ac5d9..70b72fd7fb 100644 --- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb +++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb | |||
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" | |||
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
24 | 24 | ||
25 | do_install:append() { | 25 | do_install:append() { |
26 | install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop | 26 | install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop |
27 | } | 27 | } |
28 | 28 | ||
29 | RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" | 29 | RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bb index 818dbf4e5e..f3287efa96 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.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] = "d6dda7aa38a44173278de675ccd92acff0abf473f7bc02e7d1cdd4ce0f3b7642" | 15 | SRC_URI[sha256sum] = "6b13dcc9332ef27a7c1e7005c0196883874f91622f8aa6e52f218b05b15d2bf5" |
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-omx_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb index 4cb83937dc..97348fb398 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
10 | 10 | ||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "ce0126f6de908df4fa7b12136d47d6840dd9f7131ae997e55a817d96a2728a41" | 13 | SRC_URI[sha256sum] = "18dfdf5f6b773d67e62a315c6cf6247da320b83603a5819493f53c69ed2eeef6" |
14 | 14 | ||
15 | S = "${WORKDIR}/gst-omx-${PV}" | 15 | S = "${WORKDIR}/gst-omx-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb index 70b9850a49..523ee7a5ae 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad | |||
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 | " | 12 | " |
13 | SRC_URI[sha256sum] = "dabcd60c762165bb043eba753d599212514c94684e4db9a2e25484cb6508ebbf" | 13 | SRC_URI[sha256sum] = "808d3b33fc4c71aeb2561c364a87c2e8a3e2343319a83244c8391be4b09499c8" |
14 | 14 | ||
15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch index c922aadede..2adeae93d6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch | |||
@@ -6,7 +6,7 @@ Subject: [PATCH] ssaparse: enhance SSA text lines parsing. | |||
6 | some parser will pass in the original ssa text line which starts with "Dialog:" | 6 | some parser will pass in the original ssa text line which starts with "Dialog:" |
7 | and there's are maybe multiple Dialog lines in one input buffer. | 7 | and there's are maybe multiple Dialog lines in one input buffer. |
8 | 8 | ||
9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/178] |
10 | 10 | ||
11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> | 11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> |
12 | 12 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bb index d4b69b103f..7aa10eb646 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.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] = "843a3a2da28e1ee6aeea56dd2be9bffcc3b4bbcd0f974eba4abfc3aa31f0399c" | 14 | SRC_URI[sha256sum] = "65eaf72296cc5edc985695a4d80affc931e64a79f4879d05615854f7a2cf5bd1" |
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/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch deleted file mode 100644 index 9703a3a889..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 31 Mar 2020 21:23:28 -0700 | ||
4 | Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h | ||
5 | |||
6 | gst/gl/gstglfuncs.h is included via ext/qt/gstqtgl.h which has logic to | ||
7 | prefer qt headers definitions for GLsync | ||
8 | |||
9 | This helps in fixing build errors like below | ||
10 | |||
11 | /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/QtGui/qopengles2ext.h:24:26: error: conflicting declaration 'typedef struct __GLsync* GLsync' | ||
12 | 24 | typedef struct __GLsync *GLsync; | ||
13 | | ^~~~~~ | ||
14 | In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/gstglfuncs.h:84, | ||
15 | from ../gst-plugins-good-1.16.2/ext/qt/gstqsgtexture.cc:30: | ||
16 | /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/gstreamer1.0-plugins-good/1.16.2-r0/recipe-sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: note: previous declaration as 'typedef void* GLsync | ||
17 | ' | ||
18 | 40 | typedef gpointer GLsync; | ||
19 | | ^~~~~~ | ||
20 | |||
21 | Upstream-Status: Pending | ||
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
23 | |||
24 | --- | ||
25 | ext/qt/gstqsgtexture.cc | 2 +- | ||
26 | ext/qt/qtwindow.cc | 2 +- | ||
27 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
28 | |||
29 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc | ||
30 | index 663696b..36b17d4 100644 | ||
31 | --- a/ext/qt/gstqsgtexture.cc | ||
32 | +++ b/ext/qt/gstqsgtexture.cc | ||
33 | @@ -27,7 +27,7 @@ | ||
34 | |||
35 | #include <gst/video/video.h> | ||
36 | #include <gst/gl/gl.h> | ||
37 | -#include <gst/gl/gstglfuncs.h> | ||
38 | +#include <ext/qt/gstqtgl.h> | ||
39 | #include "gstqsgtexture.h" | ||
40 | |||
41 | #define GST_CAT_DEFAULT gst_qsg_texture_debug | ||
42 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc | ||
43 | index 2872cb5..5a36be9 100644 | ||
44 | --- a/ext/qt/qtwindow.cc | ||
45 | +++ b/ext/qt/qtwindow.cc | ||
46 | @@ -25,7 +25,7 @@ | ||
47 | #include <stdio.h> | ||
48 | |||
49 | #include <gst/video/video.h> | ||
50 | -#include <gst/gl/gstglfuncs.h> | ||
51 | +#include <ext/qt/gstqtgl.h> | ||
52 | #include "qtwindow.h" | ||
53 | #include "gstqsgtexture.h" | ||
54 | #include "gstqtglutility.h" | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb index 9a76aaf247..9ce3f73f7c 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb | |||
@@ -5,10 +5,9 @@ HOMEPAGE = "https://gstreamer.freedesktop.org/" | |||
5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" | 5 | BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" |
6 | 6 | ||
7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ | 7 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ |
8 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ | ||
9 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" | 8 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" |
10 | 9 | ||
11 | SRC_URI[sha256sum] = "f748feae922cad62f20102a84ade8f42b78e1e44a34866aa3ea766f9172e1c7f" | 10 | SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2" |
12 | 11 | ||
13 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 12 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
14 | 13 | ||
@@ -52,7 +51,7 @@ PACKAGECONFIG[libpng] = "-Dpng=enabled,-Dpng=disabled,libpng" | |||
52 | PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" | 51 | PACKAGECONFIG[libv4l2] = "-Dv4l2-libv4l2=enabled,-Dv4l2-libv4l2=disabled,v4l-utils" |
53 | PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" | 52 | PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" |
54 | PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" | 53 | PACKAGECONFIG[pulseaudio] = "-Dpulse=enabled,-Dpulse=disabled,pulseaudio" |
55 | PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" | 54 | PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qttools-native ${QT5WAYLANDDEPENDS}" |
56 | PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" | 55 | PACKAGECONFIG[soup2] = "-Dsoup=enabled,,libsoup-2.4,,,soup3" |
57 | PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" | 56 | PACKAGECONFIG[soup3] = "-Dsoup=enabled,,libsoup,,,soup2" |
58 | PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" | 57 | PACKAGECONFIG[speex] = "-Dspeex=enabled,-Dspeex=disabled,speex" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb index 7cbbf9fda0..99f41d4f3d 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.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] = "cc80a81a22c0b3b31ab7f1b8bf18dda23c72d2791b86cc6264923a68336329ea" | 18 | SRC_URI[sha256sum] = "7758b7decfd20c00cae5700822bcbbf03f98c723e33e17634db2e07ca1da60bf" |
19 | 19 | ||
20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | 20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" |
21 | 21 | ||
@@ -25,7 +25,6 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0" | |||
25 | 25 | ||
26 | PACKAGECONFIG ??= " \ | 26 | PACKAGECONFIG ??= " \ |
27 | ${GSTREAMER_ORC} \ | 27 | ${GSTREAMER_ORC} \ |
28 | a52dec mpeg2dec \ | ||
29 | " | 28 | " |
30 | 29 | ||
31 | PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" | 30 | PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bb index b829a0fc62..0fbb03f757 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.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] = "99e37ea9f7163099734f9b0fce361bc67a0e7a65ffba9bc497127506a3fdedb3" | 11 | SRC_URI[sha256sum] = "f7a5450d93fd81bf46060dca7f4a048d095b6717961fec211731a11a994c99a7" |
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.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bb index 0e910e3dc4..554ed9ec8f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.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] = "60eb4f80b5a7ca929c21a61d50be9813a3413787959a5875de56a8ad5ca25f35" | 13 | SRC_URI[sha256sum] = "ec49d474750a6ff6729c85b448abc607fb6840b21717ad7abc967e2adbf07a24" |
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.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bb index b52b7aa4c4..87eb8484a1 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.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] = "094ca144aca8f2c554a2517dfdc421fa37c80294c6f12b992c20cbc73aa2c0bd" | 14 | SRC_URI[sha256sum] = "6eae1360658302b9b512fa46b4d06f5b818dfce5f2f43d7d710ca8142719d8ad" |
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_1.22.10.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bb index 0c944e9e11..8965497d01 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.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] = "969aaef396f252ce925132a4be2aa004e0320f5c1baf0acaaae09c544a6759f4" | 25 | SRC_URI[sha256sum] = "3d16259e9dab8b002c57ce208a09b350d8282f5b0197306c0cdba9a0d0799744" |
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-multimedia/liba52/liba52/buildcleanup.patch b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch deleted file mode 100644 index 5168100f3a..0000000000 --- a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | It makes much more sense to control our own CFLAGS and avoiding fPIC breaks | ||
2 | some arches too. Assume we know what we're doing and remove all the messing | ||
3 | around. | ||
4 | |||
5 | RP 23/2/10 | ||
6 | |||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Index: a52dec-0.7.4/configure.in | ||
10 | =================================================================== | ||
11 | --- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000 | ||
12 | +++ a52dec-0.7.4/configure.in 2010-02-23 14:52:36.000000000 +0000 | ||
13 | @@ -14,62 +14,6 @@ | ||
14 | AC_PROG_CC | ||
15 | AC_PROG_GCC_TRADITIONAL | ||
16 | |||
17 | -if test x"$GCC" = x"yes"; then | ||
18 | - | ||
19 | - dnl GCC-specific flags - try to optimize them sometime | ||
20 | - dnl -Wall -Werror moved to the end to not disturb the configure script | ||
21 | - | ||
22 | - dnl -O3 | ||
23 | - changequote(<<,>>) | ||
24 | - OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"` | ||
25 | - changequote([,]) | ||
26 | - OPT_CFLAGS="$OPT_CFLAGS -O3" | ||
27 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) | ||
28 | - | ||
29 | - dnl -fomit-frame-pointer | ||
30 | - OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" | ||
31 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) | ||
32 | - | ||
33 | - dnl arch-specific flags | ||
34 | - case "$host" in | ||
35 | - i?86-* | k?-*) | ||
36 | - case "$host" in | ||
37 | - i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; | ||
38 | - i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; | ||
39 | - i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; | ||
40 | - i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; | ||
41 | - k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; | ||
42 | - esac | ||
43 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
44 | - sparc-* | sparc64-*) | ||
45 | - OPT_CFLAGS="$CFLAGS -mtune=ultrasparc" | ||
46 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
47 | - mips-sgi-irix6.*) dnl do we need to be that specific ? | ||
48 | - OPT_CFLAGS="$CFLAGS -mabi=64" | ||
49 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
50 | - esac | ||
51 | -elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then | ||
52 | - dnl TenDRA portability checking compiler | ||
53 | - TENDRA=yes | ||
54 | - CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE" | ||
55 | - enable_mlib=no | ||
56 | - enable_oss=no | ||
57 | - enable_solaris_audio=no | ||
58 | -elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then | ||
59 | - dnl Intel C++ compiler | ||
60 | - CFLAGS="-g -O3 -unroll -ip" | ||
61 | -else | ||
62 | - dnl non-gcc flags - we probably need exact configuration triplets here. | ||
63 | - case "$host" in | ||
64 | - mips-sgi-irix6.*) | ||
65 | - OPT_CFLAGS="$CFLAGS -64" | ||
66 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
67 | - sparc-sun-solaris*) | ||
68 | - OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" | ||
69 | - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; | ||
70 | - esac | ||
71 | -fi | ||
72 | - | ||
73 | dnl Checks for libtool - this must be done after we set cflags | ||
74 | AC_DISABLE_SHARED | ||
75 | AC_LIBTOOL_WIN32_DLL | ||
76 | Index: a52dec-0.7.4/liba52/configure.incl | ||
77 | =================================================================== | ||
78 | --- a52dec-0.7.4.orig/liba52/configure.incl 2010-02-23 14:51:44.000000000 +0000 | ||
79 | +++ a52dec-0.7.4/liba52/configure.incl 2010-02-23 14:51:59.000000000 +0000 | ||
80 | @@ -1,9 +1,6 @@ | ||
81 | AC_SUBST([LIBA52_CFLAGS]) | ||
82 | AC_SUBST([LIBA52_LIBS]) | ||
83 | |||
84 | -dnl avoid -fPIC when possible | ||
85 | -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" | ||
86 | - | ||
87 | AC_ARG_ENABLE([double], | ||
88 | [ --enable-double use double-precision samples]) | ||
89 | if test x"$enable_double" = x"yes"; then | ||
diff --git a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/meta/recipes-multimedia/liba52/liba52_0.7.4.bb deleted file mode 100644 index 7a3b4a43c8..0000000000 --- a/meta/recipes-multimedia/liba52/liba52_0.7.4.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | SUMMARY = "ATSC A/52 surround sound stream decoder" | ||
2 | DESCRIPTION = "Library for decoding ATSC A/52 streams. The A/52 standard \ | ||
3 | is used in a variety of applications, including digital television \ | ||
4 | and DVD. It is also known as AC-3." | ||
5 | HOMEPAGE = "http://liba52.sourceforge.net/" | ||
6 | LICENSE = "GPL-2.0-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | ||
8 | file://include/a52.h;beginline=1;endline=12;md5=81152ceb3562bf20a60d1b6018175dd1" | ||
9 | SECTION = "libs" | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | SRC_URI = "http://liba52.sourceforge.net/files/a52dec-${PV}.tar.gz \ | ||
14 | file://buildcleanup.patch" | ||
15 | |||
16 | SRC_URI[md5sum] = "caa9f5bc44232dc8aeea773fea56be80" | ||
17 | SRC_URI[sha256sum] = "a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33" | ||
18 | |||
19 | UPSTREAM_CHECK_URI = "http://liba52.sourceforge.net/downloads.html" | ||
20 | |||
21 | S = "${WORKDIR}/a52dec-${PV}" | ||
22 | |||
23 | EXTRA_OECONF = " --enable-shared " | ||
24 | |||
25 | PACKAGES =+ "a52dec a52dec-doc" | ||
26 | |||
27 | FILES:a52dec = " ${bindir}/* " | ||
28 | FILES:a52dec-doc = " ${mandir}/man1/* " | ||
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.42.bb b/meta/recipes-multimedia/libpng/libpng_1.6.43.bb index cadbe957db..f1febd0a02 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.42.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.43.bb | |||
@@ -10,8 +10,8 @@ DEPENDS = "zlib" | |||
10 | 10 | ||
11 | LIBV = "16" | 11 | LIBV = "16" |
12 | 12 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" | 13 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" |
14 | SRC_URI[sha256sum] = "c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450" | 14 | SRC_URI[sha256sum] = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c" |
15 | 15 | ||
16 | MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/" | 16 | MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/" |
17 | 17 | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch deleted file mode 100644 index b2544cb44d..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch +++ /dev/null | |||
@@ -1,156 +0,0 @@ | |||
1 | From 0cafb99b57f43cf6ac2c6208718e49ad2dbe462d Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Schmidt <thaytan@noraisin.net> | ||
3 | Date: Sun, 10 Nov 2013 00:49:52 +1100 | ||
4 | Subject: [PATCH] Import revision 1206 from upstream to fix PIE build. | ||
5 | |||
6 | Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm | ||
7 | in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad | ||
8 | for shared libraries. Some environments demand that .text actually be | ||
9 | read-only all the time, yet MC_put_o_16_arm etc require that the addresses | ||
10 | be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.) | ||
11 | Even in those environments which permit the dynamic linker to modify the | ||
12 | .text segment, the runtime cost of doing the relocation can be noticeable. | ||
13 | |||
14 | This commit rewrites the linkage, discarding the tables of addresses | ||
15 | in favor of tables of offsets. All transfers are local within each individual | ||
16 | function, so there can be no interference by processing that occurs | ||
17 | after assembly, such as link-time re-ordering (even of individual functions.) | ||
18 | |||
19 | Patch by John Reiser <jreiser@bitwagon.com> | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | Upstream-Status: Backport [https://code.videolan.org/videolan/libmpeg2/commit/946bf4b518aacc224f845e73708f99e394744499] | ||
22 | --- | ||
23 | libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++------------------- | ||
24 | 1 file changed, 33 insertions(+), 37 deletions(-) | ||
25 | |||
26 | diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S | ||
27 | index c921f7c..82143f8 100644 | ||
28 | --- a/libmpeg2/motion_comp_arm_s.S | ||
29 | +++ b/libmpeg2/motion_comp_arm_s.S | ||
30 | @@ -30,9 +30,13 @@ MC_put_o_16_arm: | ||
31 | pld [r1] | ||
32 | stmfd sp!, {r4-r11, lr} @ R14 is also called LR | ||
33 | and r4, r1, #3 | ||
34 | - adr r5, MC_put_o_16_arm_align_jt | ||
35 | - add r5, r5, r4, lsl #2 | ||
36 | - ldr pc, [r5] | ||
37 | + ldrb r4, [pc, r4] | ||
38 | + add pc, pc, r4, lsl #2 | ||
39 | + .byte (MC_put_o_16_arm_align0 - 0f)>>2 | ||
40 | + .byte (MC_put_o_16_arm_align1 - 0f)>>2 | ||
41 | + .byte (MC_put_o_16_arm_align2 - 0f)>>2 | ||
42 | + .byte (MC_put_o_16_arm_align3 - 0f)>>2 | ||
43 | +0: | ||
44 | |||
45 | MC_put_o_16_arm_align0: | ||
46 | ldmia r1, {r4-r7} | ||
47 | @@ -76,11 +80,6 @@ MC_put_o_16_arm_align3: | ||
48 | 1: PROC(24) | ||
49 | bne 1b | ||
50 | ldmfd sp!, {r4-r11, pc} @@ update PC with LR content. | ||
51 | -MC_put_o_16_arm_align_jt: | ||
52 | - .word MC_put_o_16_arm_align0 | ||
53 | - .word MC_put_o_16_arm_align1 | ||
54 | - .word MC_put_o_16_arm_align2 | ||
55 | - .word MC_put_o_16_arm_align3 | ||
56 | |||
57 | @ ---------------------------------------------------------------- | ||
58 | .align | ||
59 | @@ -91,9 +90,14 @@ MC_put_o_8_arm: | ||
60 | pld [r1] | ||
61 | stmfd sp!, {r4-r10, lr} @ R14 is also called LR | ||
62 | and r4, r1, #3 | ||
63 | - adr r5, MC_put_o_8_arm_align_jt | ||
64 | - add r5, r5, r4, lsl #2 | ||
65 | - ldr pc, [r5] | ||
66 | + ldrb r4, [pc, r4] | ||
67 | + add pc, pc, r4, lsl #2 | ||
68 | + .byte (MC_put_o_8_arm_align0 - 0f)>>2 | ||
69 | + .byte (MC_put_o_8_arm_align1 - 0f)>>2 | ||
70 | + .byte (MC_put_o_8_arm_align2 - 0f)>>2 | ||
71 | + .byte (MC_put_o_8_arm_align3 - 0f)>>2 | ||
72 | +0: | ||
73 | + | ||
74 | MC_put_o_8_arm_align0: | ||
75 | ldmia r1, {r4-r5} | ||
76 | add r1, r1, r2 | ||
77 | @@ -135,12 +139,6 @@ MC_put_o_8_arm_align3: | ||
78 | bne 1b | ||
79 | ldmfd sp!, {r4-r10, pc} @@ update PC with LR content. | ||
80 | |||
81 | -MC_put_o_8_arm_align_jt: | ||
82 | - .word MC_put_o_8_arm_align0 | ||
83 | - .word MC_put_o_8_arm_align1 | ||
84 | - .word MC_put_o_8_arm_align2 | ||
85 | - .word MC_put_o_8_arm_align3 | ||
86 | - | ||
87 | @ ---------------------------------------------------------------- | ||
88 | .macro AVG_PW rW1, rW2 | ||
89 | mov \rW2, \rW2, lsl #24 | ||
90 | @@ -160,12 +158,17 @@ MC_put_x_16_arm: | ||
91 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
92 | pld [r1] | ||
93 | stmfd sp!, {r4-r11,lr} @ R14 is also called LR | ||
94 | + ldr r11, 0f | ||
95 | and r4, r1, #3 | ||
96 | - adr r5, MC_put_x_16_arm_align_jt | ||
97 | - ldr r11, [r5] | ||
98 | mvn r12, r11 | ||
99 | - add r5, r5, r4, lsl #2 | ||
100 | - ldr pc, [r5, #4] | ||
101 | + ldrb r4, [pc, r4] | ||
102 | + add pc, pc, r4, lsl #2 | ||
103 | + .byte (MC_put_x_16_arm_align0 - 0f)>>2 | ||
104 | + .byte (MC_put_x_16_arm_align1 - 0f)>>2 | ||
105 | + .byte (MC_put_x_16_arm_align2 - 0f)>>2 | ||
106 | + .byte (MC_put_x_16_arm_align3 - 0f)>>2 | ||
107 | +0: | ||
108 | + .word 0x01010101 | ||
109 | |||
110 | .macro ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4 | ||
111 | mov \R0, \R0, lsr #(\shift) | ||
112 | @@ -238,12 +241,6 @@ MC_put_x_16_arm_align3: | ||
113 | add r0, r0, r2 | ||
114 | bne 1b | ||
115 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. | ||
116 | -MC_put_x_16_arm_align_jt: | ||
117 | - .word 0x01010101 | ||
118 | - .word MC_put_x_16_arm_align0 | ||
119 | - .word MC_put_x_16_arm_align1 | ||
120 | - .word MC_put_x_16_arm_align2 | ||
121 | - .word MC_put_x_16_arm_align3 | ||
122 | |||
123 | @ ---------------------------------------------------------------- | ||
124 | .align | ||
125 | @@ -253,12 +250,17 @@ MC_put_x_8_arm: | ||
126 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
127 | pld [r1] | ||
128 | stmfd sp!, {r4-r11,lr} @ R14 is also called LR | ||
129 | + ldr r11, 0f | ||
130 | and r4, r1, #3 | ||
131 | - adr r5, MC_put_x_8_arm_align_jt | ||
132 | - ldr r11, [r5] | ||
133 | mvn r12, r11 | ||
134 | - add r5, r5, r4, lsl #2 | ||
135 | - ldr pc, [r5, #4] | ||
136 | + ldrb r4, [pc, r4] | ||
137 | + add pc, pc, r4, lsl #2 | ||
138 | + .byte (MC_put_x_8_arm_align0 - 0f)>>2 | ||
139 | + .byte (MC_put_x_8_arm_align1 - 0f)>>2 | ||
140 | + .byte (MC_put_x_8_arm_align2 - 0f)>>2 | ||
141 | + .byte (MC_put_x_8_arm_align3 - 0f)>>2 | ||
142 | +0: | ||
143 | + .word 0x01010101 | ||
144 | |||
145 | .macro ADJ_ALIGN_DW shift, R0, R1, R2 | ||
146 | mov \R0, \R0, lsr #(\shift) | ||
147 | @@ -319,9 +321,3 @@ MC_put_x_8_arm_align3: | ||
148 | add r0, r0, r2 | ||
149 | bne 1b | ||
150 | ldmfd sp!, {r4-r11,pc} @@ update PC with LR content. | ||
151 | -MC_put_x_8_arm_align_jt: | ||
152 | - .word 0x01010101 | ||
153 | - .word MC_put_x_8_arm_align0 | ||
154 | - .word MC_put_x_8_arm_align1 | ||
155 | - .word MC_put_x_8_arm_align2 | ||
156 | - .word MC_put_x_8_arm_align3 | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch deleted file mode 100644 index 5bf68b39ee..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From cbcff58ed670c8edc0be1004384cbe0fd07d8d26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 18:49:21 -0700 | ||
4 | Subject: [PATCH 1/2] check for available arm optimizations | ||
5 | |||
6 | Taken From | ||
7 | http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/65_arm-test-with-compiler.patch/ | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 12 ++++++++---- | ||
14 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index acdcb1e..2c0a721 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -59,7 +59,7 @@ elif test x"$GCC" = x"yes"; then | ||
21 | AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]) | ||
22 | |||
23 | dnl arch-specific flags | ||
24 | - arm_conditional=false | ||
25 | + build_arm_opt=false | ||
26 | case "$host" in | ||
27 | i?86-* | k?-* | x86_64-* | amd64-*) | ||
28 | AC_DEFINE([ARCH_X86],,[x86 architecture]) | ||
29 | @@ -102,8 +102,12 @@ elif test x"$GCC" = x"yes"; then | ||
30 | alpha*) | ||
31 | AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; | ||
32 | arm*) | ||
33 | - arm_conditional=: | ||
34 | - AC_DEFINE([ARCH_ARM],,[ARM architecture]);; | ||
35 | + AC_LANG(C) | ||
36 | + AC_COMPILE_IFELSE( | ||
37 | + [AC_LANG_SOURCE([[ | ||
38 | + void foo(void) { __asm__ volatile("pld [r1]"); }]])], | ||
39 | + build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]), | ||
40 | + build_arm_opt=false);; | ||
41 | esac | ||
42 | elif test x"$CC" = x"tendracc"; then | ||
43 | dnl TenDRA portability checking compiler | ||
44 | @@ -123,7 +127,7 @@ else | ||
45 | esac | ||
46 | fi | ||
47 | |||
48 | -AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) | ||
49 | +AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue) | ||
50 | |||
51 | dnl Checks for libtool - this must be done after we set cflags | ||
52 | AC_LIBTOOL_WIN32_DLL | ||
53 | -- | ||
54 | 2.13.2 | ||
55 | |||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch deleted file mode 100644 index 8301692368..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From f9d9dc92d75f8910e3cd5fdcbea72e505cdf3493 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 5 Jul 2017 19:03:36 -0700 | ||
4 | Subject: [PATCH 2/2] Set visibility of global symbols used in ARM specific | ||
5 | assembly file to internal | ||
6 | |||
7 | Taken from | ||
8 | http://sources.debian.net/src/mpeg2dec/0.5.1-7/debian/patches/60_arm-private-symbols.patch/ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | libmpeg2/motion_comp_arm_s.S | 12 ++++++++---- | ||
15 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S | ||
18 | index f6c3d7d..c921f7c 100644 | ||
19 | --- a/libmpeg2/motion_comp_arm_s.S | ||
20 | +++ b/libmpeg2/motion_comp_arm_s.S | ||
21 | @@ -23,7 +23,8 @@ | ||
22 | |||
23 | @ ---------------------------------------------------------------- | ||
24 | .align | ||
25 | - .global MC_put_o_16_arm | ||
26 | + .global MC_put_o_16_arm | ||
27 | + .internal MC_put_o_16_arm | ||
28 | MC_put_o_16_arm: | ||
29 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
30 | pld [r1] | ||
31 | @@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt: | ||
32 | |||
33 | @ ---------------------------------------------------------------- | ||
34 | .align | ||
35 | - .global MC_put_o_8_arm | ||
36 | + .global MC_put_o_8_arm | ||
37 | + .internal MC_put_o_8_arm | ||
38 | MC_put_o_8_arm: | ||
39 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
40 | pld [r1] | ||
41 | @@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt: | ||
42 | .endm | ||
43 | |||
44 | .align | ||
45 | - .global MC_put_x_16_arm | ||
46 | + .global MC_put_x_16_arm | ||
47 | + .internal MC_put_x_16_arm | ||
48 | MC_put_x_16_arm: | ||
49 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
50 | pld [r1] | ||
51 | @@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt: | ||
52 | |||
53 | @ ---------------------------------------------------------------- | ||
54 | .align | ||
55 | - .global MC_put_x_8_arm | ||
56 | + .global MC_put_x_8_arm | ||
57 | + .internal MC_put_x_8_arm | ||
58 | MC_put_x_8_arm: | ||
59 | @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) | ||
60 | pld [r1] | ||
61 | -- | ||
62 | 2.13.2 | ||
63 | |||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch b/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch deleted file mode 100644 index 00b667d336..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/61_global-symbol-test.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | Rewrite the public symbol check to verify the shared libraries, to check for | ||
2 | more things, and to avoid duplication; fixes make check on ARM | ||
3 | |||
4 | Taken From | ||
5 | https://sources.debian.org/src/mpeg2dec/0.5.1-8/debian/patches/61_global-symbol-test.patch/ | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | test/globals | 42 +++++++++++++++++++++++++++--------------- | ||
12 | 1 file changed, 27 insertions(+), 15 deletions(-) | ||
13 | |||
14 | --- mpeg2dec.orig/test/globals | ||
15 | +++ mpeg2dec/test/globals | ||
16 | @@ -1,4 +1,8 @@ | ||
17 | #!/bin/sh | ||
18 | +# TODO | ||
19 | +# - fix checking of .a libs; problem is that "nm -g --defined-only" lists | ||
20 | +# internal symbols; this can be solved by using objdump, but it's probably | ||
21 | +# good enough to just run the tests on the shared lib | ||
22 | |||
23 | if test x"$srcdir" != x""; then | ||
24 | builddir="." # running from make check, but it does not define that | ||
25 | @@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd` | ||
26 | |||
27 | error=0 | ||
28 | |||
29 | -bad_globals=`nm -g --defined-only $builddir/../libmpeg2/*.o |\ | ||
30 | - awk '{if ($3) print $3}' | grep -v '^_\?mpeg2_'` | ||
31 | - | ||
32 | -if test x"$bad_globals" != x""; then | ||
33 | - echo BAD GLOBAL SYMBOLS: | ||
34 | - for s in $bad_globals; do echo $s; done | ||
35 | +# check_bad_public_symbols <symbol prefix> <lib file> [<lib file>...] | ||
36 | +# | ||
37 | +# checks public symbols in shared libs: | ||
38 | +# - allow prefix_anything | ||
39 | +# - reject _prefixanything | ||
40 | +# - allow _anything | ||
41 | +# - reject anything else | ||
42 | +# | ||
43 | +# NB: skips missing files | ||
44 | +check_bad_public_symbols() { | ||
45 | + symbols_prefix="$1" | ||
46 | + shift | ||
47 | + lib_files=`ls "$@" 2>/dev/null` | ||
48 | + [ -z "$lib_files" ] && return | ||
49 | + bad_globals=`nm -g --defined-only $lib_files | | ||
50 | + awk '{if ($3) print $3}' | | ||
51 | + sed -n "/^${symbols_prefix}_/ d; /^_${symbols_prefix}/ { p; d }; /^_/ d; p"` | ||
52 | + [ -z "$bad_globals" ] && return | ||
53 | error=1 | ||
54 | -fi | ||
55 | - | ||
56 | -bad_globals=`nm -g --defined-only $builddir/../libmpeg2/convert/*.o |\ | ||
57 | - awk '{if ($3) print $3}' | grep -v '^_\?mpeg2convert_'` | ||
58 | + echo BAD GLOBAL SYMBOLS in $lib_files: | ||
59 | + echo "$bad_globals" | ||
60 | +} | ||
61 | |||
62 | -if test x"$bad_globals" != x""; then | ||
63 | - echo BAD GLOBAL SYMBOLS: | ||
64 | - for s in $bad_globals; do echo $s; done | ||
65 | - error=1 | ||
66 | -fi | ||
67 | +check_bad_public_symbols mpeg2 $builddir/../libmpeg2/.libs/libmpeg2.so | ||
68 | +check_bad_public_symbols mpeg2convert $builddir/../libmpeg2/convert/.libs/libmpeg2convert.so | ||
69 | |||
70 | exit $error | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch deleted file mode 100644 index 5113ad44fe..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Add new method to judge whether <altivec.h> is needed | ||
2 | |||
3 | The original logic will use "typedef vector int t;" to judge | ||
4 | whether <altivec.h> is needed. altivec.h contains the following | ||
5 | statement: | ||
6 | |||
7 | #if !defined(__APPLE_ALTIVEC__) | ||
8 | #define vector __vector | ||
9 | #define pixel __pixel | ||
10 | #define bool | ||
11 | #endif | ||
12 | |||
13 | In gcc-4.3.3, __APPLE_ALTIVEC__ is not defined by compiler, neither | ||
14 | as vector, pixel, and bool. In order to make "typedef vector int t;" | ||
15 | pass the compilation, we need to include altivec.h. | ||
16 | |||
17 | However in gcc-4.5.0, __APPLE_ALTIVEC__ is defined by compiler, | ||
18 | so as vector, pixel, and bool. We could not judge whether | ||
19 | altivec.h is needed by "typedef vector int t;". | ||
20 | Here we include another statement "int tmp = __CR6_EQ;", in | ||
21 | which __CR6_EQ is defined in altivec.h. | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
26 | |||
27 | diff -ruN a/configure.in b/configure.in | ||
28 | --- a/configure.ac 2010-09-14 20:55:42.399687663 +0800 | ||
29 | +++ b/configure.ac 2010-09-14 20:56:43.403204648 +0800 | ||
30 | @@ -79,11 +79,11 @@ | ||
31 | CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS" | ||
32 | AC_MSG_CHECKING([if <altivec.h> is needed]) | ||
33 | AC_TRY_COMPILE([], | ||
34 | - [typedef vector int t; | ||
35 | + [typedef vector int t; int tmp = __CR6_EQ; | ||
36 | vec_ld(0, (unsigned char *)0);], | ||
37 | [have_altivec=yes; AC_MSG_RESULT(no)], | ||
38 | [AC_TRY_COMPILE([#include <altivec.h>], | ||
39 | - [typedef vector int t; vec_ld(0, (unsigned char *)0);], | ||
40 | + [typedef vector int t; int tmp = __CR6_EQ; vec_ld(0, (unsigned char *)0);], | ||
41 | [AC_DEFINE([HAVE_ALTIVEC_H],, | ||
42 | [Define to 1 if you have the <altivec.h> header.]) | ||
43 | have_altivec=yes; AC_MSG_RESULT(yes)], | ||
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb deleted file mode 100644 index fd8b561657..0000000000 --- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | SUMMARY = "Library and test program for decoding MPEG-2 and MPEG-1 video streams" | ||
2 | DESCRIPTION = "mpeg2dec is a test program for libmpeg2. It decodes \ | ||
3 | mpeg-1 and mpeg-2 video streams, and also includes a demultiplexer \ | ||
4 | for mpeg-1 and mpeg-2 program streams. The main purpose of mpeg2dec \ | ||
5 | is to have a simple test bed for libmpeg2." | ||
6 | HOMEPAGE = "https://libmpeg2.sourceforge.io/" | ||
7 | SECTION = "libs" | ||
8 | LICENSE = "GPL-2.0-or-later" | ||
9 | LICENSE_FLAGS = "commercial" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
11 | file://include/mpeg2.h;beginline=1;endline=22;md5=7766f4fcb58f0f8413c49a746f2ab89b" | ||
12 | |||
13 | SRC_URI = "http://libmpeg2.sourceforge.net/files/libmpeg2-${PV}.tar.gz \ | ||
14 | file://altivec_h_needed.patch \ | ||
15 | file://0001-check-for-available-arm-optimizations.patch \ | ||
16 | file://0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch \ | ||
17 | file://61_global-symbol-test.patch \ | ||
18 | file://0001-Import-revision-1206-from-upstream-to-fix-PIE-build.patch \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/libmpeg2-${PV}" | ||
22 | |||
23 | SRC_URI[md5sum] = "0f92c7454e58379b4a5a378485bbd8ef" | ||
24 | SRC_URI[sha256sum] = "dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" | ||
25 | |||
26 | UPSTREAM_CHECK_URI = "http://libmpeg2.sourceforge.net/downloads.html" | ||
27 | |||
28 | inherit autotools pkgconfig | ||
29 | |||
30 | EXTRA_OECONF = "--enable-shared --disable-sdl" | ||
31 | |||
32 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | ||
33 | PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxv" | ||
34 | |||
35 | PACKAGES = "mpeg2dec-dbg mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev libmpeg2-staticdev libmpeg2convert-staticdev" | ||
36 | |||
37 | FILES:${PN} = "${bindir}/*" | ||
38 | FILES:libmpeg2 = "${libdir}/libmpeg2.so.*" | ||
39 | FILES:libmpeg2convert = "${libdir}/libmpeg2convert.so.*" | ||
40 | FILES:libmpeg2-dev = "${libdir}/libmpeg2.so \ | ||
41 | ${libdir}/libmpeg2.la \ | ||
42 | ${libdir}/libmpeg2arch.la \ | ||
43 | ${libdir}/pkgconfig/libmpeg2.pc \ | ||
44 | ${includedir}/mpeg2dec/mpeg2.h" | ||
45 | FILES:libmpeg2-staticdev = "${libdir}/libmpeg2.a" | ||
46 | FILES:libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \ | ||
47 | ${libdir}/libmpeg2convert.la \ | ||
48 | ${libdir}/libmpeg2convertarch.la \ | ||
49 | ${libdir}/pkgconfig/libmpeg2convert.pc \ | ||
50 | ${includedir}/mpeg2dec/mpeg2convert.h" | ||
51 | FILES:libmpeg2convert-staticdev = "${libdir}/libmpeg2convert.a" | ||
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.32.5.bb b/meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb index 52526471ef..f7786e8588 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.32.5.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" |
11 | 11 | ||
12 | SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" | 12 | SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" |
13 | SRC_URI[sha256sum] = "af908cdf6cdb6544b97bc706a799f79894e69468af5881bf454a0ebb9171ed63" | 13 | SRC_URI[sha256sum] = "ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ae16056d24..9fb5c81757 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -142,7 +142,7 @@ do_compile:append () { | |||
142 | 142 | ||
143 | do_install:append() { | 143 | do_install:append() { |
144 | install -d ${D}${sysconfdir}/default/volatiles | 144 | install -d ${D}${sysconfdir}/default/volatiles |
145 | install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse | 145 | install -m 0644 ${UNPACKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/04_pulse |
146 | } | 146 | } |
147 | 147 | ||
148 | USERADD_PACKAGES = "pulseaudio-server" | 148 | USERADD_PACKAGES = "pulseaudio-server" |
diff --git a/meta/recipes-multimedia/webp/libwebp_1.3.2.bb b/meta/recipes-multimedia/webp/libwebp_1.4.0.bb index 63b0fd9a6c..d922970479 100644 --- a/meta/recipes-multimedia/webp/libwebp_1.3.2.bb +++ b/meta/recipes-multimedia/webp/libwebp_1.4.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \ | |||
14 | file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" | 14 | file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7" |
15 | 15 | ||
16 | SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" | 16 | SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz" |
17 | SRC_URI[sha256sum] = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4" | 17 | SRC_URI[sha256sum] = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" | 19 | UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" |
20 | 20 | ||
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb index 3777f05b5a..ab178f97e6 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb | |||
@@ -27,7 +27,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -d ${D}${datadir}/matchbox/vfolders/ | 29 | install -d ${D}${datadir}/matchbox/vfolders/ |
30 | install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ | 30 | install -m 0644 ${UNPACKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ |
31 | } | 31 | } |
32 | 32 | ||
33 | FILES:${PN} += "${datadir}/matchbox/vfolders/" | 33 | FILES:${PN} += "${datadir}/matchbox/vfolders/" |
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index 6b70948f16..a1f7862efa 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb | |||
@@ -47,7 +47,7 @@ FILES:${PN}-applet = "${libdir}/matchbox-panel/*.so" | |||
47 | 47 | ||
48 | do_install:append () { | 48 | do_install:append () { |
49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | 49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ |
50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 50 | install -m 755 ${UNPACKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
51 | 51 | ||
52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la | 52 | rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la |
53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la | 53 | rm -f ${D}${libdir}/gtk-3.0/*/immodules/*.la |
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index 0c5ed5e55e..2e463cd7b3 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb | |||
@@ -27,12 +27,14 @@ inherit autotools pkgconfig features_check mime-xdg | |||
27 | REQUIRED_DISTRO_FEATURES = "x11" | 27 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 28 | ||
29 | EXTRA_OECONF = "--with-gtk=3" | 29 | EXTRA_OECONF = "--with-gtk=3" |
30 | # GCC 14 finds extra incompatible pointer type warnings which are treated as errors | ||
31 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
30 | 32 | ||
31 | do_install:append () { | 33 | do_install:append () { |
32 | install -d ${D}/${datadir} | 34 | install -d ${D}/${datadir} |
33 | install -d ${D}/${datadir}/pixmaps/ | 35 | install -d ${D}/${datadir}/pixmaps/ |
34 | 36 | ||
35 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | 37 | install -m 0644 ${UNPACKDIR}/*.png ${D}/${datadir}/pixmaps |
36 | } | 38 | } |
37 | 39 | ||
38 | FILES:${PN} += "${libdir}/pcmanfm" | 40 | FILES:${PN} += "${libdir}/pcmanfm" |
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 016614b19c..95cc140e9e 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | |||
@@ -51,8 +51,8 @@ do_install:append () { | |||
51 | install -d ${D}/${datadir}/applications | 51 | install -d ${D}/${datadir}/applications |
52 | install -d ${D}/${datadir}/pixmaps/ | 52 | install -d ${D}/${datadir}/pixmaps/ |
53 | 53 | ||
54 | install -m 0644 ${WORKDIR}/rxvt.png ${D}/${datadir}/pixmaps | 54 | install -m 0644 ${UNPACKDIR}/rxvt.png ${D}/${datadir}/pixmaps |
55 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications | 55 | install -m 0644 ${UNPACKDIR}/rxvt.desktop ${D}/${datadir}/applications |
56 | 56 | ||
57 | ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ | 57 | ${STAGING_BINDIR_NATIVE}/tic -x ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo || \ |
58 | ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo | 58 | ${STAGING_BINDIR_NATIVE}/tic ${S}/doc/etc/rxvt-unicode.terminfo -o ${D}${datadir}/terminfo |
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index 4bdbefcb75..fb00de9bc9 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | |||
@@ -26,5 +26,5 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
26 | 26 | ||
27 | do_install:append () { | 27 | do_install:append () { |
28 | install -d ${D}/${sysconfdir}/X11/Xsession.d | 28 | install -d ${D}/${sysconfdir}/X11/Xsession.d |
29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 29 | install -m 755 ${UNPACKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
30 | } | 30 | } |
diff --git a/meta/recipes-sato/webkit/libwpe_1.14.2.bb b/meta/recipes-sato/webkit/libwpe_1.16.0.bb index 03ee88193d..57f91ce87e 100644 --- a/meta/recipes-sato/webkit/libwpe_1.14.2.bb +++ b/meta/recipes-sato/webkit/libwpe_1.16.0.bb | |||
@@ -11,7 +11,7 @@ inherit cmake features_check pkgconfig | |||
11 | REQUIRED_DISTRO_FEATURES = "opengl" | 11 | REQUIRED_DISTRO_FEATURES = "opengl" |
12 | 12 | ||
13 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" | 13 | SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" |
14 | SRC_URI[sha256sum] = "8ae38022c50cb340c96fdbee1217f1e46ab57fbc1c8ba98142565abbedbe22ef" | 14 | SRC_URI[sha256sum] = "c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a" |
15 | 15 | ||
16 | # This is a tweak of upstream-version-is-even needed because | 16 | # This is a tweak of upstream-version-is-even needed because |
17 | # ipstream directory contains tarballs for other components as well. | 17 | # ipstream directory contains tarballs for other components as well. |
diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch deleted file mode 100644 index a4ef565db0..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ /dev/null | |||
@@ -1,310 +0,0 @@ | |||
1 | From a180f6821f81c65e320be0cebac72b4dcf86342e Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Perez de Castro <aperez@igalia.com> | ||
3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 | ||
4 | Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems | ||
5 | unused https://bugs.webkit.org/show_bug.cgi?id=241182 | ||
6 | |||
7 | Reviewed by NOBODY (OOPS!). | ||
8 | |||
9 | Move the NEON fast path for the SVG lighting filter effects into | ||
10 | FELightingSoftwareApplier, and arrange to actually use them by | ||
11 | forwarding calls to applyPlatformGeneric() into applyPlatformNeon(). | ||
12 | |||
13 | Some changes were needed to adapt platformApplyNeon() to the current | ||
14 | state of filters after r286140. This was not detected because the code | ||
15 | bitrotted due to it being guarded with CPU(ARM_TRADITIONAL), which does | ||
16 | not get used much these days: CPU(ARM_THUMB2) is more common. It should | ||
17 | be possible to use the NEON fast paths also in Thumb mode, but that is | ||
18 | left for a follow-up fix. | ||
19 | |||
20 | * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp: | ||
21 | (WebCore::FELightingSoftwareApplier::platformApplyNeonWorker): | ||
22 | (WebCore::FELightingSoftwareApplier::getPowerCoefficients): | ||
23 | (WebCore::FELighting::platformApplyNeonWorker): Deleted. | ||
24 | (WebCore::FELighting::getPowerCoefficients): Deleted. | ||
25 | * Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h: | ||
26 | (WebCore::FELightingSoftwareApplier::applyPlatformNeon): | ||
27 | (WebCore::FELighting::platformApplyNeon): Deleted. | ||
28 | * Source/WebCore/platform/graphics/filters/DistantLightSource.h: | ||
29 | * Source/WebCore/platform/graphics/filters/FELighting.h: | ||
30 | * Source/WebCore/platform/graphics/filters/PointLightSource.h: | ||
31 | * Source/WebCore/platform/graphics/filters/SpotLightSource.h: | ||
32 | * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: | ||
33 | |||
34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] | ||
35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
36 | --- | ||
37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- | ||
38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- | ||
39 | .../graphics/filters/DistantLightSource.h | 4 ++ | ||
40 | .../platform/graphics/filters/FELighting.h | 7 --- | ||
41 | .../graphics/filters/PointLightSource.h | 4 ++ | ||
42 | .../graphics/filters/SpotLightSource.h | 4 ++ | ||
43 | .../software/FELightingSoftwareApplier.h | 16 ++++++ | ||
44 | 7 files changed, 56 insertions(+), 35 deletions(-) | ||
45 | |||
46 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | ||
47 | index f6ff8c20..42a97ffc 100644 | ||
48 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | ||
49 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | ||
50 | @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() | ||
51 | return s_FELightingConstantsForNeon; | ||
52 | } | ||
53 | |||
54 | -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) | ||
55 | +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) | ||
56 | { | ||
57 | neonDrawLighting(parameters); | ||
58 | } | ||
59 | @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL | ||
60 | "b .lightStrengthCalculated" NL | ||
61 | ); // NOLINT | ||
62 | |||
63 | -int FELighting::getPowerCoefficients(float exponent) | ||
64 | +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) | ||
65 | { | ||
66 | // Calling a powf function from the assembly code would require to save | ||
67 | // and reload a lot of NEON registers. Since the base is in range [0..1] | ||
68 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
69 | index b17c603d..e4629cda 100644 | ||
70 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
71 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
72 | @@ -24,14 +24,15 @@ | ||
73 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
74 | */ | ||
75 | |||
76 | -#ifndef FELightingNEON_h | ||
77 | -#define FELightingNEON_h | ||
78 | +#pragma once | ||
79 | |||
80 | #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) | ||
81 | |||
82 | -#include "FELighting.h" | ||
83 | +#include "FELightingSoftwareApplier.h" | ||
84 | +#include "ImageBuffer.h" | ||
85 | #include "PointLightSource.h" | ||
86 | #include "SpotLightSource.h" | ||
87 | +#include <wtf/ObjectIdentifier.h> | ||
88 | #include <wtf/ParallelJobs.h> | ||
89 | |||
90 | namespace WebCore { | ||
91 | @@ -93,14 +94,14 @@ extern "C" { | ||
92 | void neonDrawLighting(FELightingPaintingDataForNeon*); | ||
93 | } | ||
94 | |||
95 | -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) | ||
96 | +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) | ||
97 | { | ||
98 | - alignas(16) FELightingFloatArgumentsForNeon floatArguments; | ||
99 | - FELightingPaintingDataForNeon neonData = { | ||
100 | + WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; | ||
101 | + WebCore::FELightingPaintingDataForNeon neonData = { | ||
102 | data.pixels->data(), | ||
103 | 1, | ||
104 | - data.widthDecreasedByOne - 1, | ||
105 | - data.heightDecreasedByOne - 1, | ||
106 | + data.width - 2, | ||
107 | + data.height - 2, | ||
108 | 0, | ||
109 | 0, | ||
110 | 0, | ||
111 | @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS | ||
112 | // Set light source arguments. | ||
113 | floatArguments.constOne = 1; | ||
114 | |||
115 | - auto color = m_lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); | ||
116 | + auto color = data.lightingColor.toColorTypeLossy<SRGBA<uint8_t>>().resolved(); | ||
117 | |||
118 | floatArguments.colorRed = color.red; | ||
119 | floatArguments.colorGreen = color.green; | ||
120 | floatArguments.colorBlue = color.blue; | ||
121 | floatArguments.padding4 = 0; | ||
122 | |||
123 | - if (m_lightSource->type() == LS_POINT) { | ||
124 | + if (data.lightSource->type() == LS_POINT) { | ||
125 | neonData.flags |= FLAG_POINT_LIGHT; | ||
126 | - PointLightSource& pointLightSource = static_cast<PointLightSource&>(m_lightSource.get()); | ||
127 | + const auto& pointLightSource = *static_cast<const PointLightSource*>(data.lightSource); | ||
128 | floatArguments.lightX = pointLightSource.position().x(); | ||
129 | floatArguments.lightY = pointLightSource.position().y(); | ||
130 | floatArguments.lightZ = pointLightSource.position().z(); | ||
131 | floatArguments.padding2 = 0; | ||
132 | - } else if (m_lightSource->type() == LS_SPOT) { | ||
133 | + } else if (data.lightSource->type() == LS_SPOT) { | ||
134 | neonData.flags |= FLAG_SPOT_LIGHT; | ||
135 | - SpotLightSource& spotLightSource = static_cast<SpotLightSource&>(m_lightSource.get()); | ||
136 | + const auto& spotLightSource = *static_cast<const SpotLightSource*>(data.lightSource); | ||
137 | floatArguments.lightX = spotLightSource.position().x(); | ||
138 | floatArguments.lightY = spotLightSource.position().y(); | ||
139 | floatArguments.lightZ = spotLightSource.position().z(); | ||
140 | @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS | ||
141 | if (spotLightSource.specularExponent() == 1) | ||
142 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; | ||
143 | } else { | ||
144 | - ASSERT(m_lightSource->type() == LS_DISTANT); | ||
145 | + ASSERT(data.lightSource->type() == LS_DISTANT); | ||
146 | floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); | ||
147 | floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); | ||
148 | floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); | ||
149 | @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS | ||
150 | // Set lighting arguments. | ||
151 | floatArguments.surfaceScale = data.surfaceScale; | ||
152 | floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; | ||
153 | - if (m_lightingType == FELighting::DiffuseLighting) | ||
154 | - floatArguments.diffuseConstant = m_diffuseConstant; | ||
155 | + if (data.filterType == FilterEffect::Type::FEDiffuseLighting) | ||
156 | + floatArguments.diffuseConstant = data.diffuseConstant; | ||
157 | else { | ||
158 | neonData.flags |= FLAG_SPECULAR_LIGHT; | ||
159 | - floatArguments.diffuseConstant = m_specularConstant; | ||
160 | - neonData.specularExponent = getPowerCoefficients(m_specularExponent); | ||
161 | - if (m_specularExponent == 1) | ||
162 | + floatArguments.diffuseConstant = data.specularConstant; | ||
163 | + neonData.specularExponent = getPowerCoefficients(data.specularExponent); | ||
164 | + if (data.specularExponent == 1) | ||
165 | neonData.flags |= FLAG_SPECULAR_EXPONENT_IS_1; | ||
166 | } | ||
167 | if (floatArguments.diffuseConstant == 1) | ||
168 | neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; | ||
169 | |||
170 | - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; | ||
171 | + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs | ||
172 | + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; | ||
173 | if (optimalThreadNumber > 1) { | ||
174 | // Initialize parallel jobs | ||
175 | - ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); | ||
176 | + ParallelJobs<FELightingPaintingDataForNeon> parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); | ||
177 | |||
178 | // Fill the parameter array | ||
179 | int job = parallelJobs.numberOfJobs(); | ||
180 | if (job > 1) { | ||
181 | int yStart = 1; | ||
182 | - int yStep = (data.heightDecreasedByOne - 1) / job; | ||
183 | + int yStep = (data.height - 2) / job; | ||
184 | for (--job; job >= 0; --job) { | ||
185 | FELightingPaintingDataForNeon& params = parallelJobs.parameter(job); | ||
186 | params = neonData; | ||
187 | params.yStart = yStart; | ||
188 | - params.pixels += (yStart - 1) * (data.widthDecreasedByOne + 1) * 4; | ||
189 | + params.pixels += (yStart - 1) * data.width * 4; | ||
190 | if (job > 0) { | ||
191 | params.absoluteHeight = yStep; | ||
192 | yStart += yStep; | ||
193 | } else | ||
194 | - params.absoluteHeight = data.heightDecreasedByOne - yStart; | ||
195 | + params.absoluteHeight = (data.height - 1) - yStart; | ||
196 | } | ||
197 | parallelJobs.execute(); | ||
198 | return; | ||
199 | @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS | ||
200 | } // namespace WebCore | ||
201 | |||
202 | #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) | ||
203 | - | ||
204 | -#endif // FELightingNEON_h | ||
205 | diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | ||
206 | index 70f583b3..7d5d27e5 100644 | ||
207 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h | ||
208 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | ||
209 | @@ -26,6 +26,10 @@ | ||
210 | #include <wtf/ArgumentCoder.h> | ||
211 | #include <wtf/Ref.h> | ||
212 | |||
213 | +namespace WTF { | ||
214 | +class TextStream; | ||
215 | +} // namespace WTF | ||
216 | + | ||
217 | namespace WebCore { | ||
218 | |||
219 | class DistantLightSource : public LightSource { | ||
220 | diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h | ||
221 | index 179edf6d..694d712d 100644 | ||
222 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h | ||
223 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h | ||
224 | @@ -35,8 +35,6 @@ | ||
225 | |||
226 | namespace WebCore { | ||
227 | |||
228 | -struct FELightingPaintingDataForNeon; | ||
229 | - | ||
230 | class FELighting : public FilterEffect { | ||
231 | public: | ||
232 | bool operator==(const FELighting&) const; | ||
233 | @@ -68,11 +66,6 @@ protected: | ||
234 | |||
235 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; | ||
236 | |||
237 | -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) | ||
238 | - static int getPowerCoefficients(float exponent); | ||
239 | - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); | ||
240 | -#endif | ||
241 | - | ||
242 | Color m_lightingColor; | ||
243 | float m_surfaceScale; | ||
244 | float m_diffuseConstant; | ||
245 | diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h | ||
246 | index a8cfdab8..34f867bb 100644 | ||
247 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h | ||
248 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h | ||
249 | @@ -26,6 +26,10 @@ | ||
250 | #include "LightSource.h" | ||
251 | #include <wtf/Ref.h> | ||
252 | |||
253 | +namespace WTF { | ||
254 | +class TextStream; | ||
255 | +} // namespace WTF | ||
256 | + | ||
257 | namespace WebCore { | ||
258 | |||
259 | class PointLightSource : public LightSource { | ||
260 | diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | ||
261 | index 6404467a..5cac38f2 100644 | ||
262 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h | ||
263 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | ||
264 | @@ -26,6 +26,10 @@ | ||
265 | #include "LightSource.h" | ||
266 | #include <wtf/Ref.h> | ||
267 | |||
268 | +namespace WTF { | ||
269 | +class TextStream; | ||
270 | +} // namespace WTF | ||
271 | + | ||
272 | namespace WebCore { | ||
273 | |||
274 | class SpotLightSource : public LightSource { | ||
275 | diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | ||
276 | index c974d921..e2896660 100644 | ||
277 | --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | ||
278 | +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | ||
279 | @@ -36,6 +36,7 @@ | ||
280 | namespace WebCore { | ||
281 | |||
282 | class FELighting; | ||
283 | +struct FELightingPaintingDataForNeon; | ||
284 | |||
285 | class FELightingSoftwareApplier final : public FilterEffectConcreteApplier<FELighting> { | ||
286 | WTF_MAKE_FAST_ALLOCATED; | ||
287 | @@ -132,8 +133,23 @@ private: | ||
288 | |||
289 | static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); | ||
290 | static void applyPlatformGenericWorker(ApplyParameters*); | ||
291 | + | ||
292 | +#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) | ||
293 | + static int getPowerCoefficients(float exponent); | ||
294 | + static void platformApplyNeonWorker(FELightingPaintingDataForNeon*); | ||
295 | + inline static void applyPlatformNeon(const LightingData&, const LightSource::PaintingData&); | ||
296 | + | ||
297 | + inline static void applyPlatformGeneric(const LightingData& data, const LightSource::PaintingData& paintingData) | ||
298 | + { | ||
299 | + applyPlatformNeon(data, paintingData); | ||
300 | + } | ||
301 | +#else | ||
302 | static void applyPlatformGeneric(const LightingData&, const LightSource::PaintingData&); | ||
303 | +#endif | ||
304 | + | ||
305 | static void applyPlatform(const LightingData&); | ||
306 | }; | ||
307 | |||
308 | } // namespace WebCore | ||
309 | + | ||
310 | +#include "FELightingNEON.h" | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch new file mode 100644 index 0000000000..76bcb3df99 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Devoogdt <thomas.devoogdt@barco.com> | ||
3 | Date: Mon, 16 Jan 2023 17:03:30 +0100 | ||
4 | Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix | ||
5 | |||
6 | !ENABLE(WEBASSEMBLY_B3JIT) | ||
7 | |||
8 | https://bugs.webkit.org/show_bug.cgi?id=250681 | ||
9 | |||
10 | Reviewed by NOBODY (OOPS!). | ||
11 | |||
12 | WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). | ||
13 | Also, toB3Type and simdScalarType are not defined if it is included. | ||
14 | |||
15 | Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> | ||
16 | |||
17 | Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798] | ||
18 | |||
19 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
20 | --- | ||
21 | Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- | ||
22 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp | ||
25 | index eaaa3749..1d089783 100644 | ||
26 | --- a/Source/JavaScriptCore/b3/B3Validate.cpp | ||
27 | +++ b/Source/JavaScriptCore/b3/B3Validate.cpp | ||
28 | @@ -47,6 +47,12 @@ | ||
29 | #include <wtf/StringPrintStream.h> | ||
30 | #include <wtf/text/CString.h> | ||
31 | |||
32 | +#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) | ||
33 | +#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) | ||
34 | +#else | ||
35 | +#define simdScalarTypeToB3Type(type) B3::Type() | ||
36 | +#endif | ||
37 | + | ||
38 | namespace JSC { namespace B3 { | ||
39 | |||
40 | namespace { | ||
41 | @@ -454,7 +460,7 @@ public: | ||
42 | case VectorExtractLane: | ||
43 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
44 | VALIDATE(value->numChildren() == 1, ("At ", *value)); | ||
45 | - VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
46 | + VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
47 | VALIDATE(value->child(0)->type() == V128, ("At ", *value)); | ||
48 | break; | ||
49 | case VectorReplaceLane: | ||
50 | @@ -462,7 +468,7 @@ public: | ||
51 | VALIDATE(value->numChildren() == 2, ("At ", *value)); | ||
52 | VALIDATE(value->type() == V128, ("At ", *value)); | ||
53 | VALIDATE(value->child(0)->type() == V128, ("At ", *value)); | ||
54 | - VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
55 | + VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
56 | break; | ||
57 | case VectorDupElement: | ||
58 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
59 | @@ -484,7 +490,7 @@ public: | ||
60 | VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); | ||
61 | VALIDATE(value->numChildren() == 1, ("At ", *value)); | ||
62 | VALIDATE(value->type() == V128, ("At ", *value)); | ||
63 | - VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); | ||
64 | + VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); | ||
65 | break; | ||
66 | |||
67 | case VectorPopcnt: | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.42.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb index 6790814958..29e12bb8c5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.42.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | |||
@@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 | |||
12 | SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | 12 | SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ |
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
14 | file://reproducibility.patch \ | 14 | file://reproducibility.patch \ |
15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | ||
16 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ | 15 | file://0001-CMake-Add-a-variable-to-control-macro-__PAS_ALWAYS_I.patch \ |
17 | file://no-musttail-arm.patch \ | 16 | file://no-musttail-arm.patch \ |
18 | file://t6-not-declared.patch \ | 17 | file://t6-not-declared.patch \ |
18 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ | ||
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749" | 20 | SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" |
21 | 21 | ||
22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
23 | 23 | ||
@@ -77,6 +77,8 @@ PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,sy | |||
77 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" | 77 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" |
78 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" | 78 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" |
79 | PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" | 79 | PACKAGECONFIG[jpegxl] = "-DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" |
80 | PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" | ||
81 | PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" | ||
80 | 82 | ||
81 | EXTRA_OECMAKE = " \ | 83 | EXTRA_OECMAKE = " \ |
82 | -DPORT=GTK \ | 84 | -DPORT=GTK \ |
@@ -85,8 +87,8 @@ EXTRA_OECMAKE = " \ | |||
85 | ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFFF', d)} \ | 87 | ${@oe.utils.vartrue('DEBUG_BUILD', '-DWEBKIT_NO_INLINE_HINTS=ON', '-DWEBKIT_NO_INLINE_HINTS=OFFF', d)} \ |
86 | -DENABLE_MINIBROWSER=ON \ | 88 | -DENABLE_MINIBROWSER=ON \ |
87 | -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ | 89 | -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ |
88 | -DENABLE_GAMEPAD=OFF \ | ||
89 | -DUSE_GTK4=ON \ | 90 | -DUSE_GTK4=ON \ |
91 | -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ | ||
90 | " | 92 | " |
91 | 93 | ||
92 | # Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the | 94 | # Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the |
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index a274f3a16e..b46dc76a86 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | |||
@@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized | |||
7 | system under heavy load, these tests randomly fail because they miss | 7 | system under heavy load, these tests randomly fail because they miss |
8 | a timer or other timing related issues. | 8 | a timer or other timing related issues. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] |
11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | 11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
12 | 12 | ||
13 | --- | 13 | --- |
diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140c..0000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 3 Mar 2017 22:24:17 +0100 | ||
4 | Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy | ||
5 | on test | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' | ||
11 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' | ||
12 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' | ||
13 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' | ||
14 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' | ||
15 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' | ||
16 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' | ||
17 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' | ||
18 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' | ||
19 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' | ||
20 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' | ||
21 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' | ||
22 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' | ||
23 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' | ||
24 | | collect2: error: ld returned 1 exit status | ||
25 | | Makefile:114: recipe for target 'globalmutexchild' failed | ||
26 | | make[1]: *** [globalmutexchild] Error 1 | ||
27 | | make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' | ||
28 | |||
29 | Upstream-Status: Pending | ||
30 | |||
31 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
32 | --- | ||
33 | configure.in | 1 + | ||
34 | 1 file changed, 1 insertion(+) | ||
35 | |||
36 | diff --git a/configure.in b/configure.in | ||
37 | index a227e72..cbc0f90 100644 | ||
38 | --- a/configure.in | ||
39 | +++ b/configure.in | ||
40 | @@ -784,6 +784,7 @@ else | ||
41 | APR_PTHREADS_CHECK_RESTORE ] ) | ||
42 | fi | ||
43 | if test "$pthreadh" = "1"; then | ||
44 | + APR_ADDTO(LIBS,[-lpthread]) | ||
45 | APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS | ||
46 | APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG | ||
47 | APR_CHECK_PTHREAD_RECURSIVE_MUTEX | ||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb index d322629b66..4df741c766 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.4.bb | |||
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ | 18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ |
19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ | 19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ |
20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ | 20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ |
21 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ | ||
22 | file://libtoolize_check.patch \ | 21 | file://libtoolize_check.patch \ |
23 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 22 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
24 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ | 23 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ |
diff --git a/meta/recipes-support/atk/at-spi2-core_2.50.1.bb b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb index 6996ebebcd..913b408403 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.50.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb | |||
@@ -7,11 +7,13 @@ BUGTRACKER = "http://bugzilla.gnome.org/" | |||
7 | LICENSE = "LGPL-2.1-or-later" | 7 | LICENSE = "LGPL-2.1-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
9 | 9 | ||
10 | CVE_PRODUCT += "at-spi2-atk" | ||
11 | |||
10 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
11 | 13 | ||
12 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" |
13 | 15 | ||
14 | SRC_URI[sha256sum] = "5727b5c0687ac57ba8040e79bd6731b714a36b8fcf32190f236b8fb3698789e7" | 16 | SRC_URI[sha256sum] = "0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab" |
15 | 17 | ||
16 | DEPENDS = " \ | 18 | DEPENDS = " \ |
17 | dbus \ | 19 | dbus \ |
diff --git a/meta/recipes-support/attr/attr_2.5.1.bb b/meta/recipes-support/attr/attr_2.5.1.bb deleted file mode 100644 index 5c5f7bcffb..0000000000 --- a/meta/recipes-support/attr/attr_2.5.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8" | ||
4 | |||
5 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb new file mode 100644 index 0000000000..2110c6d885 --- /dev/null +++ b/meta/recipes-support/attr/attr_2.5.2.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87" | ||
4 | |||
5 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/bash-completion/bash-completion_2.12.0.bb b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb index 66f65f565c..f75d61e219 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.12.0.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb | |||
@@ -14,7 +14,7 @@ SECTION = "console/utils" | |||
14 | 14 | ||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9" | 17 | SRC_URI[sha256sum] = "c5f99a39e40f0d154c03ff15438e87ece1f5ac666336a4459899e2ff4bedf3d1" |
18 | GITHUB_BASE_URI = "https://github.com/scop/bash-completion/releases" | 18 | GITHUB_BASE_URI = "https://github.com/scop/bash-completion/releases" |
19 | 19 | ||
20 | PARALLEL_MAKE = "" | 20 | PARALLEL_MAKE = "" |
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 346bd60e4d..0f2153d493 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb | |||
@@ -31,6 +31,9 @@ PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/s | |||
31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" | 31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" |
32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" | 32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" |
33 | 33 | ||
34 | # Fails to build with GCC14 with incompatible pointer error warning being treated as error | ||
35 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
36 | |||
34 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ | 37 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ |
35 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ | 38 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ |
36 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" | 39 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" |
diff --git a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch new file mode 100644 index 0000000000..98f7db93e8 --- /dev/null +++ b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Eissing <stefan@eissing.org> | ||
3 | Date: Mon, 1 Apr 2024 15:41:18 +0200 | ||
4 | Subject: [PATCH] http: with chunked POST forced, disable length check on read | ||
5 | callback | ||
6 | |||
7 | - when an application forces HTTP/1.1 chunked transfer encoding | ||
8 | by setting the corresponding header and instructs curl to use | ||
9 | the CURLOPT_READFUNCTION, disregard any POST length information. | ||
10 | - this establishes backward compatibility with previous curl versions | ||
11 | |||
12 | Applications are encouraged to not force "chunked", but rather | ||
13 | set length information for a POST. By setting -1, curl will | ||
14 | auto-select chunked on HTTP/1.1 and work properly on other HTTP | ||
15 | versions. | ||
16 | |||
17 | Reported-by: Jeff King | ||
18 | Fixes #13229 | ||
19 | Closes #13257 | ||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | lib/http.c | 22 ++++++++++++++++++++-- | ||
23 | 1 file changed, 20 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/lib/http.c b/lib/http.c | ||
26 | index 92c04e69cd8373..a764d3c4403c39 100644 | ||
27 | --- a/lib/http.c | ||
28 | +++ b/lib/http.c | ||
29 | @@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) | ||
30 | else | ||
31 | result = Curl_creader_set_null(data); | ||
32 | } | ||
33 | - else { /* we read the bytes from the callback */ | ||
34 | - result = Curl_creader_set_fread(data, postsize); | ||
35 | + else { | ||
36 | + /* we read the bytes from the callback. In case "chunked" encoding | ||
37 | + * is forced by the application, we disregard `postsize`. This is | ||
38 | + * a backward compatibility decision to earlier versions where | ||
39 | + * chunking disregarded this. See issue #13229. */ | ||
40 | + bool chunked = FALSE; | ||
41 | + char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); | ||
42 | + if(ptr) { | ||
43 | + /* Some kind of TE is requested, check if 'chunked' is chosen */ | ||
44 | + chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), | ||
45 | + STRCONST("chunked")); | ||
46 | + } | ||
47 | + result = Curl_creader_set_fread(data, chunked? -1 : postsize); | ||
48 | } | ||
49 | return result; | ||
50 | |||
51 | @@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, | ||
52 | data->req.upload_chunky = | ||
53 | Curl_compareheader(ptr, | ||
54 | STRCONST("Transfer-Encoding:"), STRCONST("chunked")); | ||
55 | + if(data->req.upload_chunky && | ||
56 | + Curl_use_http_1_1plus(data, data->conn) && | ||
57 | + (data->conn->httpversion >= 20)) { | ||
58 | + infof(data, "suppressing chunked transfer encoding on connection " | ||
59 | + "using HTTP version 2 or higher"); | ||
60 | + data->req.upload_chunky = FALSE; | ||
61 | + } | ||
62 | } | ||
63 | else { | ||
64 | curl_off_t req_clen = Curl_creader_total_length(data); | ||
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch index b4cfe716db..7122b6f043 100644 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch | |||
@@ -1,10 +1,17 @@ | |||
1 | Set the max-time timeout to 600 so the timeout is 10 minutes instead of 13 seconds. | 1 | From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Fri, 15 Mar 2024 14:37:37 +0000 | ||
4 | Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes | ||
5 | instead of 13 seconds. | ||
2 | 6 | ||
3 | Upstream-Status: Inappropriate | 7 | Upstream-Status: Inappropriate |
4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 8 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
9 | --- | ||
10 | tests/servers.pm | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
5 | 12 | ||
6 | diff --git a/tests/servers.pm b/tests/servers.pm | 13 | diff --git a/tests/servers.pm b/tests/servers.pm |
7 | index d4472d509..aeab62c47 100644 | 14 | index d4472d5..9999938 100644 |
8 | --- a/tests/servers.pm | 15 | --- a/tests/servers.pm |
9 | +++ b/tests/servers.pm | 16 | +++ b/tests/servers.pm |
10 | @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string | 17 | @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string |
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index acd2892f80..3d25f3d90b 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest | |||
@@ -8,4 +8,4 @@ cd tests | |||
8 | # Run four tests in parallel | 8 | # Run four tests in parallel |
9 | # Print log output on failure | 9 | # Print log output on failure |
10 | # Don't run the flaky or timing dependent tests | 10 | # Don't run the flaky or timing dependent tests |
11 | ./runtests.pl -a -n -am -j4 -p '!flaky !timing-dependent' | 11 | ./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent |
diff --git a/meta/recipes-support/curl/curl_8.6.0.bb b/meta/recipes-support/curl/curl_8.7.1.bb index ea69164d76..c74416d7e9 100644 --- a/meta/recipes-support/curl/curl_8.6.0.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb | |||
@@ -11,11 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ | ||
14 | file://run-ptest \ | 15 | file://run-ptest \ |
15 | file://disable-tests \ | 16 | file://disable-tests \ |
16 | file://no-test-timeout.patch \ | 17 | file://no-test-timeout.patch \ |
17 | " | 18 | " |
18 | SRC_URI[sha256sum] = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15" | 19 | SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" |
19 | 20 | ||
20 | # Curl has used many names over the years... | 21 | # Curl has used many names over the years... |
21 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" | 22 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" |
@@ -79,7 +80,7 @@ EXTRA_OECONF = " \ | |||
79 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ | 80 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ |
80 | " | 81 | " |
81 | 82 | ||
82 | do_install:append:class-target() { | 83 | fix_absolute_paths () { |
83 | # cleanup buildpaths from curl-config | 84 | # cleanup buildpaths from curl-config |
84 | sed -i \ | 85 | sed -i \ |
85 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ | 86 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ |
@@ -89,6 +90,14 @@ do_install:append:class-target() { | |||
89 | ${D}${bindir}/curl-config | 90 | ${D}${bindir}/curl-config |
90 | } | 91 | } |
91 | 92 | ||
93 | do_install:append:class-target() { | ||
94 | fix_absolute_paths | ||
95 | } | ||
96 | |||
97 | do_install:append:class-nativesdk() { | ||
98 | fix_absolute_paths | ||
99 | } | ||
100 | |||
92 | do_compile_ptest() { | 101 | do_compile_ptest() { |
93 | oe_runmake -C ${B}/tests | 102 | oe_runmake -C ${B}/tests |
94 | } | 103 | } |
diff --git a/meta/recipes-support/debianutils/debianutils_5.16.bb b/meta/recipes-support/debianutils/debianutils_5.17.bb index ec629d8b73..c5f25bae40 100644 --- a/meta/recipes-support/debianutils/debianutils_5.16.bb +++ b/meta/recipes-support/debianutils/debianutils_5.17.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 = "9e0facf19b17b6d090a5dcc8cacb0c16e5ad9f72" | 14 | SRCREV = "baf12e98a02883d1b76081e32f2185ee3497570b" |
15 | 15 | ||
16 | inherit autotools update-alternatives | 16 | inherit autotools update-alternatives |
17 | 17 | ||
diff --git a/meta/recipes-support/diffoscope/diffoscope_259.bb b/meta/recipes-support/diffoscope/diffoscope_265.bb index eca2c208fc..6af5abc974 100644 --- a/meta/recipes-support/diffoscope/diffoscope_259.bb +++ b/meta/recipes-support/diffoscope/diffoscope_265.bb | |||
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" | |||
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "c1f14452467f84c4be804a3725cbfdd5eadf977ece7ad463be8b647d1a87fb42" | 15 | SRC_URI[sha256sum] = "7bdcbd7fc5bc4c821bf6ab5ffbbeb265103b04e6908ea4bb12144d7e5ca002ff" |
16 | 16 | ||
17 | RDEPENDS:${PN} += "\ | 17 | RDEPENDS:${PN} += "\ |
18 | binutils \ | 18 | binutils \ |
diff --git a/meta/recipes-support/enchant/enchant2_2.6.7.bb b/meta/recipes-support/enchant/enchant2_2.7.2.bb index b31bdc422b..08998dd48f 100644 --- a/meta/recipes-support/enchant/enchant2_2.6.7.bb +++ b/meta/recipes-support/enchant/enchant2_2.7.2.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] = "a1c2e5b59acca000bbfb24810af4a1165733d407f2154786588e076c8cd57bfc" | 15 | SRC_URI[sha256sum] = "7cc3400a6657974a740b6e3c2568e2935c70e5302f07fadb2095366b75ecad6f" |
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/gmp/gmp_6.3.0.bb b/meta/recipes-support/gmp/gmp_6.3.0.bb index 3dbcd68b5c..fd4aec92fd 100644 --- a/meta/recipes-support/gmp/gmp_6.3.0.bb +++ b/meta/recipes-support/gmp/gmp_6.3.0.bb | |||
@@ -29,13 +29,21 @@ do_install:append() { | |||
29 | oe_multilib_header gmp.h | 29 | oe_multilib_header gmp.h |
30 | } | 30 | } |
31 | 31 | ||
32 | do_install:prepend:class-target() { | 32 | fix_absolute_paths () { |
33 | sed -i \ | 33 | sed -i \ |
34 | -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ | 34 | -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ |
35 | -e "s|${DEBUG_PREFIX_MAP}||g" \ | 35 | -e "s|${DEBUG_PREFIX_MAP}||g" \ |
36 | ${B}/gmp.h | 36 | ${B}/gmp.h |
37 | } | 37 | } |
38 | 38 | ||
39 | do_install:prepend:class-target() { | ||
40 | fix_absolute_paths | ||
41 | } | ||
42 | |||
43 | do_install:prepend:class-nativesdk() { | ||
44 | fix_absolute_paths | ||
45 | } | ||
46 | |||
39 | SSTATE_SCAN_FILES += "gmp.h" | 47 | SSTATE_SCAN_FILES += "gmp.h" |
40 | 48 | ||
41 | # Doesn't compile in MIPS16e mode due to use of hand-written | 49 | # Doesn't compile in MIPS16e mode due to use of hand-written |
diff --git a/meta/recipes-support/gnupg/gnupg_2.4.4.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb index fff7d8c6da..99996968b1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb | |||
@@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- | |||
23 | file://relocate.patch" | 23 | file://relocate.patch" |
24 | SRC_URI:append:class-nativesdk = " file://relocate.patch" | 24 | SRC_URI:append:class-nativesdk = " file://relocate.patch" |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6" | 26 | SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-ldap \ | 28 | EXTRA_OECONF = "--disable-ldap \ |
29 | --disable-ccid-driver \ | 29 | --disable-ccid-driver \ |
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch index 4bdc40d932..d13bfee8ef 100644 --- a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch +++ b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 21a8295bac3805e4490ba2b5f136e7f4c121061b Mon Sep 17 00:00:00 2001 | 1 | From 7be8ec59a53e93c2bd453b3ba2d63d1b300ef11f Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Mon, 23 May 2022 10:44:43 +0900 | 3 | Date: Mon, 23 May 2022 10:44:43 +0900 |
4 | Subject: [PATCH] Creating .hmac file should be excuted in target environment, | 4 | Subject: [PATCH] Creating .hmac file should be excuted in target environment, |
@@ -6,16 +6,15 @@ Subject: [PATCH] Creating .hmac file should be excuted in target environment, | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] | 7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] |
8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
9 | |||
10 | --- | 9 | --- |
11 | lib/Makefile.am | 3 +-- | 10 | lib/Makefile.am | 3 +-- |
12 | 1 file changed, 1 insertion(+), 2 deletions(-) | 11 | 1 file changed, 1 insertion(+), 2 deletions(-) |
13 | 12 | ||
14 | diff --git a/lib/Makefile.am b/lib/Makefile.am | 13 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
15 | index 6d4e8d2..24ef108 100644 | 14 | index a50d311..193ea19 100644 |
16 | --- a/lib/Makefile.am | 15 | --- a/lib/Makefile.am |
17 | +++ b/lib/Makefile.am | 16 | +++ b/lib/Makefile.am |
18 | @@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac | 17 | @@ -198,8 +198,7 @@ hmac_file = .libs/.$(gnutls_so).hmac |
19 | 18 | ||
20 | all-local: $(hmac_file) | 19 | all-local: $(hmac_file) |
21 | 20 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch new file mode 100644 index 0000000000..cc39f5c9a5 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch | |||
@@ -0,0 +1,269 @@ | |||
1 | From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Zoltan Fridrich <zfridric@redhat.com> | ||
3 | Date: Wed, 10 Apr 2024 12:51:33 +0200 | ||
4 | Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration | ||
5 | |||
6 | Upstream-Status: Backport [expected for 3.8.6 https://gitlab.com/gnutls/gnutls/-/merge_requests/1830?commit_id=2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d] | ||
7 | |||
8 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | ||
9 | Signed-off-by: Zoltan Fridrich <zfridric@redhat.com> | ||
10 | --- | ||
11 | lib/priority.c | 125 +++++++++++------- | ||
12 | ...system-override-allow-rsa-pkcs1-encrypt.sh | 27 +++- | ||
13 | 2 files changed, 96 insertions(+), 56 deletions(-) | ||
14 | |||
15 | diff --git a/lib/priority.c b/lib/priority.c | ||
16 | index 8abe00d1ff..3434619aad 100644 | ||
17 | --- a/lib/priority.c | ||
18 | +++ b/lib/priority.c | ||
19 | @@ -1018,6 +1018,12 @@ struct cfg { | ||
20 | bool force_ext_master_secret_set; | ||
21 | }; | ||
22 | |||
23 | +static inline void cfg_init(struct cfg *cfg) | ||
24 | +{ | ||
25 | + memset(cfg, 0, sizeof(*cfg)); | ||
26 | + cfg->allow_rsa_pkcs1_encrypt = true; | ||
27 | +} | ||
28 | + | ||
29 | static inline void cfg_deinit(struct cfg *cfg) | ||
30 | { | ||
31 | if (cfg->priority_strings) { | ||
32 | @@ -1095,6 +1101,12 @@ struct ini_ctx { | ||
33 | size_t curves_size; | ||
34 | }; | ||
35 | |||
36 | +static inline void ini_ctx_init(struct ini_ctx *ctx) | ||
37 | +{ | ||
38 | + memset(ctx, 0, sizeof(*ctx)); | ||
39 | + cfg_init(&ctx->cfg); | ||
40 | +} | ||
41 | + | ||
42 | static inline void ini_ctx_deinit(struct ini_ctx *ctx) | ||
43 | { | ||
44 | cfg_deinit(&ctx->cfg); | ||
45 | @@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx) | ||
46 | _gnutls_default_priority_string = cfg->default_priority_string; | ||
47 | } | ||
48 | |||
49 | - /* enable RSA-PKCS1-V1_5 by default */ | ||
50 | - cfg->allow_rsa_pkcs1_encrypt = true; | ||
51 | - | ||
52 | if (cfg->allowlisting) { | ||
53 | /* also updates `flags` of global `hash_algorithms[]` */ | ||
54 | ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size); | ||
55 | @@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void) | ||
56 | return 0; | ||
57 | } | ||
58 | |||
59 | +/* Returns false on parse error, otherwise true. | ||
60 | + * The system_wide_config must be locked for writing. | ||
61 | + */ | ||
62 | +static inline bool load_system_priority_file(void) | ||
63 | +{ | ||
64 | + int err; | ||
65 | + FILE *fp; | ||
66 | + struct ini_ctx ctx; | ||
67 | + | ||
68 | + cfg_init(&system_wide_config); | ||
69 | + | ||
70 | + fp = fopen(system_priority_file, "re"); | ||
71 | + if (fp == NULL) { | ||
72 | + _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
73 | + system_priority_file, errno); | ||
74 | + return true; | ||
75 | + } | ||
76 | + | ||
77 | + /* Parsing the configuration file needs to be done in 2 phases: | ||
78 | + * first parsing the [global] section | ||
79 | + * and then the other sections, | ||
80 | + * because the [global] section modifies the parsing behavior. | ||
81 | + */ | ||
82 | + ini_ctx_init(&ctx); | ||
83 | + err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
84 | + if (!err) { | ||
85 | + if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
86 | + _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
87 | + system_priority_file); | ||
88 | + if (fail_on_invalid_config) | ||
89 | + exit(1); | ||
90 | + } | ||
91 | + err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
92 | + } | ||
93 | + fclose(fp); | ||
94 | + if (err) { | ||
95 | + ini_ctx_deinit(&ctx); | ||
96 | + _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
97 | + system_priority_file, err); | ||
98 | + return false; | ||
99 | + } | ||
100 | + cfg_apply(&system_wide_config, &ctx); | ||
101 | + ini_ctx_deinit(&ctx); | ||
102 | + return true; | ||
103 | +} | ||
104 | + | ||
105 | static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
106 | { | ||
107 | - int ret, err = 0; | ||
108 | + int ret; | ||
109 | + bool config_parse_error = false; | ||
110 | struct stat sb; | ||
111 | - FILE *fp; | ||
112 | gnutls_buffer_st buf; | ||
113 | - struct ini_ctx ctx; | ||
114 | |||
115 | ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock); | ||
116 | - if (ret < 0) { | ||
117 | + if (ret < 0) | ||
118 | return gnutls_assert_val(ret); | ||
119 | - } | ||
120 | |||
121 | if (stat(system_priority_file, &sb) < 0) { | ||
122 | _gnutls_debug_log("cfg: unable to access: %s: %d\n", | ||
123 | system_priority_file, errno); | ||
124 | + | ||
125 | + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
126 | + ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
127 | + if (ret < 0) | ||
128 | + goto out; | ||
129 | + /* If system-wide config is unavailable, apply the defaults */ | ||
130 | + cfg_init(&system_wide_config); | ||
131 | goto out; | ||
132 | } | ||
133 | |||
134 | @@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
135 | system_priority_last_mod == sb.st_mtime) { | ||
136 | _gnutls_debug_log("cfg: system priority %s has not changed\n", | ||
137 | system_priority_file); | ||
138 | - if (system_wide_config.priority_string) { | ||
139 | + if (system_wide_config.priority_string) | ||
140 | goto out; /* nothing to do */ | ||
141 | - } | ||
142 | } | ||
143 | |||
144 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
145 | |||
146 | ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
147 | - if (ret < 0) { | ||
148 | + if (ret < 0) | ||
149 | return gnutls_assert_val(ret); | ||
150 | - } | ||
151 | |||
152 | /* Another thread could have successfully re-read system-wide config, | ||
153 | * skip re-reading if the mtime it has used is exactly the same. | ||
154 | */ | ||
155 | - if (system_priority_file_loaded) { | ||
156 | + if (system_priority_file_loaded) | ||
157 | system_priority_file_loaded = | ||
158 | (system_priority_last_mod == sb.st_mtime); | ||
159 | - } | ||
160 | |||
161 | if (!system_priority_file_loaded) { | ||
162 | - _name_val_array_clear(&system_wide_config.priority_strings); | ||
163 | - | ||
164 | - gnutls_free(system_wide_config.priority_string); | ||
165 | - system_wide_config.priority_string = NULL; | ||
166 | - | ||
167 | - fp = fopen(system_priority_file, "re"); | ||
168 | - if (fp == NULL) { | ||
169 | - _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
170 | - system_priority_file, errno); | ||
171 | + config_parse_error = !load_system_priority_file(); | ||
172 | + if (config_parse_error) | ||
173 | goto out; | ||
174 | - } | ||
175 | - /* Parsing the configuration file needs to be done in 2 phases: | ||
176 | - * first parsing the [global] section | ||
177 | - * and then the other sections, | ||
178 | - * because the [global] section modifies the parsing behavior. | ||
179 | - */ | ||
180 | - memset(&ctx, 0, sizeof(ctx)); | ||
181 | - err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
182 | - if (!err) { | ||
183 | - if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
184 | - _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
185 | - system_priority_file); | ||
186 | - if (fail_on_invalid_config) | ||
187 | - exit(1); | ||
188 | - } | ||
189 | - err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
190 | - } | ||
191 | - fclose(fp); | ||
192 | - if (err) { | ||
193 | - ini_ctx_deinit(&ctx); | ||
194 | - _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
195 | - system_priority_file, err); | ||
196 | - goto out; | ||
197 | - } | ||
198 | - cfg_apply(&system_wide_config, &ctx); | ||
199 | - ini_ctx_deinit(&ctx); | ||
200 | _gnutls_debug_log("cfg: loaded system config %s mtime %lld\n", | ||
201 | system_priority_file, | ||
202 | (unsigned long long)sb.st_mtime); | ||
203 | @@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
204 | out: | ||
205 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
206 | |||
207 | - if (err && fail_on_invalid_config) { | ||
208 | + if (config_parse_error && fail_on_invalid_config) | ||
209 | exit(1); | ||
210 | - } | ||
211 | |||
212 | return ret; | ||
213 | } | ||
214 | diff --git a/tests/system-override-allow-rsa-pkcs1-encrypt.sh b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
215 | index b7d477c96e..714d0af946 100755 | ||
216 | --- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
217 | +++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
218 | @@ -19,9 +19,8 @@ | ||
219 | # You should have received a copy of the GNU Lesser General Public License | ||
220 | # along with this program. If not, see <https://www.gnu.org/licenses/> | ||
221 | |||
222 | -: ${srcdir=.} | ||
223 | -TEST=${srcdir}/rsaes-pkcs1-v1_5 | ||
224 | -CONF=${srcdir}/config.$$.tmp | ||
225 | +TEST=${builddir}/rsaes-pkcs1-v1_5 | ||
226 | +CONF=config.$$.tmp | ||
227 | export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF} | ||
228 | export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 | ||
229 | |||
230 | @@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF} | ||
231 | allow-rsa-pkcs1-encrypt = true | ||
232 | _EOF_ | ||
233 | |||
234 | -${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed" | ||
235 | +${TEST} | ||
236 | +if [ $? != 0 ]; then | ||
237 | + echo "${TEST} expected to succeed" | ||
238 | + exit 1 | ||
239 | +fi | ||
240 | +echo "RSAES-PKCS1-v1_5 successfully enabled" | ||
241 | |||
242 | cat <<_EOF_ > ${CONF} | ||
243 | [overrides] | ||
244 | allow-rsa-pkcs1-encrypt = false | ||
245 | _EOF_ | ||
246 | |||
247 | -${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail" | ||
248 | +${TEST} | ||
249 | +if [ $? = 0 ]; then | ||
250 | + echo "${TEST} expected to fail" | ||
251 | + exit 1 | ||
252 | +fi | ||
253 | +echo "RSAES-PKCS1-v1_5 successfully disabled" | ||
254 | |||
255 | unset GNUTLS_SYSTEM_PRIORITY_FILE | ||
256 | unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID | ||
257 | + | ||
258 | +${TEST} | ||
259 | +if [ $? != 0 ]; then | ||
260 | + echo "${TEST} expected to succeed by default" | ||
261 | + exit 1 | ||
262 | +fi | ||
263 | +echo "RSAES-PKCS1-v1_5 successfully enabled by default" | ||
264 | + | ||
265 | exit 0 | ||
266 | -- | ||
267 | GitLab | ||
268 | |||
269 | |||
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch index f87cf536fa..8edd31d6b9 100644 --- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From 81861f7ba690956c064ebe8dce6c313951fa2a9f Mon Sep 17 00:00:00 2001 | 1 | From bfa70adcbda4e505cf2e597907852e78e0439ee2 Mon Sep 17 00:00:00 2001 |
2 | From: Ravineet Singh <ravineet.a.singh@est.tech> | 2 | From: Ravineet Singh <ravineet.a.singh@est.tech> |
3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 | 3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 |
4 | Subject: [PATCH] gnutls: add ptest support | 4 | Subject: [PATCH] gnutls: add ptest support |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> | 7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> |
8 | |||
9 | --- | 8 | --- |
10 | Makefile.am | 3 +++ | 9 | Makefile.am | 3 +++ |
11 | configure.ac | 2 ++ | 10 | configure.ac | 2 ++ |
@@ -27,10 +26,10 @@ index 843193f..816b09f 100644 | |||
27 | 26 | ||
28 | include $(top_srcdir)/cligen/cligen.mk | 27 | include $(top_srcdir)/cligen/cligen.mk |
29 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
30 | index b25ba14..860ddef 100644 | 29 | index 934377e..4406eae 100644 |
31 | --- a/configure.ac | 30 | --- a/configure.ac |
32 | +++ b/configure.ac | 31 | +++ b/configure.ac |
33 | @@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) | 32 | @@ -1213,6 +1213,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) |
34 | 33 | ||
35 | AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") | 34 | AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") |
36 | 35 | ||
@@ -40,10 +39,10 @@ index b25ba14..860ddef 100644 | |||
40 | 39 | ||
41 | hw_features= | 40 | hw_features= |
42 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 41 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
43 | index d530ad0..71c592f 100644 | 42 | index e39a3b3..861dd63 100644 |
44 | --- a/tests/Makefile.am | 43 | --- a/tests/Makefile.am |
45 | +++ b/tests/Makefile.am | 44 | +++ b/tests/Makefile.am |
46 | @@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL) | 45 | @@ -663,6 +663,12 @@ SH_LOG_COMPILER = $(SHELL) |
47 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind | 46 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind |
48 | LOG_COMPILER = $(LOG_VALGRIND) | 47 | LOG_COMPILER = $(LOG_VALGRIND) |
49 | 48 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index fe3f031fdc..883d0123db 100644 --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5810d97281bb30edb786de9946e5c13186eff6a2 Mon Sep 17 00:00:00 2001 | 1 | From d17ae0ef31c3c186766a338e8c40c87d1b98820e Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | 2 | From: Joe Slater <jslater@windriver.com> |
3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 | 3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 |
4 | Subject: [PATCH] gnutls: account for ARM_EABI | 4 | Subject: [PATCH] gnutls: account for ARM_EABI |
@@ -14,7 +14,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com> | |||
14 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
15 | 15 | ||
16 | diff --git a/tests/seccomp.c b/tests/seccomp.c | 16 | diff --git a/tests/seccomp.c b/tests/seccomp.c |
17 | index 86442a5..03a5aa8 100644 | 17 | index 881f0bb..5f9204a 100644 |
18 | --- a/tests/seccomp.c | 18 | --- a/tests/seccomp.c |
19 | +++ b/tests/seccomp.c | 19 | +++ b/tests/seccomp.c |
20 | @@ -55,7 +55,9 @@ int disable_system_calls(void) | 20 | @@ -55,7 +55,9 @@ int disable_system_calls(void) |
@@ -27,6 +27,3 @@ index 86442a5..03a5aa8 100644 | |||
27 | ADD_SYSCALL(getpid, 0); | 27 | ADD_SYSCALL(getpid, 0); |
28 | ADD_SYSCALL(gettimeofday, 0); | 28 | ADD_SYSCALL(gettimeofday, 0); |
29 | #if defined(HAVE_CLOCK_GETTIME) | 29 | #if defined(HAVE_CLOCK_GETTIME) |
30 | -- | ||
31 | 2.30.2 | ||
32 | |||
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.3.bb b/meta/recipes-support/gnutls/gnutls_3.8.5.bb index 27d6753be0..52a1c00c4a 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.3.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.5.bb | |||
@@ -21,11 +21,12 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ | 21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ |
22 | file://arm_eabi.patch \ | 22 | file://arm_eabi.patch \ |
23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ | 23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ |
24 | file://0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch \ | ||
24 | file://run-ptest \ | 25 | file://run-ptest \ |
25 | file://Add-ptest-support.patch \ | 26 | file://Add-ptest-support.patch \ |
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI[sha256sum] = "f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e" | 29 | SRC_URI[sha256sum] = "66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc" |
29 | 30 | ||
30 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest | 31 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest |
31 | 32 | ||
diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb..c0e9e2806b 100644 --- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 | 1 | From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 | 3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 |
4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux | 4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux |
@@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [ OE Configuration ] | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
10 | source/config/mh-linux | 2 +- | 10 | config/mh-linux | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/config/mh-linux b/config/mh-linux | 13 | diff --git a/config/mh-linux b/config/mh-linux |
14 | index 366f0cc..2689aab 100644 | 14 | index 53d6780..b622513 100644 |
15 | --- a/config/mh-linux | 15 | --- a/config/mh-linux |
16 | +++ b/config/mh-linux | 16 | +++ b/config/mh-linux |
17 | @@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN | 17 | @@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN |
18 | LD_RPATH_PRE = -Wl,-rpath, | 18 | LD_RPATH_PRE = -Wl,-rpath, |
19 | 19 | ||
20 | ## These are the library specific LDFLAGS | 20 | ## These are the library specific LDFLAGS |
@@ -23,6 +23,3 @@ index 366f0cc..2689aab 100644 | |||
23 | 23 | ||
24 | ## Compiler switch to embed a library name | 24 | ## Compiler switch to embed a library name |
25 | # The initial tab in the next line is to prevent icu-config from reading it. | 25 | # The initial tab in the next line is to prevent icu-config from reading it. |
26 | -- | ||
27 | 1.7.10.4 | ||
28 | |||
diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch index 578517b57f..a25285fb54 100644 --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 | 1 | From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> |
3 | Date: Wed, 8 May 2019 14:42:30 +0900 | 3 | Date: Wed, 8 May 2019 14:42:30 +0900 |
4 | Subject: [PATCH] icu: Added armeb support. | 4 | Subject: [PATCH] icu: Added armeb support. |
@@ -8,16 +8,15 @@ Make icu support arm32 BE. | |||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | 10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> |
11 | |||
12 | --- | 11 | --- |
13 | i18n/double-conversion-utils.h | 2 +- | 12 | i18n/double-conversion-utils.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h | 15 | diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h |
17 | index 7f23e0a..7f89094 100644 | 16 | index 303668f..7d859dc 100644 |
18 | --- a/i18n/double-conversion-utils.h | 17 | --- a/i18n/double-conversion-utils.h |
19 | +++ b/i18n/double-conversion-utils.h | 18 | +++ b/i18n/double-conversion-utils.h |
20 | @@ -115,7 +115,7 @@ int main(int argc, char** argv) { | 19 | @@ -146,7 +146,7 @@ int main(int argc, char** argv) { |
21 | // | 20 | // |
22 | // If it prints "correct" then the architecture should be here, in the "correct" section. | 21 | // If it prints "correct" then the architecture should be here, in the "correct" section. |
23 | #if defined(_M_X64) || defined(__x86_64__) || \ | 22 | #if defined(_M_X64) || defined(__x86_64__) || \ |
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 925b064ebd..16cabc8264 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001 | 1 | From 2d544cac238eccbfc32cafc9502ddf6e00994211 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 | 3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 |
4 | Subject: [PATCH] icu: fix install race | 4 | Subject: [PATCH] icu: fix install race |
@@ -11,15 +11,16 @@ and one process tries to chown a file that the other process has just deleted. | |||
11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? | 11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? |
12 | in the install command. | 12 | in the install command. |
13 | 13 | ||
14 | Upstream-Status: Pending | 14 | Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 |
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
16 | 15 | ||
16 | Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] | ||
17 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
17 | --- | 18 | --- |
18 | source/Makefile.in | 8 ++++---- | 19 | Makefile.in | 8 ++++---- |
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | 20 | 1 file changed, 4 insertions(+), 4 deletions(-) |
20 | 21 | ||
21 | diff --git a/Makefile.in b/Makefile.in | 22 | diff --git a/Makefile.in b/Makefile.in |
22 | index be9435b..ada20d7 100644 | 23 | index 8366f01..79b91c9 100644 |
23 | --- a/Makefile.in | 24 | --- a/Makefile.in |
24 | +++ b/Makefile.in | 25 | +++ b/Makefile.in |
25 | @@ -77,7 +77,7 @@ EXTRA_DATA = | 26 | @@ -77,7 +77,7 @@ EXTRA_DATA = |
diff --git a/meta/recipes-support/icu/icu_74-1.bb b/meta/recipes-support/icu/icu_74-2.bb index 88ded166b5..8352bf2a5b 100644 --- a/meta/recipes-support/icu/icu_74-1.bb +++ b/meta/recipes-support/icu/icu_74-2.bb | |||
@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
111 | SRC_URI:append:class-target = "\ | 111 | SRC_URI:append:class-target = "\ |
112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
113 | " | 113 | " |
114 | SRC_URI[code.sha256sum] = "86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0" | 114 | SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" |
115 | SRC_URI[data.sha256sum] = "67d5ab39c5187e1dd0fed60a3fe52794dce9784b4c045cb85e19f5d317fd783f" | 115 | SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" |
116 | 116 | ||
117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" | 117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" |
118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" | 118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" |
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.6.bb b/meta/recipes-support/libassuan/libassuan_2.5.7.bb index 7e899e7399..d1e622635f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.6.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.7.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ | |||
20 | file://libassuan-add-pkgconfig-support.patch \ | 20 | file://libassuan-add-pkgconfig-support.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426" | 23 | SRC_URI[sha256sum] = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76" |
24 | 24 | ||
25 | BINCONFIG = "${bindir}/libassuan-config" | 25 | BINCONFIG = "${bindir}/libassuan-config" |
26 | 26 | ||
diff --git a/meta/recipes-support/libbsd/libbsd_0.12.1.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 161dc6df43..7d5e88f293 100644 --- a/meta/recipes-support/libbsd/libbsd_0.12.1.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb | |||
@@ -38,7 +38,7 @@ SECTION = "libs" | |||
38 | 38 | ||
39 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 39 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
40 | 40 | ||
41 | SRC_URI[sha256sum] = "d7747f8ec1baa6ff5c096a9dd587c061233dec90da0f1aedd66d830f6db6996a" | 41 | SRC_URI[sha256sum] = "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014" |
42 | 42 | ||
43 | inherit autotools pkgconfig | 43 | inherit autotools pkgconfig |
44 | 44 | ||
diff --git a/meta/recipes-support/libical/libical_3.0.17.bb b/meta/recipes-support/libical/libical_3.0.18.bb index b91912b048..052ca57cfb 100644 --- a/meta/recipes-support/libical/libical_3.0.17.bb +++ b/meta/recipes-support/libical/libical_3.0.18.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/libical/libical" | |||
7 | BUGTRACKER = "https://github.com/libical/libical/issues" | 7 | BUGTRACKER = "https://github.com/libical/libical/issues" |
8 | LICENSE = "LGPL-2.1-only | MPL-2.0" | 8 | LICENSE = "LGPL-2.1-only | MPL-2.0" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ |
10 | file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3da079536f0ed871 \ | 10 | file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ |
11 | file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ | 11 | file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ |
12 | " | 12 | " |
13 | SECTION = "libs" | 13 | SECTION = "libs" |
@@ -15,7 +15,7 @@ SECTION = "libs" | |||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ | 16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "bcda9a6db6870240328752854d1ea475af9bbc6356e6771018200e475e5f781b" | 18 | SRC_URI[sha256sum] = "72b7dc1a5937533aee5a2baefc990983b66b141dd80d43b51f80aced4aae219c" |
19 | 19 | ||
20 | inherit cmake pkgconfig gobject-introspection vala github-releases | 20 | inherit cmake pkgconfig gobject-introspection vala github-releases |
21 | 21 | ||
@@ -37,7 +37,8 @@ EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" | |||
37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" | 37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" |
38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" | 38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" |
39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" | 39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" |
40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF', d)}" | 40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" |
41 | EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" | ||
41 | 42 | ||
42 | # Tell the cross-libical where the tool it needs to build is | 43 | # Tell the cross-libical where the tool it needs to build is |
43 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" | 44 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" |
diff --git a/meta/recipes-support/libproxy/libproxy_0.5.4.bb b/meta/recipes-support/libproxy/libproxy_0.5.6.bb index b4f4c6d254..6a705b305f 100644 --- a/meta/recipes-support/libproxy/libproxy_0.5.4.bb +++ b/meta/recipes-support/libproxy/libproxy_0.5.6.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
14 | DEPENDS = "glib-2.0" | 14 | DEPENDS = "glib-2.0" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" | 16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" |
17 | SRCREV = "dff9a603d823dcc740ec966cd27960daa6b891b1" | 17 | SRCREV = "e7d18806575e21f94cf2f6024659386b129ca189" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit meson pkgconfig gobject-introspection vala gi-docgen | 20 | inherit meson pkgconfig gobject-introspection vala gi-docgen |
diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb index 06ba5e9c98..478e5f4289 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb | |||
@@ -17,10 +17,12 @@ S = "${WORKDIR}/git" | |||
17 | 17 | ||
18 | inherit autotools-brokensep pkgconfig ptest features_check | 18 | inherit autotools-brokensep pkgconfig ptest features_check |
19 | 19 | ||
20 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | ||
21 | |||
20 | REQUIRED_DISTRO_FEATURES = "seccomp" | 22 | REQUIRED_DISTRO_FEATURES = "seccomp" |
21 | 23 | ||
22 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
23 | PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" | 25 | PACKAGECONFIG[python] = "--enable-python, --disable-python, python3-cython-native" |
24 | 26 | ||
25 | DISABLE_STATIC = "" | 27 | DISABLE_STATIC = "" |
26 | 28 | ||
@@ -48,9 +50,13 @@ do_install_ptest() { | |||
48 | for file in $(find tools/.libs/* -executable -type f); do | 50 | for file in $(find tools/.libs/* -executable -type f); do |
49 | install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools | 51 | install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools |
50 | done | 52 | done |
53 | # fix python shebang | ||
54 | sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' ${D}/${PTEST_PATH}/tests/regression | ||
55 | sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' ${D}/${PTEST_PATH}/tests/*.py | ||
51 | } | 56 | } |
52 | 57 | ||
53 | FILES:${PN} = "${bindir} ${libdir}/${BPN}.so*" | 58 | FILES:${PN} = "${bindir} ${libdir}/${BPN}.so* ${PYTHON_SITEPACKAGES_DIR}/" |
54 | FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" | 59 | FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" |
55 | 60 | ||
61 | RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3', '', d)}" | ||
56 | RDEPENDS:${PN}-ptest = "coreutils bash" | 62 | RDEPENDS:${PN}-ptest = "coreutils bash" |
diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index 3208785124..c7b1604b61 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb | |||
@@ -40,3 +40,11 @@ do_install:append () { | |||
40 | } | 40 | } |
41 | 41 | ||
42 | BBCLASSEXTEND = "native" | 42 | BBCLASSEXTEND = "native" |
43 | |||
44 | # http://errors.yoctoproject.org/Errors/Build/183144/ | ||
45 | # libunwind-1.6.2/include/tdep-aarch64/libunwind_i.h:123:47: error: passing argument 1 of '_ULaarch64_uc_addr' from incompatible pointer type [-Wincompatible-pointer-types] | ||
46 | # libunwind-1.6.2/src/aarch64/Ginit.c:348:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
47 | # libunwind-1.6.2/src/aarch64/Ginit.c:377:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
48 | # libunwind-1.6.2/src/aarch64/Ginit_local.c:51:9: error: assignment to 'ucontext_t *' from incompatible pointer type 'unw_context_t *' {aka 'unw_tdep_context_t *'} [-Wincompatible-pointer-types] | ||
49 | # libunwind-1.6.2/src/aarch64/Gresume.c:37:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
50 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb index cf62c32d8b..ad85576dcb 100644 --- a/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb +++ b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" |
6 | 6 | ||
7 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" | 7 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" |
8 | SRC_URI[sha256sum] = "625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261bf4e" | 8 | SRC_URI[sha256sum] = "c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654" |
9 | 9 | ||
10 | inherit cmake manpages python3native github-releases | 10 | inherit cmake manpages python3native github-releases |
11 | PACKAGECONFIG[manpages] = "" | 11 | PACKAGECONFIG[manpages] = "" |
diff --git a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch b/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch deleted file mode 100644 index 47c426b4a5..0000000000 --- a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 May 2021 20:27:52 -0700 | ||
4 | Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc." | ||
5 | |||
6 | This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 8 +++----- | ||
12 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 8a9373c..8cda28d 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -284,11 +284,9 @@ AC_TYPE_SSIZE_T | ||
19 | # | ||
20 | # Checks for libraries and functions. | ||
21 | # | ||
22 | -# We test for pthread_detach because glibc 2.22 includes | ||
23 | -# pthread_create but not pthread_detach. | ||
24 | if test "$have_w32_system" = no; then | ||
25 | - AC_SEARCH_LIBS([pthread_detach],[pthread]) | ||
26 | - case "x$ac_cv_search_pthread_detach" in | ||
27 | + AC_SEARCH_LIBS([pthread_create],[pthread]) | ||
28 | + case "x$ac_cv_search_pthread_create" in | ||
29 | xno) | ||
30 | have_pthread=no | ||
31 | ;; | ||
32 | @@ -297,7 +295,7 @@ if test "$have_w32_system" = no; then | ||
33 | ;; | ||
34 | *) | ||
35 | have_pthread=yes | ||
36 | - config_libs="$config_libs $ac_cv_search_pthread_detach" | ||
37 | + config_libs="$config_libs $ac_cv_search_pthread_create" | ||
38 | ;; | ||
39 | esac | ||
40 | if test "$have_pthread" != no; then | ||
41 | -- | ||
42 | 2.31.1 | ||
43 | |||
diff --git a/meta/recipes-support/npth/npth/musl-fix.patch b/meta/recipes-support/npth/npth/musl-fix.patch new file mode 100644 index 0000000000..fabe78b14c --- /dev/null +++ b/meta/recipes-support/npth/npth/musl-fix.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 | ||
2 | From: NIIBE Yutaka <gniibe@fsij.org> | ||
3 | Date: Fri, 1 Mar 2024 13:53:52 +0900 | ||
4 | Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. | ||
5 | |||
6 | * configure.ac: Add a case for musl system. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | -- | ||
11 | |||
12 | GnuPG-bug-id: 5664 | ||
13 | Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> | ||
14 | --- | ||
15 | configure.ac | 5 ++++- | ||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index c1091b1..576a26e 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -381,7 +381,10 @@ fi | ||
23 | AC_SUBST(INSERT_NO_RWLOCK) | ||
24 | |||
25 | case "${host}" in | ||
26 | - *-*-linux*|*-*-gnu*) | ||
27 | + *-*-linux-musl*) | ||
28 | + INSERT_EXPOSE_RWLOCK_API="1" | ||
29 | + ;; | ||
30 | + *-*-linux-gnu*|*-*-gnu*) | ||
31 | INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" | ||
32 | ;; | ||
33 | *) | ||
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
37 | |||
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch deleted file mode 100644 index b6a12e7309..0000000000 --- a/meta/recipes-support/npth/npth/pkgconfig.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Added npth pkgconfig file | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: npth-1.1/src/npth.pc.in | ||
8 | =================================================================== | ||
9 | --- /dev/null | ||
10 | +++ npth-1.1/src/npth.pc.in | ||
11 | @@ -0,0 +1,10 @@ | ||
12 | +prefix=@prefix@ | ||
13 | +exec_prefix=@exec_prefix@ | ||
14 | +libdir=@libdir@ | ||
15 | +includedir=@includedir@ | ||
16 | + | ||
17 | +Name: npth | ||
18 | +Description: a new portable posix threading library | ||
19 | +Version: @VERSION@ | ||
20 | +Libs: -L${libdir} -lnpth -lpthread | ||
21 | +Cflags: -I${includedir} | ||
22 | Index: npth-1.1/src/Makefile.am | ||
23 | =================================================================== | ||
24 | --- npth-1.1.orig/src/Makefile.am | ||
25 | +++ npth-1.1/src/Makefile.am | ||
26 | @@ -27,8 +27,10 @@ | ||
27 | # License along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
28 | |||
29 | ## Process this file with automake to produce Makefile.in | ||
30 | +pkgconfigdir = $(libdir)/pkgconfig | ||
31 | +pkgconfig_DATA = npth.pc | ||
32 | |||
33 | -EXTRA_DIST = libnpth.vers | ||
34 | +EXTRA_DIST = libnpth.vers npth.pc | ||
35 | # versioninfo.rc.in | ||
36 | nodist_include_HEADERS = npth.h | ||
37 | |||
38 | Index: npth-1.1/configure.ac | ||
39 | =================================================================== | ||
40 | --- npth-1.1.orig/configure.ac | ||
41 | +++ npth-1.1/configure.ac | ||
42 | @@ -337,6 +337,7 @@ src/Makefile | ||
43 | w32/Makefile | ||
44 | tests/Makefile]) | ||
45 | AC_CONFIG_FILES(npth-config, chmod +x npth-config) | ||
46 | +AC_CONFIG_FILES([src/npth.pc]) | ||
47 | AC_OUTPUT | ||
48 | |||
49 | echo " | ||
diff --git a/meta/recipes-support/npth/npth_1.6.bb b/meta/recipes-support/npth/npth_1.6.bb deleted file mode 100644 index ef863d39b0..0000000000 --- a/meta/recipes-support/npth/npth_1.6.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | SUMMARY = "New GNU Portable Threads library" | ||
2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " | ||
3 | HOMEPAGE = "https://www.gnu.org/software/pth/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "LGPL-2.0-or-later" | ||
6 | LIC_FILES_CHKSUM = "\ | ||
7 | file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ | ||
8 | " | ||
9 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | ||
10 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | ||
11 | file://pkgconfig.patch \ | ||
12 | file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854" | ||
16 | SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1" | ||
17 | |||
18 | BINCONFIG = "${bindir}/npth-config" | ||
19 | |||
20 | inherit autotools binconfig-disabled multilib_header | ||
21 | |||
22 | FILES:${PN} = "${libdir}/libnpth.so.*" | ||
23 | FILES:${PN}-dev += "${bindir}/npth-config" | ||
24 | |||
25 | do_install:append() { | ||
26 | oe_multilib_header npth.h | ||
27 | } | ||
28 | |||
29 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb new file mode 100644 index 0000000000..0cf35565a3 --- /dev/null +++ b/meta/recipes-support/npth/npth_1.7.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "New GNU Portable Threads library" | ||
2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " | ||
3 | HOMEPAGE = "https://gnupg.org/software/npth/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "LGPL-2.0-or-later" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" | ||
7 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | ||
8 | |||
9 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | ||
10 | file://musl-fix.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" | ||
14 | |||
15 | inherit autotools multilib_header | ||
16 | |||
17 | do_install:append() { | ||
18 | oe_multilib_header npth.h | ||
19 | } | ||
20 | |||
21 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb index b7ebd44abc..2ede38deba 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb | |||
@@ -32,3 +32,13 @@ FILES:${PN} += " \ | |||
32 | INSANE_SKIP:${PN} = "dev-so" | 32 | INSANE_SKIP:${PN} = "dev-so" |
33 | 33 | ||
34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
35 | |||
36 | # # This one is reproducible only on 32bit MACHINEs | ||
37 | # http://errors.yoctoproject.org/Errors/Details/766969/ | ||
38 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
39 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
40 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
41 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
42 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
43 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
44 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.16.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb index f0aa3ff93f..ed755ae705 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.16.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb | |||
@@ -50,9 +50,9 @@ do_configure:prepend() { | |||
50 | } | 50 | } |
51 | 51 | ||
52 | do_install:append() { | 52 | do_install:append() { |
53 | install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools | 53 | install -Dm 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/rng-tools |
54 | install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools | 54 | install -Dm 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rng-tools |
55 | install -Dm 0644 ${WORKDIR}/rng-tools.service \ | 55 | install -Dm 0644 ${UNPACKDIR}/rng-tools.service \ |
56 | ${D}${systemd_system_unitdir}/rng-tools.service | 56 | ${D}${systemd_system_unitdir}/rng-tools.service |
57 | sed -i \ | 57 | sed -i \ |
58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
@@ -67,3 +67,7 @@ do_install:append() { | |||
67 | ${D}${systemd_system_unitdir}/rng-tools.service | 67 | ${D}${systemd_system_unitdir}/rng-tools.service |
68 | fi | 68 | fi |
69 | } | 69 | } |
70 | |||
71 | # libargp detection fails | ||
72 | # http://errors.yoctoproject.org/Errors/Details/766951/ | ||
73 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d6044..c8e6eddfec 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch | |||
@@ -31,7 +31,7 @@ ERROR: scons install execution failed. | |||
31 | and the installed paths (including the paths inside libserf*.pc) | 31 | and the installed paths (including the paths inside libserf*.pc) |
32 | look correct | 32 | look correct |
33 | 33 | ||
34 | Upstream-Status: Pending | 34 | Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] |
35 | 35 | ||
36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
37 | 37 | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb index 50612feb25..03d70bbd38 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb | |||
@@ -4,5 +4,5 @@ LICENSE = "PD" | |||
4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" | 4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" |
5 | 5 | ||
6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" | 6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" |
7 | SRC_URI[sha256sum] = "cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a" | 7 | SRC_URI[sha256sum] = "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531" |
8 | 8 | ||
diff --git a/meta/recipes-support/taglib/taglib_2.0.bb b/meta/recipes-support/taglib/taglib_2.0.1.bb index 4bf9be15ae..14f99aabbc 100644 --- a/meta/recipes-support/taglib/taglib_2.0.bb +++ b/meta/recipes-support/taglib/taglib_2.0.1.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "zlib utfcpp" | |||
11 | 11 | ||
12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" | 12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "e36ea877a6370810b97d84cf8f72b1e4ed205149ab3ac8232d44c850f38a2859" | 14 | SRC_URI[sha256sum] = "08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://taglib.org/" | 16 | UPSTREAM_CHECK_URI = "https://taglib.org/" |
17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" | 17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" |
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb index 639b01f6eb..2bd3699e74 100644 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb | |||
@@ -15,7 +15,7 @@ do_compile() { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf | 18 | install -D -m 0644 ${UNPACKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf |
19 | } | 19 | } |
20 | 20 | ||
21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" | 21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" |
diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 7807b322b3..65873b088d 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py | |||
@@ -1052,7 +1052,7 @@ def register_commands(subparsers, context): | |||
1052 | parser_ide_sdk.add_argument( | 1052 | parser_ide_sdk.add_argument( |
1053 | '-I', '--key', help='Specify ssh private key for connection to the target') | 1053 | '-I', '--key', help='Specify ssh private key for connection to the target') |
1054 | parser_ide_sdk.add_argument( | 1054 | parser_ide_sdk.add_argument( |
1055 | '--skip-bitbake', help='Generate IDE configuration but skip calling bibtake to update the SDK.', action='store_true') | 1055 | '--skip-bitbake', help='Generate IDE configuration but skip calling bitbake to update the SDK', action='store_true') |
1056 | parser_ide_sdk.add_argument( | 1056 | parser_ide_sdk.add_argument( |
1057 | '-k', '--bitbake-k', help='Pass -k parameter to bitbake', action='store_true') | 1057 | '-k', '--bitbake-k', help='Pass -k parameter to bitbake', action='store_true') |
1058 | parser_ide_sdk.add_argument( | 1058 | parser_ide_sdk.add_argument( |
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 7972b4f822..bd009f44b1 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -661,7 +661,18 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works | |||
661 | srctree_localdir = os.path.join(srctree, 'oe-local-files') | 661 | srctree_localdir = os.path.join(srctree, 'oe-local-files') |
662 | 662 | ||
663 | if sync: | 663 | if sync: |
664 | bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) | 664 | try: |
665 | logger.info('Backing up current %s branch as branch: %s.bak' % (devbranch, devbranch)) | ||
666 | bb.process.run('git branch -f ' + devbranch + '.bak', cwd=srctree) | ||
667 | |||
668 | # Use git fetch to update the source with the current recipe | ||
669 | # To be able to update the currently checked out branch with | ||
670 | # possibly new history (no fast-forward) git needs to be told | ||
671 | # that's ok | ||
672 | logger.info('Syncing source files including patches to git branch: %s' % devbranch) | ||
673 | bb.process.run('git fetch --update-head-ok --force file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) | ||
674 | except bb.process.ExecutionError as e: | ||
675 | raise DevtoolError("Error when syncing source files to local checkout: %s" % str(e)) | ||
665 | 676 | ||
666 | # Move the oe-local-files directory to srctree. | 677 | # Move the oe-local-files directory to srctree. |
667 | # As oe-local-files is not part of the constructed git tree, | 678 | # As oe-local-files is not part of the constructed git tree, |
@@ -1452,8 +1463,10 @@ def _export_local_files(srctree, rd, destdir, srctreebase): | |||
1452 | 1. updated - files that already exist in SRCURI | 1463 | 1. updated - files that already exist in SRCURI |
1453 | 2. added - new files files that don't exist in SRCURI | 1464 | 2. added - new files files that don't exist in SRCURI |
1454 | 3 removed - files that exist in SRCURI but not in exported files | 1465 | 3 removed - files that exist in SRCURI but not in exported files |
1455 | In each dict the key is the 'basepath' of the URI and value is the | 1466 | In each dict the key is the 'basepath' of the URI and value is: |
1456 | absolute path to the existing file in recipe space (if any). | 1467 | - for updated and added dicts, a dict with 1 optionnal key: |
1468 | - 'path': the absolute path to the existing file in recipe space (if any) | ||
1469 | - for removed dict, the absolute path to the existing file in recipe space | ||
1457 | """ | 1470 | """ |
1458 | import oe.recipeutils | 1471 | import oe.recipeutils |
1459 | 1472 | ||
@@ -1535,9 +1548,9 @@ def _export_local_files(srctree, rd, destdir, srctreebase): | |||
1535 | origpath = existing_files.pop(fname) | 1548 | origpath = existing_files.pop(fname) |
1536 | workpath = os.path.join(local_files_dir, fname) | 1549 | workpath = os.path.join(local_files_dir, fname) |
1537 | if not filecmp.cmp(origpath, workpath): | 1550 | if not filecmp.cmp(origpath, workpath): |
1538 | updated[fname] = origpath | 1551 | updated[fname] = {'path' : origpath} |
1539 | elif fname != '.gitignore': | 1552 | elif fname != '.gitignore': |
1540 | added[fname] = None | 1553 | added[fname] = {} |
1541 | 1554 | ||
1542 | workdir = rd.getVar('WORKDIR') | 1555 | workdir = rd.getVar('WORKDIR') |
1543 | s = rd.getVar('S') | 1556 | s = rd.getVar('S') |
@@ -1554,7 +1567,7 @@ def _export_local_files(srctree, rd, destdir, srctreebase): | |||
1554 | if os.path.exists(fpath): | 1567 | if os.path.exists(fpath): |
1555 | origpath = existing_files.pop(fname) | 1568 | origpath = existing_files.pop(fname) |
1556 | if not filecmp.cmp(origpath, fpath): | 1569 | if not filecmp.cmp(origpath, fpath): |
1557 | updated[fpath] = origpath | 1570 | updated[fpath] = {'path' : origpath} |
1558 | 1571 | ||
1559 | removed = existing_files | 1572 | removed = existing_files |
1560 | return (updated, added, removed) | 1573 | return (updated, added, removed) |
@@ -1640,7 +1653,8 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi | |||
1640 | redirect_output=dry_run_outdir) | 1653 | redirect_output=dry_run_outdir) |
1641 | else: | 1654 | else: |
1642 | files_dir = _determine_files_dir(rd) | 1655 | files_dir = _determine_files_dir(rd) |
1643 | for basepath, path in upd_f.items(): | 1656 | for basepath, param in upd_f.items(): |
1657 | path = param['path'] | ||
1644 | logger.info('Updating file %s%s' % (basepath, dry_run_suffix)) | 1658 | logger.info('Updating file %s%s' % (basepath, dry_run_suffix)) |
1645 | if os.path.isabs(basepath): | 1659 | if os.path.isabs(basepath): |
1646 | # Original file (probably with subdir pointing inside source tree) | 1660 | # Original file (probably with subdir pointing inside source tree) |
@@ -1650,7 +1664,8 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, appendlayerdir, wi | |||
1650 | _move_file(os.path.join(local_files_dir, basepath), path, | 1664 | _move_file(os.path.join(local_files_dir, basepath), path, |
1651 | dry_run_outdir=dry_run_outdir, base_outdir=recipedir) | 1665 | dry_run_outdir=dry_run_outdir, base_outdir=recipedir) |
1652 | update_srcuri= True | 1666 | update_srcuri= True |
1653 | for basepath, path in new_f.items(): | 1667 | for basepath, param in new_f.items(): |
1668 | path = param['path'] | ||
1654 | logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) | 1669 | logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) |
1655 | _move_file(os.path.join(local_files_dir, basepath), | 1670 | _move_file(os.path.join(local_files_dir, basepath), |
1656 | os.path.join(files_dir, basepath), | 1671 | os.path.join(files_dir, basepath), |
@@ -1772,7 +1787,8 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil | |||
1772 | else: | 1787 | else: |
1773 | # Update existing files | 1788 | # Update existing files |
1774 | files_dir = _determine_files_dir(rd) | 1789 | files_dir = _determine_files_dir(rd) |
1775 | for basepath, path in upd_f.items(): | 1790 | for basepath, param in upd_f.items(): |
1791 | path = param['path'] | ||
1776 | logger.info('Updating file %s' % basepath) | 1792 | logger.info('Updating file %s' % basepath) |
1777 | if os.path.isabs(basepath): | 1793 | if os.path.isabs(basepath): |
1778 | # Original file (probably with subdir pointing inside source tree) | 1794 | # Original file (probably with subdir pointing inside source tree) |
@@ -1806,7 +1822,7 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, appendlayerdir, wil | |||
1806 | dry_run_outdir=dry_run_outdir, base_outdir=recipedir) | 1822 | dry_run_outdir=dry_run_outdir, base_outdir=recipedir) |
1807 | updatefiles = True | 1823 | updatefiles = True |
1808 | # Add any new files | 1824 | # Add any new files |
1809 | for basepath, path in new_f.items(): | 1825 | for basepath, param in new_f.items(): |
1810 | logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) | 1826 | logger.info('Adding new file %s%s' % (basepath, dry_run_suffix)) |
1811 | _move_file(os.path.join(local_files_dir, basepath), | 1827 | _move_file(os.path.join(local_files_dir, basepath), |
1812 | os.path.join(files_dir, basepath), | 1828 | os.path.join(files_dir, basepath), |
@@ -1885,6 +1901,8 @@ def _update_recipe(recipename, workspace, rd, mode, appendlayerdir, wildcard_ver | |||
1885 | for line in stdout.splitlines(): | 1901 | for line in stdout.splitlines(): |
1886 | branchname = line[2:] | 1902 | branchname = line[2:] |
1887 | if line.startswith('* '): | 1903 | if line.startswith('* '): |
1904 | if 'HEAD' in line: | ||
1905 | raise DevtoolError('Detached HEAD - please check out a branch, e.g., "devtool"') | ||
1888 | startbranch = branchname | 1906 | startbranch = branchname |
1889 | if branchname.startswith(override_branch_prefix): | 1907 | if branchname.startswith(override_branch_prefix): |
1890 | override_branches.append(branchname) | 1908 | override_branches.append(branchname) |
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 341e893305..10945d6008 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -101,7 +101,7 @@ def determine_file_source(targetpath, rd): | |||
101 | import oe.recipeutils | 101 | import oe.recipeutils |
102 | 102 | ||
103 | # See if it's in do_install for the recipe | 103 | # See if it's in do_install for the recipe |
104 | workdir = rd.getVar('WORKDIR') | 104 | unpackdir = rd.getVar('UNPACKDIR') |
105 | src_uri = rd.getVar('SRC_URI') | 105 | src_uri = rd.getVar('SRC_URI') |
106 | srcfile = '' | 106 | srcfile = '' |
107 | modpatches = [] | 107 | modpatches = [] |
@@ -113,9 +113,9 @@ def determine_file_source(targetpath, rd): | |||
113 | if not srcpath.startswith('/'): | 113 | if not srcpath.startswith('/'): |
114 | # Handle non-absolute path | 114 | # Handle non-absolute path |
115 | srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath)) | 115 | srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath)) |
116 | if srcpath.startswith(workdir): | 116 | if srcpath.startswith(unpackdir): |
117 | # OK, now we have the source file name, look for it in SRC_URI | 117 | # OK, now we have the source file name, look for it in SRC_URI |
118 | workdirfile = os.path.relpath(srcpath, workdir) | 118 | workdirfile = os.path.relpath(srcpath, unpackdir) |
119 | # FIXME this is where we ought to have some code in the fetcher, because this is naive | 119 | # FIXME this is where we ought to have some code in the fetcher, because this is naive |
120 | for item in src_uri.split(): | 120 | for item in src_uri.split(): |
121 | localpath = bb.fetch2.localpath(item, rd) | 121 | localpath = bb.fetch2.localpath(item, rd) |
diff --git a/scripts/lib/recipetool/create_go.py b/scripts/lib/recipetool/create_go.py index c560831442..a85a2f2786 100644 --- a/scripts/lib/recipetool/create_go.py +++ b/scripts/lib/recipetool/create_go.py | |||
@@ -16,7 +16,7 @@ from html.parser import HTMLParser | |||
16 | from recipetool.create import RecipeHandler, handle_license_vars | 16 | from recipetool.create import RecipeHandler, handle_license_vars |
17 | from recipetool.create import guess_license, tidy_licenses, fixup_license | 17 | from recipetool.create import guess_license, tidy_licenses, fixup_license |
18 | from recipetool.create import determine_from_url | 18 | from recipetool.create import determine_from_url |
19 | from urllib.error import URLError | 19 | from urllib.error import URLError, HTTPError |
20 | 20 | ||
21 | import bb.utils | 21 | import bb.utils |
22 | import json | 22 | import json |
@@ -225,7 +225,7 @@ class GoRecipeHandler(RecipeHandler): | |||
225 | 225 | ||
226 | def __init__(self): | 226 | def __init__(self): |
227 | super().__init__() | 227 | super().__init__() |
228 | self.__srv = [] | 228 | self.__srv = {} |
229 | 229 | ||
230 | def handle_starttag(self, tag, attrs): | 230 | def handle_starttag(self, tag, attrs): |
231 | if tag == 'meta' and list( | 231 | if tag == 'meta' and list( |
@@ -233,36 +233,34 @@ class GoRecipeHandler(RecipeHandler): | |||
233 | content = list( | 233 | content = list( |
234 | filter(lambda a: (a[0] == 'content'), attrs)) | 234 | filter(lambda a: (a[0] == 'content'), attrs)) |
235 | if content: | 235 | if content: |
236 | self.__srv = content[0][1].split() | 236 | srv = content[0][1].split() |
237 | self.__srv[srv[0]] = srv | ||
237 | 238 | ||
238 | @property | 239 | def go_import(self, modulepath): |
239 | def import_prefix(self): | 240 | if modulepath in self.__srv: |
240 | return self.__srv[0] if len(self.__srv) else None | 241 | srv = self.__srv[modulepath] |
241 | 242 | return GoImport(srv[0], srv[1], srv[2], None) | |
242 | @property | 243 | return None |
243 | def vcs(self): | ||
244 | return self.__srv[1] if len(self.__srv) else None | ||
245 | |||
246 | @property | ||
247 | def repourl(self): | ||
248 | return self.__srv[2] if len(self.__srv) else None | ||
249 | 244 | ||
250 | url = url.geturl() + "?go-get=1" | 245 | url = url.geturl() + "?go-get=1" |
251 | req = urllib.request.Request(url) | 246 | req = urllib.request.Request(url) |
252 | 247 | ||
253 | try: | 248 | try: |
254 | resp = urllib.request.urlopen(req) | 249 | body = urllib.request.urlopen(req).read() |
255 | 250 | except HTTPError as http_err: | |
251 | logger.warning( | ||
252 | "Unclean status when fetching page from [%s]: %s", url, str(http_err)) | ||
253 | body = http_err.fp.read() | ||
256 | except URLError as url_err: | 254 | except URLError as url_err: |
257 | logger.warning( | 255 | logger.warning( |
258 | "Failed to fetch page from [%s]: %s", url, str(url_err)) | 256 | "Failed to fetch page from [%s]: %s", url, str(url_err)) |
259 | return None | 257 | return None |
260 | 258 | ||
261 | parser = GoImportHTMLParser() | 259 | parser = GoImportHTMLParser() |
262 | parser.feed(resp.read().decode('utf-8')) | 260 | parser.feed(body.decode('utf-8')) |
263 | parser.close() | 261 | parser.close() |
264 | 262 | ||
265 | return GoImport(parser.import_prefix, parser.vcs, parser.repourl, None) | 263 | return parser.go_import(modulepath) |
266 | 264 | ||
267 | def __resolve_from_golang_proxy(self, modulepath, version): | 265 | def __resolve_from_golang_proxy(self, modulepath, version): |
268 | """ | 266 | """ |
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index e29f3a4c2f..c990143c0d 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py | |||
@@ -43,7 +43,7 @@ class RootfsPlugin(SourcePlugin): | |||
43 | # directory, or modify a directory outside OpenEmbedded). | 43 | # directory, or modify a directory outside OpenEmbedded). |
44 | full_path = os.path.realpath(os.path.join(rootfs_dir, path)) | 44 | full_path = os.path.realpath(os.path.join(rootfs_dir, path)) |
45 | if not full_path.startswith(os.path.realpath(rootfs_dir)): | 45 | if not full_path.startswith(os.path.realpath(rootfs_dir)): |
46 | logger.error("%s: Must point inside the rootfs:" % (cmd, path)) | 46 | logger.error("%s: Must point inside the rootfs: %s" % (cmd, path)) |
47 | sys.exit(1) | 47 | sys.exit(1) |
48 | 48 | ||
49 | return full_path | 49 | return full_path |
diff --git a/scripts/oe-debuginfod b/scripts/oe-debuginfod index b525310225..5e70d37b8b 100755 --- a/scripts/oe-debuginfod +++ b/scripts/oe-debuginfod | |||
@@ -15,14 +15,29 @@ scriptpath.add_bitbake_lib_path() | |||
15 | 15 | ||
16 | import bb.tinfoil | 16 | import bb.tinfoil |
17 | import subprocess | 17 | import subprocess |
18 | import argparse | ||
18 | 19 | ||
19 | if __name__ == "__main__": | 20 | if __name__ == "__main__": |
21 | p = argparse.ArgumentParser() | ||
22 | p.add_argument("-d", action='store_true', \ | ||
23 | help="store debuginfod files in project sub-directory") | ||
24 | |||
25 | args = p.parse_args() | ||
26 | |||
20 | with bb.tinfoil.Tinfoil() as tinfoil: | 27 | with bb.tinfoil.Tinfoil() as tinfoil: |
21 | tinfoil.prepare(config_only=True) | 28 | tinfoil.prepare(config_only=True) |
22 | package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() | 29 | package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() |
23 | feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) | 30 | feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) |
24 | 31 | ||
32 | opts = [ '--verbose', '-R', '-U', feed_dir ] | ||
33 | |||
34 | if args.d: | ||
35 | fdir = os.path.join(os.getcwd(), 'oedid-files') | ||
36 | os.makedirs(fdir, exist_ok=True) | ||
37 | opts += [ '-d', os.path.join(fdir, 'did.sqlite') ] | ||
38 | |||
25 | subprocess.call(['bitbake', '-c', 'addto_recipe_sysroot', 'elfutils-native']) | 39 | subprocess.call(['bitbake', '-c', 'addto_recipe_sysroot', 'elfutils-native']) |
26 | 40 | ||
27 | subprocess.call(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', '-U', feed_dir]) | 41 | subprocess.call(['oe-run-native', 'elfutils-native', 'debuginfod'] + opts) |
42 | # we should not get here | ||
28 | print("\nTo use the debuginfod server please ensure that this variable PACKAGECONFIG:pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") | 43 | print("\nTo use the debuginfod server please ensure that this variable PACKAGECONFIG:pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") |
diff --git a/scripts/oe-setup-build b/scripts/oe-setup-build index 5364f2b481..c0476992a2 100755 --- a/scripts/oe-setup-build +++ b/scripts/oe-setup-build | |||
@@ -91,7 +91,16 @@ def setup_build_env(args): | |||
91 | builddir = args.b if args.b else template["buildpath"] | 91 | builddir = args.b if args.b else template["buildpath"] |
92 | no_shell = args.no_shell | 92 | no_shell = args.no_shell |
93 | coredir = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) | 93 | coredir = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')) |
94 | cmd = "TEMPLATECONF={} . {} {}".format(template["templatepath"], os.path.join(coredir, 'oe-init-build-env'), builddir) | 94 | cmd_base = ". {} {}".format(os.path.join(coredir, 'oe-init-build-env'), os.path.abspath(builddir)) |
95 | |||
96 | initbuild = os.path.join(builddir, 'init-build-env') | ||
97 | if not os.path.exists(initbuild): | ||
98 | os.makedirs(builddir, exist_ok=True) | ||
99 | with open(initbuild, 'w') as f: | ||
100 | f.write(cmd_base) | ||
101 | print("\nRun '. {}' to initialize the build in a current shell session.\n".format(initbuild)) | ||
102 | |||
103 | cmd = "TEMPLATECONF={} {}".format(template["templatepath"], cmd_base) | ||
95 | if not no_shell: | 104 | if not no_shell: |
96 | cmd = cmd + " && {}".format(os.environ['SHELL']) | 105 | cmd = cmd + " && {}".format(os.environ['SHELL']) |
97 | print("Running:", cmd) | 106 | print("Running:", cmd) |