[ptxdist] [PATCH v2] smcroute: new package

2018-05-17 Thread Ladislav Michl
Signed-off-by: Ladislav Michl 
---
 Changes:
 -v2: address mol's comments

 rules/smcroute.in   | 39 +
 rules/smcroute.make | 84 +
 2 files changed, 123 insertions(+)
 create mode 100644 rules/smcroute.in
 create mode 100644 rules/smcroute.make

diff --git a/rules/smcroute.in b/rules/smcroute.in
new file mode 100644
index 0..e9fa8f9d2
--- /dev/null
+++ b/rules/smcroute.in
@@ -0,0 +1,39 @@
+## SECTION=networking
+
+menuconfig SMCROUTE
+   tristate
+   prompt "smcroute  "
+   select SYSTEMD  if SMCROUTE_SYSTEMD_UNIT
+   select LIBCAP   if SMCROUTE_LIBCAP
+   help
+ SMCRoute is a daemon and command line tool to manipulate
+ the multicast routing table in the UNIX kernel. 
+ SMCRoute can be used as an alternative to dynamic multicast
+ routing daemons like mrouted or pimd when (only) static
+ multicast routes should be maintained and/or no proper
+ IGMP signalling exists.
+
+if SMCROUTE
+
+config SMCROUTE_CONFIG
+   bool
+   default y
+   prompt "install smcroute.conf"
+
+config SMCROUTE_SYSTEMD_UNIT
+   bool
+   default y
+   depends on INITMETHOD_SYSTEMD
+   prompt "install systemd unit files for smcroute"
+
+config SMCROUTE_CLIENT
+   bool
+   prompt "install smcroutectl"
+   help
+ Enable IPC API and install smcroutectl.
+
+config SMCROUTE_LIBCAP
+   bool
+   prompt "use libcap to manipulate capabilities"
+
+endif
diff --git a/rules/smcroute.make b/rules/smcroute.make
new file mode 100644
index 0..a3be8bd00
--- /dev/null
+++ b/rules/smcroute.make
@@ -0,0 +1,84 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2018 by Ladislav Michl 
+#
+# 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_SMCROUTE) += smcroute
+
+#
+# Paths and names
+#
+SMCROUTE_VERSION   := 2.4.0
+SMCROUTE_MD5   := 6b4cd5ceb0476c0fbe5c1da093234f13
+SMCROUTE   := smcroute-$(SMCROUTE_VERSION)
+SMCROUTE_SUFFIX:= tar.xz
+SMCROUTE_URL   := \
+   
https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)/$(SMCROUTE).$(SMCROUTE_SUFFIX)
+SMCROUTE_SOURCE:= $(SRCDIR)/$(SMCROUTE).$(SMCROUTE_SUFFIX)
+SMCROUTE_DIR   := $(BUILDDIR)/$(SMCROUTE)
+SMCROUTE_LICENSE   := GPL-2.0-or-later
+
+# 
+# Prepare
+# 
+
+SMCROUTE_CONF_TOOL := autoconf
+SMCROUTE_CONF_OPT  := \
+   $(CROSS_AUTOCONF_USR) \
+   --enable-mrdisc \
+   $(GLOBAL_IPV6_OPTION) \
+   --$(call ptx/endis,PTXCONF_SMCROUTE_CLIENT)-client \
+   --$(call ptx/endis,PTXCONF_SMCROUTE_CONFIG)-config \
+   --$(call ptx/wwo,PTXCONF_SMCROUTE_LIBCAP)-libcap \
+   --with-systemd=/usr/lib/systemd/system
+
+# 
+# Install
+# 
+
+$(STATEDIR)/smcroute.install:
+   @$(call targetinfo)
+   @$(call world/install, SMCROUTE)
+
+ifdef PTXCONF_SMCROUTE_CONFIG
+   @install -vD -m 644 "$(SMCROUTE_DIR)/smcroute.conf" \
+   "$(SMCROUTE_PKGDIR)/etc"
+endif
+   @$(call touch)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/smcroute.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, smcroute)
+   @$(call install_fixup, smcroute,PRIORITY,optional)
+   @$(call install_fixup, smcroute,SECTION,base)
+   @$(call install_fixup, smcroute,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, smcroute,DESCRIPTION,missing)
+
+ifdef PTXCONF_SMCROUTE_CONFIG
+   @$(call install_alternative, smcroute, 0, 0, 0644, /etc/smcroute.conf)
+endif
+ifdef PTXCONF_SMCROUTE_SYSTEMD_UNIT
+   @$(call install_alternative, smcroute, 0, 0, 0644, \
+   /usr/lib/systemd/system/smcroute.service)
+endif
+ifdef PTXCONF_SMCROUTE_CLIENT
+   @$(call install_copy, smcroute, 0, 0, 0755, -, /usr/sbin/smcroutectl)
+endif
+   @$(call install_copy, smcroute, 0, 0, 0755, -, /usr/sbin/smcrouted)
+
+   @$(call install_finish, smcroute)
+
+   @$(call touch)
-- 
2.17.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libgpiod: version bump 1.0 -> 1.1

