Hello Steve, Would it be possible to include it into dunfell branch too? Or do I need to submit the patch again?
Thank you, Andrej On 6/24/21 11:10 PM, Andrej Valek wrote: > - Make mktemp applet compatible with --tmpdir option in ca-certificate > update script. > > Signed-off-by: Andrej Valek <andrej.va...@siemens.com> > Signed-off-by: Peter Marko <peter.ma...@siemens.com> > --- > .../busybox/0001-mktemp-add-tmpdir-option.patch | 81 > ++++++++++++++++++++++ > meta/recipes-core/busybox/busybox_1.33.1.bb | 5 +- > 2 files changed, 84 insertions(+), 2 deletions(-) > create mode 100644 > meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch > > diff --git > a/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patc > h > b/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patc > h > new file mode 100644 > index 0000000000..4a1960dff2 > --- /dev/null > +++ b/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option. > +++ patch > @@ -0,0 +1,81 @@ > +From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 > +2001 > +From: Andrej Valek <andrej.va...@siemens.com> > +Date: Thu, 24 Jun 2021 19:13:22 +0200 > +Subject: [PATCH] mktemp: add tmpdir option > + > +Make mktemp more compatible with coreutils. > +- add "--tmpdir" option > +- add long variants for "d,q,u" options > + > +Upstream-Status: Submitted > +[https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flis > +ts.busybox.net%2Fpipermail%2Fbusybox%2F2021-June%2F088932.html&da > +ta=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937e > +fbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103746151 > +%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6 > +Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=ljy4RuZ8pCX8keUHlquCLCJ1hojHg > +v9qfY%2BcXPB6T5o%3D&reserved=0] > + lgtm, this is right approach > +Signed-off-by: Andrej Valek <andrej.va...@siemens.com> > +Signed-off-by: Peter Marko <peter.ma...@siemens.com> > +--- > + coreutils/mktemp.c | 26 ++++++++++++++++++-------- > + 1 file changed, 18 insertions(+), 8 deletions(-) > + > +diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c index > +5393320a5..05c6d98c6 100644 > +--- a/coreutils/mktemp.c > ++++ b/coreutils/mktemp.c > +@@ -39,16 +39,17 @@ > + //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o > + > + //usage:#define mktemp_trivial_usage > +-//usage: "[-dt] [-p DIR] [TEMPLATE]" > ++//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" > + //usage:#define mktemp_full_usage "\n\n" > + //usage: "Create a temporary file with name based on TEMPLATE and > print its name.\n" > + //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" > + //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" > +-//usage: "\n -d Make directory, not file" > +-//usage: "\n -q Fail silently on errors" > +-//usage: "\n -t Prepend base directory name to TEMPLATE" > +-//usage: "\n -p DIR Use DIR as a base directory (implies -t)" > +-//usage: "\n -u Do not create anything; print a name" > ++//usage: "\n -d Make directory, not file" > ++//usage: "\n -q Fail silently on errors" > ++//usage: "\n -t Prepend base directory name to > TEMPLATE" > ++//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory > (implies -t)" > ++//usage: "\n For --tmpdir is a optional one." > ++//usage: "\n -u Do not create anything; print a > name" > + //usage: "\n" > + //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" > + //usage: > +@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) > + OPT_t = 1 << 2, > + OPT_p = 1 << 3, > + OPT_u = 1 << 4, > ++ OPT_td = 1 << 5, > + }; > + > + path = getenv("TMPDIR"); > + if (!path || path[0] == '\0') > + path = "/tmp"; > + > +- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); > ++ opts = getopt32long(argv, "^" > ++ "dqtp:u\0" > ++ "?1" /* 1 arg max */, > ++ "directory\0" No_argument "d" > ++ "quiet\0" No_argument "q" > ++ "dry-run\0" No_argument "u" > ++ "tmpdir\0" Optional_argument "\xff" > ++ , &path, &path > ++ ); > + > + chp = argv[optind]; > + if (!chp) { > +@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) > + goto error; > + } > + #endif > +- if (opts & (OPT_t|OPT_p)) > ++ if (opts & (OPT_t|OPT_p|OPT_td)) > + chp = concat_path_file(path, chp); > + > + if (opts & OPT_u) { > +-- > +2.11.0 > + > diff --git a/meta/recipes-core/busybox/busybox_1.33.1.bb > b/meta/recipes-core/busybox/busybox_1.33.1.bb > index a71ff530cb..4c2bc1106d 100644 > --- a/meta/recipes-core/busybox/busybox_1.33.1.bb > +++ b/meta/recipes-core/busybox/busybox_1.33.1.bb > @@ -38,6 +38,8 @@ SRC_URI = > "https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbusybox.net%2Fdownloads%2Fbusybox-%24&data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=N3SXB3FD0hAF7wAV7Hv4AgT5f%2BEHAQr%2FRVNv1KcZqxs%3D&reserved=0{PV}.tar.bz2;name=tarball > \ > ${@["", > "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == > 'busybox-mdev')]} \ > file://syslog.cfg \ > file://unicode.cfg \ > + file://rev.cfg \ > + file://pgrep.cfg \ > file://rcS \ > file://rcK \ > file://makefile-libbb-race.patch \ @@ -45,9 +47,8 @@ > SRC_URI = > "https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbusybox.net%2Fdownloads%2Fbusybox-%24&data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=N3SXB3FD0hAF7wAV7Hv4AgT5f%2BEHAQr%2FRVNv1KcZqxs%3D&reserved=0{PV}.tar.bz2;name=tarball > \ > > file://0001-testsuite-use-https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.example.org-for-wget-test-cases.patch%2F&data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=xHlfVfFwwfCPyRhSt%2BjwIHpJHxpCW8T52kPfwJZyo3U%3D&reserved=0 > \ > file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ > > file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ > - file://rev.cfg \ > - file://pgrep.cfg \ > > file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch > \ > + file://0001-mktemp-add-tmpdir-option.patch \ > " > SRC_URI_append_libc-musl = " file://musl.cfg " > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#153800): https://lists.openembedded.org/g/openembedded-core/message/153800 Mute This Topic: https://lists.openembedded.org/mt/83778721/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
