From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sat, 06 Apr 2024 22:24:16 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rtCaG-00H4ak-2B for lore@lore.pengutronix.de; Sat, 06 Apr 2024 22:24:16 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rtCaG-0000fB-E7; Sat, 06 Apr 2024 22:24:16 +0200 Received: from mail-he1eur04on2119.outbound.protection.outlook.com ([40.107.7.119] helo=EUR04-HE1-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rtCZr-0000eu-V8 for ptxdist@pengutronix.de; Sat, 06 Apr 2024 22:23:53 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hdgN0JEop3wX/3rq+ntvWcUdsz+kFPpQ+HxwUc5M05Wpscd7qOnVj2ifydgser8fDmqRnZJwh0u9i5gQBwPmwBgYqEo7tERBBoIQDNm5smKCtKO3W/0/QKjfjg7B2YudUCJM8UmJ9lSyH1MSulaaHsklITBViOPRZnsRv0VbUKiYWWaXPFuMncucN4Sn40AWaIyLAZzPwTTA7l5Zwhgvew+S6hOa/KzoeeILzdZ+uthO3rw05XSV7lYtcaX9we9LyKTMrJoaiMtY8BzUHB7n01LcllOIho8hurT6A31HkZTrjsbJeyKf+IlXA+EuF1Ee4zQpJwNIIrcEFuHI/4/Auw== 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=AtQYgYEuDv3wgAI+X1zxesfViJEiL+qBk8AkfVYRfaM=; b=bewk356bnjftyHsKjEq6MCmp5IkDrrNf6GQMafT5yLDjJDez8nzAeahVL3oGX62UcSiZ+9C3pzY6u5VqL2SN4P2hJ3qIH3sH+QL/T6h/lPsqWDVnZ6nNyYTn/AB7j2BjXnHy+d4nHoWNSXm8/hIFYdiGG3d3Xi0Q9xy9/1BCCCFwwXeLjFCAjuR108NaEcVZb8F73XO9dTlPPY6tbR7pi5q0s8VznwUG6GQqdChzMdD4b82wteHj5Cqzk6itGjSqt2IhYz+VQZ+p4WCHL7vSHwLRk/gJzW31JXTiULf0EgAvnw3FNy3gXTP4S/bDd00qwutn+DbatOn/pauE+cmtcw== 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=AtQYgYEuDv3wgAI+X1zxesfViJEiL+qBk8AkfVYRfaM=; b=JiSObGyYnJL+oCNM7CXfOSKZA0YGivXUUkG69XUfze5Qcs3QDpBnOz9EwWNOhj5VnJ8NQJ2vP9kAJQizLqKF4XECRD0KaRR8AVMH/qMvdnyFodirtvXPTPAum9i/e2x6dvZBT0e0FPliEj2E45GeEw9aHx7qOi2k3L90APh7pxQ= Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by GV1P251MB1089.EURP251.PROD.OUTLOOK.COM (2603:10a6:150:1c4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 6 Apr 2024 20:23:48 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::ba8c:3db:3a02:7ce4]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::ba8c:3db:3a02:7ce4%6]) with mapi id 15.20.7409.042; Sat, 6 Apr 2024 20:23:47 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Sat, 6 Apr 2024 22:23:40 +0200 Message-Id: <20240406202341.1082397-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: GVX0EPF0000ED82.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1:0:3:0:12) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|GV1P251MB1089:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HE+sIP/5elTfuaZodNe1VgXayeGD9NL1q5inCAXgEQH5zCqz3megHq95UzOVPGx6vrM/ynkyralWWRiV6rs+2Ax9yq2+BXZfhKNNUtRkuCiVNmcL4Vleqd6xofIDs+g1PGVEU7TY+zCqOSHQcigA5vRD74Zp5kg8IpqOyyOCyTFOfL9OCOFbnpqxq8EfFxjnDqBygtmwOyfHUbzjhvQof4Qi40oHxnDZGJjqKy7qfShhqWK/yS9aDd8vtPV225TsrN4ghR9D218LN2QUk+ZkkLgYQgrHJ/QbztTN7Sxac4rEt7qLos3WSW2A6RtfUYbyP0Oc+sf0Ew4nyjqj5L8Q9tmGelriua2XgoBo4my3m6F1bLTibKqTeVob0pxng/xXQ2BGYeycSJR7ocQ0cN+o7A+m7Y3PkPGARKkE6SA2vke9EFFmC8mymPvGaR3E70ccgTV+nKWSXNBoZDQxcRp3YRDxK6GIq5RoNmwq0kpio+AFvj+IrWvS7H1qIAQnKN7RrQFwNKyu/zZ2gdensVPPywGHyHlAxo94G+joRqWWkZ1phBBHMc3p9U9CdBkZc/OWGFWetRZiRTS1Uf2uvvIDAahH+6DzCwIo/IGrB0rxCu7kWO5asonL5zlw50ZhfaNSq/ctKQAohYVoX9vbGH4OJ1Dxe90rzhiGWCPM8HywLYw= 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:(13230031)(366007)(1800799015)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a3BnVmZ2dkNMYVZqUnEwWVJMMCtxZjBab1lsSk1qTnEyV0U5dG81V0hzWmsv?= =?utf-8?B?Y1ZMRTk5ODVUcHY3RC9sbUUxOGpSRDFNUzNObFh1TyttcGx2UmlJbExpTCsz?= =?utf-8?B?UkluSzdVb1NxN0hCU09SL2l4VUZ6azJadGhYUWl6SnFDcFpNaEZUWm10Y3cr?= =?utf-8?B?ZHoxYklEdHpHcDZzbzB1TnF4c1J3SUM5T1JFcFZXSFRPcENKdVozMUQyZkZt?= =?utf-8?B?ZkJvWjBnVmZKdmNqSFcrVGZCZjVnazhYZEwreWdkMHcvTUUzaGxPeDhMVkNx?= =?utf-8?B?M3ZMajdzTFpRdFdCRG1sRDNoNnMrVDFZVlY1S3JzYzJLS05LSHBoWkx3dVFW?= =?utf-8?B?WVpRaFFjRitCQW9BS1VDWW5DYi9Mck9wYWpaNkg3ZVgrMXAxYjZXZlJLalY2?= =?utf-8?B?QTJXbmVNNW9nNUg4d0hNSmo0aCtMcmJKKzNJaVZZYVpwYVdSakUyZ2ZUWEVj?= =?utf-8?B?U2kvbFVXaFI4Z25oQ3ZJKzZ0cGswUDgvYnlDNVovY3pZKzNOdzRUL1lnM3FT?= =?utf-8?B?alhHb0hkMTdtU3RQLzRqN1JIRXdmeHhDZUtqVmVETGJFUnNOVTIrc0ZCZTNt?= =?utf-8?B?aE4xZk1zZ1FxNHJlSzUrY0F6dTRMNk5RVS9EaW5RRWp5OHQ2czFteFYrYlJk?= =?utf-8?B?cjRxTHRPSkIwa3RQL0VRdDhHZjBCMkdlRUw2eUVENXM4S2k1akNzOFpFN0pO?= =?utf-8?B?NUdQQk9CMFpPZFRiMFRtZFgzZGdvODF6Wng5VHJvaUpnSmNISUlCS04xMGdT?= =?utf-8?B?U2U4UVFHNGorTFlob1dUZnpwMjFydW9kVVRpWDY1c3M1S3VrT09hYjBwNG1j?= =?utf-8?B?bURtelRrVVI5UXhvbkJzVG5vbTZuRVJLSkpWMWZiRWFXc2pqaG9IM2h5UXY4?= =?utf-8?B?SEw4VEFnMFY2cEVHT3dWYy9JWWttMFFuTGE2VzM5VmN0RU5pK0lCS0ZTZzNx?= =?utf-8?B?blg2SHllajM1TDc4ZlZWTVpXTUdyY0dlWTJ3dHZwS2p6Nno4N1I1NlFOQmNC?= =?utf-8?B?eVltUjAzM24xRVBRdFdUTlVZVUpkT21PUERac2VtcEpNenp5OTYyY2ZUSGhk?= =?utf-8?B?UEhzamFrbjZ3UUdtZzdWNDVXL1pYc3ZRWHZpelJsaWxraUtHWjZCLzd0N0V0?= =?utf-8?B?aVhpUWw5a3B5Y2MxcElLcnBqZFB5NmFWRVNKMDAzblV5REMwbU0vaUhQRDNz?= =?utf-8?B?MnZZRUVGMERQaE9rREU1UGFlR1IyWDIrL2tHWUdyanEwTzd3UnM2WGhUSWVv?= =?utf-8?B?Q2RGVHI1bHVvZU5vaWZjVnRNWk9ZQ2xNaVdveFNXYkpqRHpJNEZaSDJKdmFV?= =?utf-8?B?OTdLYmlqcE1DK0Y0Y2RGZTdKVXZHdmpmRXhjVlRNa2RPWW1xUE1aaFNwa2Rl?= =?utf-8?B?Szh5MGVqNmtVZTJLY0hMLzNsQzZVNXo0YUhsNWYvWHhsUU1JSXFoN0xPUklh?= =?utf-8?B?YjFMdFFxbnVTK3QwTUNPMWI1Vm9Gb0tOYXdyd2NmcHdlUytRb2JOMG5sakI4?= =?utf-8?B?VmFVdWxaT2hnbWZVWUNpMjJadjRUU21GOFgreHF5OGhIaW5meWxwZWhXbzBO?= =?utf-8?B?djNNT0orbUh1T3k2MWUwOGwvNnc2NEMvOCtQMWl1a2tqdmdEbk1HUHl6dVk4?= =?utf-8?B?NHFxMUhONTlMSjNzQmpuTytaU1VaYmNsRU96UVJNdjFySmpBRUVDcHRzRHI4?= =?utf-8?B?aTFrOVJjajFrWEx5UzkyZTdxcGlUOWxhUlYxcm1iT2RmWVIrVm00NkhyVVl2?= =?utf-8?B?d21rc2tBQzZxa3ZCQkMzSkEwRHJFQU1IWDNyMzl3dG14K2xJbExIbFRhM0l3?= =?utf-8?B?SmtCaGRMb254R0s2bHlPanBWSjFtM3NWMnpzak8xSzJObnpkb3FVdGUyNzlw?= =?utf-8?B?bVpMU3ZneCtZVWRCRWtmTUNSRUs4M0hNMFl0d3JVcjRMbFpuVU1wV29SNU8r?= =?utf-8?B?L2xkZVV4eDhMMUIxRUZGMDI4cWtJajI1c3V6VDlTaVBMWkNmdjNadHFTNFF4?= =?utf-8?B?MW1GV2U2U1RKa1kxQWRmeUV5YUI4cVlsbVVlVnVUdHJNV2tXenB5dGkxbmJQ?= =?utf-8?B?bCtPUURCbTlHMkdOQlJWTE9kbjB3bTJXNTMrd3pQcHY2U1YvK2RkNjM0WWRW?= =?utf-8?B?QmJwZU84dGFUVkJrakk1SmlQRFJwKzlNaUdtbSsrYnB2eFVNYUJ6SEdtZU9r?= =?utf-8?B?RHc9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: f4ffacbd-9b6f-48eb-89de-08dc567776f7 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2024 20:23:47.8481 (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: c4V7PwSQI7gtmv8bALpq/byQsis2v6HCpTk3bAmeSxnGCv+UwBYvnQRoZbfMO06FAEeZNOPfgn0p0E57as8SoY7bjhVYOpqowrV3fZPvEvs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1P251MB1089 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 1/2] util-linux: Version bump. 2.39.3 -> 2.40 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes * Switch URL. Release tarballs (using make dist) were missing files needed to build with meson. But the files are present in the git snapshot url. * New liblastlog2 stuff does seem to have various building issues etc, so disable them for now. * Old patches dropped, seem to be included in the new release. Signed-off-by: Christian Melki --- ...roperly-handle-gettext-non-existence.patch | 29 ------------------- patches/util-linux-2.39.3/series | 4 --- rules/util-linux.make | 11 +++---- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch delete mode 100644 patches/util-linux-2.39.3/series diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch deleted file mode 100644 index 01d07d3f6..000000000 --- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Sat, 5 Aug 2023 08:57:28 +0200 -Subject: [PATCH] meson: properly handle gettext non-existence -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit e91a49c9747f ("meson: don't build po if no gettext") -tried to add the possibility to build util-linux without gettext. - -Unfortunately by default the call to find_program() would abort the -build if the program is not found. -Avoid aborting the build. - -Signed-off-by: Thomas Weißschuh ---- - po/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/meson.build b/po/meson.build -index c10deafd28a6..8adfa48d8327 100644 ---- a/po/meson.build -+++ b/po/meson.build -@@ -1,4 +1,4 @@ --if not find_program('gettext').found() -+if not find_program('gettext', required : false).found() - subdir_done() - endif - diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series deleted file mode 100644 index ca4f8cdfd..000000000 --- a/patches/util-linux-2.39.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-properly-handle-gettext-non-existence.patch -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic diff --git a/rules/util-linux.make b/rules/util-linux.make index 2a2215570..60c6e9228 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,12 +15,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.39.3 -UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5 +UTIL_LINUX_VERSION := 2.40 +UTIL_LINUX_MD5 := bc4272a7821bb12c68c441d23b8eaa89 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))) -UTIL_LINUX_URL := $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_BASENAME)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)) +UTIL_LINUX_SUFFIX := tar.gz +UTIL_LINUX_URL := https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) UTIL_LINUX_SOURCE := $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) UTIL_LINUX_DIR := $(BUILDDIR)/$(UTIL_LINUX) UTIL_LINUX_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain @@ -70,6 +69,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-last=disabled \ -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ + -Dbuild-liblastlog2=disabled \ -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ @@ -88,6 +88,7 @@ UTIL_LINUX_CONF_OPT := \ -Dbuild-newgrp=disabled \ -Dbuild-nologin=disabled \ -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ + -Dbuild-pam-lastlog2=disabled \ -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ -Dbuild-pg=disabled \ -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \ -- 2.34.1