From patchwork Sat Apr 18 22:14:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1272743 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=M6u1Sn74; 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 494S1X2Ngxz9sP7 for ; Sun, 19 Apr 2020 08:14:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7910E876EE; Sat, 18 Apr 2020 22:14:36 +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 yzzZxXL0OksS; Sat, 18 Apr 2020 22:14:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 50C4C8762A; Sat, 18 Apr 2020 22:14:33 +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 716271BF577 for ; Sat, 18 Apr 2020 22:14:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6AEC587FCF for ; Sat, 18 Apr 2020 22:14:30 +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 qrq5Eb9p0jiv for ; Sat, 18 Apr 2020 22:14:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0590A87B69 for ; Sat, 18 Apr 2020 22:14:29 +0000 (UTC) Received: by mail-qt1-f180.google.com with SMTP id f13so5373422qti.5 for ; Sat, 18 Apr 2020 15:14:28 -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=UD/esOlEzxqYMMR527xgf56vxPDxYhKageEl1pcOwJg=; b=M6u1Sn74nzPmOOD715DaPnhVduamaPJCZfmmgBoMZlDcfuev7DkcZYAG4iG44skdUm p+R8bkvNghbBsgNuu+1F7vuBqPbm+0YZC3ktw3lIpPyP+zasT9s50VW8LN3KxH56x4ap C0hva+jslZba3EJunpD4jo2t60/ApINMsnqjwcjkJWVziCn/5ljdvUNX8XpDB89aysZe ydSvQ/2g+sn7tIHvTkmB2xO84HYA4prSciYcJnI4wefXyDUjdpGBSdyZoqLIT6lUwCji NJMXiuPSMuTie6pTTChvZlbPYPI978Cyf6MwOThrykRx58688mKO4Mdz9xoEKdl72m9c ZVIw== 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=UD/esOlEzxqYMMR527xgf56vxPDxYhKageEl1pcOwJg=; b=MPq8aKHlFsbNftyjrNo/PfEtES7iH514/G+/kjS+xcmzPgl8EikOFX2fFyfiXVwAGG Zfr4UsO4IKj4yunGT9QAqsfCx4qtzE91LAbAtB66nFZvSfuWgqKK09VSUOLMjnj3WOSW ZHKp2+HXm6ewEv2xtCMnt4eaBZDwojCLP2NO3eJZJ8C+V3PR89JIGnLfpdw9oGBAfkAM Kby9jsS6hW+d+kUsLvNDbWt3L5XDEsOtW60SlVwekL3n/d37VnipkCeVVt/3DbZloU2j nVXwyjTiwqTioF8PfdHtowSRSju3D/dqfr/9A3VWSq5DWhmqHYOb7kuy0qGurZKpCKAb LbbQ== X-Gm-Message-State: AGi0PuaojBsLTv4nQ8t1UgAzqLQZl81ZcUNhO+e0p6mPhjzYe1hdmhdY 0gYEOiAUoCxU9BTfp8hyvRVCBbXDwi0= X-Google-Smtp-Source: APiQypIsSQUg1lP3cqcQsQpXFGoUXZh9rk8whuK89mENXReQHlZE3e6alxgO5TKg8rABKA8B1io7bw== X-Received: by 2002:aed:3f30:: with SMTP id p45mr9917448qtf.49.1587248067850; Sat, 18 Apr 2020 15:14:27 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:14:27 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 18 Apr 2020 19:14:10 -0300 Message-Id: <20200418221411.1549783-5-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 4/5] package/owfs: use modules-load to load the kernel module 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 , Adam Duskett , Lothar Felten MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos This is compatible with BusyBox/sysvinit (via S02modules-load), OpenRC and systemd. It also prevents trying to load the module each time the init script is executed. Signed-off-by: Carlos Santos --- Tested on QEMU with a kernel config with FUSE_FS=m. Only the module loading was tested, since there is no 1-wire device. --- package/owfs/S60owfs | 2 -- package/owfs/owfs.mk | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package/owfs/S60owfs b/package/owfs/S60owfs index feed676f8a..46b7ec775d 100644 --- a/package/owfs/S60owfs +++ b/package/owfs/S60owfs @@ -10,8 +10,6 @@ OWFS_ARGS="" case "$1" in start) printf "Starting ${NAME}: " - # Fuse may be in a module, so try to load it - modprobe -q fuse && printf "[fuse] " mkdir -p ${OWFS_MOUNTPOINT} start-stop-daemon -S -x ${DAEMON} -- \ --pid_file ${PID_F} -m ${OWFS_MOUNTPOINT} ${OWFS_DEVICES} \ diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index ffc0b3098d..a09a4bb37b 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -35,6 +35,17 @@ define OWFS_CREATE_MOUNTPOINT mkdir -p $(TARGET_DIR)/dev/1wire endef OWFS_POST_INSTALL_TARGET_HOOKS += OWFS_CREATE_MOUNTPOINT +ifeq ($(BR2_LINUX_KERNEL),y) +define OWFS_GEN_MODULES_CONF + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/modules-load.d + { \ + find $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/fs/fuse -name 'fuse.ko*'; \ + } 2> /dev/null | { \ + sed 's:^.*/::; s:\.ko[^ ]*::'; \ + } > $(TARGET_DIR)/etc/modules-load.d/60-owfs.conf +endef +OWFS_TARGET_FINALIZE_HOOKS += OWFS_GEN_MODULES_CONF +endif else OWFS_CONF_OPTS += --disable-owfs endif