diff options
-rw-r--r-- | meta/conf/bitbake.conf | 6 | ||||
-rw-r--r-- | meta/packages/linux-libc-headers/linux-libc-headers.inc | 2 | ||||
-rw-r--r-- | meta/packages/maemo/xpext_1.0-5.bb | 2 | ||||
-rw-r--r-- | meta/packages/xcb/libpthread-stubs_0.1.bb | 2 | ||||
-rw-r--r-- | meta/packages/xcb/xcb-proto.inc | 2 | ||||
-rw-r--r-- | meta/packages/xorg-proto/xorg-proto-common.inc | 2 | ||||
-rw-r--r-- | meta/packages/xorg-util/util-macros_1.2.1.bb | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4387ef061..b622b5abc 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -141,7 +141,7 @@ PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0 PF = "${PN}-${EXTENDPE}${PV}-${PR}" EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" -DEBPV = "${EXTENDPEVER}${PV}-${PR}" +EXTENDPV = "${EXTENDPEVER}${PV}-${PR}" P = "${PN}-${PV}" # Base package name @@ -203,14 +203,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" -RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})" +RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" FILES_${PN}-locale = "${datadir}/locale" diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/packages/linux-libc-headers/linux-libc-headers.inc index 42cab4c0b..1f567ca1d 100644 --- a/meta/packages/linux-libc-headers/linux-libc-headers.inc +++ b/meta/packages/linux-libc-headers/linux-libc-headers.inc @@ -4,4 +4,4 @@ LICENSE = "GPL" #DEPENDS = "cross-linkage" RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb index 85e669c17..dff9a5767 100644 --- a/meta/packages/maemo/xpext_1.0-5.bb +++ b/meta/packages/maemo/xpext_1.0-5.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/xpext-1.0" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" inherit autotools_stage pkgconfig diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb index 826bff767..d2a469093 100644 --- a/meta/packages/xcb/libpthread-stubs_0.1.bb +++ b/meta/packages/xcb/libpthread-stubs_0.1.bb @@ -14,4 +14,4 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" inherit autotools_stage pkgconfig RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc index 552e0d4df..2d2f8b776 100644 --- a/meta/packages/xcb/xcb-proto.inc +++ b/meta/packages/xcb/xcb-proto.inc @@ -18,4 +18,4 @@ do_stage() { } RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc index e70afd02b..a6603fa5a 100644 --- a/meta/packages/xorg-proto/xorg-proto-common.inc +++ b/meta/packages/xorg-proto/xorg-proto-common.inc @@ -13,4 +13,4 @@ inherit autotools_stage pkgconfig # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" diff --git a/meta/packages/xorg-util/util-macros_1.2.1.bb b/meta/packages/xorg-util/util-macros_1.2.1.bb index 9cb22ade4..3e4c16b05 100644 --- a/meta/packages/xorg-util/util-macros_1.2.1.bb +++ b/meta/packages/xorg-util/util-macros_1.2.1.bb @@ -10,4 +10,4 @@ XORG_PN = "util-macros" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" |