This patch is no longer needed as upstream has added including part of this include list, perhaps thats all is what was needed to make it portable
Refresh 0001-Handle-missing-gshadow.patch Signed-off-by: Khem Raj <[email protected]> --- .../systemd/0001-Handle-missing-gshadow.patch | 20 +++++------- ...ader_entry_one_shot_stat-has-incompl.patch | 31 ------------------- meta/recipes-core/systemd/systemd_246.6.bb | 1 - 3 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch diff --git a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch index 723cd2e52e..c5960a0d60 100644 --- a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch @@ -14,10 +14,8 @@ Signed-off-by: Alex Kiernan <[email protected]> src/shared/userdb.c | 6 ++++++ 3 files changed, 30 insertions(+) -Index: systemd-stable/src/shared/group-record-nss.c -=================================================================== ---- systemd-stable.orig/src/shared/group-record-nss.c -+++ systemd-stable/src/shared/group-record-nss.c +--- a/src/shared/group-record-nss.c ++++ b/src/shared/group-record-nss.c @@ -19,8 +19,10 @@ int nss_group_to_group_record( if (isempty(grp->gr_name)) return -EINVAL; @@ -35,7 +33,7 @@ Index: systemd-stable/src/shared/group-record-nss.c +#if ENABLE_GSHADOW if (sgrp) { - if (hashed_password_valid(sgrp->sg_passwd)) { + if (looks_like_hashed_password(sgrp->sg_passwd)) { g->hashed_password = strv_new(sgrp->sg_passwd); @@ -51,6 +54,7 @@ int nss_group_to_group_record( if (!g->administrators) @@ -119,10 +117,8 @@ Index: systemd-stable/src/shared/group-record-nss.c if (r < 0) return r; -Index: systemd-stable/src/shared/group-record-nss.h -=================================================================== ---- systemd-stable.orig/src/shared/group-record-nss.h -+++ systemd-stable/src/shared/group-record-nss.h +--- a/src/shared/group-record-nss.h ++++ b/src/shared/group-record-nss.h @@ -2,7 +2,11 @@ #pragma once @@ -135,10 +131,8 @@ Index: systemd-stable/src/shared/group-record-nss.h #include "group-record.h" -Index: systemd-stable/src/shared/userdb.c -=================================================================== ---- systemd-stable.orig/src/shared/userdb.c -+++ systemd-stable/src/shared/userdb.c +--- a/src/shared/userdb.c ++++ b/src/shared/userdb.c @@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator if (gr) { _cleanup_free_ char *buffer = NULL; diff --git a/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch b/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch deleted file mode 100644 index 78660691d3..0000000000 --- a/meta/recipes-core/systemd/systemd/0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f939d3e07e1175caac5cf4cbf54bd8a58c2f198a Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <[email protected]> -Date: Fri, 7 Aug 2020 15:30:52 +0000 -Subject: [PATCH] Fix field 'efi_loader_entry_one_shot_stat' has incomplete - type - -| In file included from ../../../../../../workspace/sources/systemd/src/login/logind-gperf.gperf:7: -| ../../../../../../workspace/sources/systemd/src/login/logind.h:131:21: error: field 'efi_loader_entry_one_shot_stat' has incomplete type -| 131 | struct stat efi_loader_entry_one_shot_stat; -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Inappropriate [musl specific] -Signed-off-by: Alex Kiernan <[email protected]> ---- - src/login/logind.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/login/logind.h b/src/login/logind.h -index e64ecce8e2..2d4007d84b 100644 ---- a/src/login/logind.h -+++ b/src/login/logind.h -@@ -2,6 +2,9 @@ - #pragma once - - #include <stdbool.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> - - #include "sd-bus.h" - #include "sd-device.h" diff --git a/meta/recipes-core/systemd/systemd_246.6.bb b/meta/recipes-core/systemd/systemd_246.6.bb index b50ea0e4ad..c1424a1474 100644 --- a/meta/recipes-core/systemd/systemd_246.6.bb +++ b/meta/recipes-core/systemd/systemd_246.6.bb @@ -44,7 +44,6 @@ SRC_URI_MUSL = "\ file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ file://0021-Handle-missing-LOCK_EX.patch \ file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ - file://0023-Fix-field-efi_loader_entry_one_shot_stat-has-incompl.patch \ file://0024-test-json.c-define-M_PIl.patch \ file://0001-do-not-disable-buffer-in-writing-files.patch \ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ -- 2.28.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142912): https://lists.openembedded.org/g/openembedded-core/message/142912 Mute This Topic: https://lists.openembedded.org/mt/77204797/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
