From patchwork Fri Mar 20 23:35:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1259264 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=l42tWd2U; dkim-atps=neutral Received: from silver.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 ozlabs.org (Postfix) with ESMTPS id 48kgC11T3zz9sR4 for ; Sat, 21 Mar 2020 10:36:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 19E4B26319; Fri, 20 Mar 2020 23:36:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SrlV+cUMAKGx; Fri, 20 Mar 2020 23:36:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 48EAA26307; Fri, 20 Mar 2020 23:36:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 31D3D1BF59A for ; Fri, 20 Mar 2020 23:36:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2E67E8937E for ; Fri, 20 Mar 2020 23:36:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v68BgIJaZ9y8 for ; Fri, 20 Mar 2020 23:36:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 836F089379 for ; Fri, 20 Mar 2020 23:36:03 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id 10so6615951qtp.1 for ; Fri, 20 Mar 2020 16:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VlrgoIxjQHmCQdOPO1LxXZmvZlP0XDbuOdXMwPFy7nk=; b=l42tWd2UemIL3eG7GMvEpTRxF3t850eTL5L2xDZEAyptD5t5Qm7/JR7OMATR5wDLGJ 23P6qlMutx0qBpMpR1IhmbYEKvDoJnv2Vm78H9SAre7DF7BeyS6zeK9EG8VT96O3/fC+ dUnrj/kL/9jGnx/pN/hnyXZMybilYlLJkFMPqT5hZKvRx5zX5Bo0Cc9+X5i+6OfL1HQG f8QhBR8+SZAnw8PK5nYgca/4MpixpTmn4z9NOP7FNlmlIw+57INk4fVEZ0pGjQyo3W9H z+VmDTqLbZmw2GPBthr5F50LXDHRl9QjFfpfmMMujFRKPmPjTtK9ItvWIPnt/MiBZXcX lmRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VlrgoIxjQHmCQdOPO1LxXZmvZlP0XDbuOdXMwPFy7nk=; b=UV/pimotSLrqz/fdu3tQfzRXGrLMaZPBeIN+785CSGj40kH/M5t1iLSKLokHb3ZPqR KmxzEfNPQmeeeSBphOQueZJXBxotPg12WbHJjAerEBsdQ40ldfsS0V7xN7xPk7Eo5EpL hvlpqzGPn35ct2yzE1KCEMneP0hnTdXzo2mq5deO3zv7ztI98/Pz3AlRCqo40MTsnlU0 Eo33ofGkKUoVVqIJxmG09F+m+WlYY4d9uLoPwNe9ivXXbhnMa0w/EMg65miQHUG7j0p9 vIMLXaQHwK1m6vZOjhEB+E9pW0Egt4OY/S9C8354T83Rf0mL8GSwQZ9LdOJoFOCOentG WPYQ== X-Gm-Message-State: ANhLgQ3bztAGisrhZabQH6dpkhuY5xbkTNJPpWczD49en2yhoB5Yh+Ux RIYmq11c1bwM7Kuk4FzKZgsn0+h1f1E= X-Google-Smtp-Source: ADFU+vuSap1NXuNC7uD0onNpJB/QiygcpMT+n7T2zNz2ZjrKBH5AA2v0xCC3nWmMsm5zmqJnzbCv8Q== X-Received: by 2002:ac8:1111:: with SMTP id c17mr10891579qtj.253.1584747362131; Fri, 20 Mar 2020 16:36:02 -0700 (PDT) Received: from casantos.remote.com (177.204.229.175.dynamic.adsl.gvt.net.br. [177.204.229.175]) by smtp.gmail.com with ESMTPSA id p38sm6265257qtf.50.2020.03.20.16.35.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 16:36:01 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 20 Mar 2020 20:35:43 -0300 Message-Id: <20200320233547.28586-3-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200320233547.28586-1-unixmania@gmail.com> References: <20200320233547.28586-1-unixmania@gmail.com> Subject: [Buildroot] [[PATCH RFC] 2/6] package/busybox: add modules-load init script X-BeenThere: buildroot@busybox.net 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: Carlos Santos , Lothar Felten , Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use some scripting to mimic the systemd "modules-load" and the OpenRC "modules" services (load kernel modules based on static configuration). At the moment package/busybox/S02modules-load is a symlink to the kmod script, since it works with both versions of the "modprobe" utility. Signed-off-by: Carlos Santos --- package/busybox/S02modules-load | 1 + package/busybox/busybox.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 120000 package/busybox/S02modules-load diff --git a/package/busybox/S02modules-load b/package/busybox/S02modules-load new file mode 120000 index 0000000000..84edaae3d7 --- /dev/null +++ b/package/busybox/S02modules-load @@ -0,0 +1 @@ +../kmod/S02modules-load \ No newline at end of file diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index e2a4a8c5c7..767499b0c0 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -264,6 +264,17 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT endef endif +# Only install our modules-load script if no other package does it. +ifeq ($(BR2_PACKAGE_KMOD_TOOLS),) +define BUSYBOX_INSTALL_MODULES_SCRIPT + if grep -q CONFIG_MODPROBE=y $(@D)/.config; \ + then \ + $(INSTALL) -m 0755 -D package/busybox/S02modules-load \ + $(TARGET_DIR)/etc/init.d/S02modules-load; \ + fi +endef +endif + # Only install our sysctl scripts if no other package does it. ifeq ($(BR2_PACKAGE_PROCPS_NG),) define BUSYBOX_INSTALL_SYSCTL_SCRIPT @@ -368,6 +379,7 @@ define BUSYBOX_INSTALL_INIT_SYSV $(BUSYBOX_INSTALL_MDEV_SCRIPT) $(BUSYBOX_INSTALL_LOGGING_SCRIPT) $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) + $(BUSYBOX_INSTALL_MODULES_SCRIPT) $(BUSYBOX_INSTALL_SYSCTL_SCRIPT) $(BUSYBOX_INSTALL_TELNET_SCRIPT) endef