diff mbox

[02/30] package/matchbox: make matchbox-wm a real package

Message ID 2a2829fef33255a90ea0989d2fbd1a2cc67b7825.1429725549.git.yann.morin.1998@free.fr
State Changes Requested
Headers show

Commit Message

Yann E. MORIN April 22, 2015, 6:09 p.m. UTC
Similarly to what we just did for matchbox-lib, we make matchbox-wm a
real package.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/matchbox/Config.in             | 2 ++
 package/matchbox/matchbox-wm/Config.in | 3 +++
 package/matchbox/matchbox.mk           | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 package/matchbox/matchbox-wm/Config.in

Comments

Arnout Vandecappelle April 23, 2015, 9:35 p.m. UTC | #1
On 04/22/15 20:09, Yann E. MORIN wrote:
> Similarly to what we just did for matchbox-lib, we make matchbox-wm a
> real package.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 (on condition that it goes to package/matchbox-wm)

 Regards,
 Arnout

> ---
>  package/matchbox/Config.in             | 2 ++
>  package/matchbox/matchbox-wm/Config.in | 3 +++
>  package/matchbox/matchbox.mk           | 1 -
>  3 files changed, 5 insertions(+), 1 deletion(-)
>  create mode 100644 package/matchbox/matchbox-wm/Config.in
> 
> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
> index 70cc168..15b1017 100644
> --- a/package/matchbox/Config.in
> +++ b/package/matchbox/Config.in
> @@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX
>  	select BR2_PACKAGE_XLIB_LIBXDAMAGE
>  	select BR2_PACKAGE_XLIB_LIBXCURSOR
>  	select BR2_PACKAGE_MATCHBOX_LIB
> +	select BR2_PACKAGE_MATCHBOX_WM
>  	help
>  	  Matchbox is an Open Source base environment for the X Window
>  	  System running on non-desktop embedded platforms such as
> @@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX
>  if BR2_PACKAGE_MATCHBOX
>  
>  source "package/matchbox/matchbox-lib/Config.in"
> +source "package/matchbox/matchbox-wm/Config.in"
>  
>  config BR2_PACKAGE_MATCHBOX_PANEL
>  	bool "Matchbox Panel"
> diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
> new file mode 100644
> index 0000000..6ad5dfc
> --- /dev/null
> +++ b/package/matchbox/matchbox-wm/Config.in
> @@ -0,0 +1,3 @@
> +config BR2_PACKAGE_MATCHBOX_WM
> +	bool
> +	select BR2_PACKAGE_MATCHBOX_LIB
> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
> index e367df2..17d89d8 100644
> --- a/package/matchbox/matchbox.mk
> +++ b/package/matchbox/matchbox.mk
> @@ -1,4 +1,3 @@
>  ifeq ($(BR2_PACKAGE_MATCHBOX),y)
>  include $(sort $(wildcard package/matchbox/*/*.mk))
> -PACKAGES += matchbox-wm
>  endif
>
Arnout Vandecappelle April 23, 2015, 9:44 p.m. UTC | #2
On 04/23/15 23:35, Arnout Vandecappelle wrote:
> On 04/22/15 20:09, Yann E. MORIN wrote:
>> Similarly to what we just did for matchbox-lib, we make matchbox-wm a
>> real package.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> 
>  (on condition that it goes to package/matchbox-wm)

 As discussed on IRC: moving all matchbox packages one directory up is for a
later patch, so this patch is good as it is.

 Regards,
 Arnout

> 
>  Regards,
>  Arnout
> 
>> ---
>>  package/matchbox/Config.in             | 2 ++
>>  package/matchbox/matchbox-wm/Config.in | 3 +++
>>  package/matchbox/matchbox.mk           | 1 -
>>  3 files changed, 5 insertions(+), 1 deletion(-)
>>  create mode 100644 package/matchbox/matchbox-wm/Config.in
>>
>> diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
>> index 70cc168..15b1017 100644
>> --- a/package/matchbox/Config.in
>> +++ b/package/matchbox/Config.in
>> @@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX
>>  	select BR2_PACKAGE_XLIB_LIBXDAMAGE
>>  	select BR2_PACKAGE_XLIB_LIBXCURSOR
>>  	select BR2_PACKAGE_MATCHBOX_LIB
>> +	select BR2_PACKAGE_MATCHBOX_WM
>>  	help
>>  	  Matchbox is an Open Source base environment for the X Window
>>  	  System running on non-desktop embedded platforms such as
>> @@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX
>>  if BR2_PACKAGE_MATCHBOX
>>  
>>  source "package/matchbox/matchbox-lib/Config.in"
>> +source "package/matchbox/matchbox-wm/Config.in"
>>  
>>  config BR2_PACKAGE_MATCHBOX_PANEL
>>  	bool "Matchbox Panel"
>> diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
>> new file mode 100644
>> index 0000000..6ad5dfc
>> --- /dev/null
>> +++ b/package/matchbox/matchbox-wm/Config.in
>> @@ -0,0 +1,3 @@
>> +config BR2_PACKAGE_MATCHBOX_WM
>> +	bool
>> +	select BR2_PACKAGE_MATCHBOX_LIB
>> diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
>> index e367df2..17d89d8 100644
>> --- a/package/matchbox/matchbox.mk
>> +++ b/package/matchbox/matchbox.mk
>> @@ -1,4 +1,3 @@
>>  ifeq ($(BR2_PACKAGE_MATCHBOX),y)
>>  include $(sort $(wildcard package/matchbox/*/*.mk))
>> -PACKAGES += matchbox-wm
>>  endif
>>
> 
>
diff mbox

Patch

diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 70cc168..15b1017 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -8,6 +8,7 @@  config BR2_PACKAGE_MATCHBOX
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE
 	select BR2_PACKAGE_XLIB_LIBXCURSOR
 	select BR2_PACKAGE_MATCHBOX_LIB
+	select BR2_PACKAGE_MATCHBOX_WM
 	help
 	  Matchbox is an Open Source base environment for the X Window
 	  System running on non-desktop embedded platforms such as
@@ -19,6 +20,7 @@  config BR2_PACKAGE_MATCHBOX
 if BR2_PACKAGE_MATCHBOX
 
 source "package/matchbox/matchbox-lib/Config.in"
+source "package/matchbox/matchbox-wm/Config.in"
 
 config BR2_PACKAGE_MATCHBOX_PANEL
 	bool "Matchbox Panel"
diff --git a/package/matchbox/matchbox-wm/Config.in b/package/matchbox/matchbox-wm/Config.in
new file mode 100644
index 0000000..6ad5dfc
--- /dev/null
+++ b/package/matchbox/matchbox-wm/Config.in
@@ -0,0 +1,3 @@ 
+config BR2_PACKAGE_MATCHBOX_WM
+	bool
+	select BR2_PACKAGE_MATCHBOX_LIB
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index e367df2..17d89d8 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,4 +1,3 @@ 
 ifeq ($(BR2_PACKAGE_MATCHBOX),y)
 include $(sort $(wildcard package/matchbox/*/*.mk))
-PACKAGES += matchbox-wm
 endif