diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-02 10:30:37 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-02 10:30:37 +0000 |
commit | 01ceeedc798ae5f47af6449ac2c91cc2371ef3b4 (patch) | |
tree | d55314bc393404c3c48484daa191b10f0818b925 | |
parent | 94c895aad5ad286f172b04bc33ba670220d5eba8 (diff) | |
download | poky-01ceeedc798ae5f47af6449ac2c91cc2371ef3b4.tar.gz |
bitbake.conf: Rename DEBPV to EXTENDPV to sync up with OE
-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 4387ef061c..b622b5abce 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 | |||
141 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" | 141 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" |
142 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" | 142 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" |
143 | EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" | 143 | EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" |
144 | DEBPV = "${EXTENDPEVER}${PV}-${PR}" | 144 | EXTENDPV = "${EXTENDPEVER}${PV}-${PR}" |
145 | P = "${PN}-${PV}" | 145 | P = "${PN}-${PV}" |
146 | 146 | ||
147 | # Base package name | 147 | # Base package name |
@@ -203,14 +203,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ | |||
203 | ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" | 203 | ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" |
204 | SECTION_${PN}-dev = "devel" | 204 | SECTION_${PN}-dev = "devel" |
205 | ALLOW_EMPTY_${PN}-dev = "1" | 205 | ALLOW_EMPTY_${PN}-dev = "1" |
206 | RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})" | 206 | RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" |
207 | 207 | ||
208 | FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ | 208 | FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ |
209 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ | 209 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ |
210 | ${libdir}/matchbox-panel/.debug" | 210 | ${libdir}/matchbox-panel/.debug" |
211 | SECTION_${PN}-dbg = "devel" | 211 | SECTION_${PN}-dbg = "devel" |
212 | ALLOW_EMPTY_${PN}-dbg = "1" | 212 | ALLOW_EMPTY_${PN}-dbg = "1" |
213 | RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})" | 213 | RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" |
214 | 214 | ||
215 | FILES_${PN}-locale = "${datadir}/locale" | 215 | FILES_${PN}-locale = "${datadir}/locale" |
216 | 216 | ||
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers.inc b/meta/packages/linux-libc-headers/linux-libc-headers.inc index 42cab4c0b9..1f567ca1d1 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" | |||
4 | 4 | ||
5 | #DEPENDS = "cross-linkage" | 5 | #DEPENDS = "cross-linkage" |
6 | RDEPENDS_${PN}-dev = "" | 6 | RDEPENDS_${PN}-dev = "" |
7 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 7 | 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 85e669c174..dff9a57670 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" | |||
11 | 11 | ||
12 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 12 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
13 | RDEPENDS_${PN}-dev = "" | 13 | RDEPENDS_${PN}-dev = "" |
14 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 14 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" |
15 | 15 | ||
16 | inherit autotools_stage pkgconfig | 16 | inherit autotools_stage pkgconfig |
17 | 17 | ||
diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb index 826bff7678..d2a4690937 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" | |||
14 | inherit autotools_stage pkgconfig | 14 | inherit autotools_stage pkgconfig |
15 | 15 | ||
16 | RDEPENDS_${PN}-dev = "" | 16 | RDEPENDS_${PN}-dev = "" |
17 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 17 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" |
diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc index 552e0d4df6..2d2f8b776f 100644 --- a/meta/packages/xcb/xcb-proto.inc +++ b/meta/packages/xcb/xcb-proto.inc | |||
@@ -18,4 +18,4 @@ do_stage() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | RDEPENDS_${PN}-dev = "" | 20 | RDEPENDS_${PN}-dev = "" |
21 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 21 | 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 e70afd02bf..a6603fa5a3 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 | |||
13 | 13 | ||
14 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 14 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
15 | RDEPENDS_${PN}-dev = "" | 15 | RDEPENDS_${PN}-dev = "" |
16 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 16 | 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 9cb22ade46..3e4c16b05b 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" | |||
10 | 10 | ||
11 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies | 11 | # ${PN} is empty so we need to tweak -dev and -dbg package dependencies |
12 | RDEPENDS_${PN}-dev = "" | 12 | RDEPENDS_${PN}-dev = "" |
13 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" | 13 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" |