From patchwork Thu Jul 4 08:24:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 45994 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B7A3C41513 for ; Thu, 4 Jul 2024 08:25:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.5847.1720081503166824760 for ; Thu, 04 Jul 2024 01:25:03 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=7915407677=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4645ebaa010928 for ; Thu, 4 Jul 2024 08:25:02 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 405jrsg8uf-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 04 Jul 2024 08:25:01 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CT5EWbzXpg4v1XsKroDp0ricErxsmfBr7NP0n7XMRQx5lLXi+C/tZ3PlpIbDa8AnqivFkSO3HrJbzkSW8MHGG8/ujauS+ryRLbWmZIza9LbOcyIfIoq6NOxIkuUebbtVwAatMZDr0Fmq4bG1xn+Q2lEovJdw6p8J+8aSV8xHEusRClH2FUryEqGN0hm2hiVnXhENYEmi21dm3TahfvIHskrNlkEbXoVJCv16bpvPpgKvAobJXJew1cCBZnxamIQF5ddLSjUkkdTr6TbMPt4sNGlE0x5cQwEy2SEE+4mcsqAa+em1qLF8ZcqlWHh5r7meQSIrtpePWVLd1A4Bm3PCYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j8wlKra+01wrgwiWjWBlLWRvSMqSaC3/5hQhF1bRyQg=; b=R+ldqVI7YdUbu4LfWB5k4P6CmSg2NKqBJqPyA53UVFDzZOWq6dIuU0Vck5Jn1K3JBM13z5QRIw5uhrWrqSaDycta+GCmK4sNX8a+ZHgamrwy77qAHSubY4ix2rYYUQgqt7ju3MgDaPeydrnaNkoJTfddNu8Nznm3GCRJsR9Ah2U7nKAMSMdsp0zFk2jx726BM9fgXtPbEi8Afw2IIgfQ1B68WQNw4UbBChs8ZW4SwdtrEq3i6xCu4uTBWucjG6g7PQ6qVikefk8si33BAQp/knluMSJ4i1sRBb+LJZnWkseUFY0ycyLeV4WB3P1VDaXjewv2wZXl7XENXjyaTfr+3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW3PR11MB4649.namprd11.prod.outlook.com (2603:10b6:303:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Thu, 4 Jul 2024 08:24:56 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%7]) with mapi id 15.20.7741.027; Thu, 4 Jul 2024 08:24:56 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 1/4] systemd: upgrade from 255.6 to 256 Date: Thu, 4 Jul 2024 01:24:39 -0700 Message-ID: <20240704082444.3886275-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.45.1 X-ClientProxiedBy: BYAPR08CA0038.namprd08.prod.outlook.com (2603:10b6:a03:117::15) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW3PR11MB4649:EE_ X-MS-Office365-Filtering-Correlation-Id: 96ac1b5c-1287-4f98-7269-08dc9c02c976 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?3jYZ0k8qKlifxq5TZI/p5+ACGXRI1y0?= =?utf-8?q?MZm97IeouimeS0ptYEK3Drdj8j/YHGAex0b3k92Ls8x0KZleKaPOzcolZFT8w/Rsr?= =?utf-8?q?/02YAg4cHRkbLZsBJO2Kjuh38mScgk+9OiQFsICBl7n4IleNf1TtkIH/3dwh0Q1zw?= =?utf-8?q?xFoPa95EXOXUflnQ7Pj42auYZV6YrMxXG3RJiG4cKhVvD6i552qppumcUb66LAKMp?= =?utf-8?q?InKmhR5aClGu3wzUHjd8wgJYJMS8EcIqY3jWWdu+LfbkGi6bjm8xHdhBLmwt0uz9b?= =?utf-8?q?A9Z9C75PB+2Cg3/KZXBKdP/9TM51iWFtczfGVMeaLRGAJ/1P5YoeTHCNql8VUuzJ8?= =?utf-8?q?MOAztXSdDSB6qYt8iJI5GkqqRlTrajBmuCj5GFHVwdJQ7FIhiFnEf9hjv9eukIxRv?= =?utf-8?q?s00B7VDU30J+nwnUKFvuSjJrE4Menzg4gCi4AFEEYbr3vNnBQ+MkEtgeO0RvGbO2P?= =?utf-8?q?YX7DoNKTLtAfhnOMJQG8asvah24q/UldeRfuFuigYiK3IBt5NsuAy6xvU5LnAQMsl?= =?utf-8?q?LFvmNImpc3GYfH9OTlTc1k6o7zJQiOOp2uKlfg+gKxQlYXgknPOuPeCxVypkwXa3k?= =?utf-8?q?Z7sdiGW6JPyZZjyBkD70I4/MJaKzpkyhlQRgYlaW6vfl6Oax21Lkla2nrR95xJ7EG?= =?utf-8?q?e5+Gs+a48lW1zf5yc10jIEXxnK7tqP75vABYfhEO7pTEGaI2XMsXIVEn1/f8DY0c0?= =?utf-8?q?LRee2yGeOkwDEK4vmiTPlZixvDBF0YzL0stUAWvVGQXqPweQ3DkKh/GS/VJHPgBM3?= =?utf-8?q?L+5Q/gdIfA5Wom0HHgfFVAmgKmebjAkuJtw2Clabuew5kg8k0Ar94GzKI2XLeIo0z?= =?utf-8?q?A/L8bH+oZd4q0eWcqITH9IodfyrS8Z3ImvHquxsXyqEKuCsgMXl7qmx5/hcJTntLL?= =?utf-8?q?5w+/rhl0jigmfb08CSy2I3eVME0Ij+pBRvrLFMnW7hCOtm1XNjAiDG4jt/s/trmnZ?= =?utf-8?q?yphfmiuAS9p1GnJ2DWNWDjuS7nr/0gb0mKrhvNSiNnSGBbUMqK8Saydr1nrgdA3Ot?= =?utf-8?q?nQp1z9QQcqhaTGj1MCFVmPDs3p+VOkHS+IVbDTmlKaDcG2g9PjsYmgLhO1K8A7rMy?= =?utf-8?q?foLkCFeh5ChSGOJy9RBYabJuPUXFcaZOALthh1KeCGWUvBeerpWVicCl8aP6esbox?= =?utf-8?q?HOgRY5GAOWqGOzTSu6upEwFY4KUUYLFl5BboAYzbTAnXklItHcxHAFuZN2Moc6Pz7?= =?utf-8?q?+COwNQmXa3ubDOFiXIyxRvxaUQDFkQSzgbshQSbXa5yztTpsxtHdoUKpLl5rg3uQf?= =?utf-8?q?9SWEGkbmFnoUqBcya/KmCtaEJ55GPXkrgS+e7LmmIueatlj7WQNnqrFQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UXOKAcTw0W+vRUgkdfp3/rOAxvh+?= =?utf-8?q?lKjOMjhCD1kyN+02CphAWu8TlxUYcu3MnMmnCi5VpIgRf3vvG/8ycIUy0zC/YnF6y?= =?utf-8?q?xOB4AGWDAuHflFaDpJt95/crM1jtNsW1iILihrW+rybleY6IkQIYa8nHcwqgjI+HZ?= =?utf-8?q?Pq6N5lKdfD8mqxpIs3rrT43jbaMklpGe0AV1P88/CL7vAGGOIMRTeo/QVAk6fw2um?= =?utf-8?q?l5Kp7nxKsTTHPbHJL3YXm/a2Zfv3tw7Tspr/2KNuOY6WPLgN1Rip/GNxq2PFROV8f?= =?utf-8?q?GmYv9e6PqCo75+k8y2kfyV64vvAR5UkBVUUFgDHENHg693RCUIgU7UU24JYsjosha?= =?utf-8?q?u/fS8B8aOFzk09eSBYzR8+HfszTJozPLFiPFW9JMDbo57Pj9rWRvp1V2g4YuXwuPZ?= =?utf-8?q?JECic7X/zRpSTsB69w6laSvyn379rrtgZ6Ux32rh3P3RuQLQQ2dkfYWOqVWmWySoF?= =?utf-8?q?vdyCniOs6CQGhCVXW+bgiwRfItQnPnUOhTHBvWD/XmYrBVGtbb+uqc/TBFCnNUn95?= =?utf-8?q?tdoGFLAcOQAVJjGCDx6mQs2nfitMKL2HiGYI1ONgvbAKxHUQ8y7fzVAaD4kYv28id?= =?utf-8?q?ArJbikTc4/H6guuYBM0X89gTKUhMpBsvnHeB7Lo9rs9tjKOFR0egAMKp7NC/k3OsU?= =?utf-8?q?k6wl6/EIQxRQXvUlaIr3Tk4zwRf6BH4A45aHMuI/3o3yrgLhzsMVFOhUVZOh+pi8q?= =?utf-8?q?yH8JD2YSJ8mws0hzzEEcj61PVt4B5Ao2ucmdq5HAuY5aFCedTwW2U7NFTYSYtATTy?= =?utf-8?q?MA4hmuVas53Z3ZVYu1hWznCeeQHDhsEio/ZSNHkWPc6ywZICgbr7y1pZOzS8R4vnz?= =?utf-8?q?ej3ZeBkzdxSO8COCK0Br921mZOd8bJ9MBZRAV7F1yKpBp+RWf1EC7LN4h1UN/fR25?= =?utf-8?q?O0Zwf87C8ilUgYfMjP8V7poicVE9kKi8HpRp8p3SVsLV2tQsB7tXvkuX87C3Dzya1?= =?utf-8?q?C6WylFK0hlp1BRMtPkz10JI/ll9QzA8ySLbTCrGz9lOgSZTN8V28iXUWwk0UNb113?= =?utf-8?q?iK2/vkUS/Amn/TrfalN57g8xfEVNRgIWylvTit81mGkti0BEyL/Q18eiwSTEFRRoi?= =?utf-8?q?9hh5qYWDkLWSCC/RiFP6s3YhDoXpsm5Jd3s/1f8CdzARcpEmcZPVSwL/mppiib1ch?= =?utf-8?q?zkZMF8yGcaM42dnSn9nS8THN/aj42DoAlKYiveGzoEHBmCVCYORot5WmvnIkzX6z4?= =?utf-8?q?wf6n4qorSU7TY3wY4cGbqFo+lwaNygXmYojUiOMUL/NkvMtBBpAA4TzHlgTEmaHjA?= =?utf-8?q?tbyRpNKhJxrkrM7iiiBLNcNGA23TX/XwcTB/sZmJgOnCZ+oQ2CsdzJe7lqfaNTl+/?= =?utf-8?q?Vm7l7+ZTnGjf9pIsrCZGR5I+CgbLkdHLK5Bu7knyjIeqUazDa2rH1BvGbquq6aTUl?= =?utf-8?q?IsmVmQ5ea5A9IUfZWxsJif8jkJNvVhl57AOyZlvCVq9XAuPkS8w1e/h/qZWvcEloP?= =?utf-8?q?siksGgNev34k98zowxoieXj2HraEpGNTJgZAZ5FNtIVuhUo5gUKJPUVC0tmtIqSxE?= =?utf-8?q?TP97ImRnSvPBlmeSAza9R0nG1o9Lu+FKMQ=3D=3D?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96ac1b5c-1287-4f98-7269-08dc9c02c976 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2024 08:24:56.5460 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JUpB1GewBWCWKktmo+2a/tsQDzih5Wi0qMlDB/QlX36SW5qfZOy2wJ9OeRbQTXimx+/2o6Xv7alALuoDnhgN9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4649 X-Proofpoint-GUID: jVT5n8FHOd3wNe9x-SWZf7UGTuDLVCAy X-Proofpoint-ORIG-GUID: jVT5n8FHOd3wNe9x-SWZf7UGTuDLVCAy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-03_18,2024-07-03_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2406140001 definitions=main-2407040058 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 4645ebaa010928 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Jul 2024 08:25:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201527 From: Chen Qi The 'cgroupv2' PACKAGECONFIG is dropped as systemd now only supports cgroupv2. mime is now inherited because ${datadir}/mime/packages/io.systemd.xml is a mime type file. For musl specific patches, most are refreshed. One old patch is dropped, and three new ones are added. Newly added: build-path.c: avoid boot time segfault for musl adjust header inclusion order to avoid redeclaration undef stdin for references using stdin as a struct member include signal.h to avoid the 'undeclared' error Dropped: src/basic/missing.h: check for missing strndupa (drop reason: systemd does not use strndupa any more) Signed-off-by: Chen Qi --- meta/recipes-core/systemd/systemd.inc | 4 +- ...all-dependency-links-at-install-tim.patch} | 21 +- ...mplment-systemd-sysv-install-for-OE.patch} | 7 +- ...agate-sysroot-for-cross-compilation.patch} | 10 +- ...missing.h-check-for-missing-strndupa.patch | 696 ------------------ ...-missing_type.h-add-comparison_fn_t.patch} | 15 +- ...-parse_printf_format-implementation.patch} | 25 +- ...B_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} | 22 +- ...07-add-missing-FTW_-macros-for-musl.patch} | 9 +- ...8-Use-uintmax_t-for-handling-rlim_t.patch} | 23 +- ..._SYMLINK_NOFOLLOW-flag-to-faccessat.patch} | 9 +- ...atible-basename-for-non-glibc-syste.patch} | 10 +- ...ffering-when-writing-to-oom_score_a.patch} | 11 +- ...ompliant-strerror_r-from-GNU-specif.patch} | 9 +- ...efinition-of-prctl_mm_map-structure.patch} | 13 +- ...not-disable-buffer-in-writing-files.patch} | 151 ++-- ...tch => 0015-Handle-__cpu_mask-usage.patch} | 9 +- ...atch => 0016-Handle-missing-gshadow.patch} | 50 +- ....h-Define-MIPS-ABI-defines-for-musl.patch} | 7 +- ...ss-correct-parameters-to-getdents64.patch} | 11 +- ...tch => 0019-Adjust-for-musl-headers.patch} | 165 ++--- ...rerror-is-assumed-to-be-GNU-specifi.patch} | 13 +- ...til-Make-STRERROR-portable-for-musl.patch} | 9 +- ...ke-malloc_trim-conditional-on-glibc.patch} | 13 +- ...ared-Do-not-use-malloc_info-on-musl.patch} | 11 +- ...4-avoid-missing-LOCK_EX-declaration.patch} | 24 +- ...gnal.h-to-avoid-the-undeclared-error.patch | 27 + ...references-using-stdin-as-a-struct-m.patch | 48 ++ ...clusion-order-to-avoid-redeclaration.patch | 76 ++ ....c-avoid-boot-time-segfault-for-musl.patch | 31 + .../{systemd_255.6.bb => systemd_256.bb} | 60 +- 31 files changed, 563 insertions(+), 1026 deletions(-) rename meta/recipes-core/systemd/systemd/{0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch => 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch} (85%) rename meta/recipes-core/systemd/systemd/{0008-implment-systemd-sysv-install-for-OE.patch => 0002-implment-systemd-sysv-install-for-OE.patch} (91%) rename meta/recipes-core/systemd/systemd/{0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch => 0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch} (78%) delete mode 100644 meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch rename meta/recipes-core/systemd/systemd/{0001-missing_type.h-add-comparison_fn_t.patch => 0004-missing_type.h-add-comparison_fn_t.patch} (87%) rename meta/recipes-core/systemd/systemd/{0002-add-fallback-parse_printf_format-implementation.patch => 0005-add-fallback-parse_printf_format-implementation.patch} (96%) rename meta/recipes-core/systemd/systemd/{0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch => 0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch} (91%) rename meta/recipes-core/systemd/systemd/{0005-add-missing-FTW_-macros-for-musl.patch => 0007-add-missing-FTW_-macros-for-musl.patch} (85%) rename meta/recipes-core/systemd/systemd/{0006-Use-uintmax_t-for-handling-rlim_t.patch => 0008-Use-uintmax_t-for-handling-rlim_t.patch} (88%) rename meta/recipes-core/systemd/systemd/{0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch => 0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} (96%) rename meta/recipes-core/systemd/systemd/{0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch => 0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch} (82%) rename meta/recipes-core/systemd/systemd/{0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch => 0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch} (82%) rename meta/recipes-core/systemd/systemd/{0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch => 0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch} (92%) rename meta/recipes-core/systemd/systemd/{0011-avoid-redefinition-of-prctl_mm_map-structure.patch => 0013-avoid-redefinition-of-prctl_mm_map-structure.patch} (71%) rename meta/recipes-core/systemd/systemd/{0012-do-not-disable-buffer-in-writing-files.patch => 0014-do-not-disable-buffer-in-writing-files.patch} (84%) rename meta/recipes-core/systemd/systemd/{0013-Handle-__cpu_mask-usage.patch => 0015-Handle-__cpu_mask-usage.patch} (91%) rename meta/recipes-core/systemd/systemd/{0014-Handle-missing-gshadow.patch => 0016-Handle-missing-gshadow.patch} (80%) rename meta/recipes-core/systemd/systemd/{0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch => 0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch} (89%) rename meta/recipes-core/systemd/systemd/{0016-pass-correct-parameters-to-getdents64.patch => 0018-pass-correct-parameters-to-getdents64.patch} (88%) rename meta/recipes-core/systemd/systemd/{0017-Adjust-for-musl-headers.patch => 0019-Adjust-for-musl-headers.patch} (84%) rename meta/recipes-core/systemd/systemd/{0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch => 0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch} (87%) rename meta/recipes-core/systemd/systemd/{0019-errno-util-Make-STRERROR-portable-for-musl.patch => 0021-errno-util-Make-STRERROR-portable-for-musl.patch} (88%) rename meta/recipes-core/systemd/systemd/{0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch => 0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch} (76%) rename meta/recipes-core/systemd/systemd/{0021-shared-Do-not-use-malloc_info-on-musl.patch => 0023-shared-Do-not-use-malloc_info-on-musl.patch} (86%) rename meta/recipes-core/systemd/systemd/{0022-avoid-missing-LOCK_EX-declaration.patch => 0024-avoid-missing-LOCK_EX-declaration.patch} (62%) create mode 100644 meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch create mode 100644 meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch create mode 100644 meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch create mode 100644 meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch rename meta/recipes-core/systemd/{systemd_255.6.bb => systemd_256.bb} (95%) diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 8bda47dd38..6906ff969b 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,8 +15,8 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" -SRCBRANCH = "v255-stable" +SRCREV = "5c79cdec10a547a866764a66e1e14898112a00cd" +SRCBRANCH = "main" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch similarity index 85% rename from meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch rename to meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 4c73c924ef..4ffcb2ed46 100644 --- a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 661a34c3de30d4ff4a2a62c9a0573c6ce55424e4 Mon Sep 17 00:00:00 2001 +From ca94c86736ca7917e6c50d09d6c6ba56ba139709 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH] binfmt: Don't install dependency links at install time for - the binfmt services +Subject: [PATCH 01/27] binfmt: Don't install dependency links at install time + for the binfmt services use [Install] blocks so that they get created when the service is enabled like a traditional service. @@ -25,10 +25,10 @@ Signed-off-by: Scott Murray 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/units/meson.build b/units/meson.build -index e7bfb7f838..1d5ec4b178 100644 +index b231341a1f..b613a188a4 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -154,7 +154,6 @@ units = [ +@@ -156,7 +156,6 @@ units = [ { 'file' : 'proc-sys-fs-binfmt_misc.automount', 'conditions' : ['ENABLE_BINFMT'], @@ -36,7 +36,7 @@ index e7bfb7f838..1d5ec4b178 100644 }, { 'file' : 'proc-sys-fs-binfmt_misc.mount', -@@ -251,7 +250,6 @@ units = [ +@@ -258,7 +257,6 @@ units = [ { 'file' : 'systemd-binfmt.service.in', 'conditions' : ['ENABLE_BINFMT'], @@ -45,7 +45,7 @@ index e7bfb7f838..1d5ec4b178 100644 { 'file' : 'systemd-bless-boot.service.in', diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 5d212015a5..6c2900ca77 100644 +index 7ec21e76c9..fee4d1345f 100644 --- a/units/proc-sys-fs-binfmt_misc.automount +++ b/units/proc-sys-fs-binfmt_misc.automount @@ -22,3 +22,6 @@ Before=shutdown.target @@ -56,11 +56,11 @@ index 5d212015a5..6c2900ca77 100644 +[Install] +WantedBy=sysinit.target diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 6861c76674..531e9fbd90 100644 +index 318bf8efc2..6ef684861d 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html - Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems + Documentation=https://systemd.io/API_FILE_SYSTEMS DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount @@ -74,3 +74,6 @@ index 6861c76674..531e9fbd90 100644 + +[Install] +WantedBy=sysinit.target +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0002-implment-systemd-sysv-install-for-OE.patch similarity index 91% rename from meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch rename to meta/recipes-core/systemd/systemd/0002-implment-systemd-sysv-install-for-OE.patch index 8b833ce073..36cc5678c0 100644 --- a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0002-implment-systemd-sysv-install-for-OE.patch @@ -1,7 +1,7 @@ -From 5f89867f2b15f9bd411564d04e660cdeedd370ca Mon Sep 17 00:00:00 2001 +From 40ae40de3db990a7e56694f24fc625b1b71a98f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 5 Sep 2015 06:31:47 +0000 -Subject: [PATCH] implment systemd-sysv-install for OE +Subject: [PATCH 02/27] implment systemd-sysv-install for OE Use update-rc.d for enabling/disabling and status command to check the status of the sysv service @@ -38,3 +38,6 @@ index cb58d8243b..000bdf6165 100755 ;; *) usage ;; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch b/meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch similarity index 78% rename from meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch rename to meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch index 5be4a27b36..08b70bf66d 100644 --- a/meta/recipes-core/systemd/systemd/0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch +++ b/meta/recipes-core/systemd/systemd/0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch @@ -1,7 +1,7 @@ -From 7463b382bcaf26aacc60b73f98f0262aa41db3ee Mon Sep 17 00:00:00 2001 +From bbceb4b339231124a0b004531b4b6838539432e6 Mon Sep 17 00:00:00 2001 From: Johannes Schneider Date: Thu, 20 Jun 2024 12:32:18 +0200 -Subject: [PATCH] meson: bpf: propagate 'sysroot' for cross compilation +Subject: [PATCH 03/27] meson: bpf: propagate 'sysroot' for cross compilation During cross-compilation of systemd, the compiler used to build the bpf's needs to be pointed at the correct include searchpath. Which can be done by passing @@ -15,10 +15,10 @@ Signed-off-by: Johannes Schneider 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build -index 187e7b216d..15df058ab6 100644 +index ea4e12aa1c..52723bef09 100644 --- a/meson.build +++ b/meson.build -@@ -1691,6 +1691,7 @@ if conf.get('BPF_FRAMEWORK') == 1 +@@ -1739,6 +1739,7 @@ if conf.get('BPF_FRAMEWORK') == 1 '-ffile-prefix-map=', '-fdebug-prefix-map=', '-fmacro-prefix-map=', @@ -27,5 +27,5 @@ index 187e7b216d..15df058ab6 100644 foreach opt : c_args -- -2.34.1 +2.45.1 diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch deleted file mode 100644 index f09f2114d3..0000000000 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch +++ /dev/null @@ -1,696 +0,0 @@ -From 843c6c94bf6a29eaceeefafa420cd86a32e844d2 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH] src/basic/missing.h: check for missing strndupa - -include missing.h for definition of strndupa - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Khem Raj -Signed-off-by: Chen Qi -[Rebased for v242] -Signed-off-by: Andrej Valek -[rebased for systemd 243] -Signed-off-by: Scott Murray -Signed-off-by: Alex Kiernan -[rebased for systemd 244] -[Rebased for v247] -Signed-off-by: Luca Boccassi -[Rebased for v254] -Signed-off-by: Chen Qi -[Rebased for v255.1] ---- - meson.build | 1 + - src/backlight/backlight.c | 1 + - src/basic/cgroup-util.c | 1 + - src/basic/env-util.c | 1 + - src/basic/log.c | 1 + - src/basic/missing_stdlib.h | 12 ++++++++++++ - src/basic/mkdir.c | 1 + - src/basic/mountpoint-util.c | 1 + - src/basic/parse-util.c | 1 + - src/basic/path-lookup.c | 1 + - src/basic/percent-util.c | 1 + - src/basic/proc-cmdline.c | 1 + - src/basic/procfs-util.c | 1 + - src/basic/time-util.c | 1 + - src/boot/bless-boot.c | 1 + - src/core/dbus-cgroup.c | 1 + - src/core/dbus-execute.c | 1 + - src/core/dbus-util.c | 1 + - src/core/execute.c | 1 + - src/core/kmod-setup.c | 1 + - src/core/service.c | 1 + - src/coredump/coredump-vacuum.c | 1 + - src/fstab-generator/fstab-generator.c | 1 + - src/journal-remote/journal-remote-main.c | 1 + - src/journal/journalctl.c | 1 + - src/libsystemd/sd-bus/bus-message.c | 1 + - src/libsystemd/sd-bus/bus-objects.c | 1 + - src/libsystemd/sd-bus/bus-socket.c | 1 + - src/libsystemd/sd-bus/sd-bus.c | 1 + - src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + - src/libsystemd/sd-journal/sd-journal.c | 1 + - src/login/pam_systemd.c | 1 + - src/network/generator/network-generator.c | 1 + - src/nspawn/nspawn-settings.c | 1 + - src/nss-mymachines/nss-mymachines.c | 1 + - src/portable/portable.c | 1 + - src/resolve/resolvectl.c | 1 + - src/shared/bus-get-properties.c | 1 + - src/shared/bus-unit-procs.c | 1 + - src/shared/bus-unit-util.c | 1 + - src/shared/bus-util.c | 1 + - src/shared/dns-domain.c | 1 + - src/shared/journal-importer.c | 1 + - src/shared/logs-show.c | 1 + - src/shared/pager.c | 1 + - src/socket-proxy/socket-proxyd.c | 1 + - src/test/test-hexdecoct.c | 1 + - src/udev/udev-builtin-net_id.c | 1 + - src/udev/udev-builtin-path_id.c | 1 + - src/udev/udev-event.c | 1 + - src/udev/udev-rules.c | 1 + - 51 files changed, 62 insertions(+) - -diff --git a/meson.build b/meson.build -index c4694a9ddc..d376b76afa 100644 ---- a/meson.build -+++ b/meson.build -@@ -569,6 +569,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] - endforeach - - foreach ident : [ -+ ['strndupa' , '''#include '''], - ['memfd_create', '''#include '''], - ['gettid', '''#include - #include '''], -diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index b2032adaa5..ee9201826d 100644 ---- a/src/backlight/backlight.c -+++ b/src/backlight/backlight.c -@@ -20,6 +20,7 @@ - #include "string-util.h" - #include "strv.h" - #include "terminal-util.h" -+#include "missing_stdlib.h" - - #define PCI_CLASS_GRAPHICS_CARD 0x30000 - -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 18b16ecc0e..d2be79622f 100644 ---- a/src/basic/cgroup-util.c -+++ b/src/basic/cgroup-util.c -@@ -38,6 +38,7 @@ - #include "unit-name.h" - #include "user-util.h" - #include "xattr-util.h" -+#include "missing_stdlib.h" - - static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { - _cleanup_free_ char *fs = NULL; -diff --git a/src/basic/env-util.c b/src/basic/env-util.c -index a97651d7af..09fa601250 100644 ---- a/src/basic/env-util.c -+++ b/src/basic/env-util.c -@@ -19,6 +19,7 @@ - #include "string-util.h" - #include "strv.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - /* We follow bash for the character set. Different shells have different rules. */ - #define VALID_BASH_ENV_NAME_CHARS \ -diff --git a/src/basic/log.c b/src/basic/log.c -index 7a443005f6..eed69a48ee 100644 ---- a/src/basic/log.c -+++ b/src/basic/log.c -@@ -40,6 +40,7 @@ - #include "terminal-util.h" - #include "time-util.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - #define SNDBUF_SIZE (8*1024*1024) - #define IOVEC_MAX 256U -diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h -index 8c76f93eb2..9068bfb4f0 100644 ---- a/src/basic/missing_stdlib.h -+++ b/src/basic/missing_stdlib.h -@@ -11,3 +11,15 @@ - # error "neither secure_getenv nor __secure_getenv are available" - # endif - #endif -+ -+/* string.h */ -+#if ! HAVE_STRNDUPA -+#define strndupa(s, n) \ -+ ({ \ -+ const char *__old = (s); \ -+ size_t __len = strnlen(__old, (n)); \ -+ char *__new = (char *)alloca(__len + 1); \ -+ __new[__len] = '\0'; \ -+ (char *)memcpy(__new, __old, __len); \ -+ }) -+#endif -diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c -index c770e5ed32..1fd8816cd0 100644 ---- a/src/basic/mkdir.c -+++ b/src/basic/mkdir.c -@@ -16,6 +16,7 @@ - #include "stat-util.h" - #include "stdio-util.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - int mkdirat_safe_internal( - int dir_fd, -diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c -index bf67f7e01a..409f8d8a73 100644 ---- a/src/basic/mountpoint-util.c -+++ b/src/basic/mountpoint-util.c -@@ -18,6 +18,7 @@ - #include "missing_stat.h" - #include "missing_syscall.h" - #include "mkdir.h" -+#include "missing_stdlib.h" - #include "mountpoint-util.h" - #include "nulstr-util.h" - #include "parse-util.h" -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 0430e33e40..f3728de026 100644 ---- a/src/basic/parse-util.c -+++ b/src/basic/parse-util.c -@@ -18,6 +18,7 @@ - #include "stat-util.h" - #include "string-util.h" - #include "strv.h" -+#include "missing_stdlib.h" - - int parse_boolean(const char *v) { - if (!v) -diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 4e3d59fc56..726e240df0 100644 ---- a/src/basic/path-lookup.c -+++ b/src/basic/path-lookup.c -@@ -16,6 +16,7 @@ - #include "strv.h" - #include "tmpfile-util.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - int xdg_user_runtime_dir(char **ret, const char *suffix) { - const char *e; -diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c -index cab9d0eaea..5f6ca258e9 100644 ---- a/src/basic/percent-util.c -+++ b/src/basic/percent-util.c -@@ -3,6 +3,7 @@ - #include "percent-util.h" - #include "string-util.h" - #include "parse-util.h" -+#include "missing_stdlib.h" - - static int parse_parts_value_whole(const char *p, const char *symbol) { - const char *pc, *n; -diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c -index 522d8de1f4..7c129dc0fc 100644 ---- a/src/basic/proc-cmdline.c -+++ b/src/basic/proc-cmdline.c -@@ -16,6 +16,7 @@ - #include "string-util.h" - #include "strv.h" - #include "virt.h" -+#include "missing_stdlib.h" - - int proc_cmdline_filter_pid1_args(char **argv, char ***ret) { - enum { -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index d7cfcd9105..6cb0ddf575 100644 ---- a/src/basic/procfs-util.c -+++ b/src/basic/procfs-util.c -@@ -12,6 +12,7 @@ - #include "procfs-util.h" - #include "stdio-util.h" - #include "string-util.h" -+#include "missing_stdlib.h" - - int procfs_get_pid_max(uint64_t *ret) { - _cleanup_free_ char *value = NULL; -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index f9014dc560..1d7840a5b5 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -27,6 +27,7 @@ - #include "string-util.h" - #include "strv.h" - #include "time-util.h" -+#include "missing_stdlib.h" - - static clockid_t map_clock_id(clockid_t c) { - -diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index 12dfdf76fa..e66332519a 100644 ---- a/src/boot/bless-boot.c -+++ b/src/boot/bless-boot.c -@@ -22,6 +22,7 @@ - #include "terminal-util.h" - #include "verbs.h" - #include "virt.h" -+#include "missing_stdlib.h" - - static char **arg_path = NULL; - -diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 8a9570fd21..ac4202e5ce 100644 ---- a/src/core/dbus-cgroup.c -+++ b/src/core/dbus-cgroup.c -@@ -25,6 +25,7 @@ - #include "parse-util.h" - #include "path-util.h" - #include "percent-util.h" -+#include "missing_stdlib.h" - #include "socket-util.h" - - BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve); -diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 2d05ba7e1d..61a7de0037 100644 ---- a/src/core/dbus-execute.c -+++ b/src/core/dbus-execute.c -@@ -42,6 +42,7 @@ - #include "unit-printf.h" - #include "user-util.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); -diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c -index 7bb026af48..a86128e40c 100644 ---- a/src/core/dbus-util.c -+++ b/src/core/dbus-util.c -@@ -10,6 +10,7 @@ - #include "unit-printf.h" - #include "user-util.h" - #include "unit.h" -+#include "missing_stdlib.h" - - int bus_property_get_triggered_unit( - sd_bus *bus, -diff --git a/src/core/execute.c b/src/core/execute.c -index 8dbdfcf369..531bec4c92 100644 ---- a/src/core/execute.c -+++ b/src/core/execute.c -@@ -72,6 +72,7 @@ - #include "unit-serialize.h" - #include "user-util.h" - #include "utmp-wtmp.h" -+#include "missing_stdlib.h" - - static bool is_terminal_input(ExecInput i) { - return IN_SET(i, -diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index b8e3f7aadd..8ce8ca68d8 100644 ---- a/src/core/kmod-setup.c -+++ b/src/core/kmod-setup.c -@@ -13,6 +13,7 @@ - #include "string-util.h" - #include "strv.h" - #include "virt.h" -+#include "missing_stdlib.h" - - #if HAVE_KMOD - #include "module-util.h" -diff --git a/src/core/service.c b/src/core/service.c -index 42fffbbd67..80a8d05a19 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -45,6 +45,7 @@ - #include "unit-name.h" - #include "unit.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__) - -diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c -index 7e0c98cb7d..978a7f5874 100644 ---- a/src/coredump/coredump-vacuum.c -+++ b/src/coredump/coredump-vacuum.c -@@ -17,6 +17,7 @@ - #include "string-util.h" - #include "time-util.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ - #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ -diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 016f3baa7f..b1def81313 100644 ---- a/src/fstab-generator/fstab-generator.c -+++ b/src/fstab-generator/fstab-generator.c -@@ -37,6 +37,7 @@ - #include "unit-name.h" - #include "virt.h" - #include "volatile-util.h" -+#include "missing_stdlib.h" - - typedef enum MountPointFlags { - MOUNT_NOAUTO = 1 << 0, -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 2d380bc7a7..d3f5612728 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -27,6 +27,7 @@ - #include "stat-util.h" - #include "string-table.h" - #include "strv.h" -+#include "missing_stdlib.h" - - #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" - #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" -diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 87e2f28841..58275f41f1 100644 ---- a/src/journal/journalctl.c -+++ b/src/journal/journalctl.c -@@ -77,6 +77,7 @@ - #include "unit-name.h" - #include "user-util.h" - #include "varlink.h" -+#include "missing_stdlib.h" - - #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) - #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ -diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index ab8b06896d..43f9131205 100644 ---- a/src/libsystemd/sd-bus/bus-message.c -+++ b/src/libsystemd/sd-bus/bus-message.c -@@ -19,6 +19,7 @@ - #include "strv.h" - #include "time-util.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); - static int message_parse_fields(sd_bus_message *m); -diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index c25c40ff37..57a5da704f 100644 ---- a/src/libsystemd/sd-bus/bus-objects.c -+++ b/src/libsystemd/sd-bus/bus-objects.c -@@ -11,6 +11,7 @@ - #include "missing_capability.h" - #include "string-util.h" - #include "strv.h" -+#include "missing_stdlib.h" - - static int node_vtable_get_userdata( - sd_bus *bus, -diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index 5ade8e99aa..7553cf319d 100644 ---- a/src/libsystemd/sd-bus/bus-socket.c -+++ b/src/libsystemd/sd-bus/bus-socket.c -@@ -29,6 +29,7 @@ - #include "string-util.h" - #include "user-util.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - #define SNDBUF_SIZE (8*1024*1024) - -diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c -index 8befc97460..6ee4d4f595 100644 ---- a/src/libsystemd/sd-bus/sd-bus.c -+++ b/src/libsystemd/sd-bus/sd-bus.c -@@ -46,6 +46,7 @@ - #include "string-util.h" - #include "strv.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - #define log_debug_bus_message(m) \ - do { \ -diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c -index d988588de0..458df8df9a 100644 ---- a/src/libsystemd/sd-bus/test-bus-benchmark.c -+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c -@@ -14,6 +14,7 @@ - #include "string-util.h" - #include "tests.h" - #include "time-util.h" -+#include "missing_stdlib.h" - - #define MAX_SIZE (2*1024*1024) - -diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c -index 7a1dd2569f..d187baad47 100644 ---- a/src/libsystemd/sd-journal/sd-journal.c -+++ b/src/libsystemd/sd-journal/sd-journal.c -@@ -44,6 +44,7 @@ - #include "strv.h" - #include "syslog-util.h" - #include "uid-alloc-range.h" -+#include "missing_stdlib.h" - - #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) - -diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index bf45974ca5..2cb7e930c0 100644 ---- a/src/login/pam_systemd.c -+++ b/src/login/pam_systemd.c -@@ -35,6 +35,7 @@ - #include "login-util.h" - #include "macro.h" - #include "missing_syscall.h" -+#include "missing_stdlib.h" - #include "pam-util.h" - #include "parse-util.h" - #include "path-util.h" -diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c -index 48527a2c73..9777fe0561 100644 ---- a/src/network/generator/network-generator.c -+++ b/src/network/generator/network-generator.c -@@ -14,6 +14,7 @@ - #include "string-table.h" - #include "string-util.h" - #include "strv.h" -+#include "missing_stdlib.h" - - /* - # .network -diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c -index 161b1c1c70..ba1c459f78 100644 ---- a/src/nspawn/nspawn-settings.c -+++ b/src/nspawn/nspawn-settings.c -@@ -16,6 +16,7 @@ - #include "string-util.h" - #include "strv.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - Settings *settings_new(void) { - Settings *s; -diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c -index c64e79bdff..eda26b0b9a 100644 ---- a/src/nss-mymachines/nss-mymachines.c -+++ b/src/nss-mymachines/nss-mymachines.c -@@ -21,6 +21,7 @@ - #include "nss-util.h" - #include "signal-util.h" - #include "string-util.h" -+#include "missing_stdlib.h" - - static void setup_logging_once(void) { - static pthread_once_t once = PTHREAD_ONCE_INIT; -diff --git a/src/portable/portable.c b/src/portable/portable.c -index 3b2a37912f..835a3fdeaa 100644 ---- a/src/portable/portable.c -+++ b/src/portable/portable.c -@@ -42,6 +42,7 @@ - #include "strv.h" - #include "tmpfile-util.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was - * dropped there by the portable service logic and b) for which image it was dropped there. */ -diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c -index afa537f160..32ccee4ae5 100644 ---- a/src/resolve/resolvectl.c -+++ b/src/resolve/resolvectl.c -@@ -48,6 +48,7 @@ - #include "varlink.h" - #include "verb-log-control.h" - #include "verbs.h" -+#include "missing_stdlib.h" - - static int arg_family = AF_UNSPEC; - static int arg_ifindex = 0; -diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c -index 53e5d6b99f..851ecd5644 100644 ---- a/src/shared/bus-get-properties.c -+++ b/src/shared/bus-get-properties.c -@@ -4,6 +4,7 @@ - #include "rlimit-util.h" - #include "stdio-util.h" - #include "string-util.h" -+#include "missing_stdlib.h" - - int bus_property_get_bool( - sd_bus *bus, -diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c -index 8b462b5627..183ce1c18e 100644 ---- a/src/shared/bus-unit-procs.c -+++ b/src/shared/bus-unit-procs.c -@@ -11,6 +11,7 @@ - #include "sort-util.h" - #include "string-util.h" - #include "terminal-util.h" -+#include "missing_stdlib.h" - - struct CGroupInfo { - char *cgroup_path; -diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index 50de98941f..d47beccb0b 100644 ---- a/src/shared/bus-unit-util.c -+++ b/src/shared/bus-unit-util.c -@@ -50,6 +50,7 @@ - #include "unit-def.h" - #include "user-util.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { - assert(message); -diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c -index 4123152d93..74f148c8b4 100644 ---- a/src/shared/bus-util.c -+++ b/src/shared/bus-util.c -@@ -24,6 +24,7 @@ - #include "path-util.h" - #include "socket-util.h" - #include "stdio-util.h" -+#include "missing_stdlib.h" - - static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { - sd_event *e = ASSERT_PTR(userdata); -diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c -index b41c9b06ca..e69050a507 100644 ---- a/src/shared/dns-domain.c -+++ b/src/shared/dns-domain.c -@@ -18,6 +18,7 @@ - #include "string-util.h" - #include "strv.h" - #include "utf8.h" -+#include "missing_stdlib.h" - - int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { - const char *n; -diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index 83e9834bbf..74eaae6f5e 100644 ---- a/src/shared/journal-importer.c -+++ b/src/shared/journal-importer.c -@@ -16,6 +16,7 @@ - #include "string-util.h" - #include "strv.h" - #include "unaligned.h" -+#include "missing_stdlib.h" - - enum { - IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ -diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 0a31be382f..92d629e7e0 100644 ---- a/src/shared/logs-show.c -+++ b/src/shared/logs-show.c -@@ -41,6 +41,7 @@ - #include "time-util.h" - #include "utf8.h" - #include "web-util.h" -+#include "missing_stdlib.h" - - /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ - #define PRINT_LINE_THRESHOLD 3 -diff --git a/src/shared/pager.c b/src/shared/pager.c -index 19deefab56..6b6d0af1a0 100644 ---- a/src/shared/pager.c -+++ b/src/shared/pager.c -@@ -25,6 +25,7 @@ - #include "string-util.h" - #include "strv.h" - #include "terminal-util.h" -+#include "missing_stdlib.h" - - static pid_t pager_pid = 0; - -diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c -index 287fd6c181..8f8d5493da 100644 ---- a/src/socket-proxy/socket-proxyd.c -+++ b/src/socket-proxy/socket-proxyd.c -@@ -27,6 +27,7 @@ - #include "set.h" - #include "socket-util.h" - #include "string-util.h" -+#include "missing_stdlib.h" - - #define BUFFER_SIZE (256 * 1024) - -diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c -index f884008660..987e180697 100644 ---- a/src/test/test-hexdecoct.c -+++ b/src/test/test-hexdecoct.c -@@ -7,6 +7,7 @@ - #include "macro.h" - #include "random-util.h" - #include "string-util.h" -+#include "missing_stdlib.h" - #include "tests.h" - - TEST(hexchar) { -diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 91b40088f4..f528a46b8e 100644 ---- a/src/udev/udev-builtin-net_id.c -+++ b/src/udev/udev-builtin-net_id.c -@@ -39,6 +39,7 @@ - #include "strv.h" - #include "strxcpyx.h" - #include "udev-builtin.h" -+#include "missing_stdlib.h" - - #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1) - #define ONBOARD_16BIT_INDEX_MAX ((1U << 16) - 1) -diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 467c9a6ad3..f74dae60af 100644 ---- a/src/udev/udev-builtin-path_id.c -+++ b/src/udev/udev-builtin-path_id.c -@@ -24,6 +24,7 @@ - #include "sysexits.h" - #include "udev-builtin.h" - #include "udev-util.h" -+#include "missing_stdlib.h" - - _printf_(2,3) - static void path_prepend(char **path, const char *fmt, ...) { -diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index ed22c8b679..19ebe20237 100644 ---- a/src/udev/udev-event.c -+++ b/src/udev/udev-event.c -@@ -16,6 +16,7 @@ - #include "udev-util.h" - #include "udev-watch.h" - #include "user-util.h" -+#include "missing_stdlib.h" - - UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl, int log_level) { - UdevEvent *event; -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index c242549654..e5b8df5c2d 100644 ---- a/src/udev/udev-rules.c -+++ b/src/udev/udev-rules.c -@@ -41,6 +41,7 @@ - #include "udev-util.h" - #include "user-util.h" - #include "virt.h" -+#include "missing_stdlib.h" - - #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) - diff --git a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch similarity index 87% rename from meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch rename to meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch index 49871d16a8..f4456f3c15 100644 --- a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +++ b/meta/recipes-core/systemd/systemd/0004-missing_type.h-add-comparison_fn_t.patch @@ -1,7 +1,7 @@ -From d4b0bb9c7651017985fdd75469f37c34ce2f2c50 Mon Sep 17 00:00:00 2001 +From 34b7e1ed3b9a896db6fad435fd141c385c7337d1 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH] missing_type.h: add comparison_fn_t +Subject: [PATCH 04/27] missing_type.h: add comparison_fn_t Make it work with musl where comparison_fn_t and is not provided. @@ -21,12 +21,12 @@ Signed-off-by: Jiaqing Zhao 3 files changed, 6 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index f6233090a9..6c0456349d 100644 +index 1d17705c35..fc33b76ec1 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -10,3 +10,7 @@ #if !HAVE_CHAR16_T - #define char16_t uint16_t + # define char16_t uint16_t #endif + +#ifndef __GLIBC__ @@ -45,10 +45,10 @@ index 9c818bd747..ef10c8be2c 100644 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c -index ae91534198..7f67eea38b 100644 +index a0b673f65f..29dd2fee16 100644 --- a/src/libsystemd/sd-journal/catalog.c +++ b/src/libsystemd/sd-journal/catalog.c -@@ -28,6 +28,7 @@ +@@ -29,6 +29,7 @@ #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" @@ -56,3 +56,6 @@ index ae91534198..7f67eea38b 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch similarity index 96% rename from meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch rename to meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch index 593d6261e1..b0865b32af 100644 --- a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0005-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 776913624aaf696a3b2920b8d7506b3aae042bf1 Mon Sep 17 00:00:00 2001 +From 4a4005583e2debe491850229aa5ae2a97770532d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH] add fallback parse_printf_format implementation +Subject: [PATCH 05/27] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -22,22 +22,22 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 187e7b216d..c4694a9ddc 100644 +index 52723bef09..e20bf3af8a 100644 --- a/meson.build +++ b/meson.build -@@ -727,6 +727,7 @@ endif - foreach header : ['crypt.h', +@@ -753,6 +753,7 @@ foreach header : ['crypt.h', 'linux/memfd.h', + 'linux/time_types.h', 'linux/vm_sockets.h', + 'printf.h', 'sys/auxv.h', + 'sys/sdt.h', 'threads.h', - 'valgrind/memcheck.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index 111253e3a5..bdaa2fc5e4 100644 +index 9a214575a5..b49b6ade56 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -183,6 +183,11 @@ endforeach +@@ -189,6 +189,11 @@ endforeach basic_sources += generated_gperf_headers @@ -392,7 +392,7 @@ index 0000000000..47be7522d7 + +#endif /* HAVE_PRINTF_H */ diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h -index 4e93ac90c9..f9deb6f662 100644 +index 0a2239d022..43a765dacd 100644 --- a/src/basic/stdio-util.h +++ b/src/basic/stdio-util.h @@ -1,12 +1,12 @@ @@ -408,9 +408,9 @@ index 4e93ac90c9..f9deb6f662 100644 +#include "parse-printf-format.h" _printf_(3, 4) - static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) { + static inline char* snprintf_ok(char *buf, size_t len, const char *format, ...) { diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c -index be23b2fe75..69a2eb6404 100644 +index 7d02b57d7b..75e8e08add 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -2,7 +2,6 @@ @@ -429,3 +429,6 @@ index be23b2fe75..69a2eb6404 100644 #define SNDBUF_SIZE (8*1024*1024) +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch similarity index 91% rename from meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch rename to meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 15d25e9f19..e7a0abcf9a 100644 --- a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/meta/recipes-core/systemd/systemd/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,7 +1,8 @@ -From 2903e42c7cd727a2374d21b78950308de792ebe8 Mon Sep 17 00:00:00 2001 +From ed836c3478e1193e99e37d50db96d124796a3322 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined +Subject: [PATCH 06/27] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not + defined If the standard library doesn't provide brace expansion users just won't get it. @@ -63,11 +64,11 @@ index 802ca8c655..23818a67c6 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index 9b3e73cce0..3790ba3be5 100644 +index 49d71f15c7..0a49ebcc17 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -34,6 +34,12 @@ TEST(glob_first) { - assert_se(first == NULL); + ASSERT_NULL(first); } +/* Don't fail if the standard library @@ -114,7 +115,7 @@ index 9b3e73cce0..3790ba3be5 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 6a1c7725a1..138b3ac561 100644 +index 807925f199..b4f86fc611 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -73,6 +73,12 @@ @@ -130,7 +131,7 @@ index 6a1c7725a1..138b3ac561 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -2426,7 +2432,9 @@ finish: +@@ -2570,7 +2576,9 @@ finish: static int glob_item(Context *c, Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -138,9 +139,9 @@ index 6a1c7725a1..138b3ac561 100644 .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; - int r = 0, k; + int r; -@@ -2453,7 +2461,9 @@ static int glob_item_recursively( +@@ -2598,7 +2606,9 @@ static int glob_item_recursively( fdaction_t action) { _cleanup_globfree_ glob_t g = { @@ -148,5 +149,8 @@ index 6a1c7725a1..138b3ac561 100644 .gl_opendir = (void *(*)(const char *)) opendir_nomod, +#endif }; - int r = 0, k; + int r; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch similarity index 85% rename from meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch rename to meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch index deb0e83b6d..474a7d38d8 100644 --- a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0007-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From dcd9639657e4122b7665b01a067219f990ee3ace Mon Sep 17 00:00:00 2001 +From 8320725f1a9088623da8753c7077473b98a63107 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH] add missing FTW_ macros for musl +Subject: [PATCH 07/27] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -16,7 +16,7 @@ Signed-off-by: Chen Qi 2 files changed, 5 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index 6c0456349d..73a5b90e3c 100644 +index fc33b76ec1..34a36d83f0 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h @@ -14,3 +14,7 @@ @@ -39,3 +39,6 @@ index 8684d064ec..70fc2b5376 100644 static char **list_nftw = NULL; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch similarity index 88% rename from meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch rename to meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch index f02675604d..c8598ed2ea 100644 --- a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0008-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From c58933386caa8e45b5e814ec4ff210b18ab401da Mon Sep 17 00:00:00 2001 +From 41abe1a4136babfe5df63e9561dcf29d3c8fe6e9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH] Use uintmax_t for handling rlim_t +Subject: [PATCH 08/27] Use uintmax_t for handling rlim_t PRIu{32,64} is not right format to represent rlim_t type therefore use %ju and typecast the rlim_t variables to @@ -27,10 +27,10 @@ Signed-off-by: Chen Qi 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h -index 8719df3e29..9becc96066 100644 +index ba7cff6a8b..2736abb07b 100644 --- a/src/basic/format-util.h +++ b/src/basic/format-util.h -@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); +@@ -42,13 +42,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); # error Unknown timex member size #endif @@ -46,10 +46,10 @@ index 8719df3e29..9becc96066 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index c1f0b2b974..61c5412582 100644 +index a9f7b87f28..059c67731d 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c -@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { +@@ -47,7 +47,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { fixed.rlim_max == highest.rlim_max) return 0; @@ -58,7 +58,7 @@ index c1f0b2b974..61c5412582 100644 return RET_NERRNO(setrlimit(resource, &fixed)); } -@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { +@@ -310,13 +310,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) r = free_and_strdup(&s, "infinity"); else if (rl->rlim_cur >= RLIM_INFINITY) @@ -76,7 +76,7 @@ index c1f0b2b974..61c5412582 100644 if (r < 0) return -ENOMEM; -@@ -422,7 +422,7 @@ int rlimit_nofile_safe(void) { +@@ -425,7 +425,7 @@ int rlimit_nofile_safe(void) { rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); if (setrlimit(RLIMIT_NOFILE, &rl) < 0) @@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index 531bec4c92..602a95f674 100644 +index 513e95e09d..0e269617f8 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1041,9 +1041,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1067,9 +1067,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", @@ -101,3 +101,6 @@ index 531bec4c92..602a95f674 100644 } if (c->ioprio_set) { +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch similarity index 96% rename from meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch rename to meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 1d4ce33712..851dcbd553 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 5bf8235bc5c802908aa5d95740350927d87e953a Mon Sep 17 00:00:00 2001 +From 8af5d1e3c0dc7e71f7a4aee0f539a5d772d47354 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH 09/27] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to do and it's not portable (not supported by musl). See: @@ -31,7 +31,7 @@ Signed-off-by: Andre McCurdy 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 6a1e2e76d1..c3f7235e09 100644 +index 3e2db95304..d5747416b0 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); @@ -94,3 +94,6 @@ index a4e2dae245..67aa8ea1f2 100644 continue; } +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch similarity index 82% rename from meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch rename to meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 1ab23553f9..162650725d 100644 --- a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,7 +1,8 @@ -From d98f6bd4d8acdc4c1a5bff4c699f5004a6ebccce Mon Sep 17 00:00:00 2001 +From ea8e85d92f67a7af8577a4ce7c67c7aaee65d10c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH] Define glibc compatible basename() for non-glibc systems +Subject: [PATCH 10/27] Define glibc compatible basename() for non-glibc + systems Fixes builds with musl, even though systemd is adamant about using non-posix basename implementation, we have a way out @@ -14,7 +15,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/src/basic/string-util.h b/src/basic/string-util.h -index b6d8be3083..0a29036c4c 100644 +index ff5efbcf55..d1a6bb0e76 100644 --- a/src/basic/string-util.h +++ b/src/basic/string-util.h @@ -26,6 +26,10 @@ @@ -28,3 +29,6 @@ index b6d8be3083..0a29036c4c 100644 static inline char* strstr_ptr(const char *haystack, const char *needle) { if (!haystack || !needle) return NULL; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch similarity index 82% rename from meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch rename to meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 98ab397eff..60cec6dc7e 100644 --- a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From f3943f58f3c8a9d20dcada56eb5ca5f673a49b3d Mon Sep 17 00:00:00 2001 +From 7c8634c441401b034cd4bcf4b916a7042076fca8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH 11/27] Do not disable buffering when writing to oom_score_adj On musl, disabling buffering when writing to oom_score_adj will cause the following error. @@ -24,10 +24,10 @@ Signed-off-by: Scott Murray 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 4492e7ded2..b61a2aba74 100644 +index c9d968dee0..7d6d3ce7db 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) { +@@ -1816,7 +1816,7 @@ int set_oom_score_adjust(int value) { xsprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, @@ -36,3 +36,6 @@ index 4492e7ded2..b61a2aba74 100644 } int get_oom_score_adjust(int *ret) { +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch similarity index 92% rename from meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch rename to meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index e1ffe4ddb5..aa3c45cb5f 100644 --- a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From 5305c5f18236a9d7f2e633ea6ad317e09e8f29d5 Mon Sep 17 00:00:00 2001 +From 4a2df0bba1741914617ca1271e2bc68a5d9e5dac Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH 12/27] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -55,7 +55,7 @@ index f415797700..a5c6e9a3bd 100644 static bool map_ok(const sd_bus_error_map *map) { diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c -index 69a2eb6404..1561859650 100644 +index 75e8e08add..41e5c7c2b8 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -361,7 +361,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove @@ -71,3 +71,6 @@ index 69a2eb6404..1561859650 100644 if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch similarity index 71% rename from meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch rename to meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch index 3075f9d003..c48bd58383 100644 --- a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0013-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From c866c8652f06af4cd0b9bd7eedc606449f432b95 Mon Sep 17 00:00:00 2001 +From 846b8f16cf07d9187261e06701a75eb208caa707 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH] avoid redefinition of prctl_mm_map structure +Subject: [PATCH 13/27] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -14,7 +14,7 @@ Signed-off-by: Chen Qi 1 file changed, 2 insertions(+) diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h -index 7d9e395c92..88c2d7dfac 100644 +index 2c9f9f6c50..65a984b564 100644 --- a/src/basic/missing_prctl.h +++ b/src/basic/missing_prctl.h @@ -1,7 +1,9 @@ @@ -25,5 +25,8 @@ index 7d9e395c92..88c2d7dfac 100644 #include +#endif - /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ - #ifndef PR_CAP_AMBIENT + #include "macro.h" + +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0014-do-not-disable-buffer-in-writing-files.patch similarity index 84% rename from meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch rename to meta/recipes-core/systemd/systemd/0014-do-not-disable-buffer-in-writing-files.patch index 0fec84724d..e624c2d71e 100644 --- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0014-do-not-disable-buffer-in-writing-files.patch @@ -1,7 +1,7 @@ -From 8464b845e6df1be303e09274c13e653072701671 Mon Sep 17 00:00:00 2001 +From 88694101bcac461c39049962ce97ce579cc07e13 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 -Subject: [PATCH] do not disable buffer in writing files +Subject: [PATCH 14/27] do not disable buffer in writing files Do not disable buffer in writing files, otherwise we get failure at boot for musl like below. @@ -35,7 +35,7 @@ Signed-off-by: Chen Qi src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- src/shared/binfmt-util.c | 2 +- - src/shared/cgroup-setup.c | 4 ++-- + src/shared/cgroup-setup.c | 6 +++--- src/shared/coredump-util.c | 4 ++-- src/shared/hibernate-util.c | 4 ++-- src/shared/smack-util.c | 2 +- @@ -44,22 +44,22 @@ Signed-off-by: Chen Qi src/storagetm/storagetm.c | 24 ++++++++++++------------ src/udev/udev-rules.c | 1 - src/vconsole/vconsole-setup.c | 2 +- - 22 files changed, 50 insertions(+), 51 deletions(-) + 22 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index d2be79622f..e65fecb68d 100644 +index 553ee6075a..a3704baf6a 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { +@@ -457,7 +457,7 @@ int cg_kill_kernel_sigkill(const char *path) { if (r < 0) return r; - r = write_string_file(killfile, "1", WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(killfile, "1", 0); if (r < 0) - return r; + return log_debug_errno(r, "Failed to write to cgroup.kill for cgroup '%s': %m", path); -@@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -885,7 +885,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -68,7 +68,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -903,7 +903,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -77,7 +77,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -930,7 +930,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -86,7 +86,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -940,7 +940,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -95,7 +95,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1833,7 +1833,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -105,29 +105,29 @@ index d2be79622f..e65fecb68d 100644 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c -index 2101f617ad..63817bae17 100644 +index 5b4e43f921..42a84ded55 100644 --- a/src/basic/namespace-util.c +++ b/src/basic/namespace-util.c -@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { +@@ -325,12 +325,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { freeze(); xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); - r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(path, uid_map, 0); if (r < 0) - return log_error_errno(r, "Failed to write UID map: %m"); + return log_debug_errno(r, "Failed to write UID map: %m"); xsprintf(path, "/proc/" PID_FMT "/gid_map", pid); - r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(path, gid_map, 0); if (r < 0) - return log_error_errno(r, "Failed to write GID map: %m"); + return log_debug_errno(r, "Failed to write GID map: %m"); diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 6cb0ddf575..247cf9e1d1 100644 +index d7cfcd9105..58fb5918a3 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -63,13 +63,13 @@ int procfs_tasks_set_limit(uint64_t limit) { * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -144,7 +144,7 @@ index 6cb0ddf575..247cf9e1d1 100644 uint64_t threads_max; diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c -index b66a6622ae..8d1c93008a 100644 +index 9a1933f579..7d6fc65ee1 100644 --- a/src/basic/sysctl-util.c +++ b/src/basic/sysctl-util.c @@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { @@ -188,23 +188,23 @@ index d21f3f79ff..258607cc7e 100644 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); else diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 61ac4df1a6..ea18970196 100644 +index 34fd2a250c..cb1a6d01eb 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c -@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { - u->freezer_state = FREEZER_THAWING; - } +@@ -5173,7 +5173,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { + freezer_state_to_string(u->freezer_state), + freezer_state_to_string(next)); -- r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0); +- r = write_string_file(path, one_zero(target == FREEZER_FROZEN), WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(path, one_zero(target == FREEZER_FROZEN), 0); if (r < 0) return r; diff --git a/src/core/main.c b/src/core/main.c -index 1c0030a75f..7108a87d46 100644 +index 4b8a315d86..051a31ba84 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1789,7 +1789,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -240,23 +240,24 @@ index 7ea902b6f9..1aef2988d0 100644 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif diff --git a/src/home/homework.c b/src/home/homework.c -index 066483e342..5f92dd7064 100644 +index 482db23dbc..ed6b8d271f 100644 --- a/src/home/homework.c +++ b/src/home/homework.c -@@ -278,7 +278,7 @@ static void drop_caches_now(void) { - * for details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but +@@ -302,8 +302,8 @@ static void drop_caches_now(void) { + /* Drop file system caches now. See https://docs.kernel.org/admin-guide/sysctl/vm.html + * for details. We write "3" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but * not more. */ ++ r = write_string_file("/proc/sys/vm/drop_caches", "3\n", 0); -- r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0); +- r = write_string_file("/proc/sys/vm/drop_caches", "3\n", WRITE_STRING_FILE_DISABLE_BUFFER); if (r < 0) log_warning_errno(r, "Failed to drop caches, ignoring: %m"); else diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index 01e66b4658..f3ea82ca1b 100644 +index d8d151835c..268cb65ec7 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -2499,7 +2499,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -266,10 +267,10 @@ index 01e66b4658..f3ea82ca1b 100644 /* On failure, clear cache entry, as we do not know how it fails. */ device_remove_cached_sysattr_value(device, sysattr); diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index a5002437c6..b12e6cd9c9 100644 +index 4f28b4a225..c93c2c33b5 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -93,7 +93,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -279,10 +280,10 @@ index a5002437c6..b12e6cd9c9 100644 log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0600f3e014..ea369c32b2 100644 +index 5842d3ba8f..44ff9d946c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { +@@ -2741,7 +2741,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -291,7 +292,7 @@ index 0600f3e014..ea369c32b2 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -4143,7 +4143,7 @@ static int setup_uid_map( +@@ -4450,7 +4450,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); @@ -300,7 +301,7 @@ index 0600f3e014..ea369c32b2 100644 if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); -@@ -4153,7 +4153,7 @@ static int setup_uid_map( +@@ -4460,7 +4460,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); @@ -323,10 +324,10 @@ index a26175474b..1413a9c72c 100644 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c -index 934a16eaf3..c921ced861 100644 +index 093b6d0d22..89d0ac612b 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c -@@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -364,7 +364,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { xsprintf(c, PID_FMT "\n", pid); @@ -335,7 +336,16 @@ index 934a16eaf3..c921ced861 100644 if (r == -EOPNOTSUPP && cg_is_threaded(path) > 0) /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */ return -EUCLEAN; -@@ -966,7 +966,7 @@ int cg_enable_everywhere( +@@ -395,7 +395,7 @@ int cg_fd_attach(int fd, pid_t pid) { + + xsprintf(c, PID_FMT "\n", pid); + +- return write_string_file_at(fd, "cgroup.procs", c, WRITE_STRING_FILE_DISABLE_BUFFER); ++ return write_string_file_at(fd, "cgroup.procs", c, 0); + } + + int cg_attach_fallback(const char *controller, const char *path, pid_t pid) { +@@ -974,7 +974,7 @@ int cg_enable_everywhere( return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); } @@ -367,10 +377,10 @@ index 805503f366..01a7ccb291 100644 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c -index c3991cfa4c..7d522d8d1f 100644 +index 7c21157580..06ab74b04c 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c -@@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -495,7 +495,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ @@ -379,7 +389,7 @@ index c3991cfa4c..7d522d8d1f 100644 if (r == -ENOENT) { if (offset != 0) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), -@@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -511,7 +511,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", offset_str, device); @@ -402,10 +412,10 @@ index 1f88e724d0..feb18b320a 100644 return r; diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c -index 99ccefb227..e4975018ab 100644 +index 810c5b5206..be0d127ff3 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c -@@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { +@@ -93,7 +93,7 @@ static int watchdog_set_pretimeout_governor(const char *governor) { r = write_string_file(sys_fn, governor, @@ -415,10 +425,10 @@ index 99ccefb227..e4975018ab 100644 return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 21062b24e0..262dd71d72 100644 +index 0402bb07f3..a6cbb45340 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { +@@ -139,7 +139,7 @@ static int write_state(int fd, char * const *states) { if (k < 0) return RET_GATHER(r, k); @@ -427,17 +437,17 @@ index 21062b24e0..262dd71d72 100644 if (k >= 0) { log_debug("Using sleep state '%s'.", *state); return 0; -@@ -155,7 +155,7 @@ static int write_mode(char * const *modes) { - STRV_FOREACH(mode, modes) { - int k; +@@ -157,7 +157,7 @@ static int write_mode(const char *path, char * const *modes) { + assert(path); -- k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); -+ k = write_string_file("/sys/power/disk", *mode, 0); - if (k >= 0) { - log_debug("Using sleep disk mode '%s'.", *mode); + STRV_FOREACH(mode, modes) { +- r = write_string_file(path, *mode, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(path, *mode, 0); + if (r >= 0) { + log_debug("Using sleep mode '%s' for %s.", *mode, path); return 0; diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c -index 16d4fb07d4..aca7506463 100644 +index 1bb8eec316..cf9b4c4a21 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { @@ -533,22 +543,22 @@ index 16d4fb07d4..aca7506463 100644 return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index e5b8df5c2d..63ca15628c 100644 +index 581bbaf345..cdf648a2d1 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( - log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); - r = write_string_file(buf, value, - WRITE_STRING_FILE_VERIFY_ON_FAILURE | -- WRITE_STRING_FILE_DISABLE_BUFFER | - WRITE_STRING_FILE_AVOID_NEWLINE | - WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); - if (r < 0) +@@ -2706,7 +2706,6 @@ static int udev_rule_apply_token_to_event( + log_event_debug(dev, token, "Writing ATTR{'%s'}=\"%s\".", buf, value); + r = write_string_file(buf, value, + WRITE_STRING_FILE_VERIFY_ON_FAILURE | +- WRITE_STRING_FILE_DISABLE_BUFFER | + WRITE_STRING_FILE_AVOID_NEWLINE | + WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); + if (r < 0) diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 4d82c65f0a..3a3d861b83 100644 +index ba742dda69..6f20e81615 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -277,7 +277,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { static int toggle_utf8_sysfs(bool utf8) { int r; @@ -557,3 +567,6 @@ index 4d82c65f0a..3a3d861b83 100644 if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch similarity index 91% rename from meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch rename to meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch index 6d7e002d61..86003db4de 100644 --- a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +++ b/meta/recipes-core/systemd/systemd/0015-Handle-__cpu_mask-usage.patch @@ -1,7 +1,7 @@ -From f6b69f28657c09b1181552d85e52ced0e01182e3 Mon Sep 17 00:00:00 2001 +From c1cbec8571855b8480d56dcad2ab81aea0782bd4 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH] Handle __cpu_mask usage +Subject: [PATCH 15/27] Handle __cpu_mask usage Fixes errors: @@ -24,7 +24,7 @@ Signed-off-by: Scott Murray 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h -index 3c63a58826..4c2d4347fc 100644 +index 618fe1b0a3..46c92077b0 100644 --- a/src/shared/cpu-set-util.h +++ b/src/shared/cpu-set-util.h @@ -6,6 +6,8 @@ @@ -55,3 +55,6 @@ index ea0c58770e..b65c0bd370 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch similarity index 80% rename from meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch rename to meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch index 40b60399aa..6c7b233f95 100644 --- a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0016-Handle-missing-gshadow.patch @@ -1,7 +1,7 @@ -From 5442d8ddb285d33b459aefc76962640afd131280 Mon Sep 17 00:00:00 2001 +From 8b540d8240bbc3f917de9ca8d3b62f28c3424d91 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH] Handle missing gshadow +Subject: [PATCH 16/27] Handle missing gshadow gshadow usage is now present in the userdb code. Mask all uses of it to allow compilation on musl @@ -17,10 +17,10 @@ Signed-off-by: Luca Boccassi 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c -index 414a49331b..1a4e1b628c 100644 +index ffb5721466..4d01815c8c 100644 --- a/src/shared/user-record-nss.c +++ b/src/shared/user-record-nss.c -@@ -329,8 +329,10 @@ int nss_group_to_group_record( +@@ -286,8 +286,10 @@ int nss_group_to_group_record( if (isempty(grp->gr_name)) return -EINVAL; @@ -31,7 +31,7 @@ index 414a49331b..1a4e1b628c 100644 g = group_record_new(); if (!g) -@@ -346,6 +348,7 @@ int nss_group_to_group_record( +@@ -303,6 +305,7 @@ int nss_group_to_group_record( g->gid = grp->gr_gid; @@ -39,7 +39,7 @@ index 414a49331b..1a4e1b628c 100644 if (sgrp) { if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { g->hashed_password = strv_new(sgrp->sg_passwd); -@@ -361,6 +364,7 @@ int nss_group_to_group_record( +@@ -318,6 +321,7 @@ int nss_group_to_group_record( if (r < 0) return r; } @@ -47,7 +47,7 @@ index 414a49331b..1a4e1b628c 100644 r = json_build(&g->json, JSON_BUILD_OBJECT( JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), -@@ -387,6 +391,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re +@@ -344,6 +348,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re assert(ret_sgrp); assert(ret_buffer); @@ -55,7 +55,7 @@ index 414a49331b..1a4e1b628c 100644 for (;;) { _cleanup_free_ char *buf = NULL; struct sgrp sgrp, *result; -@@ -415,6 +420,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re +@@ -372,6 +377,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re buflen *= 2; buf = mfree(buf); } @@ -65,25 +65,25 @@ index 414a49331b..1a4e1b628c 100644 } int nss_group_record_by_name( -@@ -426,7 +434,9 @@ int nss_group_record_by_name( - struct group grp, *result; +@@ -382,7 +390,9 @@ int nss_group_record_by_name( + _cleanup_free_ char *sbuf = NULL; + _cleanup_free_ struct group *result = NULL; bool incomplete = false; - size_t buflen = 4096; +#if ENABLE_GSHADOW struct sgrp sgrp, *sresult = NULL; +#endif int r; assert(name); -@@ -455,6 +465,7 @@ int nss_group_record_by_name( - buf = mfree(buf); - } +@@ -391,6 +401,7 @@ int nss_group_record_by_name( + if (r < 0) + return r; +#if ENABLE_GSHADOW if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { -@@ -466,6 +477,9 @@ int nss_group_record_by_name( +@@ -402,6 +413,9 @@ int nss_group_record_by_name( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); @@ -93,25 +93,24 @@ index 414a49331b..1a4e1b628c 100644 if (r < 0) return r; -@@ -483,7 +497,9 @@ int nss_group_record_by_gid( - struct group grp, *result; +@@ -418,13 +432,16 @@ int nss_group_record_by_gid( + _cleanup_free_ char *sbuf = NULL; + _cleanup_free_ struct group *result = NULL; bool incomplete = false; - size_t buflen = 4096; +#if ENABLE_GSHADOW struct sgrp sgrp, *sresult = NULL; +#endif int r; - for (;;) { -@@ -509,6 +525,7 @@ int nss_group_record_by_gid( - buf = mfree(buf); - } + r = getgrgid_malloc(gid, &result); + if (r < 0) + return r; +#if ENABLE_GSHADOW if (with_shadow) { r = nss_sgrp_for_group(result, &sgrp, &sbuf); if (r < 0) { -@@ -520,6 +537,9 @@ int nss_group_record_by_gid( +@@ -436,6 +453,9 @@ int nss_group_record_by_gid( incomplete = true; r = nss_group_to_group_record(result, sresult, ret); @@ -138,7 +137,7 @@ index 22ab04d6ee..4e52e7a911 100644 #include diff --git a/src/shared/userdb.c b/src/shared/userdb.c -index f60d48ace4..e878199a28 100644 +index 75dece3442..5628e1410f 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c @@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { @@ -168,3 +167,6 @@ index f60d48ace4..e878199a28 100644 if (r < 0) return r; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch similarity index 89% rename from meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch rename to meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index 51f0b048fa..04b2fb712f 100644 --- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -1,7 +1,7 @@ -From 863dd6f502d53a4a2644e031eee2e8dfa3fd05aa Mon Sep 17 00:00:00 2001 +From 45bb63a1727097683acad23f270968026671ec6a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 12 Apr 2021 23:44:53 -0700 -Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl +Subject: [PATCH 17/27] missing_syscall.h: Define MIPS ABI defines for musl musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 unlike glibc where these are provided by libc headers, therefore define @@ -44,3 +44,6 @@ index 67aa8ea1f2..8d9824495e 100644 typedef struct BaseFilesystem { const char *dir; /* directory or symlink to create */ +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch similarity index 88% rename from meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch rename to meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch index 66b8f66806..b4b6be0e75 100644 --- a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +++ b/meta/recipes-core/systemd/systemd/0018-pass-correct-parameters-to-getdents64.patch @@ -1,7 +1,7 @@ -From 01de9e5a6e4ad2f361d3eb4d9839c7afd91cc677 Mon Sep 17 00:00:00 2001 +From 78a59a540d425e677d5652d9b72d7b175e36f4dd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 15:15:11 -0800 -Subject: [PATCH] pass correct parameters to getdents64 +Subject: [PATCH 18/27] pass correct parameters to getdents64 Fixes ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] @@ -20,10 +20,10 @@ Signed-off-by: Jiaqing Zhao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c -index 5e98b7a5d8..aef065047b 100644 +index 776733148b..d37419658c 100644 --- a/src/basic/recurse-dir.c +++ b/src/basic/recurse-dir.c -@@ -55,7 +55,7 @@ int readdir_all(int dir_fd, +@@ -56,7 +56,7 @@ int readdir_all(int dir_fd, bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX); assert(bs > de->buffer_size); @@ -32,3 +32,6 @@ index 5e98b7a5d8..aef065047b 100644 if (n < 0) return -errno; if (n == 0) +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0019-Adjust-for-musl-headers.patch similarity index 84% rename from meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch rename to meta/recipes-core/systemd/systemd/0019-Adjust-for-musl-headers.patch index f86b8c889c..44eebe16b3 100644 --- a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +++ b/meta/recipes-core/systemd/systemd/0019-Adjust-for-musl-headers.patch @@ -1,7 +1,7 @@ -From a45cf93772ac5055665cc55454509747b9c68ad2 Mon Sep 17 00:00:00 2001 +From 585e04673da62a8bf50e00fd6c1ae9ffc66c3b2f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 22:19:37 -0800 -Subject: [PATCH] Adjust for musl headers +Subject: [PATCH 19/27] Adjust for musl headers Upstream-Status: Inappropriate [musl specific] @@ -14,7 +14,7 @@ Signed-off-by: Chen Qi src/network/netdev/bareudp.c | 2 +- src/network/netdev/batadv.c | 2 +- src/network/netdev/bond.c | 2 +- - src/network/netdev/bridge.c | 2 +- + src/network/netdev/bridge.c | 3 ++- src/network/netdev/dummy.c | 2 +- src/network/netdev/geneve.c | 2 +- src/network/netdev/ifb.c | 2 +- @@ -34,7 +34,6 @@ Signed-off-by: Chen Qi src/network/netdev/vxlan.c | 2 +- src/network/netdev/wireguard.c | 2 +- src/network/netdev/xfrm.c | 2 +- - src/network/networkd-bridge-mdb.c | 4 ++-- src/network/networkd-dhcp-common.c | 3 ++- src/network/networkd-dhcp-prefix-delegation.c | 3 ++- src/network/networkd-dhcp-server.c | 2 +- @@ -42,16 +41,15 @@ Signed-off-by: Chen Qi src/network/networkd-ipv6ll.c | 2 +- src/network/networkd-link.c | 2 +- src/network/networkd-ndisc.c | 2 +- - src/network/networkd-route.c | 8 ++++---- src/network/networkd-setlink.c | 2 +- src/network/networkd-sysctl.c | 2 +- src/shared/linux/ethtool.h | 3 ++- src/shared/netif-util.c | 2 +- src/udev/udev-builtin-net_id.c | 2 +- - 38 files changed, 45 insertions(+), 42 deletions(-) + 36 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index c20367dfc9..b8d4cd8c2a 100644 +index 3e992d7cad..c7e1ff4dbf 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,7 @@ @@ -90,7 +88,7 @@ index 26da0231d4..2e8002af8c 100644 #include "batadv.h" #include "fileio.h" diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c -index 4d75a0d6bf..985b3197e0 100644 +index 52a7f126b6..74ca0812db 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,7 +1,7 @@ @@ -103,18 +101,19 @@ index 4d75a0d6bf..985b3197e0 100644 #include "alloc-util.h" #include "bond.h" diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c -index 3e394edadf..f12f667687 100644 +index d426c0c501..14432adb95 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c -@@ -2,7 +2,7 @@ +@@ -2,7 +2,8 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include - #include -#include ++#include +//#include #include + #include - #include "bridge.h" diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c index 00df1d2787..77b506b422 100644 --- a/src/network/netdev/dummy.c @@ -128,18 +127,18 @@ index 00df1d2787..77b506b422 100644 #include "dummy.h" diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c -index bc655ec7ff..a77e8e17e4 100644 +index 22c2b00e1b..1d762c4911 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -2,7 +2,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include - #include -#include +//#include + #include #include "alloc-util.h" - #include "conf-parser.h" diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c index d7ff44cb9e..e037629ae4 100644 --- a/src/network/netdev/ifb.c @@ -166,11 +165,11 @@ index d5fe299b7b..c9c8002eac 100644 #include "ipoib.h" diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c -index 05d5d010f6..d440f49537 100644 +index 51ae64341d..46460efabd 100644 --- a/src/network/netdev/ipvlan.c +++ b/src/network/netdev/ipvlan.c -@@ -2,7 +2,7 @@ - +@@ -3,7 +3,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include #include -#include @@ -179,7 +178,7 @@ index 05d5d010f6..d440f49537 100644 #include "conf-parser.h" #include "ipvlan.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c -index 17d6acefb6..679d0984f9 100644 +index 4b9f19cc95..6c4951a7e6 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -1,7 +1,7 @@ @@ -192,11 +191,11 @@ index 17d6acefb6..679d0984f9 100644 #include #include diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c -index 203807e3a5..8ab09a387e 100644 +index 21933d3970..a4ace19dc6 100644 --- a/src/network/netdev/macvlan.c +++ b/src/network/netdev/macvlan.c -@@ -2,7 +2,7 @@ - +@@ -3,7 +3,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include #include -#include @@ -205,11 +204,11 @@ index 203807e3a5..8ab09a387e 100644 #include "conf-parser.h" #include "macvlan.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index 57127a861a..7f787d0b9f 100644 +index 2b411425ba..fe00200135 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c -@@ -2,7 +2,7 @@ - +@@ -3,7 +3,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include #include -#include @@ -267,40 +266,41 @@ index 380547ee1e..137c1adf8a 100644 #include "vcan.h" diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c -index e0f5b4ebb1..8a424ed03d 100644 +index 78555286d1..e7eff072e4 100644 --- a/src/network/netdev/veth.c +++ b/src/network/netdev/veth.c @@ -3,7 +3,7 @@ - #include + /* Make sure the net/if.h header is included before any linux/ one */ #include - #include + #include -#include +//#include #include + #include - #include "netlink-util.h" diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c -index 2390206993..efec630e30 100644 +index 60e49a5b8a..266fd58813 100644 --- a/src/network/netdev/vlan.c +++ b/src/network/netdev/vlan.c -@@ -2,7 +2,7 @@ - - #include +@@ -3,7 +3,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include + #include -#include +//#include #include #include "parse-util.h" diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c -index b75ec2bcc6..6aeeea640b 100644 +index 24079a7203..33ff17ea82 100644 --- a/src/network/netdev/vrf.c +++ b/src/network/netdev/vrf.c -@@ -2,7 +2,7 @@ +@@ -2,8 +2,8 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include - #include -#include + #include +//#include #include "vrf.h" @@ -319,11 +319,11 @@ index c0343f45b6..f9e718f40b 100644 #include "vxcan.h" diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c -index b11fdbbd0d..a971a917f0 100644 +index 37f65967a6..bdd8848a02 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c -@@ -2,7 +2,7 @@ - +@@ -3,7 +3,7 @@ + /* Make sure the net/if.h header is included before any linux/ one */ #include #include -#include @@ -332,18 +332,18 @@ index b11fdbbd0d..a971a917f0 100644 #include "conf-parser.h" #include "alloc-util.h" diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c -index 4c7d837c41..6df6dfb816 100644 +index fed1be8d11..94b659fd23 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c -@@ -6,7 +6,7 @@ - #include +@@ -5,7 +5,7 @@ + + /* Make sure the net/if.h header is included before any linux/ one */ #include - #include -#include +//#include #include - - #include "sd-resolve.h" + #include + #include diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c index 905bfc0bdf..39e34dbb3b 100644 --- a/src/network/netdev/xfrm.c @@ -356,29 +356,8 @@ index 905bfc0bdf..39e34dbb3b 100644 #include "missing_network.h" #include "xfrm.h" -diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c -index bd1a9745dc..949d3da029 100644 ---- a/src/network/networkd-bridge-mdb.c -+++ b/src/network/networkd-bridge-mdb.c -@@ -1,7 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - --#include --#include - - #include "netlink-util.h" - #include "networkd-bridge-mdb.h" -@@ -11,6 +9,8 @@ - #include "networkd-queue.h" - #include "string-util.h" - #include "vlan-util.h" -+#include -+#include - - #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U - diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 080b15387c..efe8283957 100644 +index 9f0268d934..8cd605ab4a 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,7 +1,8 @@ @@ -392,7 +371,7 @@ index 080b15387c..efe8283957 100644 #include "bus-error.h" #include "bus-locator.h" diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c -index af2fe9efcd..511565700f 100644 +index 2e660b7763..b8dd6240a0 100644 --- a/src/network/networkd-dhcp-prefix-delegation.c +++ b/src/network/networkd-dhcp-prefix-delegation.c @@ -1,6 +1,5 @@ @@ -412,7 +391,7 @@ index af2fe9efcd..511565700f 100644 assert(link); diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c -index 607fe0053c..9ce4005874 100644 +index c35102af74..3be469ae16 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -1,7 +1,7 @@ @@ -425,7 +404,7 @@ index 607fe0053c..9ce4005874 100644 #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 49c452da7c..98aad1f3cd 100644 +index 4dd6044b18..15a598f9db 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -3,7 +3,7 @@ @@ -451,10 +430,10 @@ index 32229a3fc7..662a345d6e 100644 #include "in-addr-util.h" #include "networkd-address.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 4ef1be4bad..e5aa53604d 100644 +index 6b0f09926a..81f44f6e6a 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c -@@ -3,7 +3,7 @@ +@@ -4,7 +4,7 @@ #include #include #include @@ -464,7 +443,7 @@ index 4ef1be4bad..e5aa53604d 100644 #include #include diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index 840ccb158d..9f2e85e32f 100644 +index 7cafe1f6a3..07c293c9a6 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -6,7 +6,7 @@ @@ -476,33 +455,8 @@ index 840ccb158d..9f2e85e32f 100644 #include "sd-ndisc.h" -diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index eb502ae2cf..5b25ee4523 100644 ---- a/src/network/networkd-route.c -+++ b/src/network/networkd-route.c -@@ -1,9 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - --#include --#include --#include -- - #include "alloc-util.h" - #include "event-util.h" - #include "netlink-util.h" -@@ -21,6 +17,10 @@ - #include "vrf.h" - #include "wireguard.h" - -+#include -+#include -+#include -+ - int route_new(Route **ret) { - _cleanup_(route_freep) Route *route = NULL; - diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c -index 011ea1fe6e..59dfe733eb 100644 +index 058bc00ba1..bb0a430a0b 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -2,7 +2,7 @@ @@ -515,7 +469,7 @@ index 011ea1fe6e..59dfe733eb 100644 #include "missing_network.h" diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c -index 2b226b2e2a..f12a474e2f 100644 +index 68c23e0eb7..e177c49d9b 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -2,7 +2,7 @@ @@ -525,8 +479,8 @@ index 2b226b2e2a..f12a474e2f 100644 -#include +//#include + #include "af-list.h" #include "missing_network.h" - #include "networkd-link.h" diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h index 3d1da515c0..3fca9a4faf 100644 --- a/src/shared/linux/ethtool.h @@ -542,7 +496,7 @@ index 3d1da515c0..3fca9a4faf 100644 #include /* for INT_MAX */ diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c -index f56c5646c1..5af28ff119 100644 +index 8adc2c89c8..1977e28d7f 100644 --- a/src/shared/netif-util.c +++ b/src/shared/netif-util.c @@ -1,7 +1,7 @@ @@ -555,10 +509,10 @@ index f56c5646c1..5af28ff119 100644 #include "arphrd-util.h" #include "device-util.h" diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index f528a46b8e..830318cda5 100644 +index 384a1f31cb..c94bb70afb 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c -@@ -18,7 +18,7 @@ +@@ -19,7 +19,7 @@ #include #include #include @@ -567,3 +521,6 @@ index f528a46b8e..830318cda5 100644 #include #include +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch similarity index 87% rename from meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch rename to meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch index 67388e6807..b3fbfee08d 100644 --- a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +++ b/meta/recipes-core/systemd/systemd/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch @@ -1,8 +1,8 @@ -From 20dfb0b5e7113c2e7f82c01488b419dffe8714ab Mon Sep 17 00:00:00 2001 +From e01f0c444423eb65d176713735ff8cefb3068f3d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Nov 2022 13:31:34 -0800 -Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific - version mark it so +Subject: [PATCH 20/27] test-bus-error: strerror() is assumed to be GNU + specific version mark it so Upstream-Status: Inappropriate [Upstream systemd only supports glibc] @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c -index a55f3f9856..4123bf3da0 100644 +index 91045c06c2..a06b9bac0c 100644 --- a/src/libsystemd/sd-bus/test-bus-error.c +++ b/src/libsystemd/sd-bus/test-bus-error.c @@ -99,7 +99,9 @@ TEST(error) { @@ -27,7 +27,7 @@ index a55f3f9856..4123bf3da0 100644 assert_se(sd_bus_error_get_errno(&error) == EBUSY); assert_se(sd_bus_error_is_set(&error)); diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c -index 376d532281..967cfd4d67 100644 +index ab463bd1b3..e2ebcaaf33 100644 --- a/src/test/test-errno-util.c +++ b/src/test/test-errno-util.c @@ -4,7 +4,7 @@ @@ -47,3 +47,6 @@ index 376d532281..967cfd4d67 100644 TEST(PROTECT_ERRNO) { errno = 12; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch similarity index 88% rename from meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch rename to meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch index 36d468959a..6e899d0905 100644 --- a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0021-errno-util-Make-STRERROR-portable-for-musl.patch @@ -1,7 +1,7 @@ -From 32371040c2aa649e23c3b0f2c5ee27995a16526a Mon Sep 17 00:00:00 2001 +From d2f632dd6a8cca0fbdd6568ce84004335c004f58 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH] errno-util: Make STRERROR portable for musl +Subject: [PATCH 21/27] errno-util: Make STRERROR portable for musl Sadly, systemd has decided to use yet another GNU extention in a macro lets make this such that we can use XSI compliant strerror_r() for @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h -index 27804e6382..274c1c6ef1 100644 +index 48b76e4bf7..6e7653e2d9 100644 --- a/src/basic/errno-util.h +++ b/src/basic/errno-util.h @@ -15,8 +15,16 @@ @@ -37,3 +37,6 @@ index 27804e6382..274c1c6ef1 100644 /* A helper to print an error message or message for functions that return 0 on EOF. * Note that we can't use ({ … }) to define a temporary variable, so errnum is * evaluated twice. */ +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch similarity index 76% rename from meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch rename to meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch index f860b5f542..ed7e3ea586 100644 --- a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +++ b/meta/recipes-core/systemd/systemd/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch @@ -1,7 +1,7 @@ -From 751fb8c9a05115f5329cfa25e69afe7657124c20 Mon Sep 17 00:00:00 2001 +From 4a3ed5aaaf108d3a07f24997698906e801ba2412 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:06:27 -0700 -Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc +Subject: [PATCH 22/27] sd-event: Make malloc_trim() conditional on glibc musl does not have this API @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index b6899df192..0c03287004 100644 +index a1305ef014..b8a73da2a3 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c -@@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit( +@@ -1877,7 +1877,7 @@ _public_ int sd_event_add_exit( } _public_ int sd_event_trim_memory(void) { @@ -24,7 +24,7 @@ index b6899df192..0c03287004 100644 /* A default implementation of a memory pressure callback. Simply releases our own allocation caches * and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a -@@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) { +@@ -1891,7 +1891,9 @@ _public_ int sd_event_trim_memory(void) { usec_t before_timestamp = now(CLOCK_MONOTONIC); hashmap_trim_pools(); @@ -34,3 +34,6 @@ index b6899df192..0c03287004 100644 usec_t after_timestamp = now(CLOCK_MONOTONIC); if (r > 0) +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch similarity index 86% rename from meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch rename to meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch index ece9873bbc..b8583c7af7 100644 --- a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +++ b/meta/recipes-core/systemd/systemd/0023-shared-Do-not-use-malloc_info-on-musl.patch @@ -1,7 +1,7 @@ -From 4fe2a8b1aab7297beac50f6ce46f3df4169de218 Mon Sep 17 00:00:00 2001 +From d3880d167d8dfafbb8ee62f7737a869f9525f303 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:20:40 -0700 -Subject: [PATCH] shared: Do not use malloc_info on musl +Subject: [PATCH 23/27] shared: Do not use malloc_info on musl Upstream-Status: Inappropriate [musl-specific] Signed-off-by: Khem Raj @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c -index 74f148c8b4..2d862a123d 100644 +index 30f9602b1e..5308f168db 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c -@@ -611,15 +611,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat +@@ -755,15 +755,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat _cleanup_close_ int fd = -EBADF; size_t dump_size; FILE *f; @@ -52,3 +52,6 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch similarity index 62% rename from meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch rename to meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch index f517392e58..6804c7c62e 100644 --- a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta/recipes-core/systemd/systemd/0024-avoid-missing-LOCK_EX-declaration.patch @@ -1,7 +1,7 @@ -From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001 +From ca2a736627f8ee8dd9dbbf5b3149d4c8493833ff Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH] avoid missing LOCK_EX declaration +Subject: [PATCH 24/27] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration. @@ -10,12 +10,25 @@ Upstream-Status: Inappropriate [musl specific] Signed-off-by: Chen Qi --- + src/basic/fd-util.h | 1 + src/core/exec-invoke.c | 1 + src/shared/dev-setup.h | 1 + - 2 files changed, 2 insertions(+) + 3 files changed, 3 insertions(+) +diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h +index af17481dd8..fa20bfa30f 100644 +--- a/src/basic/fd-util.h ++++ b/src/basic/fd-util.h +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "macro.h" + #include "missing_fcntl.h" diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index fe14ceeb31..521e7b87ff 100644 +index ee8db04e76..2aff654f0f 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -4,6 +4,7 @@ @@ -38,3 +51,6 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch b/meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch new file mode 100644 index 0000000000..5cfb112d67 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0025-include-signal.h-to-avoid-the-undeclared-error.patch @@ -0,0 +1,27 @@ +From ecf124ab2e488a71741fe443ff4863f7ed172968 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 2 Jul 2024 22:18:47 -0700 +Subject: [PATCH 25/27] include signal.h to avoid the 'undeclared' error + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi +--- + src/basic/pidref.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/pidref.h b/src/basic/pidref.h +index 9920ebb9b3..2fdd4ff50f 100644 +--- a/src/basic/pidref.h ++++ b/src/basic/pidref.h +@@ -1,6 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + ++#include + #include "macro.h" + + /* An embeddable structure carrying a reference to a process. Supposed to be used when tracking processes continuously. */ +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch b/meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch new file mode 100644 index 0000000000..ca1a525a0a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch @@ -0,0 +1,48 @@ +From 787606c6ff822fb3fe41ba951ee289bbf6d4def3 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 2 Jul 2024 22:44:31 -0700 +Subject: [PATCH 26/27] undef stdin for references using stdin as a struct + member + +In musl stdio.h, we have: +include/stdio.h:#define stdin (stdin) + +This causes error when a struct member is also named stdin. undef it. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi +--- + src/shared/edit-util.c | 2 ++ + src/systemctl/systemctl-edit.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/shared/edit-util.c b/src/shared/edit-util.c +index cfb2828f4e..1794a7b269 100644 +--- a/src/shared/edit-util.c ++++ b/src/shared/edit-util.c +@@ -3,6 +3,8 @@ + #include + #include + ++#undef stdin ++ + #include "alloc-util.h" + #include "copy.h" + #include "edit-util.h" +diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c +index 15398f8364..e7d53ca9a1 100644 +--- a/src/systemctl/systemctl-edit.c ++++ b/src/systemctl/systemctl-edit.c +@@ -13,6 +13,8 @@ + #include "systemctl.h" + #include "terminal-util.h" + ++#undef stdin ++ + int verb_cat(int argc, char *argv[], void *userdata) { + _cleanup_hashmap_free_ Hashmap *cached_id_map = NULL, *cached_name_map = NULL; + _cleanup_(lookup_paths_done) LookupPaths lp = {}; +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch b/meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch new file mode 100644 index 0000000000..1be075d606 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch @@ -0,0 +1,76 @@ +From cf94d43572770007f95b832f477aa5a03624a1e5 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Tue, 2 Jul 2024 23:23:57 -0700 +Subject: [PATCH 27/27] adjust header inclusion order to avoid redeclaration + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi +--- + src/network/netdev/wireguard.c | 2 +- + src/network/networkd-bridge-mdb.c | 3 ++- + src/network/networkd-route.c | 6 +++--- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c +index 94b659fd23..a78ad5762d 100644 +--- a/src/network/netdev/wireguard.c ++++ b/src/network/netdev/wireguard.c +@@ -5,9 +5,9 @@ + + /* Make sure the net/if.h header is included before any linux/ one */ + #include ++#include + //#include + #include +-#include + #include + + #include "sd-resolve.h" +diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c +index 7ff4a18846..fe1a9cf888 100644 +--- a/src/network/networkd-bridge-mdb.c ++++ b/src/network/networkd-bridge-mdb.c +@@ -2,7 +2,6 @@ + + /* Make sure the net/if.h header is included before any linux/ one */ + #include +-#include + + #include "netlink-util.h" + #include "networkd-bridge-mdb.h" +@@ -13,6 +12,8 @@ + #include "string-util.h" + #include "vlan-util.h" + ++#include ++ + #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U + + /* remove MDB entry. */ +diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c +index d596fd81e6..0dc0d2a7a3 100644 +--- a/src/network/networkd-route.c ++++ b/src/network/networkd-route.c +@@ -1,8 +1,5 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + +-#include +-#include +- + #include "alloc-util.h" + #include "event-util.h" + #include "netlink-util.h" +@@ -20,6 +17,9 @@ + #include "vrf.h" + #include "wireguard.h" + ++#include ++#include ++ + static Route* route_detach_impl(Route *route) { + assert(route); + assert(!!route->network + !!route->manager + !!route->wireguard <= 1); +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch b/meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch new file mode 100644 index 0000000000..501728cbc8 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch @@ -0,0 +1,31 @@ +From 0e4379088b1cf607b605b785f6f23943ebeb6584 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 3 Jul 2024 07:18:42 -0700 +Subject: [PATCH 28/28] build-path.c: avoid boot time segfault for musl + +This function, at runtime, should return -ENOEXEC. For musl, it +somehow segfaults. I think it's related to getauxval, but it's +really does not matter, just return -ENOEXEC. + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Chen Qi +--- + src/basic/build-path.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/build-path.c b/src/basic/build-path.c +index b5972658df..4ef551034e 100644 +--- a/src/basic/build-path.c ++++ b/src/basic/build-path.c +@@ -151,6 +151,7 @@ int get_build_exec_dir(char **ret) { + */ + + static int runpath_cached = -ERRNO_MAX-1; ++ return -ENOEXEC; + if (runpath_cached == -ERRNO_MAX-1) { + const char *runpath = NULL; + +-- +2.45.1 + diff --git a/meta/recipes-core/systemd/systemd_255.6.bb b/meta/recipes-core/systemd/systemd_256.bb similarity index 95% rename from meta/recipes-core/systemd/systemd_255.6.bb rename to meta/recipes-core/systemd/systemd_256.bb index 0376412f61..2d84013430 100644 --- a/meta/recipes-core/systemd/systemd_255.6.bb +++ b/meta/recipes-core/systemd/systemd_256.bb @@ -8,7 +8,7 @@ DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" -inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check mime # unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled. @@ -26,36 +26,39 @@ SRC_URI += " \ file://init \ file://99-default.preset \ file://systemd-pager.sh \ - file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0008-implment-systemd-sysv-install-for-OE.patch \ - file://0023-meson-bpf-propagate-sysroot-for-cross-compilation.patch \ + file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ + file://0002-implment-systemd-sysv-install-for-OE.patch \ + file://0003-meson-bpf-propagate-sysroot-for-cross-compilation.patch \ " # patches needed by musl SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" SRC_URI_MUSL = "\ - file://0001-missing_type.h-add-comparison_fn_t.patch \ - file://0002-add-fallback-parse_printf_format-implementation.patch \ - file://0003-src-basic-missing.h-check-for-missing-strndupa.patch \ - file://0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ - file://0005-add-missing-FTW_-macros-for-musl.patch \ - file://0006-Use-uintmax_t-for-handling-rlim_t.patch \ - file://0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ - file://0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ - file://0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ - file://0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ - file://0011-avoid-redefinition-of-prctl_mm_map-structure.patch \ - file://0012-do-not-disable-buffer-in-writing-files.patch \ - file://0013-Handle-__cpu_mask-usage.patch \ - file://0014-Handle-missing-gshadow.patch \ - file://0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ - file://0016-pass-correct-parameters-to-getdents64.patch \ - file://0017-Adjust-for-musl-headers.patch \ - file://0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ - file://0019-errno-util-Make-STRERROR-portable-for-musl.patch \ - file://0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch \ - file://0021-shared-Do-not-use-malloc_info-on-musl.patch \ - file://0022-avoid-missing-LOCK_EX-declaration.patch \ + file://0004-missing_type.h-add-comparison_fn_t.patch \ + file://0005-add-fallback-parse_printf_format-implementation.patch \ + file://0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ + file://0007-add-missing-FTW_-macros-for-musl.patch \ + file://0008-Use-uintmax_t-for-handling-rlim_t.patch \ + file://0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ + file://0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ + file://0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ + file://0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ + file://0013-avoid-redefinition-of-prctl_mm_map-structure.patch \ + file://0014-do-not-disable-buffer-in-writing-files.patch \ + file://0015-Handle-__cpu_mask-usage.patch \ + file://0016-Handle-missing-gshadow.patch \ + file://0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ + file://0018-pass-correct-parameters-to-getdents64.patch \ + file://0019-Adjust-for-musl-headers.patch \ + file://0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ + file://0021-errno-util-Make-STRERROR-portable-for-musl.patch \ + file://0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch \ + file://0023-shared-Do-not-use-malloc_info-on-musl.patch \ + file://0024-avoid-missing-LOCK_EX-declaration.patch \ + file://0025-include-signal.h-to-avoid-the-undeclared-error.patch \ + file://0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch \ + file://0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch \ + file://0028-build-path.c-avoid-boot-time-segfault-for-musl.patch \ " PAM_PLUGINS = " \ @@ -73,7 +76,6 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', 'link-udev-shared', d)} \ backlight \ binfmt \ - cgroupv2 \ gshadow \ hibernate \ hostnamed \ @@ -135,7 +137,6 @@ PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false" PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false" PACKAGECONFIG[bpf-framework] = "-Dbpf-framework=true,-Dbpf-framework=false,clang-native bpftool-native libbpf,libbpf" PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" -PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid" PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup" PACKAGECONFIG[cryptsetup-plugins] = "-Dlibcryptsetup-plugins=true,-Dlibcryptsetup-plugins=false,cryptsetup,,cryptsetup" @@ -677,6 +678,8 @@ FILES:${PN} = " ${base_bindir}/* \ ${sysconfdir}/init.d/README \ ${sysconfdir}/resolv-conf.systemd \ ${sysconfdir}/X11/xinit/xinitrc.d/* \ + ${sysconfdir}/ssh/ssh_config.d/20-systemd-ssh-proxy.conf \ + ${sysconfdir}/ssh/sshd_config.d/20-systemd-userdb.conf \ ${rootlibexecdir}/systemd/* \ ${rootlibdir}/systemd/libsystemd-core* \ ${libdir}/pam.d \ @@ -717,6 +720,7 @@ FILES:${PN} = " ${base_bindir}/* \ ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ ${datadir}/dbus-1/system.d/org.freedesktop.home1.conf \ + ${datadir}/mime/packages/io.systemd.xml \ " FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" From patchwork Thu Jul 4 08:24:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 45992 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 986AAC30653 for ; Thu, 4 Jul 2024 08:25:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.5680.1720081501555004083 for ; Thu, 04 Jul 2024 01:25:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=7915407677=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4645ebaY010928 for ; Thu, 4 Jul 2024 08:25:00 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 405jrsg8uf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 04 Jul 2024 08:25:00 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ua31gppnwzoIXhwex/mEeTS2DcJgJRr3xbOmtjMWTpWl9S8qHsOHck6fqi+QRvTHA5NLJqtgzGZMnG6tzydlRjc1XUBXm4355fSi8pk9ZPi4gFE7CquspBLFyULrLqJisjMTHCtXmBoBEqF2A+LDHal9kcBgEpQYOdRkjmncSsjmPsCf0yM39vtEpwvzb7O4PItqpqwbgq9PTvR3UNGQ4pd6Rl5fKjLWjKZoFfwfzUbLWI46rGyhmoGlYIjP8lvnIGCyn0k6Jcyho4Q2CAYopplmz1sULpBwEDvTM/CGnQp2FznfBTG20SNAXXCb9Y9CDBy9uGH6zT7hmFo1hbOHew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oS+g8d/c6c9pfGtQUsB+JotWbxSoW66nkgBJtjjUXcM=; b=lqY4VrJKsnfi84NyTlfR1q8Dngqt211FYAkGsp+3zPlOJZyOwtPImMIRx0KW4DYWeFZPI7R3SQ3HHqDAGMo/EC4w9u60F0qmSnI/rpefJmbARQDrhEexc8XR16QRCSUH2w3SH3v1bIWkLmzhPQt6sFz5dxwt7pRYDn38I58P6Hcsr2+KjXGqP5GQCoYsl9Btq2kzLe8lJ3gkyex1QKX1+Onzw4M6s/h0XkfWdYuOuBIs0HvrAipORgM7gvGeM6nv3YmKgz4I0QuhHRDcVt7gUrLjeILY0Ls+wWUi+tLkVxbMrAyewZAPGaGHG8ntdCx+KX3xW+LosWIbNs1PnWAwYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW3PR11MB4649.namprd11.prod.outlook.com (2603:10b6:303:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Thu, 4 Jul 2024 08:24:56 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%7]) with mapi id 15.20.7741.027; Thu, 4 Jul 2024 08:24:56 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 2/4] systemd-boot: upgrade from 255.6 to 256 Date: Thu, 4 Jul 2024 01:24:40 -0700 Message-ID: <20240704082444.3886275-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240704082444.3886275-1-Qi.Chen@windriver.com> References: <20240704082444.3886275-1-Qi.Chen@windriver.com> X-ClientProxiedBy: BYAPR08CA0038.namprd08.prod.outlook.com (2603:10b6:a03:117::15) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW3PR11MB4649:EE_ X-MS-Office365-Filtering-Correlation-Id: 91e103ea-de97-400f-1c73-08dc9c02c9ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Mxjvpq6mH7YS9VEvQmQcO5pK/FMlZmTfRpsGSYUmeec/mUMpR081qp9sa+Tl4o2T2BqgijPQUCv7hys9562kRo0EyuWafnNLFk8AHyvzHGRDqmgk5DwMs2h6LRJjoErFFY25cl12OS1qsGbkjDs6nyywJ68mdgCF97waXVzFe/XfG3dVodiRyfhNWyjcel7Yl8SVDIE2lkts63uDpDoiBTb3OoymgT7S/UF9E0AixbL3Vo9kjyclc6ci65et9Oh41NXa+DzKH64bpzyKKaJm902dGvhZnou5MxQuSs1VKf3bvpY2hduh60fQ14s5Lx/HA03a0KEe9NvvqCXyj38Ozpd/pUth3F4tiIR8U3FeMgIqY9PVklOVkDs2DGChy6FvWKUwu2IL9drePnGMySfGkEIWg6LNiTkPjYs7Px6hbOhqdqM7YE/0y/HeHrjECp6aVQuCIafmzvcfZJoJjJJ4aNg4i/PWGflyYXoNCprK3W/6y0vnxiXHvgREWdM9HI0c6Oy+oQJgywBI5/Zh/r1TQ8+/8ILvSR31gCc+Ch62A4RpBZ5RyVnLFZTleR/2jqGw36BT42Issh3B2KjSu3s+ImYErd+kn1WNFV3fFzJ7fwEjlYqBCkn3rp4ttIBE/UjMkORcuex7hgRMdvwt22bvl/45cAS0+3aQUtcfbv1BCk/PIrJh+Yv9kcS2trVPD2bneypjTETb5Ce8Q2OnbsqnMf6dbfELDW5n0HCBuPxsbJQJrBril9YWJGhnHh0crs94z5K4JMemki2XiARSfFAqfko4Vz+6MfUP6ie5Fd6AYvcmLocweyVWKUBB0F99a2imFttspCaFjCOmVcQdKYEMZYNwkVixHcMSYmHE2BL8kaaKCHgqNlIR/Y8O8zpKZuNbL8adPSS2I/1kttQf67POptfexSjYTxxrryLe7CMz82GyvyBf/8acNy8azxWKHxy6XA4gpEI3KoBJnPpV5CibXgojksnjkeo4744RKXjmBkfGarC5D99RwKbVL9eBDIZdgVXfLKtsTAE0rf1mx5LkTPmadostEAphl2+MWsJ6GSqT57XrDfwku1IgtGlYcc8QBUPR/fqVBEF+oxPLPfLgo1HveZp9owG0TRsO4RvPttUNJAuP5ZLx/64r8n4xFGxyTFPgNWvH90K/RUY7Xywlef+YSW/3jMIV2PADxC0ZW3tTWNERcCgkycjyLt/JNU+VHVyXZC+zoEYxCJRGIYMuxaWRcHKyMT4ui8+vyFPDWLVEUp6elGaPT71lMe1ZHR3rUvfKFsMj79H4F5ski5nHZvks0jFERAPXqOYOlvy09YJUC0xH5nc8uqkGJ/QyZwPdbFc0Y+h10z02D2cuszEoRHZTdXj54k/gXZCUW1wMoiI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /dyxi2bNHg6HuiI+UtCf7TKQCVijNHsZyo2pjHdQSZmL8K4hLc5+eGzplvFPH4RG7AL0UY9lR8MW+OW6NkGLp8nK9lFZ7NFnfPfI/boxs8pjPbpLhU7bLrQjWaN+S5s3pooqD4iHSoxygY7x12JUeHPcfzb7vksGlCGBOl5416e6Wvxdrp1+ILiheY8RJ+W+UfKcEwF+neWxqMi8syQMr2wt4cTZzPVs+ny//Pw47vV9z7pb9vlasGwmWwx01rMV1gM1WBGfZ5892I1MNzuV3FfDm5f1n/h1LrNVry/eK5HyZQV6LFC4QHuz3WG8nv4FpmkfnLP+XA8vTWS197IG6eJRfkGmuZiddAlt0uCRyhhCbIC0NgyTVvN+3PklWkEpnlSo+gBTuCvY26Oj1IgPjw7lFBu76rA8/TkADGBN5TnbPnEmNgRE3sivuVHvcfjUbeEi5+lslDxVFAPu0nFI5cgEk9CGVrdHSiWy/+9SiRMo+P3zhbOVcDlPzY5Gq5N3W8Bcz6y9472S4KZQiXCRv6BzLux+YIGf6aWOlNFYMjJ4MOUsm+ierSrFNcS2EwiNprAq+pnNP//LVgXsh5L62c4t7qzuJ2khiscbQEhXiQOrLvb1lnkx6x45vYcvm/Y25Dstup8amhuFuQaNVvyffsSXakBI3Zyf6YDq1hOMs9MUBtH6K+SffV53tB8jw2Sfb2mab80SOr/ayO5/RNb4hUgeJ1KwXoqUjIG+pzvZbFTrzTFE7xI2xmmSbdmZ8n2fwCRw6cwYMm+0If87Jn2BvMb0u2Y6PnJagfewgrn8n3OAyKiNQvk1HvE4CdXwbNjpVpovh/G94+XsTQBMZNvXZ7xiM6u+qyDerC/T2SljMTbfaw+FAILtxcDyq2Wqa+nlczf1Bls5aJcvaH67XvaxQcn3Y2K//VnESjUCQcY0RMQ0p3mL7enFEw7HEyAu+pVh/inOqFjghIkFKVEZRLRr7//pObjmSCUflMsmw7NxTju9+xSeKW8ZLwseqFrMTkqsYdObMVzH4/+hOpT0uRRkqGOULEAPUzZD94qrEyAfJQx8TP1oD7iadhgP9pcI24RRa6tBiC3vn/996waXZTgox4NyS40yM5rfWnBpF1sgb6rwYpfjBWX8dGrxjRkrVccF0p0AkRLOwqnK+bNUii6yrpQwG6lKnmFtoYMbHvaFyvtopPMoYaCB8Kr9ylPJ2Iryl+ddALWUSk09dBopOxl5nH4DioF0qFXcR5uV5M24v5BxeZeXJYsU7xIG2zvyDCGqgQajixLc2rrczAk8peAg976WEAGfdUjm5KBnHyOTUx7Ilom69zrBSJs/AgL0RQbNnmRUa9vtfFOtad4omlFxBqYmTcnUQqhmVyJdI3+fuOQUSwvhmV4PetJEi8KtPzpRRJZYDxUdqckF8QdNx8ODHbFukIK+5x5+5Pv7BqhnExUAmhT35SfJqP/mpz4FlWMrQ9vtn3lW9KuNRwKS5CxmRzklR9tI9UjLvWQ9u0wPEni+Nr4BAVheSDTlloPxbYArjefQv2CR+r5xQMrVKcUNuEDrgrL2DoZtaUoSd2ivj4hqSHcEu2EkXSqqn8qxmvQZZwm0VJO31AvPSMX5e5eGKg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91e103ea-de97-400f-1c73-08dc9c02c9ad X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2024 08:24:56.7742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LE7jZkoK58DdAoRbnHO2v2D9vlw1RXGz+/+1xYlaE6EBk2P7mIDzr5yLthVe6Xkk5FrE8sa0/+ox0025yXtRbw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4649 X-Proofpoint-GUID: G9LCVVx1iqQrI3WjANLlA-1-DyPpeMag X-Proofpoint-ORIG-GUID: G9LCVVx1iqQrI3WjANLlA-1-DyPpeMag X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-03_18,2024-07-03_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2406140001 definitions=main-2407040058 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Jul 2024 08:25:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201525 From: Chen Qi Patch 0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch is added to resolve build time error. Signed-off-by: Chen Qi --- ...ve_255.6.bb => systemd-boot-native_256.bb} | 0 ...temd-boot_255.6.bb => systemd-boot_256.bb} | 2 ++ ...on.build-ensure-VERSION_TAG-exists-i.patch | 32 +++++++++++++++++++ 3 files changed, 34 insertions(+) rename meta/recipes-core/systemd/{systemd-boot-native_255.6.bb => systemd-boot-native_256.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_255.6.bb => systemd-boot_256.bb} (95%) create mode 100644 meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.6.bb b/meta/recipes-core/systemd/systemd-boot-native_256.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_255.6.bb rename to meta/recipes-core/systemd/systemd-boot-native_256.bb diff --git a/meta/recipes-core/systemd/systemd-boot_255.6.bb b/meta/recipes-core/systemd/systemd-boot_256.bb similarity index 95% rename from meta/recipes-core/systemd/systemd-boot_255.6.bb rename to meta/recipes-core/systemd/systemd-boot_256.bb index 9a6d8e9d6e..dd06b6218b 100644 --- a/meta/recipes-core/systemd/systemd-boot_255.6.bb +++ b/meta/recipes-core/systemd/systemd-boot_256.bb @@ -1,6 +1,8 @@ require systemd.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" +SRC_URI += "file://0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch" + require conf/image-uefi.conf DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native" diff --git a/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch b/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch new file mode 100644 index 0000000000..6f02ea2f43 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-src-boot-efi-meson.build-ensure-VERSION_TAG-exists-i.patch @@ -0,0 +1,32 @@ +From 9df06062cebd0390d33de9694e9cb1c9fa7b8697 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 3 Jul 2024 23:18:41 -0700 +Subject: [PATCH] src/boot/efi/meson.build: ensure VERSION_TAG exists in case + of cross build + +The GIT_VERSION is changed to use VERSION_TAG, but in case of cross build +for src/boot/efi, it's not set, causing build error because the compiler cannot +know it's a macro thus treating it as some variable and error out. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/33612] + +Signed-off-by: Chen Qi +--- + src/boot/efi/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index 7a60b0ec7e..99d108d6e8 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -65,6 +65,7 @@ endforeach + + if meson.is_cross_build() and get_option('sbat-distro') == 'auto' + warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.') ++ efi_conf.set_quoted('VERSION_TAG', version_tag) + elif get_option('sbat-distro') != '' + efi_conf.set_quoted('SBAT_PROJECT', meson.project_name()) + efi_conf.set_quoted('PROJECT_VERSION', meson.project_version().split('~')[0]) +-- +2.45.1 + From patchwork Thu Jul 4 08:24:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 45993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98772C3814E for ; Thu, 4 Jul 2024 08:25:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.5844.1720081502208297528 for ; Thu, 04 Jul 2024 01:25:02 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=7915407677=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4645ebaZ010928 for ; Thu, 4 Jul 2024 08:25:01 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 405jrsg8uf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 04 Jul 2024 08:25:01 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EX3oJcONENC7uAuBYdmh2GSeicwpHtU+50TYquGltJncuLjU+PbutXugJCnv2kLAlAkKlA8uszDMu8BiDokBN9mj15oVipm8sgwl9IIJAu3g6rLMbUPHe9v7w1acHx4ZpWLIVDa7LyO1mHihCD2zQdXVCjJCheqpMcSsYuB23Y8dtyUc2jJ99B5xI49VVmPlAYmVejo3/vgFYuVNK0RmpI7lXKsNcpt78eNzN/8GyKDx9sqvhBd5GZoqstJHkoA2fsr0K4dIRoxkPtzb+dYAuLzpHSlMPgmsi9FeXcyXLx7Rk6vuJ4TtoCc9BZaUWBOYlmU2BVMErTRXXboqkjxaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IujVaO+BHa4vRbmeZ6SN14R69U2Xq9L4gN6p+dFxQ64=; b=Hjp/LkdVJR71pAuD3qBWo6Nf1DUsoVobL1Kdj2nq20A74F37o7+bInDU8Ko7XG3uQifzZaUE3hnds75h6mE4ZQ3Xdl9BAX4eNeVY44EjBvE2qTRLetWo/IhSYJlcxtJUYLtUtpzfSuc1pkdEj3DOcJjtbG02Aqg9RLA4Ij5mo0si9PYZfg3FngLlRapMCPvHIrFYxzVv2Uqq8n7CvScKe1RFOObS+AV5noWrKNu/Nssbgy/akAd8Q5LPqwAx2IUiuAkKuZtFASm7qJwMXMgFpDXNf3RsG8PhCecQXQJd7vHF76gX0CJSvSGa56NdrF44L8iWhQKAWQkB8R4sdSY9qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW3PR11MB4649.namprd11.prod.outlook.com (2603:10b6:303:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Thu, 4 Jul 2024 08:24:57 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%7]) with mapi id 15.20.7741.027; Thu, 4 Jul 2024 08:24:57 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 3/4] util-linux/util-linux-libuuid: upgrade from 2.39.3 to 2.40.1 Date: Thu, 4 Jul 2024 01:24:41 -0700 Message-ID: <20240704082444.3886275-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240704082444.3886275-1-Qi.Chen@windriver.com> References: <20240704082444.3886275-1-Qi.Chen@windriver.com> X-ClientProxiedBy: BYAPR08CA0038.namprd08.prod.outlook.com (2603:10b6:a03:117::15) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW3PR11MB4649:EE_ X-MS-Office365-Filtering-Correlation-Id: 44c17f83-298a-49c7-c7f8-08dc9c02c9cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: AFG6W2fti5sEcNXmN+GQoC3tSxuE9Wibg8EArnt5HNHDOevaC7cJIbIBXapOayD2uL186NH2rWYZlOZGK4vc5zRqm79yiP8x2f1YB94K22iq8tvgmggXHj3w3jyFTDJzQeaCrbW74vbZgEX9y4AmbyEQCcCa0VTJq54iR60G4wyUNq3iOPaUXYrXbUC4KZciF1cocR7GYgmGvh4669LCVk7cCDQ+NKVOhds9KZCIFqnyk/+vke6PEqG08o6bZAH023y5UvTH23yDLh/Z8IfHQORTxwxSs5CAY/WTYiu2aj++kAjLC6UUbxwJrebwASlPU8sxe3Q7QGrSqxzcZhjm2tbmAb+R9HNqKGLc0hFpx2kGF9d97/luDgCJvjY48ieSyCc8SC9GXkW4HdjYdEatkCLahdAFPCQzDa4rbJc4vi8fkBoASfpsLOvvE5PK/4JWCLzSJbi/Jf3Ss7ungZ4/jiaV5UejaMtNMBjVRhwm6nLICxb+cYWD5rYIwn2dxe0qCbu/52t1G6lFz7GVrcmkTCmEFlYJ/avvC4LD41GtOq9L42aa+EUFcfjFCBEU00bMlQXxX7d3scuUpBSOvmAMbuxQ4qFfkKZFN6IuBB4lpfcuZG9X2IepyFlJ9lKLJhzzF05mdgXA8T9/K/YgLrsFADFNHl2e9HVlaDyXwV12AgPCSFPOmDaUlZxx3im8aqrJfJcwDyEuLoV7YdBr5wxtcj8AHhiATIcAIwdSGzXPA1auG3FW9Zdko26zZj5PF1EGIPooMMqUQtOfiRZrNhWMnvrjBc/H+oFZ+9BzZZUjond36qkcTVseuGvBzsZck5yp3ZAHr/fQM3+bhFeJjTzPb4EJ9+MbA9TgKR6Vf/xoMrOISkwUgpYTIqxpImyCMEhFLFX0Tshnu4v4lJpLK3rRp+W+ur7ncGbv+B6iXtUNsC+/UtEfT1hJDleQdMoUMvp82G7AYgHY25UZBFAVTVp5dn33rso0/oKAgy9Pjvz+WUA03JpU2uTIiPsqkj5Sy09YiAoDRMBNuQ3SKkviXdO0Mt/ldgUgpBcDPQnHNBT3mzJUiE4pHPx1dh2PXz4118h84AJjnYloFTGaJLzBPvofWaD/kDD5fxYB0k517xbeWyPhyWivjQ5v+QhPZK4IGCzCAoAqiGjxQwsBgK9eBwQeXjnDt/oIyQ86iP/f/ahy7DeR4g86AyjbUDVB4NXYUIlXPumIXGnhr5xlegKDgyHQemEFVp5Odsnr1ROmLSvM/Ks/DGKgYhXoGj1IBHDzK9ej0Sdgon5aizdYabyhgcWFLFNUFynYE+7bJGet0gs1+jMv7LYewu4uMWGt6yjT3BI9Ukn+wUqxzWidUXD0AxHZ0WrJCM5pCMlQLG0VID7oGo0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UAbEZF0XOQxf9oAU7ON+kd9eSHX6MQ73sXmDrJ3tX0ieeplNU2rcGFVHiqvqOpBmS55WCV0Sc2Zgwr728yDbNpb+V3jx1LkA7wEB6cO19NOGTmoswNOSVvUqXPDNuX5bcXx1W8EyzeO6ak51CyvXI54zp0aJeqiriLoJTkCkgx7uIr8rlyekJ0ctJi/aBTnjnLq1zZ8lcGzIzRtO5KO8m6YMPEH34hPlvOG7gw59P9z0f/QIKElvoLnQFNQtDPvB5zsnQYaQqJEf4TpmHE9B0HvFcq9qQFfbF5jsnmVpxi8JxkTbpZkp9zQB3aG9VH5w+CcISbDzqo16xc1+kVl5S9jDVTwUlLxPVj4oZIdJIpeMYKI6XbpBPJc571bmNDcyUY+XpGw2gVRV7JCdRka1JJsrOV0ffJCv9A6Phu0W9Rz98HMiFDNNicN+z2c5trMUt/YkCJzJEQZyYEBJz9G+iQhJ7R7aT6w/ZEVhe9JZjYvH7SzeyO3mCKOBrh5SfsZnvORV9DEeFD8+pbzALWLtiigwzBnkHLJl3TgzuL4bbAueF+4HCCOd5H1YzaE5zlv8AkQ+bZpyN1/j79P/UlHQewvrOCH6sYLjVekp6WnF4YA4mvZeQlQcQLKVij3jPx9QYdeOowzKaHQDi65Hovt5Tw9OmqwS48cA7JkbHsGCAsEm0qvbV2qFAJpyJOn996vZ5Hcq7xqV/iKE5GsknQgz02Z6W6iPrv2btnPewwjjw+NKEL2TJxV/2rabYxQ5TnkduDc6lCedKzpkxI7edmGbizrFfBrw4EubOwrqTfgEq9QQ24I+oHM91RVcKw5qMJXxALoTuZ3qjL/KNmpcKONfgSZsisbLRslCrCnnFVVFYoUrgEkC/D5Up7J2j2q7qh6jnIlLR+YTrsx8w9Q9/smMUG44++6BIBWYa01A6OIddEo0WH6F9xRyGyRMP6j1HP4LY0g7t+FUBW2yPaH7D4ajtmCc9LCBBtvuc9/jxVDvJpPjNs5y8QJMeNfbppqhuq6GAt5cVwg2+6PayQray4HcSlpfUiCYZGVaaNRdHV9ln9B67DZFZ7SSneyyED6W9HJOh3l0soBaQGo3OAOXdIcyCThdT2Ofa5HRe4pfpStnT+PRQRiVkT2XxO0Nm6oMiMUGNsrpyMspoBKOBWhAv1eMzbZefnfVWwKSl+t4GxuZD+KymOol2A4AHe5KxdDEzm5JlmKpL9ylLzp2Dn/y3FXIQPX5Sywrw0n4pwLXjFLQltrkpc64PgLG+fSJg5T5xYUQqwkIzGBNdpbmPJ2nGuOFp+wgVi9N7ZdpfNTIqC4vzY02eec/U5SeXCwaLAT/ZJj6CF4WxpDHvihjSzmIW8mk1ByfD0wUNetq8vp9iWvTm18Sfe+2MlY37HEM+SJkpV7z34odRvogTsSnr0FQUSdy035jXGDX/VUKC3G7tBeG2S7OLygyv80ftvEmLaRfUIEEiAjxiLLVy7ywEbuIBIO/wIUqztYT/GRwVYLcBwZ12seoTQWYxwPVj7y2iCKTA2T3jxY2v61eSYzuoHMa9pFNupiEzfhIoJVWy3zD8/irrI7IH8Ysnn0aOQsDervUAq5W9FI68qSghjqAw0TbDbjlrQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 44c17f83-298a-49c7-c7f8-08dc9c02c9cc X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2024 08:24:57.0019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WF/No2oEPgknEL3krPdiVeROUXVkoY4elXs2sU76kv49ZfzLLMQiK6Avw3JEbtCJDBQGN1SYytMBiNHcPIzNGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4649 X-Proofpoint-GUID: mIv-8I21ReWB3rShlmbiFZSpOIfdkGNa X-Proofpoint-ORIG-GUID: mIv-8I21ReWB3rShlmbiFZSpOIfdkGNa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-03_18,2024-07-03_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 spamscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2406140001 definitions=main-2407040058 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Jul 2024 08:25:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201526 From: Chen Qi License-Update: =============== GPL-2.0 is changed to GPL-2.0-only in README.licensing. The following two patches are removed as they've been there in new release: 0001-login-utils-include-libgen.h-for-basename-API.patch mit-license.patch Other existing patches are refreshed to avoid patch-fuzz error. A new PACKAGECONFIG, lastlog2, is added, which serves as a switch to build Y2038 safe lastlog pam module. This is a new functionality added in 2.40. This 2.40.1 version has the problem of unnecessary remake, causing intermmittent errors at parallel make. The do_compile:prepend is a workaround for this. Upstream issue and PR are: https://github.com/util-linux/util-linux/issues/3061 https://github.com/util-linux/util-linux/pull/3064 do_install is changed to do_install:append, the legacy codes are removed. They've been there since the born of oe-core. I tested with ccache, there's no error. Signed-off-by: Chen Qi --- ...2.39.3.bb => util-linux-libuuid_2.40.1.bb} | 0 meta/recipes-core/util-linux/util-linux.inc | 8 +-- ...ls-include-libgen.h-for-basename-API.patch | 60 ------------------- .../util-linux/avoid_parallel_tests.patch | 5 +- .../util-linux/configure-sbindir.patch | 7 +-- .../display_testname_for_subtest.patch | 7 +-- .../util-linux/util-linux/mit-license.patch | 45 -------------- .../util-linux/util-linux/ptest.patch | 11 ++-- ...l-linux_2.39.3.bb => util-linux_2.40.1.bb} | 21 ++++--- 9 files changed, 29 insertions(+), 135 deletions(-) rename meta/recipes-core/util-linux/{util-linux-libuuid_2.39.3.bb => util-linux-libuuid_2.40.1.bb} (100%) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch delete mode 100644 meta/recipes-core/util-linux/util-linux/mit-license.patch rename meta/recipes-core/util-linux/{util-linux_2.39.3.bb => util-linux_2.40.1.bb} (95%) diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.40.1.bb similarity index 100% rename from meta/recipes-core/util-linux/util-linux-libuuid_2.39.3.bb rename to meta/recipes-core/util-linux/util-linux-libuuid_2.40.1.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index d506783f9a..0f5f838e84 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -6,7 +6,7 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" -LICENSE = "GPL-1.0-or-later & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" +LICENSE = "GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & MIT" LICENSE:${PN}-fcntl-lock = "MIT" LICENSE:${PN}-fdisk = "GPL-1.0-or-later" LICENSE:${PN}-libblkid = "LGPL-2.1-or-later" @@ -14,7 +14,7 @@ LICENSE:${PN}-libfdisk = "LGPL-2.1-or-later" LICENSE:${PN}-libmount = "LGPL-2.1-or-later" LICENSE:${PN}-libsmartcols = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba \ +LIC_FILES_CHKSUM = "file://README.licensing;md5=ddd58b6c94da86ff4f03e91208eb9cfc \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://Documentation/licenses/COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \ @@ -30,7 +30,6 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=cc80239f106687ab39ef0271ff5cf4ba FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ - file://mit-license.patch \ file://configure-sbindir.patch \ file://runuser.pamd \ file://runuser-l.pamd \ @@ -38,8 +37,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://0001-login-utils-include-libgen.h-for-basename-API.patch \ file://fcntl-lock.c \ " -SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f" +SRC_URI[sha256sum] = "59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f" diff --git a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch b/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch deleted file mode 100644 index 6258710e1e..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-login-utils-include-libgen.h-for-basename-API.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d44e3ad1f6f8b5c1b3098bb7d537943a4c21d22f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Dec 2023 19:59:46 -0800 -Subject: [PATCH] login-utils: include libgen.h for basename API - -musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler - -include libgen.h for using the posix declaration of the funciton. - -Fixes - -../util-linux-2.39.2/login-utils/su-common.c:847:20: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - 847 | shell_basename = basename(shell); - | ^ - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2615] -Signed-off-by: Khem Raj - ---- - login-utils/su-common.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/login-utils/su-common.c b/login-utils/su-common.c -index b674920..3297c78 100644 ---- a/login-utils/su-common.c -+++ b/login-utils/su-common.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #ifdef HAVE_SECURITY_PAM_MISC_H - # include -@@ -840,17 +841,20 @@ static void run_shell( - su->simulate_login ? " login" : "", - su->fast_startup ? " fast-start" : "")); - -+ char* tmp = xstrdup(shell); - if (su->simulate_login) { - char *arg0; - char *shell_basename; - -- shell_basename = basename(shell); -+ shell_basename = basename(tmp); - arg0 = xmalloc(strlen(shell_basename) + 2); - arg0[0] = '-'; - strcpy(arg0 + 1, shell_basename); - args[0] = arg0; -- } else -- args[0] = basename(shell); -+ } else { -+ args[0] = basename(tmp); -+ } -+ free(tmp); - - if (su->fast_startup) - args[argno++] = "-f"; diff --git a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch index 85ad7a5575..8ea00dbb95 100644 --- a/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +++ b/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From 0b05e4695a0616badef71dfa459a00ef6ff1b521 Mon Sep 17 00:00:00 2001 +From da58b4150f6932de36c962ea657713bcf4ea44be Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Mon, 14 Jun 2021 14:00:31 +0200 Subject: [PATCH] util-linux: Add ptest @@ -9,13 +9,12 @@ Revert run.sh script accordingly to serialize running tests Signed-off-by: Tudor Florea Upstream-Status: Inappropriate - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 890212f..870e817 100644 +index 651ef2b..2a8012e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch index 75adeca188..74abdc2038 100644 --- a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +++ b/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch @@ -1,4 +1,4 @@ -From c79222a9a5e3425c55e150edc0b7ac59c573aa2f Mon Sep 17 00:00:00 2001 +From 0387d71516c978899cfd556ca512f530a212b4a9 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 24 Sep 2012 07:24:51 +0100 Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected @@ -9,16 +9,15 @@ fix the test, the [ ] syntax was getting eaten by autoconf Signed-off-by: Phil Blundell Signed-off-by: Saul Wold Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Display testname for subtest Signed-off-by: Tudor Florea Upstream-Status: Pending - --- tests/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions.sh b/tests/functions.sh -index 5a562a3..098145e 100644 +index 5fe5ba0..a6c703e 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -437,7 +437,7 @@ function ts_init_subtest { +@@ -450,7 +450,7 @@ function ts_init_subtest { if [ "$TS_PARSABLE" != "yes" ]; then [ $TS_NSUBTESTS -eq 1 ] && echo diff --git a/meta/recipes-core/util-linux/util-linux/mit-license.patch b/meta/recipes-core/util-linux/util-linux/mit-license.patch deleted file mode 100644 index afbec98f18..0000000000 --- a/meta/recipes-core/util-linux/util-linux/mit-license.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5b8fab1584017d9d9be008c23b90128bba41a7b5 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Thu, 28 Mar 2024 12:16:57 +0000 -Subject: [PATCH] README.licensing/flock: Add MIT license mention - -Looking at the license text, flock.c is under the MIT license (see -https://spdx.org/licenses/MIT). - -Add an SPDX license identifier header and add to the list of licenses the -source so everything is correctly listed/identified. - -Signed-off-by: Richard Purdie - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/2870] - ---- - README.licensing | 2 ++ - sys-utils/flock.c | 4 +++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/README.licensing b/README.licensing -index 4454f8392a..535ad34813 100644 ---- a/README.licensing -+++ b/README.licensing -@@ -12,6 +12,8 @@ There is code under: - - * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version - -+ * MIT - MIT License -+ - * BSD-2-Clause - Simplified BSD License - - * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License -diff --git a/sys-utils/flock.c b/sys-utils/flock.c -index fed29d7270..7d878ff810 100644 ---- a/sys-utils/flock.c -+++ b/sys-utils/flock.c -@@ -1,4 +1,6 @@ --/* Copyright 2003-2005 H. Peter Anvin - All Rights Reserved -+/* SPDX-License-Identifier: MIT -+ * -+ * Copyright 2003-2005 H. Peter Anvin - All Rights Reserved - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation diff --git a/meta/recipes-core/util-linux/util-linux/ptest.patch b/meta/recipes-core/util-linux/util-linux/ptest.patch index 6221de7182..7345926b88 100644 --- a/meta/recipes-core/util-linux/util-linux/ptest.patch +++ b/meta/recipes-core/util-linux/util-linux/ptest.patch @@ -1,24 +1,23 @@ -From d0a69ce80c579cbb7627a2f20e8b92e006a8d8ad Mon Sep 17 00:00:00 2001 +From f9be73c3e2b0a4f0923950dcb058be85d3ee8ed7 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 3 Dec 2015 04:08:00 +0100 Subject: [PATCH] Define TESTS variable Signed-off-by: Tudor Florea Upstream-Status: Pending - --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index effbb02..7d2bd1e 100644 +index 50ab8d0..7e2340d 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -57,6 +57,7 @@ systemdsystemunit_DATA = +@@ -64,6 +64,7 @@ tmpfiles_DATA = dist_bashcompletion_DATA = check_PROGRAMS = dist_check_SCRIPTS = +TESTS = $(check_PROGRAMS) - PATHFILES = - ADOCFILES_COMMON = + BUILT_SOURCES = + diff --git a/meta/recipes-core/util-linux/util-linux_2.39.3.bb b/meta/recipes-core/util-linux/util-linux_2.40.1.bb similarity index 95% rename from meta/recipes-core/util-linux/util-linux_2.39.3.bb rename to meta/recipes-core/util-linux/util-linux_2.40.1.bb index 2cd7750afc..5985ddc7dc 100644 --- a/meta/recipes-core/util-linux/util-linux_2.39.3.bb +++ b/meta/recipes-core/util-linux/util-linux_2.40.1.bb @@ -90,7 +90,7 @@ EXTRA_OECONF:append = " --disable-hwclock-gplv3" # build host versions during development # PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" +PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam lastlog2', '', d)}" # inherit manpages requires this to be present, however util-linux does not have # configuration options, and installs manpages always PACKAGECONFIG[manpages] = "" @@ -106,6 +106,7 @@ PACKAGECONFIG[pcre2] = ",,libpcre2" PACKAGECONFIG[cryptsetup] = "--with-cryptsetup,--without-cryptsetup,cryptsetup" PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[lastlog2] = "--enable-liblastlog2,--disable-liblastlog2,sqlite3" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" @@ -117,6 +118,7 @@ FILES:${PN}-mount = "${sysconfdir}/default/mountall" FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES:${PN}-lastlog2 += "${base_libdir}/security/pam_lastlog2.so" FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" @@ -147,18 +149,21 @@ SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" +do_compile:prepend () { + # this is a workaround for the unnecessary remake problem. Issue and PR are as below: + # https://github.com/util-linux/util-linux/issues/3061 + # https://github.com/util-linux/util-linux/pull/3064 + # When newly release tarball contains the above fix, the following workaround could be dropped. + [ -e ${S}/libsmartcols/src/filter-scanner.c ] && touch ${S}/libsmartcols/src/filter-scanner.c + [ -e ${S}/libsmartcols/src/filter-parser.c ] && touch ${S}/libsmartcols/src/filter-parser.c +} + do_compile:append () { cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c ${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock } -do_install () { - # with ccache the timestamps on compiled files may - # end up earlier than on their inputs, this allows - # for the resultant compilation in the install step. - oe_runmake 'CC=${CC}' 'LD=${LD}' \ - 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - +do_install:append () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" From patchwork Thu Jul 4 08:24:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 45991 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AA3CC3065C for ; Thu, 4 Jul 2024 08:25:04 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.5843.1720081501095722436 for ; Thu, 04 Jul 2024 01:25:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=7915407677=qi.chen@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4645ebaX010928 for ; Thu, 4 Jul 2024 08:25:00 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 405jrsg8uf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 04 Jul 2024 08:25:00 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mvVBmZa7s1DGXQnjMFzednOl0giH5zJbbzWBnPhBDN8PgrxWKiAjWzq5aVAUWTq7NMplFNM89ho2qBqrvN/71Kb+E/JtctaIDGJ90NEiUa5yCt+vymT6DDrhf8isWsLO3vWhQwPX3Y7JiQGR9A/mF30rNM6A0hHRQJ6/NUhaY13LeCl8xZwd/YXO0z4xVxLYI/lojnH6uQUfsis7Nm/4cFqjQFluch5XytK3wsHHljJGbwCGzYTCgQ1LpUumItQTWFa/sinxfqwB6pCQP9Ncfnuy/bH5509w6I8AlutYn8e0/TRbxeaMqq/+7Rtu8KI1uYVrFQrLV8747HFkaudOUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uGqTuU4RpNXUIQ+ooxri/M+NISN6QH9iRBxEYVrG1Ug=; b=oUWOnbGX6Knyz+KYd53vYLhInxZGp7auuMA9TyE1g3ZaLYvc3x2tqsph3MCiPNcYAh0iqNxinOMisJhNLn8qkDWuilxd1V/hsic/QbO5VHf3J+oiCkFe6hp5dAye2iuelSUVZbDAeop/1mJuy0NPfOHvsPvSFKNNqC4gCQ6EVtlD/8oB+jqTZ4perVorpDiD0c4ZhBD0j+H14BY0R/8dUt+nzObnXNOmmQ4A/fGGu5lQNEoLKFm/Q8vDj1nhOauqiUtMERSrAQjge3YR6+/i5YVM4yNdYEKuBC0DzjQpqg31dt3+E8EUwbQxkBy5cR8+ePL3g9QqCcffLfTIgmn0bQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) by MW3PR11MB4649.namprd11.prod.outlook.com (2603:10b6:303:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.29; Thu, 4 Jul 2024 08:24:57 +0000 Received: from CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093]) by CO6PR11MB5602.namprd11.prod.outlook.com ([fe80::a7e3:721d:9cec:6093%7]) with mapi id 15.20.7741.027; Thu, 4 Jul 2024 08:24:57 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 4/4] pciutils: remove textrel INSANE_SKIP Date: Thu, 4 Jul 2024 01:24:42 -0700 Message-ID: <20240704082444.3886275-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240704082444.3886275-1-Qi.Chen@windriver.com> References: <20240704082444.3886275-1-Qi.Chen@windriver.com> X-ClientProxiedBy: BYAPR08CA0038.namprd08.prod.outlook.com (2603:10b6:a03:117::15) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|MW3PR11MB4649:EE_ X-MS-Office365-Filtering-Correlation-Id: f2b7feb4-207e-4718-44ea-08dc9c02c9f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: ttfIG1/UU9WRY8NQK3fw8mUaAUcCDBAE0j9219P3KYTLUHBb1+LozqqRS4WfSjRokWr9qzHbQdMmVD+fm3IjpPvFKAHqkJMFyNfYM6fD+wVfpbpG8bsr0qtWvd+JnVtrK6/gMEvif9UHxQDEYmifwaLnFDEAsBxdFqDblWFYYw+y6ZHhOzlDl35ITYIh990a+AluNg5rwJAkrbIZGC/9S/nwoiy2DOhR3O0+G0WDCOLpjP/JIILzoJRA+CEI11gNVMHqLpBODX6jVjFxaoB4cVF/2xQBKhDQ69AGKQpKOLF1kx7M2kTjBHnzAEAJ8CprHsJAerEHAdUg4XhAH0Zres7l2kszUQiMLdscaeYbJ8YcCoTq7djvD4/PmgJ9vHJp9w1M4SxHwpGzz51aNYfskuX7JjviuU89ROANjKWNhjv5E8C3x8nwgefmozRLWiX3qI6+d36EkMP/6rAbgyElEfVsB+4GUBuAGE05TKhWFPCGYBqhZo/18uj2kiJF+hyMaeCDPWeNu5uONmvQ2vy1O7SlfOF35g7XwS7z13b9qO6qC0hfGO+bmMhQxMiT9+IT6W0G6goSqrGSIEunya/Qwt1BcFzpPY2ZUq9wW9IPxwC0JP23jvXPEZfR1eoogS7+tR3xyPqzZIOhz7V9Cmkm3QK/50hE5JLwL9WlAdAA0ZM0hvO/yOHSB5RuA4iUOjj0kTHe+N6wwqf+qbJ0o0QfMhae5XHJw3owO8/NXJfvONuysVU57hijPyB1hnm8u+u7XZ0bAW6FKj+5lelwstPrvsuJ8djTr/bcQ5Fb7Jk723CIxEjVSOsWtfK46NoP7Kxt2pEasc3gAQP9YGQFUb7D6+MbmzxFfa+7M+0RARXCvbN9Lq4teoPX4uWprjqXFAFPJ5P/vdDcXPDSG88Cs0cm5pg80lTf2UNZJGtWU/G+cU+8UzsJtR5b/AChyw5VIsgIwYiSlSXt2NHBQO36HtU6oEHA4yl2tygwmDYJckc7618cK1ffWSSwlZ4fqoCqetEbnbnGtLF21DEHvVhz1o5VbK6NPfSghKGX/oinhBNJrR+kcCcFvOAPA9szAuwoIYozWLmjwen85IW9kaqJYkiN6epwR34JbnpMUizWVmI1WXVF5gk3JT1E4LBp6GGlp8k7SvtM/l7IFUDsZv01tobVonXYO8WKTTDnNogHoXxNtLvC20BARP0ZQzarXls5GHx9y8kCOdtMVRwPDEn/Z6mkCVFdhf8P3ycu7oBiGi6zy0HPnsXLfGNUjRaeCnCACecWnM2dn7NWok5U9dX7lNVAf/hi+JbhCJJK2RCJ6njhvLDRy5iKgQOm1nP6pr90yank7vX8GeT69CiGGyeBNL+lYfsCyw1FbCYfjH6C9dlDnnmHLRlqoC7I5jWa8e7BM8JMsPizvwRKHI/QfrYINxhdLw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5602.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WUEsDBA2WGNNPSXOLbfF84i4HzuMSgoA92X2b8a2RFxCPLdai7ZjfnvbOQaAuQk7ztqGHDBcDIyZXlAFsUQyQBtlnkjQRlmgVrSyMm81ZKCCCfAyXNPAwnCZlqk7ilMgDgY9qNODIjOWB6yfV0dH2oxAMigpvoX4NBOJ6bWuR0uMsW6lKp/68/sd1zACuTh6MfSCa3AVG7g+rzhn6jwFeaBRpQdk9kwCJMVnIXBIZuU6YyIpxadxR0+vVyhnivJspTvNYDQ8Sdz+/URohWY0ZDuix3Wgv/R+eEBdnEDviXTRXBGuh8Lg6jmefwTblW1hsLXb1GOqSeCG1vDWdOvtWwwE91FxW/vkFS1xhG/RhRVlJBqrMoqwHyopg8R8874Udsa9RRcjGnkzw0xhAhVKOgBdNXdqyXTMr4Td/yJ7Xnoc2wLLbvtk89eE6JC9iSsobqg3yl4bq5QbrPx1hUmMZwAOTxozVUpaRVlp8cWrTHJqFvmXPObuFYUHvZP96x/qOy/e6azDpeYRFmbp8tjgUb+chK9TjpSSAH2Q4eVkd2+3n0fsPOzHE3W844m/YubKDdJ56eFG/3r1xIP0qx+blHyLPp5yVkKh5COknILCtkOVQy0cnXyJ2m7x69gnlUfwdB6KBx/RVS4w6YfSAD1WMTAo9Wl9HF0i3TDqESo2RmypYkoRFMufzGZ1ejOpIdlP+EZBOFZYgiD4b9O1AvCjVx5F+amdbGSIe3lzgQqZXZ4LFTO0oO4POj3L65TtQywqFMJ6/aqWCf2P27mHfNze3a+auHnIZWzTelnKksNyMSTrgLDUht0mg6noxEWqBNXyEcIDrwxdSnbdY2zvBvf6vF6vvM8rXGuysgcRrccJCojrs+/Q5J13osMdJ7ey2bJvgEu6sOXo2tvA9/spjsMq/vWupuC6wbBKQhSwGPaRuPxOuWxYtHyko+iiPqqU1YViCycjvJCLlcRSKWoVyPTvFehJ+GHfWlbuXrmz1siGi5z0H9zEzK1SUzhDuAa01kldG9Ju8UDGkk8mxfwj/tJpx2sFKLY2hlMJGQEE92h6FPOC1EF1bcC5dgf/X29ra5gqcI58x2MrDfXGvdCjwG2jeOLwtTXeTj22FpKlUmNyWjLYl7B4fsdVqwugOMN+t8u3lDv2yrQajQEkXvzoyesWTeFtx2wivSbfm2TsgGbIjtUqSCaqHICboC9ll7w5llhTjQj/c3VqMjYuZVy2OZnopitJnu1NbogMc0XL+WPWa08KeFNwYmtjFNiVqSlHgJWZyAJtOlJUuGVUbkoRzvQKuJb+DHYAsAeZIZocT7U5J3dKdPOECGIVwIfQKFtJzJk0Yg/exF7Xmd2cRl7AfNCy6XfVkrg1EDSWAkBEAup8hqzXOQnGAMgK6ADq+zJ+Ketjj02i5j4UZ7mFhBR4Wgo7bMnkn+4ezIQRdgaMpIAGZiP9bKDqsWxCA2E9l4+/VLRdSCTlDIQ30Fz4XB/SboeQ24ftplbNytIQRByotbQeryCewVasThEskCAypRLs/5WWUWuFLotzWrCD2n73MMJctZJp10wJsWZrUY72S3aoenlGesYpvbjG9SXTMhIwv9j76Ywgy6bPG2R/CkKA8wqrxA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2b7feb4-207e-4718-44ea-08dc9c02c9f2 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2024 08:24:57.2910 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xyi4m9c6zDd8aZEa7My5+ZfodVu5BLCilktGOBBvcLErtFpVS57fFD2EOb/0MpYDoMzXNK/GPZ/kGpokqnyg3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4649 X-Proofpoint-GUID: hufQ_HEs8E2e-K-ZZjG-asJ5uSgtthnW X-Proofpoint-ORIG-GUID: hufQ_HEs8E2e-K-ZZjG-asJ5uSgtthnW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-03_18,2024-07-03_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 phishscore=0 spamscore=0 mlxlogscore=725 adultscore=0 bulkscore=0 suspectscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.21.0-2406140001 definitions=main-2407040058 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 04 Jul 2024 08:25:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201524 From: Chen Qi The current pciutils does not have this textrel problem any more. Signed-off-by: Chen Qi --- meta/recipes-bsp/pciutils/pciutils_3.13.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb index 0b876c7070..74edd8686b 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.13.0.bb @@ -47,8 +47,6 @@ DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciuti RDEPENDS:${PN} += "${PN}-ids" FILES:libpci = "${libdir}/libpci.so.*" -# The versioned symbols in libpci appear to be causing relocations -INSANE_SKIP:libpci += "textrel" ALTERNATIVE:${PN} = "lspci" ALTERNATIVE_PRIORITY = "100"