All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package
@ 2017-07-02 14:35 Yann E. MORIN
  2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-02 14:35 UTC (permalink / raw)
  To: buildroot

Hello All!

The ifupdown scripts are currently provided by the skeleton, and they
are used by varioue network 'managers', like the standalone ifupdown,
the one in Busybox, or by systemd (without networkd).

But when we have a skeleton specific to systemd, we'd still need to have
those scripts.

Rather than duplicate or play special tricks, we first move them to
their own package.

Then we make sure we do not install them with systemd-networkd, as they
are useless in that case.

Finally, those scripts can now even be used by a custom skeleton.

Changes v2 -> v3:
  - don't select the new package at all, but default it to 'y' for the
    default skeleton, so as to really keep the current behaviour
    (Arnout)
  - split the patch in three  (Arnout)


Regards,
Yann E. MORIN.


The following changes since commit 824f3d9bebee5008ed4f21ab9857778b7d200802

  support/scripts: check-host-rpath now handles $ORIGIN as well (2017-07-02 15:49:25 +0200)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 7af4e1b5c5c358fd2a41e609ea250138a5565c18

  package/ifupdown-scripts: allow use with a custom skeleton (2017-07-02 16:14:08 +0200)


----------------------------------------------------------------
Yann E. MORIN (3):
      package/ifupdown-scripts: new package
      package/ifupdown-scripts: not needed for systemd-networkd
      package/ifupdown-scripts: allow use with a custom skeleton

 package/Config.in                                  |  1 +
 package/ifupdown-scripts/Config.in                 |  7 +++
 .../init.d => ifupdown-scripts}/S40network         |  0
 package/ifupdown-scripts/ifupdown-scripts.mk       | 57 ++++++++++++++++++++++
 .../{systemd => ifupdown-scripts}/network.service  |  0
 .../ifupdown-scripts}/network/if-down.d/.empty     |  0
 .../network/if-post-down.d/.empty                  |  0
 .../network/if-pre-up.d/wait_iface                 |  0
 .../ifupdown-scripts}/network/if-up.d/.empty       |  0
 package/{skeleton => ifupdown-scripts}/nfs_check   |  0
 package/skeleton/skeleton.mk                       | 33 -------------
 package/systemd/systemd.mk                         |  8 ---
 12 files changed, 65 insertions(+), 41 deletions(-)
 create mode 100644 package/ifupdown-scripts/Config.in
 rename package/{initscripts/init.d => ifupdown-scripts}/S40network (100%)
 create mode 100644 package/ifupdown-scripts/ifupdown-scripts.mk
 rename package/{systemd => ifupdown-scripts}/network.service (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-down.d/.empty (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-post-down.d/.empty (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-pre-up.d/wait_iface (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-up.d/.empty (100%)
 rename package/{skeleton => ifupdown-scripts}/nfs_check (100%)

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package
  2017-07-02 14:35 [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Yann E. MORIN
@ 2017-07-02 14:35 ` Yann E. MORIN
  2017-07-02 16:04   ` Arnout Vandecappelle
  2017-07-03  9:38   ` Yann E. MORIN
  2017-07-02 14:35 ` [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd Yann E. MORIN
                   ` (2 subsequent siblings)
  3 siblings, 2 replies; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-02 14:35 UTC (permalink / raw)
  To: buildroot

The ifupdown scripts can be used independently of the init system, be it
sysv, busybox or systemd; they could even be used when there is no init
system (i.e. the user is providing his own).

Currently, those ifupdown scripts are bundled in the skeleton.

But we soon will have a skeleton specific to systemd, so we would be
missing those scripts (when systemd-networks is not enabled).

So, move those scripts to their own package.

To keep the current behaviour (before it is changed in future commits),
we make that package default to y, but depend on the default skeleton.

Instead of being a target-finalize hook, the scripts are installed as
any other package are, with a package install-target command.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

---
Changes v2 -> v3:
  - don't select it from any other package, make it default y  (Arnout)

Changes v1 -> v2:
  - add a real prompt  (Thomas, Arnout)
  - drop ifupdown-scripts dummy-prompt hack  (Thomas)
  - simplify selecting ifupdown-scripts from systemd  (Thomas)
  - reword the commit log to remove reference to init systems  (Arnout)
  - select it from the package Busybox, rather than the init system
    Busybox  (Arnout)
---
 package/Config.in                                  |  1 +
 package/ifupdown-scripts/Config.in                 |  7 +++
 .../init.d => ifupdown-scripts}/S40network         |  0
 package/ifupdown-scripts/ifupdown-scripts.mk       | 57 ++++++++++++++++++++++
 .../{systemd => ifupdown-scripts}/network.service  |  0
 .../ifupdown-scripts}/network/if-down.d/.empty     |  0
 .../network/if-post-down.d/.empty                  |  0
 .../network/if-pre-up.d/wait_iface                 |  0
 .../ifupdown-scripts}/network/if-up.d/.empty       |  0
 package/{skeleton => ifupdown-scripts}/nfs_check   |  0
 package/skeleton/skeleton.mk                       | 33 -------------
 package/systemd/systemd.mk                         |  8 ---
 12 files changed, 65 insertions(+), 41 deletions(-)
 create mode 100644 package/ifupdown-scripts/Config.in
 rename package/{initscripts/init.d => ifupdown-scripts}/S40network (100%)
 create mode 100644 package/ifupdown-scripts/ifupdown-scripts.mk
 rename package/{systemd => ifupdown-scripts}/network.service (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-down.d/.empty (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-post-down.d/.empty (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-pre-up.d/wait_iface (100%)
 rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-up.d/.empty (100%)
 rename package/{skeleton => ifupdown-scripts}/nfs_check (100%)

diff --git a/package/Config.in b/package/Config.in
index fdfcd02df7..33e1464ed2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1599,6 +1599,7 @@ menu "Networking applications"
 	source "package/ifplugd/Config.in"
 	source "package/iftop/Config.in"
 	source "package/ifupdown/Config.in"
+	source "package/ifupdown-scripts/Config.in"
 	source "package/igd2-for-linux/Config.in"
 	source "package/igh-ethercat/Config.in"
 	source "package/igmpproxy/Config.in"
diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
new file mode 100644
index 0000000000..629ee6a5bd
--- /dev/null
+++ b/package/ifupdown-scripts/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IFUPDOWN_SCRIPTS
+	bool
+	depends on BR2_ROOTFS_SKELETON_DEFAULT
+	default y
+	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/initscripts/init.d/S40network b/package/ifupdown-scripts/S40network
similarity index 100%
rename from package/initscripts/init.d/S40network
rename to package/ifupdown-scripts/S40network
diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk
new file mode 100644
index 0000000000..fc58e0bc0a
--- /dev/null
+++ b/package/ifupdown-scripts/ifupdown-scripts.mk
@@ -0,0 +1,57 @@
+################################################################################
+#
+# ifupdown-scripts
+#
+################################################################################
+
+IFUPDOWN_SCRIPTS_SOURCE =
+
+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
+endef
+
+IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
+
+ifneq ($(IFUPDOWN_SCRIPTS_DHCP_IFACE),)
+define IFUPDOWN_SCRIPTS_DHCP
+	( \
+		echo ; \
+		echo "auto $(IFUPDOWN_SCRIPTS_DHCP_IFACE)"; \
+		echo "iface $(IFUPDOWN_SCRIPTS_DHCP_IFACE) inet dhcp"; \
+		echo "  pre-up /etc/network/nfs_check"; \
+		echo "  wait-delay 15"; \
+	) >> $(TARGET_DIR)/etc/network/interfaces
+	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
+		$(TARGET_DIR)/etc/network/nfs_check
+endef
+endif
+
+define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/etc/network
+	cp -a $(IFUPDOWN_SCRIPTS_PKGDIR)/network/* $(TARGET_DIR)/etc/network
+	$(IFUPDOWN_SCRIPTS_LOCALHOST)
+	$(IFUPDOWN_SCRIPTS_DHCP)
+endef
+
+define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \
+		$(TARGET_DIR)/etc/init.d/S40network
+endef
+
+# ifupdown-scripts can not be selected when systemd-networkd is
+# enabled, so if we are enabled with systemd, we must install our
+# own service file.
+define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \
+		$(TARGET_DIR)/etc/systemd/system/network.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../network.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
+endef
+
+$(eval $(generic-package))
diff --git a/package/systemd/network.service b/package/ifupdown-scripts/network.service
similarity index 100%
rename from package/systemd/network.service
rename to package/ifupdown-scripts/network.service
diff --git a/system/skeleton/etc/network/if-down.d/.empty b/package/ifupdown-scripts/network/if-down.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-down.d/.empty
rename to package/ifupdown-scripts/network/if-down.d/.empty
diff --git a/system/skeleton/etc/network/if-post-down.d/.empty b/package/ifupdown-scripts/network/if-post-down.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-post-down.d/.empty
rename to package/ifupdown-scripts/network/if-post-down.d/.empty
diff --git a/system/skeleton/etc/network/if-pre-up.d/wait_iface b/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
similarity index 100%
rename from system/skeleton/etc/network/if-pre-up.d/wait_iface
rename to package/ifupdown-scripts/network/if-pre-up.d/wait_iface
diff --git a/system/skeleton/etc/network/if-up.d/.empty b/package/ifupdown-scripts/network/if-up.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-up.d/.empty
rename to package/ifupdown-scripts/network/if-up.d/.empty
diff --git a/package/skeleton/nfs_check b/package/ifupdown-scripts/nfs_check
similarity index 100%
rename from package/skeleton/nfs_check
rename to package/ifupdown-scripts/nfs_check
diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
index 1321eb62cd..a310a314a5 100644
--- a/package/skeleton/skeleton.mk
+++ b/package/skeleton/skeleton.mk
@@ -145,39 +145,6 @@ endef
 TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE
 endif
 
-define SKELETON_SET_NETWORK_LOCALHOST
-	( \
-		echo "# interface file auto-generated by buildroot"; \
-		echo ; \
-		echo "auto lo"; \
-		echo "iface lo inet loopback"; \
-	) > $(TARGET_DIR)/etc/network/interfaces
-endef
-
-SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
-
-ifneq ($(SKELETON_NETWORK_DHCP_IFACE),)
-define SKELETON_SET_NETWORK_DHCP
-	( \
-		echo ; \
-		echo "auto $(SKELETON_NETWORK_DHCP_IFACE)"; \
-		echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp"; \
-		echo "	pre-up /etc/network/nfs_check"; \
-		echo "	wait-delay 15"; \
-	) >> $(TARGET_DIR)/etc/network/interfaces
-	$(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \
-		$(TARGET_DIR)/etc/network/nfs_check
-endef
-endif
-
-define SKELETON_SET_NETWORK
-	mkdir -p $(TARGET_DIR)/etc/network/
-	$(SKELETON_SET_NETWORK_LOCALHOST)
-	$(SKELETON_SET_NETWORK_DHCP)
-endef
-
-TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK
-
 ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y)
 ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),)
 SKELETON_ROOT_PASSWORD =
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index a853434717..af42a69b7f 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -308,13 +308,6 @@ endef
 endif
 else
 SYSTEMD_CONF_OPTS += --disable-networkd
-define SYSTEMD_INSTALL_SERVICE_NETWORK
-	$(INSTALL) -D -m 644 package/systemd/network.service \
-		$(TARGET_DIR)/etc/systemd/system/network.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../network.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
-endef
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
@@ -406,7 +399,6 @@ endif
 define SYSTEMD_INSTALL_INIT_SYSTEMD
 	$(SYSTEMD_DISABLE_SERVICE_TTY1)
 	$(SYSTEMD_INSTALL_SERVICE_TTY)
-	$(SYSTEMD_INSTALL_SERVICE_NETWORK)
 	$(SYSTEMD_INSTALL_SERVICE_TIMESYNC)
 	$(SYSTEMD_INSTALL_NETWORK_CONFS)
 endef
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd
  2017-07-02 14:35 [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Yann E. MORIN
  2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
@ 2017-07-02 14:35 ` Yann E. MORIN
  2017-07-02 16:06   ` Arnout Vandecappelle
  2017-07-02 14:35 ` [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton Yann E. MORIN
  2017-07-04 21:49 ` [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Thomas Petazzoni
  3 siblings, 1 reply; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-02 14:35 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/ifupdown-scripts/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
index 629ee6a5bd..7086253a03 100644
--- a/package/ifupdown-scripts/Config.in
+++ b/package/ifupdown-scripts/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_IFUPDOWN_SCRIPTS
 	bool
 	depends on BR2_ROOTFS_SKELETON_DEFAULT
+	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
 	default y
 	help
 	  Set of scripts used by ifupdown (either the standalone one, or the
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton
  2017-07-02 14:35 [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Yann E. MORIN
  2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
  2017-07-02 14:35 ` [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd Yann E. MORIN
@ 2017-07-02 14:35 ` Yann E. MORIN
  2017-07-02 16:08   ` Arnout Vandecappelle
  2017-07-04 21:49 ` [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Thomas Petazzoni
  3 siblings, 1 reply; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-02 14:35 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 package/ifupdown-scripts/Config.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
index 7086253a03..7064d58fec 100644
--- a/package/ifupdown-scripts/Config.in
+++ b/package/ifupdown-scripts/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_IFUPDOWN_SCRIPTS
-	bool
-	depends on BR2_ROOTFS_SKELETON_DEFAULT
+	bool "ifupdown scripts"
 	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
-	default y
+	default y if BR2_ROOTFS_SKELETON_DEFAULT
 	help
 	  Set of scripts used by ifupdown (either the standalone one, or the
 	  busybox one) to bring network up, or tear it down.
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package
  2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
@ 2017-07-02 16:04   ` Arnout Vandecappelle
  2017-07-02 16:05     ` Arnout Vandecappelle
  2017-07-03  9:38   ` Yann E. MORIN
  1 sibling, 1 reply; 12+ messages in thread
From: Arnout Vandecappelle @ 2017-07-02 16:04 UTC (permalink / raw)
  To: buildroot



On 02-07-17 16:35, Yann E. MORIN wrote:
[snip]
> +# ifupdown-scripts can not be selected when systemd-networkd is
> +# enabled, so if we are enabled with systemd, we must install our
> +# own service file.

 Leftover from a previous iteration? Now it actually can (and will be) selected
for SYSTEMD_NETWORKD. So you need the condition here (and drop the comment).

 Regards,
 Arnout

> +define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
> +	$(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \
> +		$(TARGET_DIR)/etc/systemd/system/network.service
> +	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> +	ln -fs ../network.service \
> +		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
> +endef
> +
[snip]

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package
  2017-07-02 16:04   ` Arnout Vandecappelle
@ 2017-07-02 16:05     ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2017-07-02 16:05 UTC (permalink / raw)
  To: buildroot



On 02-07-17 18:04, Arnout Vandecappelle wrote:
> 
> 
> On 02-07-17 16:35, Yann E. MORIN wrote:
> [snip]
>> +# ifupdown-scripts can not be selected when systemd-networkd is
>> +# enabled, so if we are enabled with systemd, we must install our
>> +# own service file.
> 
>  Leftover from a previous iteration? Now it actually can (and will be) selected
> for SYSTEMD_NETWORKD. So you need the condition here (and drop the comment).

 OTOH respinning just for this is silly.

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

> 
>  Regards,
>  Arnout
> 
>> +define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
>> +	$(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \
>> +		$(TARGET_DIR)/etc/systemd/system/network.service
>> +	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
>> +	ln -fs ../network.service \
>> +		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
>> +endef
>> +
> [snip]
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd
  2017-07-02 14:35 ` [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd Yann E. MORIN
@ 2017-07-02 16:06   ` Arnout Vandecappelle
  0 siblings, 0 replies; 12+ messages in thread
From: Arnout Vandecappelle @ 2017-07-02 16:06 UTC (permalink / raw)
  To: buildroot



On 02-07-17 16:35, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> ---
>  package/ifupdown-scripts/Config.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
> index 629ee6a5bd..7086253a03 100644
> --- a/package/ifupdown-scripts/Config.in
> +++ b/package/ifupdown-scripts/Config.in
> @@ -1,6 +1,7 @@
>  config BR2_PACKAGE_IFUPDOWN_SCRIPTS
>  	bool
>  	depends on BR2_ROOTFS_SKELETON_DEFAULT
> +	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
>  	default y
>  	help
>  	  Set of scripts used by ifupdown (either the standalone one, or the
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton
  2017-07-02 14:35 ` [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton Yann E. MORIN
@ 2017-07-02 16:08   ` Arnout Vandecappelle
  2017-07-02 16:37     ` Yann E. MORIN
  0 siblings, 1 reply; 12+ messages in thread
From: Arnout Vandecappelle @ 2017-07-02 16:08 UTC (permalink / raw)
  To: buildroot



On 02-07-17 16:35, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 You'll also send a patch adding a select to package/ifupdown/Config.in?

 Regards,
 Arnout

> ---
>  package/ifupdown-scripts/Config.in | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
> index 7086253a03..7064d58fec 100644
> --- a/package/ifupdown-scripts/Config.in
> +++ b/package/ifupdown-scripts/Config.in
> @@ -1,8 +1,7 @@
>  config BR2_PACKAGE_IFUPDOWN_SCRIPTS
> -	bool
> -	depends on BR2_ROOTFS_SKELETON_DEFAULT
> +	bool "ifupdown scripts"
>  	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
> -	default y
> +	default y if BR2_ROOTFS_SKELETON_DEFAULT
>  	help
>  	  Set of scripts used by ifupdown (either the standalone one, or the
>  	  busybox one) to bring network up, or tear it down.
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton
  2017-07-02 16:08   ` Arnout Vandecappelle
@ 2017-07-02 16:37     ` Yann E. MORIN
  0 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-02 16:37 UTC (permalink / raw)
  To: buildroot

Arnout, All,

On 2017-07-02 18:08 +0200, Arnout Vandecappelle spake thusly:
> On 02-07-17 16:35, Yann E. MORIN wrote:
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Arnout Vandecappelle <arnout@mind.be>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> 
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> 
>  You'll also send a patch adding a select to package/ifupdown/Config.in?

As discussed IRL, it is also a legit use-case to have ifupdown without
out scripts.

Thanks for the review! :-)

Regards,
Yann E. MORIN.

>  Regards,
>  Arnout
> 
> > ---
> >  package/ifupdown-scripts/Config.in | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
> > index 7086253a03..7064d58fec 100644
> > --- a/package/ifupdown-scripts/Config.in
> > +++ b/package/ifupdown-scripts/Config.in
> > @@ -1,8 +1,7 @@
> >  config BR2_PACKAGE_IFUPDOWN_SCRIPTS
> > -	bool
> > -	depends on BR2_ROOTFS_SKELETON_DEFAULT
> > +	bool "ifupdown scripts"
> >  	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
> > -	default y
> > +	default y if BR2_ROOTFS_SKELETON_DEFAULT
> >  	help
> >  	  Set of scripts used by ifupdown (either the standalone one, or the
> >  	  busybox one) to bring network up, or tear it down.
> > 
> 
> -- 
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package
  2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
  2017-07-02 16:04   ` Arnout Vandecappelle
@ 2017-07-03  9:38   ` Yann E. MORIN
  1 sibling, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-03  9:38 UTC (permalink / raw)
  To: buildroot

Arnout, Thomas, All,

On 2017-07-02 16:35 +0200, Yann E. MORIN spake thusly:
> The ifupdown scripts can be used independently of the init system, be it
> sysv, busybox or systemd; they could even be used when there is no init
> system (i.e. the user is providing his own).
> 
> Currently, those ifupdown scripts are bundled in the skeleton.
> 
> But we soon will have a skeleton specific to systemd, so we would be
> missing those scripts (when systemd-networks is not enabled).
> 
> So, move those scripts to their own package.
> 
> To keep the current behaviour (before it is changed in future commits),
> we make that package default to y, but depend on the default skeleton.
> 
> Instead of being a target-finalize hook, the scripts are installed as
> any other package are, with a package install-target command.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
[--SNIP--]
> diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk
> new file mode 100644
> index 0000000000..fc58e0bc0a
> --- /dev/null
> +++ b/package/ifupdown-scripts/ifupdown-scripts.mk
> @@ -0,0 +1,57 @@
> +################################################################################
> +#
> +# ifupdown-scripts
> +#
> +################################################################################
> +
> +IFUPDOWN_SCRIPTS_SOURCE =

As seen IRL, this line is not needed.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package
  2017-07-02 14:35 [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Yann E. MORIN
                   ` (2 preceding siblings ...)
  2017-07-02 14:35 ` [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton Yann E. MORIN
@ 2017-07-04 21:49 ` Thomas Petazzoni
  2017-07-04 21:56   ` Yann E. MORIN
  3 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2017-07-04 21:49 UTC (permalink / raw)
  To: buildroot

Hello,

On Sun,  2 Jul 2017 16:35:16 +0200, Yann E. MORIN wrote:

> Yann E. MORIN (3):
>       package/ifupdown-scripts: new package
>       package/ifupdown-scripts: not needed for systemd-networkd
>       package/ifupdown-scripts: allow use with a custom skeleton

I've applied those patches. As discussed with Arnout and you, I've
squashed PATCH 1 and PATCH 2. And in PATCH 1, I've removed the empty
IFUPDOWN_SCRIPTS_SOURCE variable.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package
  2017-07-04 21:49 ` [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Thomas Petazzoni
@ 2017-07-04 21:56   ` Yann E. MORIN
  0 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2017-07-04 21:56 UTC (permalink / raw)
  To: buildroot

Thomas, Arnout, All,

On 2017-07-04 23:49 +0200, Thomas Petazzoni spake thusly:
> On Sun,  2 Jul 2017 16:35:16 +0200, Yann E. MORIN wrote:
> > Yann E. MORIN (3):
> >       package/ifupdown-scripts: new package
> >       package/ifupdown-scripts: not needed for systemd-networkd
> >       package/ifupdown-scripts: allow use with a custom skeleton
> 
> I've applied those patches. As discussed with Arnout and you, I've
> squashed PATCH 1 and PATCH 2. And in PATCH 1, I've removed the empty
> IFUPDOWN_SCRIPTS_SOURCE variable.

Thanks! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-07-04 21:56 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-02 14:35 [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Yann E. MORIN
2017-07-02 14:35 ` [Buildroot] [PATCH 1/3 v3] package/ifupdown-scripts: new package Yann E. MORIN
2017-07-02 16:04   ` Arnout Vandecappelle
2017-07-02 16:05     ` Arnout Vandecappelle
2017-07-03  9:38   ` Yann E. MORIN
2017-07-02 14:35 ` [Buildroot] [PATCH 2/3 v3] package/ifupdown-scripts: not needed for systemd-networkd Yann E. MORIN
2017-07-02 16:06   ` Arnout Vandecappelle
2017-07-02 14:35 ` [Buildroot] [PATCH 3/3 v3] package/ifupdown-scripts: allow use with a custom skeleton Yann E. MORIN
2017-07-02 16:08   ` Arnout Vandecappelle
2017-07-02 16:37     ` Yann E. MORIN
2017-07-04 21:49 ` [Buildroot] [PATCH 0/3 v3] skeleton: move ifupdown script to their own package Thomas Petazzoni
2017-07-04 21:56   ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.