From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57B92EB64DC for ; Sun, 9 Jul 2023 18:03:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 23E2B60634; Sun, 9 Jul 2023 18:03:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 23E2B60634 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wvnx0aaSdQ2I; Sun, 9 Jul 2023 18:03:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3308C60746; Sun, 9 Jul 2023 18:02:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3308C60746 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6A7ED1BF289 for ; Sun, 9 Jul 2023 18:02:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4BEBB409BE for ; Sun, 9 Jul 2023 18:02:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4BEBB409BE X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KAJ_uaS94ksr for ; Sun, 9 Jul 2023 18:02:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2E82E409B6 Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2E82E409B6 for ; Sun, 9 Jul 2023 18:02:54 +0000 (UTC) Received: from fli4l.lan.fli4l (p5b3a0896.dip0.t-ipconnect.de [91.58.8.150]) by dd20012.kasserver.com (Postfix) with ESMTPSA id 1015FA4C00F9; Sun, 9 Jul 2023 20:02:50 +0200 (CEST) Received: from bruckner.lan.fli4l ([192.168.1.1]:34154) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1qIYkD-0000Ta-2U; Sun, 09 Jul 2023 20:02:49 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 9 Jul 2023 20:02:49 +0200 Message-Id: <20230709180249.3839609-1-bernd@kuhls.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spamd-Bar: / X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202306131828; t=1688925770; bh=sMUxTY4a+Axg7u3L65KWhJ8NTYe87x8T9N3U8JW+Jbc=; h=From:To:Cc:Subject:Date:From; b=rei7WAdmL8aUiL3GnXJjAnIjLGB9c6e56tCNqhNtjP4dhSipX1gqTJ9xGICG1jblt vL8e7FbedALB9v27zUNtpq520hd9RhdbXAjay7FQQlpLooIWS2rhAavYtLWQZj6jRZ 8HErkWd9o5pkSj9EAAAiL+yrpAvZyuzDMuP7C1yHTzPqDCHv8/m0/W8wnb3GK0E5PM 5nZEpTqtOHZwb4s+lK47nxyolbi2pJ+IrDIClxaXFb/NIwXD0/qC+9jMMnOGkJ7lcm EivPmlLYIfuKQ+mGuNs2AY3T6ZeTf0AV1jcvP9ADgm5w5MydBYUf9BaPmrdANmOJJS q/SWvGd1pCIpA== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202306131828 header.b=rei7WAdm Subject: [Buildroot] [PATCH 1/1] package/dahdi-linux: fix build with kernel < 6.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E . MORIN" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Buildroot commit 840b5527466502f02b86c95f9bf95557d35c8571 added a patch from upstream bug tracker which fixes build with kernel >= 6.3 but broke the build with earlier kernels. This patch adds additional code for compatibility with kernel < 6.3. Fixes: http://autobuild.buildroot.net/results/c8c/c8c51153d3a61842d57a2a4be3dc75ec9964e41c/ Signed-off-by: Bernd Kuhls --- ...atch => 0005-Fix-build-on-Linux-6.3.patch} | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) rename package/dahdi-linux/{0005-drivers-dahdi-fix-build-with-clang-16.patch => 0005-Fix-build-on-Linux-6.3.patch} (75%) diff --git a/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch b/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch similarity index 75% rename from package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch rename to package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch index 535e1628c9..f2ac4d2dc3 100644 --- a/package/dahdi-linux/0005-drivers-dahdi-fix-build-with-clang-16.patch +++ b/package/dahdi-linux/0005-Fix-build-on-Linux-6.3.patch @@ -1,4 +1,4 @@ -From d51c10dae5a06709983b929fc6f9fb18eec41951 Mon Sep 17 00:00:00 2001 +From c4969d756eac041758856b99a1084158c06beb7e Mon Sep 17 00:00:00 2001 From: Brahmajit Das Date: Thu, 22 Jun 2023 15:52:18 +0000 Subject: [PATCH] drivers/dahdi: fix build with clang-16 @@ -31,15 +31,16 @@ Signed-off-by: Brahmajit Das Upstream: https://github.com/asterisk/dahdi-linux/pull/21 -Signed-off-by: Bernd Kuhls +[Bernd: updated patch for compatibility with kernel < 6.3] +Signed-off-by: Bernd Kuhls --- - drivers/dahdi/dahdi-sysfs.c | 8 ++++---- - drivers/dahdi/wctc4xxp/base.c | 2 +- - drivers/dahdi/xpp/xbus-sysfs.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) + drivers/dahdi/dahdi-sysfs.c | 12 ++++++++++-- + drivers/dahdi/wctc4xxp/base.c | 2 +- + drivers/dahdi/xpp/xbus-sysfs.c | 4 ++++ + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c -index ca29ddba..0c5bd982 100644 +index ca29ddba..38236929 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -47,7 +47,7 @@ static int span_match(struct device *dev, struct device_driver *driver) @@ -51,16 +52,19 @@ index ca29ddba..0c5bd982 100644 { return dev_get_drvdata(dev); } -@@ -68,7 +68,7 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) +@@ -68,7 +68,11 @@ static inline struct dahdi_span *dev_to_span(struct device *dev) return err; \ } while (0) --static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int span_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int span_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { struct dahdi_span *span; -@@ -415,7 +415,7 @@ static struct { +@@ -415,7 +419,7 @@ static struct { unsigned int clean_chardev:1; } should_cleanup; @@ -69,12 +73,15 @@ index ca29ddba..0c5bd982 100644 { return container_of(dev, struct dahdi_device, dev); } -@@ -438,7 +438,7 @@ static inline struct dahdi_device *to_ddev(struct device *dev) +@@ -438,7 +442,11 @@ static inline struct dahdi_device *to_ddev(struct device *dev) return err; \ } while (0) --static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int device_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int device_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { struct dahdi_device *ddev; @@ -92,15 +99,18 @@ index ec6fc436..db70ea7e 100644 # ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &wctc4xxp_netdev_ops; diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c -index d8c11dc3..29ad3619 100644 +index d8c11dc3..11b3ed3e 100644 --- a/drivers/dahdi/xpp/xbus-sysfs.c +++ b/drivers/dahdi/xpp/xbus-sysfs.c -@@ -418,7 +418,7 @@ static int astribank_match(struct device *dev, struct device_driver *driver) +@@ -418,7 +418,11 @@ static int astribank_match(struct device *dev, struct device_driver *driver) return err; \ } while (0) --static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) + static int astribank_uevent(struct device *dev, struct kobj_uevent_env *kenv) ++#else +static int astribank_uevent(const struct device *dev, struct kobj_uevent_env *kenv) ++#endif { xbus_t *xbus; extern char *initdir; -- 2.39.2 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot