diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-23 10:50:30 +0000 |
| commit | e49ed8da00b7a5d874fd92a806c6b036a726069c (patch) | |
| tree | 4c2986b1f377b0363e6637cc792e8e553c2b39a4 /conf | |
| parent | 95580064683ef83263017dce9b610c74306348bb (diff) | |
| parent | a5ab4c1e92a80b977b53072b349e05ab0f097dd1 (diff) | |
merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
Diffstat (limited to 'conf')
60 files changed, 301 insertions, 236 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9d5d54bfb8..ac2d281123 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,7 @@ HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" -TARGET_ARCH = "INVALID" +TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" @@ -311,12 +311,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi ################################################################## CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +TOOLCHAIN_OPTIONS = "" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}" +export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" export AS = "${HOST_PREFIX}as" @@ -587,6 +588,7 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..76eacce219 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 345da5698c..f36ae8c6fe 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -2,13 +2,13 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.9" -DISTRO_VERSION = "2007.9-test-${DATE}" -DISTRO_REVISION = "46" +# The release will the 2007.12 +DISTRO_VERSION = "2007.11RC2.1" +DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc @@ -29,18 +29,24 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +# These will be put under package management soon +#FEED_URIS += " \ +# no-arch##${ANGSTROM_URI}/unstable/feed/all \ +# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ +# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ +# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ +# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ +# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ +# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" + +# set feed path variables +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ @@ -54,7 +60,8 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -98,6 +105,16 @@ PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" +PREFERRED_VERSION_avr32-gcc = "4.1.2" +PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" + +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" @@ -108,6 +125,10 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" + PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -127,6 +148,7 @@ require conf/distro/include/preferred-e-versions.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -156,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" @@ -214,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ @@ -228,3 +251,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ avahi-autoipd \ openssh-sftp-server \ " + +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" + diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 58225bb8ec..85b2916a44 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -2,7 +2,7 @@ #@TYPE: Distribution #@NAME: Angstrom <http://www.angstrom-distribution.org> #@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Koen Kooi <koen@openembedded.org> #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> #@-------------------------------------------------------------------- @@ -35,14 +35,10 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" + +# set feed path variables +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ @@ -57,7 +53,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" @@ -70,19 +66,6 @@ PREFERRED_VERSION_uclibc ?= "0.9.29" PREFERRED_VERSION_uclibc-initial ?= "0.9.29" -#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" -PREFERRED_VERSION_gcc_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross-sdk_avr32 ?= "4.2.1" -PREFERRED_VERSION_gcc-cross-initial_avr32 ?= "4.2.1" - - #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ = "2.12.0" PREFERRED_VERSION_glib-2.0 = "2.14.0" @@ -110,8 +93,20 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_VERSION_gcc_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2" +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" @@ -141,6 +136,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" @@ -189,7 +185,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${DEBUG_APPS} \ " @@ -202,3 +198,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ avahi-autoipd \ openssh-sftp-server \ " + +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" + diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index b77b3e9c87..26e78f89c1 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -21,5 +21,9 @@ DISTRO_NAME = "generic-uClibC" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "libintl" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 7ab7818393..0286666495 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -56,9 +56,7 @@ TARGET_FPU_armeb = "soft" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index e4b083dd86..1b6ed46ac7 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.22" +PREFERRED_VERSION_bluez-cups-backend ?= "3.23" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.22" -PREFERRED_VERSION_bluez-utils ?= "3.22" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.22" +PREFERRED_VERSION_bluez-libs ?= "3.23" +PREFERRED_VERSION_bluez-utils ?= "3.23" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.23" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" @@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0" PREFERRED_VERSION_keymaps ?= "1.0" PREFERRED_VERSION_keyring ?= "0.6.8" PREFERRED_VERSION_kf ?= "0.5.4.1" -PREFERRED_VERSION_kismet ?= "2007-01-R1b" +PREFERRED_VERSION_kismet ?= "2007-10-R1" PREFERRED_VERSION_klibc ?= "1.1.1" PREFERRED_VERSION_klimt ?= "0.6.1" PREFERRED_VERSION_knights ?= "1.14" @@ -838,7 +838,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42" PREFERRED_VERSION_libcontactsdb ?= "0.5" PREFERRED_VERSION_libcroco ?= "0.6.1" PREFERRED_VERSION_libcwd ?= "0.99.47" -PREFERRED_VERSION_libdaemon ?= "0.11" +PREFERRED_VERSION_libdaemon ?= "0.12" PREFERRED_VERSION_libdata-optlist-perl ?= "0.101" PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101" PREFERRED_VERSION_libdbi ?= "0.7.2" @@ -995,7 +995,7 @@ PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpixman ?= "0.1.6" +PREFERRED_VERSION_libpixman ?= "0.9.6" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" PREFERRED_VERSION_libpthread-stubs ?= "0.1" @@ -1074,7 +1074,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0" PREFERRED_VERSION_libwnck ?= "2.13.5" PREFERRED_VERSION_libwpd ?= "0.8.6" PREFERRED_VERSION_libx11 ?= "1.1.3" -PREFERRED_VERSION_libx11-native ?= "1.0.1" +PREFERRED_VERSION_libx11-native = "1.0.3" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxau-native ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "1.0.4" @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.10" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" @@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27" PREFERRED_VERSION_modutils-initscripts ?= "1.0" PREFERRED_VERSION_moin ?= "1.5.8" PREFERRED_VERSION_mono ?= "1.2.5.1" +PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" PREFERRED_VERSION_mono-native ?= "1.2.5.1" PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" @@ -1352,7 +1353,7 @@ PREFERRED_VERSION_obby ?= "0.4.1" PREFERRED_VERSION_obexftp ?= "0.20" PREFERRED_VERSION_obexpush ?= "1.0.0" PREFERRED_VERSION_obexpush-native ?= "1.0.0" -PREFERRED_VERSION_octave ?= "2.9.14" +PREFERRED_VERSION_octave ?= "2.1.73" PREFERRED_VERSION_offlineimap ?= "4.0.14" PREFERRED_VERSION_olsr ?= "0.3-1" PREFERRED_VERSION_olsrd ?= "0.5.3" @@ -1438,7 +1439,7 @@ PREFERRED_VERSION_pine ?= "4.64" PREFERRED_VERSION_pipeman ?= "1.0.0" PREFERRED_VERSION_pipepanic ?= "0.1.1" PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.9.5" +PREFERRED_VERSION_pixman ?= "0.9.6" PREFERRED_VERSION_pixops-test ?= "1.0" PREFERRED_VERSION_pkgconfig ?= "0.22" PREFERRED_VERSION_pkgconfig-native ?= "0.22" @@ -1890,7 +1891,7 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" PREFERRED_VERSION_uae4all ?= "0.7.1" PREFERRED_VERSION_ubahnnav ?= "0.4.1" -PREFERRED_VERSION_uboot-utils ?= "1.2.0" +PREFERRED_VERSION_u-boot-utils ?= "1.2.0" PREFERRED_VERSION_udev ?= "092" PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" PREFERRED_VERSION_udhcp ?= "0.9.8" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 6726710aa9..837aec9f2d 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" - - +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 16a914c0a3..11cee727c5 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" @@ -255,7 +258,7 @@ TINDER_REPORT = "1" # seppuku bbclass SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" SEPPUKU_AUTOBUILD = "1" @@ -268,5 +271,4 @@ SEPPUKU_COMPONENT = "build" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" -DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci" diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index 7c675087ab..e039a144d3 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -62,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0e29c19c5c..74b930781b 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -10,56 +10,33 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" -SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-common ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-contacts ?= "${AUTOREV}" SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dates ?= "${AUTOREV}" SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dialer ?= "${AUTOREV}" SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-footer ?= "${AUTOREV}" -SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" -SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-messages ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" -SRCREV_pn-openmoko-session ?= "${AUTOREV}" -SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" -SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}" -SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}" -SRCREV_pn-openmoko-tasks ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" @@ -72,4 +49,3 @@ SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" SRCREV_pn-usbpath-native ?= "${AUTOREV}" - diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index ccd458da89..b3b47093b7 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20070819" +EFL_SRCDATE = "20071206" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -89,6 +89,7 @@ SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" SRCDATE_python-emotion ?= "${EFL_SRCDATE}" +SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" @@ -102,12 +103,16 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}" SRCDATE_expedite ?= "${EFL_SRCDATE}" SRCDATE_elitaire ?= "${EFL_SRCDATE}" SRCDATE_entice ?= "${EFL_SRCDATE}" +SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" +SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" +SRCDATE_python-pydirectfb = "20071210" SRCDATE_dvbstream ?= "20060814" SRCDATE_dvbtraffic ?= "20060814" SRCDATE_dvbtune ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8fee94e9d9..5446a425ce 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,7 +14,7 @@ SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" -SRCREV_pn-eds-dbus ?= "628" +SRCREV_pn-eds-dbus ?= "659" SRCREV_pn-eglibc ?= "4355" SRCREV_pn-eglibc-initial ?= "4355" SRCREV_pn-eglibc-intermediate ?= "4355" @@ -31,13 +31,13 @@ SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3519" +SRCREV_pn-libgsmd ?= "3684" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "697" -SRCREV_pn-libmokogsmd2 ?= "3378" +SRCREV_pn-libjana ?= "700" +SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" -SRCREV_pn-libmokoui2 ?= "3229" +SRCREV_pn-libmokoui2 ?= "3688" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" @@ -62,18 +62,18 @@ SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3249" +SRCREV_pn-openmoko-browser2 ?= "3646" SRCREV_pn-openmoko-calculator ?= "2404" -SRCREV_pn-openmoko-calculator2 ?= "3235" +SRCREV_pn-openmoko-calculator2 ?= "3655" SRCREV_pn-openmoko-common ?= "397" SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "374" +SRCREV_pn-openmoko-contacts2 ?= "387" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "661" +SRCREV_pn-openmoko-dates2 ?= "673" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3522" -SRCREV_pn-openmoko-feedreader2 ?= "3080" +SRCREV_pn-openmoko-dialer2 ?= "3689" +SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" @@ -82,33 +82,35 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" -SRCREV_pn-openmoko-mediaplayer2 ?= "3345" +SRCREV_pn-openmoko-mediaplayer2 ?= "3583" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-messages2 ?= "3477" +SRCREV_pn-openmoko-messages2 ?= "3712" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "3149" SRCREV_pn-openmoko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" -SRCREV_pn-openmoko-panel-gsm ?= "3256" +SRCREV_pn-openmoko-panel-gsm ?= "3664" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "3360" +SRCREV_pn-openmoko-sample2 ?= "3528" SRCREV_pn-openmoko-session ?= "152" +SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192" SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" -SRCREV_pn-openmoko-tasks2 ?= "348" -SRCREV_pn-openmoko-terminal2 ?= "3435" +SRCREV_pn-openmoko-tasks2 ?= "361" +SRCREV_pn-openmoko-terminal2 ?= "3542" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "3425" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3478" +SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" @@ -120,9 +122,9 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-webkit-gtk ?= "27222" -SRCREV_pn-webkit-qt ?= "27222" -SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-qt ?= "28656" +SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 0d7c4773b7..ab80719646 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -101,6 +101,12 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" +# Set the preferred provider for a few toolchain-related items, otherwise +# these may be selected from the external-toolchain instead. +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + # compiler/binary/library versions PREFERRED_VERSION_binutils ?= "2.18" PREFERRED_VERSION_binutils-cross ?= "2.18" diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf new file mode 100644 index 0000000000..fc760f9ea0 --- /dev/null +++ b/conf/distro/openwrt-sdk.conf @@ -0,0 +1,26 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OpenWRT-SDK +#@DESCRIPTION: Building packages for OpenWRT using its official SDK. +# +#@COMMENT: This allows to build packages only, not the whole images. +#@COMMENT: You should install and have in path an SDK from the www.openwrt.org. +#@COMMENT: SDK installers are both host and target specific (so look in download +#@COMMENT: dir for your target). If there is no SDK for your host arch, +#@COMMENT: you can also look at downloads of x-wrt.org, a sister project. +#@COMMENT: To build a package, use command like: +#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package> +#----------------------------------------------------------------------------- + +require conf/distro/generic-uclibc.conf + +# +# Header +# +DISTRO_NAME = "OpenWRT" + +# This is what lives in SDK +ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Make sure that we have correct package dependencies for SDK-provided libs. +ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index ad75fffe11..0cf5e8e81e 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -45,7 +45,9 @@ 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_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" PREFERRED_PROVIDERS += " virtual/libc:glibc" +PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers" PREFERRED_PROVIDER_libc6-unslung = "glibc" diff --git a/conf/documentation.conf b/conf/documentation.conf index 44a174a01b..6c71bc00c7 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -34,6 +34,11 @@ TARGET_CC_ARCH[doc] = "FIXME" TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \ for hardware floating point instructions." +ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\ + These packages won't be built by bitbake." +ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\ + for which automatic shlib dependency tracking doesn't work." + PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ machine dependant configuration options in your bitbake file add a \ PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' @@ -98,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" +FEED_URIS[doc] = "List of ipkg feed records to put into generated image." +FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image." + # insane bbclass QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log." diff --git a/conf/machine/aximx50.conf b/conf/machine/aximx50.conf index 0dda9492e9..b119a24359 100644 --- a/conf/machine/aximx50.conf +++ b/conf/machine/aximx50.conf @@ -32,10 +32,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa" # diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 2522897042..1b6188753e 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.23" +PREFERRED_VERSION_linux ?= "2.6.23" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 09517fd11d..68bf1b9025 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -47,3 +47,7 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc + +# set partition to flash kernel into +MTD_KERNEL_PARTITION = "/dev/mtd2" + diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 4cad7924f1..25c3878ee3 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -49,3 +49,7 @@ include conf/machine/include/tune-arm920t.inc # build YAFFS2 IMAGE_FSTYPES ?= "jffs2 yaffs2" + +# set partition to flash kernel into +MTD_KERNEL_PARTITION = "/dev/mtd2" + diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 15390d2d56..439c484970 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 409eacaed5..99e82d28f4 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen vfat" # Some extra configuration diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 60a732ffa6..cad7d0393c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" # # Software/packages selection @@ -26,13 +26,21 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-snd-h2200-audio \ + kernel-module-i2c-pxa \ + " + EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-h2200-audio = "snd-h2200-audio" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 9cf8272b51..c037226154 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -17,7 +17,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection @@ -27,32 +27,11 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-micro" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" - - -# TODO: see if any of these modules have 2.6 counterparts -# and need to be RRECOMMENDED -# -#H3600_MODULES = "\ -#h3600-asic \ -#hwtimer \ -#nvrd \ -#sa1100-cs \ -#sa1100-ir \ -#sa1100-wdt \ -#sa1100-audio \ -#sa1100-rtc \ -#sa1100usb-core \ -#sd-mod \ -#serial-h3800 \ -#" - - - # # Modules autoload and other boot properties # diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf index 173f2a5c8f..a13ed48d4a 100644 --- a/conf/machine/h3800.conf +++ b/conf/machine/h3800.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices #this machine will be primarily focussed on the 2.6 port -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" require conf/machine/h3600.conf diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f475e20c46..5db7abd3d4 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index f56bee00e8..03dccedccc 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection @@ -26,8 +26,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware ${PCMCIA_MANAGER}" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ - kernel-module-h4000-pcmcia \ kernel-module-i2c-pxa \ + kernel-module-h4000-bt \ + kernel-module-h4000-pcmcia \ kernel-module-acx \ " @@ -36,7 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-h4000_audio = "snd-h4000_audio" +module_autoload_snd-h4000-audio = "snd-h4000-audio" module_autoload_g_ether = "g_ether" module_conf_acx = "blacklist acx" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 6ed836c1de..fcd6cfa0b9 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 h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/tune-xscale.inc @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" # # Software/packages selection @@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ # # Modules autoload and other boot properties # +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_g_ether = "g_ether" + SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 711ffd314c..65a82d1e0b 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -15,7 +15,7 @@ require conf/machine/include/tune-arm9tdmi.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 63ab097a89..6bf89999bf 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index 1b44742874..afaa6fc294 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 44454f3902..a5feeb2d69 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 8430cb57d4..003406bd88 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index f9326475e6..a577cc78d2 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index af91bcbb9f..016247213d 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" MACHINE_EXTRA_RDEPENDS = "alsa-state" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index c3e7cf710e..55a6757e7c 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.inc MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone vfat" MACHINE_FEATURES += "iwmmxt" # @@ -28,11 +28,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" XSERVER = "xserver-kdrive-fbdev" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ - kernel-module-bsd-comp \ +MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-i2c-pxa \ kernel-module-snd-htcuniversal-audio \ kernel-module-htcuniversal-acx \ diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 38b0c011be..34255a1536 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone vfat" # # Software/packages selection diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index c0d9016407..84733217d1 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.bz2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 87e03a7bdd..0d3a9bbcf0 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: iPAQ hx47xx +#@NAME: HP iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU # @@ -19,7 +19,9 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "200" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat" MACHINE_FEATURES += "iwmmxt" # @@ -34,17 +36,14 @@ XSERVER = "xserver-kdrive-w100" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-utf8 \ - kernel-module-af-key \ - kernel-module-i2c-pxa \ - kernel-module-pxa27x-voltage \ - kernel-module-pxa27x-voltage-max158xx \ - kernel-module-acx \ - kernel-module-hx4700-acx \ - kernel-module-hx4700-bt \ - kernel-module-snd-hx4700-audio" +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ + kernel-module-acx \ + kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ + 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 \ diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc index f22ffce6c2..bc80185fa0 100644 --- a/conf/machine/include/collie-2.6.inc +++ b/conf/machine/include/collie-2.6.inc @@ -1,6 +1,33 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi" +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat" MACHINE_EXTRA_RDEPENDS = "kernel-modules" + +MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" + +zaurus_make_installkit () { + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ + mkdir ${IMAGE_NAME}-installkit/ + # Get the latest kernel using the zImage-<machine>.bin symlink + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + if [ "${MACHINE}" = "spitz" ]; then + cp gnu-tar ${IMAGE_NAME}-installkit/ + cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz + else + [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin + fi + + # All zaurus machines except collie need updater.sh + if [ "${MACHINE}" != "collie" ]; then + cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh + fi + + tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ + md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ +} + + diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 04b6542470..bdf00d15c9 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -2,20 +2,24 @@ #@NAME: ixp4xx #@DESCRIPTION: genric machine configuration for ixp4xx platforms -# Set default for nslu2 - can be overridden for machines with other features. -MACHINE_FEATURES ?= "kernel26 usbhost ext2" +# Set default for common ixp4xx-based machines +MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" -# Set defaults for nslu2 - can be overridden for machines with other requirements. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" +# Select an appropriate default kernel +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}" + +# Add packages required for basic networking support +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" -# Set default for nslu2 - can be overridden for machines with more flash. +# Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" -# Set default for nslu2, nas100d, dsmg600 -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" +# Allow for rootfs loaded direct from internal hard disk +IMAGE_FSTYPES ?= "jffs2 tar.gz" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" +# Set default for common ixp4xx-based machines +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" require conf/machine/include/tune-xscale.inc require conf/machine/include/tune-thumb.inc diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc index 5eb7806f6f..22c6ad4233 100644 --- a/conf/machine/include/palm.inc +++ b/conf/machine/include/palm.inc @@ -10,7 +10,7 @@ SERIAL_CONSOLE = "115200 ttyS0" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2 vfat" # # Software/packages selection diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 7e41da0783..3f84138ac8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -26,7 +26,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost ext2 " diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf deleted file mode 100644 index 0a1e54c324..0000000000 --- a/conf/machine/ixp4xx.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic IXP4XX kernel -#@DESCRIPTION: Machine configuration for a generic ixp4xx board - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')} diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index a322f1a60c..3735bc0312 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -9,4 +9,4 @@ require conf/machine/include/tune-sh3.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 461d0c8326..8741eb4ff6 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -8,5 +8,5 @@ require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat" MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index f4fd23eec9..1792cda280 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 900b24b751..1c1d08afb1 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -21,15 +21,9 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "142" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat" MACHINE_FEATURES += "iwmmxt" - -# -# We don't support jffs2 installations (yet). -# -IMAGE_FSTYPES = "tar.bz2" - # # Software/packages selection # @@ -41,20 +35,20 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ - kernel-module-af-key \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ - kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-magician-flash \ - kernel-module-magician-ds1wm \ - kernel-module-magician-battery \ kernel-module-magician-phone \ kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" +#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 ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties @@ -64,8 +58,6 @@ module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_pxa27x_udc = "pxa27x_udc" -module_autoload_magician_ds1wm = "magician_ds1wm" -module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index a6681a9030..af3e5a5cc3 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -15,6 +15,7 @@ require conf/machine/include/tune-xscale.inc SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE = "16" MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000" diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 3c47b53b56..81c3e29e91 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -13,6 +13,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" PREFERRED_VERSION_u-boot = "1.3.0" UBOOT_MACHINE = "MPC8313ERDB_33_config" +#rootfs on NAND flash +EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" + #don't try to access tty1 USE_VT = "0" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 1c9fc7af9d..330a1287e4 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,7 +15,7 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" -MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen vfat" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 0e308b0a67..45fc16dc29 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -30,7 +30,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 703fc1984d..58ddb25744 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf deleted file mode 100644 index 7e45825f69..0000000000 --- a/conf/machine/nslu2.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Linksys NSLU2 -#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')} diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 3162eb3342..360e397e04 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "armeb" PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" -MACHINE_ARCH = "ixp4xxbe" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 1aced19de2..1ad9bdd96a 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" -MACHINE_ARCH = "ixp4xxle" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index ba2c956d87..f8ca7ec033 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat # # Software/packages selection diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 4b3acc0a85..2531f984f0 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index ab3da912ba..6334d34171 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -6,7 +6,7 @@ MACHINE_KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" -MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " +MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc require conf/machine/include/tune-strongarm.inc |