aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:30 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 23:02:31 +0200
commit3b468acbb4ec2aca748fc022ff0d53a530b3264b (patch)
tree08f312289bb132bcb62d974852dc3d66529f873b
parent390ef4ebb441c263f16572e458c71bde35d01c58 (diff)
downloadbuildroot-3b468acbb4ec2aca748fc022ff0d53a530b3264b.tar.gz
buildroot-3b468acbb4ec2aca748fc022ff0d53a530b3264b.tar.bz2
package/matchbox-common: move one directory higher
We usually do not have a sub-directory for a family of related packages, so move matchbox packages one directory higher, so they all are in packages/ Also re-order packages alphabetically. Reported-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/matchbox-common/Config.in (renamed from package/matchbox/matchbox-common/Config.in)0
-rw-r--r--package/matchbox-common/matchbox-common.hash (renamed from package/matchbox/matchbox-common/matchbox-common.hash)0
-rw-r--r--package/matchbox-common/matchbox-common.mk (renamed from package/matchbox/matchbox-common/matchbox-common.mk)0
-rw-r--r--package/matchbox-desktop/Config.in (renamed from package/matchbox/matchbox-desktop/Config.in)0
-rw-r--r--package/matchbox-desktop/matchbox-desktop.hash (renamed from package/matchbox/matchbox-desktop/matchbox-desktop.hash)0
-rw-r--r--package/matchbox-desktop/matchbox-desktop.mk (renamed from package/matchbox/matchbox-desktop/matchbox-desktop.mk)0
-rw-r--r--package/matchbox-fakekey/Config.in (renamed from package/matchbox/matchbox-fakekey/Config.in)0
-rw-r--r--package/matchbox-fakekey/matchbox-fakekey.hash (renamed from package/matchbox/matchbox-fakekey/matchbox-fakekey.hash)0
-rw-r--r--package/matchbox-fakekey/matchbox-fakekey.mk (renamed from package/matchbox/matchbox-fakekey/matchbox-fakekey.mk)0
-rw-r--r--package/matchbox-keyboard/Config.in (renamed from package/matchbox/matchbox-keyboard/Config.in)0
-rw-r--r--package/matchbox-keyboard/matchbox-keyboard.hash (renamed from package/matchbox/matchbox-keyboard/matchbox-keyboard.hash)0
-rw-r--r--package/matchbox-keyboard/matchbox-keyboard.mk (renamed from package/matchbox/matchbox-keyboard/matchbox-keyboard.mk)2
-rw-r--r--package/matchbox-keyboard/mb-applet-kbd-wrapper.sh (renamed from package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh)0
-rw-r--r--package/matchbox-lib/0001-index-is-legacy.patch (renamed from package/matchbox/matchbox-lib/0001-index-is-legacy.patch)0
-rw-r--r--package/matchbox-lib/0002-libpng15.patch (renamed from package/matchbox/matchbox-lib/0002-libpng15.patch)0
-rw-r--r--package/matchbox-lib/0003-include-setjmp-h.patch (renamed from package/matchbox/matchbox-lib/0003-include-setjmp-h.patch)0
-rw-r--r--package/matchbox-lib/Config.in (renamed from package/matchbox/matchbox-lib/Config.in)0
-rw-r--r--package/matchbox-lib/matchbox-lib.hash (renamed from package/matchbox/matchbox-lib/matchbox-lib.hash)0
-rw-r--r--package/matchbox-lib/matchbox-lib.mk (renamed from package/matchbox/matchbox-lib/matchbox-lib.mk)0
-rw-r--r--package/matchbox-panel/0001-index-is-legacy.patch (renamed from package/matchbox/matchbox-panel/0001-index-is-legacy.patch)0
-rw-r--r--package/matchbox-panel/0002-mb-applet-wireless.patch (renamed from package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch)0
-rw-r--r--package/matchbox-panel/Config.in (renamed from package/matchbox/matchbox-panel/Config.in)0
-rw-r--r--package/matchbox-panel/matchbox-panel.hash (renamed from package/matchbox/matchbox-panel/matchbox-panel.hash)0
-rw-r--r--package/matchbox-panel/matchbox-panel.mk (renamed from package/matchbox/matchbox-panel/matchbox-panel.mk)0
-rw-r--r--package/matchbox-startup-monitor/0001-true-false.patch (renamed from package/matchbox/matchbox-startup-monitor/0001-true-false.patch)0
-rw-r--r--package/matchbox-startup-monitor/Config.in (renamed from package/matchbox/matchbox-startup-monitor/Config.in)0
-rw-r--r--package/matchbox-startup-monitor/matchbox-startup-monitor.hash (renamed from package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash)0
-rw-r--r--package/matchbox-startup-monitor/matchbox-startup-monitor.mk (renamed from package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk)0
-rw-r--r--package/matchbox/Config.in14
-rw-r--r--package/matchbox/matchbox.mk3
30 files changed, 8 insertions, 11 deletions
diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox-common/Config.in
index 7d22d05f19..7d22d05f19 100644
--- a/package/matchbox/matchbox-common/Config.in
+++ b/package/matchbox-common/Config.in
diff --git a/package/matchbox/matchbox-common/matchbox-common.hash b/package/matchbox-common/matchbox-common.hash
index 619d8473c0..619d8473c0 100644
--- a/package/matchbox/matchbox-common/matchbox-common.hash
+++ b/package/matchbox-common/matchbox-common.hash
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox-common/matchbox-common.mk
index da6bec7135..da6bec7135 100644
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox-common/matchbox-common.mk
diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox-desktop/Config.in
index c9fd196134..c9fd196134 100644
--- a/package/matchbox/matchbox-desktop/Config.in
+++ b/package/matchbox-desktop/Config.in
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.hash b/package/matchbox-desktop/matchbox-desktop.hash
index e48a4a955c..e48a4a955c 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.hash
+++ b/package/matchbox-desktop/matchbox-desktop.hash
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox-desktop/matchbox-desktop.mk
index a703a18e55..a703a18e55 100644
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox-desktop/matchbox-desktop.mk
diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox-fakekey/Config.in
index 334f3a2a33..334f3a2a33 100644
--- a/package/matchbox/matchbox-fakekey/Config.in
+++ b/package/matchbox-fakekey/Config.in
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash
index 3e8778a6e1..3e8778a6e1 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.hash
+++ b/package/matchbox-fakekey/matchbox-fakekey.hash
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk
index ea8e6dcd61..ea8e6dcd61 100644
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox-fakekey/matchbox-fakekey.mk
diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in
index e017358b35..e017358b35 100644
--- a/package/matchbox/matchbox-keyboard/Config.in
+++ b/package/matchbox-keyboard/Config.in
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.hash b/package/matchbox-keyboard/matchbox-keyboard.hash
index 76997b0da3..76997b0da3 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.hash
+++ b/package/matchbox-keyboard/matchbox-keyboard.hash
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk
index 2017730ccc..fcdd8b1390 100644
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox-keyboard/matchbox-keyboard.mk
@@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
- $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh
+ $(INSTALL) -D -m 0755 package/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh
endef
MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
diff --git a/package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh b/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh
index be202b5d65..be202b5d65 100644
--- a/package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh
+++ b/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh
diff --git a/package/matchbox/matchbox-lib/0001-index-is-legacy.patch b/package/matchbox-lib/0001-index-is-legacy.patch
index b486fb18d4..b486fb18d4 100644
--- a/package/matchbox/matchbox-lib/0001-index-is-legacy.patch
+++ b/package/matchbox-lib/0001-index-is-legacy.patch
diff --git a/package/matchbox/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch
index 3d68573b5f..3d68573b5f 100644
--- a/package/matchbox/matchbox-lib/0002-libpng15.patch
+++ b/package/matchbox-lib/0002-libpng15.patch
diff --git a/package/matchbox/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch
index 72e1e45d8f..72e1e45d8f 100644
--- a/package/matchbox/matchbox-lib/0003-include-setjmp-h.patch
+++ b/package/matchbox-lib/0003-include-setjmp-h.patch
diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox-lib/Config.in
index 480e6fe4b2..480e6fe4b2 100644
--- a/package/matchbox/matchbox-lib/Config.in
+++ b/package/matchbox-lib/Config.in
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash
index 6f3a6531ee..6f3a6531ee 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.hash
+++ b/package/matchbox-lib/matchbox-lib.hash
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk
index 3b697bbc5f..3b697bbc5f 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox-lib/matchbox-lib.mk
diff --git a/package/matchbox/matchbox-panel/0001-index-is-legacy.patch b/package/matchbox-panel/0001-index-is-legacy.patch
index 925c326e71..925c326e71 100644
--- a/package/matchbox/matchbox-panel/0001-index-is-legacy.patch
+++ b/package/matchbox-panel/0001-index-is-legacy.patch
diff --git a/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch b/package/matchbox-panel/0002-mb-applet-wireless.patch
index 93633b367e..93633b367e 100644
--- a/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch
+++ b/package/matchbox-panel/0002-mb-applet-wireless.patch
diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox-panel/Config.in
index e3daaf5fae..e3daaf5fae 100644
--- a/package/matchbox/matchbox-panel/Config.in
+++ b/package/matchbox-panel/Config.in
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.hash b/package/matchbox-panel/matchbox-panel.hash
index 82802a9982..82802a9982 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.hash
+++ b/package/matchbox-panel/matchbox-panel.hash
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox-panel/matchbox-panel.mk
index f7d699bdac..f7d699bdac 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox-panel/matchbox-panel.mk
diff --git a/package/matchbox/matchbox-startup-monitor/0001-true-false.patch b/package/matchbox-startup-monitor/0001-true-false.patch
index c92a0776b0..c92a0776b0 100644
--- a/package/matchbox/matchbox-startup-monitor/0001-true-false.patch
+++ b/package/matchbox-startup-monitor/0001-true-false.patch
diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox-startup-monitor/Config.in
index 95af5fc842..95af5fc842 100644
--- a/package/matchbox/matchbox-startup-monitor/Config.in
+++ b/package/matchbox-startup-monitor/Config.in
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash
index b08e228912..b08e228912 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash
+++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
index be572396d8..be572396d8 100644
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 7d06bb29aa..3d771d3cc6 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -18,12 +18,12 @@ config BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
-source "package/matchbox/matchbox-lib/Config.in"
-source "package/matchbox/matchbox-panel/Config.in"
-source "package/matchbox/matchbox-desktop/Config.in"
-source "package/matchbox/matchbox-common/Config.in"
-source "package/matchbox/matchbox-fakekey/Config.in"
-source "package/matchbox/matchbox-keyboard/Config.in"
-source "package/matchbox/matchbox-startup-monitor/Config.in"
+source "package/matchbox-common/Config.in"
+source "package/matchbox-desktop/Config.in"
+source "package/matchbox-fakekey/Config.in"
+source "package/matchbox-keyboard/Config.in"
+source "package/matchbox-lib/Config.in"
+source "package/matchbox-panel/Config.in"
+source "package/matchbox-startup-monitor/Config.in"
endif
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 100a633363..29e240eded 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -36,6 +36,3 @@ MATCHBOX_CONF_OPTS += --disable-startup-notification
endif
$(eval $(autotools-package))
-
-# After we called a package infra, we can include more files
-include $(sort $(wildcard package/matchbox/*/*.mk))