summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.0p1.bb4
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb4
-rw-r--r--meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb4
-rw-r--r--meta/recipes-support/db/db_5.3.15.bb4
13 files changed, 26 insertions, 26 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 04fd6a9c69..376023c635 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -7,14 +7,14 @@ SECTION = "console/network"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10PR = "r1" 10PR = "r2"
11 11
12DEPENDS = "zlib openssl" 12DEPENDS = "zlib openssl"
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
15RPROVIDES = "ssh sshd" 15RPROVIDES = "ssh sshd"
16 16
17CONFLICTS_${PN} = "dropbear" 17RCONFLICTS_${PN} = "dropbear"
18RCONFLICTS_${PN}-sshd = "dropbear" 18RCONFLICTS_${PN}-sshd = "dropbear"
19RCONFLICTS_${PN}-keygen = "ssh-keygen" 19RCONFLICTS_${PN}-keygen = "ssh-keygen"
20 20
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 253ea43851..7dd884449d 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,12 +5,12 @@ SECTION = "libs"
5LICENSE = "GPLv3+ & LGPL-2.1+" 5LICENSE = "GPLv3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r13" 8PR = "r14"
9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" 10DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_virtclass-native = "virtual/gettext-native" 12PROVIDES_virtclass-native = "virtual/gettext-native"
13CONFLICTS_${PN} = "proxy-libintl" 13RCONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://parallel.patch \ 15 file://parallel.patch \
16 " 16 "
diff --git a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
index 093ee9924c..adfee26306 100644
--- a/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
+++ b/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
@@ -10,10 +10,10 @@ LICENSE = "MIT & MIT-style"
10LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \
11 file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926" 11 file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926"
12 12
13CONFLICTS = "compositeext" 13RCONFLICTS_${PN} = "compositeext"
14BBCLASSEXTEND = "native" 14BBCLASSEXTEND = "native"
15 15
16PR = "r0" 16PR = "r1"
17PE = "1" 17PE = "1"
18 18
19SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0" 19SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0"
diff --git a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
index de2d69cb28..75d0268108 100644
--- a/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
@@ -11,9 +11,9 @@ LICENSE = "MIT-style"
11LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \
12 file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296" 12 file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296"
13 13
14CONFLICTS = "damageext" 14RCONFLICTS_${PN} = "damageext"
15BBCLASSEXTEND = "native" 15BBCLASSEXTEND = "native"
16PR = "r0" 16PR = "r1"
17PE = "1" 17PE = "1"
18 18
19SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95" 19SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95"
diff --git a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
index 2c05cf7149..39fb88d84c 100644
--- a/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
+++ b/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
@@ -12,8 +12,8 @@ LICENSE = "MIT & MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \
13 file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4" 13 file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4"
14 14
15CONFLICTS = "fixesext" 15RCONFLICTS_${PN} = "fixesext"
16PR = "r0" 16PR = "r1"
17PE = "1" 17PE = "1"
18 18
19BBCLASSEXTEND = "native nativesdk" 19BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb b/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
index e4fe37b44e..17b709fbae 100644
--- a/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-proto/randrproto_1.3.2.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
10LIC_FILES_CHKSUM = "file://COPYING;md5=5fa3f85d9eefaa3a945071485be11343 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=5fa3f85d9eefaa3a945071485be11343 \
11 file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f" 11 file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f"
12 12
13CONFLICTS = "randrext" 13RCONFLICTS_${PN} = "randrext"
14PR = "r0" 14PR = "r1"
15PE = "1" 15PE = "1"
16 16
17BBCLASSEXTEND = "native nativesdk" 17BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
index 24404a74d9..ad2317c26e 100644
--- a/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
+++ b/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
10LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \
11 file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738" 11 file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738"
12 12
13CONFLICTS = "recordext" 13RCONFLICTS_${PN} = "recordext"
14PR = "r0" 14PR = "r1"
15PE = "1" 15PE = "1"
16 16
17SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216" 17SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216"
diff --git a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
index 5eb06cbf87..ff800ec831 100644
--- a/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
+++ b/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
@@ -10,8 +10,8 @@ LICENSE = "MIT-style"
10LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \
11 file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f" 11 file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f"
12 12
13CONFLICTS = "renderext" 13RCONFLICTS_${PN} = "renderext"
14PR = "r0" 14PR = "r1"
15PE = "1" 15PE = "1"
16 16
17BBCLASSEXTEND = "native nativesdk" 17BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
index 92c37c6f62..08b610aea5 100644
--- a/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
@@ -9,9 +9,9 @@ see and monitor X resource usage of various clients."
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97" 10LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
11 11
12CONFLICTS = "resourceext" 12RCONFLICTS_${PN} = "resourceext"
13 13
14PR = "r0" 14PR = "r1"
15PE = "1" 15PE = "1"
16 16
17SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4" 17SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"
diff --git a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
index f70d79daeb..86f3ce328f 100644
--- a/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
@@ -10,8 +10,8 @@ reporting."
10LICENSE = "MIT" 10LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6" 11LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
12 12
13CONFLICTS = "xxf86dgaext" 13RCONFLICTS_${PN} = "xxf86dgaext"
14PR = "r1" 14PR = "r2"
15PE = "1" 15PE = "1"
16 16
17SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1" 17SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
diff --git a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
index 721e7b0e13..0f31900a9e 100644
--- a/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
+++ b/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
@@ -9,9 +9,9 @@ and set video mode timings."
9LICENSE = "MIT" 9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502" 10LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502"
11 11
12CONFLICTS = "xxf86vmext" 12RCONFLICTS_${PN} = "xxf86vmext"
13 13
14PR = "r0" 14PR = "r1"
15PE = "1" 15PE = "1"
16 16
17SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e" 17SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e"
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
index 5daeb72762..e1a7e0ef76 100644
--- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
+++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7 7
8SECTION = "x11" 8SECTION = "x11"
9DEPENDS = "" 9DEPENDS = ""
10CONFLICTS = "matchbox-common" 10RCONFLICTS_${PN} = "matchbox-common"
11 11
12SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" 12SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
13PV = "0.1+git${SRCPV}" 13PV = "0.1+git${SRCPV}"
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" 16SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
17 17
diff --git a/meta/recipes-support/db/db_5.3.15.bb b/meta/recipes-support/db/db_5.3.15.bb
index 9d2bbe5e46..a34ad24a74 100644
--- a/meta/recipes-support/db/db_5.3.15.bb
+++ b/meta/recipes-support/db/db_5.3.15.bb
@@ -13,8 +13,8 @@ DESCRIPTION = "Berkeley DB v5."
13HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" 13HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
14LICENSE = "Sleepycat" 14LICENSE = "Sleepycat"
15VIRTUAL_NAME ?= "virtual/db" 15VIRTUAL_NAME ?= "virtual/db"
16CONFLICTS = "db3" 16RCONFLICTS_${PN} = "db3"
17PR = "r5" 17PR = "r6"
18 18
19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
20SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.." 20SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."