diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-09 23:27:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-11 10:53:44 +0000 |
commit | 12c90b3c83767b3d20a411729fbb3c6ce1ef9173 (patch) | |
tree | 9537bcae4b1f22e6e52c93a1f667acf5ab81efba /meta/recipes-core | |
parent | 43b776610593bad949ec1871298700317e3224fc (diff) | |
download | poky-12c90b3c83767b3d20a411729fbb3c6ce1ef9173.tar.gz |
busybox: update 1.34.1 -> 1.35.0
Drop upstreamed patch.
(From OE-Core rev: a7d5150b621c2ab4e4ad8acc6267b40d9e899b33)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch | 81 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox/fail_on_no_media.patch | 28 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.35.0.bb (renamed from meta/recipes-core/busybox/busybox_1.34.1.bb) | 3 |
3 files changed, 19 insertions, 93 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch b/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch deleted file mode 100644 index 4a1960dff2..0000000000 --- a/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrej Valek <andrej.valek@siemens.com> | ||
3 | Date: Thu, 24 Jun 2021 19:13:22 +0200 | ||
4 | Subject: [PATCH] mktemp: add tmpdir option | ||
5 | |||
6 | Make mktemp more compatible with coreutils. | ||
7 | - add "--tmpdir" option | ||
8 | - add long variants for "d,q,u" options | ||
9 | |||
10 | Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html] | ||
11 | |||
12 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
13 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
14 | --- | ||
15 | coreutils/mktemp.c | 26 ++++++++++++++++++-------- | ||
16 | 1 file changed, 18 insertions(+), 8 deletions(-) | ||
17 | |||
18 | diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c | ||
19 | index 5393320a5..05c6d98c6 100644 | ||
20 | --- a/coreutils/mktemp.c | ||
21 | +++ b/coreutils/mktemp.c | ||
22 | @@ -39,16 +39,17 @@ | ||
23 | //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o | ||
24 | |||
25 | //usage:#define mktemp_trivial_usage | ||
26 | -//usage: "[-dt] [-p DIR] [TEMPLATE]" | ||
27 | +//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" | ||
28 | //usage:#define mktemp_full_usage "\n\n" | ||
29 | //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" | ||
30 | //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" | ||
31 | //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" | ||
32 | -//usage: "\n -d Make directory, not file" | ||
33 | -//usage: "\n -q Fail silently on errors" | ||
34 | -//usage: "\n -t Prepend base directory name to TEMPLATE" | ||
35 | -//usage: "\n -p DIR Use DIR as a base directory (implies -t)" | ||
36 | -//usage: "\n -u Do not create anything; print a name" | ||
37 | +//usage: "\n -d Make directory, not file" | ||
38 | +//usage: "\n -q Fail silently on errors" | ||
39 | +//usage: "\n -t Prepend base directory name to TEMPLATE" | ||
40 | +//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)" | ||
41 | +//usage: "\n For --tmpdir is a optional one." | ||
42 | +//usage: "\n -u Do not create anything; print a name" | ||
43 | //usage: "\n" | ||
44 | //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" | ||
45 | //usage: | ||
46 | @@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) | ||
47 | OPT_t = 1 << 2, | ||
48 | OPT_p = 1 << 3, | ||
49 | OPT_u = 1 << 4, | ||
50 | + OPT_td = 1 << 5, | ||
51 | }; | ||
52 | |||
53 | path = getenv("TMPDIR"); | ||
54 | if (!path || path[0] == '\0') | ||
55 | path = "/tmp"; | ||
56 | |||
57 | - opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); | ||
58 | + opts = getopt32long(argv, "^" | ||
59 | + "dqtp:u\0" | ||
60 | + "?1" /* 1 arg max */, | ||
61 | + "directory\0" No_argument "d" | ||
62 | + "quiet\0" No_argument "q" | ||
63 | + "dry-run\0" No_argument "u" | ||
64 | + "tmpdir\0" Optional_argument "\xff" | ||
65 | + , &path, &path | ||
66 | + ); | ||
67 | |||
68 | chp = argv[optind]; | ||
69 | if (!chp) { | ||
70 | @@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) | ||
71 | goto error; | ||
72 | } | ||
73 | #endif | ||
74 | - if (opts & (OPT_t|OPT_p)) | ||
75 | + if (opts & (OPT_t|OPT_p|OPT_td)) | ||
76 | chp = concat_path_file(path, chp); | ||
77 | |||
78 | if (opts & OPT_u) { | ||
79 | -- | ||
80 | 2.11.0 | ||
81 | |||
diff --git a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox/fail_on_no_media.patch index 820acc2684..38db52538e 100644 --- a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch +++ b/meta/recipes-core/busybox/busybox/fail_on_no_media.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From a35e79002d36cca3c272ba5625aec86d6b7a38a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Tue, 9 Apr 2013 23:25:54 -0700 | ||
4 | Subject: [PATCH] busybox: fail on no media | ||
5 | |||
1 | Upstream-Status: Denied | 6 | Upstream-Status: Denied |
2 | [https://www.mail-archive.com/busybox@busybox.net/msg22354.html] | 7 | [https://www.mail-archive.com/busybox@busybox.net/msg22354.html] |
3 | 8 | ||
@@ -10,16 +15,18 @@ removed, but that would be harder to accomplish. | |||
10 | 15 | ||
11 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 16 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
12 | 17 | ||
18 | --- | ||
19 | util-linux/mount.c | 8 ++++++++ | ||
20 | 1 file changed, 8 insertions(+) | ||
13 | 21 | ||
14 | Index: busybox-1.20.2/util-linux/mount.c | 22 | diff --git a/util-linux/mount.c b/util-linux/mount.c |
15 | =================================================================== | 23 | index 4e65b6b..9d7a566 100644 |
16 | --- busybox-1.20.2.orig/util-linux/mount.c | 24 | --- a/util-linux/mount.c |
17 | +++ busybox-1.20.2/util-linux/mount.c | 25 | +++ b/util-linux/mount.c |
18 | @@ -598,7 +598,13 @@ static int mount_it_now(struct mntent *m | 26 | @@ -746,6 +746,14 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero |
19 | break; | ||
20 | errno = errno_save; | 27 | errno = errno_save; |
21 | } | 28 | } |
22 | - | 29 | |
23 | + /* | 30 | + /* |
24 | + * Break if there is no media, no point retrying for all | 31 | + * Break if there is no media, no point retrying for all |
25 | + * fs types since there is no media available | 32 | + * fs types since there is no media available |
@@ -27,6 +34,7 @@ Index: busybox-1.20.2/util-linux/mount.c | |||
27 | + if (rc == -1 && errno == ENOMEDIUM) { | 34 | + if (rc == -1 && errno == ENOMEDIUM) { |
28 | + bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); | 35 | + bb_perror_msg_and_die("mounting %s on %s failed", mp->mnt_fsname, mp->mnt_dir); |
29 | + } | 36 | + } |
30 | if (!rc || (vfsflags & MS_RDONLY) || (errno != EACCES && errno != EROFS)) | 37 | + |
31 | break; | 38 | // Should we retry read-only mount? |
32 | if (!(vfsflags & MS_SILENT)) | 39 | if (vfsflags & MS_RDONLY) |
40 | break; // no, already was tried | ||
diff --git a/meta/recipes-core/busybox/busybox_1.34.1.bb b/meta/recipes-core/busybox/busybox_1.35.0.bb index 3651c06126..7ce1717046 100644 --- a/meta/recipes-core/busybox/busybox_1.34.1.bb +++ b/meta/recipes-core/busybox/busybox_1.35.0.bb | |||
@@ -46,8 +46,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
46 | file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ | 46 | file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ |
47 | file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ | 47 | file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ |
48 | file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ | 48 | file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ |
49 | file://0001-mktemp-add-tmpdir-option.patch \ | ||
50 | " | 49 | " |
51 | SRC_URI:append:libc-musl = " file://musl.cfg " | 50 | SRC_URI:append:libc-musl = " file://musl.cfg " |
52 | 51 | ||
53 | SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549" | 52 | SRC_URI[tarball.sha256sum] = "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694" |