summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-07-31 15:36:05 +0000
committerKristoffer Ericson <kristoffer_e1@hotmail.com>2006-07-31 15:36:05 +0000
commitcc67256da139ba348bfc5e98138da3d7e84c7f48 (patch)
treea88692987440c7a78c27dfc5ff1aa3cf01223da1 /conf
parent5e5b590002af02b51b7e39ddb3a18357ce1954c6 (diff)
parent09436056f94e7103d436177bdaea7c3bd9493913 (diff)
merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
and bbd3a2811e13a3b99224c1a846af2a244d292c41
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf6
-rw-r--r--conf/distro/angstrom-2006.9.conf6
-rw-r--r--conf/distro/openzaurus-unstable.conf6
-rw-r--r--conf/machine/akita.conf1
-rw-r--r--conf/machine/h3900.conf11
-rw-r--r--conf/machine/h5xxx.conf4
-rw-r--r--conf/machine/include/zaurus-clamshell.conf9
-rw-r--r--conf/machine/ipaq-pxa270.conf2
-rwxr-xr-xconf/machine/netbook-pro.conf8
-rw-r--r--conf/machine/spitz.conf2
10 files changed, 34 insertions, 21 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d446d40b8f..f12cca15f0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -51,7 +51,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}"
TARGET_ARCH = "INVALID"
TARGET_OS = "INVALID"
TARGET_VENDOR = "${BUILD_VENDOR}"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
TARGET_PREFIX = "${TARGET_SYS}-"
TARGET_CC_ARCH = ""
@@ -118,8 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
/lib/*.a /lib/*.o ${datadir}/aclocal"
FILES_${PN}-locale = "${datadir}/locale"
-FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
- /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
+ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
# File manifest
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index fbb2814453..a387a102bb 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -22,7 +22,7 @@ FEED_URIS += " \
perl##${ANGSTROM_URI}/unstable/feed/perl \
python##${ANGSTROM_URI}/unstable/feed/python \
debug##${ANGSTROM_URI}/unstable/feed/debug \
- ${MACHINE}##${ANGSTROM_URI}/usntable/feed/machine/${MACHINE}"
+ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}"
# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
@@ -74,7 +74,7 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
# Others:
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_gconf ?= gconf-dbus
PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
PREFERRED_PROVIDER_tslib ?= tslib
@@ -107,7 +107,7 @@ PREFERRED_VERSION_busybox = "1.2.0"
PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-PREFERRED_VERSION_dbus ?= "0.61"
+PREFERRED_VERSION_dbus ?= "0.62"
PREFERRED_VERSION_gstreamer ?= "0.10.6"
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 14372b5b9e..e8eef43b70 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -10,6 +10,8 @@ CVS_TARBALL_STASH = "\
http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
http://www.oesources.org/source/current/"
+
+require conf/distro/include/sane-srcdates.inc
require conf/distro/include/openzaurus.inc
DISTRO_TYPE = "debug"
@@ -50,8 +52,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
+PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils = "2.15.94.0.1"
#
# Opie
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 89c0d031ee..005a70e664 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -4,5 +4,6 @@
include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-clamshell-2.6.conf
+IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
ROOT_FLASH_SIZE = "58"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 1611ed431a..65cce6ce81 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -1,10 +1,12 @@
#@TYPE: Machine
-#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
-#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+#@NAME: Compaq iPAQ 39xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx
KERNEL ?= "kernel24"
#KERNEL ?= "kernel26"
+INHERIT += "linux_modules"
+
OVERRIDES =. "${KERNEL}:"
TARGET_ARCH = "arm"
@@ -17,11 +19,10 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
ROOT_FLASH_SIZE = "32"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
-H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
-H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core"
+H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic nmc_asic3 mtdchar h3900-uda1380"
+H3900_MODULES_kernel26 = " h3900_lcd asic2_adcts g_ether apm h3900_battery pcmcia-core"
# pxa2xx_udc is built in to the kernel
SERIAL_CONSOLE = "115200 tts/0 vt100"
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 758793f7a7..32e9304cdb 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -7,6 +7,8 @@ KERNEL ?= "kernel24"
OVERRIDES =. "${KERNEL}:"
+INHERIT += "linux_modules"
+
TARGET_ARCH = "arm"
IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -32,4 +34,4 @@ USE_VT = "0"
GUI_MACHINE_CLASS = "smallscreen"
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index da6c28c6e2..f85c2a1221 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -12,9 +12,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
# add a summary to the jffs2 file to make it mount a lot faster
-#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
-# -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.img \
-# --eraseblock=0x4000"
+EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+ -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+ --eraseblock=0x4000 -l -p"
+IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+ ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
+
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 359f8296d8..f509cd0a5d 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices
TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
+IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700"
#use this for a hx47xx ipaq
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index e4c108c071..fb8b521a3c 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -12,7 +12,8 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
#don't try to access tty1
USE_VT = "0"
-
+#use the epson xserver
+XSERVER = "xserver-kdrive-epson"
#ship in rootfs:
NBP_MODULES = " apm \
@@ -21,7 +22,7 @@ NBP_MODULES = " apm \
BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-GPE_EXTRA_INSTALL += "gpe-mini-browser tinymail"
+GPE_EXTRA_INSTALL += "gpe-mini-browser"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttySA0 vt100"
@@ -34,6 +35,7 @@ udevdir = "/dev"
GUI_MACHINE_CLASS = "bigscreen"
-
+#The initrd needs /initrd present to be able to do pivot_root
+ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; "
include conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index f78dd7a3b9..3d80a41486 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -5,6 +5,8 @@
include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-clamshell-2.6.conf
+IPKG_EXTRA_ARCHS += "armv4 armv4t iwmmxt"
+
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
PIVOTBOOT_EXTRA_RRECOMMENDS += ""