From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 29 Jun 2023 21:01:32 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qEwtZ-008hSF-MR for lore@lore.pengutronix.de; Thu, 29 Jun 2023 21:01:32 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qEwtX-0001VS-BU; Thu, 29 Jun 2023 21:01:31 +0200 Received: from mail-ve1eur01on2084.outbound.protection.outlook.com ([40.107.14.84] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qEwt0-0001UF-RJ for ptxdist@pengutronix.de; Thu, 29 Jun 2023 21:01:00 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FV1f2Kj+HxAEUPtc+Zn8F877uOS66WY6BrP1rq8NzKZ6QOT57t7tEtxGxMqS4gBSgxzFs6wpGrInEA8mx+ruEY1bSxpABATzVHpyeBl4qEGOSsCQuvA78d2CK4cuORILE/tO/RM+XLLOc1CjuCvDasP07Z6Oy+KEDPicEdITj78X/ScYtvls3gWWfLoWcooV4G+mIC/W4CZ+2vsyeDcm/PMp8+fxdgAIcFIN7FuYtQ/wKNZIJN/Jn7PpJAzyaoMliX66rtlU02+Vik1BJQoEPODVVADnWhjX73Z1jKhuUHykbBMoef2uk5js155HYlJHhlL0jLM11O7GZL8Vd4N3WQ== 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=/XoudV2x4FVA8cVLWxopHoIew3NzN6aBbOS42QjHAfA=; b=R2zn6mLu+A1Lrhp00DFOJSJlQcizf6WKF6qimzitnpHESS6AobubP1NIc7KPBQG/8pDHFdo4yvDcjngXSfvjJSGIrGe7e8ERAFBjKEHYbwTEZ2D0BezGdv3k4BRg7V4RI5bp8oRAdYdEORvMtuDPASmhGWLC6WAJz3FUiwDIOxtWdSBFySs7rwyDKRBlbraItJioALoP1DlUreiPRMo9rV9Ym4Wazh2Gq4g7ZfcsjcMPCuL8j4GBwUS6OBRRDAhkH/gHpHbpTkEmU2OrpAdZAVYZG9SKwONKJd+8wfkS4tpAwUKfqmFqrnMeZalV0spbA6TMkV4471EFvZ8UntSWrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/XoudV2x4FVA8cVLWxopHoIew3NzN6aBbOS42QjHAfA=; b=F+iouiqary6YcFjNQYDpDlx51yHZ6hq2Tdmgv9tEliK5qeBTX7TAj9MFwnKyht0MvGKvIT2wgD17a5JdkCG0JEAOfx1IqzfpDH+f3+uFl7w/pp7lDArTn8110FKsfjS+DtnXjeDYPDmhwVJ+mg28tJMq2q7WVZM2VXzSriclASQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by DB4P251MB0901.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:37a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Thu, 29 Jun 2023 19:00:55 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e5eb:ef7c:9c9c:45e9]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e5eb:ef7c:9c9c:45e9%4]) with mapi id 15.20.6521.024; Thu, 29 Jun 2023 19:00:54 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 29 Jun 2023 21:00:46 +0200 Message-Id: <20230629190046.3579684-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: GVYP280CA0033.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:f9::24) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|DB4P251MB0901:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e5d69e0-a115-4f3c-380b-08db78d329c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FQyMEyHyMFGJXw0ZWdh0PoyjD0fy1jjIX4GumLi4eGK+Dbb55xLVeQ2EGc/7ffdiWP4EZYpmH0NxPZ89K5n7YfUsddfvYzpC/IngDZdWkeJkZ/nCPsZDA0oIAaR0rnA2vgK11H6P6UeDC8U/fV3J/rFZQt7XrgFiQys9vY5/xWbGn2XJPkYkEHlTi4KzF5luAX6/g7kx1072Q5q4gGRF8mZwqS/ERcfYEog/cO+xfzYE9u4qVWPZdjsQnfolf4ExGr1aJDbrOKuVrEbvstFtC82TqJTl8dHUhkx+V9otWdtBdmLNJVdWGIoncoru/wJ5wNS+FyKlOSZvJb2XvNIFENWuqSbMI4BSogVHLL8TD7a2qBWf6XPOjtv41k4dbXVNJZo5RcrpTaC8HBb/iNXdwt0Zz0MjkS6rYnPxXIHu6MuU/9HsWRsybsi+Ki4d49GOeIj/KGWgJGhMKfhfZCFFfps8eK+NpN9fNhgzJou6l2SicHylHtSrrXW7NBW6YkQRfSAqgqOHeXgsInD+paf1JStOgjcPPb6Av8bD1ZjfhvaLiTVw4tgkY7HqbAWuweCN+meUZf3UvbhOG7tjDx9oOmX6CfOWxCEvMsFGpF7aXnGrE+q6ayZ4g5VaaCt8kqz2a0WhnIvjYQcWeVFbgkTZFA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(346002)(39830400003)(396003)(376002)(366004)(136003)(451199021)(44832011)(5660300002)(66946007)(66556008)(66476007)(6916009)(478600001)(36756003)(316002)(8936002)(8676002)(2906002)(6512007)(6666004)(66574015)(41300700001)(6486002)(52116002)(186003)(38350700002)(6506007)(26005)(1076003)(86362001)(83380400001)(38100700002)(2616005)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QWs2VWgxaXl5cFRTbzUrVmN5eEZDZDNvUlFReFBiN2RtUlBDWHdKdGFaNitu?= =?utf-8?B?Um5YWU5DeVAwZGhPejZGR0lBdGR5cUIrbnorRHFtNnRaLzhDTjNjNWhQc0xv?= =?utf-8?B?ZWZHUW5SM1hwWFNscFZTbndMN0hoRFRBY00yMVBsR3Q4TjNFMENEaHpRR0xi?= =?utf-8?B?cmN4Mklva25UK2J4QmQzc1hJVmdxWmJSTno0d3IwMDdnT2FjN3REV3p4UUJW?= =?utf-8?B?Y05UQWNoaEM1bGE5OHBXUDBqUmJSMTZ4Mk1uYzVHVUtScExtS2RmalJPT1BQ?= =?utf-8?B?dDZ4dWVBUDg4WERVQWdPbHAvckZhQkk4L3BtVUd3Q3NFTXpFWDNPalRnUGxS?= =?utf-8?B?ZWRaVEQ4a3lCS2FncXN5N1J3NG5IR01ZbzU3N0QwNlhvZEwycUUvSFpYSzVv?= =?utf-8?B?d0xNRFlTakFjV1IwcnphckM3dmpQMEovOFp6T3dsdno5SUEySHlSREt4R1Jz?= =?utf-8?B?ZVhYbW0wZzZUNmhmOForWGFUWFQzK0YvL1BTL01iVkpiL3hCTkhaTFBvVEJN?= =?utf-8?B?UURETTRjc0R5cWQyb3BXcm1hVDdlSlREZGRsWDJJbktQeE9LSWpPT3VxMXVy?= =?utf-8?B?b09NV2dRb2hpWHNuUStNemFTOE8yaHd5MVJTc1h4eFU4TE0xNi9HWThvaHg5?= =?utf-8?B?ZHQwQzhTTzVDdTBMQ04yS1JCYVlzMzdidU5xNlc1d1JMRnZJUVVxQitQbjNt?= =?utf-8?B?dHBiV2ZPbURDd3N0R2k3Rkw0QVpMaWpyT2tWZ0QwdWh4QURtTnB6bWl2b1gy?= =?utf-8?B?d3hjU1NvVTF3aFI4ZGNhQmR2VVZLalhWSGNHVURXUlY2dE5jbElqZG52UzlR?= =?utf-8?B?aVpwcHpBaVdlZXd2TUtZaGk3Vy9iUjV5aUYyZWVjbDZhZk12NkNFeC9YLzFQ?= =?utf-8?B?OEpRaXZ3cGE2UmovM3Y3YUxzamU4S2RrSllnaDFUUUc1Tm4vcG9GOFR2RFpo?= =?utf-8?B?K1g5ekxDV29zV3F6MTBQSWYzUmRZa2hCaEM5aVZsMThXcitNcGowcndYS1dp?= =?utf-8?B?SGdTYmdSamFDVUIwclU4SFpXdjByTlk5QkVRMWhSQlVtUjgwWU1mWGZZbDRF?= =?utf-8?B?UmRLZmJ3NTRyaEYyUWFFNlhkRjZxdXJVaGp6VDBaSzJlWEh0cXpic0M5cXJo?= =?utf-8?B?aERERVZwaFduN3JycytEZUsvVE1ZY0crUWx3MTF4UHptRUNNMHhMaFovSlNN?= =?utf-8?B?SVZueW1naDZRK29QblFneVp5NEFJUDFSVUh5WjRYYi9RZ242ZUpxaWJLeEF5?= =?utf-8?B?RlFldEJySXRzMFNFY1RaTnVTSWZSLzhsbzJjL0Fib2lRT1A0MWQ4YUcvKzVs?= =?utf-8?B?c1QwQmsvWGF0VDY4NGdyNDEvQW9zK1Jua3MyYnRoWlpUVGJEVXpOdlYxOURr?= =?utf-8?B?RUlTN1ovcm5oa2hGTXVPY3RFZXZuRE8rc1RCbW1IN3MrT2RJV2J6YXhSSUlX?= =?utf-8?B?S0hYNXB2M2pHYWNiNStVTUJ3ZGlsTWFLTldCYWZLYVJGVlpnTFRKVHN3blFr?= =?utf-8?B?TUhpWUdBeU1PU1I4MFhyempWRzJVYllZYlJzRFJDOFpMZkFUTFFsYVZ4akxU?= =?utf-8?B?Q0NpZ0cxRUJ6S3piODVKMi9EWFRhTCtwTExxdTZFYnpmeUFYeDl0c09WT0d0?= =?utf-8?B?Q094SGRXNll4cXpmazBnaVVGYm56T0hTU1lMbUlCQlBwSDJ5SjlmWTNIb1Va?= =?utf-8?B?ZGI2VnZWMk40N0gxS0IwYitPcHd6UGFONGlqVjhIN3I0a1VxSUh0RURONkhV?= =?utf-8?B?cDJ4aW1VdzdHZ21xSWZJU2YxMG5ETGF3SE0vb2grZlh1WGFuUlBYZEFUWVRx?= =?utf-8?B?T29oZ1RTQ1NNTWpTNy9zYmFhSXdiN2VRSWpDSnFXd3pBS3RrZkxyQ2syeUx4?= =?utf-8?B?RXRGL0JsMU5vb0F3cmJtSzBBK2prdmFTM3BZOUl1Q1VjTDVGeXJBVGUzVHdy?= =?utf-8?B?dlBsZXYvNWJndlQxZ0RFbFRhczRwbUtUZ2ZFNWJCRG82Q2pJMU5mM1NobnJI?= =?utf-8?B?TE00R0tIZ2RsazdRL0gxdGtlSHA0UjJJU0Jtb2NUeHVIQk9YN2treFJGV3lW?= =?utf-8?B?QUlsY29UVnhCcmlwNDhqOTg2cWxUMmdyTENCS0xlemVxOVZlT3V1bTRjSlhm?= =?utf-8?B?c2ZEQk1pcUhKZjI1ZjlJY2kxMERXWGlhUVZTOHpRdytGL05id3E1VlVHV2Uy?= =?utf-8?B?ZVE9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e5d69e0-a115-4f3c-380b-08db78d329c1 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 19:00:53.9280 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IWPv3ambCdl5Oe19I7f+T/0LnJW9fw1sHGM2gy3/A5KdapjGRkg+VCHkKCmOPDVCIf9xnyEQCjRdW240zTMHyaaa7zFLPDFcXUgrU5dtIws= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4P251MB0901 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,PDS_BTC_ID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] util-linux: Version bump. 2.39 -> 2.39.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Minor release. Mostly bugfixes to enosys and lsfd. * Introduce ipcmk. No busybox counterpart. * Remove patches. They've been included in this release. Signed-off-by: Christian Melki --- .../0001-build-sys-add-disable-waitpid.patch | 28 ----- ...y-build-when-pidfd_open-is-available.patch | 42 ------- ...ck-for-availability-of-mount_setattr.patch | 105 ------------------ patches/util-linux-2.39/autogen.sh | 1 - patches/util-linux-2.39/series | 6 - rules/util-linux.in | 6 + rules/util-linux.make | 5 +- 7 files changed, 9 insertions(+), 184 deletions(-) delete mode 100644 patches/util-linux-2.39/0001-build-sys-add-disable-waitpid.patch delete mode 100644 patches/util-linux-2.39/0002-waitpid-only-build-when-pidfd_open-is-available.patch delete mode 100644 patches/util-linux-2.39/0003-libmount-check-for-availability-of-mount_setattr.patch delete mode 120000 patches/util-linux-2.39/autogen.sh delete mode 100644 patches/util-linux-2.39/series diff --git a/patches/util-linux-2.39/0001-build-sys-add-disable-waitpid.patch b/patches/util-linux-2.39/0001-build-sys-add-disable-waitpid.patch deleted file mode 100644 index d6130e7e6..000000000 --- a/patches/util-linux-2.39/0001-build-sys-add-disable-waitpid.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Frantisek Sumsal -Date: Thu, 18 May 2023 18:56:15 +0200 -Subject: [PATCH] build-sys: add --disable-waitpid - -The new pidfd stuff waitpid uses is not compatible with older kernel -headers, but the rest of the util-linux is still perfectly fine, so -allow disabling just the waitpid utility to make the builds happy again. ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6fac9cb4f0a9..30799c35ac6d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1847,7 +1847,11 @@ UL_BUILD_INIT([fadvise], [check]) - UL_REQUIRES_LINUX([fadvise]) - AM_CONDITIONAL([BUILD_FADVISE], [test "x$build_fadvise" = xyes]) - --UL_BUILD_INIT([waitpid], [check]) -+AC_ARG_ENABLE([waitpid], -+ AS_HELP_STRING([--disable-waitpid], [do not build waitpid]), -+ [], [UL_DEFAULT_ENABLE([waitpidd], [check])] -+) -+UL_BUILD_INIT([waitpid]) - UL_REQUIRES_LINUX([waitpid]) - AM_CONDITIONAL([BUILD_WAITPID], [test "x$build_waitpid" = xyes]) - diff --git a/patches/util-linux-2.39/0002-waitpid-only-build-when-pidfd_open-is-available.patch b/patches/util-linux-2.39/0002-waitpid-only-build-when-pidfd_open-is-available.patch deleted file mode 100644 index e2576d56c..000000000 --- a/patches/util-linux-2.39/0002-waitpid-only-build-when-pidfd_open-is-available.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 22 May 2023 18:24:47 +0200 -Subject: [PATCH] waitpid: only build when pidfd_open is available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #2256 - -[kzak@redhat.com: - fix UL_BUILD_INIT() use] - -Signed-off-by: Thomas Weißschuh -Signed-off-by: Karel Zak ---- - configure.ac | 1 + - meson.build | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 30799c35ac6d..11f2d599dde5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1853,6 +1853,7 @@ AC_ARG_ENABLE([waitpid], - ) - UL_BUILD_INIT([waitpid]) - UL_REQUIRES_LINUX([waitpid]) -+UL_REQUIRES_SYSCALL_CHECK([waitpid], [UL_CHECK_SYSCALL([pidfd_open])], [pidfd_open]) - AM_CONDITIONAL([BUILD_WAITPID], [test "x$build_waitpid" = xyes]) - - UL_BUILD_INIT([getopt], [yes]) -diff --git a/meson.build b/meson.build -index c56f83b1fa53..641d23674776 100644 ---- a/meson.build -+++ b/meson.build -@@ -2843,6 +2843,7 @@ if not is_disabler(exe) - bashcompletions += ['fadvise'] - endif - -+# XXX: HAVE_PIDFD_OPEN - exe = executable( - 'waitpid', - waitpid_sources, diff --git a/patches/util-linux-2.39/0003-libmount-check-for-availability-of-mount_setattr.patch b/patches/util-linux-2.39/0003-libmount-check-for-availability-of-mount_setattr.patch deleted file mode 100644 index 5ac625b22..000000000 --- a/patches/util-linux-2.39/0003-libmount-check-for-availability-of-mount_setattr.patch +++ /dev/null @@ -1,105 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 20 May 2023 06:38:20 +0200 -Subject: [PATCH] libmount: check for availability of mount_setattr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If mount_setattr is not available but needed fall back to the legacy -mount API. - -Fixes #2247 - -Signed-off-by: Thomas Weißschuh ---- - libmount/src/hook_mount.c | 23 +++++++++++++++++++++-- - tests/expected/mount/fallback-mount_setattr | 1 + - tests/ts/mount/fallback | 16 ++++++++++++++++ - 3 files changed, 38 insertions(+), 2 deletions(-) - create mode 100644 tests/expected/mount/fallback-mount_setattr - -diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c -index a324637cb73e..01de9e1c5739 100644 ---- a/libmount/src/hook_mount.c -+++ b/libmount/src/hook_mount.c -@@ -510,6 +510,15 @@ static inline int fsopen_is_supported(void) - return rc; - } - -+static inline int mount_setattr_is_supported(void) -+{ -+ int rc; -+ -+ errno = 0; -+ rc = mount_setattr(-1, NULL, 0, NULL, 0); -+ return !(rc == -1 && errno == ENOSYS); -+} -+ - /* - * open_tree() and fsopen() - */ -@@ -675,9 +684,14 @@ static int hook_prepare(struct libmnt_context *cxt, - /* call mount_setattr() */ - if (!rc - && cxt->helper == NULL -- && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) -+ && (set != 0 || clr != 0 || (flags & MS_REMOUNT))) { -+ if (!mount_setattr_is_supported()) { -+ hookset_deinit(cxt, hs); -+ return 1; -+ } - rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT, NULL, - hook_set_vfsflags); -+ } - - /* call move_mount() to attach target */ - if (!rc -@@ -688,9 +702,14 @@ static int hook_prepare(struct libmnt_context *cxt, - hook_attach_target); - - /* set propagation (has to be attached to VFS) */ -- if (!rc && mnt_optlist_get_propagation(ol)) -+ if (!rc && mnt_optlist_get_propagation(ol)) { -+ if (!mount_setattr_is_supported()) { -+ hookset_deinit(cxt, hs); -+ return 1; -+ } - rc = mnt_context_append_hook(cxt, hs, MNT_STAGE_MOUNT_POST, NULL, - hook_set_propagation); -+ } - - DBG(HOOK, ul_debugobj(hs, "prepare mount done [rc=%d]", rc)); - return rc; -diff --git a/tests/expected/mount/fallback-mount_setattr b/tests/expected/mount/fallback-mount_setattr -new file mode 100644 -index 000000000000..3e18ebf09ec4 ---- /dev/null -+++ b/tests/expected/mount/fallback-mount_setattr -@@ -0,0 +1 @@ -+private -diff --git a/tests/ts/mount/fallback b/tests/ts/mount/fallback -index fe932ee78a62..1f0c47d6763f 100755 ---- a/tests/ts/mount/fallback -+++ b/tests/ts/mount/fallback -@@ -68,5 +68,21 @@ $TS_CMD_UMOUNT $MOUNTPOINT - ts_finalize_subtest - - -+ts_init_subtest "mount_setattr" -+"$TS_CMD_MOUNT" "$DEVICE" "$MOUNTPOINT" >> $TS_OUTPUT 2>> $TS_ERRLOG -+ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts" -+$TS_CMD_ENOSYS -s mount_setattr -- \ -+ "$TS_CMD_MOUNT" -o remount,ro "$MOUNTPOINT" \ -+ >> $TS_OUTPUT 2>> $TS_ERRLOG -+$TS_CMD_FINDMNT --kernel --mountpoint "$MOUNTPOINT" --options "ro" &> /dev/null -+[ "$?" == "0" ] || ts_die "Cannot find read-only in $MOUNTPOINT in /proc/self/mountinfo" -+$TS_CMD_ENOSYS -s mount_setattr -- \ -+ "$TS_CMD_MOUNT" --make-slave "$MOUNTPOINT" \ -+ >> $TS_OUTPUT 2>> $TS_ERRLOG -+$TS_CMD_FINDMNT -n --kernel --mountpoint "$MOUNTPOINT" -o PROPAGATION >> $TS_OUTPUT -+$TS_CMD_UMOUNT $MOUNTPOINT -+ts_finalize_subtest -+ -+ - ts_finalize - diff --git a/patches/util-linux-2.39/autogen.sh b/patches/util-linux-2.39/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/util-linux-2.39/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/util-linux-2.39/series b/patches/util-linux-2.39/series deleted file mode 100644 index c34fa1c28..000000000 --- a/patches/util-linux-2.39/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-build-sys-add-disable-waitpid.patch -0002-waitpid-only-build-when-pidfd_open-is-available.patch -0003-libmount-check-for-availability-of-mount_setattr.patch -# 10fdd106143b7ca5d1d69ef1ecd0f970 - git-ptx-patches magic diff --git a/rules/util-linux.in b/rules/util-linux.in index 5c0ccf058..b906ba0f3 100644 --- a/rules/util-linux.in +++ b/rules/util-linux.in @@ -344,6 +344,12 @@ config UTIL_LINUX_HWCLOCK comment "BusyBox' hwclock is selected!" depends on BUSYBOX_HWCLOCK +config UTIL_LINUX_IPCMK + bool + prompt "ipcmk" + help + ipcmk lets you create various SysV IPC objects. + config UTIL_LINUX_IPCRM bool prompt "ipcrm" diff --git a/rules/util-linux.make b/rules/util-linux.make index cf2a0e85b..d6bc52c0f 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.39 -UTIL_LINUX_MD5 := 16579e594a8ef2e6236b38b9ab36cccf +UTIL_LINUX_VERSION := 2.39.1 +UTIL_LINUX_MD5 := c542cd7c0726254e4b3006a9b428201a UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SUFFIX := tar.xz UTIL_LINUX_BASENAME := v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION))) @@ -114,6 +114,7 @@ UTIL_LINUX_CONF_OPT := \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_PIVOT_ROOT)-pivot_root \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)-lsmem \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)-chmem \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCMK)-ipcmk \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCRM)-ipcrm \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)-ipcs \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)-irqtop \ -- 2.34.1