Clean conf/layer.conf

Change-Id: I21b62497b0aa670f209f732123169e4c503d0d91
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/conf/layer.conf b/conf/layer.conf
index e9f970a..e709be6 100644 (file)
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,46 +14,45 @@ PACKAGE_CLASSES = "package_rpm"
 
 INHERIT_DISTRO = "devshell sstate license"
 
+INHERIT += "metatizen"
+
 #262144=256(Mo)*1024
 IMAGE_ROOTFS_SIZE_ext3 = "262144"
-#EXTRA_IMAGECMD_ext2 += "-b 1024"
-#IMAGE_ROOTFS_EXTRA_SPACE = "6400"
 
+# Crosswalk third-party "angle" doesn't build with gcc 4.9
+# https://bugs.tizen.org/jira/browse/BTY-38
 GCCVERSION = "4.8%"
 
-PREFERRED_PROVIDER_rpmbuild = "rpm-native"
 PREFERRED_PROVIDER_libpam = "pam"
+DISTRO_FEATURES_append = " pam "
 PREFERRED_VERSION_pam = "git"
 
+DISTRO_FEATURES_remove = " x11"
+DISTRO_FEATURES_append = " wayland"
+WESTONSTARTUP ??= "weston-common"
+
+DEPENDS_remove =  "rpmresolve-native"
+PREFERRED_PROVIDER_rpmbuild = "rpm-native"
 DEPENDS_rpm-lang-all = "rpm-native"
 DEPENDS_rpminst = "rpm-native"
 DEPENDS_rpm-libs = "rpm-native"
 
 PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_VERSION_linux-yocto = "3.14.4+git%"
 
 DISTRO_FEATURES_append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
-DISTRO_FEATURES_append = " wayland"
-
-DISTRO_FEATURES_append = " pam "
-
 DISTRO_FEATURES_append = " ld-is-gold "
 
-DISTRO_FEATURES_remove = " x11"
-
-#PREFERRED_PROVIDER_python-dbus = "git"
 PREFERRED_PROVIDER_python-dbus = "dbus-python"
 
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
+
 LICENSE_FLAGS_WHITELIST += "commercial"
-PREFERRED_VERSION_libav = "9.13"
 
-PREFERRED_VERSION_linux-yocto = "3.14.4+git%"
+PREFERRED_VERSION_libav = "9.13"
 
-WESTONSTARTUP ??= "weston-common"
 IMAGECONFIG ??= "config-tizen-common"
 
-INHERIT += "metatizen"
-
 FILESYSTEM_PERMS_TABLES = "tizen-fs-perms.txt"