[ptxdist] [PATCH v2 4/4] weston: make weston-launch configurable

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/weston.in   | 9 +
 rules/weston.make | 5 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rules/weston.in b/rules/weston.in
index 56b85d26a..79512bc2a 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -57,6 +57,15 @@ config WESTON_FBDEV_COMPOSITOR
bool
prompt "fbdev compositor"
 
+config WESTON_LAUNCH
+   bool
+   prompt "weston-launch support"
+   # needs pam
+   depends on BROKEN
+   help
+ weston-launch is a setuid-root program which does privileged
+ operations on Weston's behalf
+
 config WESTON_SYSTEMD
bool
default INITMETHOD_SYSTEMD
diff --git a/rules/weston.make b/rules/weston.make
index 61cb6b072..dd942b0bb 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -59,7 +59,7 @@ 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 \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
@@ -90,6 +90,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] [PATCH v2 1/4] wayland-protocols: version bump 1.12 -> 1.13

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/wayland-protocols.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
index 80b9c64b6..ec069fe7e 100644
--- a/rules/wayland-protocols.make
+++ b/rules/wayland-protocols.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols
 #
 # Paths and names
 #
-WAYLAND_PROTOCOLS_VERSION  := 1.12
-WAYLAND_PROTOCOLS_MD5  := ac83c4704003323b6bd5a1b91fb1be53
+WAYLAND_PROTOCOLS_VERSION  := 1.13
+WAYLAND_PROTOCOLS_MD5  := 29312149dafcd4a0e739ba94995a574d
 WAYLAND_PROTOCOLS  := 
wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION)
 WAYLAND_PROTOCOLS_SUFFIX   := tar.xz
 WAYLAND_PROTOCOLS_URL  := 
https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
-- 
2.16.1


___
ptxdist mailing list
ptxdist@pengutronix.de

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

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/weston.in   |  6 ++
 rules/weston.make | 38 +++---
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 7db255202..56b85d26a 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
@@ -30,6 +29,7 @@ menuconfig WESTON
select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
select SYSTEMD  if WESTON_SYSTEMD
select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
+   select DBUS if WESTON_SYSTEMD_LOGIND
prompt "weston"
help
  Wayland compositor reference implementation
@@ -59,9 +59,7 @@ config WESTON_FBDEV_COMPOSITOR
 
 config WESTON_SYSTEMD
bool
-   depends on INITMETHOD_SYSTEMD
-   default y
-   prompt "systemd support"
+   default INITMETHOD_SYSTEMD
 
 config WESTON_SYSTEMD_LOGIND
bool
diff --git a/rules/weston.make b/rules/weston.make
index 6e7065982..61cb6b072 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,8 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION := 3.0.0
-WESTON_MD5 := 9c42a4c51a1b9f35d040fa9d45ada36d
+WESTON_VERSION := 4.0.0
+LIBWESTON_MAJOR := 4
+WESTON_MD5 := 33709aa4d5916f89643fca0fc0064b39
 WESTON := weston-$(WESTON_VERSION)
 WESTON_SUFFIX  := tar.xz
 WESTON_URL := 
http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
@@ -61,12 +62,11 @@ WESTON_CONF_OPT := \
--disable-weston-launch \
--enable-fullscreen-shell \
--disable-colord \
-   --disable-dbus \
+   --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
--disable-junit-xml \
--disable-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-   --disable-libunwind \
--disable-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
@@ -96,23 +96,23 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/wcap-decode)
 endif
 
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3)
-   @$(call install_lib, weston, 0, 0, 0644, libweston-desktop-3)
+   @$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR))
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-desktop-$(LIBWESTON_MAJOR))
 ifdef PTXCONF_WESTON_XWAYLAND
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/xwayland)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/xwayland)
 endif
 ifdef PTXCONF_WESTON_DRM_COMPOSITOR
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/drm-backend)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/drm-backend)
 endif
 ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/headless-backend)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/headless-backend)
 endif
 ifdef PTXCONF_WESTON_FBDEV_COMPOSITOR
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/fbdev-backend)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/fbdev-backend)
 endif
 ifdef PTXCONF_WESTON_GL
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/wayland-backend)
-   @$(call install_lib, weston, 0, 0, 0644, libweston-3/gl-renderer)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/wayland-backend)
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/gl-renderer)
 endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
