* [ptxdist] [PATCH 1/3] wayland: version bump 1.15.0 -> 1.16.0
@ 2018-08-27 13:29 Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 2/3] wayland-protocols: version bump 1.13 -> 1.16 Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 3/3] weston: version bump 4.0.0 -> 5.0.0 Philipp Zabel
0 siblings, 2 replies; 14+ messages in thread
From: Philipp Zabel @ 2018-08-27 13:29 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/wayland.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/wayland.make b/rules/wayland.make
index 5d5e44470f99..a30ee7e3babc 100644
--- a/rules/wayland.make
+++ b/rules/wayland.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WAYLAND) += wayland
#
# Paths and names
#
-WAYLAND_VERSION := 1.15.0
-WAYLAND_MD5 := b7393c17fdce9a8d383edab656c92fd2
+WAYLAND_VERSION := 1.16.0
+WAYLAND_MD5 := 0c215e53de71d6fb26f7102cdc6432d3
WAYLAND := wayland-$(WAYLAND_VERSION)
WAYLAND_SUFFIX := tar.xz
WAYLAND_URL := http://wayland.freedesktop.org/releases/$(WAYLAND).$(WAYLAND_SUFFIX)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 2/3] wayland-protocols: version bump 1.13 -> 1.16
2018-08-27 13:29 [ptxdist] [PATCH 1/3] wayland: version bump 1.15.0 -> 1.16.0 Philipp Zabel
@ 2018-08-27 13:29 ` Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 3/3] weston: version bump 4.0.0 -> 5.0.0 Philipp Zabel
1 sibling, 0 replies; 14+ messages in thread
From: Philipp Zabel @ 2018-08-27 13:29 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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 ec069fe7ebf7..c5442d521958 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.13
-WAYLAND_PROTOCOLS_MD5 := 29312149dafcd4a0e739ba94995a574d
+WAYLAND_PROTOCOLS_VERSION := 1.16
+WAYLAND_PROTOCOLS_MD5 := e0b523ff162e30bab46be1d65d527683
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.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 3/3] weston: version bump 4.0.0 -> 5.0.0
2018-08-27 13:29 [ptxdist] [PATCH 1/3] wayland: version bump 1.15.0 -> 1.16.0 Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 2/3] wayland-protocols: version bump 1.13 -> 1.16 Philipp Zabel
@ 2018-08-27 13:29 ` Philipp Zabel
2018-08-30 16:23 ` [ptxdist] [PATCH 1/3] weston: remove empty clean stage Michael Tretter
1 sibling, 1 reply; 14+ messages in thread
From: Philipp Zabel @ 2018-08-27 13:29 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/weston.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/weston.make b/rules/weston.make
index dd942b0bb800..f5d7488974d8 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
#
# Paths and names
#
-WESTON_VERSION := 4.0.0
-LIBWESTON_MAJOR := 4
-WESTON_MD5 := 33709aa4d5916f89643fca0fc0064b39
+WESTON_VERSION := 5.0.0
+LIBWESTON_MAJOR := 5
+WESTON_MD5 := 752a04ce3c65af4884cfac4e57231bdb
WESTON := weston-$(WESTON_VERSION)
WESTON_SUFFIX := tar.xz
WESTON_URL := http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 1/3] weston: remove empty clean stage
2018-08-27 13:29 ` [ptxdist] [PATCH 3/3] weston: version bump 4.0.0 -> 5.0.0 Philipp Zabel
@ 2018-08-30 16:23 ` Michael Tretter
2018-08-30 16:23 ` [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc Michael Tretter
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Michael Tretter @ 2018-08-30 16:23 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/weston.make | 8 --------
1 file changed, 8 deletions(-)
diff --git a/rules/weston.make b/rules/weston.make
index f5d748897..1817a94f3 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -146,12 +146,4 @@ endif
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-#$(STATEDIR)/weston.clean:
-# @$(call targetinfo)
-# @$(call clean_pkg, WESTON)
-
# vim: syntax=make
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc
2018-08-30 16:23 ` [ptxdist] [PATCH 1/3] weston: remove empty clean stage Michael Tretter
@ 2018-08-30 16:23 ` Michael Tretter
2018-08-31 6:09 ` Ladislav Michl
2018-08-30 16:23 ` [ptxdist] [PATCH 3/3] weston: add IVI-Shell support Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage Michael Tretter
2 siblings, 1 reply; 14+ messages in thread
From: Michael Tretter @ 2018-08-30 16:23 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Weston brings an example weston.ini file, which is not installed by
default. Use the shipped template to generate a weston.ini for the
target system and install it to the default system global path.
Allow to disable weston.ini to use the build-in default configuration or
to override it in the projectroot.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/weston.in | 6 ++++++
rules/weston.make | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/rules/weston.in b/rules/weston.in
index 1c0ebff98..2e760740c 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
help
Weston CAPture Tools
+config WESTON_INSTALL_CONFIG
+ bool
+ prompt "install configuration file"
+ help
+ Install the Weston configuration file into /etc/xdg/weston
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index 1817a94f3..1e08b8c80 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -74,6 +74,22 @@ WESTON_CONF_OPT := \
--with-jpeg \
--without-webp
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/weston.install:
+ @$(call targetinfo)
+ @$(call world/install, WESTON)
+
+ @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
+ bindir="/usr/bin" \
+ abs_top_builddir="/usr/bin" \
+ libexecdir="/usr/libexec" \
+ ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
+ "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
@@ -141,6 +157,9 @@ endif
wayland.svg, \
$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
+ifdef PTXCONF_WESTON_INSTALL_CONFIG
+ @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
+endif
@$(call install_finish, weston)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 3/3] weston: add IVI-Shell support
2018-08-30 16:23 ` [ptxdist] [PATCH 1/3] weston: remove empty clean stage Michael Tretter
2018-08-30 16:23 ` [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc Michael Tretter
@ 2018-08-30 16:23 ` Michael Tretter
2018-08-31 6:11 ` Ladislav Michl
2018-08-31 8:10 ` [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage Michael Tretter
2 siblings, 1 reply; 14+ messages in thread
From: Michael Tretter @ 2018-08-30 16:23 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
build the ivi shell module and separately also build the ivi-shell user
interface example.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
rules/weston.in | 14 ++++++++++++++
rules/weston.make | 41 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/rules/weston.in b/rules/weston.in
index 2e760740c..77789a23b 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
help
Install the Weston configuration file into /etc/xdg/weston
+config WESTON_IVISHELL
+ bool
+ prompt "IVI-Shell"
+
+config WESTON_IVISHELL_EXAMPLE
+ bool
+ select WESTON_INSTALL_CONFIG
+ depends on WESTON_IVISHELL
+ prompt "install example IVI-Shell user interface"
+ help
+ Install the example hmi-controller, the IVI-Shell user interface
+ application, a few demo clients and the weston.ini configuration for
+ the IVI-Shell.
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index 1e08b8c80..8f208c4d2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -65,9 +65,9 @@ WESTON_CONF_OPT := \
--$(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_IVISHELL)-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
- --disable-demo-clients-install \
+ --$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
--with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
@@ -82,12 +82,20 @@ $(STATEDIR)/weston.install:
@$(call targetinfo)
@$(call world/install, WESTON)
+ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
bindir="/usr/bin" \
abs_top_builddir="/usr/bin" \
libexecdir="/usr/libexec" \
ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+else
+ @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
+ westondatadir="/usr/share/weston" \
+ bindir="/usr/bin" \
+ ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
+ "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+endif
@$(call touch)
@@ -135,6 +143,9 @@ ifdef PTXCONF_WESTON_GL
endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
+ifdef PTXCONF_WESTON_IVISHELL
+ @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
+endif
ifdef PTXCONF_WESTON_SYSTEMD
@$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
endif
@@ -161,6 +172,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
@$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
endif
+ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
+ @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-ivi-shell-user-interface)
+
+ @$(foreach image, \
+ background.png \
+ fullscreen.png \
+ home.png \
+ icon_ivi_clickdot.png \
+ icon_ivi_flower.png \
+ icon_ivi_simple-egl.png \
+ icon_ivi_simple-shm.png \
+ icon_ivi_smoke.png \
+ panel.png \
+ random.png \
+ sidebyside.png \
+ tiling.png, \
+ $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
+
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
+endif
+
@$(call install_finish, weston)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc
2018-08-30 16:23 ` [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc Michael Tretter
@ 2018-08-31 6:09 ` Ladislav Michl
2018-08-31 7:16 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Ladislav Michl @ 2018-08-31 6:09 UTC (permalink / raw)
To: ptxdist
Hello Michael,
just a nitpick...
On Thu, Aug 30, 2018 at 06:23:29PM +0200, Michael Tretter wrote:
> Weston brings an example weston.ini file, which is not installed by
> default. Use the shipped template to generate a weston.ini for the
> target system and install it to the default system global path.
>
> Allow to disable weston.ini to use the build-in default configuration or
> to override it in the projectroot.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> rules/weston.in | 6 ++++++
> rules/weston.make | 19 +++++++++++++++++++
> 2 files changed, 25 insertions(+)
>
> diff --git a/rules/weston.in b/rules/weston.in
> index 1c0ebff98..2e760740c 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
> help
> Weston CAPture Tools
>
> +config WESTON_INSTALL_CONFIG
> + bool
> + prompt "install configuration file"
> + help
> + Install the Weston configuration file into /etc/xdg/weston
> +
> endif
> diff --git a/rules/weston.make b/rules/weston.make
> index 1817a94f3..1e08b8c80 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -74,6 +74,22 @@ WESTON_CONF_OPT := \
> --with-jpeg \
> --without-webp
>
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/weston.install:
> + @$(call targetinfo)
> + @$(call world/install, WESTON)
> +
> + @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> + bindir="/usr/bin" \
> + abs_top_builddir="/usr/bin" \
> + libexecdir="/usr/libexec" \
Seems there are spaces after tab.
> + ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> +
> + @$(call touch)
>
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -141,6 +157,9 @@ endif
> wayland.svg, \
> $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
>
> +ifdef PTXCONF_WESTON_INSTALL_CONFIG
> + @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> +endif
>
> @$(call install_finish, weston)
>
> --
> 2.18.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 3/3] weston: add IVI-Shell support
2018-08-30 16:23 ` [ptxdist] [PATCH 3/3] weston: add IVI-Shell support Michael Tretter
@ 2018-08-31 6:11 ` Ladislav Michl
2018-08-31 7:22 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Ladislav Michl @ 2018-08-31 6:11 UTC (permalink / raw)
To: ptxdist
On Thu, Aug 30, 2018 at 06:23:30PM +0200, Michael Tretter wrote:
> The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
> build the ivi shell module and separately also build the ivi-shell user
> interface example.
>
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> rules/weston.in | 14 ++++++++++++++
> rules/weston.make | 41 +++++++++++++++++++++++++++++++++++++++--
> 2 files changed, 53 insertions(+), 2 deletions(-)
>
> diff --git a/rules/weston.in b/rules/weston.in
> index 2e760740c..77789a23b 100644
> --- a/rules/weston.in
> +++ b/rules/weston.in
> @@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
> help
> Install the Weston configuration file into /etc/xdg/weston
>
> +config WESTON_IVISHELL
> + bool
> + prompt "IVI-Shell"
> +
> +config WESTON_IVISHELL_EXAMPLE
> + bool
> + select WESTON_INSTALL_CONFIG
> + depends on WESTON_IVISHELL
a more common patters seems to have "depends on" first
> + prompt "install example IVI-Shell user interface"
> + help
> + Install the example hmi-controller, the IVI-Shell user interface
> + application, a few demo clients and the weston.ini configuration for
> + the IVI-Shell.
> +
> endif
> diff --git a/rules/weston.make b/rules/weston.make
> index 1e08b8c80..8f208c4d2 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -65,9 +65,9 @@ WESTON_CONF_OPT := \
> --$(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_IVISHELL)-ivi-shell \
> --$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
> - --disable-demo-clients-install \
> + --$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
> --disable-lcms \
> --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
> --with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
> @@ -82,12 +82,20 @@ $(STATEDIR)/weston.install:
> @$(call targetinfo)
> @$(call world/install, WESTON)
>
> +ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
> @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> bindir="/usr/bin" \
> abs_top_builddir="/usr/bin" \
> libexecdir="/usr/libexec" \
> ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> +else
> + @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> + westondatadir="/usr/share/weston" \
> + bindir="/usr/bin" \
spaces after tab
> + ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
> + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> +endif
>
> @$(call touch)
>
> @@ -135,6 +143,9 @@ ifdef PTXCONF_WESTON_GL
> endif
> @$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
> @$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
> +ifdef PTXCONF_WESTON_IVISHELL
> + @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
> +endif
> ifdef PTXCONF_WESTON_SYSTEMD
> @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
> endif
> @@ -161,6 +172,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
> @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> endif
>
> +ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
> + @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-ivi-shell-user-interface)
> +
> + @$(foreach image, \
> + background.png \
> + fullscreen.png \
> + home.png \
> + icon_ivi_clickdot.png \
> + icon_ivi_flower.png \
> + icon_ivi_simple-egl.png \
> + icon_ivi_simple-shm.png \
> + icon_ivi_smoke.png \
> + panel.png \
> + random.png \
> + sidebyside.png \
> + tiling.png, \
> + $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
> +
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
> + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
> +endif
> +
> @$(call install_finish, weston)
>
> @$(call touch)
> --
> 2.18.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc
2018-08-31 6:09 ` Ladislav Michl
@ 2018-08-31 7:16 ` Michael Olbrich
2018-08-31 7:19 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2018-08-31 7:16 UTC (permalink / raw)
To: ptxdist
On Fri, Aug 31, 2018 at 08:09:48AM +0200, Ladislav Michl wrote:
> Hello Michael,
>
> just a nitpick...
>
> On Thu, Aug 30, 2018 at 06:23:29PM +0200, Michael Tretter wrote:
> > Weston brings an example weston.ini file, which is not installed by
> > default. Use the shipped template to generate a weston.ini for the
> > target system and install it to the default system global path.
> >
> > Allow to disable weston.ini to use the build-in default configuration or
> > to override it in the projectroot.
> >
> > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > ---
> > rules/weston.in | 6 ++++++
> > rules/weston.make | 19 +++++++++++++++++++
> > 2 files changed, 25 insertions(+)
> >
> > diff --git a/rules/weston.in b/rules/weston.in
> > index 1c0ebff98..2e760740c 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
> > help
> > Weston CAPture Tools
> >
> > +config WESTON_INSTALL_CONFIG
> > + bool
> > + prompt "install configuration file"
> > + help
> > + Install the Weston configuration file into /etc/xdg/weston
> > +
> > endif
> > diff --git a/rules/weston.make b/rules/weston.make
> > index 1817a94f3..1e08b8c80 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -74,6 +74,22 @@ WESTON_CONF_OPT := \
> > --with-jpeg \
> > --without-webp
> >
> > +# ----------------------------------------------------------------------------
> > +# Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/weston.install:
> > + @$(call targetinfo)
> > + @$(call world/install, WESTON)
> > +
> > + @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> > + bindir="/usr/bin" \
> > + abs_top_builddir="/usr/bin" \
> > + libexecdir="/usr/libexec" \
>
> Seems there are spaces after tab.
Indeed. I prefer an extra tab, like the lines below.
Michael
> > + ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> > + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > +
> > + @$(call touch)
> >
> > # ----------------------------------------------------------------------------
> > # Target-Install
> > @@ -141,6 +157,9 @@ endif
> > wayland.svg, \
> > $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
> >
> > +ifdef PTXCONF_WESTON_INSTALL_CONFIG
> > + @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> > +endif
> >
> > @$(call install_finish, weston)
> >
> > --
> > 2.18.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
> _______________________________________________
> 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] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc
2018-08-31 7:16 ` Michael Olbrich
@ 2018-08-31 7:19 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2018-08-31 7:19 UTC (permalink / raw)
To: ptxdist
On Fri, Aug 31, 2018 at 09:16:34AM +0200, Michael Olbrich wrote:
> On Fri, Aug 31, 2018 at 08:09:48AM +0200, Ladislav Michl wrote:
> > Hello Michael,
> >
> > just a nitpick...
> >
> > On Thu, Aug 30, 2018 at 06:23:29PM +0200, Michael Tretter wrote:
> > > Weston brings an example weston.ini file, which is not installed by
> > > default. Use the shipped template to generate a weston.ini for the
> > > target system and install it to the default system global path.
> > >
> > > Allow to disable weston.ini to use the build-in default configuration or
> > > to override it in the projectroot.
> > >
> > > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > > ---
> > > rules/weston.in | 6 ++++++
> > > rules/weston.make | 19 +++++++++++++++++++
> > > 2 files changed, 25 insertions(+)
> > >
> > > diff --git a/rules/weston.in b/rules/weston.in
> > > index 1c0ebff98..2e760740c 100644
> > > --- a/rules/weston.in
> > > +++ b/rules/weston.in
> > > @@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
> > > help
> > > Weston CAPture Tools
> > >
> > > +config WESTON_INSTALL_CONFIG
> > > + bool
> > > + prompt "install configuration file"
> > > + help
> > > + Install the Weston configuration file into /etc/xdg/weston
> > > +
> > > endif
> > > diff --git a/rules/weston.make b/rules/weston.make
> > > index 1817a94f3..1e08b8c80 100644
> > > --- a/rules/weston.make
> > > +++ b/rules/weston.make
> > > @@ -74,6 +74,22 @@ WESTON_CONF_OPT := \
> > > --with-jpeg \
> > > --without-webp
> > >
> > > +# ----------------------------------------------------------------------------
> > > +# Install
> > > +# ----------------------------------------------------------------------------
> > > +
> > > +$(STATEDIR)/weston.install:
> > > + @$(call targetinfo)
> > > + @$(call world/install, WESTON)
> > > +
> > > + @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
And there is no need to combine the mkdir the next command.
'make' will abort if it fails and there is no shared context.
Michael
> > > + bindir="/usr/bin" \
> > > + abs_top_builddir="/usr/bin" \
> > > + libexecdir="/usr/libexec" \
> >
> > Seems there are spaces after tab.
>
> Indeed. I prefer an extra tab, like the lines below.
>
> Michael
>
> > > + ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> > > + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > > +
> > > + @$(call touch)
> > >
> > > # ----------------------------------------------------------------------------
> > > # Target-Install
> > > @@ -141,6 +157,9 @@ endif
> > > wayland.svg, \
> > > $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
> > >
> > > +ifdef PTXCONF_WESTON_INSTALL_CONFIG
> > > + @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> > > +endif
> > >
> > > @$(call install_finish, weston)
> > >
> > > --
> > > 2.18.0
> > >
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> >
> > _______________________________________________
> > 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
--
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] 14+ messages in thread
* Re: [ptxdist] [PATCH 3/3] weston: add IVI-Shell support
2018-08-31 6:11 ` Ladislav Michl
@ 2018-08-31 7:22 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2018-08-31 7:22 UTC (permalink / raw)
To: ptxdist
On Fri, Aug 31, 2018 at 08:11:01AM +0200, Ladislav Michl wrote:
> On Thu, Aug 30, 2018 at 06:23:30PM +0200, Michael Tretter wrote:
> > The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
> > build the ivi shell module and separately also build the ivi-shell user
> > interface example.
> >
> > Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> > ---
> > rules/weston.in | 14 ++++++++++++++
> > rules/weston.make | 41 +++++++++++++++++++++++++++++++++++++++--
> > 2 files changed, 53 insertions(+), 2 deletions(-)
> >
> > diff --git a/rules/weston.in b/rules/weston.in
> > index 2e760740c..77789a23b 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
> > help
> > Install the Weston configuration file into /etc/xdg/weston
> >
> > +config WESTON_IVISHELL
> > + bool
> > + prompt "IVI-Shell"
> > +
> > +config WESTON_IVISHELL_EXAMPLE
> > + bool
> > + select WESTON_INSTALL_CONFIG
> > + depends on WESTON_IVISHELL
>
> a more common patters seems to have "depends on" first
>
> > + prompt "install example IVI-Shell user interface"
> > + help
> > + Install the example hmi-controller, the IVI-Shell user interface
> > + application, a few demo clients and the weston.ini configuration for
> > + the IVI-Shell.
> > +
> > endif
> > diff --git a/rules/weston.make b/rules/weston.make
> > index 1e08b8c80..8f208c4d2 100644
> > --- a/rules/weston.make
> > +++ b/rules/weston.make
> > @@ -65,9 +65,9 @@ WESTON_CONF_OPT := \
> > --$(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_IVISHELL)-ivi-shell \
> > --$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
> > - --disable-demo-clients-install \
> > + --$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
> > --disable-lcms \
> > --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
> > --with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
> > @@ -82,12 +82,20 @@ $(STATEDIR)/weston.install:
> > @$(call targetinfo)
> > @$(call world/install, WESTON)
> >
> > +ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
> > @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> > bindir="/usr/bin" \
> > abs_top_builddir="/usr/bin" \
> > libexecdir="/usr/libexec" \
> > ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
> > "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > +else
> > + @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
> > + westondatadir="/usr/share/weston" \
> > + bindir="/usr/bin" \
>
> spaces after tab
And move the mkdir befor the ifndef.
Michael
>
> > + ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
> > + "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
> > +endif
> >
> > @$(call touch)
> >
> > @@ -135,6 +143,9 @@ ifdef PTXCONF_WESTON_GL
> > endif
> > @$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
> > @$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
> > +ifdef PTXCONF_WESTON_IVISHELL
> > + @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
> > +endif
> > ifdef PTXCONF_WESTON_SYSTEMD
> > @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
> > endif
> > @@ -161,6 +172,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
> > @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
> > endif
> >
> > +ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
> > + @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-ivi-shell-user-interface)
> > +
> > + @$(foreach image, \
> > + background.png \
> > + fullscreen.png \
> > + home.png \
> > + icon_ivi_clickdot.png \
> > + icon_ivi_flower.png \
> > + icon_ivi_simple-egl.png \
> > + icon_ivi_simple-shm.png \
> > + icon_ivi_smoke.png \
> > + panel.png \
> > + random.png \
> > + sidebyside.png \
> > + tiling.png, \
> > + $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
> > +
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
> > + @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
> > +endif
> > +
> > @$(call install_finish, weston)
> >
> > @$(call touch)
> > --
> > 2.18.0
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
>
> _______________________________________________
> 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] 14+ messages in thread
* [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage
2018-08-30 16:23 ` [ptxdist] [PATCH 1/3] weston: remove empty clean stage Michael Tretter
2018-08-30 16:23 ` [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc Michael Tretter
2018-08-30 16:23 ` [ptxdist] [PATCH 3/3] weston: add IVI-Shell support Michael Tretter
@ 2018-08-31 8:10 ` Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 2/3] weston: install weston.ini into /etc Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 3/3] weston: add IVI-Shell support Michael Tretter
2 siblings, 2 replies; 14+ messages in thread
From: Michael Tretter @ 2018-08-31 8:10 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Changes since v1:
- none
---
rules/weston.make | 8 --------
1 file changed, 8 deletions(-)
diff --git a/rules/weston.make b/rules/weston.make
index f5d748897..1817a94f3 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -146,12 +146,4 @@ endif
@$(call touch)
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-#$(STATEDIR)/weston.clean:
-# @$(call targetinfo)
-# @$(call clean_pkg, WESTON)
-
# vim: syntax=make
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 2/3] weston: install weston.ini into /etc
2018-08-31 8:10 ` [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage Michael Tretter
@ 2018-08-31 8:10 ` Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 3/3] weston: add IVI-Shell support Michael Tretter
1 sibling, 0 replies; 14+ messages in thread
From: Michael Tretter @ 2018-08-31 8:10 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
Weston brings an example weston.ini file, which is not installed by
default. Use the shipped template to generate a weston.ini for the
target system and install it to the default system global path.
Allow to disable weston.ini to use the build-in default configuration or
to override it in the projectroot.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Changes since v1:
- remove && between mkdir and ptxd_replace_magic
- fix indentation
---
rules/weston.in | 6 ++++++
rules/weston.make | 19 +++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/rules/weston.in b/rules/weston.in
index 1c0ebff98..2e760740c 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
help
Weston CAPture Tools
+config WESTON_INSTALL_CONFIG
+ bool
+ prompt "install configuration file"
+ help
+ Install the Weston configuration file into /etc/xdg/weston
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index 1817a94f3..c33d0814c 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -74,6 +74,22 @@ WESTON_CONF_OPT := \
--with-jpeg \
--without-webp
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/weston.install:
+ @$(call targetinfo)
+ @$(call world/install, WESTON)
+
+ @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
+ @bindir="/usr/bin" \
+ abs_top_builddir="/usr/bin" \
+ libexecdir="/usr/libexec" \
+ ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
+ "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+
+ @$(call touch)
# ----------------------------------------------------------------------------
# Target-Install
@@ -141,6 +157,9 @@ endif
wayland.svg, \
$(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
+ifdef PTXCONF_WESTON_INSTALL_CONFIG
+ @$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
+endif
@$(call install_finish, weston)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH v2 3/3] weston: add IVI-Shell support
2018-08-31 8:10 ` [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 2/3] weston: install weston.ini into /etc Michael Tretter
@ 2018-08-31 8:10 ` Michael Tretter
1 sibling, 0 replies; 14+ messages in thread
From: Michael Tretter @ 2018-08-31 8:10 UTC (permalink / raw)
To: ptxdist; +Cc: Michael Tretter
The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
build the ivi shell module and separately also build the ivi-shell user
interface example.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Changes since v1:
- move depends on before select in configuration
- move mkdir in front of ifndef
- fix indentation
---
rules/weston.in | 14 ++++++++++++++
rules/weston.make | 40 ++++++++++++++++++++++++++++++++++++++--
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/rules/weston.in b/rules/weston.in
index 2e760740c..36ab6257b 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
help
Install the Weston configuration file into /etc/xdg/weston
+config WESTON_IVISHELL
+ bool
+ prompt "IVI-Shell"
+
+config WESTON_IVISHELL_EXAMPLE
+ bool
+ depends on WESTON_IVISHELL
+ select WESTON_INSTALL_CONFIG
+ prompt "install example IVI-Shell user interface"
+ help
+ Install the example hmi-controller, the IVI-Shell user interface
+ application, a few demo clients and the weston.ini configuration for
+ the IVI-Shell.
+
endif
diff --git a/rules/weston.make b/rules/weston.make
index c33d0814c..a60fa62b4 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -65,9 +65,9 @@ WESTON_CONF_OPT := \
--$(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_IVISHELL)-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
- --disable-demo-clients-install \
+ --$(call ptx/endis, PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
--with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
@@ -83,11 +83,18 @@ $(STATEDIR)/weston.install:
@$(call world/install, WESTON)
@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
+ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
@bindir="/usr/bin" \
abs_top_builddir="/usr/bin" \
libexecdir="/usr/libexec" \
ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+else
+ @bindir="/usr/bin" \
+ westondatadir="/usr/share/weston" \
+ ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
+ "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+endif
@$(call touch)
@@ -135,6 +142,9 @@ ifdef PTXCONF_WESTON_GL
endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
+ifdef PTXCONF_WESTON_IVISHELL
+ @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
+endif
ifdef PTXCONF_WESTON_SYSTEMD
@$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
endif
@@ -161,6 +171,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
@$(call install_alternative, weston, 0, 0, 0644, /etc/xdg/weston/weston.ini)
endif
+ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
+ @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-ivi-shell-user-interface)
+
+ @$(foreach image, \
+ background.png \
+ fullscreen.png \
+ home.png \
+ icon_ivi_clickdot.png \
+ icon_ivi_flower.png \
+ icon_ivi_simple-egl.png \
+ icon_ivi_simple-shm.png \
+ icon_ivi_smoke.png \
+ panel.png \
+ random.png \
+ sidebyside.png \
+ tiling.png, \
+ $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl))
+
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
+ @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
+endif
+
@$(call install_finish, weston)
@$(call touch)
--
2.18.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2018-08-31 8:10 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-27 13:29 [ptxdist] [PATCH 1/3] wayland: version bump 1.15.0 -> 1.16.0 Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 2/3] wayland-protocols: version bump 1.13 -> 1.16 Philipp Zabel
2018-08-27 13:29 ` [ptxdist] [PATCH 3/3] weston: version bump 4.0.0 -> 5.0.0 Philipp Zabel
2018-08-30 16:23 ` [ptxdist] [PATCH 1/3] weston: remove empty clean stage Michael Tretter
2018-08-30 16:23 ` [ptxdist] [PATCH 2/3] weston: install weston.ini into /etc Michael Tretter
2018-08-31 6:09 ` Ladislav Michl
2018-08-31 7:16 ` Michael Olbrich
2018-08-31 7:19 ` Michael Olbrich
2018-08-30 16:23 ` [ptxdist] [PATCH 3/3] weston: add IVI-Shell support Michael Tretter
2018-08-31 6:11 ` Ladislav Michl
2018-08-31 7:22 ` Michael Olbrich
2018-08-31 8:10 ` [ptxdist] [PATCH v2 1/3] weston: remove empty clean stage Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 2/3] weston: install weston.ini into /etc Michael Tretter
2018-08-31 8:10 ` [ptxdist] [PATCH v2 3/3] weston: add IVI-Shell support Michael Tretter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox