Re: [OE-core] [PATCH 50/61] coreutils: update 9.0 -> 9.1
On Thu, 5 May 2022 at 20:54, Khem Raj wrote: > https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=v8.24-7-g6d67649 > has marked uname -p and -i as non-portable options. So dropping this > patch is fine.Perhaps > using that as an argument in the commit message will be better than > saying it is difficult to rebase. I resent with a corrected commit message. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165322): https://lists.openembedded.org/g/openembedded-core/message/165322 Mute This Topic: https://lists.openembedded.org/mt/90905508/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 50/61] coreutils: update 9.0 -> 9.1
On Wed, May 4, 2022 at 10:06 PM Alexander Kanavin
wrote:
>
> Drop patches:
> fix-selinux-flask.patch
> (upstream fixed the issue)
>
> e8b56ebd536e82b15542a00c888109471936bfda.patch
> (backport)
>
> 0001-uname-report-processor-and-hardware-correctly.patch
> (difficult to rebase, use case for oe unclear)
https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commitdiff;h=v8.24-7-g6d67649
has marked uname -p and -i as non-portable options. So dropping this
patch is fine.Perhaps
using that as an argument in the commit message will be better than
saying it is difficult to rebase.
>
> License-Update: copyright years
> Signed-off-by: Alexander Kanavin
> ---
> ...ort-processor-and-hardware-correctly.patch | 64 -
> ...6ebd536e82b15542a00c888109471936bfda.patch | 93 ---
> .../coreutils/fix-selinux-flask.patch | 37
> .../{coreutils_9.0.bb => coreutils_9.1.bb}| 7 +-
> 4 files changed, 2 insertions(+), 199 deletions(-)
> delete mode 100644
> meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
> delete mode 100644
> meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
> delete mode 100644
> meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
> rename meta/recipes-core/coreutils/{coreutils_9.0.bb => coreutils_9.1.bb}
> (96%)
>
> diff --git
> a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
>
> b/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
> deleted file mode 100644
> index 3c43e1d5da..00
> ---
> a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -Upstream-Status: Denied
> -
> -Subject: uname: report processor and hardware correctly
> -
> -This patch is rejected by coreutils upstream, but distros like debian and
> fedora
> -uses this patch to make `uname -i' and `uname -p' to not report 'unknown'.
> -
> -Signed-off-by: Chen Qi
>
> - src/uname.c | 18 --
> - 1 file changed, 16 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/uname.c b/src/uname.c
> -index 39bd28c..c84582d 100644
> a/src/uname.c
> -+++ b/src/uname.c
> -@@ -299,13 +299,19 @@ main (int argc, char **argv)
> -
> - if (toprint & PRINT_PROCESSOR)
> - {
> -- char const *element = unknown;
> -+ char *element = unknown;
> - #if HAVE_SYSINFO && defined SI_ARCHITECTURE
> - {
> - static char processor[257];
> - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
> - element = processor;
> - }
> -+#else
> -+ {
> -+ static struct utsname u;
> -+ uname();
> -+ element = u.machine;
> -+ }
> - #endif
> - #ifdef UNAME_PROCESSOR
> - if (element == unknown)
> -@@ -343,7 +349,7 @@ main (int argc, char **argv)
> -
> - if (toprint & PRINT_HARDWARE_PLATFORM)
> - {
> -- char const *element = unknown;
> -+ char *element = unknown;
> - #if HAVE_SYSINFO && defined SI_PLATFORM
> - {
> - static char hardware_platform[257];
> -@@ -361,6 +367,14 @@ main (int argc, char **argv)
> - if (sysctl (mib, 2, hardware_platform, , 0, 0) >= 0)
> - element = hardware_platform;
> - }
> -+#else
> -+ {
> -+ static struct utsname u;
> -+ uname();
> -+ element = u.machine;
> -+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' &&
> element[3]=='6')
> -+element[1]='3';
> -+ }
> - #endif
> - if (! (toprint == UINT_MAX && element == unknown))
> - print_element (element);
> ---
> -1.9.1
> -
> diff --git
> a/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
>
> b/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
> deleted file mode 100644
> index d69ee95e4a..00
> ---
> a/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
> +++ /dev/null
> @@ -1,93 +0,0 @@
> -From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?P=C3=A1draig=20Brady?=
> -Date: Fri, 24 Sep 2021 20:57:41 +0100
> -Subject: [PATCH] chmod: fix exit status when ignoring symlinks
> -
> -* src/chmod.c: Reorder enum so CH_NOT_APPLIED
> -can be treated as a non error.
> -* tests/chmod/ignore-symlink.sh: A new test.
> -* tests/local.mk: Reference the new test.
> -* NEWS: Mention the bug fix.
> -Fixes https://bugs.gnu.org/50784
> -
> -Upstream-Status: Backport
> -Signed-off-by: Alexander Kanavin
>
> - src/chmod.c | 4 ++--
> - tests/chmod/ignore-symlink.sh | 31 +++
> - tests/local.mk| 1 +
> - 4 files changed, 40 insertions(+), 2 deletions(-)
> - create mode 100755 tests/chmod/ignore-symlink.sh
> -
> -diff --git a/src/chmod.c b/src/chmod.c
> -index
[OE-core] [PATCH 50/61] coreutils: update 9.0 -> 9.1
Drop patches:
fix-selinux-flask.patch
(upstream fixed the issue)
e8b56ebd536e82b15542a00c888109471936bfda.patch
(backport)
0001-uname-report-processor-and-hardware-correctly.patch
(difficult to rebase, use case for oe unclear)
License-Update: copyright years
Signed-off-by: Alexander Kanavin
---
...ort-processor-and-hardware-correctly.patch | 64 -
...6ebd536e82b15542a00c888109471936bfda.patch | 93 ---
.../coreutils/fix-selinux-flask.patch | 37
.../{coreutils_9.0.bb => coreutils_9.1.bb}| 7 +-
4 files changed, 2 insertions(+), 199 deletions(-)
delete mode 100644
meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
delete mode 100644
meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
delete mode 100644
meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
rename meta/recipes-core/coreutils/{coreutils_9.0.bb => coreutils_9.1.bb} (96%)
diff --git
a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
b/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
deleted file mode 100644
index 3c43e1d5da..00
---
a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Upstream-Status: Denied
-
-Subject: uname: report processor and hardware correctly
-
-This patch is rejected by coreutils upstream, but distros like debian and
fedora
-uses this patch to make `uname -i' and `uname -p' to not report 'unknown'.
-
-Signed-off-by: Chen Qi
- src/uname.c | 18 --
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/uname.c b/src/uname.c
-index 39bd28c..c84582d 100644
a/src/uname.c
-+++ b/src/uname.c
-@@ -299,13 +299,19 @@ main (int argc, char **argv)
-
- if (toprint & PRINT_PROCESSOR)
- {
-- char const *element = unknown;
-+ char *element = unknown;
- #if HAVE_SYSINFO && defined SI_ARCHITECTURE
- {
- static char processor[257];
- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
- element = processor;
- }
-+#else
-+ {
-+ static struct utsname u;
-+ uname();
-+ element = u.machine;
-+ }
- #endif
- #ifdef UNAME_PROCESSOR
- if (element == unknown)
-@@ -343,7 +349,7 @@ main (int argc, char **argv)
-
- if (toprint & PRINT_HARDWARE_PLATFORM)
- {
-- char const *element = unknown;
-+ char *element = unknown;
- #if HAVE_SYSINFO && defined SI_PLATFORM
- {
- static char hardware_platform[257];
-@@ -361,6 +367,14 @@ main (int argc, char **argv)
- if (sysctl (mib, 2, hardware_platform, , 0, 0) >= 0)
- element = hardware_platform;
- }
-+#else
-+ {
-+ static struct utsname u;
-+ uname();
-+ element = u.machine;
-+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' &&
element[3]=='6')
-+element[1]='3';
-+ }
- #endif
- if (! (toprint == UINT_MAX && element == unknown))
- print_element (element);
---
-1.9.1
-
diff --git
a/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
b/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
deleted file mode 100644
index d69ee95e4a..00
---
a/meta/recipes-core/coreutils/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?=
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: [PATCH] chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin
- src/chmod.c | 4 ++--
- tests/chmod/ignore-symlink.sh | 31 +++
- tests/local.mk| 1 +
- 4 files changed, 40 insertions(+), 2 deletions(-)
- create mode 100755 tests/chmod/ignore-symlink.sh
-
-diff --git a/src/chmod.c b/src/chmod.c
-index 37b04f500..57ac47f33 100644
a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
- enum
- {
- CH_NO_STAT,
-- CH_NOT_APPLIED,
- CH_FAILED,
-+ CH_NOT_APPLIED,
- CH_NO_CHANGE_REQUESTED,
- CH_SUCCEEDED
- }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
- if ( ! recurse)
- fts_set (fts, ent, FTS_SKIP);
-
-- return CH_NO_CHANGE_REQUESTED <= ch.status;
-+ return CH_NOT_APPLIED <= ch.status;
- }
-
- /* Recursively change the modes of the specified FILES (the last entry
-diff --git a/tests/chmod/ignore-symlink.sh
