From patchwork Sat Apr 18 22:14:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1272740 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.138; helo=whitealder.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=l14l70nE; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 494S1N5cGVz9sSG for ; Sun, 19 Apr 2020 08:14:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6532B87613; Sat, 18 Apr 2020 22:14:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sbuJ5Q8TcY0L; Sat, 18 Apr 2020 22:14:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 71C13875BA; Sat, 18 Apr 2020 22:14:28 +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 E09D41BF577 for ; Sat, 18 Apr 2020 22:14:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DCD9D87410 for ; Sat, 18 Apr 2020 22:14:24 +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 gUovtaMkDwpx for ; Sat, 18 Apr 2020 22:14:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 35EE687B5E for ; Sat, 18 Apr 2020 22:14:24 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id l13so5357633qtr.7 for ; Sat, 18 Apr 2020 15:14:24 -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=6ktryBLsDq5rSWzEOdQjG7rgRB7dI7miNRc9zyJnpw4=; b=l14l70nEwND8wO+Y0MzV5mRfbhkovxnYuiiPhugtzXWhQMbn9dR2NRAfSl0GmXRsH9 na5n5IpD9eduQzEio3+3dOOGp5dDquA9Ngh2OkSiT5mnJe7sBCFmoDHpOZsVqnBBKwHZ luVTo3o+7FgbHCQMN+qyl0vQkm5NeA6v6HEOdq/FeygACjA+Q29IOzNdIO9cBUC9MOPT v7d97+In9nodKkti5XQJtr8g+akC5eg+kvalS34qvSozLAlXLJpxHp5Rv8QDDBkLxbC8 GDW8lu90/5rLs70k7tWBzTFo2EOC6AAeaAc+/FI79sZLOgKvx5iGypT8eIZPUOGoodQC 8+MQ== 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=6ktryBLsDq5rSWzEOdQjG7rgRB7dI7miNRc9zyJnpw4=; b=aC+a2CPjeh19A1Y3Bi7wrzUS5tR4LbFF2izIRLClIhYHPviNjRPtHoUzW8RIX19XhP j5yqqRSLF/fSnm5PooPHYiHvaa5Od1YrMF2EQ6f3AAGOz61lyPHA9Kn823ikhSjekdrQ x8qwKWxNZbr+DP/0zhUSVIzgZJzJ5f8E/lI5kWUM/BV1zvwTDhPlz0ICA9qtjgZ60vm0 aHMEf7hXNrV0MEo1DEJGV5zr9WWMfQiAZKnaFk+oYYhEsRtTFhug6o/E/yFt8qmcMbia 8+a/vkfMBsviLWO9ytb0onAhM4Bo4cmeDSlDmHXvMB17tJ6bXBydnyNqMiQUjhAmRjZN XBkw== X-Gm-Message-State: AGi0Pub6kmgTjHbd49XT8+t/inBxI1DrhJ8UC0ss9xR9c4u6p0uVfLOL HX7fDyLrtL1/nHkTPZce8eOFSyQMwlU= X-Google-Smtp-Source: APiQypJ5lcnKyB6kRPwaiHjul1RKy8rzV8BeV8LZV+4iOUJwEfyPLBxKpCIjL3cV/11rXojvZ5Tmbg== X-Received: by 2002:ac8:17c9:: with SMTP id r9mr9678031qtk.392.1587248062922; Sat, 18 Apr 2020 15:14:22 -0700 (PDT) Received: from casantos.remote.csb.com (189.27.141.225.dynamic.adsl.gvt.net.br. [189.27.141.225]) by smtp.gmail.com with ESMTPSA id h3sm5335252qkf.15.2020.04.18.15.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:14:22 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 18 Apr 2020 19:14:08 -0300 Message-Id: <20200418221411.1549783-3-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200418221411.1549783-1-unixmania@gmail.com> References: <20200418221411.1549783-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH v2 2/5] 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 , "Yann E. MORIN" , 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/ --- CC: "Yann E. MORIN" --- Changes v1->v2: - Rename S02modules-load to S11modules-load to ensure that it runs after S10mdev and S10udev, which both are going to trigger cold-plug events that may in turn trigger module loading, as observed by Yann E. MORIN. --- package/busybox/S11modules-load | 1 + package/busybox/busybox.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 120000 package/busybox/S11modules-load diff --git a/package/busybox/S11modules-load b/package/busybox/S11modules-load new file mode 120000 index 0000000000..44623673ff --- /dev/null +++ b/package/busybox/S11modules-load @@ -0,0 +1 @@ +../kmod/S11modules-load \ No newline at end of file diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 5d5f3e92bd..3512bf77b5 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/S11modules-load \ + $(TARGET_DIR)/etc/init.d/S11modules-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