All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andrej Valek" <andrej.valek@siemens.com>
To: "steve@sakoman.com" <steve@sakoman.com>
Cc: "openembedded-core@lists.openembedded.org"
	<openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core][PATCH] busybox: add tmpdir option into mktemp applet
Date: Tue, 13 Jul 2021 05:57:06 +0000	[thread overview]
Message-ID: <DB8PR10MB39779534C416E7949A0AEEC192149@DB8PR10MB3977.EURPRD10.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <bdb3cd51-b2b7-f5d6-4353-287d339dcbc6@gmail.com>

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.valek@siemens.com>
> Signed-off-by: Peter Marko <peter.marko@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.valek@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&amp;da
> +ta=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937e
> +fbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103746151
> +%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6
> +Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=ljy4RuZ8pCX8keUHlquCLCJ1hojHg
> +v9qfY%2BcXPB6T5o%3D&amp;reserved=0]
> +

lgtm, this is right approach

> +Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> +Signed-off-by: Peter Marko <peter.marko@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&amp;data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=N3SXB3FD0hAF7wAV7Hv4AgT5f%2BEHAQr%2FRVNv1KcZqxs%3D&amp;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&amp;data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=N3SXB3FD0hAF7wAV7Hv4AgT5f%2BEHAQr%2FRVNv1KcZqxs%3D&amp;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&amp;data=04%7C01%7Candrej.valek%40siemens.com%7Cd0399684a66a4ee5460508d937efbf1f%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637602325103756104%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=xHlfVfFwwfCPyRhSt%2BjwIHpJHxpCW8T52kPfwJZyo3U%3D&amp;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 "
>   
> 
> 
> 
> 
> 

  reply	other threads:[~2021-07-13  5:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-22 12:15 [OE-core][PATCH] ca-certificates: revert mktemp patch in update-ca-certificates script Andrej Valek
2021-06-22 12:40 ` Alexander Kanavin
2021-06-22 12:42 ` Bruce Ashfield
2021-06-22 14:30 ` Richard Purdie
2021-06-25  6:10 ` [OE-core][PATCH] busybox: add tmpdir option into mktemp applet Andrej Valek
2021-06-25 15:41   ` Khem Raj
2021-07-13  5:57     ` Andrej Valek [this message]
2021-07-13 16:15       ` Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DB8PR10MB39779534C416E7949A0AEEC192149@DB8PR10MB3977.EURPRD10.PROD.OUTLOOK.COM \
    --to=andrej.valek@siemens.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=steve@sakoman.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.