@@ -127,16 +127,16 @@ endif
 
 
@$(foreach image, \
-   wayland.svg \
-   terminal.png \
-   wayland.png \
border.png \
-   pattern.png \
-   sign_maximize.png \
icon_window.png \
+   pattern.png \
sign_close.png \
-   sign_maximize.png, \
-   $(call install_copy, weston, 0, 0, 0644, -, 
/usr/share/weston/$(image));)
+   sign_maximize.png \
+   sign_minimize.png \
+ 

[ptxdist] [PATCH v2 2/4] wayland: version bump 1.14 -> 1.15

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/wayland.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wayland.make b/rules/wayland.make
index 203caa4a9..5d5e44470 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland
 #
 # Paths and names
 #
-WAYLAND_VERSION:= 1.14.0
-WAYLAND_MD5:= 0235f6075c32c3be61cff94fa0b9f108
+WAYLAND_VERSION:= 1.15.0
+WAYLAND_MD5:= b7393c17fdce9a8d383edab656c92fd2
 WAYLAND:= wayland-$(WAYLAND_VERSION)
 WAYLAND_SUFFIX := tar.xz
 WAYLAND_URL:= 
http://wayland.freedesktop.org/releases/$(WAYLAND).$(WAYLAND_SUFFIX)
-- 
2.16.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 0/4] wayland, weston: version bump

[Michael Tretter]

Changes since v1:

- add variable LIBWESTON_MAJOR instead of splitting WESTON_VERSION
- sort installed images in alphabetical order
- drop separate config item for Weston D-Bus support
- mark WESTON_LAUNCH as broken

Michael Tretter (4):
  wayland-protocols: version bump 1.12 -> 1.13
  wayland: version bump 1.14 -> 1.15
  weston: version bump 3.0.0 -> 4.0.0
  weston: make weston-launch configurable

 rules/wayland-protocols.make |  4 ++--
 rules/wayland.make   |  4 ++--
 rules/weston.in  | 17 -
 rules/weston.make| 44 
 4 files changed, 40 insertions(+), 29 deletions(-)

-- 
2.16.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] OSELAS Toolchain for i.MX 6UltraLite MCIMX6G2

[Matthias Klein]

Hello Lucas,

Thanks a lot for the info!


Best regards,
Matthias

-- Originalnachricht --
Von: "Lucas Stach" 
An: ptxdist@pengutronix.de; "Matthias Klein" 


Gesendet: 11.04.2018 11:42:44
Betreff: Re: [ptxdist] OSELAS Toolchain for i.MX 6UltraLite MCIMX6G2


Hi Matthias,

Am Mittwoch, den 11.04.2018, 09:26 + schrieb Matthias Klein:

Hello,

we are using the OSELAS Toolchain 2014.12.2 in the "arm-v7a-linux-
gnueabihf" variant for the NXP i.MX6S7 and NXP i.MX6QP7.

Can we use this existing Toolchain and the PTXdist project also for
the i.MX 6UltraLite MCIMX6G2?


In other words: do we need only a different device tree (and a kernel
which supports the CPU/Board), or do we need a different Toolchain
(and different PTXdist project)?


Yes, both CPUs are compatible. The only difference regarding the
toolchain/platform is that the Cortex-A7 on the MX6UL supports vfp-v4,
while the Cortex-A9 on the older i.MX6 variants only supports vfp-v3.

The generic arm-v7a toolchain will not use the newer vfp version by
default, but it's something to keep in mind. Just don't add vfp-v4 to
the platform toolchain options in the BSP and you should be fine.

Regards,
Lucas



___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] OSELAS Toolchain for i.MX 6UltraLite MCIMX6G2

[Lucas Stach]

Hi Matthias,