2018-05-17 Thread Clemens Gruber
Hi,

On Thu, May 17, 2018 at 10:55:54AM +0200, Michael Olbrich wrote:
> On Wed, May 16, 2018 at 06:45:34PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber 
> > ---
> >  rules/libgpiod.make | 8 +---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/rules/libgpiod.make b/rules/libgpiod.make
> > index eb90e6da2..8b84c0209 100644
> > --- a/rules/libgpiod.make
> > +++ b/rules/libgpiod.make
> > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBGPIOD) += libgpiod
> >  #
> >  # Paths and names
> >  #
> > -LIBGPIOD_VERSION   := 1.0
> > -LIBGPIOD_MD5   := 7ea85c55c1637389d6e90ae4e8403ad6
> > +LIBGPIOD_VERSION   := 1.1
> > +LIBGPIOD_MD5   := 788f5ee333e67b85bb7bd9a17a6e659f
> >  LIBGPIOD   := libgpiod-$(LIBGPIOD_VERSION)
> >  LIBGPIOD_SUFFIX:= tar.gz
> >  LIBGPIOD_URL   := 
> > https://www.kernel.org/pub/software/libs/libgpiod/$(LIBGPIOD).$(LIBGPIOD_SUFFIX)
> > @@ -34,7 +34,9 @@ LIBGPIOD_CONF_TOOL:= autoconf
> >  LIBGPIOD_CONF_OPT  := \
> > $(CROSS_AUTOCONF_USR) \
> > --$(call ptx/endis, PTXCONF_LIBGPIOD_TOOLS)-tools \
> > -   --disable-tests
> > +   --disable-tests \
> > +   --disable-bindings-cxx \
> > +   --disable-bindings-python
> >  
> >  LIBGPIOD_ENV := \
> > $(CROSS_ENV) \
> 
> This does not apply. LIBGPIOD_ENV is not defined on master. Do you have
> another commit here?

Yes, there was one I forgot to drop, but it is no longer necessary.

I will send a v2 of the version bump.

Clemens

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] smcroute: new package

2018-05-17 Thread Michael Olbrich
On Tue, May 08, 2018 at 02:02:22PM +0200, Michael Olbrich wrote:
> On Mon, May 07, 2018 at 06:47:04PM +0200, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl 
> 
> configure_helper.py gives me:
> 
> --- rules/smcroute.make
> +++ smcroute-2.4.0
> @@ -2,5 +2,9 @@
>   --sysconfdir=/etc
>   --localstatedir=/var
>   --libdir=/usr/lib
> - --build=x86_64-host-linux-gnu
> - --host=arm-v5te-linux-gnueabi
> 
> This can be ignored.
> 
> + --enable-mrdisc
> + --disable-ipv6
> + --disable-client
> + --disable-config
> + --without-libcap
> + --with-systemd=DIR
> 
> I think all of those should be set as appropriate.
> 
> Michael
> 
> > ---
> >  rules/smcroute.in   | 12 ++
> >  rules/smcroute.make | 53 +
> >  2 files changed, 65 insertions(+)
> >  create mode 100644 rules/smcroute.in
> >  create mode 100644 rules/smcroute.make
> > 
> > diff --git a/rules/smcroute.in b/rules/smcroute.in
> > new file mode 100644
> > index 0..8d3a29752
> > --- /dev/null
> > +++ b/rules/smcroute.in
> > @@ -0,0 +1,12 @@
> > +## SECTION=networking
> > +
> > +config SMCROUTE
> > +   tristate
> > +   prompt "smcroute  "
> > +   help
> > + SMCRoute is a daemon and command line tool to manipulate
> > + the multicast routing table in the UNIX kernel. 
> > + SMCRoute can be used as an alternative to dynamic multicast
> > + routing daemons like mrouted or pimd when (only) static
> > + multicast routes should be maintained and/or no proper
> > + IGMP signalling exists.
> > diff --git a/rules/smcroute.make b/rules/smcroute.make
> > new file mode 100644
> > index 0..11f9dd335
> > --- /dev/null
> > +++ b/rules/smcroute.make
> > @@ -0,0 +1,53 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2018 by Ladislav Michl 
> > +#
> > +# 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_SMCROUTE) += smcroute
> > +
> > +#
> > +# Paths and names
> > +#
> > +SMCROUTE_VERSION   := 2.4.0
> > +SMCROUTE_MD5   := 6b4cd5ceb0476c0fbe5c1da093234f13
> > +SMCROUTE   := smcroute-$(SMCROUTE_VERSION)
> > +SMCROUTE_SUFFIX:= tar.xz
> > +SMCROUTE_URL   := \
> > +   
> > https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)/$(SMCROUTE).$(SMCROUTE_SUFFIX)
> > +SMCROUTE_SOURCE:= $(SRCDIR)/$(SMCROUTE).$(SMCROUTE_SUFFIX)
> > +SMCROUTE_DIR   := $(BUILDDIR)/$(SMCROUTE)
> > +SMCROUTE_LICENSE   := GPL-2.0+

