From c4c7d4729805dd7fef39478dcd90b4abf58c1599 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 5 Apr 2013 14:49:32 +0200 Subject: [PATCH] - remove build dep for coreutils. --- Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-git-config | 4 ++-- Tizen_TZ_package/recipes-Tizen-IVI-base/package-provided-extra | 5 ++++- Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe | 3 ++- Tizen_TZ_package/spec2yocto.py | 9 ++++++++- .../recipes-tizen/libatomic_ops/libatomic_ops-depends.inc | 1 - meta-tizen-ivi/recipes-tizen/libdrm/libdrm-native_git.bb | 2 +- meta-tizen-ivi/recipes-tizen/libdrm/libdrm_git.bb | 2 +- .../recipes-tizen/mic-bootstrap/mic-bootstrap-depends.inc | 1 - meta-tizen-ivi/recipes-tizen/openssl/openssl-depends.inc | 1 - .../recipes-tizen/tizen-coreutils/tizen-coreutils-rprovides.inc | 2 -- .../recipes-tizen/xorg-glproto/xorg-glproto-native_git.bb | 2 +- meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto_git.bb | 2 +- .../xorg-x11-proto-fixes/xorg-x11-proto-fixes-rdepends.inc | 2 +- 13 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-git-config b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-git-config index b706dbc..947fbca 100644 --- a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-git-config +++ b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-git-config @@ -378,7 +378,7 @@ capi-content-mime-type capi-content-mime-type.spec framework/api/mime-type tizen embryo embryo.spec profile/ivi/embryo 2.0alpha-wayland libmm-sound libmm-sound.spec profile/ivi/libmm-sound 2.0alpha org.tizen.browser org.tizen.browser.spec profile/ivi/org.tizen.browser 2.0 -libdrm libdrm.spec profile/ivi/libdrm tizen_2.0 +libdrm libdrm.spec profile/ivi/libdrm 2.0alpha bootchart bootchart.spec profile/ivi/bootchart 2.0 speex speex.spec external/speex tizen_2.0 xorg-x11-drv-evdev-multitouch xorg-x11-drv-evdev-multitouch.spec profile/ivi/xorg-x11-drv-evdev-multitouch 2.0alpha @@ -468,7 +468,7 @@ nfc-manager nfc-manager.spec framework/connectivity/nfc-manager 2.0alpha ed ed.spec toolchains/ed tizen_2.0 capi-system-media-key capi-system-media-key.spec framework/api/media-key tizen_2.0 murphy murphy.spec profile/ivi/murphy 2.0alpha -xorg-glproto xorg-glproto.spec profile/ivi/xorg-glproto 2.0 +xorg-glproto xorg-glproto.spec profile/ivi/xorg-glproto 2.0alpha smartcard-plugin-nfc smartcard-plugin-nfc.spec framework/system/smartcard-plugin-nfc 2.0alpha org.tizen.download-manager org.tizen.download-manager.spec apps/web/download-manager 2.0alpha libtheora libtheora.spec external/libtheora tizen_2.0 diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-provided-extra b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-provided-extra index 1219f7b..8037641 100644 --- a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-provided-extra +++ b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-provided-extra @@ -13,4 +13,7 @@ cpio::::/bin/cpio gawk::::/bin/awk gzip::::/bin/gzip findutils::::/bin/find -grep::::/bin/grep \ No newline at end of file +grep::::/bin/grep +coreutils::::mktemp +xorg-x11-xutils-dev:::util-macros +xorg-x11-proto-xext::::xextproto \ No newline at end of file diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe index 5b9f83a..b526b7d 100644 --- a/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe +++ b/Tizen_TZ_package/recipes-Tizen-IVI-base/package-yocto-oe @@ -9,4 +9,5 @@ gettext libgcc linux-libc-headers perl -m4 \ No newline at end of file +m4 +coreutils \ No newline at end of file diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py index bc84ad2..9ef0c02 100755 --- a/Tizen_TZ_package/spec2yocto.py +++ b/Tizen_TZ_package/spec2yocto.py @@ -990,6 +990,10 @@ class metaSpec: pkg=p[0] if not len(p)==1: f.write("# the PROVIDES rules is ignore \"%s %s %s\"\n" % (pkg,p[1],p[2])) + + if (pkg == "mktemp" and self.__package_name=="tizen-coreutils"): + continue + f.write("PROVIDES += \"%s\"\n" % (pkg)) f.write("RPROVIDES_%s += \"%s\"\n" % (kp,pkg)) @@ -1176,7 +1180,10 @@ class metaSpec: elif res == "cmake": f.write("DEPENDS += \"cmake-native\"\n") - elif res == "libtool": + elif res in ["coreutils","tizen-coreutils"]: + pass + + elif res in [ "libtool","libtool-ltdl-devel","libtool-ltdl"]: f.write("DEPENDS += \"libtool-native\"\n") elif res == "autoconf": diff --git a/meta-tizen-ivi/recipes-tizen/libatomic_ops/libatomic_ops-depends.inc b/meta-tizen-ivi/recipes-tizen/libatomic_ops/libatomic_ops-depends.inc index 381e34b..b8804a9 100644 --- a/meta-tizen-ivi/recipes-tizen/libatomic_ops/libatomic_ops-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/libatomic_ops/libatomic_ops-depends.inc @@ -1,3 +1,2 @@ DEPENDS = "" #DEPENDS of libatomic_ops -DEPENDS += "tizen-coreutils" diff --git a/meta-tizen-ivi/recipes-tizen/libdrm/libdrm-native_git.bb b/meta-tizen-ivi/recipes-tizen/libdrm/libdrm-native_git.bb index c47a45d..86ec7de 100644 --- a/meta-tizen-ivi/recipes-tizen/libdrm/libdrm-native_git.bb +++ b/meta-tizen-ivi/recipes-tizen/libdrm/libdrm-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/profile/ivi/libdrm;protocol=ssh;tag=tizen_2.0" +SRC_URI += "git://review.tizen.org/profile/ivi/libdrm;protocol=ssh;tag=2.0alpha" require libdrm-native-extraconf.inc diff --git a/meta-tizen-ivi/recipes-tizen/libdrm/libdrm_git.bb b/meta-tizen-ivi/recipes-tizen/libdrm/libdrm_git.bb index 754d235..849f567 100644 --- a/meta-tizen-ivi/recipes-tizen/libdrm/libdrm_git.bb +++ b/meta-tizen-ivi/recipes-tizen/libdrm/libdrm_git.bb @@ -7,6 +7,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/libdrm;protocol=ssh;tag=tizen_2.0" +SRC_URI += "git://review.tizen.org/profile/ivi/libdrm;protocol=ssh;tag=2.0alpha" require libdrm-oe-extraconf.inc diff --git a/meta-tizen-ivi/recipes-tizen/mic-bootstrap/mic-bootstrap-depends.inc b/meta-tizen-ivi/recipes-tizen/mic-bootstrap/mic-bootstrap-depends.inc index aa8e41c..a97b3cb 100644 --- a/meta-tizen-ivi/recipes-tizen/mic-bootstrap/mic-bootstrap-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/mic-bootstrap/mic-bootstrap-depends.inc @@ -5,7 +5,6 @@ DEPENDS += "syslinux" DEPENDS += "grep" DEPENDS += "libzypp-bindings" DEPENDS += "mic" -DEPENDS += "tizen-coreutils" DEPENDS += "psmisc" DEPENDS += "python-base" DEPENDS += "rpm-python" diff --git a/meta-tizen-ivi/recipes-tizen/openssl/openssl-depends.inc b/meta-tizen-ivi/recipes-tizen/openssl/openssl-depends.inc index 85e7e09..4aca61e 100644 --- a/meta-tizen-ivi/recipes-tizen/openssl/openssl-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/openssl/openssl-depends.inc @@ -2,5 +2,4 @@ DEPENDS = "" #DEPENDS of openssl DEPENDS += "zlib" DEPENDS += "sed" -DEPENDS += "tizen-coreutils" DEPENDS += "util-linux-ng" diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-rprovides.inc b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-rprovides.inc index fd28df6..b5358e8 100644 --- a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-rprovides.inc +++ b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-rprovides.inc @@ -14,8 +14,6 @@ RPROVIDES_tizen-coreutils += "stat" PROVIDES += "textutils" RPROVIDES_tizen-coreutils += "textutils" # the PROVIDES rules is ignore "mktemp " -PROVIDES += "mktemp" -RPROVIDES_tizen-coreutils += "mktemp" # the PROVIDES rules is ignore "coreutils " PROVIDES += "coreutils" RPROVIDES_tizen-coreutils += "coreutils" diff --git a/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto-native_git.bb b/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto-native_git.bb index 2817fb0..4447c55 100644 --- a/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto-native_git.bb +++ b/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto-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/profile/ivi/xorg-glproto;protocol=ssh;tag=2.0" +SRC_URI += "git://review.tizen.org/profile/ivi/xorg-glproto;protocol=ssh;tag=2.0alpha" require xorg-glproto-native-extraconf.inc diff --git a/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto_git.bb b/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto_git.bb index ca2cc11..b983dda 100644 --- a/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto_git.bb +++ b/meta-tizen-ivi/recipes-tizen/xorg-glproto/xorg-glproto_git.bb @@ -7,6 +7,6 @@ S = "${WORKDIR}/git" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/profile/ivi/xorg-glproto;protocol=ssh;tag=2.0" +SRC_URI += "git://review.tizen.org/profile/ivi/xorg-glproto;protocol=ssh;tag=2.0alpha" require xorg-glproto-oe-extraconf.inc diff --git a/meta-tizen-ivi/recipes-tizen/xorg-x11-proto-fixes/xorg-x11-proto-fixes-rdepends.inc b/meta-tizen-ivi/recipes-tizen/xorg-x11-proto-fixes/xorg-x11-proto-fixes-rdepends.inc index 2c38125..b7a0135 100644 --- a/meta-tizen-ivi/recipes-tizen/xorg-x11-proto-fixes/xorg-x11-proto-fixes-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/xorg-x11-proto-fixes/xorg-x11-proto-fixes-rdepends.inc @@ -1,5 +1,5 @@ RDEPENDS = "" #RDEPENDS of xorg-x11-proto-fixes -RDEPENDS_xorg-x11-proto-fixes += "xextproto" +RDEPENDS_xorg-x11-proto-fixes += "xorg-x11-proto-xext" -- 2.7.4