Am Mittwoch, den 11.04.2018, 09:26 + schrieb Matthias Klein:
> Hello,
> 
> we are using the OSELAS Toolchain 2014.12.2 in the "arm-v7a-linux-
> gnueabihf" variant for the NXP i.MX6S7 and NXP i.MX6QP7.
> 
> Can we use this existing Toolchain and the PTXdist project also for
> the i.MX 6UltraLite MCIMX6G2?
> 
> 
> In other words: do we need only a different device tree (and a kernel
> which supports the CPU/Board), or do we need a different Toolchain
> (and different PTXdist project)?

Yes, both CPUs are compatible. The only difference regarding the
toolchain/platform is that the Cortex-A7 on the MX6UL supports vfp-v4,
while the Cortex-A9 on the older i.MX6 variants only supports vfp-v3.

The generic arm-v7a toolchain will not use the newer vfp version by
default, but it's something to keep in mind. Just don't add vfp-v4 to
the platform toolchain options in the BSP and you should be fine.

Regards,
Lucas

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] OSELAS Toolchain for i.MX 6UltraLite MCIMX6G2

[Matthias Klein]

Hello,

we are using the OSELAS Toolchain 2014.12.2 in the 
"arm-v7a-linux-gnueabihf" variant for the NXP i.MX6S7 and NXP i.MX6QP7.


Can we use this existing Toolchain and the PTXdist project also for the 
i.MX 6UltraLite MCIMX6G2?



In other words: do we need only a different device tree (and a kernel 
which supports the CPU/Board), or do we need a different Toolchain (and 
different PTXdist project)?




Best regards,
Matthias Klein
___
ptxdist mailing list
ptxdist@pengutronix.de

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

[Roland Hieber]

Ah, thank you for reminding me. It builds fine without the patches, but
I will send v2 nevertheless to delete them.

 - Roland

On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Hei hei,
> 
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
> 
> FWIW …
> 
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
> upstream. 
> 
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly 
> to 
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
> not sure if it is really needed anymore. Maybe see the discussions about 
> ncurses6 earlier this year on this list or the commit introducing that patch 
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).
> 
> HTH & Greets
> Alex
> 
> [1] https://github.com/hishamhm/htop/issues/695
> [2] https://github.com/hishamhm/htop/pull/745
> 
> 

-- 
Roland Hieber | r.hie...@pengutronix.de |
Pengutronix e.K.  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917- |

___
ptxdist mailing list
ptxdist@pengutronix.de

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

[Michael Olbrich]

Hi,

On Wed, Apr 11, 2018 at 08:56:02AM +0200, Alexander Dahl wrote:
> Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> > There are patches on top of htop 2.1.0. You should port them or drop
> > them as needed.
> 
> FWIW …
> 
> 0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
> upstream. 
> 
> 0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly 
> to 
> htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
> upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
> that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
> not sure if it is really needed anymore. Maybe see the discussions about 
> ncurses6 earlier this year on this list or the commit introducing that patch 
> (74ffd1f57d0d68a89183ea2bf47c0cd67a989520).

The problem is, that configure looks for libncurses6 with ncurses6-config.
We don't have that combination. The fallback is ncurses5-config. That may
be picked up from the system, which is bad.

HTOP_NCURSES_CONFIG_SCRIPT=ncurses6-config in the _CONF_ENV should work
instead of the patch.

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

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

[Alexander Dahl]

Hei hei,

Am Dienstag, 10. April 2018, 17:34:09 CEST schrieb Bastian Stender:
> There are patches on top of htop 2.1.0. You should port them or drop
> them as needed.

FWIW …

0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch was applied 
upstream. 

0002-configure-check-for-ncurses-with-ncurses6-config.patch applies cleanly to 
htop 2.2.0, but I'm not sure it's needed, they changed ncurses CFLAGS use in 
upstream commit bc5d46982f3504000567e00f59e4f7a5905597a9, maybe more info on 
that in #695 [1] and #745 [2]. Also they fixed things with pkg-config, so I'm 
not sure if it is really needed anymore. Maybe see the discussions about 
ncurses6 earlier this year on this list or the commit introducing that patch 
(74ffd1f57d0d68a89183ea2bf47c0cd67a989520).

HTH & Greets
Alex

[1] https://github.com/hishamhm/htop/issues/695
[2] https://github.com/hishamhm/htop/pull/745


___
ptxdist mailing list
ptxdist@pengutronix.de