From 9dbacfaf10fabfdf518d48e6e1c74c1289302997 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 23 Sep 2013 13:47:18 +0200 Subject: [PATCH] - modify imae conf. --- meta-wrt-tizen/recipes-efl/efl/evas_1.7.8.bbappend | 10 +++++----- meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal-dev.bb | 3 ++- meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal.bb | 2 +- meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/meta-wrt-tizen/recipes-efl/efl/evas_1.7.8.bbappend b/meta-wrt-tizen/recipes-efl/efl/evas_1.7.8.bbappend index 3fb0854..48c0dac 100644 --- a/meta-wrt-tizen/recipes-efl/efl/evas_1.7.8.bbappend +++ b/meta-wrt-tizen/recipes-efl/efl/evas_1.7.8.bbappend @@ -1,14 +1,14 @@ EVAS_OECONF = " --enable-pthreads " PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ -${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ -${@base_contains('DISTRO_FEATURES', 'harfbuzz', 'harfbuzz', '', d)} \ -" + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + harfbuzz \ + " PACKAGECONFIG_class-native = "" PACKAGECONFIG[x11] = " --enable-gl-xcb, ,x11" -PACKAGECONFIG[wayland] = "--enable-wayland-egl --enable-gles-variety-sgx --enable-evas_engine_gl_xcb,,wayland mesa libxkbcommon" -PACKAGECONFIG[wayland-native] = "--enable-wayland-egl --enable-gles-variety-sgx --enable-evas_engine_gl_xcb,,wayland" +PACKAGECONFIG[wayland] = "--enable-wayland-egl --enable-gles-variety-sgx ,,wayland mesa libxkbcommon" +PACKAGECONFIG_class-native[wayland-native] = "--enable-wayland-egl --enable-gles-variety-sgx ,,wayland" EXTRA_OECONF = "${EVAS_OECONF} \ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal-dev.bb b/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal-dev.bb index 6aa71fb..8a7498c 100644 --- a/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal-dev.bb +++ b/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal-dev.bb @@ -3,4 +3,5 @@ require wrt-image-minimal.bb DESCRIPTION = "A weston image with Tizen wrt and is suitable for development work." -IMAGE_FEATURES += "dev-pkgs tools-sdk tools-profile tools-testapps ssh-server-openssh " \ No newline at end of file +IMAGE_FEATURES += "dev-pkgs tools-sdk tools-profile tools-testapps ssh-server-openssh " +RDEPENDS_${PN} += "vim git" \ No newline at end of file diff --git a/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal.bb b/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal.bb index 804ea60..564ee5f 100644 --- a/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal.bb +++ b/meta-wrt-tizen/recipes-wrt/image/wrt-image-minimal.bb @@ -2,4 +2,4 @@ require recipes-graphics/images/core-image-weston.bb DESCRIPTION = "A weston image with Tizen wrt." -IMAGE_INSTALL += "packagegroup-wrt" +IMAGE_INSTALL += "packagegroup-wrt config-image-weston-user" diff --git a/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb b/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb index 2497d9f..4dd29bc 100644 --- a/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb +++ b/meta-wrt-tizen/recipes-wrt/packagegroup/packagegroup-wrt.bb @@ -5,12 +5,12 @@ PR = "r1" inherit packagegroup -RDEPENDS_${PN} = "wrt wrt-commons wrt-installer wrt-plugins-common wrt-security " - -RDEPENDS_${PN} += "wrt-plugins-tizen" +#RDEPENDS_${PN} = "wrt wrt-commons wrt-installer wrt-plugins-common wrt-security " +#RDEPENDS_${PN} += "wrt-plugins-tizen" +#RDEPENDS_${PN} += "wrt-widgets" RDEPENDS_${PN} += "webkit2-efl" -#RDEPENDS_${PN} += "wrt-widgets" + -- 2.7.4