recipes: replace CONFLICTS with RCONFLICTS_${PN}
(From OE-Core rev: fbcda6eff010e0a39cc0145a514e7de99f475145) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0529f93440
commit
79e4de8406
|
@ -7,14 +7,14 @@ SECTION = "console/network"
|
|||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
|
||||
|
||||
PR = "r1"
|
||||
PR = "r2"
|
||||
|
||||
DEPENDS = "zlib openssl"
|
||||
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||
|
||||
RPROVIDES = "ssh sshd"
|
||||
|
||||
CONFLICTS_${PN} = "dropbear"
|
||||
RCONFLICTS_${PN} = "dropbear"
|
||||
RCONFLICTS_${PN}-sshd = "dropbear"
|
||||
RCONFLICTS_${PN}-keygen = "ssh-keygen"
|
||||
|
||||
|
|
|
@ -5,12 +5,12 @@ SECTION = "libs"
|
|||
LICENSE = "GPLv3+ & LGPL-2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
PR = "r13"
|
||||
PR = "r14"
|
||||
DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
|
||||
DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native"
|
||||
PROVIDES = "virtual/libintl virtual/gettext"
|
||||
PROVIDES_virtclass-native = "virtual/gettext-native"
|
||||
CONFLICTS_${PN} = "proxy-libintl"
|
||||
RCONFLICTS_${PN} = "proxy-libintl"
|
||||
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
|
||||
file://parallel.patch \
|
||||
"
|
||||
|
|
|
@ -10,10 +10,10 @@ LICENSE = "MIT & MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=2c4bfe136f4a4418ea2f2a96b7c8f3c5 \
|
||||
file://composite.h;endline=43;md5=cbd44d4079053aa75930ed2f02b92926"
|
||||
|
||||
CONFLICTS = "compositeext"
|
||||
RCONFLICTS_${PN} = "compositeext"
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "98482f65ba1e74a08bf5b056a4031ef0"
|
||||
|
|
|
@ -11,9 +11,9 @@ LICENSE = "MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=d5f5a2de65c3a84cbde769f07a769608 \
|
||||
file://damagewire.h;endline=23;md5=4a4501a592dbc7de5ce89255e50d0296"
|
||||
|
||||
CONFLICTS = "damageext"
|
||||
RCONFLICTS_${PN} = "damageext"
|
||||
BBCLASSEXTEND = "native"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "998e5904764b82642cc63d97b4ba9e95"
|
||||
|
|
|
@ -12,8 +12,8 @@ LICENSE = "MIT & MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=262a7a87da56e66dd639bf7334a110c6 \
|
||||
file://xfixesproto.h;endline=43;md5=c3a9ee6db3532ed0d44dea266cfc97f4"
|
||||
|
||||
CONFLICTS = "fixesext"
|
||||
PR = "r0"
|
||||
RCONFLICTS_${PN} = "fixesext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
|
@ -10,8 +10,8 @@ LICENSE = "MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=5fa3f85d9eefaa3a945071485be11343 \
|
||||
file://randrproto.h;endline=30;md5=3885957c6048fdf3310ac8ba54ca2c3f"
|
||||
|
||||
CONFLICTS = "randrext"
|
||||
PR = "r0"
|
||||
RCONFLICTS_${PN} = "randrext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
|
@ -10,8 +10,8 @@ LICENSE = "MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=575827a0f554bbed332542976d5f3d40 \
|
||||
file://recordproto.h;endline=19;md5=1cbb0dd45a0b060ff833901620a3e738"
|
||||
|
||||
CONFLICTS = "recordext"
|
||||
PR = "r0"
|
||||
RCONFLICTS_${PN} = "recordext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "1b4e5dede5ea51906f1530ca1e21d216"
|
||||
|
|
|
@ -10,8 +10,8 @@ LICENSE = "MIT-style"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=f826d99765196352e6122a406cf0d024 \
|
||||
file://renderproto.h;beginline=4;endline=24;md5=3e5e2851dad240b0a3a27c4776b4fd1f"
|
||||
|
||||
CONFLICTS = "renderext"
|
||||
PR = "r0"
|
||||
RCONFLICTS_${PN} = "renderext"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
|
@ -9,9 +9,9 @@ see and monitor X resource usage of various clients."
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=604859305e662503077240fee8c77d97"
|
||||
|
||||
CONFLICTS = "resourceext"
|
||||
RCONFLICTS_${PN} = "resourceext"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "cfdb57dae221b71b2703f8e2980eaaf4"
|
||||
|
|
|
@ -10,8 +10,8 @@ reporting."
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e01e66e4b317088cf869bc98e6af4fb6"
|
||||
|
||||
CONFLICTS = "xxf86dgaext"
|
||||
PR = "r1"
|
||||
RCONFLICTS_${PN} = "xxf86dgaext"
|
||||
PR = "r2"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
|
||||
|
|
|
@ -9,9 +9,9 @@ and set video mode timings."
|
|||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=499be2ff387a42f84628c35f311f1502"
|
||||
|
||||
CONFLICTS = "xxf86vmext"
|
||||
RCONFLICTS_${PN} = "xxf86vmext"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
PE = "1"
|
||||
|
||||
SRC_URI[md5sum] = "e793ecefeaecfeabd1aed6a01095174e"
|
||||
|
|
|
@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
|
|||
|
||||
SECTION = "x11"
|
||||
DEPENDS = ""
|
||||
CONFLICTS = "matchbox-common"
|
||||
RCONFLICTS_${PN} = "matchbox-common"
|
||||
|
||||
SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07"
|
||||
PV = "0.1+git${SRCPV}"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
|
||||
|
||||
|
|
|
@ -13,8 +13,8 @@ DESCRIPTION = "Berkeley DB v5."
|
|||
HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
|
||||
LICENSE = "Sleepycat"
|
||||
VIRTUAL_NAME ?= "virtual/db"
|
||||
CONFLICTS = "db3"
|
||||
PR = "r5"
|
||||
RCONFLICTS_${PN} = "db3"
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
|
||||
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
|
||||
|
|
Loading…
Reference in New Issue