From patchwork Tue Aug 20 09:35:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1974318 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wp4943xNKz1yf6 for ; Tue, 20 Aug 2024 19:36:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C57FB40582; Tue, 20 Aug 2024 09:36:21 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Fd_xPczuUwQl; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A08BE4059E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A08BE4059E; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 36C321BF32C for ; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2E9954094B for ; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id D0ZoHve9Aid3 for ; Tue, 20 Aug 2024 09:36:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.178.240; helo=mslow1.mail.gandi.net; envelope-from=peko@48ers.dk; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 73078400B9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 73078400B9 Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by smtp2.osuosl.org (Postfix) with ESMTPS id 73078400B9 for ; Tue, 20 Aug 2024 09:36:17 +0000 (UTC) Received: from relay9-d.mail.gandi.net (unknown [217.70.183.199]) by mslow1.mail.gandi.net (Postfix) with ESMTP id B17D7C0C5D for ; Tue, 20 Aug 2024 09:36:14 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 77D6AFF805; Tue, 20 Aug 2024 09:36:08 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.96) (envelope-from ) id 1sgLHb-00GKnM-2W; Tue, 20 Aug 2024 11:36:07 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 20 Aug 2024 11:35:57 +0200 Message-Id: <20240820093559.3893162-1-peter@korsgaard.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-GND-Sasl: peter@korsgaard.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Subject: [Buildroot] [PATCH-NEXT 1/2] package/eudev: correct !static comment 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: Eric Le Bihan , Bernd Kuhls Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" eudev itself includes dlfcn.h, so even without kmod it cannot be built statically: grep -rs dlfcn build/eudev-3.2.14/src eudev-3.2.14/src/shared/util.c:#include Signed-off-by: Peter Korsgaard --- package/eudev/Config.in | 2 +- system/Config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 6e7bbe4648..669a8a15ae 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_EUDEV depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV depends on BR2_USE_MMU # uses fork() depends on BR2_USE_WCHAR # needs C99 compiler - depends on !BR2_STATIC_LIBS # kmod + depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC select BR2_PACKAGE_UTIL_LINUX diff --git a/system/Config.in b/system/Config.in index bc0c6eb6bc..244e4af531 100644 --- a/system/Config.in +++ b/system/Config.in @@ -254,7 +254,7 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV bool "Dynamic using devtmpfs + eudev" depends on BR2_USE_WCHAR # eudev - depends on !BR2_STATIC_LIBS + depends on !BR2_STATIC_LIBS # eudev depends on BR2_USE_MMU # eudev select BR2_PACKAGE_EUDEV From patchwork Tue Aug 20 09:35:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1974319 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wp4982j7cz1yf6 for ; Tue, 20 Aug 2024 19:36:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9C79F405B8; Tue, 20 Aug 2024 09:36:24 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CTaRupMNSrB2; Tue, 20 Aug 2024 09:36:23 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 211DB405B0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 211DB405B0; Tue, 20 Aug 2024 09:36:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 395361BF97A for ; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2645D4059E for ; Tue, 20 Aug 2024 09:36:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8MEQj_lOqbIM for ; Tue, 20 Aug 2024 09:36:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=217.70.178.240; helo=mslow1.mail.gandi.net; envelope-from=peko@48ers.dk; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 7578740582 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7578740582 Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) by smtp4.osuosl.org (Postfix) with ESMTPS id 7578740582 for ; Tue, 20 Aug 2024 09:36:17 +0000 (UTC) Received: from relay1-d.mail.gandi.net (unknown [217.70.183.193]) by mslow1.mail.gandi.net (Postfix) with ESMTP id CE2D2C174F for ; Tue, 20 Aug 2024 09:36:14 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 23BE1240004; Tue, 20 Aug 2024 09:36:08 +0000 (UTC) Received: from peko by dell.be.48ers.dk with local (Exim 4.96) (envelope-from ) id 1sgLHc-00GKnS-13; Tue, 20 Aug 2024 11:36:08 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 20 Aug 2024 11:35:58 +0200 Message-Id: <20240820093559.3893162-2-peter@korsgaard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240820093559.3893162-1-peter@korsgaard.com> References: <20240820093559.3893162-1-peter@korsgaard.com> MIME-Version: 1.0 X-GND-Sasl: peter@korsgaard.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Subject: [Buildroot] [PATCH-NEXT 2/2] package/eudev: make kmod support optional 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: Eric Le Bihan , Bernd Kuhls Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Eudev can be built without kmod support, E.G. for setups not using a modular kernel - So support that. Make the option default y for backwards compatibility. Signed-off-by: Peter Korsgaard --- package/eudev/Config.in | 8 +++++++- package/eudev/eudev.mk | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/package/eudev/Config.in b/package/eudev/Config.in index 669a8a15ae..65cfc1d2de 100644 --- a/package/eudev/Config.in +++ b/package/eudev/Config.in @@ -9,7 +9,6 @@ config BR2_PACKAGE_EUDEV select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_KMOD help eudev is a fork of systemd-udev with the goal of obtaining better compatibility with existing software such as OpenRC and @@ -23,6 +22,13 @@ if BR2_PACKAGE_EUDEV config BR2_PACKAGE_PROVIDES_UDEV default "eudev" +config BR2_PACKAGE_EUDEV_MODULE_LOADING + bool "enable kernel module loading" + default y + select BR2_PACKAGE_KMOD + help + Enable kernel module loading support + config BR2_PACKAGE_EUDEV_RULES_GEN bool "enable rules generator" help diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 33cc638291..8318bc1ed4 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -19,13 +19,20 @@ EUDEV_CONF_OPTS = \ --enable-blkid # eudev requires only the util-linux libraries at build time -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs kmod +EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux-libs EUDEV_PROVIDES = udev ifeq ($(BR2_ROOTFS_MERGED_USR),) EUDEV_CONF_OPTS += --with-rootlibdir=/lib --enable-split-usr endif +ifeq ($(BR2_PACKAGE_EUDEV_MODULE_LOADING),y) +EUDEV_CONF_OPTS += --enable-kmod +EUDEV_DEPENDENCIES += kmod +else +EUDEV_CONF_OPTS += --disable-kmod +endif + ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y) EUDEV_CONF_OPTS += --enable-rule-generator else