diff options
110 files changed, 972 insertions, 13503 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index c660fd9cae..a599dec3f2 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -19,11 +19,16 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" return s +# Native package configurations go in ${BINDIR}/<name>-config-native to prevent a collision with cross packages +def is_native(d): + import bb.data + return ["","-native"][bb.data.inherits_class('native', d)] + do_stage_append() { for config in `find ${S} -name '*-config'`; do - configname=`basename $config` - install -d ${STAGING_BINDIR}/${HOST_SYS} - cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/${HOST_SYS}/$configname - chmod u+x ${STAGING_BINDIR}/${HOST_SYS}/$configname + configname=`basename $config`${@is_native(d)} + install -d ${STAGING_BINDIR} + cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname + chmod u+x ${STAGING_BINDIR}/$configname done } diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index 7f51344ec7..d861944d53 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -2,13 +2,12 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_ecore = "0.9.9.007" -PREFERRED_VERSION_edb = "1.0.5.003" -PREFERRED_VERSION_edje = "0.5.0.007" -PREFERRED_VERSION_eet = "0.9.10.007" -PREFERRED_VERSION_embryo = "0.9.1.007" -PREFERRED_VERSION_etox = "0.9.0.003" -PREFERRED_VERSION_evas = "0.9.9.007" -PREFERRED_VERSION_ewl = "0.0.4.003" -PREFERRED_VERSION_imlib2 = "1.2.0.007" - +PREFERRED_VERSION_ecore = "0.9.9.013" +PREFERRED_VERSION_edb = "1.0.5.004" +PREFERRED_VERSION_edje = "0.5.0.013" +PREFERRED_VERSION_eet = "0.9.10.013" +PREFERRED_VERSION_embryo = "0.9.1.013" +PREFERRED_VERSION_etox = "0.9.0.004" +PREFERRED_VERSION_evas = "0.9.9.013" +PREFERRED_VERSION_ewl = "0.0.4.004" +PREFERRED_VERSION_imlib2 = "1.2.1.004" diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf deleted file mode 100644 index ecc99ff5a7..0000000000 --- a/conf/machine/beagle.conf +++ /dev/null @@ -1,62 +0,0 @@ -#@TYPE: Machine -#@NAME: MasterIA PA100 -#@DESCRIPTION: Machine configuration for the SA1100 based MasterIA PA-100 device - -TARGET_ARCH = "arm" -IPKG_ARCHS = "all arm ${MACHINE}" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "montavista-sa" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils hostap-modules orinoco-modules " -BOOTSTRAP_EXTRA_RDEPENDS = " kernel-module-net-fd \ -kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \ -kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix \ -kernel-module-sa1100-ir kernel-module-irlan kernel-module-irnet \ -kernel-module-usb-eth kernel-module-sa1100usb-core \ -kernel-module-ppp-generic kernel-module-ppp-async kernel-module-mtdchar \ -kernel-module-fat kernel-module-vfat \ -kernel-module-ircomm kernel-module-ircomm-tty \ -kernel-module-serial kernel-module-slhc " -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs " - - -EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000" -EXTRA_IMAGEDEPENDS = "cetools-native" - -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \ - ${EXTRA_IMAGECMD}; bin2rom ${T}/${IMAGE_NAME}.rootfs.jffs2 \ - ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \ - ffffffff ffffffff d0140000" - -include conf/machine/tune-strongarm.conf - - -SERIAL_CONSOLE = "115200 ttySA0" - - - -# Configuration bits for "generic handheld" from handhelds-common.conf -HANDHELD_MODULES_COPY = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -ide-cs ide-disk \ -loop \ -vfat ext2 \ -sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ -pcnet-cs serial-cs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty \ -input uinput \ -" - - -BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils" -BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm irda-utils" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools ${@linux_module_packages('${HANDHELD_MODULES_COPY}', d)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf new file mode 100644 index 0000000000..468fcf1838 --- /dev/null +++ b/conf/machine/h1910.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: HP iPAQ H1910/H1915 +#@DESCRIPTION: Machine configuration for the HP iPAQ H1910/H1915 + +KERNEL ?= "kernel26" +OVERRIDES =. "${KERNEL}:" + +TARGET_ARCH = "arm" +IPKG_ARCHS = "all arm armv5te h1910" + +include conf/machine/tune-xscale.conf + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +BOOTSTRAP_EXTRA_DEPENDS = "udev apmd irda-utils network-suspend-scripts modutils-collateral mtd-utils" +BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils" +BOOTSTRAP_EXTRA_RRECOMMENDS += "" + +EXTRA_IMAGECMD_h1910_jffs2 = "-e 0x4000 -p -n" + +GUI_MACHINE_CLASS = "smallscreen" + diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf deleted file mode 100644 index ad50bff395..0000000000 --- a/conf/machine/ipaq-pxa-2.6.conf +++ /dev/null @@ -1,11 +0,0 @@ -IPKG_ARCHS = "all arm h3900 ${MACHINE}" -TARGET_ARCH = arm -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" |