diff options
| author | Rene Wagner <rw@handhelds.org> | 2005-08-27 00:35:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-27 00:35:47 +0000 |
| commit | c9310255bcef16e59907891f5ef65a897bd52297 (patch) | |
| tree | 8202942e8390597aa917e22fc0de92b109611d79 /classes | |
| parent | 5da3f4af1e4e6b558b6249b9db7ba89306ed9db2 (diff) | |
| parent | bfe154780c963a74e76688b840786da3ffe3fbe2 (diff) | |
merge of bdbeb53fb07854a8484b17504b9ab11113e0fe51
and fda50be34c5e8aeb2a40fcb38520b83eea2db043
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/efl.bbclass | 4 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/classes/efl.bbclass b/classes/efl.bbclass index ff6929d757..16c2dba0b8 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -69,8 +69,8 @@ do_stage_append () { } PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples" -FILES_${SRCNAME} = "${libdir}" +FILES_${SRCNAME} = "${libdir}/lib*.so*" FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles" -FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${datadir}/${SRCNAME}/include" +FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include" FILES_${SRCNAME}-examples = "${bindir} ${datadir}" diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 8b2186dec6..ff9aeeab78 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -193,6 +193,7 @@ module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" # alias defaults (alphabetically sorted) +module_conf_af_packet = "alias net-pf-17 af_packet" module_conf_bluez = "alias net-pf-31 bluez" module_conf_bnep = "alias bt-proto-4 bnep" module_conf_hci_uart = "alias tty-ldisc-15 hci_uart" @@ -229,7 +230,7 @@ python populate_packages_prepend () { kernelver = bb.data.getVar('PV', d, 1) + bb.data.getVar('KERNEL_LOCALVERSION', d, 1) kernelver_stripped = kernelver - m = re.match('^(.*-hh.*)\..*$', kernelver) + m = re.match('^(.*-hh.*)[\.\+].*$', kernelver) if m: kernelver_stripped = m.group(1) path = bb.data.getVar("PATH", d, 1) |