diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-11-02 16:17:51 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-11-05 11:28:36 +0000 |
commit | 6a5a8391aa360599ad78d60506998af4472de672 (patch) | |
tree | 2714455b30cca6ccb39d61c81e2403f2c8570c5c /meta | |
parent | 5bc82ecd054b39e120ef9e62b971e02a43d5566e (diff) | |
download | poky-6a5a8391aa360599ad78d60506998af4472de672.tar.gz |
createrepo-c: upgrade 1.0.1 -> 1.0.2
time64fix.patch
removed since it's included in 1.0.2
Changelog:
==========
Fix building on EL9
Don't allow building without zstd
Adjust printf formats for 64bit time_t on 32bit systems
Remove dependency on libmagic, hardcode magic number detection
Add automation for uploading prebuilt binary wheels to PyPI
(From OE-Core rev: baff3647aea6b08eff7312eb45b60bc481830132)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch | 69 | ||||
-rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c_1.0.2.bb (renamed from meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb) | 3 |
2 files changed, 1 insertions, 71 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch deleted file mode 100644 index a63801ce26..0000000000 --- a/meta/recipes-devtools/createrepo-c/createrepo-c/time64fix.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | From 89e1c9415fb8438310036d5810cdb7da75ee3a7f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 26 Jul 2023 12:27:14 -0700 | ||
4 | Subject: [PATCH] Adjust printf formats for 64bit time_t on 32bit systems | ||
5 | |||
6 | Fixes format specifier mismatch warnings as well while here | ||
7 | |||
8 | e.g. | ||
9 | warning: format '%ld' expects argument of type 'long int', but argument 2 has type 'time_t' | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/376] | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/createrepo_c.c | 4 ++-- | ||
16 | src/misc.c | 4 ++-- | ||
17 | src/xml_dump_repomd.c | 2 +- | ||
18 | 3 files changed, 5 insertions(+), 5 deletions(-) | ||
19 | |||
20 | diff --git a/src/createrepo_c.c b/src/createrepo_c.c | ||
21 | index 8681419..0f9048a 100644 | ||
22 | --- a/src/createrepo_c.c | ||
23 | +++ b/src/createrepo_c.c | ||
24 | @@ -582,9 +582,9 @@ duplicates_warning(const char *nevra, GArray *locations, CmdDupNevra option) | ||
25 | for (size_t i=0; i<locations->len; i++) { | ||
26 | struct DuplicateLocation location = g_array_index(locations, struct | ||
27 | DuplicateLocation, i); | ||
28 | - g_warning(" Sourced from location: \'%s\', build timestamp: %ld%s", | ||
29 | + g_warning(" Sourced from location: \'%s\', build timestamp: %jd%s", | ||
30 | location.location, | ||
31 | - location.pkg->time_build, | ||
32 | + (intmax_t) location.pkg->time_build, | ||
33 | location.pkg->skip_dump ? skip_reason : ""); | ||
34 | |||
35 | } | ||
36 | diff --git a/src/misc.c b/src/misc.c | ||
37 | index 8511ca2..7866c7b 100644 | ||
38 | --- a/src/misc.c | ||
39 | +++ b/src/misc.c | ||
40 | @@ -1512,11 +1512,11 @@ cr_append_pid_and_datetime(const char *str, const char *suffix) | ||
41 | gettimeofday(&tv, NULL); | ||
42 | timeinfo = localtime (&(tv.tv_sec)); | ||
43 | strftime(datetime, 80, "%Y%m%d%H%M%S", timeinfo); | ||
44 | - gchar *result = g_strdup_printf("%s%jd.%s.%ld%s", | ||
45 | + gchar *result = g_strdup_printf("%s%jd.%s.%jd%s", | ||
46 | str ? str : "", | ||
47 | (intmax_t) getpid(), | ||
48 | datetime, | ||
49 | - tv.tv_usec, | ||
50 | + (intmax_t) tv.tv_usec, | ||
51 | suffix ? suffix : ""); | ||
52 | return result; | ||
53 | } | ||
54 | diff --git a/src/xml_dump_repomd.c b/src/xml_dump_repomd.c | ||
55 | index 33b0e09..9d24249 100644 | ||
56 | --- a/src/xml_dump_repomd.c | ||
57 | +++ b/src/xml_dump_repomd.c | ||
58 | @@ -143,7 +143,7 @@ cr_xml_dump_repomd_body(xmlNodePtr root, cr_Repomd *repomd) | ||
59 | BAD_CAST repomd->revision); | ||
60 | } else { | ||
61 | // Use the current time if no revision was explicitly specified | ||
62 | - gchar *rev = g_strdup_printf("%ld", time(NULL)); | ||
63 | + gchar *rev = g_strdup_printf("%jd", (intmax_t) time(NULL)); | ||
64 | xmlNewChild(root, NULL, BAD_CAST "revision", BAD_CAST rev); | ||
65 | g_free(rev); | ||
66 | } | ||
67 | -- | ||
68 | 2.41.0 | ||
69 | |||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.2.bb index 44d9213bd4..49d29bcfb4 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.1.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.2.bb | |||
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
7 | SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;protocol=https \ |
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://time64fix.patch \ | ||
11 | " | 10 | " |
12 | 11 | ||
13 | SRCREV = "e7af838e04009cd2f848a00e1ea31cc42c8f3ae7" | 12 | SRCREV = "e87636334a3bc5d6ddfdb6c0b34042e96987efb1" |
14 | 13 | ||
15 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
16 | 15 | ||