From patchwork Mon May 20 08:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43841 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 1B12BC04FFE for ; Mon, 20 May 2024 08:11:04 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.56007.1716192661437958092 for ; Mon, 20 May 2024 01:11: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.166.238, mailfrom: prvs=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K5PlDO003963 for ; Mon, 20 May 2024 01:11:01 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y7bx6rq1j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 01:11:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lUvQAWGEeIF+8DT0RKTcdwE0SQhwLcVkUaSsWLWRzCC1aluYYYaGRgCOEg3RG9zROG7TCMY1xMzhwY1aV2ni4kCbs13keNI/iiD9aiPx7GwFXIy+jf8SEO5NvI1xzVWSsKmtwXbYnz/sy1+HdiA2jNUzVTMuqmRTmIiganC1JEGjapNuAW6XJUSbiJFsES+NhcZwyyy1gDuereFbWWBtaUPxW6pLB1hPWQa+jhTG5AE1cLtGFgP4kw+EPIXDxvx/hMbG+dnlVTsSk9kGtLO7oKuSxyUiwS6Wb5Et+35MFY35pjX/ADGmp3rhxOu33SQ9gQtlMr4dD7M9IMtZanx2XA== 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=XuEzdyG6EU5rcJV1o5l1A7t2/4EdlOZgCoN0E3NW9GY=; b=PL8/bxzfst1PiCoLUYbarAmdCeYVS1X0rEsWjTCuqiXdYNQTsZhNBSF4P465fDRomSd+WDCxOHDt1mUI4RSNaAgtKQ40PJHGsnkkcIqQLLf9Pq6tU6/IHKvTKhm/Vtkys/BcO7X6IjTZdGfw9XzlMizQ253S+SpXR+Aw45R62WDuB+59tVevWzJAxRyDJde8TXA5EH1OKqVcIFBR1/qM+40H6Ju6r4ML5G8R82Ee3GICFzUhXsvOtzR1Uaf60Z10q62D+ogiqE6/5orOw0Y+KcDxOykjRrY3ROCXlimb75ZxU7E0kaa/LmN97u3y0riZG7Nk7YUSvUglnXwbgXDLUQ== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:10: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.7544.052; Mon, 20 May 2024 08:10:57 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 1/6] systemd/systemd-boot: upgrade from 255.4 to 255.6 Date: Mon, 20 May 2024 16:10:35 +0800 Message-Id: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ff493df-3778-452d-90cf-08dc78a460a3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ynVDafoivGJ15tQg2Cprcpga1Onvmj1?= =?utf-8?q?T4UgkNf+8ruWSZZbrOvqzOTZX6pqXAGmBKzu4SLbqEWlBZBzLTOWJeoNmJbIr76Qz?= =?utf-8?q?ajbf9o7prMnm0wXm9s169ZT+rOliRctN3TFLkGyC3PRxs586Qk9jZXF+hocojRvST?= =?utf-8?q?7iIWaKV9szodGjV0O55BGpnQExU307Do3iCCcBY767TMkidT1WJHpsvEr/nIfZ0BX?= =?utf-8?q?1n336EHipi+eQIWtcpMThgEDjpI1sEFXid4kaJZo6nLlcGrx+vSvinrE3fHCWw0w4?= =?utf-8?q?snT4tMJUlkjyVRn98J4+VN8A+WcND/j3oQjfaymcGz9sPdo0B78Uoy0IQX9s6f7RB?= =?utf-8?q?DTql3Cxb8afsuvX7984Kv2MWZRwVLYB6vxvBNW3rdhqQoDs5oRkX2tmupu210Vgiy?= =?utf-8?q?QigfP6NG6/mRFOSphUCK36u5+0CnZ2IgjAQigdfps5QwcVr0huGx4ngfO3HAwcwyA?= =?utf-8?q?nCeZWG9+2aAGrAahudQTeCbiQMrNDIxXaxX5nGo0LslJaMVXpUhBMjsFpC6LAO4K9?= =?utf-8?q?C4MKmquwSc6LAzZQ7RXRNLrgz/hHFYZL6j/0dmNntN+f0EK3Wf1QQui+qsKcxyiS+?= =?utf-8?q?ycRdhQ4l897BG0IMjXbUcUb8ZvGqeTIgeRXNSiftbqFQa8UY1uXG8NyYgtrsIsHuN?= =?utf-8?q?4rDJJ4ibRmt4ZkIech/5EGYSm2cwgvgzAGlBRIzJrLaj8OyixZ85jRxCgizasJWcA?= =?utf-8?q?YobX5fxIiDgofIiinjPAdvW0E+Mru2wuxsil1hAtmR/YfQ6y7kuChO256zPfNMljh?= =?utf-8?q?k80DFZKukmHByu4x12BIf+bw6kxOmImjrQGPAdWUdQpDX4EZ55L1LyUBs+cS8iIab?= =?utf-8?q?AJkYJwdEo3M1xi8TO+omIREURN7RM+pQI9YwqA89r4DGBy0Sdu7vK/Tmafr0r3MhZ?= =?utf-8?q?BQTHNm3x6pqzGdzqtAvRxVYJtVNq/kq8yJV8STcUOMZphXCN1zQQE0AOftMSLE9cy?= =?utf-8?q?U/v4RPryZgYC9I0P6IYIZaQ0iDtSNQqkAb2lLHno1ZFEcP1d2pzZw60YW3qiLqOIG?= =?utf-8?q?mifzQ1eRq/0BPNxg/WAVfGpyTldFOZKsJq+j8zMRVZn67TEEFEsGIypj1w3Jk/1nN?= =?utf-8?q?c6OafZf8rGUYWQ0F6tRnCCQqU62j7nWOg+Hh6SkElDuEPYih/rs+gzojAzboQuUUW?= =?utf-8?q?xnzvp7Pgy/cnBaBjXuujo055g9cueGf8KVHyCSYjZB/SPRfoMGLAbD2UYHHD+242N?= =?utf-8?q?rAlk0RxNEaiL41D26CCczQBoiknY7DFfZSzlsjQewcpwbJPFDxn6fICy5XeApYUra?= =?utf-8?q?qX2E2yRyrMaJvQ110/4TQpa4OBCerAuzzsw=3D=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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?2z8rE5ZUCnEbOhC/eA344YBV+/B5?= =?utf-8?q?CFKKQ5cxuKU7As1e4jzBRmUQDD5jY91zOnghYpaPcasRl/8C5dVPsFeLHFnMlEpcw?= =?utf-8?q?MeGPKvwNuDzCrC4rGN6GlEasRq8HRnBRTDacvibrIE0IgytNHdqwllEoNJgd4gbGc?= =?utf-8?q?dGEywnWtoqPyurJ7NoIEsWQmR9nlf1jndOqdDqfxeFeEOYpR3C6ltyuR+cg4pDqRr?= =?utf-8?q?AwThH4Bj1sfLhGPXRFJVPeAV6wwSoZsIrRUYyykd0QkmOgJo2o+T0fDzKKi6PiXv7?= =?utf-8?q?qiUG/rkDE2kRlC3UrU+QQEUd4PFCLKpfQldvWJKzP9+BKRtlM4oMdfIkPXY97XozX?= =?utf-8?q?s22wPhashHemYtLXokSB/ZMKXq5yWXGuoujxw7gQ+Me/FKnce0vpzto0yiDzsNWCI?= =?utf-8?q?zeWWIqJSOfWKtBxbB87R0C+0URTyRyFtXRaPZVDKkyQgj6fEUdfZNDwczmfhmQWwT?= =?utf-8?q?HsmcA6Rsh4hedqO2UX9DzwAbaVv7zeEf8OgwX3dy4irn60vhA2fYU3eqIJwMEWoGN?= =?utf-8?q?jQQjnGeZwAPRj3hFi4eYvbD4uZJ0nIjIRyEKXnC73tuuWcq/tDpslzOhCyD6u30q7?= =?utf-8?q?H65zFs3CXOS+KCfcEAeOXVlWm7s7Z341NDEaN/TQnJANw6+i43NzqZg5ISb5dffUR?= =?utf-8?q?fd/iqVAFR8jYjLoU4MuW69JF7WJunrK53JMkV/Z1NNdnJG8UdrwL1JBu3OWR3sv1e?= =?utf-8?q?ZvONQbOP31SBJMOuJGFNbMZI1AKLB1pX3NnZFOSJCn5t/Q5yjlAurT9IzRILOFynY?= =?utf-8?q?vA5SWPB8dfWR79zt55VvgvvpC5RgKK+kk9TG3eeJN6CVBUgZ/Lb/cwRm6vaD4bfE5?= =?utf-8?q?rKg9DPShrUlPi6gayEVe/yoc+RiGjB72u6Uo/p5pn/w992ziw+7SWvGwFiImqViR4?= =?utf-8?q?5lfImKnRcKtXISfnJ9Ik9cgBtsyqzCajMHQL+xSyADT9pknSOcKNGdoYCDWNoplMG?= =?utf-8?q?d7qBB5PfpJj7kxLL4aNSTLAOF6DMyPTz2Dkj7XfCbjf4+G471m6rgBIstan8vJf92?= =?utf-8?q?jdtH3kRQq+0aPRcfterkg6T/PEk9CLDJ7+YdJ1cI689JoN8MV3hSJTFR2IeP99HAM?= =?utf-8?q?9AZKgM/EjZPnQZqYohhFYpae+ed65nvI8j5441hPomOLgPgnG1KGlTvNZAaacvbUE?= =?utf-8?q?XnlqcHpmOyQLPxK064voanKIFABil+fcI+Jd1In0e6fUmWafG6hDUD8uzzUQhXStv?= =?utf-8?q?brtoC//1kmwS4mZIy1Z8BZJ1hKQluXWPkQB/4JnueLWgb8nXAXyb7SIwwrfe0g9/r?= =?utf-8?q?Cc7J50VLaXCNmq2cCuLuABqLhOfuC8ghJ4+nUQhjoxtD6vBGgQYFScLgR6CDv7k4Z?= =?utf-8?q?7aY9XHZa0+GtwyiWvNwOnwnMMKMwrpEGex4TRvXmulGF+Ejbmybf6pZXPn9FRzAEu?= =?utf-8?q?d9RWUu0ABfn1l/QNMdc12j/Af/zHf/BumALxZeINjwy/gcuKyM7yNOCcGQB9X4nNq?= =?utf-8?q?KsWcyowvd8+4RzpJGH8SFKEcqkqx6KAm2hTKzMYc76AYnWvsbvFka6/V5RVc0Vc2a?= =?utf-8?q?xMiHLhSme8GE?= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ff493df-3778-452d-90cf-08dc78a460a3 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:10:57.5746 (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: bjprwqOwHyLGhEVtD93kjXEIUnLySm72aCvyMsALEuSbbENMguCTbKmkqJ+jQROqCx1S/ZEBAsdbTv6YAbTspQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-GUID: vzYNHVfFxlDjciJoXwl4nVQ1g055A6PP X-Proofpoint-ORIG-GUID: vzYNHVfFxlDjciJoXwl4nVQ1g055A6PP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1011 lowpriorityscore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-0064b401.pphosted.com id 44K5PlDO003963 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 ; Mon, 20 May 2024 08:11:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199556 From: Chen Qi musl patches are refreshed to avoid 'patch-fuzz' error. Signed-off-by: Chen Qi --- ..._255.4.bb => systemd-boot-native_255.6.bb} | 0 ...md-boot_255.4.bb => systemd-boot_255.6.bb} | 0 meta/recipes-core/systemd/systemd.inc | 2 +- ...1-missing_type.h-add-comparison_fn_t.patch | 7 +-- ...k-parse_printf_format-implementation.patch | 13 ++--- ...tall-dependency-links-at-install-tim.patch | 9 +-- ...missing.h-check-for-missing-strndupa.patch | 55 +++++++++---------- ...OB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | 14 ++--- ...005-add-missing-FTW_-macros-for-musl.patch | 7 +-- ...06-Use-uintmax_t-for-handling-rlim_t.patch | 11 ++-- ...T_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 11 ++-- ...patible-basename-for-non-glibc-syste.patch | 8 +-- ...implment-systemd-sysv-install-for-OE.patch | 5 +- ...uffering-when-writing-to-oom_score_a.patch | 9 +-- ...compliant-strerror_r-from-GNU-specif.patch | 13 ++--- ...definition-of-prctl_mm_map-structure.patch | 7 +-- ...-not-disable-buffer-in-writing-files.patch | 35 ++++++------ .../0013-Handle-__cpu_mask-usage.patch | 7 +-- .../systemd/0014-Handle-missing-gshadow.patch | 7 +-- ...l.h-Define-MIPS-ABI-defines-for-musl.patch | 11 ++-- ...ass-correct-parameters-to-getdents64.patch | 7 +-- .../0017-Adjust-for-musl-headers.patch | 17 +++--- ...trerror-is-assumed-to-be-GNU-specifi.patch | 9 +-- ...util-Make-STRERROR-portable-for-musl.patch | 7 +-- ...ake-malloc_trim-conditional-on-glibc.patch | 9 +-- ...hared-Do-not-use-malloc_info-on-musl.patch | 7 +-- ...22-avoid-missing-LOCK_EX-declaration.patch | 9 +-- .../{systemd_255.4.bb => systemd_255.6.bb} | 0 28 files changed, 111 insertions(+), 185 deletions(-) rename meta/recipes-core/systemd/{systemd-boot-native_255.4.bb => systemd-boot-native_255.6.bb} (100%) rename meta/recipes-core/systemd/{systemd-boot_255.4.bb => systemd-boot_255.6.bb} (100%) rename meta/recipes-core/systemd/{systemd_255.4.bb => systemd_255.6.bb} (100%) diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.4.bb b/meta/recipes-core/systemd/systemd-boot-native_255.6.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot-native_255.4.bb rename to meta/recipes-core/systemd/systemd-boot-native_255.6.bb diff --git a/meta/recipes-core/systemd/systemd-boot_255.4.bb b/meta/recipes-core/systemd/systemd-boot_255.6.bb similarity index 100% rename from meta/recipes-core/systemd/systemd-boot_255.4.bb rename to meta/recipes-core/systemd/systemd-boot_255.6.bb diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index a35db5091e..8bda47dd38 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" +SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" diff --git a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch index 2aa5dee6b5..49871d16a8 100644 --- a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch +++ b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch @@ -1,7 +1,7 @@ -From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001 +From d4b0bb9c7651017985fdd75469f37c34ce2f2c50 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 13:55:12 +0800 -Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t +Subject: [PATCH] missing_type.h: add comparison_fn_t Make it work with musl where comparison_fn_t and is not provided. @@ -56,6 +56,3 @@ index ae91534198..7f67eea38b 100644 const char * const catalog_file_dirs[] = { "/usr/local/lib/systemd/catalog/", --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch index 900a931632..593d6261e1 100644 --- a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001 +From 776913624aaf696a3b2920b8d7506b3aae042bf1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH 02/22] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -22,10 +22,10 @@ Signed-off-by: Scott Murray create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 7419e2b0b0..01fd3ffc19 100644 +index 187e7b216d..c4694a9ddc 100644 --- a/meson.build +++ b/meson.build -@@ -725,6 +725,7 @@ endif +@@ -727,6 +727,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,7 +34,7 @@ index 7419e2b0b0..01fd3ffc19 100644 'threads.h', 'valgrind/memcheck.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index d7450d8b44..c3e3daf4bd 100644 +index 111253e3a5..bdaa2fc5e4 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -183,6 +183,11 @@ endforeach @@ -429,6 +429,3 @@ index be23b2fe75..69a2eb6404 100644 #define SNDBUF_SIZE (8*1024*1024) --- -2.34.1 - 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/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch index be231cf6b2..4c73c924ef 100644 --- a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,8 +1,8 @@ -From 29a58009a172e369ad7166e16dab2f4945c6b0d2 Mon Sep 17 00:00:00 2001 +From 661a34c3de30d4ff4a2a62c9a0573c6ce55424e4 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 21 Feb 2019 16:23:24 +0800 -Subject: [PATCH 1/2] binfmt: Don't install dependency links at install time - for the binfmt services +Subject: [PATCH] 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. @@ -74,6 +74,3 @@ index 6861c76674..531e9fbd90 100644 + +[Install] +WantedBy=sysinit.target --- -2.34.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 index 5595b5bc23..f09f2114d3 100644 --- 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 @@ -1,7 +1,7 @@ -From 87f1d38f40c5fe9cadf2b2de442473e4e5605788 Mon Sep 17 00:00:00 2001 +From 843c6c94bf6a29eaceeefafa420cd86a32e844d2 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:18:21 +0800 -Subject: [PATCH 03/22] src/basic/missing.h: check for missing strndupa +Subject: [PATCH] src/basic/missing.h: check for missing strndupa include missing.h for definition of strndupa @@ -75,10 +75,10 @@ Signed-off-by: Chen Qi 51 files changed, 62 insertions(+) diff --git a/meson.build b/meson.build -index 01fd3ffc19..61a872b753 100644 +index c4694a9ddc..d376b76afa 100644 --- a/meson.build +++ b/meson.build -@@ -567,6 +567,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] +@@ -569,6 +569,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] endforeach foreach ident : [ @@ -87,7 +87,7 @@ index 01fd3ffc19..61a872b753 100644 ['gettid', '''#include #include '''], diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c -index 5ac9f904a9..99d5122dd7 100644 +index b2032adaa5..ee9201826d 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -20,6 +20,7 @@ @@ -111,7 +111,7 @@ index 18b16ecc0e..d2be79622f 100644 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 d3bf73385f..16b17358ca 100644 +index a97651d7af..09fa601250 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -19,6 +19,7 @@ @@ -123,7 +123,7 @@ index d3bf73385f..16b17358ca 100644 /* 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 1470611a75..9924ec2b9a 100644 +index 7a443005f6..eed69a48ee 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -40,6 +40,7 @@ @@ -251,7 +251,7 @@ index f9014dc560..1d7840a5b5 100644 static clockid_t map_clock_id(clockid_t c) { diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c -index 0c0b4f23c7..68fe5ca509 100644 +index 12dfdf76fa..e66332519a 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -22,6 +22,7 @@ @@ -263,7 +263,7 @@ index 0c0b4f23c7..68fe5ca509 100644 static char **arg_path = NULL; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 4237e694c0..05f9d9d9a9 100644 +index 8a9570fd21..ac4202e5ce 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -25,6 +25,7 @@ @@ -275,7 +275,7 @@ index 4237e694c0..05f9d9d9a9 100644 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 4daa1cefd3..2c77901471 100644 +index 2d05ba7e1d..61a7de0037 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -42,6 +42,7 @@ @@ -287,10 +287,10 @@ index 4daa1cefd3..2c77901471 100644 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 d680a64268..e59f48103e 100644 +index 7bb026af48..a86128e40c 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #include "unit-printf.h" #include "user-util.h" #include "unit.h" @@ -299,7 +299,7 @@ index d680a64268..e59f48103e 100644 int bus_property_get_triggered_unit( sd_bus *bus, diff --git a/src/core/execute.c b/src/core/execute.c -index ef0bf88687..bd3da0c401 100644 +index 8dbdfcf369..531bec4c92 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -72,6 +72,7 @@ @@ -323,7 +323,7 @@ index b8e3f7aadd..8ce8ca68d8 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/core/service.c b/src/core/service.c -index b9eb40c555..268fe7573b 100644 +index 42fffbbd67..80a8d05a19 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -45,6 +45,7 @@ @@ -359,7 +359,7 @@ index 016f3baa7f..b1def81313 100644 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 da0f20d3ce..f22ce41908 100644 +index 2d380bc7a7..d3f5612728 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -27,6 +27,7 @@ @@ -371,7 +371,7 @@ index da0f20d3ce..f22ce41908 100644 #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 7f3dcd56a4..41b7cbaaf1 100644 +index 87e2f28841..58275f41f1 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -77,6 +77,7 @@ @@ -383,7 +383,7 @@ index 7f3dcd56a4..41b7cbaaf1 100644 #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 ff0228081f..9066fcb133 100644 +index ab8b06896d..43f9131205 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -19,6 +19,7 @@ @@ -407,7 +407,7 @@ index c25c40ff37..57a5da704f 100644 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 3c59d0d615..746922d46f 100644 +index 5ade8e99aa..7553cf319d 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -29,6 +29,7 @@ @@ -419,7 +419,7 @@ index 3c59d0d615..746922d46f 100644 #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 4a0259f8bb..aaa90d2223 100644 +index 8befc97460..6ee4d4f595 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -46,6 +46,7 @@ @@ -443,7 +443,7 @@ index d988588de0..458df8df9a 100644 #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 6b9ff0a4ed..4a5027ad0f 100644 +index 7a1dd2569f..d187baad47 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -44,6 +44,7 @@ @@ -455,7 +455,7 @@ index 6b9ff0a4ed..4a5027ad0f 100644 #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c -index b8da266e27..4bb8dd9496 100644 +index bf45974ca5..2cb7e930c0 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -35,6 +35,7 @@ @@ -503,10 +503,10 @@ index c64e79bdff..eda26b0b9a 100644 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 d4b448a627..bb26623565 100644 +index 3b2a37912f..835a3fdeaa 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c -@@ -40,6 +40,7 @@ +@@ -42,6 +42,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "user-util.h" @@ -551,7 +551,7 @@ index 8b462b5627..183ce1c18e 100644 struct CGroupInfo { char *cgroup_path; diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c -index 4ee9706847..30c8084847 100644 +index 50de98941f..d47beccb0b 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -50,6 +50,7 @@ @@ -599,7 +599,7 @@ index 83e9834bbf..74eaae6f5e 100644 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 a5d04003bd..10392c132d 100644 +index 0a31be382f..92d629e7e0 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -683,7 +683,7 @@ index ed22c8b679..19ebe20237 100644 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 5f12002394..febe345b4c 100644 +index c242549654..e5b8df5c2d 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -41,6 +41,7 @@ @@ -694,6 +694,3 @@ index 5f12002394..febe345b4c 100644 #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) --- -2.34.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/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 15877bea88..15d25e9f19 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/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,8 +1,7 @@ -From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001 +From 2903e42c7cd727a2374d21b78950308de792ebe8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 14:56:21 +0800 -Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not - defined +Subject: [PATCH] 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. @@ -115,7 +114,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 230ec09b97..2cc5f391d7 100644 +index 6a1c7725a1..138b3ac561 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -73,6 +73,12 @@ @@ -131,7 +130,7 @@ index 230ec09b97..2cc5f391d7 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 -@@ -2434,7 +2440,9 @@ finish: +@@ -2426,7 +2432,9 @@ finish: static int glob_item(Context *c, Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +140,7 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; -@@ -2461,7 +2469,9 @@ static int glob_item_recursively( +@@ -2453,7 +2461,9 @@ static int glob_item_recursively( fdaction_t action) { _cleanup_globfree_ glob_t g = { @@ -151,6 +150,3 @@ index 230ec09b97..2cc5f391d7 100644 }; int r = 0, k; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch index a1dfca22cd..deb0e83b6d 100644 --- a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch @@ -1,7 +1,7 @@ -From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001 +From dcd9639657e4122b7665b01a067219f990ee3ace Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:00:06 +0800 -Subject: [PATCH 05/22] add missing FTW_ macros for musl +Subject: [PATCH] add missing FTW_ macros for musl This is to avoid build failures like below for musl. @@ -39,6 +39,3 @@ index 8684d064ec..70fc2b5376 100644 static char **list_nftw = NULL; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch index 4be14b72ec..f02675604d 100644 --- a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,7 +1,7 @@ -From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001 +From c58933386caa8e45b5e814ec4ff210b18ab401da Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:12:41 +0800 -Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t +Subject: [PATCH] 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 @@ -86,10 +86,10 @@ index c1f0b2b974..61c5412582 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index bd3da0c401..df1870fd2f 100644 +index 531bec4c92..602a95f674 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -1041,9 +1041,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,6 +101,3 @@ index bd3da0c401..df1870fd2f 100644 } if (c->ioprio_set) { --- -2.34.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/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 8d6084239e..1d4ce33712 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,7 +1,7 @@ -From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001 +From 5bf8235bc5c802908aa5d95740350927d87e953a Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 10 Oct 2017 14:33:30 -0700 -Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() +Subject: [PATCH] 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 1023ab73ca..c78ff6f27f 100644 +index 6a1e2e76d1..c3f7235e09 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]); @@ -64,7 +64,7 @@ index 1023ab73ca..c78ff6f27f 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 569ef466c3..7ae921a113 100644 +index a4e2dae245..67aa8ea1f2 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { @@ -94,6 +94,3 @@ index 569ef466c3..7ae921a113 100644 continue; } --- -2.34.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/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch index c1a8bb19fe..1ab23553f9 100644 --- a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,8 +1,7 @@ -From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001 +From d98f6bd4d8acdc4c1a5bff4c699f5004a6ebccce Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 May 2018 08:36:44 -0700 -Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc - systems +Subject: [PATCH] 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 @@ -29,6 +28,3 @@ index b6d8be3083..0a29036c4c 100644 static inline char* strstr_ptr(const char *haystack, const char *needle) { if (!haystack || !needle) return NULL; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch index acff18dc43..8b833ce073 100644 --- a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch +++ b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch @@ -1,4 +1,4 @@ -From 5712d56f1cd654d2e5d2e9117ff77fe4c299f76b Mon Sep 17 00:00:00 2001 +From 5f89867f2b15f9bd411564d04e660cdeedd370ca 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 @@ -38,6 +38,3 @@ index cb58d8243b..000bdf6165 100755 ;; *) usage ;; --- -2.39.2 - 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/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 3ff0177ae3..98ab397eff 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/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,7 +1,7 @@ -From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001 +From f3943f58f3c8a9d20dcada56eb5ca5f673a49b3d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 4 Jul 2018 15:00:44 +0800 -Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj +Subject: [PATCH] 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,7 +24,7 @@ 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 201c5596ae..ea51595b6c 100644 +index 4492e7ded2..b61a2aba74 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) { @@ -36,6 +36,3 @@ index 201c5596ae..ea51595b6c 100644 } int get_oom_score_adjust(int *ret) { --- -2.34.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/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index cf59ac7d06..e1ffe4ddb5 100644 --- a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,7 +1,7 @@ -From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001 +From 5305c5f18236a9d7f2e633ea6ad317e09e8f29d5 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 10 Jul 2018 15:40:17 +0800 -Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi +Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi strerror_r XSI-compliant strerror_r and GNU-specifi strerror_r are different. @@ -24,10 +24,10 @@ Signed-off-by: Chen Qi 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 77b2e1a0fd..fdba0e0142 100644 +index f415797700..a5c6e9a3bd 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { +@@ -410,7 +410,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0; @@ -40,7 +40,7 @@ index 77b2e1a0fd..fdba0e0142 100644 if (errno == ERANGE || strlen(x) >= k - 1) { free(m); k *= 2; -@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static +@@ -595,8 +600,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static if (e && e->message) return e->message; @@ -71,6 +71,3 @@ index 69a2eb6404..1561859650 100644 if (errno == 0) { char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch index e481b2e2e4..3075f9d003 100644 --- a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,7 +1,7 @@ -From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001 +From c866c8652f06af4cd0b9bd7eedc606449f432b95 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 25 Feb 2019 15:44:54 +0800 -Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure +Subject: [PATCH] avoid redefinition of prctl_mm_map structure Fix the following compile failure: error: redefinition of 'struct prctl_mm_map' @@ -27,6 +27,3 @@ index 7d9e395c92..88c2d7dfac 100644 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ #ifndef PR_CAP_AMBIENT --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077e..0fec84724d 100644 --- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch @@ -1,7 +1,7 @@ -From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001 +From 8464b845e6df1be303e09274c13e653072701671 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Mar 2019 15:22:15 +0800 -Subject: [PATCH 12/22] do not disable buffer in writing files +Subject: [PATCH] do not disable buffer in writing files Do not disable buffer in writing files, otherwise we get failure at boot for musl like below. @@ -201,7 +201,7 @@ index 61ac4df1a6..ea18970196 100644 return r; diff --git a/src/core/main.c b/src/core/main.c -index 3f71cc0947..0e5aec3e9e 100644 +index 1c0030a75f..7108a87d46 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { @@ -253,7 +253,7 @@ index 066483e342..5f92dd7064 100644 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 2fbc619a34..09d9591e37 100644 +index 01e66b4658..f3ea82ca1b 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, @@ -279,10 +279,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 6ab604d3dc..bbec6b686c 100644 +index 0600f3e014..ea369c32b2 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { +@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -291,7 +291,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -4141,7 +4141,7 @@ static int setup_uid_map( +@@ -4143,7 +4143,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); @@ -300,7 +300,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); -@@ -4151,7 +4151,7 @@ static int setup_uid_map( +@@ -4153,7 +4153,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); @@ -367,10 +367,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 3eb13d48f6..d09b901be1 100644 +index c3991cfa4c..7d522d8d1f 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c -@@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -501,7 +501,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 +379,7 @@ index 3eb13d48f6..d09b901be1 100644 if (r == -ENOENT) { if (offset != 0) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), -@@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -517,7 +517,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,7 +402,7 @@ index 1f88e724d0..feb18b320a 100644 return r; diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c -index 4c1a968718..6faf6806a5 100644 +index 99ccefb227..e4975018ab 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { @@ -412,10 +412,10 @@ index 4c1a968718..6faf6806a5 100644 - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); if (r < 0) - return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); + 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 21af3e9e52..6d4b84b5d5 100644 +index 21062b24e0..262dd71d72 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { @@ -437,7 +437,7 @@ index 21af3e9e52..6d4b84b5d5 100644 log_debug("Using sleep disk mode '%s'.", *mode); return 0; diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c -index ae63baaf79..82eeca479a 100644 +index 16d4fb07d4..aca7506463 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { @@ -533,7 +533,7 @@ index ae63baaf79..82eeca479a 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 febe345b4c..a90b610ba1 100644 +index e5b8df5c2d..63ca15628c 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( @@ -557,6 +557,3 @@ index 4d82c65f0a..3a3d861b83 100644 if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch index 43f75373a6..6d7e002d61 100644 --- a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch +++ b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch @@ -1,7 +1,7 @@ -From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001 +From f6b69f28657c09b1181552d85e52ced0e01182e3 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH 13/22] Handle __cpu_mask usage +Subject: [PATCH] Handle __cpu_mask usage Fixes errors: @@ -55,6 +55,3 @@ index ea0c58770e..b65c0bd370 100644 /* Print information about various types. Useful when diagnosing * gcc diagnostics on an unfamiliar architecture. */ --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch index a751e1ba6f..40b60399aa 100644 --- a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch @@ -1,7 +1,7 @@ -From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001 +From 5442d8ddb285d33b459aefc76962640afd131280 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 10 Mar 2020 11:05:20 +0000 -Subject: [PATCH 14/22] Handle missing gshadow +Subject: [PATCH] Handle missing gshadow gshadow usage is now present in the userdb code. Mask all uses of it to allow compilation on musl @@ -168,6 +168,3 @@ index f60d48ace4..e878199a28 100644 if (r < 0) return r; --- -2.34.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/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index e112766a9b..51f0b048fa 100644 --- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -1,7 +1,7 @@ -From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001 +From 863dd6f502d53a4a2644e031eee2e8dfa3fd05aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 12 Apr 2021 23:44:53 -0700 -Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl +Subject: [PATCH] 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 @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 2 files changed, 7 insertions(+) diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index d795efd8f2..d6729d3c1d 100644 +index 86280771c4..20d05db506 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -20,6 +20,12 @@ @@ -33,7 +33,7 @@ index d795efd8f2..d6729d3c1d 100644 #include "missing_keyctl.h" #include "missing_stat.h" diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 7ae921a113..0ef9d1fd39 100644 +index 67aa8ea1f2..8d9824495e 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -20,6 +20,7 @@ @@ -44,6 +44,3 @@ index 7ae921a113..0ef9d1fd39 100644 typedef struct BaseFilesystem { const char *dir; /* directory or symlink to create */ --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch index 0be817e62d..66b8f66806 100644 --- a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch +++ b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch @@ -1,7 +1,7 @@ -From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001 +From 01de9e5a6e4ad2f361d3eb4d9839c7afd91cc677 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 15:15:11 -0800 -Subject: [PATCH 16/22] pass correct parameters to getdents64 +Subject: [PATCH] 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] @@ -32,6 +32,3 @@ index 5e98b7a5d8..aef065047b 100644 if (n < 0) return -errno; if (n == 0) --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch index 4176522a1c..f86b8c889c 100644 --- a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch +++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch @@ -1,7 +1,7 @@ -From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001 +From a45cf93772ac5055665cc55454509747b9c68ad2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 21 Jan 2022 22:19:37 -0800 -Subject: [PATCH 17/22] Adjust for musl headers +Subject: [PATCH] Adjust for musl headers Upstream-Status: Inappropriate [musl specific] @@ -425,7 +425,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 efbae6d868..1ea2151d50 100644 +index 49c452da7c..98aad1f3cd 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -3,7 +3,7 @@ @@ -451,7 +451,7 @@ 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 ee5f0f2c0a..ea5269a2de 100644 +index 4ef1be4bad..e5aa53604d 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -3,7 +3,7 @@ @@ -464,7 +464,7 @@ index ee5f0f2c0a..ea5269a2de 100644 #include #include diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index ab9eeb13a5..dd96fe7483 100644 +index 840ccb158d..9f2e85e32f 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -6,7 +6,7 @@ @@ -477,7 +477,7 @@ index ab9eeb13a5..dd96fe7483 100644 #include "sd-ndisc.h" diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index 7218d799fc..30d5574eae 100644 +index eb502ae2cf..5b25ee4523 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1,9 +1,5 @@ @@ -502,7 +502,7 @@ index 7218d799fc..30d5574eae 100644 _cleanup_(route_freep) Route *route = NULL; diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c -index 2298f9ea3a..7d5f87de53 100644 +index 011ea1fe6e..59dfe733eb 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -2,7 +2,7 @@ @@ -567,6 +567,3 @@ index f528a46b8e..830318cda5 100644 #include #include --- -2.34.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/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch index 75f6b9094a..67388e6807 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/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch @@ -1,8 +1,8 @@ -From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001 +From 20dfb0b5e7113c2e7f82c01488b419dffe8714ab Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Nov 2022 13:31:34 -0800 -Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU - specific version mark it so +Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific + version mark it so Upstream-Status: Inappropriate [Upstream systemd only supports glibc] @@ -47,6 +47,3 @@ index 376d532281..967cfd4d67 100644 TEST(PROTECT_ERRNO) { errno = 12; --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch index e038b73678..36d468959a 100644 --- a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch @@ -1,7 +1,7 @@ -From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001 +From 32371040c2aa649e23c3b0f2c5ee27995a16526a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Jan 2023 23:39:46 -0800 -Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl +Subject: [PATCH] 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 @@ -37,6 +37,3 @@ 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.34.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/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch index b83fffe793..f860b5f542 100644 --- a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch +++ b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch @@ -1,7 +1,7 @@ -From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001 +From 751fb8c9a05115f5329cfa25e69afe7657124c20 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:06:27 -0700 -Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc +Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc musl does not have this API @@ -12,7 +12,7 @@ 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 288798a0dc..6419a7f216 100644 +index b6899df192..0c03287004 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( @@ -34,6 +34,3 @@ index 288798a0dc..6419a7f216 100644 usec_t after_timestamp = now(CLOCK_MONOTONIC); if (r > 0) --- -2.34.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/0021-shared-Do-not-use-malloc_info-on-musl.patch index 7eff069bb7..ece9873bbc 100644 --- a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch +++ b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch @@ -1,7 +1,7 @@ -From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001 +From 4fe2a8b1aab7297beac50f6ce46f3df4169de218 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 2 Aug 2023 12:20:40 -0700 -Subject: [PATCH 21/22] shared: Do not use malloc_info on musl +Subject: [PATCH] shared: Do not use malloc_info on musl Upstream-Status: Inappropriate [musl-specific] Signed-off-by: Khem Raj @@ -52,6 +52,3 @@ index 8e70e365dd..9e782caec9 100644 (void) memstream_dump(LOG_INFO, &m); break; } --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch index 24f3bf74a0..f517392e58 100644 --- a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch @@ -1,7 +1,7 @@ -From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 +From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH 22/22] avoid missing LOCK_EX declaration +Subject: [PATCH] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration. @@ -15,7 +15,7 @@ Signed-off-by: Chen Qi 2 files changed, 2 insertions(+) diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index 70d963e269..7084811439 100644 +index fe14ceeb31..521e7b87ff 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -4,6 +4,7 @@ @@ -38,6 +38,3 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); --- -2.34.1 - diff --git a/meta/recipes-core/systemd/systemd_255.4.bb b/meta/recipes-core/systemd/systemd_255.6.bb similarity index 100% rename from meta/recipes-core/systemd/systemd_255.4.bb rename to meta/recipes-core/systemd/systemd_255.6.bb From patchwork Mon May 20 08:10:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43840 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 1DA65C25B78 for ; Mon, 20 May 2024 08:11:04 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.56009.1716192662221831005 for ; Mon, 20 May 2024 01:11: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.166.238, mailfrom: prvs=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K5PlDP003963 for ; Mon, 20 May 2024 01:11:02 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y7bx6rq1j-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 01:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BbpWu4gFhdHS4OL3maI7+KFQmEa+k45uAvrykuxVFmRGksFFKovGau65kH2TYUmeFU1rrvQfpc+k2P43Bd0pZf2uruQjySg0YzMCOmzrth5r04JnsymWYJKnaUwNDYZrSbIUYWExbP1LPIbJDIS+UppPSl/fj2AA4xh3WMUjb718c9HCRW7rIxAYawENbjf8d1FFgg6xerjUfs5r4DClfBXBgQe1dslVRk9v64/H1+rT8fT8OB2x/g4lI5msYcvGVxYQyTEqEpXSmGlpE/3Z18OsCY/EnIhzB8pLSRSHeF9jAFLhf+hzCXehx2yzHNISNMhvgQjaarsJWxxOIQ9dWQ== 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=X+5T/SYaip2w6PEhkuUMpKbXbUxvqSiIEwaRruGPj+0=; b=MwaGekw+PIi/aTO4wPUCVeTHYFbgDQpg7dYnAtWsNP42Mx11TioZ+aENE2WV5OLY8XdxwAFTJD5CePD2WF08ap+tM3T0mKcN1e8of80SWmagUn5YCASFVf3wrdA5+HUJNsY5MBFJXsfKO3hdsflIcAimv5UkuBzXaLXDZcOkUy1VQJy+QXoto4dey+ObVRpJbdLq3RUsPZMfLix8pVqea6QKsMuBN5HGrz332ybYX0WizvlROajhqBn7Bt/KCIblXmKCmXOej7r2LTkjnuieUtwrM/Wxyf1A4I2KCKjYzHIzY9y61ok4Dew/GVZSfb2dYl+FrLE8gPgEW6qZJGhaww== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:10:59 +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.7544.052; Mon, 20 May 2024 08:10:59 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 2/6] util-linux/util-linux-libuuid: upgrade from 2.39.3 to 2.40.1 Date: Mon, 20 May 2024 16:10:36 +0800 Message-Id: <20240520081040.2380736-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520081040.2380736-1-Qi.Chen@windriver.com> References: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: 379ba0b3-d7ac-4ef0-9cc5-08dc78a461a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: CLvD3VNHT3ZNOr4NiYvs4weyuePkVEr4iahxluAh6EtPjiQCAtIQlPoCK1fEQaST453M2cRauzCsOHwDq2m427j76SEFt3WFLV+PCxZl14fe4WBphYojod1IOywbnunZFxR+geuIvlYlAv5ZkTHusIdkYiK1Z/EJorvNcsS6W0FloK6MrQeLJ4HxpFgVFLpmsXxla/u8RIIgfPBB1YuUd1gjTmPjRj/YRUpFF/3zceUaOK6coHUm41BfbV8h5ueT2Y40GIxYwqphJ1A573uyQaRnr466DhSQxwNT5IJzmU+SgRnQ8xyztnBVKNiYHnhSOcS1IXJIFGhtr0KtoccjrYmcNGvyojdFbMKa5KYL7qSZZUE0ybGh3CfJi3sGlqzoHoIF0ZKX9PPymAMVU5ad2U7jYgtFKFyae/UzDkrpa21ht2dMbjBe/0OvuSTw/s42wFNwuWX1kzAsdLG0feLFwvO7VPXAYpbCNTCoYkmKHaSxCj14S3DXgjyLEniJW0bz5wsCMHVUJaV6GLEObzsnGzmxLYT1gMhF0lqTi8ejyDaMBlQO2Fi+ZkjZi4al1MAsd7d03m2/nZIeH9FdOSa0XsYV413U61zGY45bzKU5WlghMEWAlnDg39+VcBpr/d1azJa8uYIwdaHr6fGILafG5TLJXm+6S31RNunNipb7PSbOmSBF1++t8qtwyf6odv1LSqGL3dXGNwer/Nx+zoCdyMS0j98dixc25nEjL4n5iumvGU7frbmxTJ8A8ez0Q8cJITl/WQG6d7BWIbd/ksOVuHkdxZbY/jG2zBzaavelZ+GDxtEIYWj7l2XhOswtQ8KAL78s2/8qe2TK/pxHDP8XyLDVLyPrtkdhvEkmlQVywgrePrXLf8OhSLLwX3cAlQNkXyrMLIBstSJj58/u48vlFSnjZcgEgiLosjUJ/VXaFBiCfPnfVM6cLLGUo+93mDeDpwXS7gOHjxvlpqbD5hZop9VpDXjLBnC3HGe8MfIhYqQFuX6NLiJpPDOk4ieo7okiqNylce1LCGwxqZE1zQ1kso5Mx1uCyxLeky7LJ9/CDcAJwu1fanYNnmZ2e3K5z3MZlDa43sOblen39RcjWo7rSop/YWQDeaDfNv3vwURIBq9lboSJ654WnJ073S4dHOyEdcT+PpiAMx4gqXLJnKq5lyDIHzeG1ggRj+lMAN176zqZKFvm6YVr9k4zC9cCdWktFNT7ck1TM793kSYGrEexGJ+Jgq3tGfsvw7YDqUDrClSCsmrEtd1U0lpQvPCB6H85GyhYi9q4udMJYLwCZ00EDA== 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JAAUL5L+zBgnJFNzbt3hlwquOcLXPiURqVoaslxMFHaL+Gkt6u9+08/+VNzMGN0/ldKHpnpdwzSh9AqnZB8wI2aJknvATvQxbaN7qA5JVS318rZsoULbMqQZ5GbRl9+gu8r1/yiyFL+4pwRjmG7YfZC9u6bcVPnJcii1sm1iHSnyNHaJm+b5O9EBnCNkBheGi6cDScLR8+7yqiQXpLnYV96U1Too5YosGGyX4wP9W9j0yDmazj4s/ga4M/sIco5VxizpX4PMEhLeqSf5w91Ui4LZjq3ERElMzkU2MPwi26OZxMZz+JQlh7mozDmXD5rN64cnH5htUj3XPWDcdyJQIzCnkvzbKY+xfeeZG85DxHR90Wcli9fnTIyb4wzBomixwo4vHfUHCKUgPLsaEgie0bDzmVPGZbrU+IuXQn4Zk6qsrOmXSbGEgWTyMlcTzQEbWUtvy2ArDE+09gbgKZ79UAuH9Tu6jba/BLXXa5s557m6Y0/jVeUL63E983/Somu6FiRONdL/kMbgh6EyUB+Dk2fUFfrqVEkQWq+UJezVln6lBmkFld/cUI2zLGhyYUsnEM7DpEUXdYx9OVmiVbGne2Gvmog1DtnkldHd5v2fpg8rdVGmHxLsKM72qDOz5Ek8Xm9E4It3AS5I/Yqj172QxTpRLZ9+Ni01uEaDYrrMzNbXe86/QDy67wWvJzO0muZDKTuEiX5ML8gGdyWp0YjhZ/vSFK9kMxeC2AQuHUtaiXzzssIW9Md46lws+Is5xkNuCPVaPbuPsPdIfuU221TTkqXoHiTuKaAri4MEDjGQbWdE5uTRp/3Geg42J1WmbL4mZCW9pUSYNU5srNG9j1ZaavuB2ndjLidTOkryqd+iUq1i/cNEc6vZYKN97QgljyaoG62CS0p83/38nevzWGRLjg4hfzYa64IZI0ENHEoaEHZqaFIDnNw0v/2gj1r0dREtlf46ZXVgAEtbfBLvaYx0V7NZMLg/keQGOgrmZ7ClxOgREtzqVCwmXqnl6yxVposfCmdFPkUwLiQSFFHCfUDwCJyQubczqLX7p9MrBQ2NULMvjSyshEx7NGMOZB08GE7iETRPSWaS6I6pJyhxSx+af153w7XQ8rLf5N34QA4WG8qMH77AdwNPst332KprmThQ6jTKA+FUOq9xV3Y7DI/rr6dMDmBuZhDnk4Vijsq6YuOEKo+14sKsegFUDN//7m2JWSAOfDviMtu2sU/AwoQ7FcCLLSRTJC2lpe4PvWvrS7R4o00akE9siU7hqi8gaw4CfB5IQH0sPQw1BXSk3oqtmRwFBG3EeGsRQojSq7d4T6NcraEth1Nn6MlvEiCaOnbqjwh/+Tk9N0h1kT9aIVmnaWETPm7QC0T8Aru+upa70oEp5t3pKNVUROR2q+9Yc1a127u/7dAKbnxQIZ09dLMKVEi3pBu1OZVp3f9Wvs4uO0U/hLwXSxq0YI74v5Ov/Wv2CS+UzxDS4ke6GpCWfVBCX9wLZQU88LNxnaTTx5j0Yu5yfR2Cdc0TFM/RFnYQShEuX0XoE9mC/QiePrbCib9YzY9aKNgB5gErE9yf92X8Ucu6dm5aId9NW0tJUqQyh4UQ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 379ba0b3-d7ac-4ef0-9cc5-08dc78a461a1 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:10:59.0353 (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: CWuF/zVjUnMfWRPSumbN6yUsw2f5V+cTxJ566Y8ftMUH1cE2wJzSP990+crKmQy071o0dFB49NiMt6oPYwBmmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-GUID: XfH-ELufBB5KTPlfGDGlqtWnsFPrPaYG X-Proofpoint-ORIG-GUID: XfH-ELufBB5KTPlfGDGlqtWnsFPrPaYG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 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 ; Mon, 20 May 2024 08:11:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199557 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. 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} | 3 +- 9 files changed, 18 insertions(+), 128 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} (99%) 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 99% 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..eceb0495a7 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}'" From patchwork Mon May 20 08:10:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43842 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 2A691C25B77 for ; Mon, 20 May 2024 08:11:04 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.56010.1716192662583797550 for ; Mon, 20 May 2024 01:11: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.166.238, mailfrom: prvs=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K5PlDQ003963 for ; Mon, 20 May 2024 01:11:02 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y7bx6rq1j-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 01:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EsnCSGLuH+lVjy13uVAiNKj484bCIPNvN+z7Y1frrfS9GuA4LtOiwKbrd+oS8VA8KzBbEalFJuZR0aSIpJ0XDsV+TPwIP2J8Kz0EApDfgvkIPEwwyIBbK1w7tHfJqbRLSFZYqJoohuRwbI3y0U6o28IzvcrKSSnhuHPVnAZ1G8twv2i6dvdI/QGsPcjPfAjEYGZlCgaSv1W7rmOMiazz7MPHS+vcr1101ZplsmAi6EmuXmcj+fKcxa9UqrNVIq0fzKDLcptY28Q8sBJsza/dRyCRhnUcNzcRiYFQ+01qVePBigIy3k+ThuNgHUZEg7yVfTd3hXgWIEzmkIywziRzLg== 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=YCPKQZJuE4ebdZYMiEO+KfSpg0KLBkwR1C82ed5YbA4=; b=OZRBhNG6uy2rC7veEuoTno3uwNaDea92zAEcmwvdsbbP6t+TVrCE2+Jbo8ChyHOzQEkw9BDuLNEMcZMPc28VbbB9KQ0yPQThHBWnjyDC95Q3NW0gdtTzuumTtjJWTxFypGLlni2wdHXLfP2iLlk5FTMa99SUbkojKTItip4rlnG+C6tp82ug6LC/M7v5wutYNMHZEJtyAseoyNG3g8Lt04XxdefBZe9/k9STorrxnk52YsrGAEfH2uj+V8X7HYEVTJDwI4xXmqccQXfbc3PCLzcB2aJLMHYaVtyoH+VvQgG3RdkbL/hN/oOZrh5GwD2nEY+SmDmTDNxOXY4p7/6+cw== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:11:00 +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.7544.052; Mon, 20 May 2024 08:11:00 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 3/6] pciutils: upgrade from 3.11.1 to 3.12.0 Date: Mon, 20 May 2024 16:10:37 +0800 Message-Id: <20240520081040.2380736-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520081040.2380736-1-Qi.Chen@windriver.com> References: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: b3f11694-ffc2-4721-d877-08dc78a4627d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: oMgLHQWXAFyJEWSJpBtrUmclfe8eVGcrr0GN4uxG35PydjvlhcurBa4IAXR3b+PGkjyOza1TQWt0AZ0MFY3RkhgJzq8yvVpOgVtw1TfGCZvxEFU2m0wT11qSqGMU9bTZA6ksrUUxVhl3vXEwurxy9eK22soKysVFcAhqseefKS6tX36bAZnVC0NzsNMl8U83gsQAHodgHQuSzs3HVVoPCvxawsg2IccOUueinEPVh6vKzGLSqSf7Gj2UIWO3hIp44zZUcOglPozJ/RWpu+Qh1vcd9oiRHEj24oLZvg4pD+XSR7mlWVnf7FyIYb8jKDfq76WipoYxAfiesT02PwfhYom1hUR4JTADVvAfHdO4Nj0zKNQI96eAo+7/FwfFsZgf+oPdWYbN9G5QdTWnC33OcdYmZS6ED2Gg9STcm3W+ajws+sjGTyqM4ock/wYX5JbbfgBHKME5RW12r7fCdZMrmLp+TFXHcksX3UmFa1uPfdNH+s6I/TN1FVj5GQUO2+RcTtmLdFvDVeessaxkCbp0W9CQStMB7OZ6tsAk+6BrmeBL71O+y8xjbuYXPJ1BQNxqepfnlXb271kP4saXzklpvbSU4JNFbn0smAdzbvwJrDFsyaCs2zoIrDXwltjzmOSZUHTMAt7oHk8rXDmPVmbE8jli8A3g+VsZClTHfkq0VK7c9kZfzDTzJx4VFsCfmpuGSetREVS9V359Qv1rICnj3MTuECs+u+0jfZvVlgEesQcUadYnar3uMIy/rK7nfF2L5NSRXHJ7AdQXeLbnN/Tm20tK+9qnGnNYZhyvk8JSAEpp14pmQzFaJkbUPhccu/M93dPC5YEGBZjEsswhqVZBwJ5BzC+shu7OT7DkmyElgT9JmtXU1Z2DN+HIZULBCqr51Q/UkOke51oH2WrbAeiVDtGopOuWScPXyLQfSccYhbS8oFZA01QSACnk/gOpe0+PLVsmKxQD07vg5BliCsWySCkBvpxvOVU4yxz9/e/awi1zKO/sAuwWc86BuvvSLAN0YW9lS2cP6aUfDlj7RdCMMW63ZUCcKB7wTddu0fCDNZ+OVebJ8CGsy8AO6LjUIDpKmlKNa2WvnL3h/O99AL1s8hDfCGz/qqbPw5YtrpFjza7eawVq/Pqlq85Um8iPlBO9eqHxGP/eWE966PaqmMVaTVy0Wrx2P1gUkfW/OdlpQabQmDSUhQSRW4yHObR/3aJ13Q8BFHS2WpJZsRXqrYyYcAmpPqBN7mWgb6aSmdoe9mY3karL0+Ibw/eADjqjFjxsBpfLGUqO5+yUlz6U+OUhHEVj4JCj5AAPAbQomRtaEjkbyCnlxVOGDmYUJUShXhKgiNdhsRr++ZzcLmCMMVBjQA== 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aKRMU6upEJlioa+hqxzBf+uBvK98MY5mIjyVgfLpQatvWgTpxhu7P2DJcTOUFBMHj1AdVLjLBe4bJGYS0q6X9pkVyZQegJCPMgVt4yPlVIfTyAp6wFhN/N1yw1dYRubIqX9Ata1PNbpsu50Ru7Ytg/CZ+kQepIXPoikem26Q9EWW/UId0jORIqJHttVZPeZMzwF9m4T1M98BnwYodpsu778HKPdT7eB53URi1I0xAm/RKFwe/yNJIbxgcParrfi6mxEpIhetNaYCNc8NYf5kkhi5w+6qcZ4qS1CFH52E5A+as+TK1Xs8cI40zuERZU9MWFd59dH2IunTar1DkPHf3FAD0XQisKbW79BZH8N86qohO7I2P5L8b0ZCizUQTJb1Y+rftnOc/StNyKqY0TwL79iNTmmOOf8v+COIQXgeFocPU5Icf2HjbKwV+skhAemhgH+Nt45noRoBkI7fEqmGXGJbQYobPPJZSewSxxP6ThdO1dTU9ixM+4u1aFBkVxaEchQYbwHDH/1V8P26u+15R5ZTa0GvpLxut6E/c75MceF8t4QgdPYEv/1EShRqbgbyzV2cG/ntTCVsfiekQgvhLQN38VnnJCw9mqx9e1ehc7b6aDvhsEXKZZ013v6BHPdsJEQwmj6tXjcSlB3wjs2KYmx9JsoJ8ZSxGXylg5UTtDUfUYhkleuMG0b2vworGpqG2sDBBVzz/c1aAIlQZKR7rCDUyV/AjZs2g2S6IzortysFiXNCduYiJiZrn62rb6eXtqf5rjw9ZtIn9mdOn9+gGghJklA0GQIewuaw3+Nj7wLuNea4PU+/StSLUDj6kmo9vtrp8oEfvcKJtz8RaX65zMTpdoohghm9BuFshft/nY+yZHsQyJoNpiNzlVen0MrKuvGX35KMS7c2UgvlsdUrOumonxX1HxIzesAXWyxHbC2F1ceThbOiLEp1xm5i51YEnQKKrGoxyCG+JEjVoRc7nindd5LToSpGZuOE/+iHQ1xTtch3X4mTJ30i7y+EU6MXdd2Hy9SiwQW3xB5xiZxwcTTwRDP1ZguQVeNdYllUUR4Lo2cMYopfcPo184cpY62omnWhzXiiZ+OWG80poZ68sn8AqiyGojA12inJKyHG5Fp/AWFIxUjijL0RGX2ZczaA0oeHHm/GladMiRdPHJM5M+lVwhUyRd0LnHdcv0lB+wxCFAJNSjhIH/6AQESG/gIVj4h1kh0QLeTQSZY+dejHoUEZ6p5hIlMQDfHmMwti1Tgc/F3FfkfXYO37j626t7pY6qdM4lo8ABlzA75J6bRcil9MM2GuadsDr4g8Lf+Y0lVnfN1EoQ93WG84YLsCsQdJbHzyxKMsng9c2T/Itx9BgI0oOHQrxytZo5HZfzVEK6SsHa03ex81NNha367PHkoNANqP4R3zFZB4cBN55WqEzDqCAOqmlPjMSGUZU95qskLqcikelHlL4JCLZ8apTDKVtzlFVDmCTvs32hRb+J6/ffyiC23vDr+6CePVnINZyzg0uqUYlGwjQFZSJdtAKLIVC2qrjktw/Elq/xXCA+roJyWWfyJ8HGtETTh6NGsN0zyM5EgBth1tYYd6QyKq7ELA X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3f11694-ffc2-4721-d877-08dc78a4627d X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:11:00.5227 (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: 4QwmKWD5dbraOEJFdo49fkiXzADfHiFPD1crKBMo1mF97MtixVY0YtEtgbNp8klN7F/C2neRjEd8J4Liy5awrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-GUID: _jxAD4nf4yYjRB8cbsCy7zqP1mnpkS2B X-Proofpoint-ORIG-GUID: _jxAD4nf4yYjRB8cbsCy7zqP1mnpkS2B X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 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 ; Mon, 20 May 2024 08:11:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199558 From: Chen Qi configure.patch is rebased against the new version. Signed-off-by: Chen Qi --- meta/recipes-bsp/pciutils/pciutils/configure.patch | 13 ++++++++----- .../{pciutils_3.11.1.bb => pciutils_3.12.0.bb} | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) rename meta/recipes-bsp/pciutils/{pciutils_3.11.1.bb => pciutils_3.12.0.bb} (95%) diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch index 5015cf4884..0ff151b8cf 100644 --- a/meta/recipes-bsp/pciutils/pciutils/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch @@ -1,4 +1,4 @@ -From 561216c8cbc280aaa9aecf30cb11835a4a0a78ed Mon Sep 17 00:00:00 2001 +From 6af07e1f812b2444d33ce199308c87e04b2f5dc7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 31 Dec 2008 17:20:38 +0000 Subject: [PATCH] pciutils: Upgarde 2.2.4 -> 3.0.3 @@ -23,20 +23,20 @@ Upstream-Status: Inappropriate [embedded specific] 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile -index aaec04e..9c1dab0 100644 +index be23593..aa13be5 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,7 @@ pcilmr$(EXEEXT): pcilmr.o $(LMROBJS) $(COMMON) lib/$(PCIIMPLIB) pcilmr.o: pcilmr.c $(LMRINC) %$(EXEEXT): %.o -- $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ -+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ +- $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LIB_LDLIBS) $(LDLIBS) -o $@ ifdef PCI_OS_WINDOWS comma := , diff --git a/lib/configure b/lib/configure -index 3df057a..c87e71c 100755 +index d02160b..52c1eee 100755 --- a/lib/configure +++ b/lib/configure @@ -9,6 +9,10 @@ echo_n() { @@ -88,3 +88,6 @@ index 3df057a..c87e71c 100755 c=config.h m=config.mk echo >$c '#define PCI_CONFIG_H' +-- +2.42.0 + diff --git a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb similarity index 95% rename from meta/recipes-bsp/pciutils/pciutils_3.11.1.bb rename to meta/recipes-bsp/pciutils/pciutils_3.12.0.bb index 044074ccc3..480a338696 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.11.1.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.12.0.bb @@ -14,7 +14,7 @@ DEPENDS = "zlib kmod make-native" SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ file://configure.patch" -SRC_URI[sha256sum] = "3f472ad864473de5ba17f765cc96ef5f33e1b730918d3adda6f945a2a9290df4" +SRC_URI[sha256sum] = "f185d116d5ff99b797497efce8f19f1ee8ccc5a668b97a159e3d13472f674154" inherit multilib_header pkgconfig update-alternatives From patchwork Mon May 20 08:10:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43843 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 2E4F4C41513 for ; Mon, 20 May 2024 08:11:04 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.55182.1716192663064993168 for ; Mon, 20 May 2024 01:11: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.166.238, mailfrom: prvs=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K5PlDR003963 for ; Mon, 20 May 2024 01:11:02 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y7bx6rq1j-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 01:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GzvSW2kRbf8T8+Pul9KiWMRuy7M0qkOtJ/lXLm5W6glBS9IwsY+An/Y49M8Qsh1FTALuXu/WuYkqeg8rXMjOvOFWqpLF6Yuriq8sA758Nv/s97ayKlbx/mcdHqtiXkzJsyCCorGU1sEyQRz/b9bwXjNGmDPIGBnHDDg4I/5vi+bAO5JtZAJyA/x9EEzvrQ1G3FSP76n9J8aJz+ER0zVqAEYGDIS3UG/pP0CwPPn9Dd/RjSGKVZXx5JXih/SYILNFdKIN1hoWS/9vGv7K7zmK77Oe1/LfAJgLTVYx60q5csKBoMB9UfJ0MtGyKGD+BM2nsZBFhQici9UwRe9BUqelAQ== 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=BtUQ5ND3Nop5ASJ/MjFaVDaEcQoxi1JOgJGR+xBak1w=; b=gzKxi88nkHydO0CIiYjLi1Yv9+UA2eXWAsbDXaOlApIXT4qj8XHj1jRpEJY4C0Qy+w7Mn8ZLcyqMbiUWChddu0o/RNEGeBBW6kwmgrXcfA43OD6IOLeOVL2US/mR9yyTigpr9MrhiEUTyKB/dCKQU3VxBg3Rra5DXQmCXoDv94v8XMIdgKEFld3nC8sB0GF2yPtGLjD7RUJxOzwYItY+NVTSvmrOcaq0FB5OELCDckZqfNdv+Uk7u1GbD3Ki4EepErZ5iWjNfWqRqQbSensiCwgSnsA3reBoJsy5H0yrCBx+A/OBYqCpsVyFRp9jgGESrWsyzTRq5Mx0NMfLPthpFA== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:11:01 +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.7544.052; Mon, 20 May 2024 08:11:01 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 4/6] shadow: upgrade from 4.15.0 to 4.15.1 Date: Mon, 20 May 2024 16:10:38 +0800 Message-Id: <20240520081040.2380736-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520081040.2380736-1-Qi.Chen@windriver.com> References: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e2a2a37-85b4-43dd-89ef-08dc78a46361 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: NNlvVylYLC39bb6F1A55GPBwe1sQAbiuJaYu6A6nOEUwPwnsjrvws2gEsYsDksHDCq3xXCEYXxT/GZJfWIaCzYjORZwjInnlavuqVPxxbdMvoZ0wud/he0AyerPZpkUBz7gcU6aSCQCZ5iV7R6/y67AyBvHOeyk+KQAQejkokPKhO/B42rJRjuxvX0QPm7RUH86Q/y+JtnYZmEpaGAVQLyVpnZYQzlB1TSveSBnxIfjEnhUNfghF4Git9v7IP/x7PZY2GGJukEgA8gG1GhRMdpveCX6HKZiY2lZ1kOchXg9ZBwYgqiD/b2X2aZPpVDMG03leJLTTi6Vll8/r9FUQ0YlKr+URziAFwQ0XylWS3KmD73OT5Vnj3LPropiZeULdE4V4ygv2er2lgok5NnIatHA33kcIwd0ytgQmdkZFzLBWWyg69c7vIPmk6/t3PbeZ+wIuVrBr6W//BbjoWxD3GciIDthyQipWBYmqaeifi0gRAsCIUnr0AQOCxniYNvb5JVwGK4dLI3pBkxlrAG+Y/N3bb/higGzB+wVlnfLMWEARie3QXQYYVyuvub3c0HycHF/bwUWt3WY8HThXd8nmu4kodueEO2v5XappNhH9p3LXg3fK/N8oZwlCf7/7DHBj/+U2m86x5apQzD/43TJ0zahtWP7Rm1nATySul3qW231TV/HyIkNmEGawHRabGScbiVCc8fJj28At/pFrRo4Rikzc/a/w5R4XvM0J+czclI7iEXs6JxndCnGiZSha0OBSkEEUdGlJE5zbzsUmGBVhIsJNSzoW473Y3NuX8yQFLX5SQ/6+bF20EVOZOPH5U80U1DwT354UZIM3lI1NFsDmNzPHZ+vigV7I6J+7xZTwWVtBZLP5EeAH7UMqzdqYFFVDJITJk4QyBuaMkQZ+EaCfa9ko0aYKKz21qpf1VaDDu/jk+jYg4anYJZFLI9EQZyqst4CPa9SV+/F5yYVDYq6uKwZq+QoK9KaMVJHnM8P5HJD3ltGBppM5RcZ0xjyrMjMrbiwX4gjc1CRSM16qHq3wRRTdPht9Y/lCSehF/JCzijnRH8p1wqLT8uOvOsdVIorIlppjkbYO5jNuMh7+0K2UcSOm3koqTYSywtppRsciZols9CyhV21nGl+1ypfJ8QWY6YZjttjR+KHLF7JNeAG5UKu5N81tnBsAzXvXPmL19/yaqhcwUnk7xdTVfDC3VkBml1nA+jbwjjnjd1b2sZ+TAJEyFQP6OQ1HKTGA0gH31sjGugW0UEYYuMCnmFLsAYyQmH96islmP381NEAvUc3DPzNk9N5YPiR0bn+jBZL57/c= 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: joGsnbx+rlguax3b73XvA1/YTd/K2qsaSZaTptEbODmL+mRdE7ane9uzE1lvi8SN529/50B/ZiUwPhLZTtM4yxN8IYpc1duNXwWu2QXHjcX7/xZsQlsX9z7sZJf2K7issXD+1b0Zv3NsgqNlSZWQ9xnxfJXcYgVcp9z8liPEt+7FwCAG85SGXoIpDoPCYwxV8UaPkO7nOU8vCqU3f7GUgzoEabVwkLIGnyz8Pyk8NB2dDhynztB9qh9/i8F8FqaXtZuy+xW3hGjMUoR9uQCIBoIqvzsPLS00L2LFbRG2CpDtMTWNlrdpfqwlET0id7hwAwLQZHG3OkbSPzTsKgI+kNbyhUN726ETgUyf7ArM7nFkIoSZU6fPNH6MTNKO03jfinWoPcxexDuzcMT06tUE6Fh8xL2JfRZ9Krj3C57Z3sdejOUTjNupxmeIKHSygOaWHZs0lIBaT2kXKeSRMz4XatkbJ5hHN9VYH7gFCGPDL4OTXruFt6oLXP0TDSMzu9VA+AIjK2l6XHRPLe0ysFK1mETpQ5Z2fbuwtkSdn1UdIqEYgV1khOg8eUWHxib9Mq55mVB79+k9jHCAOOWFGWIkSJdKYGJQA9gGZ1OzkwLEjJ/0gq398f8gYtYCMSbJPxxT/m3wFc/sU5e3tvcfeQZQraKdYvkEt0Y8sSZ6JKZ9iIJcWr9reHFiGyEfal9jTugjjurpFP/Y1J8SmKMWxnUoO8qlkf7kkNq2nKDBW8rBOeSzua+FKPibidGnXIUIIlqNeOvTsfeAfd2mE7okn0NFBSeJAWTDdl8UqqpuAcuGL9QsJTEfdqU6tfcVoDRnNaXEdY7l7yxfN10/iRM1OvgAK3xXFrE5BvCShHIAtqXxWFwYjhnXcB0qg6Y8HcJb9d/5hJ5kPYA3PJzEZpk4OfmevBsZupBJAUHc32f0bEXdl0pMgK814FBrItjliMmy3tkCNTDpTBP+GG/iwTE8FmVA2PPjBkWwDyXXGI+aeh2BLJ59Sj8xbLq4zJS1BbYe3bf/P10se6INCmb7WHZL51WIJOyaj9YUWKdIasujZuW0nzeO5QnZosURQbg96GDg4JBUWM4u7AkNvJcT7gUjwTf+045KQRz8cp5UcCbo8nvBqZCJn4YvKJ9gwHm3Nz03p6Quzw1hAb4y1WxN6JOxizCmm8efqZQPz4JnxR3qqJaLBTioRofI7+Z8HzmTgy9bEI0v5BQ+AF6KG2IiRXrA+a2v/4QRYhEkoC0O1bvhvsKXptoMutGa6qKZUu1DbnTk4rS+/6kqGdkgjTse7/qtNFgsBt+efS5Abv6WE6RQqLTw5m/SfxhU8hGdrfA5IN5VHsdlLTCRZYVgIevNf1znIAUL7RWJtJf/b624GPdsckBHDioJz0i/kWPErESvZ8YiN0ZGHe7St7BfX/qIJoX3ehJdMTGK3D4UzEzFkrxANClDSsSGUERQxW2n9BaQ5xFq89AKLl+y0JGEts9owcF2gm8bKmaBYS10/ceXX/N37g45UnqnqlcM5BHXpHXwnIKezCEvzKDI/wogi//vN5iY4Y8yHaQUbQRanMpbiyz9zcP1uoELB4EUyvQgdqlDioXW2YBP X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e2a2a37-85b4-43dd-89ef-08dc78a46361 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:11:01.8759 (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: /593lTqtsthR2zMi2D/s1qYqh0d/yLN27wpaqIYHzM7l0tcS4dO7mpi7ieireuRPDLAxhKFVKK4V1DgmV6q9hA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-GUID: ak76cIAuAtzNRfkI0ceisYdGU-pxMT_i X-Proofpoint-ORIG-GUID: ak76cIAuAtzNRfkI0ceisYdGU-pxMT_i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 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 ; Mon, 20 May 2024 08:11:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199559 From: Chen Qi 0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch is dropped as it has been merged and is in this new release. Signed-off-by: Chen Qi --- ...copy_entry-use-temporary-stat-buffer.patch | 37 ------------------- meta/recipes-extended/shadow/shadow.inc | 3 +- .../{shadow_4.15.0.bb => shadow_4.15.1.bb} | 0 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch rename meta/recipes-extended/shadow/{shadow_4.15.0.bb => shadow_4.15.1.bb} (100%) diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch deleted file mode 100644 index 2e5503bfd4..0000000000 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ /dev/null @@ -1,37 +0,0 @@ -From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001 -From: Enrico Scholz -Date: Mon, 18 Mar 2024 12:14:21 +0100 -Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer - -There are no guarantees that fstatat() does not clobber the stat -buffer on errors. - -Use a temporary buffer so that the following code sees correct -attributes of the source entry. - -Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974] - -Signed-off-by: Enrico Scholz ---- - lib/copydir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/lib/copydir.c -+++ b/lib/copydir.c -@@ -400,6 +400,7 @@ static int copy_entry (const struct path - { - int err = 0; - struct stat sb; -+ struct stat tmp_sb; - struct link_name *lp; - struct timespec mt[2]; - -@@ -423,7 +424,7 @@ static int copy_entry (const struct path - * If the destination already exists do nothing. - * This is after the copy_dir above to still iterate into subdirectories. - */ -- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { -+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { - return err; - } - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 25930b64c1..3991006b43 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -12,7 +12,6 @@ DEPENDS = "virtual/crypt" GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ - file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ " @@ -25,7 +24,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:class-native = " \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" +SRC_URI[sha256sum] = "b34686b89b279887ffbf1f33128902ccc0fa1a998a3add44213bb12d7385b218" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.15.0.bb b/meta/recipes-extended/shadow/shadow_4.15.1.bb similarity index 100% rename from meta/recipes-extended/shadow/shadow_4.15.0.bb rename to meta/recipes-extended/shadow/shadow_4.15.1.bb From patchwork Mon May 20 08:10:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43844 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 30992C04FFE for ; Mon, 20 May 2024 08:11:14 +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.55184.1716192665563051702 for ; Mon, 20 May 2024 01:11:05 -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=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K8AKcO020739 for ; Mon, 20 May 2024 08:11:04 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y75rb8v13-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 08:11:04 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BLvcT27etMFPrXsWGTNZKLQliUaPF8SWi5MPdorqCllcTLOa33idvWqI9cI8kNWiREhklejnddk8HFq/I25yfxiXPrUFGqMt51UJqbdcaBhwPdItStR+LC9SUM6ksyfqHju8QRYQVWI6sfBxzFr+NqkQlnxbrpsecCs/NZaSAMZnok6HKMmH9QAX0isekua4h6BdaL9lbZpTuHYrVrIpEaUMi0/l91ZPUWdGUNWJJioCjgSHe7x94ZHLESv9Vd3i41zqhvAJEMNq3JxNqbDHi1GKWKsy0tY9/7PKTyiOuKhRbF9Qg4WbWGQ587FMwToGXBw3w665iWCFPZZOHEksIg== 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=KPIbSekaCvWujINFtTb/BCY05cPHDFwaY1sbwph4I/0=; b=EwBZ5zJeGaDLtMZnVPAWfGkre1XM+fWq1SPtLO294vJyhTcGTQivc/A8O+E63WGQ93Bmp+TlkP6XIClIXfrd6sZ3jZFCYLLUL9+irtYWVZrrCe7P/8bonW9giN5VcnkNvYs8F/cTO1+RKyXoSATv7aLM9qXzcvAncaIPFHE9y5PKt6VerDxY1quM6ZM9qHnd3vO6tRoxzXGi/M9DSpKX22L6eIhn0VDAS12pghfrcfCQkQ+F69dPTNc9Y5pQv9hZ7chzxv1oHr7JXtK1Xpf+jUW8CggbPwXQW5Ksx4YFyXz+pl1YnQ1ZkHPrYuFuscSI83Z+tnH3Uun8w4+EcG30Eg== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:11:03 +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.7544.052; Mon, 20 May 2024 08:11:03 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 5/6] cups: upgrade from 2.4.7 to 2.4.8 Date: Mon, 20 May 2024 16:10:39 +0800 Message-Id: <20240520081040.2380736-5-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520081040.2380736-1-Qi.Chen@windriver.com> References: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: d50067a2-447f-47ec-3242-08dc78a46429 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: 6htrvS9tlYLRHNfs7UZr759T2Ci9M6Gnnm9dbeyiovva4zS8/DMJBFki/peIVirjGWiT4FFLXWRxOTUQVcPHSIVOyZA76rX1fPsLN8xMCpoAZ3bBocKaJ1639K+BRhpwsYMo+QW0q7DNw2yaKdBWjHpshPgxZ/a5PaDQM36a1hXnhGDLXbOdgVmYUtMBFaW8qqdNbSAf5nyDfoWdE/0MJoGQJ2CcRnZ5IqKYPHbxZhlSnYAyUYflblZRQv3xgomAUM1mHEO924NqCX7wAkS/8O6tRwDjK0rFEZT9sw07m6TtAVEoWxaatxrCeDbd1+KrU7E7lCiYQA+bWitnIaqQm5n4fCoghv8KFQ6LG6sc3lDHlWejXWYKvaAxu4fgMh+E1jceHT3RhuOjFhOPfmEI7+Mkm7kjZVQst129Y6jXBoKA6136jmdJsRMukg+OGMowZEPBN+uu5PUFL0/CaU0UCu8QWlHk64jvhb0dGzp94noO7cB2uSYjNqGO2bgh1chV7mfjUHLjl5yk9oMhv33yAq4lvS0M0YalPsADZaMCVoCX7r+hOWgoo/AZs+jJGl2Bj48FxO/aEdkAKTUbBBB/cCXNKY/oIKX/ZMN/wtIzFcjYX5Prt6SjO+Dcx0O5d0vsm5v0vrrM1LbLHaKfukDX7SEbOHel5oSMVxhA7WDF7ddrKyTwQFDhBTeLApYVxwjuMhftZCGHFW7FzF1pzmE6+pIHgdRxisGsLVW8VvD3D2LYfNYBIHY3hyaspRWvzRzRu4b3TOS5ZUoYjw1Wu0m4EouVWH+DtjftZz2Y3+bew0L2JG5DcaqxpqdaZn9PRZrv+3G/yOvBCxJ3DSLqNYRs72JA3q0DhPXtYZyXTq6UBngQV8xE9TRdgsZ2QSV6FSxMGz1Ki+bh+xLtmSQFeRG6MnSCKlFOCoGoi3n+tjwNDed73gYJOwoNVhdrLvuXt+0yRgzg8mSS5d3LXFUmnHhkzjPgYe/+ibdxOA0x35WMzQVg3YDyHjJSFytXxguVMIlKwK2MPhxjlNlmGOXmUsINirGCTdwinlPOW2K5RYashllQ8+uf2EjiuYwpkbQyAzyKiyzgbsfuZQuPN3odPXA7KQtWWWV8gq0+/0/DUxefmWp7OIXIVle3morMBwox7IM6LU8/w2q63EZSZgMYwvPmgpazdXsrFkAvwDXOknGJ0n3vrBmIPtmN/V24B18dAZczjxtgWagbkFVtspnT/FxpWuXFZcL0lgUNkVSD55xXEgY8aMGcI1AhTW1yDpaHg7OHlMG4ONo8CmDycI0o7SW3Ij/TEHj42fES1hN7M6zC2DBvBjpsj2RVwCOEsI2+5knMsYjQeEBZ32zZ3UCWIcY9Kg== 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MYGMIxngv+xy1DzeG7WGbHUStze7bJU3GkQLgthYa6LfzrPMiFzWDH7AtfGxWXz02jOL1VcSF7rexTHQJwf3OgkN/ki9YzRVg+a28vj0lb0hyWax+1Dd4zUgULKiKKSzDqz5YYPnZlBUPRzuJtl0FWveWS4C/PchoZcU51NRhgBA2MKgRFLwsvrTjpu7mr9WBKT7wg5NQV1K2jkaGg9iFW568yNzlLozN7MpN5RIkC05otmJLlRjJevpzBjuZgXLvGm3y1OIP06puVxCRo1gfExG3vNogTu3ymPYlDkwceHWDBd24RNVRdeqqgtVL1wWw2sFolLhewZ2wkjYQkMX39XpAbfNZzwHJiSDgdCsws2+UYslok8NvrwunrQdTHg+Cv7jnUyHUuShxj6OuLwBlJlbOoea/E50ZE/zSwwq10JKP/O0HBgKv1Fz5f1jHek5gPkQTn3e+MAwheTlOX7f8G17CADtjktzFFuNn4Vo/nJMSST9TfEcA2/IuwxhNvqL+Rv8RUqjFkCx3bF7EXpxiQ1ErZhbrz9aGYCCzbQce9o/YoyRpa2Cs42KNj5dY41MMybJqR7h6y+sGMcWXsuZ/9sjoSkFZBtYUiRpBCZAdOkW+OVavK3M8fG2SgKFSjjlfuH10BEaW+lZWhR5fhH6oV2Qp1MEtkkAQQyAhO7vxfSpDtuCR1W5XEhz7QJ92GbaghqvGbN5wuwUMAfj6ga7FqK/hJzDnZn5oWvXtx9LwPMmSyJ0Ztbn0tPC7wru6iU5TgWfL+N8p2AJWMB9mSy9l5wnoeig6NlFCOlrEOKp1Ay19DBQLNssfInaGgTJBuMS2MHueQK1gfN6sfe1mSm1XEYHkYJnNi4xudT9zks1JW16uD/JlCiOdS/82BTGvOA1lWEvx27uEVVfltRP8t/2eDh2n48+n1DTPR+Nf0wegiRzX7NXFe6mh5OoqP+qQ3NKLrjpmNA4l5Adylc9jH6ZxnUwcCqis96ZMnMhyrh4XCpX3LPu18OFhKKSV1mWBZuMaeCWbzirvkG/imI/mceeb6T7AhcdTo7lN0BfbvGGc6fnOLyE4QZw/IlQPrHVOZxeV/LL9oWiOBgFgjEWLYAdlAz6sinHmyMZbxnwivQdWkxbg0zF+xZzGTgUyf/s/vl//EK0lUndBklF0N5Dh2uyNGVrQH/MzAR8j3cO3HXNMAcEOJaiYFYzbfYAVjZUSmyK1pWHaVVktMLHoVF5tuUPJBrU+UARUa/5Sc5Ev/bf2g2MAglLEi7K8TESRW3TkQFfIfkKnJIHFSSss/89lbk7iBFaK3ShZOWjkNTv87IvvRfpFWNQhBPk6bbZJWRh//vuSQp+3RIa7r6PwgeJbg4RSgllSX4zSruw7zvsSJB8oWGPAoJaCL1k6u3Ozr3yypBzgUY3s65pyal8n4Y3w3HCnTcMyNifE6hb53zzicdlVepOX/YXy9TlDRUmiYEtgP2jfo2YKIKhNf0wVvVba2gc9DJ3vRStuMoHsuA7srTCMlqyt2yc41p/F4RIUR/QSmIoYvmaJrslnZZwNwunpuWWFp6wfQpB19YzTiinpkdq7axkSIGRX242LkRYCojMDNxh X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: d50067a2-447f-47ec-3242-08dc78a46429 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:11:03.3031 (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: Hfkzjpx+ufXVUAI0kZP2QfmQ/T6dyNdMPdOXkqYZ83j0gVXgtRE/pzFNT5i5EejhJD2C385f1nRBxOGtgEXJRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-ORIG-GUID: 9V1K86n-Xq0Fgxy73qxniPFPa70Gtt58 X-Proofpoint-GUID: 9V1K86n-Xq0Fgxy73qxniPFPa70Gtt58 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 bulkscore=0 impostorscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 suspectscore=0 spamscore=0 mlxlogscore=700 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 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 ; Mon, 20 May 2024 08:11:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199560 From: Chen Qi Signed-off-by: Chen Qi --- meta/recipes-extended/cups/{cups_2.4.7.bb => cups_2.4.8.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/cups/{cups_2.4.7.bb => cups_2.4.8.bb} (51%) diff --git a/meta/recipes-extended/cups/cups_2.4.7.bb b/meta/recipes-extended/cups/cups_2.4.8.bb similarity index 51% rename from meta/recipes-extended/cups/cups_2.4.7.bb rename to meta/recipes-extended/cups/cups_2.4.8.bb index f4b0282e4c..c0cddf7e99 100644 --- a/meta/recipes-extended/cups/cups_2.4.7.bb +++ b/meta/recipes-extended/cups/cups_2.4.8.bb @@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" +SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0" From patchwork Mon May 20 08:10:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 43845 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 3366DC25B78 for ; Mon, 20 May 2024 08:11:14 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.56011.1716192666269848490 for ; Mon, 20 May 2024 01:11:06 -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.166.238, mailfrom: prvs=5870edb5a7=qi.chen@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44K5gCSv000472 for ; Mon, 20 May 2024 01:11:06 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3y7c738pt2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2024 01:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=axQMRobEJ39656PQDx4pnhXItHVqD8GxYOLuPle3niW7jshxDP1zw7Jj6Wyh9wanQFCqZNwCVjJGj9B32vYjTopJrP2A0MqIcdnZJaW0vGGWOqPQVcZ/0RldVal/UwzhS4rAwkEZz+9pEBpedeOahXEFcmksOWH3X+0N5PCVpwYkLuO73CdRvQNd7tD5hloEojMMkAaGAuKbPU9bQQiPWhFOLYTmumRYmUKAZxVla4F/np82v9j/xmPc7L9+xVbVSIn6eb5p0pkcu4Ycu4tkBiDFSU7Iiv+IOxoDZ19nf1J+MnEzU5xJr1D8dgrAsa9Lnqqv+kH7n0U+/0DsoreSxw== 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=jtlG6bD2USHsiUhek15j7em9sXCI76+5QORIiFqaGmI=; b=XMC0LRdUpUjCTDwlcjhzbCjIdm3QB5tZiM832InK2QY7+v+Ny+PvVfbZMEhilNx5kkwX9CDQ0uYaJvSnFIExmIsCnLrovmSntQm+IgNOKDLoPXZ8Do0H992wy6ABUsQmX6OHxQnR0K7ln4pt9AQn+fyzpgfstg324f/zg+NtLzqWPjASUnwhN2TW5haURjos9Bcgn3Sitph9jeuMJSBxXolsSh3lWGp5rpeHf1RwD3EZA8Ha7gDzMNV4Z5FrnE8ES/mic4iZuHSZ3ksDyHBIILexgdJE5HEULPyQEoltHCSYCDGzepWMFD6MwOE1//J8zsjtSkZSf6sGWwGeP++m7Q== 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 CO1PR11MB4882.namprd11.prod.outlook.com (2603:10b6:303:97::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Mon, 20 May 2024 08:11:04 +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.7544.052; Mon, 20 May 2024 08:11:04 +0000 From: Qi.Chen@windriver.com To: openembedded-core@lists.openembedded.org Subject: [OE-core][PATCH 6/6] kmod: upgrade from 31 to 32 Date: Mon, 20 May 2024 16:10:40 +0800 Message-Id: <20240520081040.2380736-6-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520081040.2380736-1-Qi.Chen@windriver.com> References: <20240520081040.2380736-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SI1PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:1f7::13) To CO6PR11MB5602.namprd11.prod.outlook.com (2603:10b6:303:13a::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR11MB5602:EE_|CO1PR11MB4882:EE_ X-MS-Office365-Filtering-Correlation-Id: b18a7ed5-30c2-49fa-d71b-08dc78a46507 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|52116005|1800799015|38350700005; X-Microsoft-Antispam-Message-Info: 0MR9BVExMHArDSjPR1gP+w2mBCOhefcz/DCyxuJLMPW05Zb9CNcYvBs48yHLwOW1RzRMEkYylLSl6PLkX+MVYc9zy1SApD8abrm/NaiqtGYQsEvvNGYkFzqHhWQbxWbNwBpAQpNYp7Y8YwnfxCgua96HMmF3UiSNERxgrKjp9uKAImoER7U8gjq4IPp/q5r7lNGeTUS30Ak7BjQrW5u4UGmObDZDSD08TO+GM9vzAJNazyBLrPfMuCOTOj3lIIHKD7ZA1m4bUhzDKjvhSfliFVGkD39Etc8c35FnOXDQNL8ndhpSe7MntNYpIUcCCd//bEQMZ1O6zTve/ku0JZ94JDKIX8ErBEYnJ2XIP8jgq4WG7NF469PI1cNM3RzvduFHWHQNg0YvXVnJ5PP+QynIsZ5MAWZMsUF8qgdDx67XBG58d+GsoEkhCk0VusoMm1cn4BAjD7WelxS7I2QKQrcCeGfrTf+vUbDucu1iFdjLEN/rfjCmgZkiT6an6MkpiTD++NbZfH0MZ9auPvc0ZyHJWIKlGs4J1sRA4m7vcFrHdcSm9krWtrH9vyZjCBLUM9EDvEAyXMuiVKCF2hJtzTPTphQyJ0KXYMz6QPeZMU/+781rcQ8KiPgMmMslDw7nn6kS4XtJyOdf53/SCNC4OOtT11FKtsWB3ZhlDqvsK/8OnhPfh3I+5uG/Al+Vh2O1LRhgFhEfBNgndE6uu8v6H+IlUAZPmtX5HQVWbIyPEujHJ3+jyqLrxk5zhV/6th/PACQxgZhdnb1p+bjjm9AwT4mCXBdGMy2aFrjvhvTtmlUKRCUl0wOoSpzgsHNRyNBBTFQy7Dk3VJWdVIeMw1Tdij/UDQI7aublWOxfcS/TFh4d+iy4cIHEfcxbpi6+W+x7IAHJaSKWM48q9ltzG8XO3JMz1da/sSHGOQJaC7rAikQDVHT7HCyNtsVeWUUVHCNJyO5Hg/Irdh10HSAHo+Rw9q0Wfj21oNxjwc/CCTPB1JSegHCK9h5X08lK2fG0v5Q2MgYiYh+K8Y8MuSPjAjQ8w2fc3QEcnAcVFrCGUgDtGL96nl2DHALm8MkDd7jt66BTU3gYiCn3cRoZgrVdATEix1wjB+FjE2jQ8IDjFiLF9pUxwMQcNM39KvImBySFrbwa07QQyY5opwUhrJcHkgdikYc9cR2tFHvVidD7ePZ6hAS8eLKLoZhI9PPnLBst0g2OssqdGQMbFlyfJ0OnioZK4poHMiq1Exe6zbyeltlIXGJv7ViGetP4e4cxzyqgAC93Apg1KA2qL42jS442dH68O3M8ng== 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:(13230031)(366007)(376005)(52116005)(1800799015)(38350700005);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RFWFb+3ZRFfKys6elrcBPZRYP6dL7zDG5wtp4GETRVnN7FceTC5lMEb4fOrimd23nK5SU40lllXRDPCYjX2FzMcaIsaNDU3BiKTD5bq37GK32yEI1alzhxnaWwA83nJCTB9E0ZwiBl2IM/wyW6qMCD3o9AvrWKSEoWLUiffty09vA9SP46RY1S5grJlYq60iRQXaPEdgJ8+k3LtWOHoI2tMpT9Qpy0RKbBlUN5TSPOGchdmmjMIz2awIP5Ce/DdUxTe3QCE8LqcgehWqPkd2a15pAnMbS+nsbcnyLjxcvp4VGWg1or6ir2c6qBp2erujFWKRRqtu/xFdCLh7XYrPWaz7sMxyg2X+udYwRIWEsHkcZhiDEZmX5S4J/B95aU8yT/51PC2p0X1wYg0ReL49c7zW4yZ2N/RRLE5Q73CxmAhEPT8S8jEV6DVf8eK5zZfD9oTEmnxWmLtaBJSzZGNzNqYCKLQHq4Aa13MHeyZc9ctYvvdMyZ17DglAoWkvOaUhKevCFyQEgDroUc6ECvXvGpGwoEFmDeWMYAhqK/CxrzBt4vey6T1JSO7MEjQNTOAAtUpIIn3rV2WWe12km76PqRXIQyRx2cM/5XYhf1PoD6twT0PXB9+ILiR7N2rzAAAYLXKNrAsDSESw01CpUO2yBH3O33eG6FtiIDh3A/DfjLmDnPIpzogCOKpytAivBQznQRNQlFw/qh+mBJefEeU2m74jsqZ1SxAee6D6N1T3+T30UGMrmVYQpLc6AtxsqmJJ2GXle0ahZijtNuGaTM+baYtjctrZ2DadX8nqPzuRZIwovMStU6S+9dLKoYsKsYV2eUJYhFbRgdkHXkPJZ7YTCztabCiKrvUelbc9bA3yJQA36SXA1p1detseDeieSBKVnyDGEgUwGbnhrmMrVk+ZgEC5ne/S9Rs0s2Vt8k0E9IwfyE3dyTUm+k+Kl2CNLORyIX81YUuH7bdOiqr53Gkr4TYDnlxbihKCLPtamj6/dnU8dpQc1xz+PGgNtAorQGDsjPcW20fnjumxQ/YVGzqFc8AriBoAtbktAv/V9T3vEDja+UadYP5CawGMPGpaxL8dkp/Yq1KMG/lVOt6W2Q+hPYgTnN6XzAvs2vhJtf9q3BDQgZC+kKON/jfJaiUIiPU9Y+m6/cM9vaLa1SY7KdR81a6GzVTmQzqjEdi58Q0T00NEWrtqfM0tmIa+dfTgrVLiNo5tjoudB0dnDA4zk9r3gLDhYUw/1HB13IzYFAGkGoZYrP/AdFxGTnV7WZo5b9SZ6/uUYp2xFdI4YD3de7+wSZUzsEr/fQ9Ayhudgw917GtO/XtFZV1VcF4hK6m67zDikwTctsLE+g1Syn2cRXLsoHBtIl7ilGtiDjGIE4FbOS0V8mESvtm3XYSP1FH/Qln78weEED/Zg3WoHYL1lN4KJomEelb3e70xim6pXbZjJjW/ZOT82rkHgOTYhEyv8o3G2EySiukzLW6yaK/HjJX1BK2V/fUaRsRAMdjWZukIzZdP1l9PaurRcpNm+MKFfgMqMnUKacVJlaWN7xx97qhGN16RK0T/otNsaKYzgQNQ+/Hpo2hN7lGNb7QYDYi4xK2M X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b18a7ed5-30c2-49fa-d71b-08dc78a46507 X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5602.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2024 08:11:04.6837 (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: A18JnTGdlPoN6EXirpGiFMjMoPBfng74uf1iIUQ+QVndZjLpHQQcqUFYJblSy7uwjxgCHlcA4WnZGEgy/zyPUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4882 X-Proofpoint-ORIG-GUID: MUMehhI7Ha9QTo_8P9hryjbBCxVKuE3T X-Proofpoint-GUID: MUMehhI7Ha9QTo_8P9hryjbBCxVKuE3T X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-20_04,2024-05-17_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 malwarescore=0 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 mlxlogscore=944 clxscore=1015 priorityscore=1501 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405200067 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 ; Mon, 20 May 2024 08:11:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199561 From: Chen Qi kmod now installs symlinks in 'make install'. https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/? id=e98cef6f3f8cd6f8bfb26d147b2c209297453cca With this change, we no longer need to deal with the symlinks in do_install. Besides, as upstream chooses 'bin' instead of 'sbin' to hold the tools, we'd better sync with it. That's the reason for the sbindir -> bindir changes. Signed-off-by: Chen Qi --- .../kmod/{kmod_31.bb => kmod_32.bb} | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) rename meta/recipes-kernel/kmod/{kmod_31.bb => kmod_32.bb} (78%) diff --git a/meta/recipes-kernel/kmod/kmod_31.bb b/meta/recipes-kernel/kmod/kmod_32.bb similarity index 78% rename from meta/recipes-kernel/kmod/kmod_31.bb rename to meta/recipes-kernel/kmod/kmod_32.bb index 718a5565b4..1235bc1bf8 100644 --- a/meta/recipes-kernel/kmod/kmod_31.bb +++ b/meta/recipes-kernel/kmod/kmod_32.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools bash-completion gtk-doc pkgconfig manpages update-alternatives -SRCREV = "aff617ea871d0568cc491bd116c0be1e857463bb" +SRCREV = "41faa59711742c1476d59985011ee0f27ed91d30" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master;protocol=https \ file://depmod-search.conf \ @@ -50,12 +50,6 @@ EXTRA_OECONF += "--bindir=${base_bindir} --sbindir=${base_sbindir}" do_install:append () { install -dm755 ${D}${base_bindir} - install -dm755 ${D}${base_sbindir} - # add symlinks to kmod - ln -rs ${D}${base_bindir}/kmod ${D}${base_bindir}/lsmod - for tool in insmod rmmod depmod modinfo modprobe; do - ln -rs ${D}${base_bindir}/kmod ${D}${base_sbindir}/${tool} - done # configuration directories install -dm755 ${D}${nonarch_base_libdir}/depmod.d install -dm755 ${D}${nonarch_base_libdir}/modprobe.d @@ -71,16 +65,14 @@ do_install:append () { ALTERNATIVE_PRIORITY = "70" -ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" +ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo lsmod depmod" -ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" -ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" -ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" -ALTERNATIVE_LINK_NAME[rmmod] = "${base_sbindir}/rmmod" -ALTERNATIVE_LINK_NAME[modinfo] = "${base_sbindir}/modinfo" -ALTERNATIVE_LINK_NAME[bin-lsmod] = "${base_bindir}/lsmod" -ALTERNATIVE_LINK_NAME[lsmod] = "${base_sbindir}/lsmod" -ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" +ALTERNATIVE_LINK_NAME[depmod] = "${base_bindir}/depmod" +ALTERNATIVE_LINK_NAME[insmod] = "${base_bindir}/insmod" +ALTERNATIVE_LINK_NAME[modprobe] = "${base_bindir}/modprobe" +ALTERNATIVE_LINK_NAME[rmmod] = "${base_bindir}/rmmod" +ALTERNATIVE_LINK_NAME[modinfo] = "${base_bindir}/modinfo" +ALTERNATIVE_LINK_NAME[lsmod] = "${base_bindir}/lsmod" PACKAGES =+ "libkmod" FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"