Re: [ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-10 Thread Bastian Stender 

Hi,

On 04/10/2018 05:14 PM, Roland Hieber wrote:

Signed-off-by: Roland Hieber 
---
  rules/htop.make | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..eff67cdda 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
  #
  # Paths and names
  #
-HTOP_VERSION   := 2.1.0
-HTOP_MD5   := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION   := 2.2.0
+HTOP_MD5   := 0d816b6beed31edc75babcfbf863ffa8
  HTOP  := htop-$(HTOP_VERSION)
  HTOP_SUFFIX   := tar.gz
  HTOP_URL  := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)



There are patches on top of htop 2.1.0. You should port them or drop
them as needed.

Regards,
Bastian

--
Pengutronix e.K.
Industrial Linux Solutions
http://www.pengutronix.de/
Peiner Str. 6-8, 31137 Hildesheim, Germany
Amtsgericht Hildesheim, HRA 2686

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 3/4] weston: version bump 3.0.0 -> 4.0.0

2018-04-10 Thread Michael Tretter 
On Tue, 10 Apr 2018 16:59:51 +0200, Philipp Zabel wrote:
> On Tue, 2018-04-10 at 16:27 +0200, Michael Olbrich wrote:
> > On Tue, Apr 10, 2018 at 11:06:46AM +0200, Michael Tretter wrote:  
> > > Split the version into major.minor.pl and use variable instead of hard
> > > coded version for installing libweston.
> > > 
> > > Signed-off-by: Michael Tretter 
> > > ---
> > >  rules/weston.in   |  1 -
> > >  rules/weston.make | 26 ++
> > >  2 files changed, 14 insertions(+), 13 deletions(-)
> > > 
> > > diff --git a/rules/weston.in b/rules/weston.in
> > > index 7db255202..a1755f510 100644
> > > --- a/rules/weston.in
> > > +++ b/rules/weston.in
> > > @@ -13,7 +13,6 @@ menuconfig WESTON
> > >   select CAIRO
> > >   select CAIRO_PNG
> > >   select LIBDRM   if WESTON_DRM_COMPOSITOR
> > > - select MTDEVif WESTON_DRM_COMPOSITOR || 
> > > WESTON_FBDEV_COMPOSITOR
> > >   select UDEV if WESTON_DRM_COMPOSITOR || 
> > > WESTON_FBDEV_COMPOSITOR
> > >   select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || 
> > > WESTON_FBDEV_COMPOSITOR
> > >   select MESALIB  if WESTON_DRM_COMPOSITOR
> > > diff --git a/rules/weston.make b/rules/weston.make
> > > index 6e7065982..06175a304 100644
> > > --- a/rules/weston.make
> > > +++ b/rules/weston.make
> > > @@ -17,8 +17,11 @@ PACKAGES-$(PTXCONF_WESTON) += weston
> > >  #
> > >  # Paths and names
> > >  #
> > > -WESTON_VERSION   := 3.0.0
> > > -WESTON_MD5   := 9c42a4c51a1b9f35d040fa9d45ada36d
> > > +WESTON_MAJOR := 4
> > > +WESTON_MINOR := 0
> > > +WESTON_PL:= 0
> > > +WESTON_VERSION   := $(WESTON_MAJOR).$(WESTON_MINOR).$(WESTON_PL)  
> > 
> > I prefer the version in one line. And use this for the major version:
> > 
> > WESTON_MAJOR:= $(basename $(basename $(WESTON_VERSION)))  
> 
> The library version below is LIBWESTON_MAJOR in configure.ac, not
> WESTON_VERSION_MAJOR. Both currently have the same value, but will
> weston increase major version with every backwards incompatible
> libweston API change? How about:
> 
> WESTON_VERSION:= 4.0.0
> LIBWESTON_MAJOR   := 4

I see. Actually the LIBWESTON_MAJOR changes with the first ABI
break, while WESTON_VERSION changes with the release and they are only
for releases and more or less by coincidence the same. I'll split the
variables.

Michael

> 
> regards
> Philipp
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable

2018-04-10 Thread Michael Tretter 
On Tue, 10 Apr 2018 16:31:53 +0200, Michael Olbrich wrote:
> On Tue, Apr 10, 2018 at 11:06:47AM +0200, Michael Tretter wrote:
> > Signed-off-by: Michael Tretter 
> > ---
> >  rules/weston.in   | 13 +
> >  rules/weston.make |  7 +--
> >  2 files changed, 18 insertions(+), 2 deletions(-)
> > 
> > diff --git a/rules/weston.in b/rules/weston.in
> > index a1755f510..49fc90e55 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -27,6 +27,7 @@ menuconfig WESTON
> > select XORG_LIB_XCURSOR if WESTON_XWAYLAND
> > select XORG_SERVER  if WESTON_XWAYLAND && RUNTIME
> > select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
> > +   select DBUS if WESTON_DBUS
> > select SYSTEMD  if WESTON_SYSTEMD
> > select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
> > prompt "weston"
> > @@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR
> > bool
> > prompt "fbdev compositor"
> >  
> > +config WESTON_LAUNCH
> > +   bool
> > +   prompt "weston-launch support"
> > +   help
> > + weston-launch is a setuid-root program which does privileged
> > + operations on Weston's behalf
> > +
> > +config WESTON_DBUS
> > +   bool
> > +   prompt "dbus support"  
> 
> Is this useful without logind? If not, then just use that option to enable
> D-Bus.

Only logind uses D-Bus.

