summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:01:29 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:01:29 (GMT)
commit19f1bad37806b5e0b4d971d09226eda51345c9d2 (patch)
tree520a5e51fd16ee7fba10a8b948af76c45e592322 /meta
parent83930b32c8c405a39659c9db1a76a732d1aacd96 (diff)
downloadpoky-19f1bad37806b5e0b4d971d09226eda51345c9d2.tar.gz
bitbake.conf: Set RDEPENDS and RRECOMMENDS of -dev and -dbg packages to match specific versions, not >=. Fix typo.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3115 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7bb412a..8492c0d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -163,14 +163,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
163 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" 163 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
164SECTION_${PN}-dev = "devel" 164SECTION_${PN}-dev = "devel"
165ALLOW_EMPTY_${PN}-dev = "1" 165ALLOW_EMPTY_${PN}-dev = "1"
166RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" 166RDEPENDS_${PN}-dev = "${PN} (= ${PV}-${PR})"
167 167
168FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ 168FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
169 ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ 169 ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
170 ${libdir}/matchbox-panel/.debug" 170 ${libdir}/matchbox-panel/.debug"
171SECTION_${PN}-dbg = "devel" 171SECTION_${PN}-dbg = "devel"
172ALLOW_EMPTY_${PN}-dbg = "1" 172ALLOW_EMPTY_${PN}-dbg = "1"
173RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" 173RRECOMMENDS_${PN}-dbg = "${PN} (= ${PV}-${PR})"
174 174
175FILES_${PN}-locale = "${datadir}/locale" 175FILES_${PN}-locale = "${datadir}/locale"
176 176
@@ -450,7 +450,7 @@ SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS'
450XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' 450XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"'
451XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS' 451XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS'
452KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' 452KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
453KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e $SHELLCMDS' 453KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS'
454 454
455# Set a default 455# Set a default
456TERMCMD ?= "${GNOME_TERMCMD}" 456TERMCMD ?= "${GNOME_TERMCMD}"