diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 9 | ||||
| -rw-r--r-- | classes/lib_package.bbclass | 2 | ||||
| -rw-r--r-- | classes/module-base.bbclass | 10 | ||||
| -rw-r--r-- | classes/opie_i18n.bbclass | 12 |
4 files changed, 18 insertions, 15 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 598380be36..8b2186dec6 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -184,18 +184,21 @@ if [ x"$D" = "x" ]; then fi } -# defaults +# autoload defaults (alphabetically sorted) +module_autoload_hidp = "hidp" module_autoload_ipv6 = "ipv6" module_autoload_ipsec = "ipsec" module_autoload_ircomm-tty = "ircomm-tty" +module_autoload_rfcomm = "rfcomm" module_autoload_sa1100-rtc = "sa1100-rtc" +# alias defaults (alphabetically sorted) 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" module_conf_l2cap = "alias bt-proto-0 l2cap" module_conf_sco = "alias bt-proto-2 sco" module_conf_rfcomm = "alias bt-proto-3 rfcomm" -module_conf_bnep = "alias bt-proto-4 bnep" -module_conf_hci_uart = "alias tty-ldisc-15 hci_uart" python populate_packages_prepend () { def extract_modinfo(file): diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass index 5042ed5a95..e29d2659b0 100644 --- a/classes/lib_package.bbclass +++ b/classes/lib_package.bbclass @@ -1,4 +1,4 @@ -PACKAGES = ${PN} ${PN}-dev ${PN}-doc ${PN}-bin +PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-bin" FILES_${PN} = "${libexecdir} ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index 41192807be..df0941d561 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -5,11 +5,11 @@ inherit kernel-arch export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" -export KERNEL_VERSION = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')} -export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')} -KERNEL_OBJECT_SUFFIX = ${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]} -KERNEL_CCSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')} -KERNEL_LDSUFFIX = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')} +export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" +export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" +KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" +KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" +KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX}" KERNEL_LD = "${LD}${KERNEL_LDSUFFIX}" diff --git a/classes/opie_i18n.bbclass b/classes/opie_i18n.bbclass index 7ceae83124..cb3d07de75 100644 --- a/classes/opie_i18n.bbclass +++ b/classes/opie_i18n.bbclass @@ -9,7 +9,7 @@ # I18N_STATS = "1" -SRC_URI += "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n" +SRC_URI += "${HANDHELDS_CVS};module=opie/i18n" DEPENDS += "opie-i18n" die () { @@ -122,14 +122,14 @@ do_build_opie_i18n () { # If we don't adjust FILES to exclude the i18n directory, we will end up with # _lots_ of empty i18n/$lang directories in the original .ipk. - if (echo "${FILES}" | egrep "/opt/QtPalmtop/? |/opt/QtPalmtop/?$") &>/dev/null + if (echo "${FILES}" | egrep "${palmtopdir}/? |${palmtopdir}/?$") &>/dev/null then - echo "NOTE: FILES was set to /opt/QtPalmtop which would include the i18n directory" - echo -e "\n\nI'll remove /opt/QtPalmtop from FILES and replace it with all directories" + echo "NOTE: FILES was set to ${palmtopdir} which would include the i18n directory" + echo -e "\n\nI'll remove ${palmtopdir} from FILES and replace it with all directories" echo "below QtPalmtop, except i18n ($qt_dirs). See classes/opie_i18n.oeclass for details" # Removes /opt/QtPalmtop from FILES but keeps /opt/QtPalmtop/$some_dir - FILES="`echo "$FILES"| sed "s#/opt/QtPalmtop[/]\?\$\|/opt/QtPalmtop[/]\? ##"`" + FILES="`echo "$FILES"| sed "s#${palmtopdir}[/]\?\$\|${palmtopdir}[/]\? ##"`" echo "${PN}#$FILES $dir_" >> "${WORKDIR}/FILES.tmp" fi @@ -138,7 +138,7 @@ do_build_opie_i18n () { if test -z "${FILES}" then echo "NOTE:" - echo -e "Since FILES is empty, i'll add all directories below /o/QtPalmtop to it,\nexcluding i18n: ( $qt_dirs )" + echo -e "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )" echo "${PN}#$FILES $dir_" >> "${WORKDIR}/FILES.tmp" fi |