From patchwork Thu Feb 6 17:14:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Can Wong X-Patchwork-Id: 56794 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 7B5A9C02194 for ; Thu, 6 Feb 2025 17:14:26 +0000 (UTC) Received: from mx0b-00300601.pphosted.com (mx0b-00300601.pphosted.com [148.163.142.35]) by mx.groups.io with SMTP id smtpd.web10.46958.1738862057548254522 for ; Thu, 06 Feb 2025 09:14:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@emerson.com header.s=email header.b=vgyhjPrU; dkim=pass header.i=@Emerson.com header.s=selector1 header.b=4XvyOk1u; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: emerson.com, ip: 148.163.142.35, mailfrom: prvs=1132ee0a8d=can.wong@emerson.com) Received: from pps.filterd (m0144091.ppops.net [127.0.0.1]) by mx0b-00300601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 516GeQTs017094; Thu, 6 Feb 2025 17:14:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emerson.com; h= cc:content-type:date:from:message-id:mime-version:subject:to; s= email; bh=9QXIKYbp0tq9hlABn5RUmwocdwbmLy1lVpYeflj3bUg=; b=vgyhjP rUeYrqk4XFkEypu3ke+IXXg0+zbPHA8B3CZI44nYdGq+iIb+Hntnv4bNCmC0bCBQ XmtYZZDWmlv/mF7L/hEx3LdA+MmfsgaYiycgsT6tyJFig931buMQjpqMbZyM4p5A UrcpJ0Z0Rjfe808bwE2vf98GdyjHdk0O3ICVMYAbRU2H5X3skEt+BwVMbwkgJxxk h8Ck5RYGOv6IXLoK5slviZ+hvOwtvUKfXMXgV2Q+L8BXTVabiwKO83wXkugOvP3J WafBtfCvePyM+CHImZfgrD4sOUs1wg9XM93T3h/KiQ7IhKOevA7O+JZnHzxjQpHT peNlXcbk6U/V2hRA== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2046.outbound.protection.outlook.com [104.47.70.46]) by mx0b-00300601.pphosted.com (PPS) with ESMTPS id 44n0qa0p1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Feb 2025 17:14:16 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KV4iojpzDk2t2+cz7075GuddanNXICG+ZvyFHgZwAZl1ACva4sD/ldg41QLWPpuJJ6Gjk76p6QjP4r3mJ380+CLz1d7Q8rPtQCx/sjqKZCyB8yRWJt7o2azB5nDca33d73d6bJADOOPQ+Onfjl7dILPYgcc1OCbC0WDaMRw2MbIgF0VV+nOBYGsDqbAgH57O8hd//wptDrFei7cIp6UOvcOvy7tPPFTmyaYhysyGfN6PkEDGvD8Zggw7zawZNHMymNBgEyMJizs4zOcj4vQ45XMiNUw70D9SNqfxFYpp1mLrHVfDiuvLE9Vk8C2pqt7oBGmc/726A7XmwsaX7f8Kkw== 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=9QXIKYbp0tq9hlABn5RUmwocdwbmLy1lVpYeflj3bUg=; b=ss9qAaCJXGGLU/gGEc6s/BkJiTd61IGZ9uvTsnuVTuJ1+56E8K2IDq+NkBj2t64bGyyglzgyg2HZzeOjZg5zW2Och3LTw5hfuQkViGy1C50nsmjAMe12a3xQUunA2PuXWwYvhCstJfIVx5tc/Oxl76m2hfsq2Nu10bSde9VhngiT4uTTYKokELCT+e3D3y1cDc9GqmruKtD8+6mOSywosqm9mfQ7phGpwhSa8fA5/ob2quAsEtLPri4SFoZckij6I7TeTvkOqbpoeJK8Qzso2s1cWvzqIFfUPlVj02KX42oVNOscWgmJ9VGyWxvQPd2jrxCcurfpI2a4KlOfWXDIsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=emerson.com; dmarc=pass action=none header.from=emerson.com; dkim=pass header.d=emerson.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Emerson.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9QXIKYbp0tq9hlABn5RUmwocdwbmLy1lVpYeflj3bUg=; b=4XvyOk1u0HPeAGiouz7B7C7/xjwvtt3BYmE3Qyp7SWTdDxPPmK5FKLNEcfcdKYTYhjXhKPeQEz9nBaECcH5T0HD5t3ZZDQlCR6LsYZjNjVUzay9WpCe56cVH2bD5si712Yy8Nf636kCH2juO4CcO2VidtMgcDAjOmm88j2+avt7KD4jX1x0Z01uewNAeCjjwftGOczurSL8iy+7EBw2mmO/tnhdMYCS9QwWzzQkA3c6FzsDWl7nqoEEEUEcts6lFfqy03W6BMMGiNATI0J8oerLreColNFgZ37OAkN1Wt6t7z8yS/xP0+lxjLzqXTbfZtE84CFhVN9b/aCobe5+YGw== Received: from IA1PR10MB7418.namprd10.prod.outlook.com (2603:10b6:208:445::11) by IA1PR10MB7540.namprd10.prod.outlook.com (2603:10b6:208:445::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.10; Thu, 6 Feb 2025 17:14:12 +0000 Received: from IA1PR10MB7418.namprd10.prod.outlook.com ([fe80::76e:a3bb:ea4c:3f2e]) by IA1PR10MB7418.namprd10.prod.outlook.com ([fe80::76e:a3bb:ea4c:3f2e%4]) with mapi id 15.20.8422.009; Thu, 6 Feb 2025 17:14:12 +0000 Message-ID: <18f583e8-cc9a-4c36-8b20-3fb9528449dd@emerson.com> Date: Thu, 6 Feb 2025 12:14:11 -0500 User-Agent: Mozilla Thunderbird Content-Language: en-US To: openembedded-devel@lists.openembedded.org From: Can Wong Subject: [meta-oe][scarthgap][PATCH] audit: fix build when systemd is enabled. Cc: can.canwong85@gmail.com X-ClientProxiedBy: BN0PR10CA0016.namprd10.prod.outlook.com (2603:10b6:408:143::23) To IA1PR10MB7418.namprd10.prod.outlook.com (2603:10b6:208:445::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR10MB7418:EE_|IA1PR10MB7540:EE_ X-MS-Office365-Filtering-Correlation-Id: 93c30c52-cdd4-4459-090e-08dd46d1ad29 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|8096899003; X-Microsoft-Antispam-Message-Info: =?utf-8?q?jgAXM7uerdClIOPmX67TS+LUF7Q5osb?= =?utf-8?q?Ce4wXoXRUN3ceheHD+v3J4rUX2gEgxMQkWnIzbexZtH+mPJ7Xp4AAPiYX1RKRbziF?= =?utf-8?q?SustJK7EmdxEudFdd1sXUQNR08iSJxO/DFsERx2+FA2w6rOrYOg1UyBMAPBR0qyuz?= =?utf-8?q?dvHfce+hsz5kr34LW6ZmBlaBnOXXJ5tz0ca5jbM4F9OF1uNLblUhY8GOoG86WMP1u?= =?utf-8?q?umCqBkq5Uv4UE+wR3ExmL2y5ldG5AO5OVj2RHUiR9rI0pfYvqV8HMutE5R7BgM1gJ?= =?utf-8?q?wZG8uwsJM9e4rL8TIW8OO7oe4ZN0EvAP6vF0hwTbu4NiY3zr6VHICBhULs12c3XF1?= =?utf-8?q?thIGdYzlSs9NQmGhWcf7GxqV5GhtbT3pzb6zJtytiL063adOoUNZNIgzF2A1ZzI/C?= =?utf-8?q?cSOA+Z/aiQkdw3TWeoP6674C2bcyQf8nboaoARaAZy3C0kZt9PFJON1HHjV3Gwhz4?= =?utf-8?q?1MrnmCC72Xl9Vqn8MxYaSHBTH5ynqHT96G27JjBIckR1v+PXGZpZNibxskqgmarMI?= =?utf-8?q?z6mPp62htTRo84aOkChtbgHywffjO2lxDd4479Zesoyuxv29Z+zFUg2bHcOFoz8B0?= =?utf-8?q?6/bnei58U+cVQA0scqVgTUkl8xl+mFu3CEx07fvNGpCqeyQaW7ooiEm/dFxKYwNzd?= =?utf-8?q?6A9+x52EqHyQp8uRe7VuTlL/B5hTpa+ThKH9Gx4FI/UMTbteDh6zmpx9VAh/QT8uE?= =?utf-8?q?WSIs7FYnTfj4kVi0g0AvmNOi7SIL2Wqr7ia+TI2sTiamO47jTA4XMp6dqFxRJyvnY?= =?utf-8?q?1HszinB7N0f7f43dww+A2A9k/UoCb2bPW5zUrgSSAulHbONkSCQy13lqvkd0m1X1u?= =?utf-8?q?ktSTFgmaRe0ABZLP5O82RdQcaOgvVR4ZtyCC/UiG8hKvyDAUPDqRiLojCT5Xfy0F0?= =?utf-8?q?u4Xv+ohCkNPQ3Nyvz+MgBpjYoaKttRo1hd82oWuJnlLimipWpDFSIU8cEps4jXmKw?= =?utf-8?q?A4eZlbvj7TTHayQ8bXkYtf12Ayg6kcuhhsWWknPnMrNzfiJm91hs9VtMqc24emJbl?= =?utf-8?q?CnvVwLnrAbejuKQd0ugTZt9nK7heOfGKoCaxT25Y3wTSPYK9uhOG0Zrh0PBfq3O+v?= =?utf-8?q?ih8+nPiSRa7k+FA9eL0Gyt41Fv0UUSa32n6AQLltkBrbHEk4tBWDMyIlf0IdL0VdF?= =?utf-8?q?Hry8SH53iK+K+W5KpMJu7EKhoQ8ILc3XkIFEEiJa6Pxbgr8pvvTxdLxWstkrter/t?= =?utf-8?q?sSCXMOGPIpyRrnkg59EzD/KVw2Fe3fdBxbhCKEN7hsZMD4qJ1TgYaebxLJzYLpDWj?= =?utf-8?q?uBJcFYR/8yX10dn05HVO4fp20W/i0vlWGNax7mt1/EYwlQ5zwPUsmMCa8ujAH4k9Q?= =?utf-8?q?GGQPayw9L91I?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA1PR10MB7418.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(8096899003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ABEzrh7RMY3M5fJVrPvNqSUHxx9u?= =?utf-8?q?2fpmnRk9YzUxuV7+7JG9DGgHS206WQrLOkz6jgCqbLQ0Yo/bJ5cN9f8O+guoB4G59?= =?utf-8?q?yM9jEX8ULvy1PEcrPTS2eCyEzIsxrt7dnNkHuVH9LpiW/Dc44QtAyTpLoGW9nOqVs?= =?utf-8?q?VgSKbbWINC6KbgXNLtzLTdJKcWn7oc1YGgc2Ibtse+vJkeEmTW4H8DMbPcYWYkZcL?= =?utf-8?q?L3gxs8w/zblCaqmui/5jxrqkXuBZ1CZAzkstpw59f5CDI+ojIM3TEY8neDFHCGqcu?= =?utf-8?q?sC0Y2zFc2nj3mFnPW5rXauEPNf39ZS4j+EyacczXMTboVkZxWeJbs/n5xCI16zAL9?= =?utf-8?q?UqPBYHaObXwqsEAciLa0qryf8xQZVETJM39awW8U143uGne0U9u2DWI08l2XVxGnn?= =?utf-8?q?jYkKEGjRVNPPPCy82U4H3sJdP9ufDc09X2cLqKyRpJoxaCUR+l2mOT2ZzsfKu5cDm?= =?utf-8?q?Qqqox9lO5hUfCeHZ1snNI0+0IIVzUacCOGFePQo8YKSQfdH0qg3mOnrEQg15c9HD6?= =?utf-8?q?6io0KQs8d1Qi0D5vTw0KXTE1teqPS/RMkRps7RZTJb8ZM8IyFfAB4ryNaF+qqShTe?= =?utf-8?q?f4S31RSVnQrWDFt1+M56WehZahiTrIgd41AHKH/cz8QZTYbcyhOvX3WbNVTi9fYI+?= =?utf-8?q?xpNXVD9/4jj15T5HRsRhd2B3cH9QoWRNMjzKly3Qp6yUAslS6CsvfpWhA5Lc14siL?= =?utf-8?q?AfCYX2wRusoZ5AzgmLMTD8z0cPC9fm0SDLwYn9zJHQ6N3/NMwFbNVg96h4QHGgqLp?= =?utf-8?q?UHdIIevNwwLjQePnhiks+bqkO1XFYva2z2qFGgqDk8wUeJ4Gq+mLW+Z5IPnE3XfBH?= =?utf-8?q?qf6sEVyMR+/8ArJHdJTz+GtDymS6C32CrY7KnqvRo/Zs7Pfj/YZzmDVbB2X+4aZmf?= =?utf-8?q?Q8gZULiy/655L29iwXN/y6reeUwVh9BveHDQq6DuYjQ1qUVEaxhxngg3WAPJeszgq?= =?utf-8?q?tBHCEZu83/B9uwvGEwOG+cLNpw7qPGWGj/SRrOZUBzQ16fh2jsD3JaSsF0JUn2VLE?= =?utf-8?q?mlzKYFYcFkQsk3ZHS+E0s1hDbdxnCQvgJDE3XZeWGFOeggSKFO+y3/ExMGLKvQnoH?= =?utf-8?q?I6zWEoa1PzL+eB7eVeIgoVmffTfUa2/JtgOC2fh0es7o7w3t/aq3LJAewT6lT2TSM?= =?utf-8?q?4We7mVFpE1Xs///fESB8vdEbDRn3YY83QeqZKufbewL3CpDpbqBAIAgKP1FP43lrd?= =?utf-8?q?CSy7pGrGfh7/yVaGeCR7imIN9C0EfOWxYtQ0j+HF4+EgVUR0xvgLUhKs0fLUS2A3g?= =?utf-8?q?9pyQjYsELKS2Rvgg1FM11KRvfITaK8Zz2Nl6ad/anzHPAjNF/SGMm2NR0ghqXwY/b?= =?utf-8?q?VuiDrPTcQ0GMVq2ahC/5u/JExqii1z4GXzwdd9xvLw2nVrex2+Rt/lJRZtJxWd+sX?= =?utf-8?q?k6eLYE9jV07x5UY1jmJqo/RkeDZ4rcn4v9NBQbjynlyVU60Ap2brbfbggmndA0G1H?= =?utf-8?q?JKRrNd7IqyTjg51O/OUXhxs5E9+IhHC0An2b9u4RkQSUzbVoK8lS9rabq5HnbHMgB?= =?utf-8?q?z6SyvoSuNcuh?= X-OriginatorOrg: Emerson.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93c30c52-cdd4-4459-090e-08dd46d1ad29 X-MS-Exchange-CrossTenant-AuthSource: IA1PR10MB7418.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2025 17:14:12.5161 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: eb06985d-06ca-4a17-81da-629ab99f6505 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uoQKubtFrbs6or28vjs8WWeGz3WhdWZP+JkMFfy9Kl2nU27tsDGvkNy1hiyDIL6UQPwzi7aGlVXp+s9IKhJkfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7540 X-Proofpoint-ORIG-GUID: H1vTod2L3gcdQW4nR62hLYOi5dLcAMxC X-Proofpoint-GUID: H1vTod2L3gcdQW4nR62hLYOi5dLcAMxC 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-02-06_05,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 impostorscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502060139 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 06 Feb 2025 17:14:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/115290 From: Armin Kuster Signed-off-by: Armin Kuster Signed-off-by: Khem Raj (cherry picked from commit e68145b00260fc380242cd67579068427e501c10) Signed-off-by: Can Wong --- meta-oe/recipes-security/audit/audit_4.0.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.1.bb index a37ae3bb84..ade566d82f 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.1.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.1.bb @@ -95,7 +95,13 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd + fi + + if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then rm -rf ${D}${libdir}/systemd + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${B}/init.d/auditd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${B}/init.d/audit-rules.service ${D}${systemd_unitdir}/system/ fi # Create /var/spool/audit directory for audisp-remote