From 5da88c7b38484036571137aab4f16333a618c55b Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 30 Aug 2013 10:46:15 +0200 Subject: [PATCH] - change manifest_addon, and add priority for manifest. --- meta-wrt-tizen/conf/layer.conf | 2 +- .../app-manager/app-manager-depends.inc | 2 +- .../capi-system-system-settings-extraconf.inc | 0 ...api-system-system-settings-native-extraconf.inc | 0 .../capi-system-system-settings-native_git.bb | 13 ------- .../capi-system-system-settings-oe-extraconf.inc | 0 .../capi-system-system-settings-rdepends.inc | 6 ---- .../capi-system-system-settings_git.bb | 10 ------ .../capi-web-url-download-rdepends.inc | 5 --- .../connection/connection-native_git.bb | 2 +- .../recipes-wrt/connection/connection_git.bb | 2 +- .../dukgenerator/dukgenerator-native_git.bb | 2 +- .../recipes-wrt/dukgenerator/dukgenerator_git.bb | 2 +- .../libcryptsvc/libcryptsvc-native_git.bb | 2 +- .../recipes-wrt/libcryptsvc/libcryptsvc_git.bb | 2 +- .../libslp-sysman-depends.inc} | 0 .../libslp-sysman-extraconf.inc} | 0 .../libslp-sysman-native-extraconf.inc} | 0 .../libslp-sysman/libslp-sysman-native_git.bb | 13 +++++++ .../libslp-sysman-oe-extraconf.inc} | 0 .../libslp-sysman/libslp-sysman-rdepends.inc | 8 +++++ .../libslp-sysman-rprovides.inc} | 0 .../sysman.inc => libslp-sysman/libslp-sysman.inc} | 6 ++-- .../recipes-wrt/libslp-sysman/libslp-sysman_git.bb | 10 ++++++ .../libslp-tapi/libslp-tapi-native_git.bb | 2 +- .../recipes-wrt/libslp-tapi/libslp-tapi_git.bb | 2 +- .../package-manager/package-manager-depends.inc | 2 +- .../recipes-wrt/pkgmgr/pkgmgr-native_git.bb | 13 ------- .../recipes-wrt/pkgmgr/pkgmgr-rdepends.inc | 21 ----------- meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr_git.bb | 10 ------ .../slp-pkgmgr-depends.inc} | 0 .../slp-pkgmgr-extraconf.inc} | 0 .../slp-pkgmgr-native-extraconf.inc} | 0 .../slp-pkgmgr/slp-pkgmgr-native_git.bb | 13 +++++++ .../slp-pkgmgr-oe-extraconf.inc} | 0 .../recipes-wrt/slp-pkgmgr/slp-pkgmgr-rdepends.inc | 21 +++++++++++ .../slp-pkgmgr-rprovides.inc} | 0 .../pkgmgr.inc => slp-pkgmgr/slp-pkgmgr.inc} | 18 +++++----- .../recipes-wrt/slp-pkgmgr/slp-pkgmgr_git.bb | 10 ++++++ .../recipes-wrt/sysman/sysman-native_git.bb | 13 ------- .../recipes-wrt/sysman/sysman-rdepends.inc | 8 ----- meta-wrt-tizen/recipes-wrt/sysman/sysman_git.bb | 10 ------ .../system-settings-depends.inc} | 0 .../system-settings-extraconf.inc} | 0 .../system-settings-native-extraconf.inc} | 0 .../system-settings/system-settings-native_git.bb | 13 +++++++ .../system-settings-oe-extraconf.inc} | 0 .../system-settings/system-settings-rdepends.inc | 6 ++++ .../system-settings-rprovides.inc} | 0 .../system-settings.inc} | 6 ++-- .../system-settings/system-settings_git.bb | 10 ++++++ .../url-download-depends.inc} | 0 .../url-download-extraconf.inc} | 0 .../url-download-native-extraconf.inc} | 0 .../url-download-native_git.bb} | 6 ++-- .../url-download-oe-extraconf.inc} | 0 .../url-download/url-download-rdepends.inc | 5 +++ .../url-download-rprovides.inc} | 0 .../url-download.inc} | 6 ++-- .../url-download_git.bb} | 8 ++--- .../wrt-installer/wrt-installer-depends.inc | 2 +- .../wrt-plugins-tizen-depends.inc | 8 ++--- .../wrt-security/wrt-security-native_git.bb | 2 +- .../recipes-wrt/wrt-security/wrt-security_git.bb | 2 +- .../wrt-setting/wrt-setting-depends.inc | 11 ------ .../wrt-setting/wrt-setting-native_git.bb | 13 ------- .../wrt-setting/wrt-setting-rdepends.inc | 2 -- .../wrt-setting/wrt-setting-rprovides.inc | 4 --- .../recipes-wrt/wrt-setting/wrt-setting.inc | 29 --------------- .../recipes-wrt/wrt-setting/wrt-setting_git.bb | 10 ------ meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc | 14 ++++---- proto-meta-Tizen_ivi_3.0/.spec2yoctorc | 15 ++++---- .../manifest_addon/manifest_addon.xml | 6 ++-- tools/spec2yocto.py | 41 +++++++++++++++------- 74 files changed, 198 insertions(+), 251 deletions(-) delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-extraconf.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native-extraconf.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-oe-extraconf.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rdepends.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rdepends.inc rename meta-wrt-tizen/recipes-wrt/{sysman/sysman-depends.inc => libslp-sysman/libslp-sysman-depends.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{wrt-setting/wrt-setting-oe-extraconf.inc => libslp-sysman/libslp-sysman-extraconf.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{wrt-setting/wrt-setting-native-extraconf.inc => libslp-sysman/libslp-sysman-native-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native_git.bb rename meta-wrt-tizen/recipes-wrt/{wrt-setting/wrt-setting-extraconf.inc => libslp-sysman/libslp-sysman-oe-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rdepends.inc rename meta-wrt-tizen/recipes-wrt/{sysman/sysman-rprovides.inc => libslp-sysman/libslp-sysman-rprovides.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{sysman/sysman.inc => libslp-sysman/libslp-sysman.inc} (91%) create mode 100644 meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rdepends.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr_git.bb rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr-depends.inc => slp-pkgmgr/slp-pkgmgr-depends.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{sysman/sysman-oe-extraconf.inc => slp-pkgmgr/slp-pkgmgr-extraconf.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{sysman/sysman-native-extraconf.inc => slp-pkgmgr/slp-pkgmgr-native-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native_git.bb rename meta-wrt-tizen/recipes-wrt/{sysman/sysman-extraconf.inc => slp-pkgmgr/slp-pkgmgr-oe-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rdepends.inc rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr-rprovides.inc => slp-pkgmgr/slp-pkgmgr-rprovides.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr.inc => slp-pkgmgr/slp-pkgmgr.inc} (88%) create mode 100644 meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/sysman/sysman-native_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/sysman/sysman-rdepends.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/sysman/sysman_git.bb rename meta-wrt-tizen/recipes-wrt/{capi-system-system-settings/capi-system-system-settings-depends.inc => system-settings/system-settings-depends.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr-oe-extraconf.inc => system-settings/system-settings-extraconf.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr-native-extraconf.inc => system-settings/system-settings-native-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native_git.bb rename meta-wrt-tizen/recipes-wrt/{pkgmgr/pkgmgr-extraconf.inc => system-settings/system-settings-oe-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rdepends.inc rename meta-wrt-tizen/recipes-wrt/{capi-system-system-settings/capi-system-system-settings-rprovides.inc => system-settings/system-settings-rprovides.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{capi-system-system-settings/capi-system-system-settings.inc => system-settings/system-settings.inc} (87%) create mode 100644 meta-wrt-tizen/recipes-wrt/system-settings/system-settings_git.bb rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-depends.inc => url-download/url-download-depends.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-oe-extraconf.inc => url-download/url-download-extraconf.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-native-extraconf.inc => url-download/url-download-native-extraconf.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-native_git.bb => url-download/url-download-native_git.bb} (61%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-extraconf.inc => url-download/url-download-oe-extraconf.inc} (100%) create mode 100644 meta-wrt-tizen/recipes-wrt/url-download/url-download-rdepends.inc rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download-rprovides.inc => url-download/url-download-rprovides.inc} (100%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download.inc => url-download/url-download.inc} (89%) rename meta-wrt-tizen/recipes-wrt/{capi-web-url-download/capi-web-url-download_git.bb => url-download/url-download_git.bb} (50%) delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-depends.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native_git.bb delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rdepends.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rprovides.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting.inc delete mode 100644 meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting_git.bb diff --git a/meta-wrt-tizen/conf/layer.conf b/meta-wrt-tizen/conf/layer.conf index cc3f936..c716229 100644 --- a/meta-wrt-tizen/conf/layer.conf +++ b/meta-wrt-tizen/conf/layer.conf @@ -12,4 +12,4 @@ BBFILES := "${BBFILES} \ #PREFERRED_PROVIDER_udev = "systemd" #DISTRO_FEATURES_BACKFILL = "pulseaudio systemd" -#DISTRO_FEATURES += "systemd x11" \ No newline at end of file +DISTRO_FEATURES_append = "systemd x11" \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/app-manager/app-manager-depends.inc b/meta-wrt-tizen/recipes-wrt/app-manager/app-manager-depends.inc index 7f8da50..d984702 100644 --- a/meta-wrt-tizen/recipes-wrt/app-manager/app-manager-depends.inc +++ b/meta-wrt-tizen/recipes-wrt/app-manager/app-manager-depends.inc @@ -2,7 +2,7 @@ DEPENDS = "" #DEPENDS of capi-appfw-app-manager DEPENDS += "aul-1" DEPENDS += "cmake-native" -DEPENDS += "pkgmgr" +DEPENDS += "slp-pkgmgr" DEPENDS += "dlog" DEPENDS += "glib-2.0" DEPENDS += "ail" diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-extraconf.inc b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-extraconf.inc deleted file mode 100644 index e69de29..0000000 diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native-extraconf.inc deleted file mode 100644 index e69de29..0000000 diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native_git.bb b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native_git.bb deleted file mode 100644 index 40459d6..0000000 --- a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-native_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require capi-system-system-settings.inc - -PRIORITY = "9" - -inherit native - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/framework/api/system-settings;protocol=ssh;tag=tizen" -require capi-system-system-settings-native-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-oe-extraconf.inc deleted file mode 100644 index e69de29..0000000 diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rdepends.inc b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rdepends.inc deleted file mode 100644 index 02c4f31..0000000 --- a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rdepends.inc +++ /dev/null @@ -1,6 +0,0 @@ -RDEPENDS = "" -#RDEPENDS of capi-system-system-settings-devel (${PN}-devel) -RDEPENDS_${PN}-devel += "common" -RDEPENDS_${PN}-devel += "capi-system-system-settings" - - diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings_git.bb b/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings_git.bb deleted file mode 100644 index 7d3c5c8..0000000 --- a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require capi-system-system-settings.inc -require capi-system-system-settings-rprovides.inc - -PRIORITY = "10" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/framework/api/system-settings;protocol=ssh;tag=tizen" -require capi-system-system-settings-oe-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rdepends.inc b/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rdepends.inc deleted file mode 100644 index b8afa1c..0000000 --- a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rdepends.inc +++ /dev/null @@ -1,5 +0,0 @@ -RDEPENDS = "" -#RDEPENDS of capi-web-url-download-devel (${PN}-devel) -RDEPENDS_${PN}-devel += "capi-web-url-download" - - diff --git a/meta-wrt-tizen/recipes-wrt/connection/connection-native_git.bb b/meta-wrt-tizen/recipes-wrt/connection/connection-native_git.bb index 077037f..56fef07 100644 --- a/meta-wrt-tizen/recipes-wrt/connection/connection-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/connection/connection-native_git.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/connection;protocol=ssh;tag=submit/tizen/20130717.155954" +SRC_URI += "git://review.tizen.org/platform/core/api/connection;protocol=ssh;tag=refs/tags/submit/tizen/20130710.102326" require connection-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/connection/connection_git.bb b/meta-wrt-tizen/recipes-wrt/connection/connection_git.bb index 43e0ce7..75a43ef 100644 --- a/meta-wrt-tizen/recipes-wrt/connection/connection_git.bb +++ b/meta-wrt-tizen/recipes-wrt/connection/connection_git.bb @@ -5,6 +5,6 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/connection;protocol=ssh;tag=submit/tizen/20130717.155954" +SRC_URI += "git://review.tizen.org/platform/core/api/connection;protocol=ssh;tag=refs/tags/submit/tizen/20130710.102326" require connection-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator-native_git.bb b/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator-native_git.bb index ddb9117..b3182d9 100644 --- a/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator-native_git.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/security/dukgenerator;protocol=ssh;tag=submit/tizen/20130710.124515" +SRC_URI += "git://review.tizen.org/platform/core/security/dukgenerator;protocol=ssh;tag=submit/tizen/20130830.004456" require dukgenerator-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator_git.bb b/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator_git.bb index 26ace83..e5d8bf2 100644 --- a/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator_git.bb +++ b/meta-wrt-tizen/recipes-wrt/dukgenerator/dukgenerator_git.bb @@ -5,6 +5,6 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/security/dukgenerator;protocol=ssh;tag=submit/tizen/20130710.124515" +SRC_URI += "git://review.tizen.org/platform/core/security/dukgenerator;protocol=ssh;tag=submit/tizen/20130830.004456" require dukgenerator-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc-native_git.bb b/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc-native_git.bb index 784c80e..24aaed5 100644 --- a/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc-native_git.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/security/libcryptsvc;protocol=ssh;tag=submit/tizen/20130710.124523" +SRC_URI += "git://review.tizen.org/platform/core/security/libcryptsvc;protocol=ssh;tag=submit/tizen/20130829.121231" require libcryptsvc-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc_git.bb b/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc_git.bb index 8a8ae40..fad0d6d 100644 --- a/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc_git.bb +++ b/meta-wrt-tizen/recipes-wrt/libcryptsvc/libcryptsvc_git.bb @@ -5,6 +5,6 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/security/libcryptsvc;protocol=ssh;tag=submit/tizen/20130710.124523" +SRC_URI += "git://review.tizen.org/platform/core/security/libcryptsvc;protocol=ssh;tag=submit/tizen/20130829.121231" require libcryptsvc-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-depends.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-depends.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman-depends.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-depends.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-oe-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native_git.bb b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native_git.bb new file mode 100644 index 0000000..ebbd3a5 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-native_git.bb @@ -0,0 +1,13 @@ +require libslp-sysman.inc + +PRIORITY = "9" + +inherit native + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/system/libslp-sysman;protocol=ssh;tag=submit/tizen/20130710.124703" +require libslp-sysman-native-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-extraconf.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-oe-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rdepends.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rdepends.inc new file mode 100644 index 0000000..475e632 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rdepends.inc @@ -0,0 +1,8 @@ +RDEPENDS = "" +#RDEPENDS of sysman-internal-devel (sysman-internal-devel) +RDEPENDS_sysman-internal-devel += "sysman" + +#RDEPENDS of sysman-devel (sysman-devel) +RDEPENDS_sysman-devel += "sysman" + + diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-rprovides.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rprovides.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman-rprovides.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman-rprovides.inc diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman.inc b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman.inc similarity index 91% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman.inc rename to meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman.inc index 14acb8c..24bdbdb 100644 --- a/meta-wrt-tizen/recipes-wrt/sysman/sysman.inc +++ b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman.inc @@ -40,6 +40,6 @@ inherit tizenBuildUtils S = "${WORKDIR}/git" -require sysman-rdepends.inc -require sysman-depends.inc -require sysman-extraconf.inc +require libslp-sysman-rdepends.inc +require libslp-sysman-depends.inc +require libslp-sysman-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman_git.bb b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman_git.bb new file mode 100644 index 0000000..1989364 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/libslp-sysman/libslp-sysman_git.bb @@ -0,0 +1,10 @@ +require libslp-sysman.inc +require libslp-sysman-rprovides.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/system/libslp-sysman;protocol=ssh;tag=submit/tizen/20130710.124703" +require libslp-sysman-oe-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi-native_git.bb b/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi-native_git.bb index 9f2759e..14422ef 100644 --- a/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi-native_git.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/telephony/libslp-tapi;protocol=ssh;tag=submit/tizen/20130710.124842" +SRC_URI += "git://review.tizen.org/framework/telephony/libslp-tapi;protocol=ssh;tag=refs/tags/2.2_release" require libslp-tapi-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi_git.bb b/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi_git.bb index 6c04716..09c9a50 100644 --- a/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi_git.bb +++ b/meta-wrt-tizen/recipes-wrt/libslp-tapi/libslp-tapi_git.bb @@ -5,6 +5,6 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/telephony/libslp-tapi;protocol=ssh;tag=submit/tizen/20130710.124842" +SRC_URI += "git://review.tizen.org/framework/telephony/libslp-tapi;protocol=ssh;tag=refs/tags/2.2_release" require libslp-tapi-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/package-manager/package-manager-depends.inc b/meta-wrt-tizen/recipes-wrt/package-manager/package-manager-depends.inc index 6ef8774..04d0cdc 100644 --- a/meta-wrt-tizen/recipes-wrt/package-manager/package-manager-depends.inc +++ b/meta-wrt-tizen/recipes-wrt/package-manager/package-manager-depends.inc @@ -2,7 +2,7 @@ DEPENDS = "" #DEPENDS of capi-appfw-package-manager DEPENDS += "aul-1" DEPENDS += "cmake-native" -DEPENDS += "pkgmgr" +DEPENDS += "slp-pkgmgr" DEPENDS += "pkgmgr-info" DEPENDS += "ail" DEPENDS += "dlog" diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native_git.bb b/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native_git.bb deleted file mode 100644 index aa0f6ed..0000000 --- a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require pkgmgr.inc - -PRIORITY = "9" - -inherit native - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/projects/framework/appfw/slp-pkgmgr;protocol=ssh;tag=tizen" -require pkgmgr-native-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rdepends.inc b/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rdepends.inc deleted file mode 100644 index a870262..0000000 --- a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rdepends.inc +++ /dev/null @@ -1,21 +0,0 @@ -RDEPENDS = "" -#RDEPENDS of pkgmgr-client (${PN}-client) -RDEPENDS_${PN}-client += "shared-mime-info" -RDEPENDS_${PN}-client += "pkgmgr" - -#RDEPENDS of pkgmgr-server (${PN}-server) -RDEPENDS_${PN}-server += "pkgmgr" - -#RDEPENDS of pkgmgr-types-devel (${PN}-types-devel) -RDEPENDS_${PN}-types-devel += "pkgmgr" - -#RDEPENDS of pkgmgr-client-devel (${PN}-client-devel) -RDEPENDS_${PN}-client-devel += "pkgmgr" - -#RDEPENDS of pkgmgr-installer-devel (${PN}-installer-devel) -RDEPENDS_${PN}-installer-devel += "pkgmgr" - -#RDEPENDS of pkgmgr-installer (${PN}-installer) -RDEPENDS_${PN}-installer += "pkgmgr" - - diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr_git.bb b/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr_git.bb deleted file mode 100644 index a80198d..0000000 --- a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pkgmgr.inc -require pkgmgr-rprovides.inc - -PRIORITY = "10" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/projects/framework/appfw/slp-pkgmgr;protocol=ssh;tag=tizen" -require pkgmgr-oe-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-depends.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-depends.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-depends.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-depends.inc diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman-oe-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman-native-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native_git.bb b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native_git.bb new file mode 100644 index 0000000..eba90d5 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-native_git.bb @@ -0,0 +1,13 @@ +require slp-pkgmgr.inc + +PRIORITY = "9" + +inherit native + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;protocol=ssh;tag=submit/tizen/20130717.043324" +require slp-pkgmgr-native-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-extraconf.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-oe-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/sysman/sysman-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rdepends.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rdepends.inc new file mode 100644 index 0000000..2dbc425 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rdepends.inc @@ -0,0 +1,21 @@ +RDEPENDS = "" +#RDEPENDS of pkgmgr-client (pkgmgr-client) +RDEPENDS_pkgmgr-client += "shared-mime-info" +RDEPENDS_pkgmgr-client += "pkgmgr" + +#RDEPENDS of pkgmgr-server (pkgmgr-server) +RDEPENDS_pkgmgr-server += "pkgmgr" + +#RDEPENDS of pkgmgr-types-devel (pkgmgr-types-devel) +RDEPENDS_pkgmgr-types-devel += "pkgmgr" + +#RDEPENDS of pkgmgr-client-devel (pkgmgr-client-devel) +RDEPENDS_pkgmgr-client-devel += "pkgmgr" + +#RDEPENDS of pkgmgr-installer-devel (pkgmgr-installer-devel) +RDEPENDS_pkgmgr-installer-devel += "pkgmgr" + +#RDEPENDS of pkgmgr-installer (pkgmgr-installer) +RDEPENDS_pkgmgr-installer += "pkgmgr" + + diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rprovides.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rprovides.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-rprovides.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr-rprovides.inc diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr.inc b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr.inc similarity index 88% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr.inc rename to meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr.inc index b38da9f..331e7e5 100644 --- a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr.inc +++ b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr.inc @@ -15,7 +15,7 @@ PACKAGES += "pkgmgr-installer-devel" PACKAGES += "pkgmgr-installer" pkgmgr-client_files = "" -pkgmgr-client_files += "pkgmgr-client.manifest" +pkgmgr-client_files += "pkgmgr.manifest" pkgmgr-client_files += "/etc/package-manager" pkgmgr-client_files += "/etc/package-manager/pkg_path.conf" pkgmgr-client_files += "/usr/lib/libpkgmgr-client.so.*" @@ -37,26 +37,26 @@ pkgmgr_files += "/usr/share/mime/packages/mime.wac.xml" pkgmgr_files += "/usr/share/mime/packages/mime.tpk.xml" pkgmgr-server_files = "" -pkgmgr-server_files += "pkgmgr-server.manifest" +pkgmgr-server_files += "pkgmgr.manifest" pkgmgr-server_files += "/usr/share/dbus-1/services/org.tizen.slp.pkgmgr.service" pkgmgr-server_files += "/usr/bin/pkgmgr-server" pkgmgr-server_files += "/etc/package-manager/server" pkgmgr-types-devel_files = "" -pkgmgr-types-devel_files += "pkgmgr-types-devel.manifest" +pkgmgr-types-devel_files += "pkgmgr.manifest" pkgmgr-types-devel_files += "/usr/include/package-manager-types.h" pkgmgr-types-devel_files += "/usr/include/package-manager-plugin.h" pkgmgr-types-devel_files += "/usr/lib/pkgconfig/pkgmgr-types.pc" pkgmgr-client-devel_files = "" -pkgmgr-client-devel_files += "pkgmgr-client-devel.manifest" +pkgmgr-client-devel_files += "pkgmgr.manifest" pkgmgr-client-devel_files += "/usr/include/package-manager.h" pkgmgr-client-devel_files += "/usr/include/pkgmgr-dbinfo.h" pkgmgr-client-devel_files += "/usr/lib/pkgconfig/pkgmgr.pc" pkgmgr-client-devel_files += "/usr/lib/libpkgmgr-client.so" pkgmgr-installer-devel_files = "" -pkgmgr-installer-devel_files += "pkgmgr-installer-devel.manifest" +pkgmgr-installer-devel_files += "pkgmgr.manifest" pkgmgr-installer-devel_files += "/usr/include/pkgmgr" pkgmgr-installer-devel_files += "/usr/include/pkgmgr/pkgmgr_installer.h" pkgmgr-installer-devel_files += "/usr/lib/pkgconfig/pkgmgr-installer-status-broadcast-server.pc" @@ -67,7 +67,7 @@ pkgmgr-installer-devel_files += "/usr/lib/libpkgmgr_installer_client.so" pkgmgr-installer-devel_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so" pkgmgr-installer_files = "" -pkgmgr-installer_files += "pkgmgr-installer.manifest" +pkgmgr-installer_files += "pkgmgr.manifest" pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer.so.*" pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so.*" pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_client.so.*" @@ -86,6 +86,6 @@ inherit tizenBuildUtils S = "${WORKDIR}/git" -require pkgmgr-rdepends.inc -require pkgmgr-depends.inc -require pkgmgr-extraconf.inc +require slp-pkgmgr-rdepends.inc +require slp-pkgmgr-depends.inc +require slp-pkgmgr-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr_git.bb b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr_git.bb new file mode 100644 index 0000000..e173a1e --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/slp-pkgmgr/slp-pkgmgr_git.bb @@ -0,0 +1,10 @@ +require slp-pkgmgr.inc +require slp-pkgmgr-rprovides.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;protocol=ssh;tag=submit/tizen/20130717.043324" +require slp-pkgmgr-oe-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-native_git.bb b/meta-wrt-tizen/recipes-wrt/sysman/sysman-native_git.bb deleted file mode 100644 index 952cbfe..0000000 --- a/meta-wrt-tizen/recipes-wrt/sysman/sysman-native_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require sysman.inc - -PRIORITY = "9" - -inherit native - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/framework/system/libslp-sysman;protocol=ssh;tag=tizen" -require sysman-native-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman-rdepends.inc b/meta-wrt-tizen/recipes-wrt/sysman/sysman-rdepends.inc deleted file mode 100644 index ede88dd..0000000 --- a/meta-wrt-tizen/recipes-wrt/sysman/sysman-rdepends.inc +++ /dev/null @@ -1,8 +0,0 @@ -RDEPENDS = "" -#RDEPENDS of sysman-internal-devel (${PN}-internal-devel) -RDEPENDS_${PN}-internal-devel += "sysman" - -#RDEPENDS of sysman-devel (${PN}-devel) -RDEPENDS_${PN}-devel += "sysman" - - diff --git a/meta-wrt-tizen/recipes-wrt/sysman/sysman_git.bb b/meta-wrt-tizen/recipes-wrt/sysman/sysman_git.bb deleted file mode 100644 index 31b07d5..0000000 --- a/meta-wrt-tizen/recipes-wrt/sysman/sysman_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require sysman.inc -require sysman-rprovides.inc - -PRIORITY = "10" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/framework/system/libslp-sysman;protocol=ssh;tag=tizen" -require sysman-oe-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-depends.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-depends.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-depends.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings-depends.inc diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-oe-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-native-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native_git.bb b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native_git.bb new file mode 100644 index 0000000..351ebce --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-native_git.bb @@ -0,0 +1,13 @@ +require system-settings.inc + +PRIORITY = "9" + +inherit native + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/api/system-settings;protocol=ssh;tag=submit/tizen/20130710.102646" +require system-settings-native-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-extraconf.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-oe-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/pkgmgr/pkgmgr-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rdepends.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rdepends.inc new file mode 100644 index 0000000..e8b3709 --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rdepends.inc @@ -0,0 +1,6 @@ +RDEPENDS = "" +#RDEPENDS of capi-system-system-settings-devel (capi-system-${PN}-devel) +RDEPENDS_capi-system-${PN}-devel += "common" +RDEPENDS_capi-system-${PN}-devel += "capi-system-system-settings" + + diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rprovides.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rprovides.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings-rprovides.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings-rprovides.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings.inc b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings.inc similarity index 87% rename from meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings.inc rename to meta-wrt-tizen/recipes-wrt/system-settings/system-settings.inc index b5b3fb4..c41b380 100644 --- a/meta-wrt-tizen/recipes-wrt/capi-system-system-settings/capi-system-system-settings.inc +++ b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings.inc @@ -29,6 +29,6 @@ inherit tizenBuildUtils S = "${WORKDIR}/git" -require capi-system-system-settings-rdepends.inc -require capi-system-system-settings-depends.inc -require capi-system-system-settings-extraconf.inc +require system-settings-rdepends.inc +require system-settings-depends.inc +require system-settings-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/system-settings/system-settings_git.bb b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings_git.bb new file mode 100644 index 0000000..fded00b --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/system-settings/system-settings_git.bb @@ -0,0 +1,10 @@ +require system-settings.inc +require system-settings-rprovides.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/api/system-settings;protocol=ssh;tag=submit/tizen/20130710.102646" +require system-settings-oe-extraconf.inc + diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-depends.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-depends.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-depends.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-depends.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-oe-extraconf.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-oe-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-native-extraconf.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-native-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-native-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-native_git.bb b/meta-wrt-tizen/recipes-wrt/url-download/url-download-native_git.bb similarity index 61% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-native_git.bb rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-native_git.bb index 97d69e4..842beda 100644 --- a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/url-download/url-download-native_git.bb @@ -1,4 +1,4 @@ -require capi-web-url-download.inc +require url-download.inc PRIORITY = "9" @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/url-download;protocol=ssh;tag=accepted/tizen/20130710.221549" -require capi-web-url-download-native-extraconf.inc +SRC_URI += "git://review.tizen.org/platform/core/api/url-download;protocol=ssh;tag=submit/tizen/20130710.102708" +require url-download-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-extraconf.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-oe-extraconf.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-extraconf.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/url-download/url-download-rdepends.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-rdepends.inc new file mode 100644 index 0000000..562fc4b --- /dev/null +++ b/meta-wrt-tizen/recipes-wrt/url-download/url-download-rdepends.inc @@ -0,0 +1,5 @@ +RDEPENDS = "" +#RDEPENDS of capi-web-url-download-devel (capi-web-${PN}-devel) +RDEPENDS_capi-web-${PN}-devel += "capi-web-url-download" + + diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rprovides.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download-rprovides.inc similarity index 100% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download-rprovides.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download-rprovides.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download.inc b/meta-wrt-tizen/recipes-wrt/url-download/url-download.inc similarity index 89% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download.inc rename to meta-wrt-tizen/recipes-wrt/url-download/url-download.inc index 20c9449..39551a3 100644 --- a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download.inc +++ b/meta-wrt-tizen/recipes-wrt/url-download/url-download.inc @@ -30,6 +30,6 @@ inherit tizenBuildUtils S = "${WORKDIR}/git" -require capi-web-url-download-rdepends.inc -require capi-web-url-download-depends.inc -require capi-web-url-download-extraconf.inc +require url-download-rdepends.inc +require url-download-depends.inc +require url-download-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download_git.bb b/meta-wrt-tizen/recipes-wrt/url-download/url-download_git.bb similarity index 50% rename from meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download_git.bb rename to meta-wrt-tizen/recipes-wrt/url-download/url-download_git.bb index 60720b7..4e3178e 100644 --- a/meta-wrt-tizen/recipes-wrt/capi-web-url-download/capi-web-url-download_git.bb +++ b/meta-wrt-tizen/recipes-wrt/url-download/url-download_git.bb @@ -1,10 +1,10 @@ -require capi-web-url-download.inc -require capi-web-url-download-rprovides.inc +require url-download.inc +require url-download-rprovides.inc PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/api/url-download;protocol=ssh;tag=accepted/tizen/20130710.221549" -require capi-web-url-download-oe-extraconf.inc +SRC_URI += "git://review.tizen.org/platform/core/api/url-download;protocol=ssh;tag=submit/tizen/20130710.102708" +require url-download-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-installer/wrt-installer-depends.inc b/meta-wrt-tizen/recipes-wrt/wrt-installer/wrt-installer-depends.inc index 9c76057..487f31c 100644 --- a/meta-wrt-tizen/recipes-wrt/wrt-installer/wrt-installer-depends.inc +++ b/meta-wrt-tizen/recipes-wrt/wrt-installer/wrt-installer-depends.inc @@ -3,12 +3,12 @@ DEPENDS = "" DEPENDS += "edje" DEPENDS += "libslp-tapi" DEPENDS += "libxml2" -DEPENDS += "pkgmgr" DEPENDS += "libiri" DEPENDS += "xmlsec1" DEPENDS += "dlog" DEPENDS += "pcre" DEPENDS += "cmake-native" +DEPENDS += "slp-pkgmgr" DEPENDS += "app-svc" DEPENDS += "shortcut" DEPENDS += "cert-svc" diff --git a/meta-wrt-tizen/recipes-wrt/wrt-plugins-tizen/wrt-plugins-tizen-depends.inc b/meta-wrt-tizen/recipes-wrt/wrt-plugins-tizen/wrt-plugins-tizen-depends.inc index 5998555..0271acb 100644 --- a/meta-wrt-tizen/recipes-wrt/wrt-plugins-tizen/wrt-plugins-tizen-depends.inc +++ b/meta-wrt-tizen/recipes-wrt/wrt-plugins-tizen/wrt-plugins-tizen-depends.inc @@ -1,10 +1,8 @@ DEPENDS = "" #DEPENDS of wrt-plugins-tizen -DEPENDS += "capi-web-url-download" DEPENDS += "libslp-tapi" DEPENDS += "pkgconfig(msg-service)" DEPENDS += "expat-devel" -DEPENDS += "pkgmgr" DEPENDS += "pkgconfig(capi-system-info)" DEPENDS += "security-server" DEPENDS += "pkgconfig(push)" @@ -24,6 +22,7 @@ DEPENDS += "boost-system" DEPENDS += "wrt-plugins-common" DEPENDS += "pkgconfig(accounts-svc)" DEPENDS += "app-svc" +DEPENDS += "system-settings" DEPENDS += "pkgconfig(calendar-service2)" DEPENDS += "application" DEPENDS += "pkgconfig(message-port)" @@ -37,16 +36,17 @@ DEPENDS += "pkgconfig(capi-network-bluetooth)" DEPENDS += "package-manager" DEPENDS += "pkgconfig(mm-fileinfo)" DEPENDS += "pkgconfig(capi-location-poi)" -DEPENDS += "capi-system-system-settings" +DEPENDS += "pkgmgr-info" DEPENDS += "pkgconfig(capi-web-favorites)" +DEPENDS += "slp-pkgmgr" DEPENDS += "webkit-efl" -DEPENDS += "pkgmgr-info" DEPENDS += "pkgconfig(capi-system-power)" DEPENDS += "pkgconfig(capi-location-route)" DEPENDS += "libnet-client" DEPENDS += "pkgconfig(capi-media-metadata-extractor)" DEPENDS += "pkgconfig(capi-telephony-call)" DEPENDS += "geocoder" +DEPENDS += "url-download" DEPENDS += "pkgconfig(capi-system-sensor)" DEPENDS += "pkgconfig(email-service)" DEPENDS += "connection" diff --git a/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security-native_git.bb b/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security-native_git.bb index 53e7377..28d7f6d 100644 --- a/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security-native_git.bb +++ b/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security-native_git.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/framework/web/wrt-security;protocol=ssh;tag=submit/tizen/20130724.224204" +SRC_URI += "git://review.tizen.org/platform/framework/web/wrt-security;protocol=ssh;tag=submit/tizen/20130829.212854" require wrt-security-native-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security_git.bb b/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security_git.bb index 9cf7acb..b08bdc8 100644 --- a/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security_git.bb +++ b/meta-wrt-tizen/recipes-wrt/wrt-security/wrt-security_git.bb @@ -5,6 +5,6 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/framework/web/wrt-security;protocol=ssh;tag=submit/tizen/20130724.224204" +SRC_URI += "git://review.tizen.org/platform/framework/web/wrt-security;protocol=ssh;tag=submit/tizen/20130829.212854" require wrt-security-oe-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-depends.inc b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-depends.inc deleted file mode 100644 index 04cda57..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-depends.inc +++ /dev/null @@ -1,11 +0,0 @@ -DEPENDS = "" -#DEPENDS of wrt-setting -DEPENDS += "edje" -DEPENDS += "wrt-security" -DEPENDS += "ui-gadget-1" -DEPENDS += "cmake-native" -#Replace "DEPENDS" on gettext by "inherit gettext" -inherit gettext -DEPENDS += "elementary" -DEPENDS += "ecore" -DEPENDS += "wrt-commons" diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native_git.bb b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native_git.bb deleted file mode 100644 index a2d86d4..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-native_git.bb +++ /dev/null @@ -1,13 +0,0 @@ -require wrt-setting.inc - -PRIORITY = "9" - -inherit native - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/apps/core/preloaded/wrt-setting;protocol=ssh;tag=submit/tizen/20130729.063446" -require wrt-setting-native-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rdepends.inc b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rdepends.inc deleted file mode 100644 index 229b925..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rdepends.inc +++ /dev/null @@ -1,2 +0,0 @@ -RDEPENDS = "" - diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rprovides.inc b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rprovides.inc deleted file mode 100644 index 6847475..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting-rprovides.inc +++ /dev/null @@ -1,4 +0,0 @@ -#PROVIDES by wrt-setting -PROVIDES += "wrt-setting" -RPROVIDES_wrt-setting += "wrt-setting" - diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting.inc b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting.inc deleted file mode 100644 index b2a9fe4..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting.inc +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "WRT Setting UI Gadgets" -HOMEPAGE = "http://nohomepage.org" -SECTION = "Development/Libraries" -LICENSE = "Flora Software License" - -PROVIDES = "" - -PACKAGES = "" -PACKAGES += "wrt-setting" - -wrt-setting_files = "" -wrt-setting_files += "wrt-setting.manifest" -wrt-setting_files += "/etc/smack/accesses2.d/ug.webapp-common-efl.include" -wrt-setting_files += "/etc/smack/accesses2.d/ug.webapp-detail-efl.include" -wrt-setting_files += "/usr/share/license/wrt-setting" -wrt-setting_files += "/usr/ug/lib/*" -wrt-setting_files += "/usr/ug/res/*" - -FILES_${PN} = "${wrt-setting_files}" - -SRC_URI = "" - -inherit tizenBuildUtils - -S = "${WORKDIR}/git" - -require wrt-setting-rdepends.inc -require wrt-setting-depends.inc -require wrt-setting-extraconf.inc diff --git a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting_git.bb b/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting_git.bb deleted file mode 100644 index 023ca33..0000000 --- a/meta-wrt-tizen/recipes-wrt/wrt-setting/wrt-setting_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -require wrt-setting.inc -require wrt-setting-rprovides.inc - -PRIORITY = "10" - -LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "git://review.tizen.org/apps/core/preloaded/wrt-setting;protocol=ssh;tag=submit/tizen/20130729.063446" -require wrt-setting-oe-extraconf.inc - diff --git a/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc b/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc index 184ab72..ba2b75b 100644 --- a/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc +++ b/meta-wrt-tizen/recipes-wrt/wrt/wrt-depends.inc @@ -4,38 +4,38 @@ DEPENDS += "edje" DEPENDS += "aul-1" DEPENDS += "ui-gadget-1" DEPENDS += "libhaptic" -DEPENDS += "pkgmgr" DEPENDS += "libiri" DEPENDS += "eina" DEPENDS += "dlog" DEPENDS += "glib-2.0" -DEPENDS += "mesa" DEPENDS += "dbus-glib" DEPENDS += "pcre" DEPENDS += "cmake-native" -DEPENDS += "wrt-plugins-common" +DEPENDS += "slp-pkgmgr" DEPENDS += "notification" DEPENDS += "app-svc" +DEPENDS += "system-settings" #Replace "DEPENDS" on gettext by "inherit gettext" inherit gettext DEPENDS += "cert-svc" DEPENDS += "libsoup-2.4" +DEPENDS += "libslp-sysman" DEPENDS += "app-manager" DEPENDS += "secure-storage" DEPENDS += "libprivilege-control" DEPENDS += "wrt-security" -DEPENDS += "capi-system-system-settings" +DEPENDS += "bundle" DEPENDS += "sqlite3" DEPENDS += "smack" DEPENDS += "webkit-efl" -DEPENDS += "bundle" DEPENDS += "ecore" -DEPENDS += "capi-web-url-download" +DEPENDS += "mesa" DEPENDS += "app-core" DEPENDS += "app-checker" DEPENDS += "libslp-utilx" +DEPENDS += "wrt-plugins-common" +DEPENDS += "url-download" DEPENDS += "libx11" DEPENDS += "openssl" DEPENDS += "app2sd" DEPENDS += "wrt-commons" -DEPENDS += "sysman" diff --git a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc index f6e5d0b..58300f9 100644 --- a/proto-meta-Tizen_ivi_3.0/.spec2yoctorc +++ b/proto-meta-Tizen_ivi_3.0/.spec2yoctorc @@ -19,7 +19,7 @@ manifest=tizen_common_3.0_manifest, wrt_addon arch=x86_64 recipes_dir_sources=${HOME}/yoctoTizen/meta-wrt-tizen/recipes-wrt blacklist_autoreconf=tizen_ivi_autoreconf -whitelist=wrt, wrt-commons, wrt-installer, wrt-plugins-common, wrt-plugins-tizen, wrt-security, capi-system-system-settings, capi-web-url-download, ui-gadget-1, pkgmgr, libiri, dlog, libhaptic,haptic, cert-svc, notification, aul-1, secure-storage, libprivilege-control, app-manager, app-svc, smack, bundle, app-checker, libslp-utilx, app-core, app2sd, sysman, vconf, common, sensor, libcryptsvc, librua, xdgmime, pkgmgr-info, ail, application, runtime-info, vconf-internal-keys,alarm-manager, security-server, libslp-pm, libslp-db-util, libslp-tapi, heynoti, iniparser, libtbm, libdri2,com-core, libdevice-node, xmlsec1, dukgenerator, devman, download-provider, connection, libnet-client, libwifi-direct, privacy-manager, shortcut, package-manager, geocoder, libslp-location +whitelist=wrt, wrt-commons, wrt-installer, wrt-plugins-common, wrt-plugins-tizen, wrt-security, system-settings, url-download, ui-gadget-1, slp-pkgmgr, libiri, dlog, libhaptic,haptic, cert-svc, notification, aul-1, secure-storage, libprivilege-control, app-manager, app-svc, smack, bundle, app-checker, libslp-utilx, app-core, app2sd, libslp-sysman, vconf, common, sensor, libcryptsvc, librua, xdgmime, pkgmgr-info, ail, application, runtime-info, vconf-internal-keys,alarm-manager, security-server, libslp-pm, libslp-db-util, libslp-tapi, heynoti, iniparser, libtbm, libdri2,com-core, libdevice-node, xmlsec1, dukgenerator, devman, download-provider, connection, libnet-client, libwifi-direct, privacy-manager, shortcut, package-manager, geocoder, libslp-location provided-extra=wrt-provided-extra [substitute] @@ -37,16 +37,17 @@ libpcre-devel=pcre-devel [wrt_addon] uri=${HOME}/yoctoTizen/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml default_git_src=review.tizen.org - +priority=1 [tizen_ivi_3.0_manifest] uri=http://download.tizen.org/snapshots/tizen/ivi/latest/ default_git_src=review.tizen.org +priority=0 [tizen_common_3.0_manifest] uri=http://download.tizen.org/snapshots/tizen/common/latest/ default_git_src=review.tizen.org - +priority=0 [tizen_ivi_3.0_manifest_cache] uri=http://download.tizen.org/snapshots/tizen/ivi/latest/ @@ -301,7 +302,7 @@ v4l-utils=pkgconfig(libv4l2) [wrt-provided-extra] bundle=pkgconfig(bundle) openssl=pkgconfig(openssl) -capi-system-system-settings=pkgconfig(capi-system-system-settings) +system-settings=pkgconfig(capi-system-system-settings) app-checker=pkgconfig(app-checker) dlog=pkgconfig(dlog) vconf=pkgconfig(vconf), /usr/bin/vconftool @@ -318,7 +319,7 @@ eina=pkgconfig(eina) ui-gadget-1=pkgconfig(ui-gadget-1) libslp-utilx=pkgconfig(utilX) secure-storage=pkgconfig(secure-storage) -pkgmgr=pkgconfig(pkgmgr) +slp-pkgmgr=pkgconfig(pkgmgr) libiri=pkgconfig(libiri) app-svc=pkgconfig(appsvc) cert-svc=pkgconfig(cert-svc-vcore) @@ -327,8 +328,8 @@ notification=pkgconfig(notification) libprivilege-control=pkgconfig(libprivilege-control) app-manager=pkgconfig(capi-appfw-app-manager) libhaptic=pkgconfig(haptic) -capi-web-url-download=pkgconfig(capi-web-url-download) -sysman=pkgconfig(sysman) +url-download=pkgconfig(capi-web-url-download) +libslp-sysman=pkgconfig(sysman) app2sd=pkgconfig(app2sd) mesa=pkgconfig(gl), pkgconfig(glesv2) dbus-glib=pkgconfig(dbus-glib-1) diff --git a/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml b/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml index 0ede08e..fcd1550 100644 --- a/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml +++ b/proto-meta-Tizen_ivi_3.0/manifest_addon/manifest_addon.xml @@ -2,8 +2,6 @@ - - - - + + \ No newline at end of file diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py index 777d3c6..bfd81b7 100755 --- a/tools/spec2yocto.py +++ b/tools/spec2yocto.py @@ -103,6 +103,12 @@ class Spec2yoctoConfig( object ): res = os.path.expandvars( res ) return res + def get_manifest_priority( self, meta_manifest ): + ''' + return the priority of the manifest. + ''' + return self.__get_value( meta_manifest, "priority" , 0 ) + def get_manifest_default_git_src( self, meta_manifest ): ''' return the default_git_src of the manifest. @@ -1898,11 +1904,12 @@ def specfile_patcher( package_spec_path, project, package_name_list , dest_spec_ class package_def: - def __init__( self, project, name, path, revision, git_src ): + def __init__( self, project, name, path, revision, priority, git_src ): self.__project = project self.name = name self.git_path = path self.git_revision = revision + self.priority = priority self.git_src = git_src self.__my_meta_spec = None @@ -1959,6 +1966,7 @@ def make_alias_package( project, packages_dico ): alias, a_package_def.git_path, a_package_def.git_revision, + a_package_def.priority, a_package_def.git_src ) return packages_dico @@ -2032,7 +2040,7 @@ class manifestCollection: for meta_manifest in self.__my_manifest_file_list.keys(): manifest_uri = self.__my_manifest_file_list[meta_manifest] manifest_git = SPEC2YOCTO_CONFIG.get_manifest_default_git_src( meta_manifest ) - + manifest_priority = SPEC2YOCTO_CONFIG.get_manifest_priority( meta_manifest ) remote, packages_dico = self.parse_manifest_xml( manifest_uri ) if manifest_git is not None: @@ -2048,16 +2056,25 @@ class manifestCollection: if package in packages_dico.keys(): [path, revision] = packages_dico[package] if package in self.__my_package_dico.keys(): - msg = "most of one occurence of package \"%s\" ." - msg = msg % ( package ) - print >> sys.stderr, colorize( msg, "red" ) - sys.exit( 1 ) - - self.__my_package_dico[package] = package_def( self.__my_project, - package, - path, - revision, - remote ) + if manifest_priority > self.__my_package_dico[package].priority: + self.__my_package_dico[package] = package_def( self.__my_project, + package, + path, + revision, + manifest_priority, + remote ) + elif manifest_priority == self.__my_package_dico[package].priority: + msg = "most of one occurence of package \"%s\" ." + msg = msg % ( package ) + print >> sys.stderr, colorize( msg, "red" ) + sys.exit( 1 ) + else: + self.__my_package_dico[package] = package_def( self.__my_project, + package, + path, + revision, + manifest_priority, + remote ) for package in whitelist: if package not in self.__my_package_dico.keys(): msg = "package \"%s\" is in the white list but no in manifest." -- 2.7.4