GPL-2.0-or-later

Michael


> > +
> > +# 
> > 
> > +# Prepare
> > +# 
> > 
> > +
> > +SMCROUTE_CONF_TOOL := autoconf
> > +
> > +# 
> > 
> > +# Target-Install
> > +# 
> > 
> > +
> > +$(STATEDIR)/smcroute.targetinstall:
> > +   @$(call targetinfo)
> > +
> > +   @$(call install_init, smcroute)
> > +   @$(call install_fixup, smcroute,PRIORITY,optional)
> > +   @$(call install_fixup, smcroute,SECTION,base)
> > +   @$(call install_fixup, smcroute,AUTHOR,"Ladislav Michl 
> > ")
> > +   @$(call install_fixup, smcroute,DESCRIPTION,missing)
> > +
> > +   @$(call install_copy, smcroute, 0, 0, 0755, -, /usr/sbin/smcroutectl)
> > +   @$(call install_copy, smcroute, 0, 0, 0755, -, /usr/sbin/smcrouted)
> > +
> > +   @$(call install_finish, smcroute)
> > +
> > +   @$(call touch)
> > -- 
> > 2.17.0
> > 
> > 
> > ___
> > 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- |
> 
> ___
> 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- |

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libgpiod: version bump 1.0 -> 1.1

2018-05-17 Thread Michael Olbrich
On Wed, May 16, 2018 at 06:45:34PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber 
> ---
>  rules/libgpiod.make | 8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/libgpiod.make b/rules/libgpiod.make
> index eb90e6da2..8b84c0209 100644
> --- a/rules/libgpiod.make
> +++ b/rules/libgpiod.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBGPIOD) += libgpiod
>  #
>  # Paths and names
>  #
> -LIBGPIOD_VERSION := 1.0
> -LIBGPIOD_MD5 := 7ea85c55c1637389d6e90ae4e8403ad6
> +LIBGPIOD_VERSION := 1.1
> +LIBGPIOD_MD5 := 788f5ee333e67b85bb7bd9a17a6e659f
>  LIBGPIOD := libgpiod-$(LIBGPIOD_VERSION)
>  LIBGPIOD_SUFFIX  := tar.gz
>  LIBGPIOD_URL := 
> https://www.kernel.org/pub/software/libs/libgpiod/$(LIBGPIOD).$(LIBGPIOD_SUFFIX)
> @@ -34,7 +34,9 @@ LIBGPIOD_CONF_TOOL  := autoconf
>  LIBGPIOD_CONF_OPT:= \
>   $(CROSS_AUTOCONF_USR) \
>   --$(call ptx/endis, PTXCONF_LIBGPIOD_TOOLS)-tools \
> - --disable-tests
> + --disable-tests \
> + --disable-bindings-cxx \
> + --disable-bindings-python
>  
>  LIBGPIOD_ENV := \
>   $(CROSS_ENV) \

This does not apply. LIBGPIOD_ENV is not defined on master. Do you have
another commit here?

Michael

> -- 
> 2.17.0
> 
> 
> ___
> 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- |

___
ptxdist mailing list
ptxdist@pengutronix.de