diff options
Diffstat (limited to 'meta/recipes-devtools')
41 files changed, 882 insertions, 45 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch new file mode 100644 index 0000000000..c3a5ded494 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From dc7a8b3050a2a43f49515a03ae19713dfced75dc Mon Sep 17 00:00:00 2001 | ||
2 | From: David Kalnischkies <david@kalnischkies.de> | ||
3 | Date: Sat, 18 Nov 2023 13:10:05 +0000 | ||
4 | Subject: [PATCH] Raise cmake_minimum_required to 3.13 to avoid warnings | ||
5 | |||
6 | CMake Deprecation Warning at CMakeLists.txt:6 (cmake_minimum_required): | ||
7 | Compatibility with CMake < 3.5 will be removed from a future version of | ||
8 | CMake. | ||
9 | |||
10 | Update the VERSION argument <min> value or use a ...<max> suffix to tell | ||
11 | CMake that the project does not need compatibility with older versions. | ||
12 | |||
13 | Picking 3.13 here is a semi-random choice to avoid raising the requirement | ||
14 | too much needlessly while also hopefully avoiding needing to raise it | ||
15 | soon again based on the referenced mail. | ||
16 | |||
17 | While we are at it, lets also fix the other spewed warning: | ||
18 | |||
19 | CMake Warning (dev) at CMakeLists.txt:5 (project): | ||
20 | cmake_minimum_required() should be called prior to this top-level project() | ||
21 | call. Please see the cmake-commands(7) manual for usage documentation of | ||
22 | both commands. | ||
23 | |||
24 | References: https://lists.debian.org/msgid-search/20230617162957.6pklb6632zf4nijc@mail.gaussglocke.de | ||
25 | |||
26 | Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/dc7a8b3050a2a43f49515a03ae19713dfced75dc] | ||
27 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
28 | --- | ||
29 | CMakeLists.txt | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
33 | index 62182cddf..dae12e7c3 100644 | ||
34 | --- a/CMakeLists.txt | ||
35 | +++ b/CMakeLists.txt | ||
36 | @@ -2,8 +2,8 @@ | ||
37 | # Licensed under the same terms as APT; i.e. GPL 2 or later. | ||
38 | |||
39 | # set minimum version | ||
40 | +cmake_minimum_required(VERSION 3.13) | ||
41 | project(apt) | ||
42 | -cmake_minimum_required(VERSION 3.4.0) | ||
43 | # Generic header locations | ||
44 | include_directories(${PROJECT_BINARY_DIR}/include) | ||
45 | |||
46 | -- | ||
47 | GitLab | ||
diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index d605d950dd..50ac2ea812 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ | |||
14 | file://0001-aptwebserver.cc-Include-array.patch \ | 14 | file://0001-aptwebserver.cc-Include-array.patch \ |
15 | file://0001-Remove-using-std-binary_function.patch \ | 15 | file://0001-Remove-using-std-binary_function.patch \ |
16 | file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ | 16 | file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ |
17 | file://0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI:append:class-native = " \ | 20 | SRC_URI:append:class-native = " \ |
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.15.bb index 982d4830b5..88a6d11354 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.15.bb | |||
@@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib" | |||
18 | SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;tag=v${PV} \ | 18 | SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;tag=v${PV} \ |
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 = "5ad147c9ec00e657393c85b195c9bcc0f4c35a54" | 21 | SRCREV = "3da67f1c78bcbd7556f04d89e31aa4621face50b" |
22 | 22 | ||
23 | PACKAGECONFIG ??= " \ | 23 | PACKAGECONFIG ??= " \ |
24 | programs \ | 24 | programs \ |
diff --git a/meta/recipes-devtools/clang/common-clang.inc b/meta/recipes-devtools/clang/common-clang.inc index 15e6610b9b..cbea6b4d75 100644 --- a/meta/recipes-devtools/clang/common-clang.inc +++ b/meta/recipes-devtools/clang/common-clang.inc | |||
@@ -5,7 +5,7 @@ LLVM_HTTP ?= "https://github.com/llvm" | |||
5 | 5 | ||
6 | MAJOR_VER = "20" | 6 | MAJOR_VER = "20" |
7 | MINOR_VER = "1" | 7 | MINOR_VER = "1" |
8 | PATCH_VER = "6" | 8 | PATCH_VER = "7" |
9 | # could be 'rcX' or 'git' or empty ( for release ) | 9 | # could be 'rcX' or 'git' or empty ( for release ) |
10 | VER_SUFFIX = "" | 10 | VER_SUFFIX = "" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/clang/common.inc b/meta/recipes-devtools/clang/common.inc index 0684e648cc..37d37ec197 100644 --- a/meta/recipes-devtools/clang/common.inc +++ b/meta/recipes-devtools/clang/common.inc | |||
@@ -17,7 +17,7 @@ BASEURI ?= "${LLVM_HTTP}/llvm-project/releases/download/llvmorg-${PV}/llvm-proje | |||
17 | UPSTREAM_CHECK_URI = "${LLVM_HTTP}/llvm-project/releases/" | 17 | UPSTREAM_CHECK_URI = "${LLVM_HTTP}/llvm-project/releases/" |
18 | UPSTREAM_CHECK_REGEX = "releases/tag/llvmorg-?(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_REGEX = "releases/tag/llvmorg-?(?P<pver>\d+(\.\d+)+)" |
19 | SOURCEDIR ?= "llvm-project-${PV}.src" | 19 | SOURCEDIR ?= "llvm-project-${PV}.src" |
20 | SRC_URI[sha256sum] = "5c70549d524284c184fe9fbff862c3d2d7a61b787570611b5a30e5cc345f145e" | 20 | SRC_URI[sha256sum] = "cd8fd55d97ad3e360b1d5aaf98388d1f70dfffb7df36beee478be3b839ff9008" |
21 | 21 | ||
22 | SRC_URI = "\ | 22 | SRC_URI = "\ |
23 | ${BASEURI} \ | 23 | ${BASEURI} \ |
diff --git a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index 47438014b2..087a766302 100644 --- a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb | |||
@@ -37,6 +37,7 @@ CFLAGS += "${COMPILER_RT}" | |||
37 | CXXFLAGS += "${COMPILER_RT} ${LIBCPLUSPLUS}" | 37 | CXXFLAGS += "${COMPILER_RT} ${LIBCPLUSPLUS}" |
38 | 38 | ||
39 | TOOLCHAIN = "clang" | 39 | TOOLCHAIN = "clang" |
40 | TOOLCHAIN_NATIVE = "clang" | ||
40 | 41 | ||
41 | DEPENDS += "ninja-native virtual/crypt compiler-rt" | 42 | DEPENDS += "ninja-native virtual/crypt compiler-rt" |
42 | DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native" | 43 | DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native" |
diff --git a/meta/recipes-devtools/clang/compiler-rt_git.bb b/meta/recipes-devtools/clang/compiler-rt_git.bb index ff6cc29bf3..342a7b0e95 100644 --- a/meta/recipes-devtools/clang/compiler-rt_git.bb +++ b/meta/recipes-devtools/clang/compiler-rt_git.bb | |||
@@ -29,14 +29,15 @@ DEPENDS += "ninja-native libgcc" | |||
29 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" | 29 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" |
30 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime" | 30 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime" |
31 | DEPENDS:append:class-native = " clang-native" | 31 | DEPENDS:append:class-native = " clang-native" |
32 | DEPENDS:remove:class-native = "libcxx-native compiler-rt-native" | ||
32 | 33 | ||
33 | # Trick clang.bbclass into not creating circular dependencies | 34 | # Trick clang.bbclass into not creating circular dependencies |
34 | UNWINDLIB:class-nativesdk = "--unwindlib=libgcc" | 35 | UNWINDLIB:class-nativesdk = "--unwindlib=libgcc" |
35 | COMPILER_RT:class-nativesdk = "-rtlib=libgcc" | 36 | COMPILER_RT:class-nativesdk = "-rtlib=libgcc" |
36 | LIBCPLUSPLUS:class-nativesdk = "-stdlib=libstdc++" | 37 | LIBCPLUSPLUS:class-nativesdk = "-stdlib=libstdc++" |
37 | UNWINDLIB:class-native = "--unwindlib=libgcc" | 38 | UNWINDLIB:class-native = "" |
38 | COMPILER_RT:class-native = "-rtlib=libgcc" | 39 | COMPILER_RT:class-native = "" |
39 | LIBCPLUSPLUS:class-native = "-stdlib=libstdc++" | 40 | LIBCPLUSPLUS:class-native = "" |
40 | UNWINDLIB:class-target = "--unwindlib=libgcc" | 41 | UNWINDLIB:class-target = "--unwindlib=libgcc" |
41 | COMPILER_RT:class-target = "-rtlib=libgcc" | 42 | COMPILER_RT:class-target = "-rtlib=libgcc" |
42 | LIBCPLUSPLUS:class-target = "-stdlib=libstdc++" | 43 | LIBCPLUSPLUS:class-target = "-stdlib=libstdc++" |
@@ -52,8 +53,6 @@ HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', | |||
52 | 53 | ||
53 | CC = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" | 54 | CC = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" |
54 | CXX = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" | 55 | CXX = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" |
55 | BUILD_CC = "${CCACHE}clang ${BUILD_CC_ARCH}" | ||
56 | BUILD_CXX = "${CCACHE}clang++ ${BUILD_CC_ARCH}" | ||
57 | LDFLAGS += "${COMPILER_RT} ${UNWINDLIB}" | 56 | LDFLAGS += "${COMPILER_RT} ${UNWINDLIB}" |
58 | CXXFLAGS += "${LIBCPLUSPLUS}" | 57 | CXXFLAGS += "${LIBCPLUSPLUS}" |
59 | 58 | ||
diff --git a/meta/recipes-devtools/clang/libcxx_git.bb b/meta/recipes-devtools/clang/libcxx_git.bb index f5bf17f30a..d355fc3a0f 100644 --- a/meta/recipes-devtools/clang/libcxx_git.bb +++ b/meta/recipes-devtools/clang/libcxx_git.bb | |||
@@ -25,6 +25,7 @@ DEPENDS += "ninja-native" | |||
25 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs" | 25 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs" |
26 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt" | 26 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt" |
27 | DEPENDS:append:class-native = " clang-native compiler-rt-native" | 27 | DEPENDS:append:class-native = " clang-native compiler-rt-native" |
28 | DEPENDS:remove:class-native = "libcxx-native" | ||
28 | 29 | ||
29 | COMPILER_RT ?= "${@bb.utils.contains("PACKAGECONFIG", "compiler-rt", "-rtlib=compiler-rt", "-rtlib=libgcc", d)}" | 30 | COMPILER_RT ?= "${@bb.utils.contains("PACKAGECONFIG", "compiler-rt", "-rtlib=compiler-rt", "-rtlib=libgcc", d)}" |
30 | UNWINDLIB ?= "${@bb.utils.contains("PACKAGECONFIG", "unwind", "-unwindlib=none", "-unwindlib=libgcc", d)}" | 31 | UNWINDLIB ?= "${@bb.utils.contains("PACKAGECONFIG", "unwind", "-unwindlib=none", "-unwindlib=libgcc", d)}" |
@@ -55,6 +56,7 @@ LDFLAGS += "${COMPILER_RT} ${UNWINDLIB} ${LIBCPLUSPLUS}" | |||
55 | CXXFLAGS += "${LIBCPLUSPLUS}" | 56 | CXXFLAGS += "${LIBCPLUSPLUS}" |
56 | 57 | ||
57 | TOOLCHAIN = "clang" | 58 | TOOLCHAIN = "clang" |
59 | TOOLCHAIN_NATIVE = "clang" | ||
58 | 60 | ||
59 | OECMAKE_SOURCEPATH = "${S}/llvm" | 61 | OECMAKE_SOURCEPATH = "${S}/llvm" |
60 | EXTRA_OECMAKE += "\ | 62 | EXTRA_OECMAKE += "\ |
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-libname-of-Libs.private.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-libname-of-Libs.private.patch new file mode 100644 index 0000000000..ceccbda9d6 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Fix-libname-of-Libs.private.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | From 122963c764b06a4b487b32d4d1da330bd83da4d8 Mon Sep 17 00:00:00 2001 | ||
2 | From: fundawang <fundawang@yeah.net> | ||
3 | Date: Mon, 17 Mar 2025 19:05:08 +0800 | ||
4 | Subject: [PATCH] Fix libname of Libs.private | ||
5 | |||
6 | Upstream-Status: Backport [1c712194e604f6dd4f8a881e09d8236d4f770b67] | ||
7 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
8 | --- | ||
9 | src/createrepo_c.pc.cmake | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/createrepo_c.pc.cmake b/src/createrepo_c.pc.cmake | ||
13 | index 466487e2f490db28576611924e3d9ac94a99cb51..b7eb66318781b01f2b1348ab2c9dbd24d9a5c32f 100644 | ||
14 | --- a/src/createrepo_c.pc.cmake | ||
15 | +++ b/src/createrepo_c.pc.cmake | ||
16 | @@ -8,5 +8,5 @@ Version: @VERSION@ | ||
17 | Requires: glib-2.0 rpm libcurl sqlite3 | ||
18 | Requires.private: zlib libxml-2.0 | ||
19 | Libs: -L${libdir} -lcreaterepo_c | ||
20 | -Libs.private: -lbz2 -lzma | ||
21 | +Libs.private: -lbz2 -llzma | ||
22 | Cflags: -I${includedir} | ||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0002-Use-IMPORTED_TARGET-for-3rd-party-dependencies.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0002-Use-IMPORTED_TARGET-for-3rd-party-dependencies.patch new file mode 100644 index 0000000000..da50d27a76 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0002-Use-IMPORTED_TARGET-for-3rd-party-dependencies.patch | |||
@@ -0,0 +1,226 @@ | |||
1 | From 545532ec468d0dc768fee8a5e83153440509b273 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pietro Cerutti <gahr@gahr.ch> | ||
3 | Date: Tue, 1 Oct 2024 12:10:40 +0000 | ||
4 | Subject: [PATCH] Use IMPORTED_TARGET for 3rd-party dependencies | ||
5 | |||
6 | The current CMakeLists.txt fails to include the required link directories for 3rd-party packages. | ||
7 | As an example, on FreeBSD where packages are installed under /usr/local, the link lines include -lgio-2.0 but not -L/usr/local/lib. | ||
8 | |||
9 | The suggested solution is to use the IMPORTED_TARGET mode of pkg_check_modules. This requires CMake 3.6, so I have bumped the minimum required version. | ||
10 | |||
11 | Upstream-Status: Backport [89fa02828cdaf1c710c38bde5fcbcf59538a9cce] | ||
12 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
13 | --- | ||
14 | CMakeLists.txt | 22 +++++++++++----------- | ||
15 | src/CMakeLists.txt | 36 ++++++++++++++++++------------------ | ||
16 | tests/CMakeLists.txt | 30 +++++++++++++++--------------- | ||
17 | 3 files changed, 44 insertions(+), 44 deletions(-) | ||
18 | |||
19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
20 | index 9a18393f526a4eb74a53d5bddc84f75afcf0499c..c4bf525200ba24eb69ad08feb68b30f065bdac22 100644 | ||
21 | --- a/CMakeLists.txt | ||
22 | +++ b/CMakeLists.txt | ||
23 | @@ -1,4 +1,4 @@ | ||
24 | -CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12) | ||
25 | +CMAKE_MINIMUM_REQUIRED (VERSION 3.7) | ||
26 | PROJECT (createrepo_c C) | ||
27 | |||
28 | include(GNUInstallDirs) | ||
29 | @@ -39,13 +39,13 @@ find_package(LibXml2 REQUIRED) | ||
30 | find_package(OpenSSL REQUIRED) | ||
31 | find_package(ZLIB REQUIRED) | ||
32 | |||
33 | -pkg_check_modules(GLIB2 REQUIRED glib-2.0) | ||
34 | -pkg_check_modules(GIO REQUIRED gio-2.0) | ||
35 | -pkg_check_modules(GTHREAD2 REQUIRED gthread-2.0) | ||
36 | -pkg_check_modules(LZMA REQUIRED liblzma) | ||
37 | -pkg_check_modules(SQLITE3 REQUIRED sqlite3>=3.6.18) | ||
38 | -pkg_check_modules(RPM REQUIRED rpm) | ||
39 | -pkg_check_modules(ZSTD REQUIRED libzstd) | ||
40 | +pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0) | ||
41 | +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) | ||
42 | +pkg_check_modules(GTHREAD2 REQUIRED IMPORTED_TARGET gthread-2.0) | ||
43 | +pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma) | ||
44 | +pkg_check_modules(SQLITE3 REQUIRED IMPORTED_TARGET sqlite3>=3.6.18) | ||
45 | +pkg_check_modules(RPM REQUIRED IMPORTED_TARGET rpm) | ||
46 | +pkg_check_modules(ZSTD REQUIRED IMPORTED_TARGET libzstd) | ||
47 | |||
48 | # Add include dirs | ||
49 | |||
50 | @@ -73,7 +73,7 @@ ENDIF (WITH_LEGACY_HASHES) | ||
51 | # drpm | ||
52 | OPTION (ENABLE_DRPM "Enable delta RPM support?" OFF) | ||
53 | IF (ENABLE_DRPM) | ||
54 | - pkg_check_modules(DRPM REQUIRED drpm>=0.4.0) | ||
55 | + pkg_check_modules(DRPM REQUIRED IMPORTED_TARGET drpm>=0.4.0) | ||
56 | include_directories (${DRPM_INCLUDE_DIRS}) | ||
57 | ADD_DEFINITIONS("-DCR_DELTA_RPM_SUPPORT") | ||
58 | ENDIF (ENABLE_DRPM) | ||
59 | @@ -83,7 +83,7 @@ OPTION (ENABLE_PYTHON "Enable python support?" ON) | ||
60 | |||
61 | OPTION (WITH_ZCHUNK "Build with zchunk support" ON) | ||
62 | IF (WITH_ZCHUNK) | ||
63 | - pkg_check_modules(ZCK REQUIRED zck) | ||
64 | + pkg_check_modules(ZCK REQUIRED IMPORTED_TARGET zck) | ||
65 | include_directories(${ZCK_INCLUDE_DIRS}) | ||
66 | SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_ZCHUNK") | ||
67 | SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DWITH_ZCHUNK") | ||
68 | @@ -91,7 +91,7 @@ ENDIF (WITH_ZCHUNK) | ||
69 | |||
70 | OPTION (WITH_LIBMODULEMD "Build with libmodulemd support" ON) | ||
71 | IF (WITH_LIBMODULEMD) | ||
72 | - pkg_check_modules(LIBMODULEMD REQUIRED modulemd-2.0) | ||
73 | + pkg_check_modules(LIBMODULEMD REQUIRED IMPORTED_TARGET modulemd-2.0) | ||
74 | include_directories(${LIBMODULEMD_INCLUDE_DIRS}) | ||
75 | SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_LIBMODULEMD") | ||
76 | SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DWITH_LIBMODULEMD") | ||
77 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
78 | index 61b048044392b4204984af8969c3b1d74a9b8094..5309050bdadf6a14d9cddf4529d309ef97cc6d2c 100644 | ||
79 | --- a/src/CMakeLists.txt | ||
80 | +++ b/src/CMakeLists.txt | ||
81 | @@ -86,18 +86,18 @@ ENDIF () | ||
82 | ADD_LIBRARY(libcreaterepo_c ${createrepo_c_library_type} ${createrepo_c_SRCS}) | ||
83 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${BZIP2_LIBRARIES}) | ||
84 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${CURL_LIBRARY}) | ||
85 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
86 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${GIO_LIBRARIES}) | ||
87 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBMODULEMD_LIBRARIES}) | ||
88 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GLIB2) | ||
89 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GIO) | ||
90 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LIBMODULEMD) | ||
91 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBXML2_LIBRARIES}) | ||
92 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${LZMA_LIBRARIES}) | ||
93 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LZMA) | ||
94 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${OPENSSL_LIBRARIES}) | ||
95 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${RPM_LIBRARIES}) | ||
96 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${SQLITE3_LIBRARIES}) | ||
97 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::RPM) | ||
98 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::SQLITE3) | ||
99 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY}) | ||
100 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZCK_LIBRARIES}) | ||
101 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${DRPM_LIBRARIES}) | ||
102 | -TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZSTD_LIBRARIES}) | ||
103 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZCK) | ||
104 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::DRPM) | ||
105 | +TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZSTD) | ||
106 | |||
107 | SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES | ||
108 | OUTPUT_NAME "createrepo_c" | ||
109 | @@ -108,27 +108,27 @@ SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES | ||
110 | ADD_EXECUTABLE(createrepo_c createrepo_c.c cmd_parser.c) | ||
111 | TARGET_LINK_LIBRARIES(createrepo_c | ||
112 | libcreaterepo_c | ||
113 | - ${GLIB2_LIBRARIES} | ||
114 | - ${GTHREAD2_LIBRARIES}) | ||
115 | + PkgConfig::GLIB2 | ||
116 | + PkgConfig::GTHREAD2) | ||
117 | |||
118 | ADD_EXECUTABLE(mergerepo_c mergerepo_c.c) | ||
119 | TARGET_LINK_LIBRARIES(mergerepo_c | ||
120 | libcreaterepo_c | ||
121 | - ${GLIB2_LIBRARIES} | ||
122 | - ${GTHREAD2_LIBRARIES} | ||
123 | - ${LIBMODULEMD_LIBRARIES}) | ||
124 | + PkgConfig::GLIB2 | ||
125 | + PkgConfig::GTHREAD2 | ||
126 | + PkgConfig::LIBMODULEMD) | ||
127 | |||
128 | ADD_EXECUTABLE(modifyrepo_c modifyrepo_c.c) | ||
129 | TARGET_LINK_LIBRARIES(modifyrepo_c | ||
130 | libcreaterepo_c | ||
131 | - ${GLIB2_LIBRARIES} | ||
132 | - ${GTHREAD2_LIBRARIES}) | ||
133 | + PkgConfig::GLIB2 | ||
134 | + PkgConfig::GTHREAD2) | ||
135 | |||
136 | ADD_EXECUTABLE(sqliterepo_c sqliterepo_c.c) | ||
137 | TARGET_LINK_LIBRARIES(sqliterepo_c | ||
138 | libcreaterepo_c | ||
139 | - ${GLIB2_LIBRARIES} | ||
140 | - ${GTHREAD2_LIBRARIES}) | ||
141 | + PkgConfig::GLIB2 | ||
142 | + PkgConfig::GTHREAD2) | ||
143 | |||
144 | CONFIGURE_FILE("createrepo_c.pc.cmake" "${CMAKE_SOURCE_DIR}/src/createrepo_c.pc" @ONLY) | ||
145 | CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY) | ||
146 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | ||
147 | index 4ffe837edb64153a7261d19dbaf67aceac4b5746..37339ad75190827a8e501de64dbf929f9aee4cd4 100644 | ||
148 | --- a/tests/CMakeLists.txt | ||
149 | +++ b/tests/CMakeLists.txt | ||
150 | @@ -1,61 +1,61 @@ | ||
151 | ADD_EXECUTABLE(test_checksum test_checksum.c) | ||
152 | -TARGET_LINK_LIBRARIES(test_checksum libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
153 | +TARGET_LINK_LIBRARIES(test_checksum libcreaterepo_c PkgConfig::GLIB2) | ||
154 | ADD_DEPENDENCIES(tests test_checksum) | ||
155 | |||
156 | ADD_EXECUTABLE(test_compression_wrapper test_compression_wrapper.c) | ||
157 | -TARGET_LINK_LIBRARIES(test_compression_wrapper libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
158 | +TARGET_LINK_LIBRARIES(test_compression_wrapper libcreaterepo_c PkgConfig::GLIB2) | ||
159 | ADD_DEPENDENCIES(tests test_compression_wrapper) | ||
160 | |||
161 | ADD_EXECUTABLE(test_load_metadata test_load_metadata.c) | ||
162 | -TARGET_LINK_LIBRARIES(test_load_metadata libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
163 | +TARGET_LINK_LIBRARIES(test_load_metadata libcreaterepo_c PkgConfig::GLIB2) | ||
164 | ADD_DEPENDENCIES(tests test_load_metadata) | ||
165 | |||
166 | ADD_EXECUTABLE(test_locate_metadata test_locate_metadata.c) | ||
167 | -TARGET_LINK_LIBRARIES(test_locate_metadata libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
168 | +TARGET_LINK_LIBRARIES(test_locate_metadata libcreaterepo_c PkgConfig::GLIB2) | ||
169 | ADD_DEPENDENCIES(tests test_locate_metadata) | ||
170 | |||
171 | ADD_EXECUTABLE(test_misc test_misc.c) | ||
172 | -TARGET_LINK_LIBRARIES(test_misc libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
173 | +TARGET_LINK_LIBRARIES(test_misc libcreaterepo_c PkgConfig::GLIB2) | ||
174 | ADD_DEPENDENCIES(tests test_misc) | ||
175 | |||
176 | ADD_EXECUTABLE(test_sqlite test_sqlite.c) | ||
177 | -TARGET_LINK_LIBRARIES(test_sqlite libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
178 | +TARGET_LINK_LIBRARIES(test_sqlite libcreaterepo_c PkgConfig::GLIB2) | ||
179 | ADD_DEPENDENCIES(tests test_sqlite) | ||
180 | |||
181 | ADD_EXECUTABLE(test_xml_file test_xml_file.c) | ||
182 | -TARGET_LINK_LIBRARIES(test_xml_file libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
183 | +TARGET_LINK_LIBRARIES(test_xml_file libcreaterepo_c PkgConfig::GLIB2) | ||
184 | ADD_DEPENDENCIES(tests test_xml_file) | ||
185 | |||
186 | ADD_EXECUTABLE(test_xml_parser_filelists test_xml_parser_filelists.c) | ||
187 | -TARGET_LINK_LIBRARIES(test_xml_parser_filelists libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
188 | +TARGET_LINK_LIBRARIES(test_xml_parser_filelists libcreaterepo_c PkgConfig::GLIB2) | ||
189 | ADD_DEPENDENCIES(tests test_xml_parser_filelists) | ||
190 | |||
191 | ADD_EXECUTABLE(test_xml_parser_repomd test_xml_parser_repomd.c) | ||
192 | -TARGET_LINK_LIBRARIES(test_xml_parser_repomd libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
193 | +TARGET_LINK_LIBRARIES(test_xml_parser_repomd libcreaterepo_c PkgConfig::GLIB2) | ||
194 | ADD_DEPENDENCIES(tests test_xml_parser_repomd) | ||
195 | |||
196 | ADD_EXECUTABLE(test_xml_parser_updateinfo test_xml_parser_updateinfo.c) | ||
197 | -TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
198 | +TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c PkgConfig::GLIB2) | ||
199 | ADD_DEPENDENCIES(tests test_xml_parser_updateinfo) | ||
200 | |||
201 | ADD_EXECUTABLE(test_xml_parser_main_metadata_together test_xml_parser_main_metadata_together.c) | ||
202 | -TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
203 | +TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c PkgConfig::GLIB2) | ||
204 | ADD_DEPENDENCIES(tests test_xml_parser_main_metadata_together) | ||
205 | |||
206 | ADD_EXECUTABLE(test_xml_dump test_xml_dump.c) | ||
207 | -TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
208 | +TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c PkgConfig::GLIB2) | ||
209 | ADD_DEPENDENCIES(tests test_xml_dump) | ||
210 | |||
211 | ADD_EXECUTABLE(test_xml_dump_primary test_xml_dump_primary.c) | ||
212 | -TARGET_LINK_LIBRARIES(test_xml_dump_primary libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
213 | +TARGET_LINK_LIBRARIES(test_xml_dump_primary libcreaterepo_c PkgConfig::GLIB2) | ||
214 | ADD_DEPENDENCIES(tests test_xml_dump_primary) | ||
215 | |||
216 | ADD_EXECUTABLE(test_koji test_koji.c) | ||
217 | -TARGET_LINK_LIBRARIES(test_koji libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
218 | +TARGET_LINK_LIBRARIES(test_koji libcreaterepo_c PkgConfig::GLIB2) | ||
219 | ADD_DEPENDENCIES(tests test_koji) | ||
220 | |||
221 | ADD_EXECUTABLE(test_modifyrepo_shared test_modifyrepo_shared.c) | ||
222 | -TARGET_LINK_LIBRARIES(test_modifyrepo_shared libcreaterepo_c ${GLIB2_LIBRARIES}) | ||
223 | +TARGET_LINK_LIBRARIES(test_modifyrepo_shared libcreaterepo_c PkgConfig::GLIB2) | ||
224 | ADD_DEPENDENCIES(tests test_modifyrepo_shared) | ||
225 | |||
226 | CONFIGURE_FILE("run_tests.sh.in" "${CMAKE_BINARY_DIR}/tests/run_tests.sh") | ||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0003-Don-t-try-to-use-imported-targets-of-turned-off-depe.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0003-Don-t-try-to-use-imported-targets-of-turned-off-depe.patch new file mode 100644 index 0000000000..769976694e --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0003-Don-t-try-to-use-imported-targets-of-turned-off-depe.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From cfd899731f40695e9fd362dc64098e27636808fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Pietro Cerutti <gahr@gahr.ch> | ||
3 | Date: Mon, 14 Oct 2024 11:49:42 +0000 | ||
4 | Subject: [PATCH] Don't try to use imported targets of turned-off dependencies | ||
5 | |||
6 | Upstream-Status: Backport [0a2da7c87ae9b7e3e11e77416a8e75633d4608a0] | ||
7 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
8 | --- | ||
9 | src/CMakeLists.txt | 18 +++++++++++++----- | ||
10 | 1 file changed, 13 insertions(+), 5 deletions(-) | ||
11 | |||
12 | diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
13 | index 5309050bdadf6a14d9cddf4529d309ef97cc6d2c..9444875ff1a2fd2ce0ccc678e121ea54ce0d1b83 100644 | ||
14 | --- a/src/CMakeLists.txt | ||
15 | +++ b/src/CMakeLists.txt | ||
16 | @@ -88,15 +88,21 @@ TARGET_LINK_LIBRARIES(libcreaterepo_c ${BZIP2_LIBRARIES}) | ||
17 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${CURL_LIBRARY}) | ||
18 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GLIB2) | ||
19 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::GIO) | ||
20 | -TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LIBMODULEMD) | ||
21 | +IF (WITH_LIBMODULEMD) | ||
22 | + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LIBMODULEMD) | ||
23 | +ENDIF (WITH_LIBMODULEMD) | ||
24 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${LIBXML2_LIBRARIES}) | ||
25 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::LZMA) | ||
26 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${OPENSSL_LIBRARIES}) | ||
27 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::RPM) | ||
28 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::SQLITE3) | ||
29 | TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY}) | ||
30 | -TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZCK) | ||
31 | -TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::DRPM) | ||
32 | +IF (WITH_ZCHUNK) | ||
33 | + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZCK) | ||
34 | +ENDIF (WITH_ZCHUNK) | ||
35 | +IF (ENABLE_DRPM) | ||
36 | + TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::DRPM) | ||
37 | +ENDIF (ENABLE_DRPM) | ||
38 | TARGET_LINK_LIBRARIES(libcreaterepo_c PkgConfig::ZSTD) | ||
39 | |||
40 | SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES | ||
41 | @@ -115,8 +121,10 @@ ADD_EXECUTABLE(mergerepo_c mergerepo_c.c) | ||
42 | TARGET_LINK_LIBRARIES(mergerepo_c | ||
43 | libcreaterepo_c | ||
44 | PkgConfig::GLIB2 | ||
45 | - PkgConfig::GTHREAD2 | ||
46 | - PkgConfig::LIBMODULEMD) | ||
47 | + PkgConfig::GTHREAD2) | ||
48 | +IF (WITH_LIBMODULEMD) | ||
49 | + TARGET_LINK_LIBRARIES(mergerepo_c PkgConfig::LIBMODULEMD) | ||
50 | +ENDIF (WITH_LIBMODULEMD) | ||
51 | |||
52 | ADD_EXECUTABLE(modifyrepo_c modifyrepo_c.c) | ||
53 | TARGET_LINK_LIBRARIES(modifyrepo_c | ||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0004-cmake-Allow-builds-without-Doxygen-being-present-wit.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0004-cmake-Allow-builds-without-Doxygen-being-present-wit.patch new file mode 100644 index 0000000000..acf888e7ba --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0004-cmake-Allow-builds-without-Doxygen-being-present-wit.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 90f39874bd122ca9e966f32c01e43e922031018e Mon Sep 17 00:00:00 2001 | ||
2 | From: Moritz Haase <Moritz.Haase@bmw.de> | ||
3 | Date: Mon, 23 Jun 2025 09:21:07 +0200 | ||
4 | Subject: [PATCH] cmake: Allow builds without Doxygen being present with CMake | ||
5 | 4+ | ||
6 | |||
7 | With CMake 4+, the initial CMake run fails with | ||
8 | |||
9 | CMake Error at doc/CMakeLists.txt:18 (ADD_DEPENDENCIES): | ||
10 | The dependency target "doc-c" of target "doc" does not exist. | ||
11 | |||
12 | in case Doxygen is not installed on the system, since non-existent dependencies | ||
13 | are not ignored anymore (see [0]). Rectify that by making sure that we only add | ||
14 | the dependency in case Doxygen has been found. | ||
15 | |||
16 | [0]: https://cmake.org/cmake/help/latest/policy/CMP0046.html | ||
17 | |||
18 | Upstream-Status: Backport [908e3a4a5909ab107da41c2631a06c6b23617f3c] | ||
19 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
20 | --- | ||
21 | doc/CMakeLists.txt | 7 ++++--- | ||
22 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
23 | |||
24 | diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt | ||
25 | index 6b2ef5e0593757c7b977cd5d228b7774b4f45641..6332b91260ff87f16e331071e652bfe0b167f518 100644 | ||
26 | --- a/doc/CMakeLists.txt | ||
27 | +++ b/doc/CMakeLists.txt | ||
28 | @@ -1,11 +1,15 @@ | ||
29 | ADD_SUBDIRECTORY (python) | ||
30 | |||
31 | +ADD_CUSTOM_TARGET (doc) | ||
32 | +ADD_DEPENDENCIES (doc doc-python) | ||
33 | + | ||
34 | find_package(Doxygen) | ||
35 | if(DOXYGEN_FOUND) | ||
36 | CONFIGURE_FILE("Doxyfile.in.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.in" @ONLY) | ||
37 | add_custom_target(doc-c | ||
38 | ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.in | ||
39 | COMMENT "Building C API documentation with Doxygen" VERBATIM) | ||
40 | + ADD_DEPENDENCIES (doc doc-c) | ||
41 | endif(DOXYGEN_FOUND) | ||
42 | |||
43 | IF(CREATEREPO_C_INSTALL_MANPAGES) | ||
44 | @@ -13,6 +17,3 @@ IF(CREATEREPO_C_INSTALL_MANPAGES) | ||
45 | DESTINATION "${CMAKE_INSTALL_MANDIR}/man8" | ||
46 | COMPONENT bin) | ||
47 | ENDIF(CREATEREPO_C_INSTALL_MANPAGES) | ||
48 | - | ||
49 | -ADD_CUSTOM_TARGET (doc) | ||
50 | -ADD_DEPENDENCIES (doc doc-python doc-c) | ||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb index 63a717726c..ecd43b0c0b 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb | |||
@@ -7,6 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
7 | SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https;tag=${PV} \ | 7 | SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https;tag=${PV} \ |
8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
9 | file://0001-include-rpm-rpmstring.h.patch \ | 9 | file://0001-include-rpm-rpmstring.h.patch \ |
10 | file://0001-Fix-libname-of-Libs.private.patch \ | ||
11 | file://0002-Use-IMPORTED_TARGET-for-3rd-party-dependencies.patch \ | ||
12 | file://0003-Don-t-try-to-use-imported-targets-of-turned-off-depe.patch \ | ||
13 | file://0004-cmake-Allow-builds-without-Doxygen-being-present-wit.patch \ | ||
10 | " | 14 | " |
11 | 15 | ||
12 | SRCREV = "8c6e6f88df86d1e34ca26d3835d77a2816326414" | 16 | SRCREV = "8c6e6f88df86d1e34ca26d3835d77a2816326414" |
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0001-fsck.fat-Adhere-to-the-fsck-exit-codes.patch b/meta/recipes-devtools/dosfstools/dosfstools/0001-fsck.fat-Adhere-to-the-fsck-exit-codes.patch new file mode 100644 index 0000000000..3d2ce48723 --- /dev/null +++ b/meta/recipes-devtools/dosfstools/dosfstools/0001-fsck.fat-Adhere-to-the-fsck-exit-codes.patch | |||
@@ -0,0 +1,214 @@ | |||
1 | From 9d165145b9f9c20a56e111360fbc2003c2b28cba Mon Sep 17 00:00:00 2001 | ||
2 | From: Ricardo Simoes <ricardo.simoes@pt.bosch.com> | ||
3 | Date: Thu, 26 Jun 2025 08:14:29 +0100 | ||
4 | Subject: [PATCH] fsck.fat: Adhere to the fsck exit codes | ||
5 | |||
6 | fsck.fat is used as a filesystem-specific checker for the `fsck`. This | ||
7 | also causes `fsck` to return the same exit-codes given by `fsck.fat`. | ||
8 | |||
9 | In most cases this is already the case. One exception to that comes when | ||
10 | checking a read-only filesystem. In that case `fsck.fat` will return 6, | ||
11 | which for `fsck` means "Fiesystem errors left uncorrected" and "System | ||
12 | should reboot". When a more proper response would be to return 8, | ||
13 | "Operational Error". | ||
14 | |||
15 | This commit solves that problem by introducing a new header file which | ||
16 | standardizes the exit codes used by `fsck.fat`. | ||
17 | |||
18 | Signed-off-by: Ricardo Ungerer <ungerer.ricardo@gmail.com> | ||
19 | |||
20 | Upstream-Status: Inactive-Upstream [lastcommit: 2023, lastrelease: 2021] | ||
21 | Upstream-Status: Submitted [https://github.com/dosfstools/dosfstools/pull/217] | ||
22 | --- | ||
23 | src/Makefile.am | 4 ++-- | ||
24 | src/common.c | 8 ++++---- | ||
25 | src/exit_codes.h | 15 +++++++++++++++ | ||
26 | src/fsck.fat.c | 23 ++++++++++++----------- | ||
27 | src/io.c | 3 ++- | ||
28 | 5 files changed, 35 insertions(+), 18 deletions(-) | ||
29 | create mode 100644 src/exit_codes.h | ||
30 | |||
31 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
32 | index a389046..48f00dd 100644 | ||
33 | --- a/src/Makefile.am | ||
34 | +++ b/src/Makefile.am | ||
35 | @@ -23,7 +23,7 @@ EXTRA_DIST = blkdev/README | ||
36 | |||
37 | charconv_common_sources = charconv.c charconv.h | ||
38 | charconv_common_ldadd = $(LIBICONV) | ||
39 | -fscklabel_common_sources = boot.c boot.h common.c common.h \ | ||
40 | +fscklabel_common_sources = boot.c boot.h common.c common.h exit_codes.h \ | ||
41 | fat.c fat.h io.c io.h msdos_fs.h \ | ||
42 | $(charconv_common_sources) \ | ||
43 | fsck.fat.h endian_compat.h | ||
44 | @@ -38,7 +38,7 @@ devinfo_common_sources = device_info.c device_info.h \ | ||
45 | blkdev/blkdev.c blkdev/blkdev.h \ | ||
46 | blkdev/linux_version.c blkdev/linux_version.h | ||
47 | mkfs_fat_SOURCES = mkfs.fat.c msdos_fs.h common.c common.h endian_compat.h \ | ||
48 | - $(charconv_common_sources) $(devinfo_common_sources) | ||
49 | + exit_codes.h $(charconv_common_sources) $(devinfo_common_sources) | ||
50 | mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev | ||
51 | mkfs_fat_CFLAGS = $(AM_CFLAGS) | ||
52 | mkfs_fat_LDADD = $(charconv_common_ldadd) | ||
53 | diff --git a/src/common.c b/src/common.c | ||
54 | index 4f1afcb..089d4b3 100644 | ||
55 | --- a/src/common.c | ||
56 | +++ b/src/common.c | ||
57 | @@ -38,7 +38,7 @@ | ||
58 | |||
59 | #include "common.h" | ||
60 | #include "charconv.h" | ||
61 | - | ||
62 | +#include "exit_codes.h" | ||
63 | |||
64 | int interactive; | ||
65 | int write_immed; | ||
66 | @@ -62,7 +62,7 @@ void die(const char *msg, ...) | ||
67 | vfprintf(stderr, msg, args); | ||
68 | va_end(args); | ||
69 | fprintf(stderr, "\n"); | ||
70 | - exit(1); | ||
71 | + exit(OPERATIONAL_ERROR); | ||
72 | } | ||
73 | |||
74 | void pdie(const char *msg, ...) | ||
75 | @@ -205,7 +205,7 @@ int get_choice(int noninteractive_result, const char *noninteractive_msg, | ||
76 | } while (choice == '\n'); /* filter out enter presses */ | ||
77 | |||
78 | if (choice == EOF) | ||
79 | - exit(1); | ||
80 | + exit(USAGE_OR_SYNTAX_ERROR); | ||
81 | |||
82 | printf("%c\n", choice); | ||
83 | |||
84 | @@ -235,7 +235,7 @@ int get_choice(int noninteractive_result, const char *noninteractive_msg, | ||
85 | inhibit_quit_choice = 0; | ||
86 | |||
87 | if (quit_choice == 1) | ||
88 | - exit(0); | ||
89 | + exit(NO_ERRORS); | ||
90 | } | ||
91 | } | ||
92 | |||
93 | diff --git a/src/exit_codes.h b/src/exit_codes.h | ||
94 | new file mode 100644 | ||
95 | index 0000000..f67d22e | ||
96 | --- /dev/null | ||
97 | +++ b/src/exit_codes.h | ||
98 | @@ -0,0 +1,15 @@ | ||
99 | +#ifndef _EXIT_CODES_H | ||
100 | +#define _EXIT_CODES_H | ||
101 | + | ||
102 | +/* Codes as defined by fsck. | ||
103 | + For more information, see fsck manpage. */ | ||
104 | +#define NO_ERRORS 0 | ||
105 | +#define FS_ERRORS_CORRECTED 1 | ||
106 | +#define SYSTEM_SHOULD_BE_REBOOTED 2 | ||
107 | +#define FS_ERRORS_LEFT_UNCORRECTED 4 | ||
108 | +#define OPERATIONAL_ERROR 8 | ||
109 | +#define USAGE_OR_SYNTAX_ERROR 16 | ||
110 | +#define CHECKING_CANCELED_BY_USER 32 | ||
111 | +#define SHARED_LIB_ERROR 128 | ||
112 | + | ||
113 | +#endif | ||
114 | diff --git a/src/fsck.fat.c b/src/fsck.fat.c | ||
115 | index 8b02b57..42e3ab4 100644 | ||
116 | --- a/src/fsck.fat.c | ||
117 | +++ b/src/fsck.fat.c | ||
118 | @@ -46,6 +46,7 @@ | ||
119 | #include "file.h" | ||
120 | #include "check.h" | ||
121 | #include "charconv.h" | ||
122 | +#include "exit_codes.h" | ||
123 | |||
124 | int rw = 0, list = 0, test = 0, verbose = 0; | ||
125 | long fat_table = 0; | ||
126 | @@ -147,10 +148,10 @@ int main(int argc, char **argv) | ||
127 | codepage = strtol(optarg, &tmp, 10); | ||
128 | if (!*optarg || isspace(*optarg) || *tmp || errno || codepage < 0 || codepage > INT_MAX) { | ||
129 | fprintf(stderr, "Invalid codepage : %s\n", optarg); | ||
130 | - usage(argv[0], 2); | ||
131 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
132 | } | ||
133 | if (!set_dos_codepage(codepage)) | ||
134 | - usage(argv[0], 2); | ||
135 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
136 | break; | ||
137 | case 'd': | ||
138 | file_add(optarg, fdt_drop); | ||
139 | @@ -163,7 +164,7 @@ int main(int argc, char **argv) | ||
140 | fat_table = strtol(optarg, &tmp, 10); | ||
141 | if (!*optarg || isspace(*optarg) || *tmp || errno || fat_table < 0 || fat_table > 255) { | ||
142 | fprintf(stderr, "Invalid FAT table : %s\n", optarg); | ||
143 | - usage(argv[0], 2); | ||
144 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
145 | } | ||
146 | break; | ||
147 | case 'l': | ||
148 | @@ -202,31 +203,31 @@ int main(int argc, char **argv) | ||
149 | atari_format = 1; | ||
150 | } else { | ||
151 | fprintf(stderr, "Unknown variant: %s\n", optarg); | ||
152 | - usage(argv[0], 2); | ||
153 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
154 | } | ||
155 | break; | ||
156 | case 'w': | ||
157 | write_immed = 1; | ||
158 | break; | ||
159 | case OPT_HELP: | ||
160 | - usage(argv[0], 0); | ||
161 | + usage(argv[0], EXIT_SUCCESS); | ||
162 | break; | ||
163 | case '?': | ||
164 | - usage(argv[0], 2); | ||
165 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
166 | break; | ||
167 | default: | ||
168 | fprintf(stderr, | ||
169 | "Internal error: getopt_long() returned unexpected value %d\n", c); | ||
170 | - exit(3); | ||
171 | + exit(OPERATIONAL_ERROR); | ||
172 | } | ||
173 | if (!set_dos_codepage(-1)) /* set default codepage if none was given in command line */ | ||
174 | - exit(2); | ||
175 | + exit(OPERATIONAL_ERROR); | ||
176 | if ((test || write_immed) && !rw) { | ||
177 | fprintf(stderr, "-t and -w can not be used in read only mode\n"); | ||
178 | - exit(2); | ||
179 | + exit(USAGE_OR_SYNTAX_ERROR); | ||
180 | } | ||
181 | if (optind != argc - 1) | ||
182 | - usage(argv[0], 2); | ||
183 | + usage(argv[0], USAGE_OR_SYNTAX_ERROR); | ||
184 | |||
185 | printf("fsck.fat " VERSION " (" VERSION_DATE ")\n"); | ||
186 | fs_open(argv[optind], rw); | ||
187 | @@ -285,5 +286,5 @@ exit: | ||
188 | n_files, (unsigned long)fs.data_clusters - free_clusters, | ||
189 | (unsigned long)fs.data_clusters); | ||
190 | |||
191 | - return fs_close(rw) ? 1 : 0; | ||
192 | + return fs_close(rw) ? FS_ERRORS_CORRECTED : NO_ERRORS; | ||
193 | } | ||
194 | diff --git a/src/io.c b/src/io.c | ||
195 | index 8c0c3b2..8bd1ae5 100644 | ||
196 | --- a/src/io.c | ||
197 | +++ b/src/io.c | ||
198 | @@ -44,6 +44,7 @@ | ||
199 | #include "fsck.fat.h" | ||
200 | #include "common.h" | ||
201 | #include "io.h" | ||
202 | +#include "exit_codes.h" | ||
203 | |||
204 | typedef struct _change { | ||
205 | void *data; | ||
206 | @@ -60,7 +61,7 @@ void fs_open(const char *path, int rw) | ||
207 | { | ||
208 | if ((fd = open(path, rw ? O_RDWR : O_RDONLY)) < 0) { | ||
209 | perror("open"); | ||
210 | - exit(6); | ||
211 | + exit(OPERATIONAL_ERROR); | ||
212 | } | ||
213 | changes = last = NULL; | ||
214 | did_change = 0; | ||
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/0002-manpages-Document-fsck.fat-new-exit-codes.patch b/meta/recipes-devtools/dosfstools/dosfstools/0002-manpages-Document-fsck.fat-new-exit-codes.patch new file mode 100644 index 0000000000..29bba7b093 --- /dev/null +++ b/meta/recipes-devtools/dosfstools/dosfstools/0002-manpages-Document-fsck.fat-new-exit-codes.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 8d703216d2ea3247092a08adb0c37b38eb77ccc7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ricardo Ungerer <ungerer.ricardo@gmail.com> | ||
3 | Date: Wed, 21 May 2025 07:18:15 +0100 | ||
4 | Subject: [PATCH 2/3] manpages: Document fsck.fat new exit codes | ||
5 | |||
6 | Signed-off-by: Ricardo Ungerer <ungerer.ricardo@gmail.com> | ||
7 | |||
8 | Upstream-Status: Inactive-Upstream [lastcommit: 2023, lastrelease: 2021] | ||
9 | Upstream-Status: Submitted [https://github.com/dosfstools/dosfstools/pull/217] | ||
10 | --- | ||
11 | manpages/fsck.fat.8.in | 18 +++++++++++++----- | ||
12 | 1 file changed, 13 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/manpages/fsck.fat.8.in b/manpages/fsck.fat.8.in | ||
15 | index 824a83d..557aa4c 100644 | ||
16 | --- a/manpages/fsck.fat.8.in | ||
17 | +++ b/manpages/fsck.fat.8.in | ||
18 | @@ -222,13 +222,21 @@ Display help message describing usage and options then exit. | ||
19 | .\" ---------------------------------------------------------------------------- | ||
20 | .SH "EXIT STATUS" | ||
21 | .IP "0" 4 | ||
22 | -No recoverable errors have been detected. | ||
23 | +No errors | ||
24 | .IP "1" 4 | ||
25 | -Recoverable errors have been detected or \fBfsck.fat\fP has discovered an | ||
26 | -internal inconsistency. | ||
27 | +Filesystem errors corrected | ||
28 | .IP "2" 4 | ||
29 | -Usage error. | ||
30 | -\fBfsck.fat\fP did not access the filesystem. | ||
31 | +System should be rebooted | ||
32 | +.IP "4" 4 | ||
33 | +Filesystem errors left uncorrected | ||
34 | +.IP "8" 4 | ||
35 | +Operational error | ||
36 | +.IP "16" 4 | ||
37 | +Usage or syntax error | ||
38 | +.IP "32" 4 | ||
39 | +Checking canceled by user request | ||
40 | +.IP "128" 4 | ||
41 | +Shared-library error | ||
42 | .\" ---------------------------------------------------------------------------- | ||
43 | .SH FILES | ||
44 | .IP "\fIfsck0000.rec\fP, \fIfsck0001.rec\fP, ..." 4 | ||
45 | -- | ||
46 | 2.25.1 | ||
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb b/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb index 175fa265ef..86fb68f664 100644 --- a/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb +++ b/meta/recipes-devtools/dosfstools/dosfstools_4.2.bb | |||
@@ -10,11 +10,12 @@ LICENSE = "GPL-3.0-only" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
11 | 11 | ||
12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
13 | " | 13 | file://source-date-epoch.patch \ |
14 | file://0001-fsck.fat-Adhere-to-the-fsck-exit-codes.patch \ | ||
15 | file://0002-manpages-Document-fsck.fat-new-exit-codes.patch \ | ||
16 | " | ||
14 | SRC_URI[sha256sum] = "64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527" | 17 | SRC_URI[sha256sum] = "64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527" |
15 | 18 | ||
16 | SRC_URI += "file://source-date-epoch.patch" | ||
17 | |||
18 | inherit autotools gettext pkgconfig update-alternatives github-releases | 19 | inherit autotools gettext pkgconfig update-alternatives github-releases |
19 | 20 | ||
20 | EXTRA_OECONF = "--enable-compat-symlinks --without-iconv" | 21 | EXTRA_OECONF = "--enable-compat-symlinks --without-iconv" |
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index e077eba8ff..7066e1808d 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch | |||
@@ -23,15 +23,15 @@ Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd3 | |||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/generate-configlist.sh b/generate-configlist.sh | 25 | diff --git a/generate-configlist.sh b/generate-configlist.sh |
26 | index dffdaad..cc35a21 100755 | 26 | index 75c39ad..6d4525e 100755 |
27 | --- a/generate-configlist.sh | 27 | --- a/generate-configlist.sh |
28 | +++ b/generate-configlist.sh | 28 | +++ b/generate-configlist.sh |
29 | @@ -15,7 +15,7 @@ static const char *config_name_list[] = { | 29 | @@ -23,7 +23,7 @@ EOF |
30 | EOF | 30 | d' \ |
31 | grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc | | 31 | "$SOURCE_DIR"/Documentation/*config.adoc \ |
32 | sed '/deprecated/d; s/::$//; s/, */\n/g' | | 32 | "$SOURCE_DIR"/Documentation/config/*.adoc | |
33 | - sort | | 33 | - sort |
34 | + LC_ALL=C sort | | 34 | + LC_ALL=C sort |
35 | sed 's/^.*$/ "&",/' | ||
36 | cat <<EOF | 35 | cat <<EOF |
37 | NULL, | 36 | NULL, |
37 | }; | ||
diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.50.0.bb index e1b501d62b..2d28fd05fc 100644 --- a/meta/recipes-devtools/git/git_2.49.0.bb +++ b/meta/recipes-devtools/git/git_2.50.0.bb | |||
@@ -170,4 +170,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ | |||
170 | " | 170 | " |
171 | EXTRA_OEMAKE += "NO_GETTEXT=1" | 171 | EXTRA_OEMAKE += "NO_GETTEXT=1" |
172 | 172 | ||
173 | SRC_URI[tarball.sha256sum] = "f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c" | 173 | SRC_URI[tarball.sha256sum] = "920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da" |
diff --git a/meta/recipes-devtools/json-c/json-c_0.18.bb b/meta/recipes-devtools/json-c/json-c_0.18.bb index ece320d66c..c112aacf4b 100644 --- a/meta/recipes-devtools/json-c/json-c_0.18.bb +++ b/meta/recipes-devtools/json-c/json-c_0.18.bb | |||
@@ -19,8 +19,7 @@ UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+)-\d+" | |||
19 | 19 | ||
20 | RPROVIDES:${PN} = "libjson" | 20 | RPROVIDES:${PN} = "libjson" |
21 | 21 | ||
22 | # - '-Werror' must be disabled for ICECC builds | 22 | # Apps aren't needed/packaged and their CMakeLists.txt is incompatible with CMake 4+. |
23 | # - Apps aren't needed/packaged and their CMakeLists.txt is incompatible with CMake 4+. | ||
24 | EXTRA_OECMAKE = "-DDISABLE_WERROR=ON \ | 23 | EXTRA_OECMAKE = "-DDISABLE_WERROR=ON \ |
25 | -DBUILD_APPS=OFF \ | 24 | -DBUILD_APPS=OFF \ |
26 | " | 25 | " |
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Support-builds-with-CMake-4.patch b/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Support-builds-with-CMake-4.patch new file mode 100644 index 0000000000..9a90e05888 --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Support-builds-with-CMake-4.patch | |||
@@ -0,0 +1,132 @@ | |||
1 | From 702ec1423fb9b53244b902923fd87ef19b63a7f5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Moritz Haase <Moritz.Haase@bmw.de> | ||
3 | Date: Mon, 23 Jun 2025 08:32:18 +0200 | ||
4 | Subject: [PATCH] libcomps: Support builds with CMake 4+ | ||
5 | |||
6 | - Bump minimum required version to 3.10, the lowest one CMake 4+ don't complain | ||
7 | about. It's also possible to use 3.5, but that results in a deprecation | ||
8 | warning. The 'cmake_minimum_required()' invocation has been moved before the | ||
9 | initial 'project()' call as CMake complained about the wrong order. | ||
10 | |||
11 | - Set policy CMP0148 [0] to OLD to unblock build without additional changes. | ||
12 | Eventually, the usage of the 'PythonInterp' and 'PythonLibs' find modules will | ||
13 | be need to be updated to use 'Python3' instead. | ||
14 | |||
15 | - Set policy CMP0175 [1] to NEW and fix warnings. | ||
16 | |||
17 | - Fix the 'No TARGET ... has been created in this directory' error in | ||
18 | 'src/python'. | ||
19 | |||
20 | - Fix 'Utility target <foo> must not be used as the target of a | ||
21 | target_link_libraries call' errors (see [2]). | ||
22 | |||
23 | - Mark the 'check' library as required when tests are enabled to prevent test | ||
24 | targets from linking a non-existing library in case it's not installed. | ||
25 | |||
26 | [0]: https://cmake.org/cmake/help/latest/policy/CMP0148.html | ||
27 | [1]: https://cmake.org/cmake/help/latest/policy/CMP0175.html | ||
28 | [2]: https://cmake.org/cmake/help/latest/policy/CMP0039.html | ||
29 | |||
30 | Upstream-Status: Backport [702ec1423fb9b53244b902923fd87ef19b63a7f5] | ||
31 | Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> | ||
32 | --- | ||
33 | README.md | 3 +-- | ||
34 | libcomps/CMakeLists.txt | 7 +++++-- | ||
35 | libcomps/src/python/docs/CMakeLists.txt | 3 ++- | ||
36 | libcomps/src/python/pycopy.cmake | 7 ++++--- | ||
37 | libcomps/tests/CMakeLists.txt | 2 -- | ||
38 | 5 files changed, 12 insertions(+), 10 deletions(-) | ||
39 | |||
40 | diff --git a/README.md b/README.md | ||
41 | index 7f8314dd3f70d131c4d399f069d3d7bb77dcff02..24bf8a226d50b7b9b5372f98b52650ff4467c3d6 100644 | ||
42 | --- a/README.md | ||
43 | +++ b/README.md | ||
44 | @@ -27,7 +27,7 @@ for python bindings: | ||
45 | |||
46 | for C library tests: | ||
47 | |||
48 | -* check http://check.sourceforge.net/ | ||
49 | +* check https://github.com/libcheck/check | ||
50 | |||
51 | for documentation build: | ||
52 | |||
53 | @@ -128,4 +128,3 @@ Here's the most direct way to get your work merged into the project. | ||
54 | |||
55 | 1. Push the branch to your fork | ||
56 | 1. Send a pull request for your branch | ||
57 | - | ||
58 | diff --git a/libcomps/CMakeLists.txt b/libcomps/CMakeLists.txt | ||
59 | index d8d628af1a8b863b6173ff11615a59aa58d8235e..3957e63a311fc42c85516c0e66fc6f598194cb8f 100644 | ||
60 | --- a/libcomps/CMakeLists.txt | ||
61 | +++ b/libcomps/CMakeLists.txt | ||
62 | @@ -1,5 +1,8 @@ | ||
63 | +cmake_minimum_required (VERSION 3.10) | ||
64 | project(libcomps C) | ||
65 | -cmake_minimum_required (VERSION 2.8.10) | ||
66 | + | ||
67 | +cmake_policy(SET CMP0148 OLD) | ||
68 | +cmake_policy(SET CMP0175 NEW) | ||
69 | |||
70 | include (GNUInstallDirs) | ||
71 | include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake) | ||
72 | @@ -32,7 +35,7 @@ include_directories("${PROJECT_SOURCE_DIR}/src") | ||
73 | #include_directories("${PROJECT_SOURCE_DIR}/src/libcomps") | ||
74 | |||
75 | if (ENABLE_TESTS) | ||
76 | - find_library(CHECK_LIBRARY NAMES check) | ||
77 | + find_library(CHECK_LIBRARY REQUIRED NAMES check) | ||
78 | endif() | ||
79 | find_library(EXPAT_LIBRARY NAMES expat) | ||
80 | |||
81 | diff --git a/libcomps/src/python/docs/CMakeLists.txt b/libcomps/src/python/docs/CMakeLists.txt | ||
82 | index c4b388cb4a4bb2d962a625a448efcfee14ef71b3..9c92b2dacf4a2cb76f461b8038217cc8e895a369 100644 | ||
83 | --- a/libcomps/src/python/docs/CMakeLists.txt | ||
84 | +++ b/libcomps/src/python/docs/CMakeLists.txt | ||
85 | @@ -26,7 +26,8 @@ add_dependencies(pydocs pycomps) | ||
86 | include(../pycopy.cmake) | ||
87 | add_custom_command(TARGET pydocs PRE_BUILD COMMAND set -E $ENV{LD_LIBRARY_PATH} "${LIBCOMPS_OUT}:$ENV{LD_LIBRARY_PATH}") | ||
88 | |||
89 | -add_custom_command(TARGET pydocs COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_EXECUTABLE} -E -b html | ||
90 | +add_custom_command(TARGET pydocs POST_BUILD | ||
91 | + COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_EXECUTABLE} -E -b html | ||
92 | "${CMAKE_CURRENT_SOURCE_DIR}/doc-sources/" | ||
93 | "${CMAKE_CURRENT_BINARY_DIR}/html/" | ||
94 | COMMENT "LDLP $ENV{LD_LIBRARY_PATH}") | ||
95 | diff --git a/libcomps/src/python/pycopy.cmake b/libcomps/src/python/pycopy.cmake | ||
96 | index b22f83595c09b4af8f1c2e49ddbd7755f4c97f0b..0e99e38d791ffd13496bd8fbbf61cd7701e543b7 100644 | ||
97 | --- a/libcomps/src/python/pycopy.cmake | ||
98 | +++ b/libcomps/src/python/pycopy.cmake | ||
99 | @@ -6,9 +6,10 @@ math (EXPR len "${len} - 1") | ||
100 | |||
101 | #set(pycopy "py${pversion}-copy") | ||
102 | |||
103 | -#if (NOT TARGET ${pycopy}) | ||
104 | +if (NOT TARGET ${pycopy}) | ||
105 | + add_custom_target(${pycopy} DEPENDS pycomps) | ||
106 | +endif() | ||
107 | |||
108 | -#add_custom_target(${pycopy} DEPENDS pycomps) | ||
109 | set (pycomps_SRCDIR "${PROJECT_SOURCE_DIR}/src/python/src/") | ||
110 | set (pycomps_TESTDIR "${PROJECT_SOURCE_DIR}/src/python/tests/") | ||
111 | set (pycomps_LIBPATH ${PYCOMPS_LIB_PATH})#"${PROJECT_BINARY_DIR}/src/python/src/python${pversion}") | ||
112 | @@ -16,7 +17,7 @@ set (pycomps_LIBPATH ${PYCOMPS_LIB_PATH})#"${PROJECT_BINARY_DIR}/src/python/src/ | ||
113 | #add_custom_command(TARGET pycopy PRE_BUILD COMMAND ${CMAKE_COMMAND} -E | ||
114 | # make_directory "${CP_DST}") | ||
115 | |||
116 | -add_custom_command(TARGET ${pycopy} COMMAND ${CMAKE_COMMAND} -E | ||
117 | +add_custom_command(TARGET ${pycopy} POST_BUILD COMMAND ${CMAKE_COMMAND} -E | ||
118 | make_directory ${pycomps_LIBPATH}/libcomps/comps/) | ||
119 | |||
120 | foreach(x RANGE 0 ${len}) | ||
121 | diff --git a/libcomps/tests/CMakeLists.txt b/libcomps/tests/CMakeLists.txt | ||
122 | index 23ced7450afa02977c63f9374a4fee33ae596d98..9d6e428e18d5a234c7be74d957c25961dea30050 100644 | ||
123 | --- a/libcomps/tests/CMakeLists.txt | ||
124 | +++ b/libcomps/tests/CMakeLists.txt | ||
125 | @@ -87,7 +87,5 @@ add_custom_target(test_parse_run | ||
126 | WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} | ||
127 | DEPENDS test_parse | ||
128 | COMMENT "Running comps_parse test") | ||
129 | -target_link_libraries(test_parse_run libcomps) | ||
130 | -target_link_libraries(test_comps_run libcomps) | ||
131 | |||
132 | add_dependencies(ctest test_comps_run test_parse_run) | ||
diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb index 5709f3e69f..9429c703e1 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.21.bb | |||
@@ -5,6 +5,7 @@ LICENSE = "GPL-2.0-only" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ |
8 | file://0001-libcomps-Support-builds-with-CMake-4.patch \ | ||
8 | file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 9 | file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
9 | " | 10 | " |
10 | 11 | ||
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.2.bb index 6504414387..32d2a39c41 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_2.15.2.bb | |||
@@ -4,9 +4,9 @@ DESCRIPTION = "${SUMMARY}" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" | 7 | SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main;tag=${PV}" |
8 | 8 | ||
9 | SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd" | 9 | SRCREV = "b8b11b4dafaa2c4d73883152bfa7e5bd81cd7395" |
10 | 10 | ||
11 | inherit meson gobject-introspection pkgconfig manpages | 11 | inherit meson gobject-introspection pkgconfig manpages |
12 | 12 | ||
diff --git a/meta/recipes-devtools/mtools/mtools_4.0.48.bb b/meta/recipes-devtools/mtools/mtools_4.0.49.bb index 646735f3b3..294b2f37b2 100644 --- a/meta/recipes-devtools/mtools/mtools_4.0.48.bb +++ b/meta/recipes-devtools/mtools/mtools_4.0.49.bb | |||
@@ -24,7 +24,7 @@ RRECOMMENDS:${PN}:libc-glibc = "\ | |||
24 | glibc-gconv-ibm866 \ | 24 | glibc-gconv-ibm866 \ |
25 | glibc-gconv-ibm869 \ | 25 | glibc-gconv-ibm869 \ |
26 | " | 26 | " |
27 | SRC_URI[sha256sum] = "03c29aac8735dd7154a989fbc29eaf2b506121ae1c3a35cd0bf2a02e94d271a9" | 27 | SRC_URI[sha256sum] = "6fe5193583d6e7c59da75e63d7234f76c0b07caf33b103894f46f66a871ffc9f" |
28 | 28 | ||
29 | SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ | 29 | SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ |
30 | file://mtools-makeinfo.patch \ | 30 | file://mtools-makeinfo.patch \ |
diff --git a/meta/recipes-devtools/ninja/ninja_1.12.1.bb b/meta/recipes-devtools/ninja/ninja_1.13.0.bb index 5aff82edec..a5fa8f1c9e 100644 --- a/meta/recipes-devtools/ninja/ninja_1.12.1.bb +++ b/meta/recipes-devtools/ninja/ninja_1.13.0.bb | |||
@@ -1,14 +1,18 @@ | |||
1 | SUMMARY = "Ninja is a small build system with a focus on speed." | 1 | SUMMARY = "Ninja is a small build system with a focus on speed." |
2 | HOMEPAGE = "https://ninja-build.org/" | 2 | HOMEPAGE = "https://ninja-build.org/" |
3 | DESCRIPTION = "Ninja is a small build system with a focus on speed. It differs from other build systems in two major respects: it is designed to have its input files generated by a higher-level build system, and it is designed to run builds as fast as possible." | 3 | DESCRIPTION = "Ninja is a small build system with a focus on speed. \ |
4 | It differs from other build systems in two major respects: \ | ||
5 | it is designed to have its input files generated by a higher-level build system, \ | ||
6 | and it is designed to run builds as fast as possible." | ||
7 | |||
4 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" |
6 | 10 | ||
7 | DEPENDS = "re2c-native ninja-native" | 11 | DEPENDS = "re2c-native ninja-native" |
8 | 12 | ||
9 | SRCREV = "2daa09ba270b0a43e1929d29b073348aa985dfaa" | 13 | SRCREV = "b4d51f6ed5bed09dd2b70324df0d9cb4ecad2638" |
10 | 14 | ||
11 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https" | 15 | SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https;tag=v${PV}" |
12 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)" |
13 | 17 | ||
14 | do_configure[noexec] = "1" | 18 | do_configure[noexec] = "1" |
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_2.4.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.bb index 9695e37bbd..12ca075b5d 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_2.4.3.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_2.5.1.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] = "51203d99ed573fa7344bf07ca626f10c7cc094e0846ac4aa0023bd0c83c25a41" | 23 | SRC_URI[sha256sum] = "cd05c9589b9f86ecf044c10a2269822bc9eb001eced2582cfffd658b0a50c243" |
24 | 24 | ||
25 | inherit autotools | 25 | inherit autotools |
26 | 26 | ||
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 385b6f34d9..ae89d4d8e3 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb | |||
@@ -12,8 +12,8 @@ SRC_URI:append:class-nativesdk = " \ | |||
12 | file://older-glibc-symbols.patch" | 12 | file://older-glibc-symbols.patch" |
13 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" | 13 | SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa" |
14 | 14 | ||
15 | SRCREV = "2c43381180f9cfef4c0a8bb0c1658a86c3fcc876" | 15 | SRCREV = "b4645cb30573c5b3d5e94b9d50e1e2f8beefe9be" |
16 | PV = "1.9.0+git" | 16 | PV = "1.9.2" |
17 | 17 | ||
18 | # largefile and 64bit time_t support adds these macros via compiler flags globally | 18 | # largefile and 64bit time_t support adds these macros via compiler flags globally |
19 | # remove them for pseudo since pseudo intercepts some of the functions which will be | 19 | # remove them for pseudo since pseudo intercepts some of the functions which will be |
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.135.9.bb b/meta/recipes-devtools/python/python3-hypothesis_6.135.16.bb index efc5229fbc..c0241b63e4 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.135.9.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.135.16.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] = "a80a256268b8af3d34d62be30f6bf4a7d099b2b762621cc5f3f1de65e7b98543" | 16 | SRC_URI[sha256sum] = "6131ea0b698e69bad62aae915988b8d00a6ac974351d0830db74c5fffc68c418" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-attrs \ | 19 | python3-attrs \ |
diff --git a/meta/recipes-devtools/python/python3-license-expression_30.4.1.bb b/meta/recipes-devtools/python/python3-license-expression_30.4.3.bb index ec613f6eaa..065284ed62 100644 --- a/meta/recipes-devtools/python/python3-license-expression_30.4.1.bb +++ b/meta/recipes-devtools/python/python3-license-expression_30.4.3.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] = "9f02105f9e0fcecba6a85dfbbed7d94ea1c3a70cf23ddbfb5adf3438a6f6fce0" | 7 | SRC_URI[sha256sum] = "49f439fea91c4d1a642f9f2902b58db1d42396c5e331045f41ce50df9b40b1f2" |
8 | 8 | ||
9 | inherit pypi ptest-python-pytest python_setuptools_build_meta | 9 | inherit pypi ptest-python-pytest python_setuptools_build_meta |
10 | PYPI_PACKAGE = "license_expression" | 10 | PYPI_PACKAGE = "license_expression" |
diff --git a/meta/recipes-devtools/python/python3-lxml_5.4.0.bb b/meta/recipes-devtools/python/python3-lxml_6.0.0.bb index 126fbe99b4..56f5664c9b 100644 --- a/meta/recipes-devtools/python/python3-lxml_5.4.0.bb +++ b/meta/recipes-devtools/python/python3-lxml_6.0.0.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ | |||
18 | 18 | ||
19 | DEPENDS += "libxml2 libxslt" | 19 | DEPENDS += "libxml2 libxslt" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "d12832e1dbea4be280b22fd0ea7c9b87f0d8fc51ba06e92dc62d52f804f78ebd" | 21 | SRC_URI[sha256sum] = "032e65120339d44cdc3efc326c9f660f5f7205f3a535c1fdbf898b29ea01fb72" |
22 | 22 | ||
23 | SRC_URI += "${PYPI_SRC_URI}" | 23 | SRC_URI += "${PYPI_SRC_URI}" |
24 | inherit pkgconfig pypi setuptools3 | 24 | inherit pkgconfig pypi setuptools3 |
diff --git a/meta/recipes-devtools/python/python3-markdown_3.8.bb b/meta/recipes-devtools/python/python3-markdown_3.8.2.bb index 09c2f3435b..d7ab34b915 100644 --- a/meta/recipes-devtools/python/python3-markdown_3.8.bb +++ b/meta/recipes-devtools/python/python3-markdown_3.8.2.bb | |||
@@ -5,7 +5,7 @@ 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 | SRC_URI[sha256sum] = "7df81e63f0df5c4b24b7d156eb81e4690595239b7d70937d0409f1b0de319c6f" | 8 | SRC_URI[sha256sum] = "247b9a70dd12e27f67431ce62523e675b866d254f900c4fe75ce3dda62237c45" |
9 | 9 | ||
10 | BBCLASSEXTEND = "native nativesdk" | 10 | BBCLASSEXTEND = "native nativesdk" |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-numpy_2.3.0.bb b/meta/recipes-devtools/python/python3-numpy_2.3.1.bb index 34a14f7ca6..bc718d37c4 100644 --- a/meta/recipes-devtools/python/python3-numpy_2.3.0.bb +++ b/meta/recipes-devtools/python/python3-numpy_2.3.1.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ | |||
12 | file://fix_reproducibility.patch \ | 12 | file://fix_reproducibility.patch \ |
13 | file://run-ptest \ | 13 | file://run-ptest \ |
14 | " | 14 | " |
15 | SRC_URI[sha256sum] = "581f87f9e9e9db2cba2141400e160e9dd644ee248788d6f90636eeb8fd9260a6" | 15 | SRC_URI[sha256sum] = "1ec9ae20a4226da374362cca3c62cd753faf2f951440b0e3b98e93c235441d2b" |
16 | 16 | ||
17 | GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" | 17 | GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" |
18 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" | 18 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" |
diff --git a/meta/recipes-devtools/python/python3-pdm_2.25.1.bb b/meta/recipes-devtools/python/python3-pdm_2.25.3.bb index d9331ba72c..f3ec4e60d3 100644 --- a/meta/recipes-devtools/python/python3-pdm_2.25.1.bb +++ b/meta/recipes-devtools/python/python3-pdm_2.25.3.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "3145251f37a3f94fa211ade992e7db7792da4c3e8e3eeeb1993d952adebe0b96" | 7 | SRC_URI[sha256sum] = "6d0820f805dacf64d55a7fe56777e7d8349a2ee35efc3006f29b4573d1311c84" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta/recipes-devtools/python/python3-pygments_2.19.1.bb b/meta/recipes-devtools/python/python3-pygments_2.19.2.bb index de24ed3f11..a1f73b441d 100644 --- a/meta/recipes-devtools/python/python3-pygments_2.19.1.bb +++ b/meta/recipes-devtools/python/python3-pygments_2.19.2.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592" |
6 | 6 | ||
7 | inherit python_hatchling | 7 | inherit python_hatchling |
8 | SRC_URI[sha256sum] = "61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f" | 8 | SRC_URI[sha256sum] = "636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887" |
9 | 9 | ||
10 | inherit pypi | 10 | inherit pypi |
11 | 11 | ||
diff --git a/meta/recipes-devtools/python/python3-sphinx-argparse_0.5.2.bb b/meta/recipes-devtools/python/python3-sphinx-argparse_0.5.2.bb new file mode 100644 index 0000000000..554fb3eb51 --- /dev/null +++ b/meta/recipes-devtools/python/python3-sphinx-argparse_0.5.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "A sphinx extension that automatically documents argparse commands and options" | ||
2 | HOMEPAGE = "https://sphinx-argparse.readthedocs.io/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENCE.rst;md5=5c1cd8f13774629fee215681e66a1056" | ||
5 | |||
6 | SRC_URI[sha256sum] = "e5352f8fa894b6fb6fda0498ba28a9f8d435971ef4bbc1a6c9c6414e7644f032" | ||
7 | |||
8 | PYPI_PACKAGE = "sphinx_argparse" | ||
9 | UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" | ||
10 | |||
11 | inherit pypi python_flit_core | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-sphinx-copybutton_0.5.2.bb b/meta/recipes-devtools/python/python3-sphinx-copybutton_0.5.2.bb new file mode 100644 index 0000000000..0441804661 --- /dev/null +++ b/meta/recipes-devtools/python/python3-sphinx-copybutton_0.5.2.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | SUMMARY = "Add a copy button to code blocks in Sphinx" | ||
2 | HOMEPAGE = "https://sphinx-copybutton.readthedocs.io" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c60e920848b6d2ecec51ea44a1a33bf0" | ||
5 | |||
6 | SRC_URI[sha256sum] = "4cf17c82fb9646d1bc9ca92ac280813a3b605d8c421225fd9913154103ee1fbd" | ||
7 | |||
8 | inherit setuptools3 pypi | ||
9 | |||
10 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-urllib3_2.4.0.bb b/meta/recipes-devtools/python/python3-urllib3_2.5.0.bb index 7a4bffc05e..a4f3995730 100644 --- a/meta/recipes-devtools/python/python3-urllib3_2.4.0.bb +++ b/meta/recipes-devtools/python/python3-urllib3_2.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/urllib3/urllib3" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "414bc6535b787febd7567804cc015fee39daab8ad86268f1310a9250697de466" | 6 | SRC_URI[sha256sum] = "3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760" |
7 | 7 | ||
8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-wheel_0.45.1.bb b/meta/recipes-devtools/python/python3-wheel_0.46.1.bb index 8274e83747..058af2f0e7 100644 --- a/meta/recipes-devtools/python/python3-wheel_0.45.1.bb +++ b/meta/recipes-devtools/python/python3-wheel_0.46.1.bb | |||
@@ -4,9 +4,14 @@ 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] = "661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729" | 7 | SRC_URI[sha256sum] = "fd477efb5da0f7df1d3c76c73c14394002c844451bd63229d8570f376f5e6a38" |
8 | 8 | ||
9 | inherit python_flit_core pypi | 9 | inherit python_flit_core pypi ptest-python-pytest |
10 | |||
11 | RDEPENDS:${PN} += "python3-packaging" | ||
12 | |||
13 | # One test is skipped but requires the "full" python3-flit, not just python3-flit-core | ||
14 | RDEPENDS:${PN}-ptest += "python3-setuptools" | ||
10 | 15 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
12 | 17 | ||
diff --git a/meta/recipes-devtools/repo/repo_2.55.2.bb b/meta/recipes-devtools/repo/repo_2.56.bb index 882f3e6312..efdb9bd0c9 100644 --- a/meta/recipes-devtools/repo/repo_2.55.2.bb +++ b/meta/recipes-devtools/repo/repo_2.56.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;tag=v${PV} \ | 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main;tag=v${PV} \ |
13 | " | 13 | " |
14 | SRCREV = "b262d0e4619c406a2708856ed312091d21c5bf39" | 14 | SRCREV = "99b5a17f2c951fe5979100c36e7e1dbb4c61b36c" |
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 | ||
diff --git a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb index 17d5a747ff..46f9ee8548 100644 --- a/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb +++ b/meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb | |||
@@ -26,7 +26,7 @@ CARGO_INSTALL_LIBRARIES = "1" | |||
26 | do_compile:prepend () { | 26 | do_compile:prepend () { |
27 | # rpm-sequoia.pc is generated in the source directory | 27 | # rpm-sequoia.pc is generated in the source directory |
28 | # but the target directory does not exist there. | 28 | # but the target directory does not exist there. |
29 | mkdir -p ${S}/target/release | 29 | mkdir -p ${S}/target/${BUILD_DIR} |
30 | 30 | ||
31 | # From rpm-sequoia's README.md: | 31 | # From rpm-sequoia's README.md: |
32 | # | 32 | # |
@@ -58,7 +58,7 @@ do_install:append () { | |||
58 | 58 | ||
59 | # rpm-sequoia does not install its pkgconfig file. Do it manually. | 59 | # rpm-sequoia does not install its pkgconfig file. Do it manually. |
60 | mkdir -p ${D}${libdir}/pkgconfig | 60 | mkdir -p ${D}${libdir}/pkgconfig |
61 | install -m644 ${S}/target/release/rpm-sequoia.pc ${D}${libdir}/pkgconfig | 61 | install -m644 ${S}/target/${BUILD_DIR}/rpm-sequoia.pc ${D}${libdir}/pkgconfig |
62 | } | 62 | } |
63 | 63 | ||
64 | do_install_ptest:append () { | 64 | do_install_ptest:append () { |
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb index 1639ae84e9..f008c0c6de 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb | |||
@@ -49,6 +49,12 @@ CFLAGS:append:riscv64 = " ${LCL_STOP_SERVICES}" | |||
49 | CFLAGS:append:riscv32 = " ${LCL_STOP_SERVICES}" | 49 | CFLAGS:append:riscv32 = " ${LCL_STOP_SERVICES}" |
50 | CFLAGS:append:loongarch64 = " ${LCL_STOP_SERVICES}" | 50 | CFLAGS:append:loongarch64 = " ${LCL_STOP_SERVICES}" |
51 | 51 | ||
52 | # This works with gcc-ranlib wrapper only because it exists without error if nothing | ||
53 | # is passed as argument but binutils ranlib and llvm ranlib do not and expect an input | ||
54 | # passing $@ ensures that Makefile default target which is the archive name in tcf makefiles | ||
55 | # is passed to RANLIB, ensures that whichever ranlib is used, the behavior is identical | ||
56 | RANLIB:append = " $@" | ||
57 | |||
52 | do_install() { | 58 | do_install() { |
53 | oe_runmake install INSTALLROOT=${D} | 59 | oe_runmake install INSTALLROOT=${D} |
54 | install -d ${D}${sysconfdir}/init.d/ | 60 | install -d ${D}${sysconfdir}/init.d/ |
diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.1.bb b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb index 70aa9b606c..765dc64e4d 100644 --- a/meta/recipes-devtools/tcltk/tcl_9.0.1.bb +++ b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb | |||
@@ -51,7 +51,7 @@ do_install() { | |||
51 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh | 51 | ln -sf ./tclsh${VER} ${D}${bindir}/tclsh |
52 | ln -sf tclsh9.0 ${D}${bindir}/tclsh${VER} | 52 | ln -sf tclsh9.0 ${D}${bindir}/tclsh${VER} |
53 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh | 53 | sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh |
54 | sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh | 54 | sed -i "s;'${UNPACKDIR};'${STAGING_INCDIR};g" tclConfig.sh |
55 | install -d ${D}${bindir_crossscripts} | 55 | install -d ${D}${bindir_crossscripts} |
56 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} | 56 | install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} |
57 | install -m 0755 tclConfig.sh ${D}${libdir} | 57 | install -m 0755 tclConfig.sh ${D}${libdir} |
@@ -105,6 +105,7 @@ tcl_package_preprocess() { | |||
105 | -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ | 105 | -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ |
106 | -e "s;${STAGING_INCDIR};${includedir};g" \ | 106 | -e "s;${STAGING_INCDIR};${includedir};g" \ |
107 | -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ | 107 | -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ |
108 | -e "s;${B};${libdir};g" ${PKGD}${libdir}/tclConfig.sh \ | ||
108 | ${PKGD}${libdir}/tclConfig.sh | 109 | ${PKGD}${libdir}/tclConfig.sh |
109 | 110 | ||
110 | rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh | 111 | rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh |