* Re: [OE-core][PATCH] ca-certificates: revert mktemp patch in update-ca-certificates script
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
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Alexander Kanavin @ 2021-06-22 12:40 UTC (permalink / raw)
To: Andrej Valek; +Cc: OE-core, Steve Sakoman
[-- Attachment #1: Type: text/plain, Size: 4434 bytes --]
This submission is modifying two different patch files (one of which I
think should not be touched), and reverting something that was already
accepted upstream.
I would suggest that you first take latest upstream code, then do any
needed modifications there, then submit them upstream and backport to the
recipe.
Also the patch file metadata is changed and important information is being
removed.
The issue that the patch is aiming to address could also be explained
better, particularly the step by step scenario of where the breakage
happens would help.
Alex
On Tue, 22 Jun 2021 at 14:15, Andrej Valek <andrej.valek@siemens.com> wrote:
> - revert f3eabbb5c15fb55ae3d46b2377c09bb58226d965
> - mktemp from busybox does not support '--tmpdir' option
> - coreutils is usually not possible to use because of 'GPLv3+' LICENSE
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> .../ca-certificates/ca-certificates/sbindir.patch | 10 ++--------
> .../update-ca-certificates-support-Toybox.patch | 21
> +++++++++++----------
> 2 files changed, 13 insertions(+), 18 deletions(-)
>
> diff --git
> a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> index f343ebf16e..a113fa8b15 100644
> --- a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> +++ b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> @@ -1,12 +1,6 @@
> -sbin/Makefile: Allow the sbin path to be configurable
> +Upstream-Status: Pending
>
> -Some project sharing ca-certificates from Debian allow configuration
> -of the installation location. Make the sbin location configurable.
> -
> -Also ensure the target directory exists
> -
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Upstream-Status: Submitted [
> https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
> +Let us alter the install destination of the script via SBINDIR
>
> --- ca-certificates-20130119.orig/sbin/Makefile
> +++ ca-certificates-20130119/sbin/Makefile
> diff --git
> a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> index f78790923c..6e2171f758 100644
> ---
> a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> +++
> b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> @@ -1,13 +1,14 @@
> -update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir
> +From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001
> +From: Patrick Ohly <patrick.ohly@intel.com>
> +Date: Thu, 17 Mar 2016 12:38:09 +0100
> +Subject: [PATCH] update-ca-certificates: support Toybox
>
> -According to coreutils docs, mktemp -t is deprecated, switch to the
> ---tmpdir option instead.
> +"mktemp -t" is deprecated and does not work when using Toybox. Replace
> +with something that works also with Toybox.
>
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Upstream-Status: Submitted [
> https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
> +Upstream-Status: Pending
>
> -[This was originally for compatibility with toybox but toybox now
> -supports -t]
> +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> ---
> sbin/update-ca-certificates | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> @@ -23,9 +24,9 @@ index 79c41bb..ae9e3f1 100755
> -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
> -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
> -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
> -+TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")"
> -+ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
> -+REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
> ++TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")"
> ++ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
> ++REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
>
> # Adds a certificate to the list of trusted ones. This includes a
> symlink
> # in /etc/ssl/certs to the certificate file and its inclusion into the
> --
> 2.11.0
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 5722 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [OE-core][PATCH] ca-certificates: revert mktemp patch in update-ca-certificates script
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
3 siblings, 0 replies; 8+ messages in thread
From: Bruce Ashfield @ 2021-06-22 12:42 UTC (permalink / raw)
To: Andrej Valek
Cc: Patches and discussions about the oe-core layer, Steve Sakoman
On Tue, Jun 22, 2021 at 8:16 AM Andrej Valek <andrej.valek@siemens.com> wrote:
>
> - revert f3eabbb5c15fb55ae3d46b2377c09bb58226d965
> - mktemp from busybox does not support '--tmpdir' option
> - coreutils is usually not possible to use because of 'GPLv3+' LICENSE
This should say "coreutils may not be possible" .. many folks don't
care about GPLv3, so "usually" is not appropriate here.
Also: What Alex said in his review.
Bruce
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> .../ca-certificates/ca-certificates/sbindir.patch | 10 ++--------
> .../update-ca-certificates-support-Toybox.patch | 21 +++++++++++----------
> 2 files changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> index f343ebf16e..a113fa8b15 100644
> --- a/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> +++ b/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
> @@ -1,12 +1,6 @@
> -sbin/Makefile: Allow the sbin path to be configurable
> +Upstream-Status: Pending
>
> -Some project sharing ca-certificates from Debian allow configuration
> -of the installation location. Make the sbin location configurable.
> -
> -Also ensure the target directory exists
> -
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
> +Let us alter the install destination of the script via SBINDIR
>
> --- ca-certificates-20130119.orig/sbin/Makefile
> +++ ca-certificates-20130119/sbin/Makefile
> diff --git a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> index f78790923c..6e2171f758 100644
> --- a/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> +++ b/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
> @@ -1,13 +1,14 @@
> -update-ca-certificates: Replace deprecated mktemp -t with mktemp --tmpdir
> +From 30378026d136efa779732e3f6664e2ecf461e458 Mon Sep 17 00:00:00 2001
> +From: Patrick Ohly <patrick.ohly@intel.com>
> +Date: Thu, 17 Mar 2016 12:38:09 +0100
> +Subject: [PATCH] update-ca-certificates: support Toybox
>
> -According to coreutils docs, mktemp -t is deprecated, switch to the
> ---tmpdir option instead.
> +"mktemp -t" is deprecated and does not work when using Toybox. Replace
> +with something that works also with Toybox.
>
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/5]
> +Upstream-Status: Pending
>
> -[This was originally for compatibility with toybox but toybox now
> -supports -t]
> +Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
> ---
> sbin/update-ca-certificates | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> @@ -23,9 +24,9 @@ index 79c41bb..ae9e3f1 100755
> -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
> -ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
> -REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
> -+TEMPBUNDLE="$(mktemp --tmpdir "${CERTBUNDLE}.tmp.XXXXXX")"
> -+ADDED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
> -+REMOVED="$(mktemp --tmpdir "ca-certificates.tmp.XXXXXX")"
> ++TEMPBUNDLE="$(mktemp -p${TMPDIR:-/tmp} "${CERTBUNDLE}.tmp.XXXXXX")"
> ++ADDED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
> ++REMOVED="$(mktemp -p${TMPDIR:-/tmp} "ca-certificates.tmp.XXXXXX")"
>
> # Adds a certificate to the list of trusted ones. This includes a symlink
> # in /etc/ssl/certs to the certificate file and its inclusion into the
> --
> 2.11.0
>
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [OE-core][PATCH] ca-certificates: revert mktemp patch in update-ca-certificates script
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
3 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2021-06-22 14:30 UTC (permalink / raw)
To: Andrej Valek, openembedded-core; +Cc: steve
On Tue, 2021-06-22 at 14:15 +0200, Andrej Valek wrote:
> - revert f3eabbb5c15fb55ae3d46b2377c09bb58226d965
> - mktemp from busybox does not support '--tmpdir' option
> - coreutils is usually not possible to use because of 'GPLv3+' LICENSE
I suspect the better long term solution here is to submit a patch to add
--tmpdir to busybox since we're likely to lose deprecated options from
coreutils and upstream already moved to the non-deprecated options.
Cheers,
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* [OE-core][PATCH] busybox: add tmpdir option into mktemp applet
2021-06-22 12:15 [OE-core][PATCH] ca-certificates: revert mktemp patch in update-ca-certificates script Andrej Valek
` (2 preceding siblings ...)
2021-06-22 14:30 ` Richard Purdie
@ 2021-06-25 6:10 ` Andrej Valek
2021-06-25 15:41 ` Khem Raj
3 siblings, 1 reply; 8+ messages in thread
From: Andrej Valek @ 2021-06-25 6:10 UTC (permalink / raw)
To: openembedded-core; +Cc: steve, Andrej Valek, Peter Marko
- 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.patch b/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch
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 [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html]
+
+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://busybox.net/downloads/busybox-${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://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
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 "
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [OE-core][PATCH] busybox: add tmpdir option into mktemp applet
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
0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2021-06-25 15:41 UTC (permalink / raw)
To: Andrej Valek, openembedded-core; +Cc: steve, Peter Marko
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.patch b/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch
> 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 [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html]
> +
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://busybox.net/downloads/busybox-${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://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
> file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
> 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 "
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [OE-core][PATCH] busybox: add tmpdir option into mktemp applet
2021-06-25 15:41 ` Khem Raj
@ 2021-07-13 5:57 ` Andrej Valek
2021-07-13 16:15 ` Steve Sakoman
0 siblings, 1 reply; 8+ messages in thread
From: Andrej Valek @ 2021-07-13 5:57 UTC (permalink / raw)
To: steve; +Cc: openembedded-core
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&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.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&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 "
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [OE-core][PATCH] busybox: add tmpdir option into mktemp applet
2021-07-13 5:57 ` Andrej Valek
@ 2021-07-13 16:15 ` Steve Sakoman
0 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2021-07-13 16:15 UTC (permalink / raw)
To: Andrej Valek; +Cc: openembedded-core
On Mon, Jul 12, 2021 at 7:57 PM Andrej Valek <andrej.valek@siemens.com> wrote:
> Would it be possible to include it into dunfell branch too? Or do I need to submit the patch again?
This patch doesn't apply cleanly to the busybox in dunfell since it is
a different version.
I've dealt with the issues and created a version for dunfell. If it
passes autobuilder testing I will include it in the next dunfell patch
review cycle.
Steve
> 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&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.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&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 "
> >
> >
> >
> >
> >
> >
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread