bitbake.conf: Set RDEPENDS and RRECOMMENDS of -dev and -dbg packages to match specifi...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3115 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7bb412a13be75ab6ddac27b2992a9caa5531d0f5..8492c0d5db7d0ae10439df962944240a40222ca3 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -163,14 +163,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RDEPENDS_${PN}-dev = "${PN} (= ${PV}-${PR})"
 
 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} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${PV}-${PR})"
 
 FILES_${PN}-locale = "${datadir}/locale"
 
@@ -450,7 +450,7 @@ SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS'
 XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"'
 XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS'
 KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
-KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e $SHELLCMDS'
+KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS'
 
 # Set a default
 TERMCMD ?= "${GNOME_TERMCMD}"