> 
> > +
> >  config WESTON_SYSTEMD
> > bool
> > depends on INITMETHOD_SYSTEMD
> > @@ -65,6 +77,7 @@ config WESTON_SYSTEMD
> >  config WESTON_SYSTEMD_LOGIND
> > bool
> > depends on WESTON_SYSTEMD
> > +   depends on WESTON_DBUS  
> 
> Is this dependency new in 4.0? If yes, then it should be part of the
> version bump.

The logind backend depends on D-Bus support since its addition in 1.4.0,
but since 4.0 configure actually fails if the dependency is not
fulfilled. Should be part of the version bump anyway.

Michael

> 
> Michael
> 
> > prompt "logind support"
> >  
> >  config WESTON_WCAP_TOOLS
> > diff --git a/rules/weston.make b/rules/weston.make
> > index 06175a304..30249e9f1 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -61,10 +61,10 @@ WESTON_CONF_OPT := \
> > --disable-simple-dmabuf-v4l-client \
> > --enable-clients \
> > --enable-resize-optimization \
> > -   --disable-weston-launch \
> > +   --$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
> > --enable-fullscreen-shell \
> > --disable-colord \
> > -   --disable-dbus \
> > +   --$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \
> > --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
> > --disable-junit-xml \
> > --disable-ivi-shell \
> > @@ -92,6 +92,9 @@ $(STATEDIR)/weston.targetinstall:
> >  
> > @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
> > @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
> > +ifdef PTXCONF_WESTON_LAUNCH
> > +   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
> > +endif
> > @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
> >  
> >  ifdef PTXCONF_WESTON_WCAP_TOOLS
> > -- 
> > 2.16.1
> > 
> > 
> > ___
> > ptxdist mailing list
> > ptxdist@pengutronix.de  
> 

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] htop: version bump 2.1.0 -> 2.2.0

2018-04-10 Thread Roland Hieber 
Signed-off-by: Roland Hieber 
---
 rules/htop.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/htop.make b/rules/htop.make
index 4d3505f29..eff67cdda 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION   := 2.1.0
-HTOP_MD5   := f262b66ad6c194782f4d3a80627e84c8
+HTOP_VERSION   := 2.2.0
+HTOP_MD5   := 0d816b6beed31edc75babcfbf863ffa8
 HTOP   := htop-$(HTOP_VERSION)
 HTOP_SUFFIX:= tar.gz
 HTOP_URL   := 
http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
-- 
2.11.0


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 4/4] weston: make dbus and weston-launch configurable

2018-04-10 Thread Michael Olbrich 
On Tue, Apr 10, 2018 at 11:06:47AM +0200, Michael Tretter wrote:
> Signed-off-by: Michael Tretter 
> ---
>  rules/weston.in   | 13 +
>  rules/weston.make |  7 +--
>  2 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/weston.in b/rules/weston.in
> index a1755f510..49fc90e55 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -27,6 +27,7 @@ menuconfig WESTON
>   select XORG_LIB_XCURSOR if WESTON_XWAYLAND
>   select XORG_SERVER  if WESTON_XWAYLAND && RUNTIME
>   select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
> + select DBUS if WESTON_DBUS
>   select SYSTEMD  if WESTON_SYSTEMD
>   select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
>   prompt "weston"
> @@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR
>   bool
>   prompt "fbdev compositor"
>  
> +config WESTON_LAUNCH
> + bool
> + prompt "weston-launch support"
> + help
> +   weston-launch is a setuid-root program which does privileged
> +   operations on Weston's behalf
> +
> +config WESTON_DBUS
> + bool
> + prompt "dbus support"

Is this useful without logind? If not, then just use that option to enable
D-Bus.

> +
>  config WESTON_SYSTEMD
>   bool
>   depends on INITMETHOD_SYSTEMD
> @@ -65,6 +77,7 @@ config WESTON_SYSTEMD
>  config WESTON_SYSTEMD_LOGIND
>   bool
>   depends on WESTON_SYSTEMD
> + depends on WESTON_DBUS

Is this dependency new in 4.0? If yes, then it should be part of the
version bump.

Michael

>   prompt "logind support"
>  
>  config WESTON_WCAP_TOOLS
> diff --git a/rules/weston.make b/rules/weston.make
> index 06175a304..30249e9f1 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -61,10 +61,10 @@ WESTON_CONF_OPT   := \
>   --disable-simple-dmabuf-v4l-client \
>   --enable-clients \
>   --enable-resize-optimization \
> - --disable-weston-launch \
> + --$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
>   --enable-fullscreen-shell \
>   --disable-colord \
> - --disable-dbus \
> + --$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \
>   --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
>   --disable-junit-xml \
>   --disable-ivi-shell \
> @@ -92,6 +92,9 @@ $(STATEDIR)/weston.targetinstall:
>  
>   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
>   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
> +ifdef PTXCONF_WESTON_LAUNCH
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
> +endif
>   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
>  
>  ifdef PTXCONF_WESTON_WCAP_TOOLS
> -- 
> 2.16.1
> 
> 
> ___
> 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 v2 5/5] nftables: Add bbinit startscript

2018-04-10 Thread Michael Olbrich 
On Tue, Apr 10, 2018 at 08:57:01AM +0200, Alexander Dahl wrote:
> Hello Michael,
> 
> Am Montag, 9. April 2018, 10:30:56 CEST schrieb Michael Olbrich:
> > This patch does not apply. I'm not sure why:
> > [...]
> > error: sha1 information is lacking or useless (rules/nftables.in).
> > error: could not build fake ancestor
> > [...]
> 
> I tried to apply the series from the mails by myself on two systems and got 
> no 
> error. Strange.

It's a line break problem. The patch had the same problem until I used
'dos2unix'.

> > Please resent. Maybe as an attachment.
> 
> I attach it to this mail. You may need to apply other patches of this series 
> first?

It's in my internal test queue now.

Michael


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