Move distro config from layer.conf to tizen.conf

Since Tizen is becoming a distribution instead of a layer, global
configuration needs to be moved from layer.conf to distro/tizen.conf.

Bug-Tizen: BTY-35 (relates to)
Change-Id: I90d61e4c445a2ad32a24de3e3e32dc4af51d3792
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

2 files changed, 34 insertions, 63 deletions

diff --git a/meta-tizen-common-base/conf/distro/tizen.conf b/meta-tizen-common-base/conf/distro/tizen.conf
index ec85bdb8..340eef1a 100644
--- a/meta-tizen-common-base/conf/distro/tizen.conf
+++ b/meta-tizen-common-base/conf/distro/tizen.conf
@@ -1,27 +1,42 @@
-include conf/distro/include/default-providers.inc
-include conf/distro/include/default-versions.inc
-include conf/distro/include/default-distrovars.inc
-include conf/distro/include/world-broken.inc
-
 DISTRO_NAME = "Tizen"
 DISTRO_VERSION = "3.0"
-DISTRO_FEATURES += "opengl"
 
-TCMODE ?= "default"
-require conf/distro/include/tcmode-${TCMODE}.inc
+TIZEN_DEFAULT_DISTRO_FEATURES = "largefile ptest multiarch"
+TIZEN_DEFAULT_DISTRO_FEATURES = "ld-is-gold pam wayland systemd opengl"
+TIZEN_DEFAULT_EXTRA_RRECOMMENDS = ""
+DISTRO_FEATURES_DEFAULT_remove = "x11"
+DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${TIZEN_DEFAULT_DISTRO_FEATURES}" 
+
+VIRTUAL-RUNTIME_init_manager = "systemd"
+
+PACKAGE_CLASSES ?= "package_rpm"
+INHERIT_DISTRO_remove = "debian"
+INHERIT_TIZEN = "metatizen"
+INHERIT ?= "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} ${INHERIT_TIZEN}"
+
+DEPENDS_rpm-lang-all = "rpm-native"
+DEPENDS_rpminst = "rpm-native"
+DEPENDS_rpm-libs = "rpm-native"
+
+#262144=256(Mo)*1024
+IMAGE_ROOTFS_SIZE_ext3 = "262144"
 
-TCLIBC ?= "glibc"
-require conf/distro/include/tclibc-${TCLIBC}.inc
+# Use weston from Tizen since it contains Tizen specific patches
+WESTONSTARTUP ??= "weston-common"
+IMAGECONFIG ??= "config-tizen-common"
 
-# Allow single libc distros to disable this code
-TCLIBCAPPEND ?= "-${TCLIBC}"
-TMPDIR .= "${TCLIBCAPPEND}"
+PREFERRED_PROVIDER_python-dbus = "dbus-python"
+PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
+PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
+PREFERRED_PROVIDER_libtdb = "tdb"
+PREFERRED_PROVIDER_make-native = "make-native"
+PREFERRED_PROVIDER_python-setuptools = "python-setuptools"
+PREFERRED_PROVIDER_rpmbuild = "rpm-native"
+PREFERRED_PROVIDER_libpam = "pam"
+PREFERRED_PROVIDER_pciutils-ids = "pciutils"
 
-CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE', True))][bool(d.getVar('MACHINE', True))]}${@['', '/' + str(d.getVar('SDKMACHINE', True))][bool(d.getVar('SDKMACHINE', True))]}"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
-USER_CLASSES ?= ""
-PACKAGE_CLASSES ?= "package_ipk"
-INHERIT_BLACKLIST = "blacklist"
-INHERIT_DISTRO ?= "debian devshell sstate license"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}"
+LICENSE_FLAGS_WHITELIST += "commercial"
 
+SYS_CTLR_PROVIDER = "murphy"
diff --git a/meta-tizen-common-base/conf/layer.conf b/meta-tizen-common-base/conf/layer.conf
index 6e906ecc..8c48f762 100644
--- a/meta-tizen-common-base/conf/layer.conf
+++ b/meta-tizen-common-base/conf/layer.conf
@@ -9,47 +9,3 @@ BBFILES := "${BBFILES} \
 BBFILE_COLLECTIONS += "meta-tizen-common-base"
 BBFILE_PATTERN_meta-tizen-common-base := "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-tizen-common-base = "8"
-
-PACKAGE_CLASSES = "package_rpm"
-
-INHERIT_DISTRO = "devshell sstate license"
-
-INHERIT += "metatizen"
-
-#262144=256(Mo)*1024
-IMAGE_ROOTFS_SIZE_ext3 = "262144"
-
-DISTRO_FEATURES_append = " pam "
-DISTRO_FEATURES_remove = " x11"
-DISTRO_FEATURES_append = " wayland"
-DISTRO_FEATURES_append = " ld-is-gold "
-DISTRO_FEATURES_append = " opengl "
-
-# Use weston from Tizen since it contains Tizen specific patches
-WESTONSTARTUP ??= "weston-common"
-
-DEPENDS_remove =  "rpmresolve-native"
-DEPENDS_rpm-lang-all = "rpm-native"
-DEPENDS_rpminst = "rpm-native"
-DEPENDS_rpm-libs = "rpm-native"
-
-DISTRO_FEATURES_append = " systemd"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-
-PREFERRED_PROVIDER_python-dbus = "dbus-python"
-PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
-PREFERRED_PROVIDER_jpeg-native = "libjpeg-turbo-native"
-PREFERRED_PROVIDER_libtdb = "tdb"
-PREFERRED_PROVIDER_make-native = "make-native"
-PREFERRED_PROVIDER_python-setuptools = "python-setuptools"
-PREFERRED_PROVIDER_rpmbuild = "rpm-native"
-PREFERRED_PROVIDER_libpam = "pam"
-PREFERRED_PROVIDER_pciutils-ids = "pciutils"
-
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
-
-LICENSE_FLAGS_WHITELIST += "commercial"
-
-IMAGECONFIG ??= "config-tizen-common"
-
-SYS_CTLR_PROVIDER = "murphy"