From patchwork Mon Mar 9 02:50:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1251158 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=ZupFl5Wg; 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 48bN5W5TFcz9sPJ for ; Mon, 9 Mar 2020 13:51:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A12BB881FA; Mon, 9 Mar 2020 02:51:09 +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 ue5nKhtuib4Z; Mon, 9 Mar 2020 02:51:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7FB728816D; Mon, 9 Mar 2020 02:51:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 745CD1BF380 for ; Mon, 9 Mar 2020 02:51:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6FBC186A2B for ; Mon, 9 Mar 2020 02:51:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0W2Vr-3BDzgf for ; Mon, 9 Mar 2020 02:51:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 999BB869C5 for ; Mon, 9 Mar 2020 02:50:17 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id f198so7878750qke.11 for ; Sun, 08 Mar 2020 19:50:17 -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=YgN6nBprVBMtOb0Ht/BLR1WE4D40D4Ppa1oKjp07TeM=; b=ZupFl5Wg1a8tx4VH/pPLHxqMPet25CtKjQ6PRiSj7uucXU5/rDIXoh+J+4Zhfgejef 9HLG+PebFOJ+0mYFPc9GRv9lQUr5NJVUPTUKHjYSt9ShT1VyzguupOzmMG2PmthYVswN Fp9+cdMJa5nu1jFW6v7vVqTjLUDo3NMNSAaEI1O4Ue/+HXF4BxP1TS4DI01MnxzCSH/J D4iVg7dcJEruWGoZdyhusNdY0eeKhAJ6fcIgKYNX+ExuF5HxmyoJ5HPduE09Gnc8cdoT fGTrfUNO/UYVBio2N380DJ+CajyihTgk7Q50NPdJsaZZ57XSyJIdV7Cit3oovRb0V5FW buWg== 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=YgN6nBprVBMtOb0Ht/BLR1WE4D40D4Ppa1oKjp07TeM=; b=PBT9ZwRs3PhGa8NFIjj8TT1xYQuAvatOyl/ZvGKUJ9nQW+pcPR40eeIM+PHFdQbsRP DueHunWp4Mih98ctUh+x/4JN1UjT9p7J0rpqNaOvUoxhpRufWCAl3h3fOMxHATICxNL9 bkElmckwMy7IDXGzH4JSa0aB8VmLOKlP7UAW/TrNXPgjwzj8tW79i1xPRuf6i5wkAqEc SsxcEP3lT8xhLnjFXVClFuH8qbtwIF2aYoNTNHey2qYlI5CVTmvePwlnlXdWharOHJ41 03380HP1Ye93afOy9Ixr3GNVeAqODaJmxR4gYi7mawS5MmuTFxx7wK5HJAnqzms/yx6k Xijg== X-Gm-Message-State: ANhLgQ21t0weMt8r6zYAhbtsvDsyj4ZJAHHEc85cx1dM3i7WB2kcqa89 eS62rQPVPaqB7hAumd/bSkFI2Psf X-Google-Smtp-Source: ADFU+vvh1oKuV98uoYmTUJahZvYIu3Or6JoY2c4HUm+tFuGLD0mUGo+aRQ2t4vfjWfuzBILTI1IvKw== X-Received: by 2002:a05:620a:1092:: with SMTP id g18mr13131233qkk.80.1583722216354; Sun, 08 Mar 2020 19:50:16 -0700 (PDT) Received: from casantos.remote.com ([187.113.201.123]) by smtp.gmail.com with ESMTPSA id d9sm21162478qtw.32.2020.03.08.19.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Mar 2020 19:50:15 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sun, 8 Mar 2020 23:50:03 -0300 Message-Id: <20200309025003.26466-4-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20200309025003.26466-1-unixmania@gmail.com> References: <20200309025003.26466-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 3/3] package/ifupdown-scripts: add openrc support 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 MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos The "network" script allows configuring an interface by means of two /etc/ifup. and /etc/ifdown. files with the commands required to bring it up and down, respectively. So we can support the BR2_SYSTEM_DHCP config if netifrc is not selected. - Replace the dependency on !BR2_PACKAGE_OPENRC in Config.in by a dependency on !BR2_PACKAGE_NETIFRC. - Add an IFUPDOWN_SCRIPTS_PREAMBLE macro to create an empty interfaces file. - Make the IFUPDOWN_SCRIPTS_LOCALHOST macro append the "lo" setup to the interfaces file. - Add an IFUPDOWN_SCRIPTS_DHCP_OPENRC macro to create the ifup. and ifdown. files. - Add an IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC hook that includes the IFUPDOWN_SCRIPTS_{PREAMBLE,DHCP,DHCP_OPENRC} macros. LOCALHOST is not required, since "lo" is configured by the "loopback" script. Signed-off-by: Carlos Santos --- package/ifupdown-scripts/Config.in | 2 +- package/ifupdown-scripts/ifupdown-scripts.mk | 22 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in index 4b984bc30c..166094c511 100644 --- a/package/ifupdown-scripts/Config.in +++ b/package/ifupdown-scripts/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" default y if BR2_ROOTFS_SKELETON_DEFAULT - depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, or the busybox one) to bring network up, or tear it down. diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk index 16fef783dd..5ef032142c 100644 --- a/package/ifupdown-scripts/ifupdown-scripts.mk +++ b/package/ifupdown-scripts/ifupdown-scripts.mk @@ -4,13 +4,17 @@ # ################################################################################ +define IFUPDOWN_SCRIPTS_PREAMBLE + echo "# interface file auto-generated by buildroot" \ + > $(TARGET_DIR)/etc/network/interfaces +endef + define IFUPDOWN_SCRIPTS_LOCALHOST ( \ - echo "# interface file auto-generated by buildroot"; \ echo ; \ echo "auto lo"; \ echo "iface lo inet loopback"; \ - ) > $(TARGET_DIR)/etc/network/interfaces + ) >> $(TARGET_DIR)/etc/network/interfaces endef IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) @@ -26,6 +30,12 @@ define IFUPDOWN_SCRIPTS_DHCP echo " hostname \$$(hostname)"; \ ) >> $(TARGET_DIR)/etc/network/interfaces endef +define IFUPDOWN_SCRIPTS_DHCP_OPENRC + echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) + echo "ifdown $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifdown.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) +endef endif define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS @@ -34,9 +44,16 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network) endef +define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC + $(IFUPDOWN_SCRIPTS_PREAMBLE) + $(IFUPDOWN_SCRIPTS_DHCP) + $(IFUPDOWN_SCRIPTS_DHCP_OPENRC) +endef + define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endef @@ -47,6 +64,7 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endef