Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
---
meta-shr-distro/COPYING.MIT | 17 +++++++++++
meta-shr-distro/README | 33 ++++++++++++++++++++++
.../classes/shr-mirrors.bbclass | 0
.../conf/distro/include/defaulttunes.inc | 0
.../conf/distro/include/preferred-shr-versions.inc | 0
{meta-shr => meta-shr-distro}/conf/distro/shr.conf | 0
meta-shr-distro/conf/layer.conf | 19 +++++++++++++
.../files/fs-perms-shr.txt | 0
.../recipes-bsp/keymaps/keymaps_1.0.bbappend | 0
.../avahi/avahi-ui_0.6.31.bbappend | 0
.../avahi/avahi_0.6.31.bbappend | 0
.../recipes-connectivity/bind/bind_9.8.1.bbappend | 0
.../bluez/bluez4_4.101.bbappend | 0
.../midori/midori_0.5.2.bbappend | 0
.../recipes-core/base-files/base-files/motd | 0
.../recipes-core/base-files/base-files/profile | 0
.../base-files/base-files_3.0.14.bbappend | 0
.../recipes-core/busybox/busybox/defconfig | 0
.../recipes-core/busybox/busybox_1.21.1.bbappend | 0
.../init-ifupdown/init-ifupdown/shr/interfaces | 0
.../init-ifupdown/init-ifupdown_1.0.bbappend | 0
.../initscripts/initscripts/mountall.sh | 0
.../initscripts/initscripts/populate-volatile.sh | 0
.../recipes-core/initscripts/initscripts/volatiles | 0
.../initscripts/initscripts_1.0.bbappend | 0
.../recipes-core/meta/distro-feed-configs.bbappend | 0
.../packagegroups/packagegroup-base.bbappend | 0
.../packagegroups/packagegroup-core-boot.bbappend | 0
.../systemd/systemd-compat-units.bbappend | 0
.../recipes-efl/e17/enjoy_svn.bbappend | 0
.../recipes-efl/efl/entrance/entrance.conf | 0
.../recipes-efl/efl/entrance_svn.bbappend | 0
.../recipes-extended/screen/screen_4.0.3.bbappend | 0
.../shadow/shadow_4.1.4.3.bbappend | 0
.../recipes-graphics/libsdl/libsdl_1.2.15.bbappend | 0
.../xinput-calibrator/pointercal-xinput/qemuarm | 0
.../xinput-calibrator/pointercal-xinput/qemux86-64 | 0
.../pointercal-xinput/qemux86/pointercal.xinput | 0
.../pointercal-xinput_0.0.bbappend | 0
.../xserver-xf86-config/qemuarm/xorg.conf | 0
.../xserver-xf86-config/qemux86-64/xorg.conf | 0
.../xserver-xf86-config/qemux86/xorg.conf | 0
.../xorg-xserver/xserver-xf86-config_0.1.bbappend | 0
.../xorg-xserver/xserver-xorg/randr-support.patch | 0
.../xorg-xserver/xserver-xorg_1.14.0.bbappend | 0
.../modutils-initscripts.bbappend | 0
.../libsndfile/libsndfile1_1.0.25.bbappend | 0
.../recipes-multimedia/sox/sox_14.4.0.bbappend | 0
.../recipes-navigation/gpsd/gpsd_3.7.bbappend | 0
.../navit/navit/navit.launcher.sh | 0
.../recipes-navigation/navit/navit/navitD.png | 0
.../recipes-navigation/navit/navit/osd.xml | 0
.../recipes-navigation/navit/navit_svn.bbappend | 0
.../packagegroups/packagegroup-core-x11.bbappend | 0
.../recipes-support/libcap/libcap_2.22.bbappend | 0
meta-shr/README | 14 ++-------
meta-shr/conf/layer.conf | 10 -------
57 files changed, 72 insertions(+), 21 deletions(-)
create mode 100644 meta-shr-distro/COPYING.MIT
create mode 100644 meta-shr-distro/README
rename {meta-shr => meta-shr-distro}/classes/shr-mirrors.bbclass (100%)
rename {meta-shr => meta-shr-distro}/conf/distro/include/defaulttunes.inc
(100%)
rename {meta-shr =>
meta-shr-distro}/conf/distro/include/preferred-shr-versions.inc (100%)
rename {meta-shr => meta-shr-distro}/conf/distro/shr.conf (100%)
create mode 100644 meta-shr-distro/conf/layer.conf
rename {meta-shr => meta-shr-distro}/files/fs-perms-shr.txt (100%)
rename {meta-shr => meta-shr-distro}/recipes-bsp/keymaps/keymaps_1.0.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-connectivity/avahi/avahi-ui_0.6.31.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-connectivity/avahi/avahi_0.6.31.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-connectivity/bind/bind_9.8.1.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-connectivity/bluez/bluez4_4.101.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-connectivity/midori/midori_0.5.2.bbappend (100%)
rename {meta-shr => meta-shr-distro}/recipes-core/base-files/base-files/motd
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/base-files/base-files/profile (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/base-files/base-files_3.0.14.bbappend (100%)
rename {meta-shr => meta-shr-distro}/recipes-core/busybox/busybox/defconfig
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/busybox/busybox_1.21.1.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/init-ifupdown/init-ifupdown/shr/interfaces (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/initscripts/initscripts/mountall.sh (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/initscripts/initscripts/populate-volatile.sh
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/initscripts/initscripts/volatiles (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/initscripts/initscripts_1.0.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/meta/distro-feed-configs.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/packagegroups/packagegroup-base.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/packagegroups/packagegroup-core-boot.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-core/systemd/systemd-compat-units.bbappend (100%)
rename {meta-shr => meta-shr-distro}/recipes-efl/e17/enjoy_svn.bbappend (100%)
rename {meta-shr => meta-shr-distro}/recipes-efl/efl/entrance/entrance.conf
(100%)
rename {meta-shr => meta-shr-distro}/recipes-efl/efl/entrance_svn.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-extended/screen/screen_4.0.3.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-extended/shadow/shadow_4.1.4.3.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/libsdl/libsdl_1.2.15.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuarm
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86-64
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86/pointercal.xinput
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xorg/randr-support.patch
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-kernel/module-init-tools/modutils-initscripts.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-multimedia/sox/sox_14.4.0.bbappend (100%)
rename {meta-shr => meta-shr-distro}/recipes-navigation/gpsd/gpsd_3.7.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-navigation/navit/navit/navit.launcher.sh (100%)
rename {meta-shr => meta-shr-distro}/recipes-navigation/navit/navit/navitD.png
(100%)
rename {meta-shr => meta-shr-distro}/recipes-navigation/navit/navit/osd.xml
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-navigation/navit/navit_svn.bbappend (100%)
rename {meta-shr =>
meta-shr-distro}/recipes-sato/packagegroups/packagegroup-core-x11.bbappend
(100%)
rename {meta-shr =>
meta-shr-distro}/recipes-support/libcap/libcap_2.22.bbappend (100%)
diff --git a/meta-shr-distro/COPYING.MIT b/meta-shr-distro/COPYING.MIT
new file mode 100644
index 0000000..fb950dc
--- /dev/null
+++ b/meta-shr-distro/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/meta-shr-distro/README b/meta-shr-distro/README
new file mode 100644
index 0000000..a4c6b3c
--- /dev/null
+++ b/meta-shr-distro/README
@@ -0,0 +1,33 @@
+The SHR DISTRO OpenEmbedded layer
+This layer depends on:
+
+URI: git://github.com/shr-distribution/oe-core.git
+layers: meta
+branch: shr
+revision: HEAD
+
+URI: git://github.com/shr-distribution/meta-oe.git
+layers: meta-oe, meta-efl, meta-gnome, meta-gpe, meta-systemd
+branch: shr
+revision: HEAD
+
+URI: git://github.com/shr-distribution/meta-smartphone.git
+layers: meta-shr, meta-fso, meta-aurora
+branch: shr
+revision: HEAD
+
+It is recommended to follow the instruction at
+http://www.shr-project.org/trac/wiki/Building%20SHR
+
+After optional but recommended setup of shr-chroot
+"make setup-shr-chroot"
+you just setup shr-core repositories and environment settings with
+"make setup-shr-core"
+
+If you want to contribute changes, please follow
+http://www.shr-project.org/trac/wiki/Howto%20get%20my%20application%20in%20the%20SHR%20feed
+and send patches or pull requests to shr-devel@lists.shr-project.org with
prefix [meta-shr-distro].
+
+If you want to discuss this layer join us on #openmoko-cdevel on FreeNode IRC
network.
+
+Main layer maintainers: Martin 'JaMa' Jansa <martin.ja...@gmail.com>, Klaus
'mrmoku' Kurzmann <m...@fluxnetz.de>
diff --git a/meta-shr/classes/shr-mirrors.bbclass
b/meta-shr-distro/classes/shr-mirrors.bbclass
similarity index 100%
rename from meta-shr/classes/shr-mirrors.bbclass
rename to meta-shr-distro/classes/shr-mirrors.bbclass
diff --git a/meta-shr/conf/distro/include/defaulttunes.inc
b/meta-shr-distro/conf/distro/include/defaulttunes.inc
similarity index 100%
rename from meta-shr/conf/distro/include/defaulttunes.inc
rename to meta-shr-distro/conf/distro/include/defaulttunes.inc
diff --git a/meta-shr/conf/distro/include/preferred-shr-versions.inc
b/meta-shr-distro/conf/distro/include/preferred-shr-versions.inc
similarity index 100%
rename from meta-shr/conf/distro/include/preferred-shr-versions.inc
rename to meta-shr-distro/conf/distro/include/preferred-shr-versions.inc
diff --git a/meta-shr/conf/distro/shr.conf
b/meta-shr-distro/conf/distro/shr.conf
similarity index 100%
rename from meta-shr/conf/distro/shr.conf
rename to meta-shr-distro/conf/distro/shr.conf
diff --git a/meta-shr-distro/conf/layer.conf b/meta-shr-distro/conf/layer.conf
new file mode 100644
index 0000000..bb2ffc4
--- /dev/null
+++ b/meta-shr-distro/conf/layer.conf
@@ -0,0 +1,19 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "shr-distro-layer"
+BBFILE_PATTERN_shr-distro-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_shr-distro-layer = "7"
+
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
+ intone->mplayer2 \
+ intone->mplayer \
+ mplayer2->linux-gta04 \
+ mplayer2->linux-openmoko \
+ mplayer2->linux-nokia900-meego \
+ mplayer2->linux-samsung-crespo \
+ mplayer2->linux-palmpre \
+"
diff --git a/meta-shr/files/fs-perms-shr.txt
b/meta-shr-distro/files/fs-perms-shr.txt
similarity index 100%
rename from meta-shr/files/fs-perms-shr.txt
rename to meta-shr-distro/files/fs-perms-shr.txt
diff --git a/meta-shr/recipes-bsp/keymaps/keymaps_1.0.bbappend
b/meta-shr-distro/recipes-bsp/keymaps/keymaps_1.0.bbappend
similarity index 100%
rename from meta-shr/recipes-bsp/keymaps/keymaps_1.0.bbappend
rename to meta-shr-distro/recipes-bsp/keymaps/keymaps_1.0.bbappend
diff --git a/meta-shr/recipes-connectivity/avahi/avahi-ui_0.6.31.bbappend
b/meta-shr-distro/recipes-connectivity/avahi/avahi-ui_0.6.31.bbappend
similarity index 100%
rename from meta-shr/recipes-connectivity/avahi/avahi-ui_0.6.31.bbappend
rename to meta-shr-distro/recipes-connectivity/avahi/avahi-ui_0.6.31.bbappend
diff --git a/meta-shr/recipes-connectivity/avahi/avahi_0.6.31.bbappend
b/meta-shr-distro/recipes-connectivity/avahi/avahi_0.6.31.bbappend
similarity index 100%
rename from meta-shr/recipes-connectivity/avahi/avahi_0.6.31.bbappend
rename to meta-shr-distro/recipes-connectivity/avahi/avahi_0.6.31.bbappend
diff --git a/meta-shr/recipes-connectivity/bind/bind_9.8.1.bbappend
b/meta-shr-distro/recipes-connectivity/bind/bind_9.8.1.bbappend
similarity index 100%
rename from meta-shr/recipes-connectivity/bind/bind_9.8.1.bbappend
rename to meta-shr-distro/recipes-connectivity/bind/bind_9.8.1.bbappend
diff --git a/meta-shr/recipes-connectivity/bluez/bluez4_4.101.bbappend
b/meta-shr-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend
similarity index 100%
rename from meta-shr/recipes-connectivity/bluez/bluez4_4.101.bbappend
rename to meta-shr-distro/recipes-connectivity/bluez/bluez4_4.101.bbappend
diff --git a/meta-shr/recipes-connectivity/midori/midori_0.5.2.bbappend
b/meta-shr-distro/recipes-connectivity/midori/midori_0.5.2.bbappend
similarity index 100%
rename from meta-shr/recipes-connectivity/midori/midori_0.5.2.bbappend
rename to meta-shr-distro/recipes-connectivity/midori/midori_0.5.2.bbappend
diff --git a/meta-shr/recipes-core/base-files/base-files/motd
b/meta-shr-distro/recipes-core/base-files/base-files/motd
similarity index 100%
rename from meta-shr/recipes-core/base-files/base-files/motd
rename to meta-shr-distro/recipes-core/base-files/base-files/motd
diff --git a/meta-shr/recipes-core/base-files/base-files/profile
b/meta-shr-distro/recipes-core/base-files/base-files/profile
similarity index 100%
rename from meta-shr/recipes-core/base-files/base-files/profile
rename to meta-shr-distro/recipes-core/base-files/base-files/profile
diff --git a/meta-shr/recipes-core/base-files/base-files_3.0.14.bbappend
b/meta-shr-distro/recipes-core/base-files/base-files_3.0.14.bbappend
similarity index 100%
rename from meta-shr/recipes-core/base-files/base-files_3.0.14.bbappend
rename to meta-shr-distro/recipes-core/base-files/base-files_3.0.14.bbappend
diff --git a/meta-shr/recipes-core/busybox/busybox/defconfig
b/meta-shr-distro/recipes-core/busybox/busybox/defconfig
similarity index 100%
rename from meta-shr/recipes-core/busybox/busybox/defconfig
rename to meta-shr-distro/recipes-core/busybox/busybox/defconfig
diff --git a/meta-shr/recipes-core/busybox/busybox_1.21.1.bbappend
b/meta-shr-distro/recipes-core/busybox/busybox_1.21.1.bbappend
similarity index 100%
rename from meta-shr/recipes-core/busybox/busybox_1.21.1.bbappend
rename to meta-shr-distro/recipes-core/busybox/busybox_1.21.1.bbappend
diff --git a/meta-shr/recipes-core/init-ifupdown/init-ifupdown/shr/interfaces
b/meta-shr-distro/recipes-core/init-ifupdown/init-ifupdown/shr/interfaces
similarity index 100%
rename from meta-shr/recipes-core/init-ifupdown/init-ifupdown/shr/interfaces
rename to
meta-shr-distro/recipes-core/init-ifupdown/init-ifupdown/shr/interfaces
diff --git a/meta-shr/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
b/meta-shr-distro/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
similarity index 100%
rename from meta-shr/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
rename to meta-shr-distro/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
diff --git a/meta-shr/recipes-core/initscripts/initscripts/mountall.sh
b/meta-shr-distro/recipes-core/initscripts/initscripts/mountall.sh
similarity index 100%
rename from meta-shr/recipes-core/initscripts/initscripts/mountall.sh
rename to meta-shr-distro/recipes-core/initscripts/initscripts/mountall.sh
diff --git a/meta-shr/recipes-core/initscripts/initscripts/populate-volatile.sh
b/meta-shr-distro/recipes-core/initscripts/initscripts/populate-volatile.sh
similarity index 100%
rename from meta-shr/recipes-core/initscripts/initscripts/populate-volatile.sh
rename to
meta-shr-distro/recipes-core/initscripts/initscripts/populate-volatile.sh
diff --git a/meta-shr/recipes-core/initscripts/initscripts/volatiles
b/meta-shr-distro/recipes-core/initscripts/initscripts/volatiles
similarity index 100%
rename from meta-shr/recipes-core/initscripts/initscripts/volatiles
rename to meta-shr-distro/recipes-core/initscripts/initscripts/volatiles
diff --git a/meta-shr/recipes-core/initscripts/initscripts_1.0.bbappend
b/meta-shr-distro/recipes-core/initscripts/initscripts_1.0.bbappend
similarity index 100%
rename from meta-shr/recipes-core/initscripts/initscripts_1.0.bbappend
rename to meta-shr-distro/recipes-core/initscripts/initscripts_1.0.bbappend
diff --git a/meta-shr/recipes-core/meta/distro-feed-configs.bbappend
b/meta-shr-distro/recipes-core/meta/distro-feed-configs.bbappend
similarity index 100%
rename from meta-shr/recipes-core/meta/distro-feed-configs.bbappend
rename to meta-shr-distro/recipes-core/meta/distro-feed-configs.bbappend
diff --git a/meta-shr/recipes-core/packagegroups/packagegroup-base.bbappend
b/meta-shr-distro/recipes-core/packagegroups/packagegroup-base.bbappend
similarity index 100%
rename from meta-shr/recipes-core/packagegroups/packagegroup-base.bbappend
rename to meta-shr-distro/recipes-core/packagegroups/packagegroup-base.bbappend
diff --git
a/meta-shr/recipes-core/packagegroups/packagegroup-core-boot.bbappend
b/meta-shr-distro/recipes-core/packagegroups/packagegroup-core-boot.bbappend
similarity index 100%
rename from meta-shr/recipes-core/packagegroups/packagegroup-core-boot.bbappend
rename to
meta-shr-distro/recipes-core/packagegroups/packagegroup-core-boot.bbappend
diff --git a/meta-shr/recipes-core/systemd/systemd-compat-units.bbappend
b/meta-shr-distro/recipes-core/systemd/systemd-compat-units.bbappend
similarity index 100%
rename from meta-shr/recipes-core/systemd/systemd-compat-units.bbappend
rename to meta-shr-distro/recipes-core/systemd/systemd-compat-units.bbappend
diff --git a/meta-shr/recipes-efl/e17/enjoy_svn.bbappend
b/meta-shr-distro/recipes-efl/e17/enjoy_svn.bbappend
similarity index 100%
rename from meta-shr/recipes-efl/e17/enjoy_svn.bbappend
rename to meta-shr-distro/recipes-efl/e17/enjoy_svn.bbappend
diff --git a/meta-shr/recipes-efl/efl/entrance/entrance.conf
b/meta-shr-distro/recipes-efl/efl/entrance/entrance.conf
similarity index 100%
rename from meta-shr/recipes-efl/efl/entrance/entrance.conf
rename to meta-shr-distro/recipes-efl/efl/entrance/entrance.conf
diff --git a/meta-shr/recipes-efl/efl/entrance_svn.bbappend
b/meta-shr-distro/recipes-efl/efl/entrance_svn.bbappend
similarity index 100%
rename from meta-shr/recipes-efl/efl/entrance_svn.bbappend
rename to meta-shr-distro/recipes-efl/efl/entrance_svn.bbappend
diff --git a/meta-shr/recipes-extended/screen/screen_4.0.3.bbappend
b/meta-shr-distro/recipes-extended/screen/screen_4.0.3.bbappend
similarity index 100%
rename from meta-shr/recipes-extended/screen/screen_4.0.3.bbappend
rename to meta-shr-distro/recipes-extended/screen/screen_4.0.3.bbappend
diff --git a/meta-shr/recipes-extended/shadow/shadow_4.1.4.3.bbappend
b/meta-shr-distro/recipes-extended/shadow/shadow_4.1.4.3.bbappend
similarity index 100%
rename from meta-shr/recipes-extended/shadow/shadow_4.1.4.3.bbappend
rename to meta-shr-distro/recipes-extended/shadow/shadow_4.1.4.3.bbappend
diff --git a/meta-shr/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
b/meta-shr-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
similarity index 100%
rename from meta-shr/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
rename to meta-shr-distro/recipes-graphics/libsdl/libsdl_1.2.15.bbappend
diff --git
a/meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuarm
b/meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuarm
similarity index 100%
rename from
meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuarm
rename to
meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuarm
diff --git
a/meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86-64
b/meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86-64
similarity index 100%
rename from
meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86-64
rename to
meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86-64
diff --git
a/meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86/pointercal.xinput
b/meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86/pointercal.xinput
similarity index 100%
rename from
meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86/pointercal.xinput
rename to
meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput/qemux86/pointercal.xinput
diff --git
a/meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
b/meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
similarity index 100%
rename from
meta-shr/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
rename to
meta-shr-distro/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
similarity index 100%
rename from
meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
similarity index 100%
rename from
meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
similarity index 100%
rename from
meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
similarity index 100%
rename from
meta-shr/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xorg/randr-support.patch
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xorg/randr-support.patch
similarity index 100%
rename from
meta-shr/recipes-graphics/xorg-xserver/xserver-xorg/randr-support.patch
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xorg/randr-support.patch
diff --git
a/meta-shr/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bbappend
b/meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bbappend
similarity index 100%
rename from meta-shr/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bbappend
rename to
meta-shr-distro/recipes-graphics/xorg-xserver/xserver-xorg_1.14.0.bbappend
diff --git
a/meta-shr/recipes-kernel/module-init-tools/modutils-initscripts.bbappend
b/meta-shr-distro/recipes-kernel/module-init-tools/modutils-initscripts.bbappend
similarity index 100%
rename from
meta-shr/recipes-kernel/module-init-tools/modutils-initscripts.bbappend
rename to
meta-shr-distro/recipes-kernel/module-init-tools/modutils-initscripts.bbappend
diff --git a/meta-shr/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bbappend
b/meta-shr-distro/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bbappend
similarity index 100%
rename from meta-shr/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bbappend
rename to
meta-shr-distro/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bbappend
diff --git a/meta-shr/recipes-multimedia/sox/sox_14.4.0.bbappend
b/meta-shr-distro/recipes-multimedia/sox/sox_14.4.0.bbappend
similarity index 100%
rename from meta-shr/recipes-multimedia/sox/sox_14.4.0.bbappend
rename to meta-shr-distro/recipes-multimedia/sox/sox_14.4.0.bbappend
diff --git a/meta-shr/recipes-navigation/gpsd/gpsd_3.7.bbappend
b/meta-shr-distro/recipes-navigation/gpsd/gpsd_3.7.bbappend
similarity index 100%
rename from meta-shr/recipes-navigation/gpsd/gpsd_3.7.bbappend
rename to meta-shr-distro/recipes-navigation/gpsd/gpsd_3.7.bbappend
diff --git a/meta-shr/recipes-navigation/navit/navit/navit.launcher.sh
b/meta-shr-distro/recipes-navigation/navit/navit/navit.launcher.sh
similarity index 100%
rename from meta-shr/recipes-navigation/navit/navit/navit.launcher.sh
rename to meta-shr-distro/recipes-navigation/navit/navit/navit.launcher.sh
diff --git a/meta-shr/recipes-navigation/navit/navit/navitD.png
b/meta-shr-distro/recipes-navigation/navit/navit/navitD.png
similarity index 100%
rename from meta-shr/recipes-navigation/navit/navit/navitD.png
rename to meta-shr-distro/recipes-navigation/navit/navit/navitD.png
diff --git a/meta-shr/recipes-navigation/navit/navit/osd.xml
b/meta-shr-distro/recipes-navigation/navit/navit/osd.xml
similarity index 100%
rename from meta-shr/recipes-navigation/navit/navit/osd.xml
rename to meta-shr-distro/recipes-navigation/navit/navit/osd.xml
diff --git a/meta-shr/recipes-navigation/navit/navit_svn.bbappend
b/meta-shr-distro/recipes-navigation/navit/navit_svn.bbappend
similarity index 100%
rename from meta-shr/recipes-navigation/navit/navit_svn.bbappend
rename to meta-shr-distro/recipes-navigation/navit/navit_svn.bbappend
diff --git a/meta-shr/recipes-sato/packagegroups/packagegroup-core-x11.bbappend
b/meta-shr-distro/recipes-sato/packagegroups/packagegroup-core-x11.bbappend
similarity index 100%
rename from meta-shr/recipes-sato/packagegroups/packagegroup-core-x11.bbappend
rename to
meta-shr-distro/recipes-sato/packagegroups/packagegroup-core-x11.bbappend
diff --git a/meta-shr/recipes-support/libcap/libcap_2.22.bbappend
b/meta-shr-distro/recipes-support/libcap/libcap_2.22.bbappend
similarity index 100%
rename from meta-shr/recipes-support/libcap/libcap_2.22.bbappend
rename to meta-shr-distro/recipes-support/libcap/libcap_2.22.bbappend
diff --git a/meta-shr/README b/meta-shr/README
index a576203..a603722 100644
--- a/meta-shr/README
+++ b/meta-shr/README
@@ -1,4 +1,4 @@
-The SHR OpenEmbedded layer
+The SHR Apps OpenEmbedded layer
This layer depends on:
URI: git://github.com/shr-distribution/oe-core.git
@@ -7,23 +7,15 @@ branch: shr
revision: HEAD
URI: git://github.com/shr-distribution/meta-oe.git
-layers: meta-oe, meta-efl, meta-gnome, meta-gpe, meta-systemd
+layers: meta-oe, meta-efl
branch: shr
revision: HEAD
URI: git://github.com/shr-distribution/meta-smartphone.git
-layers: meta-fso, meta-aurora
+layers: meta-fso
branch: shr
revision: HEAD
-It is recommended to follow the instruction at
-http://www.shr-project.org/trac/wiki/Building%20SHR
-
-After optional but recommended setup of shr-chroot
-"make setup-shr-chroot"
-you just setup shr-core repositories and environment settings with
-"make setup-shr-core"
-
If you want to contribute changes, please follow
http://www.shr-project.org/trac/wiki/Howto%20get%20my%20application%20in%20the%20SHR%20feed
and send patches or pull requests to shr-devel@lists.shr-project.org with
prefix [meta-shr].
diff --git a/meta-shr/conf/layer.conf b/meta-shr/conf/layer.conf
index a488aea..65eff70 100644
--- a/meta-shr/conf/layer.conf
+++ b/meta-shr/conf/layer.conf
@@ -16,13 +16,3 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += "\
e-wm-config-illume2-shr \
shr-settings \
"
-
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
- intone->mplayer2 \
- intone->mplayer \
- mplayer2->linux-gta04 \
- mplayer2->linux-openmoko \
- mplayer2->linux-nokia900-meego \
- mplayer2->linux-samsung-crespo \
- mplayer2->linux-palmpre \
-"
--
1.8.3.2
_______________________________________________
Shr-devel mailing list
Shr-devel@lists.shr-project.org
http://lists.shr-project.org/mailman/listinfo/shr-devel
