Message ID | 1415969096-3032-5-git-send-email-gustavo@zacarias.com.ar |
---|---|
State | Superseded |
Headers | show |
On 14/11/14 13:44, Gustavo Zacarias wrote: > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> A couple of questions below, but nothing critical. > --- > package/Config.in | 3 +++ > package/ifupdown/Config.in | 17 +++++++++++++++++ > package/ifupdown/ifupdown.hash | 2 ++ > package/ifupdown/ifupdown.mk | 33 +++++++++++++++++++++++++++++++++ > 4 files changed, 55 insertions(+) > create mode 100644 package/ifupdown/Config.in > create mode 100644 package/ifupdown/ifupdown.hash > create mode 100644 package/ifupdown/ifupdown.mk > > diff --git a/package/Config.in b/package/Config.in > index 278134d..8f3cc3c 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1014,6 +1014,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > source "package/ifplugd/Config.in" > endif > source "package/iftop/Config.in" > +if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS > + source "package/ifupdown/Config.in" > +endif > source "package/igh-ethercat/Config.in" > source "package/igmpproxy/Config.in" > source "package/inadyn/Config.in" > diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in > new file mode 100644 > index 0000000..10cf2be > --- /dev/null > +++ b/package/ifupdown/Config.in > @@ -0,0 +1,17 @@ > +config BR2_PACKAGE_IFUPDOWN > + bool "ifupdown" > + depends on BR2_USE_MMU # fork() > + # Default/our uclibc lacks wordexp() > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > + # runtime for ip binary > + select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX > + # runtime for run-parts > + select BR2_PACKAGE_DEBIANUTILS if !BR2_PACKAGE_BUSYBOX > + help > + High level tools to configure network interfaces. > + > + https://tracker.debian.org/pkg/ifupdown > + > +comment "ifupdown needs an (e)glibc or musl toolchain" > + depends on BR2_USE_MMU > + depends on BR2_TOOLCHAIN_USES_UCLIBC > diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash > new file mode 100644 > index 0000000..f0c314b > --- /dev/null > +++ b/package/ifupdown/ifupdown.hash > @@ -0,0 +1,2 @@ > +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.7.49.dsc > +sha256 5d07c73610ff90393c7273e2af9003eeb1825fc88144ae5ed11a5517547d0f58 ifupdown_0.7.49.tar.xz Check! > diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk > new file mode 100644 > index 0000000..b05ffc9 > --- /dev/null > +++ b/package/ifupdown/ifupdown.mk > @@ -0,0 +1,33 @@ > +################################################################################ > +# > +# ifupdown > +# > +################################################################################ > + > +IFUPDOWN_VERSION = 0.7.49 > +IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz > +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20140923T221921Z/pool/main/i/ifupdown > +IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) > +IFUPDOWN_LICENSE = GPLv2+ > +IFUPDOWN_LICENSE_FILES = COPYING > + > +define IFUPDOWN_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > + CFLAGS="$(TARGET_CFLAGS) -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ > + -C $(@D) > +endef > + > +define IFUPDOWN_INSTALL_TARGET_CMDS > + $(INSTALL) -m 0755 -D $(@D)/ifup $(TARGET_DIR)/sbin/ifup > + $(INSTALL) -m 0755 -D $(@D)/settle-dad.sh \ > + $(TARGET_DIR)/lib/ifupdown/settle-dad.sh > + ln -sf ifup $(TARGET_DIR)/sbin/ifdown > + ln -sf ifup $(TARGET_DIR)/sbin/ifquery Why not 'make BASEDIR=$(TARGET_DIR) install'? > +endef > + > +define IFUPDOWN_INSTALL_INIT_SYSTEMD > + echo "d /run/network 0755 - - - -" > \ > + $(TARGET_DIR)/usr/lib/tmpfiles.d/ifupdown.conf Nice to see that the _INIT_SYSTEMD macro really needs to do something more than copying a unit file! Regards, Arnout > +endef > + > +$(eval $(generic-package)) >
On 11/14/2014 06:56 PM, Arnout Vandecappelle wrote: > Why not 'make BASEDIR=$(TARGET_DIR) install'? I'll switch it, forgot to clean that up once all the bits were working. > Nice to see that the _INIT_SYSTEMD macro really needs to do something more than > copying a unit file! Actually i think we might want to do something like that for SysV since at the moment we handle those in the initscripts, one big S02tmpfiles or similar that gets "compiled" by buildroot according to package needs might be nice - pretty low priority though :) Regards.
diff --git a/package/Config.in b/package/Config.in index 278134d..8f3cc3c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1014,6 +1014,9 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/ifplugd/Config.in" endif source "package/iftop/Config.in" +if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + source "package/ifupdown/Config.in" +endif source "package/igh-ethercat/Config.in" source "package/igmpproxy/Config.in" source "package/inadyn/Config.in" diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in new file mode 100644 index 0000000..10cf2be --- /dev/null +++ b/package/ifupdown/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_IFUPDOWN + bool "ifupdown" + depends on BR2_USE_MMU # fork() + # Default/our uclibc lacks wordexp() + depends on !BR2_TOOLCHAIN_USES_UCLIBC + # runtime for ip binary + select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX + # runtime for run-parts + select BR2_PACKAGE_DEBIANUTILS if !BR2_PACKAGE_BUSYBOX + help + High level tools to configure network interfaces. + + https://tracker.debian.org/pkg/ifupdown + +comment "ifupdown needs an (e)glibc or musl toolchain" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/ifupdown/ifupdown.hash b/package/ifupdown/ifupdown.hash new file mode 100644 index 0000000..f0c314b --- /dev/null +++ b/package/ifupdown/ifupdown.hash @@ -0,0 +1,2 @@ +# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.7.49.dsc +sha256 5d07c73610ff90393c7273e2af9003eeb1825fc88144ae5ed11a5517547d0f58 ifupdown_0.7.49.tar.xz diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk new file mode 100644 index 0000000..b05ffc9 --- /dev/null +++ b/package/ifupdown/ifupdown.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# ifupdown +# +################################################################################ + +IFUPDOWN_VERSION = 0.7.49 +IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz +IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20140923T221921Z/pool/main/i/ifupdown +IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) +IFUPDOWN_LICENSE = GPLv2+ +IFUPDOWN_LICENSE_FILES = COPYING + +define IFUPDOWN_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ + -C $(@D) +endef + +define IFUPDOWN_INSTALL_TARGET_CMDS + $(INSTALL) -m 0755 -D $(@D)/ifup $(TARGET_DIR)/sbin/ifup + $(INSTALL) -m 0755 -D $(@D)/settle-dad.sh \ + $(TARGET_DIR)/lib/ifupdown/settle-dad.sh + ln -sf ifup $(TARGET_DIR)/sbin/ifdown + ln -sf ifup $(TARGET_DIR)/sbin/ifquery +endef + +define IFUPDOWN_INSTALL_INIT_SYSTEMD + echo "d /run/network 0755 - - - -" > \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/ifupdown.conf +endef + +$(eval $(generic-package))
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/Config.in | 3 +++ package/ifupdown/Config.in | 17 +++++++++++++++++ package/ifupdown/ifupdown.hash | 2 ++ package/ifupdown/ifupdown.mk | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/ifupdown/Config.in create mode 100644 package/ifupdown/ifupdown.hash create mode 100644 package/ifupdown/ifupdown.mk