* [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD
@ 2014-01-25 13:18 Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility Alexander Aring
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 13:18 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Busybox also provides tftpd binary. Add depends on !BUSYBOX_TFTPD to
avoid a double install of a tftpd binary.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
rules/inetutils.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/inetutils.in b/rules/inetutils.in
index 876c298..cb1c62f 100644
--- a/rules/inetutils.in
+++ b/rules/inetutils.in
@@ -136,11 +136,15 @@ comment "BusyBox' syslogd is selected!"
menuconfig INETUTILS_TFTPD
bool
prompt "tftpd "
+ depends on !BUSYBOX_TFTPD
help
TFTPD is a ftp daemon to be used for diskless clients. Most bootloaders
use the Trivial File Transfer Protocol to load their OS image. Note:
There is no authentication!
+comment "BusyBox' tftpd is selected!"
+ depends on BUSYBOX_TFTPD
+
if INETUTILS_TFTPD
config INETUTILS_TFTPD_BASE_DIR
--
1.8.5.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility
2014-01-25 13:18 [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Alexander Aring
@ 2014-01-25 13:18 ` Alexander Aring
2014-01-27 9:48 ` Michael Olbrich
2014-01-25 13:18 ` [ptxdist] [PATCH 3/3] iputils: add new package iputils Alexander Aring
2014-01-25 13:48 ` [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Robert Schwebel
2 siblings, 1 reply; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 13:18 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
This patch adds a openssl compatibility option to gnutls and install the
gnutls openssl compatibility library if enabled.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
There are two issues and I am not sure if it's still okay.
1:
Packages which needs GNUTLS_OPENSSL need to select GNUTLS and GNUTLS_OPENSSL.
Is there a way to select GNUTLS if GNUTLS_OPENSSL is selected? I get some
trouble if I make a select GNUTLS in GNUTLS_OPENSSL because the if GNUTLS
above.
2:
The default is to generate the gnutls openssl compatibility library but this
wasn't installed before. Now the default is --disable--openssl-compatibility
and only install the library if it enabled. I think this should not make
trouble in other package which used gnutls.
rules/gnutls.in | 15 +++++++++++++--
rules/gnutls.make | 5 +++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/rules/gnutls.in b/rules/gnutls.in
index 10a181e..3a5bd3a 100644
--- a/rules/gnutls.in
+++ b/rules/gnutls.in
@@ -1,10 +1,11 @@
## SECTION=networking
-config GNUTLS
+menuconfig GNUTLS
tristate
select LIBGCRYPT
select LIBTASN1
- prompt "gnutls"
+ select OPENSSL if GNUTLS_OPENSSL
+ prompt "gnutls "
help
GnuTLS is a secure communications library implementing the SSL,
TLS and DTLS protocols and technologies around them.
@@ -13,3 +14,13 @@ config GNUTLS
APIs to parse and write X.509, PKCS #12, OpenPGP and other required
structures. It is aimed to be portable and efficient with focus on
security and interoperability.
+
+if GNUTLS
+
+config GNUTLS_OPENSSL
+ bool
+ prompt "openssl compatibility"
+ help
+ Enables the OpenSSL compatibility support.
+
+endif
diff --git a/rules/gnutls.make b/rules/gnutls.make
index b64a36c..08923ae 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -38,6 +38,7 @@ GNUTLS_CONF_OPT := \
--with-libgcrypt \
--with-libgcrypt-prefix=$(PTXDIST_SYSROOT_TARGET)/usr \
--without-p11-kit \
+ --$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
--disable-guile
# ----------------------------------------------------------------------------
@@ -55,6 +56,10 @@ $(STATEDIR)/gnutls.targetinstall:
@$(call install_lib, gnutls, 0, 0, 0644, libgnutls)
+ifdef PTXCONF_GNUTLS_OPENSSL
+ @$(call install_lib, gnutls, 0, 0, 0644, libgnutls-openssl)
+endif
+
@$(call install_finish, gnutls)
@$(call touch)
--
1.8.5.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* [ptxdist] [PATCH 3/3] iputils: add new package iputils
2014-01-25 13:18 [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility Alexander Aring
@ 2014-01-25 13:18 ` Alexander Aring
2014-01-25 13:49 ` Robert Schwebel
2014-01-25 13:48 ` [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Robert Schwebel
2 siblings, 1 reply; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 13:18 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
This patch adds another package for most common network binary tools
like ping, ping6, etc.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
rules/iputils.in | 118 ++++++++++++++++++++++++++++++++++++++++++++
rules/iputils.make | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 259 insertions(+)
create mode 100644 rules/iputils.in
create mode 100644 rules/iputils.make
diff --git a/rules/iputils.in b/rules/iputils.in
new file mode 100644
index 0000000..12695e5
--- /dev/null
+++ b/rules/iputils.in
@@ -0,0 +1,118 @@
+## SECTION=networking
+
+menuconfig IPUTILS
+ tristate
+ prompt "iputils "
+ select LIBC_RESOLV if IPUTILS_PING6
+ select LIBCAP if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_PING6 || IPUTILS_TRACEROUTE6
+ select GNUTLS if IPUTILS_PING6
+ select GNUTLS_OPENSSL if IPUTILS_PING6
+ help
+ The iputils package is set of small useful utilities for Linux
+ networking.
+
+if IPUTILS
+
+config IPUTILS_ARPING
+ bool
+ depends on !BUSYBOX_ARPING
+ prompt "arping"
+ help
+ Ping destination on device interface by ARP packets, using source
+ address source.
+
+comment "BusyBox' arping is selected!"
+ depends on BUSYBOX_ARPING
+
+config IPUTILS_CLOCKDIFF
+ bool
+ prompt "clockdiff"
+ help
+ Measures clock difference between us and destination with 1 msec
+ resolution.
+
+config IPUTILS_PING
+ bool
+ depends on !INETUTILS_PING
+ prompt "ping"
+ help
+ The ping command uses the ICMP protocol's mandatory ECHO_REQUEST datagram
+ to elicit an ICMP ECHO_RESPONSE from a host or gateway. ECHO_REQUEST
+ datagrams pings have an IP and ICMP header, followed by a struct
+ timeval and then an arbitrary number of pad bytes used to fill out
+ the packet.
+
+comment "BusyBox' ping is selected!"
+ depends on BUSYBOX_PING
+
+comment "inetutils' ping is selected!"
+ depends on INETUTILS_PING
+
+config IPUTILS_PING6
+ bool
+ depends on !INETUTILS_PING6
+ prompt "ping6"
+ depends on GLOBAL_IPV6
+ help
+ The ping6 command is IPv6 version of ping, and can also send Node
+ Information Queries (RFC4620). Intermediate hops may not be allowed,
+ because IPv6 source routing was deprecated (RFC5095).
+
+comment "BusyBox' ping6 is selected!"
+ depends on BUSYBOX_PING6
+
+comment "inetutils' ping6 is selected!"
+ depends on INETUTILS_PING6
+
+config IPUTILS_RARPD
+ bool
+ prompt "rarpd"
+ help
+ Listens RARP (http://tools.ietf.org/rfc/rfc903.txt) requests from
+ clients. Provided MAC address of client is found in /etc/ethers
+ database and obtained host name is resolvable to an IP address
+ appropriate for attached network, rarpd answers to client with
+ RARPD reply carrying an IP address.
+
+config IPUTILS_RDISC
+ bool
+ prompt "rdisc"
+ help
+ The rdisc command implements client side of the ICMP router discover
+ protocol. rdisc is invoked at boot time to populate the network
+ routing tables with default routes.
+
+config IPUTILS_TFTPD
+ bool
+ depends on !INETUTILS_TFTPD
+ prompt "tftpd"
+ help
+
+comment "BusyBox' tftpd is selected!"
+ depends on BUSYBOX_TFTPD
+
+comment "inetutils' tftpd is selected!"
+ depends on INETUTILS_TFTPD
+
+config IPUTILS_TRACEPATH
+ bool
+ prompt "tracepath"
+ help
+
+config IPUTILS_TRACEPATH6
+ bool
+ prompt "tracepath6"
+ depends on GLOBAL_IPV6
+ help
+
+config IPUTILS_TRACEROUTE6
+ bool
+ depends on !BUSYBOX_TRACEROUTE6
+ prompt "traceroute6"
+ depends on GLOBAL_IPV6
+ help
+
+comment "BusyBox' traceroute6 is selected!"
+ depends on BUSYBOX_TRACEROUTE6
+
+endif
diff --git a/rules/iputils.make b/rules/iputils.make
new file mode 100644
index 0000000..9685370
--- /dev/null
+++ b/rules/iputils.make
@@ -0,0 +1,141 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Alexander Aring <aar@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_IPUTILS) += iputils
+
+#
+# Paths and names
+#
+IPUTILS_VERSION := s20121221
+IPUTILS_MD5 := 6072aef64205720dd1893b375e184171
+IPUTILS := iputils-$(IPUTILS_VERSION)
+IPUTILS_SUFFIX := tar.bz2
+IPUTILS_URL := http://www.skbuff.net/iputils/$(IPUTILS).$(IPUTILS_SUFFIX)
+IPUTILS_SOURCE := $(SRCDIR)/$(IPUTILS).$(IPUTILS_SUFFIX)
+IPUTILS_DIR := $(BUILDDIR)/$(IPUTILS)
+IPUTILS_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+IPUTILS_CONF_TOOL := NO
+IPUTILS_MAKEVARS := $(CROSS_ENV)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/iputils.install:
+ @$(call targetinfo)
+ mkdir -p $(IPUTILS_PKGDIR)/usr/bin
+
+ifdef PTXCONF_IPUTILS_ARPING
+ install -m0755 $(IPUTILS_DIR)/arping $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_CLOCKDIFF
+ install -m0755 $(IPUTILS_DIR)/clockdiff $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_PING
+ install -m0755 $(IPUTILS_DIR)/ping $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_PING6
+ install -m0755 $(IPUTILS_DIR)/ping6 $(IPUTILS_PKGDIR)/usr/bin
+endif
+ @$(call touch)
+
+ifdef PTXCONF_IPUTILS_RARPD
+ install -m0755 $(IPUTILS_DIR)/rarpd $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_RDISC
+ install -m0755 $(IPUTILS_DIR)/rdisc $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_TFTPD
+ install -m0755 $(IPUTILS_DIR)/tftpd $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEPATH
+ install -m0755 $(IPUTILS_DIR)/tracepath $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEPATH6
+ install -m0755 $(IPUTILS_DIR)/tracepath6 $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEROUTE6
+ install -m0755 $(IPUTILS_DIR)/traceroute6 $(IPUTILS_PKGDIR)/usr/bin
+endif
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/iputils.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, iputils)
+ @$(call install_fixup, iputils,PRIORITY,optional)
+ @$(call install_fixup, iputils,SECTION,base)
+ @$(call install_fixup, iputils,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
+ @$(call install_fixup, iputils,DESCRIPTION,missing)
+
+ifdef PTXCONF_IPUTILS_ARPING
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/arping)
+endif
+
+ifdef PTXCONF_IPUTILS_CLOCKDIFF
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/clockdiff)
+endif
+
+ifdef PTXCONF_IPUTILS_PING
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/ping)
+endif
+
+ifdef PTXCONF_IPUTILS_PING6
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/ping6)
+endif
+
+ifdef PTXCONF_IPUTILS_RARPD
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/rarpd)
+endif
+
+ifdef PTXCONF_IPUTILS_RDISC
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/rdisc)
+endif
+
+ifdef PTXCONF_IPUTILS_TFTPD
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tftpd)
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEPATH
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tracepath)
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEPATH6
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tracepath6)
+endif
+
+ifdef PTXCONF_IPUTILS_TRACEROUTE6
+ @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/traceroute6)
+endif
+
+ @$(call install_finish, iputils)
+
+ @$(call touch)
+
+# vim: syntax=make
--
1.8.5.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD
2014-01-25 13:18 [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 3/3] iputils: add new package iputils Alexander Aring
@ 2014-01-25 13:48 ` Robert Schwebel
2014-01-25 13:50 ` Alexander Aring
2 siblings, 1 reply; 11+ messages in thread
From: Robert Schwebel @ 2014-01-25 13:48 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
On Sat, Jan 25, 2014 at 02:18:23PM +0100, Alexander Aring wrote:
> Busybox also provides tftpd binary. Add depends on !BUSYBOX_TFTPD to
> avoid a double install of a tftpd binary.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> rules/inetutils.in | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/rules/inetutils.in b/rules/inetutils.in
> index 876c298..cb1c62f 100644
> --- a/rules/inetutils.in
> +++ b/rules/inetutils.in
> @@ -136,11 +136,15 @@ comment "BusyBox' syslogd is selected!"
> menuconfig INETUTILS_TFTPD
> bool
> prompt "tftpd "
> + depends on !BUSYBOX_TFTPD
depends on !BUSYBOX_TFTPD || ALLYES
please
> help
> TFTPD is a ftp daemon to be used for diskless clients. Most bootloaders
> use the Trivial File Transfer Protocol to load their OS image. Note:
> There is no authentication!
>
> +comment "BusyBox' tftpd is selected!"
> + depends on BUSYBOX_TFTPD
> +
> if INETUTILS_TFTPD
>
> config INETUTILS_TFTPD_BASE_DIR
> --
> 1.8.5.3
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 3/3] iputils: add new package iputils
2014-01-25 13:18 ` [ptxdist] [PATCH 3/3] iputils: add new package iputils Alexander Aring
@ 2014-01-25 13:49 ` Robert Schwebel
2014-01-25 13:54 ` Alexander Aring
0 siblings, 1 reply; 11+ messages in thread
From: Robert Schwebel @ 2014-01-25 13:49 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
The || ALLYES comment applies here as well.
On Sat, Jan 25, 2014 at 02:18:25PM +0100, Alexander Aring wrote:
> This patch adds another package for most common network binary tools
> like ping, ping6, etc.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> rules/iputils.in | 118 ++++++++++++++++++++++++++++++++++++++++++++
> rules/iputils.make | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 259 insertions(+)
> create mode 100644 rules/iputils.in
> create mode 100644 rules/iputils.make
>
> diff --git a/rules/iputils.in b/rules/iputils.in
> new file mode 100644
> index 0000000..12695e5
> --- /dev/null
> +++ b/rules/iputils.in
> @@ -0,0 +1,118 @@
> +## SECTION=networking
> +
> +menuconfig IPUTILS
> + tristate
> + prompt "iputils "
> + select LIBC_RESOLV if IPUTILS_PING6
> + select LIBCAP if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_PING6 || IPUTILS_TRACEROUTE6
> + select GNUTLS if IPUTILS_PING6
> + select GNUTLS_OPENSSL if IPUTILS_PING6
> + help
> + The iputils package is set of small useful utilities for Linux
> + networking.
> +
> +if IPUTILS
> +
> +config IPUTILS_ARPING
> + bool
> + depends on !BUSYBOX_ARPING
> + prompt "arping"
> + help
> + Ping destination on device interface by ARP packets, using source
> + address source.
> +
> +comment "BusyBox' arping is selected!"
> + depends on BUSYBOX_ARPING
> +
> +config IPUTILS_CLOCKDIFF
> + bool
> + prompt "clockdiff"
> + help
> + Measures clock difference between us and destination with 1 msec
> + resolution.
> +
> +config IPUTILS_PING
> + bool
> + depends on !INETUTILS_PING
> + prompt "ping"
> + help
> + The ping command uses the ICMP protocol's mandatory ECHO_REQUEST datagram
> + to elicit an ICMP ECHO_RESPONSE from a host or gateway. ECHO_REQUEST
> + datagrams pings have an IP and ICMP header, followed by a struct
> + timeval and then an arbitrary number of pad bytes used to fill out
> + the packet.
> +
> +comment "BusyBox' ping is selected!"
> + depends on BUSYBOX_PING
> +
> +comment "inetutils' ping is selected!"
> + depends on INETUTILS_PING
> +
> +config IPUTILS_PING6
> + bool
> + depends on !INETUTILS_PING6
> + prompt "ping6"
> + depends on GLOBAL_IPV6
> + help
> + The ping6 command is IPv6 version of ping, and can also send Node
> + Information Queries (RFC4620). Intermediate hops may not be allowed,
> + because IPv6 source routing was deprecated (RFC5095).
> +
> +comment "BusyBox' ping6 is selected!"
> + depends on BUSYBOX_PING6
> +
> +comment "inetutils' ping6 is selected!"
> + depends on INETUTILS_PING6
> +
> +config IPUTILS_RARPD
> + bool
> + prompt "rarpd"
> + help
> + Listens RARP (http://tools.ietf.org/rfc/rfc903.txt) requests from
> + clients. Provided MAC address of client is found in /etc/ethers
> + database and obtained host name is resolvable to an IP address
> + appropriate for attached network, rarpd answers to client with
> + RARPD reply carrying an IP address.
> +
> +config IPUTILS_RDISC
> + bool
> + prompt "rdisc"
> + help
> + The rdisc command implements client side of the ICMP router discover
> + protocol. rdisc is invoked at boot time to populate the network
> + routing tables with default routes.
> +
> +config IPUTILS_TFTPD
> + bool
> + depends on !INETUTILS_TFTPD
> + prompt "tftpd"
> + help
> +
> +comment "BusyBox' tftpd is selected!"
> + depends on BUSYBOX_TFTPD
> +
> +comment "inetutils' tftpd is selected!"
> + depends on INETUTILS_TFTPD
> +
> +config IPUTILS_TRACEPATH
> + bool
> + prompt "tracepath"
> + help
> +
> +config IPUTILS_TRACEPATH6
> + bool
> + prompt "tracepath6"
> + depends on GLOBAL_IPV6
> + help
> +
> +config IPUTILS_TRACEROUTE6
> + bool
> + depends on !BUSYBOX_TRACEROUTE6
> + prompt "traceroute6"
> + depends on GLOBAL_IPV6
> + help
> +
> +comment "BusyBox' traceroute6 is selected!"
> + depends on BUSYBOX_TRACEROUTE6
> +
> +endif
> diff --git a/rules/iputils.make b/rules/iputils.make
> new file mode 100644
> index 0000000..9685370
> --- /dev/null
> +++ b/rules/iputils.make
> @@ -0,0 +1,141 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Alexander Aring <aar@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_IPUTILS) += iputils
> +
> +#
> +# Paths and names
> +#
> +IPUTILS_VERSION := s20121221
> +IPUTILS_MD5 := 6072aef64205720dd1893b375e184171
> +IPUTILS := iputils-$(IPUTILS_VERSION)
> +IPUTILS_SUFFIX := tar.bz2
> +IPUTILS_URL := http://www.skbuff.net/iputils/$(IPUTILS).$(IPUTILS_SUFFIX)
> +IPUTILS_SOURCE := $(SRCDIR)/$(IPUTILS).$(IPUTILS_SUFFIX)
> +IPUTILS_DIR := $(BUILDDIR)/$(IPUTILS)
> +IPUTILS_LICENSE := GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +IPUTILS_CONF_TOOL := NO
> +IPUTILS_MAKEVARS := $(CROSS_ENV)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/iputils.install:
> + @$(call targetinfo)
> + mkdir -p $(IPUTILS_PKGDIR)/usr/bin
> +
> +ifdef PTXCONF_IPUTILS_ARPING
> + install -m0755 $(IPUTILS_DIR)/arping $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_CLOCKDIFF
> + install -m0755 $(IPUTILS_DIR)/clockdiff $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_PING
> + install -m0755 $(IPUTILS_DIR)/ping $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_PING6
> + install -m0755 $(IPUTILS_DIR)/ping6 $(IPUTILS_PKGDIR)/usr/bin
> +endif
> + @$(call touch)
> +
> +ifdef PTXCONF_IPUTILS_RARPD
> + install -m0755 $(IPUTILS_DIR)/rarpd $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_RDISC
> + install -m0755 $(IPUTILS_DIR)/rdisc $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TFTPD
> + install -m0755 $(IPUTILS_DIR)/tftpd $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEPATH
> + install -m0755 $(IPUTILS_DIR)/tracepath $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEPATH6
> + install -m0755 $(IPUTILS_DIR)/tracepath6 $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEROUTE6
> + install -m0755 $(IPUTILS_DIR)/traceroute6 $(IPUTILS_PKGDIR)/usr/bin
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/iputils.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, iputils)
> + @$(call install_fixup, iputils,PRIORITY,optional)
> + @$(call install_fixup, iputils,SECTION,base)
> + @$(call install_fixup, iputils,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> + @$(call install_fixup, iputils,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_IPUTILS_ARPING
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/arping)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_CLOCKDIFF
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/clockdiff)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_PING
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/ping)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_PING6
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/ping6)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_RARPD
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/rarpd)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_RDISC
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/rdisc)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TFTPD
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tftpd)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEPATH
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tracepath)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEPATH6
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/tracepath6)
> +endif
> +
> +ifdef PTXCONF_IPUTILS_TRACEROUTE6
> + @$(call install_copy, iputils, 0, 0, 0755, -, /usr/bin/traceroute6)
> +endif
> +
> + @$(call install_finish, iputils)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 1.8.5.3
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD
2014-01-25 13:48 ` [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Robert Schwebel
@ 2014-01-25 13:50 ` Alexander Aring
0 siblings, 0 replies; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 13:50 UTC (permalink / raw)
To: Robert Schwebel; +Cc: ptxdist
Hi Robert,
On Sat, Jan 25, 2014 at 02:48:14PM +0100, Robert Schwebel wrote:
> On Sat, Jan 25, 2014 at 02:18:23PM +0100, Alexander Aring wrote:
> > Busybox also provides tftpd binary. Add depends on !BUSYBOX_TFTPD to
> > avoid a double install of a tftpd binary.
> >
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> > rules/inetutils.in | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/rules/inetutils.in b/rules/inetutils.in
> > index 876c298..cb1c62f 100644
> > --- a/rules/inetutils.in
> > +++ b/rules/inetutils.in
> > @@ -136,11 +136,15 @@ comment "BusyBox' syslogd is selected!"
> > menuconfig INETUTILS_TFTPD
> > bool
> > prompt "tftpd "
> > + depends on !BUSYBOX_TFTPD
>
> depends on !BUSYBOX_TFTPD || ALLYES
>
ok. :-)
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 3/3] iputils: add new package iputils
2014-01-25 13:49 ` Robert Schwebel
@ 2014-01-25 13:54 ` Alexander Aring
2014-01-25 14:00 ` Robert Schwebel
0 siblings, 1 reply; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 13:54 UTC (permalink / raw)
To: Robert Schwebel; +Cc: ptxdist
On Sat, Jan 25, 2014 at 02:49:51PM +0100, Robert Schwebel wrote:
> The || ALLYES comment applies here as well.
>
ok. What means ALLYES in this case? I suppose something with
allyesconfig?
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 3/3] iputils: add new package iputils
2014-01-25 13:54 ` Alexander Aring
@ 2014-01-25 14:00 ` Robert Schwebel
2014-01-25 14:01 ` Alexander Aring
0 siblings, 1 reply; 11+ messages in thread
From: Robert Schwebel @ 2014-01-25 14:00 UTC (permalink / raw)
To: Alexander Aring; +Cc: ptxdist
On Sat, Jan 25, 2014 at 02:54:12PM +0100, Alexander Aring wrote:
> On Sat, Jan 25, 2014 at 02:49:51PM +0100, Robert Schwebel wrote:
> > The || ALLYES comment applies here as well.
>
> ok. What means ALLYES in this case? I suppose something with
> allyesconfig?
We have an "ALLYES" BSP in our autobuilder. It has PTXCONF_ALLYES set,
which makes it possible to build everything, even the packages which
have equivalents in busybox.
rsc
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 3/3] iputils: add new package iputils
2014-01-25 14:00 ` Robert Schwebel
@ 2014-01-25 14:01 ` Alexander Aring
0 siblings, 0 replies; 11+ messages in thread
From: Alexander Aring @ 2014-01-25 14:01 UTC (permalink / raw)
To: Robert Schwebel; +Cc: ptxdist
Hi Robert,
On Sat, Jan 25, 2014 at 03:00:28PM +0100, Robert Schwebel wrote:
> On Sat, Jan 25, 2014 at 02:54:12PM +0100, Alexander Aring wrote:
> > On Sat, Jan 25, 2014 at 02:49:51PM +0100, Robert Schwebel wrote:
> > > The || ALLYES comment applies here as well.
> >
> > ok. What means ALLYES in this case? I suppose something with
> > allyesconfig?
>
> We have an "ALLYES" BSP in our autobuilder. It has PTXCONF_ALLYES set,
> which makes it possible to build everything, even the packages which
> have equivalents in busybox.
>
makes sense. Thanks.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility
2014-01-25 13:18 ` [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility Alexander Aring
@ 2014-01-27 9:48 ` Michael Olbrich
2014-01-27 10:06 ` Alexander Aring
0 siblings, 1 reply; 11+ messages in thread
From: Michael Olbrich @ 2014-01-27 9:48 UTC (permalink / raw)
To: ptxdist
On Sat, Jan 25, 2014 at 02:18:24PM +0100, Alexander Aring wrote:
> This patch adds a openssl compatibility option to gnutls and install the
> gnutls openssl compatibility library if enabled.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> There are two issues and I am not sure if it's still okay.
> 1:
> Packages which needs GNUTLS_OPENSSL need to select GNUTLS and GNUTLS_OPENSSL.
> Is there a way to select GNUTLS if GNUTLS_OPENSSL is selected? I get some
> trouble if I make a select GNUTLS in GNUTLS_OPENSSL because the if GNUTLS
> above.
We have that elsewhere as well. It's just not possible with kconfig.
> 2:
> The default is to generate the gnutls openssl compatibility library but this
> wasn't installed before. Now the default is --disable--openssl-compatibility
> and only install the library if it enabled. I think this should not make
> trouble in other package which used gnutls.
Hmm, you've added a dependency to openssl here. So I assume, that the
default is to build it _if_ openssl is available, right?
Anyways, It doesn't make the situation worse, so the options is just fine
as it is.
> rules/gnutls.in | 15 +++++++++++++--
> rules/gnutls.make | 5 +++++
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/rules/gnutls.in b/rules/gnutls.in
> index 10a181e..3a5bd3a 100644
> --- a/rules/gnutls.in
> +++ b/rules/gnutls.in
> @@ -1,10 +1,11 @@
> ## SECTION=networking
>
> -config GNUTLS
> +menuconfig GNUTLS
> tristate
> select LIBGCRYPT
> select LIBTASN1
> - prompt "gnutls"
> + select OPENSSL if GNUTLS_OPENSSL
> + prompt "gnutls "
> help
> GnuTLS is a secure communications library implementing the SSL,
> TLS and DTLS protocols and technologies around them.
> @@ -13,3 +14,13 @@ config GNUTLS
> APIs to parse and write X.509, PKCS #12, OpenPGP and other required
> structures. It is aimed to be portable and efficient with focus on
> security and interoperability.
> +
> +if GNUTLS
> +
> +config GNUTLS_OPENSSL
> + bool
> + prompt "openssl compatibility"
> + help
> + Enables the OpenSSL compatibility support.
> +
> +endif
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index b64a36c..08923ae 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -38,6 +38,7 @@ GNUTLS_CONF_OPT := \
> --with-libgcrypt \
> --with-libgcrypt-prefix=$(PTXDIST_SYSROOT_TARGET)/usr \
> --without-p11-kit \
> + --$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
> --disable-guile
>
> # ----------------------------------------------------------------------------
> @@ -55,6 +56,10 @@ $(STATEDIR)/gnutls.targetinstall:
>
> @$(call install_lib, gnutls, 0, 0, 0644, libgnutls)
>
> +ifdef PTXCONF_GNUTLS_OPENSSL
> + @$(call install_lib, gnutls, 0, 0, 0644, libgnutls-openssl)
> +endif
> +
> @$(call install_finish, gnutls)
>
> @$(call touch)
> --
> 1.8.5.3
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility
2014-01-27 9:48 ` Michael Olbrich
@ 2014-01-27 10:06 ` Alexander Aring
0 siblings, 0 replies; 11+ messages in thread
From: Alexander Aring @ 2014-01-27 10:06 UTC (permalink / raw)
To: ptxdist
Hi Michael,
thanks for your reply.
On Mon, Jan 27, 2014 at 10:48:19AM +0100, Michael Olbrich wrote:
> On Sat, Jan 25, 2014 at 02:18:24PM +0100, Alexander Aring wrote:
> > This patch adds a openssl compatibility option to gnutls and install the
> > gnutls openssl compatibility library if enabled.
> >
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> > There are two issues and I am not sure if it's still okay.
> > 1:
> > Packages which needs GNUTLS_OPENSSL need to select GNUTLS and GNUTLS_OPENSSL.
> > Is there a way to select GNUTLS if GNUTLS_OPENSSL is selected? I get some
> > trouble if I make a select GNUTLS in GNUTLS_OPENSSL because the if GNUTLS
> > above.
>
> We have that elsewhere as well. It's just not possible with kconfig.
ok.
> > 2:
> > The default is to generate the gnutls openssl compatibility library but this
> > wasn't installed before. Now the default is --disable--openssl-compatibility
> > and only install the library if it enabled. I think this should not make
> > trouble in other package which used gnutls.
>
> Hmm, you've added a dependency to openssl here. So I assume, that the
> default is to build it _if_ openssl is available, right?
yes.
> Anyways, It doesn't make the situation worse, so the options is just fine
> as it is.
Ok.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-01-27 10:06 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-25 13:18 [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility Alexander Aring
2014-01-27 9:48 ` Michael Olbrich
2014-01-27 10:06 ` Alexander Aring
2014-01-25 13:18 ` [ptxdist] [PATCH 3/3] iputils: add new package iputils Alexander Aring
2014-01-25 13:49 ` Robert Schwebel
2014-01-25 13:54 ` Alexander Aring
2014-01-25 14:00 ` Robert Schwebel
2014-01-25 14:01 ` Alexander Aring
2014-01-25 13:48 ` [ptxdist] [PATCH 1/3] inetutils: add misiing depends on !BUSYBOX_TFTPD Robert Schwebel
2014-01-25 13:50 ` Alexander Aring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox