From patchwork Fri Jan 3 09:24:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 54927 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 06F01E77188 for ; Fri, 3 Jan 2025 09:25:15 +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.27084.1735896308549373395 for ; Fri, 03 Jan 2025 01:25:08 -0800 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=30983b852f=yi.zhao@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 5038Xc0m018516 for ; Fri, 3 Jan 2025 01:25:08 -0800 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43thqq4rf4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 03 Jan 2025 01:25:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GnYbpNpLhiLqzY68nLjaqx909Un6UwvTW9h2+axwqmjWRlf23bMGOPp6r9J1jMi36X+9HgMYMDYfASyFhk5jQVGdcHQ7hPiqgCA47GsvfwDc3apX/03DkbHmwgF0BxZCxtaHdLdOLVocD0OVLdXcVZ4QDBXNwxmbN6mdoandMsV9jnEF+vc2FpO6A2Z1I9N6nsbUETwcG3th4zaMZ64mC8IW3gvc7K+YBa/U+UrN06IaHt8uf/IqGOr8v3b5E2vGWR7wYXoA5Db3URn/G6y+0fWGttFTjhf8fRkMQlFT1GNqYzny87b5lDxWGDhYxITvnkjl7m4Df0IVd0BDj29+1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=9RMbA2s2WS42YDJLNdilP0a/67PcUUG4coQi8pvtH4A=; b=FW4kvegY6zHrJBwFm/6/UwZMv5ThEUad6xRGZ4LMbQB5zw3B/tNZ4XYHrhYKGpjn4QQDhZE10mFimwwhZi5WZJVfvjvho2/MYeK5+LPHbXasiVwdGvk8UaQWgO6YZp3IQs4FUkbuyPP4hXvN1JcePvARtj3111Pu9bGlMC7BefmGbmskdxiKlh++JwZbi74dZUvHaYC/nZEll2laqiUYjldx0xAKAYHE92ZEwMA49g61nyuwXH8+oHm4pmbTKkC9VYBLNSeH4Nw71bdTqxZArRUU5EVrdCypbLNtmPZL3fcqrZ6y6HMQm0+Ks6L3lXd6kMkndL/tRtKG8ruNDpZfDg== 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 DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SJ2PR11MB7520.namprd11.prod.outlook.com (2603:10b6:a03:4c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.12; Fri, 3 Jan 2025 09:25:01 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%7]) with mapi id 15.20.8314.011; Fri, 3 Jan 2025 09:25:01 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] libpam: set pam module path to ${base_libdir}/security Date: Fri, 3 Jan 2025 17:24:43 +0800 Message-Id: <20250103092445.566172-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: TYXPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:403:a::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SJ2PR11MB7520:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ac0c56-7c29-47a6-788d-08dd2bd87fb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: lqMMoW7krMTGwXgxCupLBOat+u9GcvgqjWhQNpUYA975/W00gYRpeivuKnWXK86W7cVEJPGLyR4+pAdNuxd0ZYXDZKhiom29VSr3y0UGkcvWxkbwhrvqpstBrLLOD6Lwi7jt63GPedhscl2kovIrSuh6tck9ANswm/VEQe2jUtLV75SsYgjnoSBd/h9PA/15MDcNWNpifvWKX2UL77ODnsY/fscV8oaQS/wXFTBcYKlYY0Gse0Ig6EvTSvvpla8cR9l+9cfYDw/6pdCI6WSvvD2mTUA2bVf4LxaFejB9WEhvQunQcChOpItZ/rDaEsLcUi2QQsT6NZv5hy/+c7sZITh0sP5hs8c6ChQqjEzAKmurtlSN3FMsLqihs4pGpnLQxfaBpuOLUtdQlCk8MeKXTsSdvqlT4C89uH+DzyhOZDGIIJW3e4k1Zp9u/U/ERL3ZIojcsX10AvO932Mp0h3PYduEmqQmkRhx0ILvCOngfZ/wncRPRsGQeTkLbWFyfH1KZvdD2ER0Ul3tqMz3UP4MB2BGbyJcuDSboTEPe9aeVE5R4EyHMjT3WwfqiHrtvW/pyEUrP8XrDA5gxgQXtPvf+KJUE7fdL+FSo1o2jPqilrpTGL4Lc/cNmx99uHu5tKEwEZ1qSpXa/n4wHBpNQ7smxr59wFpshLxnv/bQQ+H+0bXF9dLPjCiuZz3bDKF4is2+zuoVYzQRZVvkNPOxM67Pdp2j2e1J7PRoydVa66tylS32CsvL2OnY0U9DLmfi7DjKi6KwR5OS9/xPcHhZGeEMaZ1NsPd6Iq/Gk2xzLGCs4H1Mzq34Zqa3cFmA7KUe0/ClCBB1qoY5McZV+kQdxFiKHigD2vdgdiwlCDoDOhA1fjUAM6hZaQ2+wIn7jxu8XeMbNQpGxRWqS2tpEWO0eDS8RWuQBKCsne7INiUh2vbh9aucBu+ezbX4uvmFISqsbADN4lQsgZvaiI+JeX4SXE08fV4mss/u+/R5Kd2zS3Rhg6RmdVtFBHNozpUA91DYwKmcIMYasw+DsfMXNGCuGhVsI5XEHNDBGlHqg2tLprHlqClramc6+v0KRUsCa4Etvw0Dn74Ycw0asKYgSHmfkzSyECTlW4fVJMYyuYafmHX1Gq/OHnskmO+G6FjpDdqQ40lmZUbp3KzOflX60NRIE7jFmr6FiBFkLBheYggR2uwU/dEx7MmTEjgSDuUQ7nqWZ1Bn8Y79ibeAuLmxRIIW0vPESCpZrrynD4aag7YQKJ3gfF7MnP6OjqodjFxzGbyEA29pf9xPuQpGGdRJZmgdK3sP+QRZQbOtMOBUyF0Tj22oBKgTYV5kWVaWVpPKm5Z9fwcO5EIyEfV0U5YQuo4zEL5tc/7J4V+Zfy5dtmguIVqZ0H+BHSOxBLihFFeeckk0dbnD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aJnAmht0OcCE3c2ODDzWjfx2sMBxeEROpC/ZWFEiF1vA+4FhbIT6efjXRevhjEDg5gDFzG04hucucazQ/3yqIp1SH3u6iB/IZI0VgKBcL07vSdrkRKfw6BruwxzdGKHQXhWWl/Fu5W6pzVHI/s1j6LLWl3w2XYDJs0dHYp1ei9ApXoRhfI1bTcxXJqDbNxLkOLqG+20Pr64mrRtIjPfgMX7Bb9c7QWhLmz+ysPDNdWASCYF/PAnbY8fMjmLudOWxaFeC98jgB/eLpRGgRnBmGCve5ZxiILRL0thzytnCHFt8FTPT5P7bNR6d3+AgafJG555KHigHDxLJyUZYXLe5EoTH1apPnicLkGT5PzqFLPW8mn9lZb9bROM7ppGLQCoDmVvIknBG4xyTPC3PD7vviEAaQIJNMSDrmOJk8JHNtFKSnYiNyREGUEakbEXMo26Fef0UxFYq4Z09nQpPGUjpSUXp1SzGjRwkwkGIQ0pVhDwBb6uVICu3IgHDuW3TO0/ZEqRI6grswZBf5na1y1rv6e2JxgrNIwP99NTP9JqHlON45vC8Ndx7CVj9nQxM5RxfzkohMff0YJUa93ID8wJ76WP5haRny+2tkTeE+dS/7HJIkOmMQKo4Qw/S/A9DSQ5WdoTxQ7UB5IKrseqKa8Sv+/Vbr7udT0no0rn7f0ys2RBXn5tEGFdT5IWIiEzj/Cibyobz7sWa2MGn4/jXdV5ginuYw5GF4+JoljWsfOWjd/B5K8gzSzJO+dfrOyaCiYc3+BbwtOQ2oonckAt9PMM1m/xT1WBqi+MVXt4e81a5qQT4Lcmr8Zr4gr4rcIHg8Opnq6FkWCrXwLquwH/k79BagMYVWzHIIMuIcZ4e/cVLIgbnO+pdkrD52G3tUqckhjcgZXeeea/8S12nIea3aKL0QYSQEDU/oN7PRiMXqVpuowmYfSoquQtutEj4llvCVW6Ton6GdoQTb1YDrMTRcR9P6IrSSnV0BXWK/xO4yM8A4dqD7ejjOMlQp30klcKKNXJc83IF7K6UZIFpYe3IkLVkir7wnp4BtUV/Z42N9yZ7Z1iQA4R3CxvoQ2EKrxRi/UtSIEJ3A5kWBgtJ4hucl9I4hufozCIe4nAGfgfPyDEgPhgIZwiez/dgg0onZ5ASrp1TrVxSI0fo7vaaTZeFkhfvhc2AylYSrQEajOPgXeHE5/iINYrViaiH9qvssrMrEOPGRyYNkv5gk0h+nY5yZYIgeuhodgZhDta9Ney4Q7Pgj41wOpvrqwdOGp9QaluM8EJOMuVQJbqySg1PWhlfSwZ8PFNwYt1t6d/mcvUJpY8TNiNCBu4rU2yCBdAgvbAkJjtxbxAMlIzVkBsupJ0FYv8DV23WF98l0MUU/Sa/5FFCCSYPyjK/2KbgskuFD98qmG4xOuDp8JbzEHBhOf/aKiyQalgFzCWRACdsxRRewU2o8V+PRoUIeXM2ZnDOBjeiMB0PsZCAoH9ngddIdwc6QxYu8j1RTZ/JJ+TeTJqTDi4/KOQXwnVCxyFihNrQ+o6qJzbblpOAN6nY/6MPIM67IR9ihn2wVvVHWPcF5bfwZqS8oIp8lOjd8tCR9W2CmkPIOZRo X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13ac0c56-7c29-47a6-788d-08dd2bd87fb4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2025 09:25:01.3829 (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: F0Xg5n7jFIbnj9KdOFNmGyaAyPlT5K2pMNVGwe11YMBRRMs3e3HiCVLyye4X5aV7cLB+FL0MMrLteBLN0YoBgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7520 X-Authority-Analysis: v=2.4 cv=RoI/LDmK c=1 sm=1 tr=0 ts=6777acf3 cx=c_pps a=2bhcDDF4uZIgm5IDeBgkqw==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=Q4-j1AaZAAAA:8 a=GcyzOjIWAAAA:8 a=t7CeM3EgAAAA:8 a=Tt3KEgD1KPp9yqgMz28A:9 a=Chkcx7g74zAA:10 a=ar1jwvS_AuAA:10 a=9H3Qd4_ONW2Ztcrla5EB:22 a=hQL3dl6oAZ8NdCsdz28n:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: Lo42uPhZVwPgwbf49lde0AU98FkY5Jyt X-Proofpoint-ORIG-GUID: Lo42uPhZVwPgwbf49lde0AU98FkY5Jyt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-02_03,2025-01-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501030082 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 ; Fri, 03 Jan 2025 09:25:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209327 After upgrading to 1.7.0, the pam module path is set to ${libdir}/security[1]. But from the pam.conf(5) man page, the default location seems to be "Module location: /lib/security/ or /lib64/security/, depending on the architecture"[2]. Many third-party pam modules still use {base_libdir}/security as the default module path, such as pam_lastlog2 (from util-linux), pam_cgroup (from libcgroup), pam_cap (from libcap), etc. So currently if you don't use the absolute path to these modules in the files in /etc/pam.d/, they will not be found: PAM unable to dlopen(/usr/lib/security/pam_lastlog2.so): /usr/lib/security/pam_lastlog2.so: cannot open shared object file: No such file or directory This change only affects sysvinit without usrmerge feature enabled, and has no effect on systems using systemd. [1] https://git.openembedded.org/openembedded-core/commit/?id=00eb730291f9630eb70480d37ed48fbadecc547a [2] https://www.man7.org/linux/man-pages/man5/pam.conf.5.html Signed-off-by: Yi Zhao --- meta/recipes-extended/pam/libpam_1.7.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/pam/libpam_1.7.0.bb b/meta/recipes-extended/pam/libpam_1.7.0.bb index 53839e8cd3..1be3c9e2bb 100644 --- a/meta/recipes-extended/pam/libpam_1.7.0.bb +++ b/meta/recipes-extended/pam/libpam_1.7.0.bb @@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "57dcd7a6b966ecd5bbd95e1d11173734691e16b68692fa59661cdae9b1 DEPENDS = "bison-native flex-native libxml2-native virtual/crypt" -EXTRA_OEMESON = "-Ddocs=disabled" +EXTRA_OEMESON = "-Ddocs=disabled -Dsecuredir=${base_libdir}/security" S = "${WORKDIR}/Linux-PAM-${PV}" @@ -45,7 +45,7 @@ FILES:${PN} = " \ ${libdir}/lib*${SOLIBS} \ ${nonarch_libdir}/tmpfiles.d/*.conf \ " -FILES:${PN}-dev += "${libdir}/security/*.la ${libdir}/*.la ${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-dev += "${base_libdir}/security/*.la ${libdir}/*.la ${libdir}/lib*${SOLIBSDEV}" FILES:${PN}-runtime = "${sysconfdir} ${sbindir} ${nonarch_libdir}/systemd/system" FILES:${PN}-xtests = "${datadir}/Linux-PAM/xtests" @@ -105,9 +105,9 @@ python populate_packages:prepend () { mlprefix = d.getVar('MLPREFIX') or '' dvar = d.expand('${WORKDIR}/package') - pam_libdir = d.expand('${libdir}/security') + pam_libdir = d.expand('${base_libdir}/security') pam_sbindir = d.expand('${sbindir}') - pam_filterdir = d.expand('${libdir}/security/pam_filter') + pam_filterdir = d.expand('${base_libdir}/security/pam_filter') pam_pkgname = mlprefix + 'pam-plugin%s' do_split_packages(d, pam_libdir, r'^pam(.*)\.so$', pam_pkgname, From patchwork Fri Jan 3 09:24:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 54928 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 082E9E7718F for ; Fri, 3 Jan 2025 09:25:15 +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.26894.1735896309139477117 for ; Fri, 03 Jan 2025 01:25:09 -0800 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=30983b852f=yi.zhao@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 5038Xc0n018516 for ; Fri, 3 Jan 2025 01:25:09 -0800 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43thqq4rf4-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 03 Jan 2025 01:25:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a4zFrDoXLmqHMC+CtNDNYuAGwda7Qw8Y0J8+np9AC8Ce7fmDyqa+m24Ec/qNliQZFfFmCLBS67+CHlNo4r1GDxquv1P42Mj2Za7MDrvwm8/f2L5zUgXllDgDIHKekdIFp5uOLRG567FW5VOHTIBuIK3a+QtZPdFErX1BDbrFCP913+1+xGxeEPhe78yVF31zWhgZyUdqwJGrndCFeRYTT1yiTOTifXh4Pa4XoQemagHmHMC93vEoKw0IM8UoQgABcVWTZA+xh5B2ll/G9lujaDAj0aIAuSzjkRvbAifUWG6KYe+2jD+Dpxel+j0jK8gpIXJAWz7qXCawbMCigmnYFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qJAlbO+JyHmudevhGSjDUZZ3t/Uoa1t9evWxXIrNNKA=; b=x5ioRCT1MvxWvOvfDedub683Gxfjd8MYVqHuuSOnnoucSLSvdxDYqIYEVbqMYXnjjP6Hz3XRRfLXvsY46iRlTIzYhY1bFLCPNU46BfXmD87NKcHv0jcwt8XCB2sjYVKauZBY5wpPp9/VBd/qx9IcevNqn41cKXZOJ+4e11uQJjoF3ZQNh1/0dzBLmSTeOJJBEpHMESMCZnknrhP2Pp3vBkNCAq4xb1Jp7WINnrXPwuHk4Su4dJ+CBPVJWozX/i+HObrsObbbtgmtyZtnvK9/bcP+wvupkeI9kpPocJLLzd2wXc6NvKHv9zDTuVC12E67WGa25q0bayLb7mPzZ7ixpQ== 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 DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SJ2PR11MB7520.namprd11.prod.outlook.com (2603:10b6:a03:4c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.12; Fri, 3 Jan 2025 09:25:02 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%7]) with mapi id 15.20.8314.011; Fri, 3 Jan 2025 09:25:02 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] util-linux: replace local patch with upstream patch Date: Fri, 3 Jan 2025 17:24:44 +0800 Message-Id: <20250103092445.566172-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250103092445.566172-1-yi.zhao@windriver.com> References: <20250103092445.566172-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYXPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:403:a::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SJ2PR11MB7520:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e14fc66-26a0-497e-c290-08dd2bd88060 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: KiM2xefOQdTNN7FIrdH+HVhlQaeHDcRYZykcAcYYTO2RGDfHIBj0Xc7DcroRb24A06v83a/qf0fk1reJH4U81jyddSmbBjw/aW06a9bfuiLVnXJtHOBT9mCmkUd5AaE5egQQ5YaZMTGf47bPkvtRIx3gDq++iVQSI9NsLSCYmd3PgxR7uw/3Nt7nSK2WBrfuwYiRAvPk63wt3pXaAkrZV3JXJxdyTvuiSmRyXcOucIur25MeFcjsevvj6OCzCJI9HAv701WEuE3ekNjAf4JGYTmLjMowfLgwYxZE8pZ7vTXIJid4a9I9ZvWXq/6KEbf/1HOwwy+PbrPxCYTdKl/rRiq9Jy4tgmm2WPDmuozfP2mGw9aa2wGh+oCtvYU8gTrAKMOyePwS3uNEvYXtsxixJkpREYAxtjaNkrIjn+KE2rHl0Hn8+je6hpljNFE8c3/OmC/Ll9HPC912kIwUty65T5URqcxAhJrfETa1JUd6cd+nzw9vLGehZmCgTJyA+4ILRxK/pBmYEaS+DmuvAFlAkJmyE9G8r17JRpjY4LjLDh7fboz03apR5cMRWPdEr/7CstuceTllprjB5U5KFPR5XgVgwxmSUB1WvlpO/4oIcD5tqjMTJGk3I3uTisKOGbz461dFkDjKiLT0I7rhIaGJoQI/q1PoVUEDpcKkLc6xarPmWpIU7BEIqRPKkWDTueMC7n1OFXDONIvW4zfCjrVTXD/l1+ayqJPySBJtLMLsbs/8LBrNECL3lwK9+Nh+grj9PC3mxVADBIMOHEvNijA7CxK+XH2cxBCcfFdrD95/xKos/lMY2bYsfsJXNXMNphDmMmj1e9GSl26WDoWH8FlTFL/t+c7F/uuNNMPBGhBGfugsu/wCkgtfEBQ23fI+pV8pmg1GSvQg8iuIG6/wVNk1MINwCjHxb5s0VAtnEABdlP5Ymxq1atjibEUab4McynWcNVFqhGrvlBeSwxO5NfCpM+CWQSojEvz+7pn8pcXMJye7GMLsBS+h3EJW16gMKxHr4SmgEx1sCjatJtSMcKqEFH3KhrZCPwfaLDhQL8lfJwk3fvEIEfcFSeo/JOKUFq3wae1Wmq8AjNwxRA4Ggvcr7EB2sZ0dyZExtfdMcqoYhk+bRUXwFC01h42ulkq7qUb0FJCR35f9bK4uC8nbYUETFJcAuhbu4S3vLbKTEm2MOR5Ft6CPT90qN6M+c45X/JR2iFjNXTpFJkOefxkkaHrtBotzgx8kwuV+X3JnKfjkHT8ehSDzOYrBRPWfigQ1AbhyorRNTFFdV3kjmZPnEWe8EYtJ0Uj/ar0FxnymxQDP0yXdI6upNrrIh7xB0E4vQmWZjkmF90GVtzadt4Iqh7ZxjfdVvsKjP0ESLCHH8s/2fdpZQNlFUYhT9Q6GltB519pjJfsexjn7vdINlW/nbhJYhc34uwHhPEqgCrlVUy8mAA344byodQN2nj3bcfe0NQVmaalqQytKeJtYaWjXOA5g/A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: waozyElu0Z6irvF0DOMRwwJGQmMBvDkfUg6Vt9NVE54y5ahEm5zlSvzrCxMbZYLfuiK4GH9wLhDcAM0nYG83B+k8b872fNWbAZhfD2oUgKrobIJ4X8AY2HRp5SjLLJYYJ3FthB0x8wgTvl4rC8DuYjxSxN6dCrUmRjYIOzg6mbhvOMz6eiJPG3TeYW+7oVx4gkmrvux4pwYHxjyRA0VdaHSjDUjgdMqUgsySkB9NIHzYBO837ImULBRImZDHSbaxfRKHII/+YhOMwZA8iCtOuNHwsCspWeBFD+s9/5DNo+WXc2g+54vO1JMoTSbQILVucyafZLK4j7KPj9CpZan5qFvKo7NEVdCa2mnDrVtYUufb191e85S8eNt6M+NPZ7Fxzy1Kap7d/UkB7rwpM2MFd4JOQKEx3XIo3qSylj738o5X9lXZTjrAWfbeuK9Cn07q32Vx0rEPntXxYWkhDm7/XZh4V/XpRSfQaxXBjL0hid0/vjCY+CdECmMljZFqYFwXPvW3UVzU2F/hc/uYMFMEcGwvCgCPUzJLF87VZcTbKQUEWITpIYXcjnb3dzNQyA8GCn211tl5CD6r2HAS8aF99Vl+LyblhBXcuuxz1h8fmc+8b36BK9esb/aHCwdKhaqR+QCgnQWmNs5XW1V1kmOkUXENdIleqtA09Q9Q3c2VZU2d3H+y4kki+/98FyItvOPJFjguPRuLEW8T4HDWdNlVFhW4K2co+fNLIDfN5xI17M/ErvdPFrolEGOuXG1v6MqM5/4YO4n7bgK7WMkPmhn7A4Snr7bnUZ51S4bIkgA5wEqgjwVkQrfLyDpRtwiQr7Wg2EG9ZBuw+US9GcAb4Gul0TitrXKnm6gFXQCx6JdaASBEULFHTw8gFrmCaGJcqqUn6AnBxb7HdS0dU2p4u2ynKnfhvyYuZY4jlfWeyW1+uZZCQut+pSvnUH1O0LqIbo53QHsJFDysI1SC6PlGMxjyqPw2raQRxKno7akax82Jv5Anp/Al+SRAiUxu5cQLFo34J1/RwcwuU9Giy3zhkU6AZab8P6tOpYAbmMufG5xavOimxka/7PMPU1uL3+ToUz4i0FVryeDdRJngz84MNM17Oy8R+vyIokFvhX6kEAEuuKl2YILGN7b1TDA32jcUoVi4rOCZCc5+g8HIHLp+LbZ6cGyWWmSeZ3Slvaoli/moJDaHAdJjeh+g2XBz+uuH8OHVTzNouMtxcXjV169ylJ99ubV5AhvekNa9Jd/zFWPZfD0yGzF3EOCr7epkI3k3H4gTUYJ1L49UeMDddeB0h5WJcpOTh4hZPPwntuEpaDUD6nh1tUDccpdQFiXm34+vPAB/PEJKor7AaUqIsNQs/v7XRF4EnOWsvOc93DpFARlKU2JdC2mWCxJfcUptvLvDm0VBZ10imQcU8KMinltPNPZ9+065Y6MLDHQznycZ9qMSwc3jGMSERUQzlUPbbe1o00oupKn9ZpAsrXJ8xAosJQtcFQt4/z12t7z276XBdhyYWFnFhOrHxJtxHncfLj1S93EI3UbYA5h56ahQxZNcm3B8cvekFTnZ4pTuZxmz5/oSaedRQP67B7GJQZ7Y7ezv/7yS X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e14fc66-26a0-497e-c290-08dd2bd88060 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2025 09:25:02.5031 (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: jVBQT2PVsoy8JhZZhnllSVHb4puc9oun30vm/r5Q3z+5eRh1XWV1DuQThu98KfVqWZMFk98dqDqTMP/f7gcMyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7520 X-Authority-Analysis: v=2.4 cv=RoI/LDmK c=1 sm=1 tr=0 ts=6777acf4 cx=c_pps a=2bhcDDF4uZIgm5IDeBgkqw==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=20KFwNOVAAAA:8 a=b_pyp5wphmC0vpvZUIUA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: 6d7GZ_mBaG-E-SnV6NcB1gwyVl0cJWk7 X-Proofpoint-ORIG-GUID: 6d7GZ_mBaG-E-SnV6NcB1gwyVl0cJWk7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-02_03,2025-01-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501030082 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 ; Fri, 03 Jan 2025 09:25:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209328 There is a better solution upstream to fix the pam_lastlog2 installation issue[1]. Backport this patch to replace the local patch. [1] https://github.com/util-linux/util-linux/pull/3173 Signed-off-by: Yi Zhao --- meta/recipes-core/util-linux/util-linux.inc | 2 +- ...s-make-pam-install-path-configurable.patch | 65 --------------- ...x-securedir-and-pam_lastlog2-install.patch | 82 +++++++++++++++++++ 3 files changed, 83 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch create mode 100644 meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 1c066631f3..1dc30c0535 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -38,7 +38,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://fcntl-lock.c \ - file://0001-Revert-autotools-make-pam-install-path-configurable.patch \ + file://0001-autotools-fix-securedir-and-pam_lastlog2-install.patch \ file://libfdisk-cfdisk-and-sfdisk-sector-size-improvements.patch \ " diff --git a/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch b/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch deleted file mode 100644 index e9f01fd0be..0000000000 --- a/meta/recipes-core/util-linux/util-linux/0001-Revert-autotools-make-pam-install-path-configurable.patch +++ /dev/null @@ -1,65 +0,0 @@ -From af5b58cb77fc8e2e2e2f26aadef4b773b950eafc Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Wed, 21 Aug 2024 07:50:57 -0700 -Subject: [PATCH] Revert "autotools: make pam install path configurable" - -This reverts commit 0539b1ebd26f6a168b822374d7b167f8ef4a1997. - -If people want to use /lib instead of /usr/lib as $(libdir) and want -lastlog2 pam module installed in /lib/security, there's no way to do so. - -Beside, we have: -pam_lastlog2/meson.build: pamlibdir = get_option('libdir') / 'security' - -So things are not in sync between Makemodule.am and meson.build with -the original commit. - -Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/3173] - -Signed-off-by: Chen Qi ---- - Makefile.am | 1 - - configure.ac | 3 --- - pam_lastlog2/src/Makemodule.am | 3 ++- - 3 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 54e0fd497..3f801c686 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,7 +56,6 @@ usrsbin_exec_PROGRAMS = - man_MANS = - pkgconfig_DATA = - usrlib_exec_LTLIBRARIES = --usrsecurelib_exec_LTLIBRARIES = - bin_PROGRAMS = - sbin_PROGRAMS = - dist_usrbin_exec_SCRIPTS = -diff --git a/configure.ac b/configure.ac -index 82d0e4bf9..35a70aba4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,9 +120,6 @@ AS_CASE([$libdir], - ) - AC_SUBST([usrlib_execdir]) - --usrsecurelib_execdir='${usrlib_execdir}/security' --AC_SUBST([usrsecurelib_execdir]) -- - # static configuration maintaned by packages (e.g. /usr/lib) - AC_ARG_VAR([SYSCONFSTATICDIR], - [Path to static system configuration, default ${prefix}/lib]) -diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am -index 6d2365378..f9a9b6b41 100644 ---- a/pam_lastlog2/src/Makemodule.am -+++ b/pam_lastlog2/src/Makemodule.am -@@ -1,4 +1,5 @@ --usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la -+securelibdir = $(libdir)/security -+securelib_LTLIBRARIES = pam_lastlog2.la - - pam_lastlog2_la_SOURCES = \ - pam_lastlog2/src/pam_lastlog2.c --- -2.25.1 - diff --git a/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch b/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch new file mode 100644 index 0000000000..272e574a77 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-autotools-fix-securedir-and-pam_lastlog2-install.patch @@ -0,0 +1,82 @@ +From f912fb1bbb0ff5af2736d154347a3b9fc40476eb Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 27 Aug 2024 12:00:21 +0200 +Subject: [PATCH] autotools: fix securedir and pam_lastlog2 install + +Addresses: https://github.com/util-linux/util-linux/pull/3173 +Signed-off-by: Karel Zak + +Upstream-Status: Backport +[https://github.com/util-linux/util-linux/commit/9c787eaac43f5f01146f792b0239f587e4b81202] + +Signed-off-by: Yi Zhao +--- + Makefile.am | 6 +++--- + configure.ac | 6 +++--- + pam_lastlog2/src/Makemodule.am | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ee2d553..a5dcaea 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -56,7 +56,7 @@ usrsbin_exec_PROGRAMS = + man_MANS = + pkgconfig_DATA = + usrlib_exec_LTLIBRARIES = +-usrsecurelib_exec_LTLIBRARIES = ++securelib_exec_LTLIBRARIES = + bin_PROGRAMS = + sbin_PROGRAMS = + dist_usrbin_exec_SCRIPTS = +@@ -155,11 +155,11 @@ EXTRA_DIST += \ + # pylibmountexec module must be installed after usrlib_exec libraries, + # otherwise the libtool relink step will fail to find libmount.la and + # will try -lmount which is possibly not available. +-# The same for usrsecurelib_exec and liblastlog2.la ++# The same for securelib_exec and liblastlog2.la + # + # So introduce this dependency rule: + # install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES +-# install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES ++# install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES + @verbatim_extra_dependency@ + + # +diff --git a/configure.ac b/configure.ac +index 0375d29..134cf38 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -123,8 +123,8 @@ AS_CASE([$libdir], + ) + AC_SUBST([usrlib_execdir]) + +-usrsecurelib_execdir='${usrlib_execdir}/security' +-AC_SUBST([usrsecurelib_execdir]) ++securelib_execdir='${libdir}/security' ++AC_SUBST([securelib_execdir]) + + # static configuration maintaned by packages (e.g. /usr/lib) + AC_ARG_VAR([SYSCONFSTATICDIR], +@@ -2767,7 +2767,7 @@ verbatim_extra_dependency=' + # otherwise the libtool relink step will fail to find libmount.la and + # will try -lmount which is possibly not available. + install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES +-install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES ++install-securelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES + + ' + AC_SUBST([verbatim_extra_dependency]) +diff --git a/pam_lastlog2/src/Makemodule.am b/pam_lastlog2/src/Makemodule.am +index 6d23653..a2becac 100644 +--- a/pam_lastlog2/src/Makemodule.am ++++ b/pam_lastlog2/src/Makemodule.am +@@ -1,4 +1,4 @@ +-usrsecurelib_exec_LTLIBRARIES += pam_lastlog2.la ++securelib_exec_LTLIBRARIES += pam_lastlog2.la + + pam_lastlog2_la_SOURCES = \ + pam_lastlog2/src/pam_lastlog2.c +-- +2.25.1 + From patchwork Fri Jan 3 09:24:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 54929 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 0D0BDE77199 for ; Fri, 3 Jan 2025 09:25:15 +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.26895.1735896309821693155 for ; Fri, 03 Jan 2025 01:25:09 -0800 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=30983b852f=yi.zhao@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 5038Xc0o018516 for ; Fri, 3 Jan 2025 01:25:09 -0800 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43thqq4rf4-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 03 Jan 2025 01:25:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X5QFCEC2SqEG5hC/HJKRvboOulYgcSM5iUMOZkY3WhrLqzV+UQlI3Bgv4rwib5MOmDu/AgrVLMvcSlSxDET+gEkr8/IGBl5TbiCHTVT2WUjRSkjZvecaBCOqOYFdYkXf7yyIzPcDjDjAvYb3gl1Y3RY4tzuS01HmC+qCUVqxij86cqXlF4htbmMxla0I3ZGru9z+2k0DkdXsGBijxLXTJDTOsOa4jTlqaFMhd0dIil+uOWuLwbXzfbdoASRQi3qPGQYxIrPzj/D76YOqQ0mQJAzl9Vifx9WEqahhm28QGUnInwdDfRuhyaUtrhu0yhPKVKWDdq0uMC5iQTSZmTTZoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=WrvtQPbK/KBQ9anXjXxK8XZeIvASkMuGhb7yEHqXlGg=; b=wlO/kGJE+gqLQafJzzQ7w+hRiwwz0XQ5dlRzoI6XXl4Cwh+h0J0aC+CzBbDSf/1On2S25mbl/F5YbFftz7FZ1C+kumTV/ySCfBlZXWjw45bxMj9MtWQM4GSgPuSWisFHz7i0Auc2dU5y1Yy3JjHBs3bxjWvD10D5KHLAcyhF3XMsXqgLY32iFbZHaxJgd7DwGoBSKYqTg2moRCR6VFzWsDp102Zn/c7noJhUUSUEN5TUi8kLBuZJGojuCP44iQ1cV6rJckRpVvEkssquaw0OIbC5PBkkgaUNgPg34EAV7xNOKv4ZoaYjchYmNCE3z22ZSXNAlP9nqfxYM1DdXLDc+g== 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 DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SJ2PR11MB7520.namprd11.prod.outlook.com (2603:10b6:a03:4c2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.12; Fri, 3 Jan 2025 09:25:03 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%7]) with mapi id 15.20.8314.011; Fri, 3 Jan 2025 09:25:03 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] util-linux: add volatile file for lastlog2 Date: Fri, 3 Jan 2025 17:24:45 +0800 Message-Id: <20250103092445.566172-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250103092445.566172-1-yi.zhao@windriver.com> References: <20250103092445.566172-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYXPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:403:a::19) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SJ2PR11MB7520:EE_ X-MS-Office365-Filtering-Correlation-Id: 06764975-eb4a-4866-de14-08dd2bd8810a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: oHhp0hnm707FT46Rqy7ckBqcVZbSWsyshchd0eSjYP6Gt81depdDJ3+OXpIAoOTyFRrRBNbvsJObRTaYzU+d90uai99u5Ny/cgrZKnpedqDv/WtP1nOLPbL3rdRcmQFWBCullyKGR+ybT/ZyfYy1gUsEyAkCfIrtPIzORClLhqvg9yCNMTJbRdw1xEuvHkHzUonC4anVztiGtPmHYvUGRA3ynnJj8zPpIOmhWc0N7+z/VHLce9hIe5sPBU0SEitSBpF4IqLiKIjkIQZ2lFAMAIwSdLU6UUpRmWjb72ut1Za519lXG79EgyTj36AAse9K2FPVsmPCewRpHb8o1v8ADukRSLFefgWbZtpFZr4FxanZjzQkDRuU5OHoCtfkyvM4/4hUjUeV6UobJ+OWflxMMFOShX8k4denJehxFh8NnddjPlsmLrurMQO4u26uotyLfD5AyH7JwLjF1Ak+GXEXIbncY16Nu8+Z81Gd7Zn0wj4kRzg7dmmeiYCZ2DgQVJCd5plBMcIDqIdtZutTS31eB0EVTq8E4mwjRGdq6kS+lcu1AkIVAi7ArB2w6lUNB+K8Df0hkKjEEIyrdECkn4wKr69jAVUQuoH8cfkVN5jd+dwlLi7XQBxlLmkSnlmVXv/2VLkOoqbL9ykm2cGor2Ly96ixTrlX1kSnfqYFmNdM8GznFlX1IAmZsjW9Y7PpQj4xCjMB9Or35tFubtOfrrYedhQS03zFZUi4gkztZ9fR83dOULUIfgCcVtEPiNUehu0Y0/xfBjZ0lZhJ3HssywCgya0vB19cHCw2mKMdCkwiCYDFeEENRYyvfo+U8V4LTrilXlKTCCQfYnX6Kjeu8lhKUauw7pBDvcLbELhI+QPzqqQfiCUXHRhC2aryz4um42yOr4+rLfG3nX54kOsLn2SXHJl0iKE2ATQTh/5ZlGoc0JOT9V9NiIDmQdT136lXY19HzTFav/oj1SFU47l2Kw7fDsOi2UDml+UAGh9rltGm2bEkAV7BUtXC5pIjQ9Vix/ckik+wDJPubpbvt1kj6itsad+hrbOY7uXkdKyoMEMJefL147uHeIsu57BqCoGTrwCo4g1D4nUJntsofLMCY0YhaRf42ShBrulmre6QIAUlLAXkoJcAORifAqUyDtuMFVN7AIYca0AYKtSlrm5OxrlgSOfsFE+KV9Gs57eOJdX3PiRSAw/91tVCaLbV6twsqYZe/h0BJwULS1hCzzn4ATiS8T/16W4QH1Hzu7+HmheEsyJ3lrgAXNmgezfVxfEo5OGo/WqQWnrS5wJhInM2fu1JGJKt1v2ggxB8Q5tWatoOwn6SsmPzUx6/uU3zrdSROQ34GBpQjyqMAiC6Fr2YniFuvtXgi/Br/CdbkOgzM+wQMRHnq1tHxcuRg/yRnVrP2mx2DPxbJhU8xHziN5NMWs/VyGHn0MJc9g7iV+VsxbNbA5wf5OADcHMGHyUBAt+k4aqf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ijhXLDcUUdA+gYdfLOsnM/s1pwCFHq0tH0ug9CwF7NRJxbxu6ld7lJOZdLpPkzjTABZouh12c4FDmwUtnxmlIswq/SfGtI8io974um93UHMLv9bCnvNqpPaQjCgavlQdinE68xmhwHmyo51KFzCEWn+39y5owj2TrCJvdVz3hrmrl8YabseMAi64wEcJuS+NjdJ7XaVuQE3tC12axnhF69+iiFLtjqcg8mf4lNxP5C1Kz1mkWuz1lU3e3Xh4cJ3rwoXbgyyrRcqPecyenD/Oljpu8nmBT3m3ePYFQZmoxO7ahSi/Eu/7vmm4xAkSdX5SwUCvbYGeVe6DxyOqhM/JJqvFTzH0jYZmpFeNsoFPmswIBdS9vTU6ogN4qWC+XJsOvjnYNBBoT4rycpMXNaaw1yHx0N9KlI53pD+IEGBJFzUFLzzAvUY0walzithweTQri8lKK2wIn5uzhILW0/aBnq5RklmsFEvHnRR1m8LDKj33r0mv54lOp7ZZCDn22SaOFeqGGoTfdsao8gV0RuiVga4O2h8LYxGEHoqbP3Ch7KSzxY79VfhytcaDu3P36cDwdPeNF/9nO0t8BeaP4zxL4mMWcu++CBynoHdroX9uQaV6wcFI4l+FsvvKGdZ1mzcp/EkzQDur2Yf9d3lOLwg3WgnuFDpUJaRpFV7d3rY9Qf5gYBp95ZJEOByO5mDTuAMA58xshdHPaci7eitFQDPH2PvCP0DLcM8wCWAU6gno/cKstdoItsj7CyBdPAtrlPoHOpVYLaE1NfbDURi4xXjgWQd8rjnnlpwWJv8dKr2MTlGnxyZ18eTrGC85NQiMSQCRPnIskXbuvMhujEyakmCPPkgKQGAldppuJ9MnAg3gqoyTvFNSfox/PQ+PRg/OoLEmoKU9OW56b6KQ4yQR+/m9tpO7wHG7wAzuyOuSpNAyPeYsvZ0kCC8xWbcJ8CBiee1mOZdpTb6bUV5sekMlyIWAdODHJFwsLcR/9WWs5tGm7mDkWhBdJcczntV4GmPaLXoMM3GGZIWwUrRwVcRbp72vfyJ9hUIl6+baxNI5I4tiOeDH/p0tvcx7NCUttrnC58DPTeh5kgnksxuxmJB///VI/BxgwGpGD0NOFQ88m6cD2+ti7im+7GdPuJbpmIIfji8/XPuWI1pCimZsFfzHRnWIGJVTWdN16KqjWKVVhtyTIVoMJerHabW9EI5ADGk+y7wNZnJ8AbLEhLPVp7jBav0ezzgqCuuQK5glXqy3u4HAxB4kIVpclmu+N/rI0fZtL7olaYw2s3n7WYVm9CeUo5jmnf26oZPeca6d3sYbyny/7F+sGRjFDa7L5BIYz+F+yhz88vWP2uxRaChpx0F1UEylE2kF0EOdOSgg1fC84j0NoxwOBnhCd6RvLE+lM7u3kmj681hdKWTcCvuY3p7qz5G2BDe0Uzm9yw3M35s9x5WmnyvCWYUS+joP//CKrPp7SGY5El6GIouicIabI691KQ3yxZ551uw+6N4hHdPVsZokStUzrVubIhXLeFaaliZZevas0qku/gWC0E9Hm+2Lzd1pghbf+V0WW2py0o08+atb1nbs2NAOICKwnCwYCcWbUM3b X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06764975-eb4a-4866-de14-08dd2bd8810a X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2025 09:25:03.6061 (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: WMsk3z/+SpH+73JQEnbam7FRZyNu8kqv7fTaokbXPPxfZqN8BTI0BsdW6EeIRODZfTi2CXGgXpEeP9yW0kziDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB7520 X-Authority-Analysis: v=2.4 cv=RoI/LDmK c=1 sm=1 tr=0 ts=6777acf5 cx=c_pps a=2bhcDDF4uZIgm5IDeBgkqw==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=VdSt8ZQiCzkA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=kDmmQspSaqKm4nw16goA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: X--VyYLuKhr6r1TlyhuCq4IbbLFgTjsB X-Proofpoint-ORIG-GUID: X--VyYLuKhr6r1TlyhuCq4IbbLFgTjsB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-02_03,2025-01-02_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 suspectscore=0 clxscore=1015 impostorscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2501030082 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 ; Fri, 03 Jan 2025 09:25:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209329 Add volatile file for lastlog2 to fix runtime error with sysvinit: $ lastlog2 lastlog2: Couldn't read entries for all users lastlog2: Cannot open database (/var/lib/lastlog/lastlog2.db): unable to open database file Signed-off-by: Yi Zhao --- meta/recipes-core/util-linux/util-linux_2.40.2.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux_2.40.2.bb b/meta/recipes-core/util-linux/util-linux_2.40.2.bb index 646bc05564..2c7dd154e1 100644 --- a/meta/recipes-core/util-linux/util-linux_2.40.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.40.2.bb @@ -129,7 +129,8 @@ FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" FILES:${PN}-lastlog2 += "${base_libdir}/security/pam_lastlog2.so \ - ${nonarch_libdir}/tmpfiles.d/lastlog2.conf" + ${nonarch_libdir}/tmpfiles.d/lastlog2.conf \ + ${sysconfdir}/default/volatiles/99_lastlog2" FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" @@ -222,6 +223,12 @@ do_install:append:class-target () { install -m 0644 ${S}/misc-utils/lastlog2-tmpfiles.conf.in \ ${D}${nonarch_libdir}/tmpfiles.d/lastlog2.conf fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 /var/lib/lastlog none" \ + > ${D}${sysconfdir}/default/volatiles/99_lastlog2 + fi fi } # nologin causes a conflict with shadow-native