From 828298c4bb970f2fac3a29df1b9b21a46d235d10 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Thu, 20 Aug 2020 10:20:35 +0000 Subject: systemd: Move musl patches to SRC_URI_MUSL Supplemental musl patches for v246 were erroneously added to SRC_URI, move them to SRC_URI_MUSL. Fixes: 470c58ba4586 ("systemd: Upgrade v245.6 -> v246") (From OE-Core rev: fb7a03fb6c057e4f8b802671230f67bef53a5818) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_246.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_246.bb b/meta/recipes-core/systemd/systemd_246.bb index a463aab1e3..11e3cd2966 100644 --- a/meta/recipes-core/systemd/systemd_246.bb +++ b/meta/recipes-core/systemd/systemd_246.bb @@ -20,9 +20,6 @@ SRC_URI += "file://touchscreen.rules \ file://99-default.preset \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.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 \ " # patches needed by musl @@ -45,6 +42,9 @@ SRC_URI_MUSL = "\ file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ 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 \ -- cgit v1.2.3-54-g00ecf