diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-12-15 00:45:42 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-21 10:16:31 +0000 |
| commit | 0e2c1d3cfcdde38e4e0dc143cc1940a5ba73d0da (patch) | |
| tree | a52d3adeda37c20e062154878a667eab72224c9b /meta | |
| parent | abdc692e53c9bf2d2e1193b85c1cc781828193be (diff) | |
| download | poky-0e2c1d3cfcdde38e4e0dc143cc1940a5ba73d0da.tar.gz | |
acl: Enable largefile support by default
This ensures right flags are passed so enable it. Musl and decoupled
these APIs from _GNU_SOURCE and now are only available when
_LARGEFILE64_SOURCE macro is enabled
(From OE-Core rev: fa29c98302fcd765bcc0160ce5c2b8294de0d814)
Signed-off-by: Khem Raj <raj.khem@gmail.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-support/attr/acl/0001-chacl-Use-portable-version-of-dirent-and-readdir.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-support/attr/acl_2.3.1.bb | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-support/attr/acl/0001-chacl-Use-portable-version-of-dirent-and-readdir.patch b/meta/recipes-support/attr/acl/0001-chacl-Use-portable-version-of-dirent-and-readdir.patch new file mode 100644 index 0000000000..775675e1f2 --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-chacl-Use-portable-version-of-dirent-and-readdir.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 1a5671a4eb13b81b98c3e71f00370781563f66d8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 10 Nov 2022 17:57:24 -0800 | ||
| 4 | Subject: [PATCH] chacl: Use portable version of dirent and readdir | ||
| 5 | |||
| 6 | Using 64bit versions on 32bit architectures should be enabled with | ||
| 7 | --enable-largefile, this makes it portable across musl and glibc | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=2b42f64737adf6a2ddd491213580d6e9cdd2f5af] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | tools/chacl.c | 4 ++-- | ||
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/tools/chacl.c b/tools/chacl.c | ||
| 16 | index 525a7ff..8fff875 100644 | ||
| 17 | --- a/tools/chacl.c | ||
| 18 | +++ b/tools/chacl.c | ||
| 19 | @@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) | ||
| 20 | { | ||
| 21 | int failed = 0; | ||
| 22 | DIR *dir; | ||
| 23 | - struct dirent64 *d; | ||
| 24 | + struct dirent *d; | ||
| 25 | char *name; | ||
| 26 | |||
| 27 | if ((dir = opendir(fname)) == NULL) { | ||
| 28 | @@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) | ||
| 29 | return(0); /* got a file, not an error */ | ||
| 30 | } | ||
| 31 | |||
| 32 | - while ((d = readdir64(dir)) != NULL) { | ||
| 33 | + while ((d = readdir(dir)) != NULL) { | ||
| 34 | /* skip "." and ".." entries */ | ||
| 35 | if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) | ||
| 36 | continue; | ||
| 37 | -- | ||
| 38 | 2.38.1 | ||
| 39 | |||
diff --git a/meta/recipes-support/attr/acl_2.3.1.bb b/meta/recipes-support/attr/acl_2.3.1.bb index aca04a9aac..5fb8f9ae35 100644 --- a/meta/recipes-support/attr/acl_2.3.1.bb +++ b/meta/recipes-support/attr/acl_2.3.1.bb | |||
| @@ -19,12 +19,15 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ | |||
| 19 | file://run-ptest \ | 19 | file://run-ptest \ |
| 20 | file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ | 20 | file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ |
| 21 | file://0001-test-patch-out-failing-bits.patch \ | 21 | file://0001-test-patch-out-failing-bits.patch \ |
| 22 | file://0001-chacl-Use-portable-version-of-dirent-and-readdir.patch \ | ||
| 22 | " | 23 | " |
| 23 | 24 | ||
| 24 | SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" | 25 | SRC_URI[sha256sum] = "760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af" |
| 25 | 26 | ||
| 26 | inherit autotools gettext ptest | 27 | inherit autotools gettext ptest |
| 27 | 28 | ||
| 29 | EXTRA_OECONF += "--enable-largefile" | ||
| 30 | |||
| 28 | PACKAGES =+ "lib${BPN}" | 31 | PACKAGES =+ "lib${BPN}" |
| 29 | 32 | ||
| 30 | FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" | 33 | FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" |
