diff options
76 files changed, 3293 insertions, 1398 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index de503c5ad7..ace5d1a5de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,7 @@ Person: Cliff Brake Mail: cbrake@bec-systems.com Website: http://bec-systems.com Interests: Support in OE for single board computers, web application support -Machines: compulab-pxa270, logicpd-pxa270 +Machines: compulab-pxa270, logicpd-pxa270, devkitidp-pxa255 Person: Erik Hovland Mail: erik@hovland.org diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 9c7ff8a207..21f441e3d0 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -14,12 +14,7 @@ KERNEL_IMAGETYPE ?= "zImage" KERNEL_PRIORITY = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[-1]}" -# [jbowler 20051109] ${PV}${KERNEL_LOCALVERSION} is used throughout this -# .bbclass to (apparently) find the full 'uname -r' kernel version, this -# should be the same as UTS_RELEASE or (in this file) KERNEL_VERSION: -# KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION) -# but since this is not certain this overridable setting is used here: -KERNEL_RELEASE ?= "${PV}${KERNEL_LOCALVERSION}" +KERNEL_RELEASE ?= "${KERNEL_VERSION}" KERNEL_CCSUFFIX ?= "" KERNEL_LDSUFFIX ?= "" @@ -111,9 +106,9 @@ kernel_do_stage() { cp -fR drivers/sound/*.h ${STAGING_KERNEL_DIR}/include/drivers/sound/ fi - install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_RELEASE} - ln -sf config-${KERNEL_RELEASE} ${STAGING_KERNEL_DIR}/.config - ln -sf config-${KERNEL_RELEASE} ${STAGING_KERNEL_DIR}/kernel-config + install -m 0644 .config ${STAGING_KERNEL_DIR}/config-${KERNEL_VERSION} + ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/.config + ln -sf config-${KERNEL_VERSION} ${STAGING_KERNEL_DIR}/kernel-config echo "${KERNEL_VERSION}" >${STAGING_KERNEL_DIR}/kernel-abiversion echo "${S}" >${STAGING_KERNEL_DIR}/kernel-source echo "${KERNEL_CCSUFFIX}" >${STAGING_KERNEL_DIR}/kernel-ccsuffix @@ -128,7 +123,7 @@ kernel_do_stage() { fi cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} - install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} + install -m 0644 System.map ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} [ -e Module.symvers ] && install -m 0644 Module.symvers ${STAGING_KERNEL_DIR}/ cp -fR scripts ${STAGING_KERNEL_DIR}/ @@ -144,9 +139,9 @@ kernel_do_install() { install -d ${D}/${KERNEL_IMAGEDEST} install -d ${D}/boot - install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} - install -m 0644 System.map ${D}/boot/System.map-${KERNEL_RELEASE} - install -m 0644 .config ${D}/boot/config-${KERNEL_RELEASE} + install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} + install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -d ${D}/etc/modutils # Check if scripts/genksyms exists and if so, build it @@ -163,11 +158,11 @@ kernel_do_configure() { } pkg_postinst_kernel () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true + cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} || true + cd /${KERNEL_IMAGEDEST}; update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true } inherit cml1 @@ -184,11 +179,11 @@ ALLOW_EMPTY_kernel = "1" ALLOW_EMPTY_kernel-image = "1" pkg_postinst_kernel-image () { -if [ ! -e "$D/lib/modules/${KERNEL_RELEASE}" ]; then - mkdir -p $D/lib/modules/${KERNEL_RELEASE} +if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then + mkdir -p $D/lib/modules/${KERNEL_VERSION} fi if [ -n "$D" ]; then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a fi @@ -196,7 +191,7 @@ fi pkg_postinst_modules () { if [ -n "$D" ]; then - ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_RELEASE} ${KERNEL_VERSION} + ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else depmod -a update-modules || true @@ -257,7 +252,7 @@ python populate_packages_prepend () { bb.error("D not defined") return - kernelver = bb.data.getVar('KERNEL_RELEASE', d, 1) + kernelver = bb.data.getVar('KERNEL_VERSION', d, 1) kernelver_stripped = kernelver m = re.match('^(.*-hh.*)[\.\+].*$', kernelver) if m: diff --git a/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc new file mode 100644 index 0000000000..7898f7b349 --- /dev/null +++ b/conf/distro/include/opie-users-are-too-stupid-to-put-this-in-local.conf.inc @@ -0,0 +1,6 @@ +# Opie +#use 1337 mt version of opie to have a webbrowser +PALMTOP_USE_MULTITHREADED_QT = "yes" +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +require conf/distro/include/preferred-opie-versions.inc diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 029246a8c2..468c2ebd7d 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -5,12 +5,12 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "bigscreen" -PACKAGE_EXTRA_ARCHS = "armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" - -BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +PREFERRED_VERSION_u-boot = "1.1.6" +UBOOT_MACHINE = "pxa255_idp_config" require conf/machine/include/tune-xscale.conf @@ -20,4 +20,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" +MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 0f18728087..72c2d33713 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index da8a58329a..6c43e75625 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " #Compile with armv5te optimizations, incompatible with armv4(t) cpus require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index eb0b6d40e6..a440078cb7 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 ipaqsa" +PACKAGE_EXTRA_ARCHS = "armv4 " require conf/machine/include/tune-strongarm.conf @@ -30,7 +30,7 @@ MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-micro" -EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 323aa8f061..32b6a8ea8a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 3eaa96b327..2a34333bac 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index c0c9b2fefe..ecc2e679d9 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" require conf/machine/include/tune-xscale.conf @@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index a61656ab5c..11f0e7e54f 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 0cb51ce383..d75a573f65 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 0f8ed6ed82..843e26bed0 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "ipaqpxa armv4t armv5te iwmmxt" +PACKAGE_EXTRA_ARCHS = " armv4t armv5te iwmmxt" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 900da400b0..ffffc3a569 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " PREFERRED_PROVIDER_virtual/kernel = "linux-rp" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 53903f7982..482c8c0d8a 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf @@ -39,10 +39,11 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-hx4700-acx \ kernel-module-snd-hx4700-audio" - +#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ - -e 256KiB -p" + -e 256KiB -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e16a46c619..4e6c9a625a 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf diff --git a/contrib/site-conf/m4/mysql.m4 b/contrib/site-conf/m4/mysql.m4 index 5c6157f865..2db7e668f3 100644 --- a/contrib/site-conf/m4/mysql.m4 +++ b/contrib/site-conf/m4/mysql.m4 @@ -1 +1,101 @@ # Tests for mysql + +# A local version of AC_CHECK_SIZEOF that includes sys/types.h +dnl MYSQL_CHECK_SIZEOF(TYPE [, CROSS-SIZE]) +AC_DEFUN([MYSQL_CHECK_SIZEOF], +[changequote(<<, >>)dnl +dnl The name to #define. +define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl +dnl The cache variable name. +define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl +changequote([, ])dnl +AC_MSG_CHECKING(size of $1) +AC_CACHE_VAL(AC_CV_NAME, +[AC_TRY_RUN([#include <stdio.h> +#include <sys/types.h> +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof($1)); + exit(0); +}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl +AC_MSG_RESULT($AC_CV_NAME) +AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [ ]) +undefine([AC_TYPE_NAME])dnl +undefine([AC_CV_NAME])dnl +]) + + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_TYPE_OFF_T +AC_TYPE_SIZE_T +AC_STRUCT_ST_RDEV +AC_HEADER_TIME +AC_STRUCT_TM + +AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) +AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>]) +AC_CHECK_TYPES([u_int32_t]) + +dnl Checks for header files. +AC_CHECK_HEADERS(malloc.h sys/cdefs.h) + +dnl Checks for library functions. +AC_FUNC_ALLOCA +AC_PROG_GCC_TRADITIONAL +AC_TYPE_SIGNAL + +AC_CHECK_FUNCS(re_comp regcomp strdup) +AC_CHECK_FUNCS(strlcat strlcpy) +AC_CHECK_FUNCS(issetugid) +AC_CHECK_FUNCS(fgetln) +AC_CHECK_FUNCS(getline flockfile) +AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr) + +AC_FUNC_MMAP +AC_TYPE_SIGNAL +AC_FUNC_UTIME_NULL +AC_FUNC_VPRINTF + +# AC_CHECK_SIZEOF return 0 when it does not find the size of a +# type. We want a error instead. +AC_CHECK_SIZEOF( |