diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2024-05-09 10:31:25 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-12 08:43:18 -0700 |
commit | 7efc8922b7ebba84cee005bf4735f167e66e99f1 (patch) | |
tree | 3d5ff374e37bcd2cb8b19dd5a27e0239da91462b /meta-oe | |
parent | 4acfcfb234d3307ce5c72fb6a9358b5f918db5af (diff) | |
download | meta-openembedded-7efc8922b7ebba84cee005bf4735f167e66e99f1.tar.gz |
composefs: bump ecef20c1
- This is required to add the native target support.
- Drop upstream merged patch:
0001-musl-basename-use-portable-implementation-for-basena.patch
https://github.com/containers/composefs/pull/273
Changelog:
$ git --no-pager log --oneline HEAD...v1.0.3
ecef20c (HEAD -> main, origin/main, origin/HEAD) Merge pull request #276 from wahtari/copy_file_range
e78c7a4 Merge pull request #277 from alexlarsson/fix-newline-error
1d82bc1 mkcomposefs: Drop newline from error string
3e38d73 Added copy_file_range for faster file copy.
85a693d Merge pull request #273 from fboudra/musl-basename
31afa13 musl: basename: use portable implementation for basename API
4776580 Merge pull request #275 from eriksjolund/fix-spelling-in-error-message
4a68a42 Merge pull request #269 from wahtari/threading-for-mkcomposefs
7266546 fuse: fix spelling in error message
b49499b added threads in mkcomposefs for digest calculation and file copy
d144db0 refactored lcfs_load_node_from_file to enable multi-threading in mkcomposefs
af69922 Merge pull request #266 from eriksjolund/erofs-add-missing-free
1eecf38 Merge pull request #267 from eriksjolund/mkcomposefs-add-missing-free
a880713 mkcomposefs: Add missing free()
456d618 erofs: Add missing free() and lcfs_node_unref()
1179638 Merge pull request #265 from eriksjolund/handle-empty-basedir-option
301b78f Merge pull request #268 from eriksjolund/set-errno-for-unknown-format
09ca740 writer: Set errno for unknown format
a96f786 mountcomposefs: Handle empty basedir option
fc9a526 Merge pull request #260 from eriksjolund/handle-error-from-build-node
9b85011 Merge pull request #262 from eriksjolund/add-error-check-and-rearrange
2cb505b Merge pull request #263 from eriksjolund/writer-set-errno
9b417be writer: Set errno
d5ffbeb Merge pull request #261 from eriksjolund/add-missing-node-unref
9c393a4 Merge pull request #259 from eriksjolund/handle-error-from-node-set-content
396a3b8 mkcomposefs: Handle NULL from lcfs_node_new()
238a94a lib: Set errno in lcfs_node_new()
c1181fa erofs: Handle error from lcfs_build_node_from_image()
49288d5 erofs, mkcomposefs: Handle error from lcfs_node_set_content()
4e0b147 lib: Add missing lcfs_node_unref()
9bc76dd Merge pull request #258 from eriksjolund/fix-missing-options
d59dd9b mountcomposefs, mkcomposefs: Add missing options to usage information
418f4f7 Merge pull request #255 from cgwalters/mount-minor-tweaks
72c602a Merge pull request #256 from eriksjolund/fix-error-message
770cc36 fuse: Fix filepath argument in error message
465c079 man/mount.composefs: Fix a typo and two markdown lint warnings
8565a8b Merge pull request #254 from edbaunton/edbaunton/man-mkcomposefs-inline
b99a978 man mkcomposefs: detail inlining logic
47f6949 Merge pull request #253 from rborn-tx/support-older-linux-headers
453eaef ci: Add build test for Ubuntu Focal
384f306 mount: Allow building when macro LOOP_CONFIGURE is not available
f163eba mount: Allow building when macro MOUNT_ATTR_IDMAP is not available
80e99bd Merge pull request #250 from cgwalters/doc-verification
f6e8510 README.md: Fix markdownlint warnings
3b7e567 README.md: Drop removed `signed` mount option
091b51f Merge pull request #247 from cgwalters/readlinkat-overflow
232336d Merge pull request #248 from cgwalters/more-analyzer
a6904d6 writer: Close mmap leak
e9632ca Merge pull request #246 from eriksjolund/handle-null-from-strndup
6b2192b writer: Fix (almost certainly unreachable) overflow
bdc2c4c mkcomposefs: Handle NULL from strndup()
e63786d Merge pull request #245 from giuseppe/run-distcheck-ci
5d3fe92 tests: do not hardcode number of threads
d6e55bf .github: run make distcheck as part of the CI
f6bbf54 Merge pull request #244 from alexlarsson/mount-api
4e5883b mount.composefs: Add tryverity option
15bdcd6 lib: Add TRY_VERITY mount option
f884f57 mount: Use the new lowerdir+ and datadir+ options
bd6ce95 Merge pull request #243 from giuseppe/add-fuzzing
171eae0 mkcompose: fix crash if no target for hardlink
7b1518f mkcomposefs: tree_from_dump does not exit(2) on errors
a8ac3d5 mkcomposefs: reject dump without root node
28a9d6b tests: add fuzzing tests for mkcomposefs
932f748 tools: add fuzzing entrypoint for mkcomposefs
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/composefs/composefs_1.0.3.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch | 75 |
2 files changed, 3 insertions, 80 deletions
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb index 76c85ce93..5d4fa9c31 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.3.bb | |||
@@ -13,11 +13,9 @@ LIC_FILES_CHKSUM = "\ | |||
13 | file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 13 | file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" | 16 | PV .= "+git${SRCPV}" |
17 | SRC_URI = "\ | 17 | SRCREV = "ecef20c18c81943bd17b489ad1484f361b99c792" |
18 | git://github.com/containers/composefs.git;protocol=https;branch=main \ | 18 | SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" |
19 | file://0001-musl-basename-use-portable-implementation-for-basena.patch \ | ||
20 | " | ||
21 | 19 | ||
22 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
23 | 21 | ||
diff --git a/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch b/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch deleted file mode 100644 index 49a0b21c6..000000000 --- a/meta-oe/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From b21a9d4f10a066cac76bb345d31fdd24afcf3e6f Mon Sep 17 00:00:00 2001 | ||
2 | From: Fathi Boudra <fathi.boudra@linaro.org> | ||
3 | Date: Tue, 9 Apr 2024 08:47:37 +0200 | ||
4 | Subject: [PATCH] musl: basename: use portable implementation for basename API | ||
5 | |||
6 | musl has removed the non-prototype declaration of basename from string.h which | ||
7 | now results in build errors with newer clang compilers. | ||
8 | |||
9 | Implement GNU basename behavior using strchr which is portable across libcs. | ||
10 | |||
11 | Fixes: | ||
12 | | ../../git/tools/mountcomposefs.c:43:20: | ||
13 | | error: call to undeclared function 'basename'; ISO C99 and later do not | ||
14 | | support implicit function declarations [-Wimplicit-function-declaration] | ||
15 | | 43 | const char *bin = basename(argv0); | ||
16 | | | ^ | ||
17 | | ../../git/tools/mountcomposefs.c:43:14: | ||
18 | | error: incompatible integer to pointer conversion initializing 'const char *' | ||
19 | | with an expression of type 'int' [-Wint-conversion] | ||
20 | | 43 | const char *bin = basename(argv0); | ||
21 | | | ^ ~~~~~~~~~~~~~~~ | ||
22 | |||
23 | For reference: | ||
24 | https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
25 | |||
26 | Closes: https://github.com/containers/composefs/issues/272 | ||
27 | |||
28 | Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> | ||
29 | |||
30 | Upstream-Status: Submitted [https://github.com/containers/composefs/pull/273] | ||
31 | --- | ||
32 | libcomposefs/lcfs-utils.h | 6 ++++++ | ||
33 | tools/mkcomposefs.c | 2 +- | ||
34 | tools/mountcomposefs.c | 3 ++- | ||
35 | 3 files changed, 9 insertions(+), 2 deletions(-) | ||
36 | |||
37 | --- a/tools/mountcomposefs.c | ||
38 | +++ b/tools/mountcomposefs.c | ||
39 | @@ -37,10 +37,11 @@ | ||
40 | #include <linux/fsverity.h> | ||
41 | |||
42 | #include "libcomposefs/lcfs-mount.h" | ||
43 | +#include "libcomposefs/lcfs-utils.h" | ||
44 | |||
45 | static void usage(const char *argv0) | ||
46 | { | ||
47 | - const char *bin = basename(argv0); | ||
48 | + const char *bin = gnu_basename(argv0); | ||
49 | fprintf(stderr, | ||
50 | "usage: %s [-t type] [-o opt[,opts..]] IMAGE MOUNTPOINT\n" | ||
51 | "Example:\n" | ||
52 | --- a/libcomposefs/lcfs-utils.h | ||
53 | +++ b/libcomposefs/lcfs-utils.h | ||
54 | @@ -161,4 +161,10 @@ static inline void *steal_pointer(void * | ||
55 | /* type safety */ | ||
56 | #define steal_pointer(pp) (0 ? (*(pp)) : (steal_pointer)(pp)) | ||
57 | |||
58 | +static inline const char *gnu_basename(const char *filename) | ||
59 | +{ | ||
60 | + const char *p = strrchr(filename, '/'); | ||
61 | + return p ? p+1 : filename; | ||
62 | +} | ||
63 | + | ||
64 | #endif | ||
65 | --- a/tools/mkcomposefs.c | ||
66 | +++ b/tools/mkcomposefs.c | ||
67 | @@ -315,7 +315,7 @@ static int fill_store(struct lcfs_node_s | ||
68 | |||
69 | static void usage(const char *argv0) | ||
70 | { | ||
71 | - const char *bin = basename(argv0); | ||
72 | + const char *bin = gnu_basename(argv0); | ||
73 | fprintf(stderr, | ||
74 | "Usage: %s [OPTIONS] SOURCE IMAGE\n" | ||
75 | "Options:\n" | ||