NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1175f46044
kumquat-buildroot/package/ifupdown-scripts/ifupdown-scripts.mk

73 lines
2.1 KiB
Makefile
Raw Normal View History

package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
################################################################################
#
# ifupdown-scripts
#
################################################################################
package/ifupdown-scripts: do not expect localhost to precede DHCP Currently, we always suppose that localhost settings will always come before the (optional) DHCP ones. This is always true when using sysvinit/busybox or systemd. However, with openrc, this will no longer be the case: only the DHCP settings will be present (OpenRC handles lo on his own). So, prepare the macros to be independent one from the other, and for symetry, in both: - use append-redirection >> to populate the interfaces file, - prepend a leading empty line at the beginning of each section. The origianl singe '>' redirection would ensure the file would not grow on a reinstall, but that's no longer the case, so reset the file prior to filling it, using the canned preamble. Signed-off-by: Carlos Santos <unixmania@gmail.com> [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 21:46:22 +01:00
define IFUPDOWN_SCRIPTS_PREAMBLE
echo "# interface file auto-generated by buildroot" \
> $(TARGET_DIR)/etc/network/interfaces
endef
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
define IFUPDOWN_SCRIPTS_LOCALHOST
( \
echo ; \
echo "auto lo"; \
echo "iface lo inet loopback"; \
package/ifupdown-scripts: do not expect localhost to precede DHCP Currently, we always suppose that localhost settings will always come before the (optional) DHCP ones. This is always true when using sysvinit/busybox or systemd. However, with openrc, this will no longer be the case: only the DHCP settings will be present (OpenRC handles lo on his own). So, prepare the macros to be independent one from the other, and for symetry, in both: - use append-redirection >> to populate the interfaces file, - prepend a leading empty line at the beginning of each section. The origianl singe '>' redirection would ensure the file would not grow on a reinstall, but that's no longer the case, so reset the file prior to filling it, using the canned preamble. Signed-off-by: Carlos Santos <unixmania@gmail.com> [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 21:46:22 +01:00
) >> $(TARGET_DIR)/etc/network/interfaces
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
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"; \
ifupdown-script: send current hostname in DHCP request For the default (BR2_SYSTEM_DHCP) /etc/network/interfaces handling. Both the "big" and busybox ifupdown variants pass the hostname argument to the DHCP client through the shell, so we can use $() to expand to the current hostname value. Notice that this may not be handled by all DHCP clients. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-10-30 18:16:14 +01:00
echo " hostname \$$(hostname)"; \
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
) >> $(TARGET_DIR)/etc/network/interfaces
endef
package/ifupdown-scripts: add openrc support The "network" script allows configuring an interface by means of two /etc/ifup.<if_name> and /etc/ifdown.<if_name> 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_DHCP_OPENRC macro to create the ifup.<if_name> and ifdown.<if_name> 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 <unixmania@gmail.com> [yann.morin.1998@free.fr: - adapt after the preamble was spit to itw own patch ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-09 03:50:03 +01:00
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
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
endif
define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
package/ifupdown-scripts: always install /etc/network/nfs_check The script is minuscle and can be useful to configure an interface via DHCP at run-time. Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-09 03:50:01 +01:00
$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
$(TARGET_DIR)/etc/network/nfs_check
ifupdown-scripts: do not install .empty files ifupdown-scripts has some .empty files to maintain empty directories in git. Previously this package used to be part of the skeleton which used SYSTEM_RSYNC to copy the directories to the target. When it was split into a separate package, cp -a was used to do the copy instead, which copies the .empty files. Change to SYSTEM_RSYNC which excludes .empty files. Signed-off-by: Cam Hutchison <camh@xdna.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-15 02:57:19 +02:00
$(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network)
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
endef
package/ifupdown-scripts: add openrc support The "network" script allows configuring an interface by means of two /etc/ifup.<if_name> and /etc/ifdown.<if_name> 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_DHCP_OPENRC macro to create the ifup.<if_name> and ifdown.<if_name> 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 <unixmania@gmail.com> [yann.morin.1998@free.fr: - adapt after the preamble was spit to itw own patch ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-09 03:50:03 +01:00
define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC
$(IFUPDOWN_SCRIPTS_PREAMBLE)
$(IFUPDOWN_SCRIPTS_DHCP)
$(IFUPDOWN_SCRIPTS_DHCP_OPENRC)
endef
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \
$(TARGET_DIR)/etc/init.d/S40network
package/ifupdown-scripts: do not expect localhost to precede DHCP Currently, we always suppose that localhost settings will always come before the (optional) DHCP ones. This is always true when using sysvinit/busybox or systemd. However, with openrc, this will no longer be the case: only the DHCP settings will be present (OpenRC handles lo on his own). So, prepare the macros to be independent one from the other, and for symetry, in both: - use append-redirection >> to populate the interfaces file, - prepend a leading empty line at the beginning of each section. The origianl singe '>' redirection would ensure the file would not grow on a reinstall, but that's no longer the case, so reset the file prior to filling it, using the canned preamble. Signed-off-by: Carlos Santos <unixmania@gmail.com> [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 21:46:22 +01:00
$(IFUPDOWN_SCRIPTS_PREAMBLE)
package/ifupdown-scripts: relocate the generation the interfaces file Generate it in the IFUPDOWN_SCRIPTS_INSTALL_INIT_<FOO> hook. This will allow creating a file to configure an interface via DHCP for the openrc network service, in a forthcoming change. Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-09 03:50:02 +01:00
$(IFUPDOWN_SCRIPTS_LOCALHOST)
$(IFUPDOWN_SCRIPTS_DHCP)
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
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
package/ifupdown-scripts: do not expect localhost to precede DHCP Currently, we always suppose that localhost settings will always come before the (optional) DHCP ones. This is always true when using sysvinit/busybox or systemd. However, with openrc, this will no longer be the case: only the DHCP settings will be present (OpenRC handles lo on his own). So, prepare the macros to be independent one from the other, and for symetry, in both: - use append-redirection >> to populate the interfaces file, - prepend a leading empty line at the beginning of each section. The origianl singe '>' redirection would ensure the file would not grow on a reinstall, but that's no longer the case, so reset the file prior to filling it, using the canned preamble. Signed-off-by: Carlos Santos <unixmania@gmail.com> [yann.morin.1998@free.fr: split off to its own patch] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-11 21:46:22 +01:00
$(IFUPDOWN_SCRIPTS_PREAMBLE)
package/ifupdown-scripts: relocate the generation the interfaces file Generate it in the IFUPDOWN_SCRIPTS_INSTALL_INIT_<FOO> hook. This will allow creating a file to configure an interface via DHCP for the openrc network service, in a forthcoming change. Signed-off-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-09 03:50:02 +01:00
$(IFUPDOWN_SCRIPTS_LOCALHOST)
$(IFUPDOWN_SCRIPTS_DHCP)
package/ifupdown-scripts: new package 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-networkd 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> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> [Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-02 16:35:50 +02:00
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink