diff options
Diffstat (limited to 'conf')
22 files changed, 203 insertions, 81 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c86cda5040..ba2b2c71f5 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -203,10 +203,11 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -CVSDIR = "${DL_DIR}/cvs" -SVNDIR = "${DL_DIR}/svn" -GITDIR = "${DL_DIR}/git" -BZRDIR = "${DL_DIR}/bzr" +CO_DIR = "${DL_DIR}" +CVSDIR = "${CO_DIR}/cvs" +SVNDIR = "${CO_DIR}/svn" +GITDIR = "${CO_DIR}/git" +BZRDIR = "${CO_DIR}/bzr" STAMP = "${TMPDIR}/stamps/${PF}" WORKDIR = "${TMPDIR}/work/${PF}" @@ -563,6 +564,9 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" # MACHINE don't change the path to the cache CACHE := "${CACHE}" +# Default to disabling packaged staging code +export PSTAGING_ACTIVE = "0" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index e42dd1cb3b..a78469c3d1 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,6 +20,9 @@ DISTRO_VERSION = "2008.1-test-${DATE}" DISTRO_REVISION = "1" +#build staging from packages +INHERIT += "packaged-staging" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2008-preferred-versions.inc @@ -61,7 +64,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #Initramfs for kernels -KERNEL_INITRAMFS_PATH = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/initramfs-bootmenu-image-${MACHINE}.cpio.gz" +KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/" +KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)" #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" @@ -77,7 +81,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ ?= "2.12.3" PREFERRED_VERSION_glib-2.0 ?= "2.14.4" -PREFERRED_VERSION_pango ?= "1.18.1" PREFERRED_PROVIDER_avahi = "avahi" @@ -101,28 +104,30 @@ PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" +# GCC 4.3.0 is the first release with armv7 support +#PREFERRED_VERSION_gcc_beagleboard = "4.3.0" +#PREFERRED_VERSION_gcc-cross_beagleboard = "4.3.0" +#PREFERRED_VERSION_gcc-cross-sdk_beagleboard = "4.3.0" +#PREFERRED_VERSION_gcc-cross-initial_beagleboard = "4.3.0" + PREFERRED_VERSION_gcc ?= "4.2.2" PREFERRED_VERSION_gcc-cross ?= "4.2.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" - #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom 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" +#avr32 only has patches for binutils 2.17 and gcc 4.2.1 in OE +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" 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" @@ -204,7 +209,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \ + opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${DEBUG_APPS} \ " diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index 700af88653..905e8680a5 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -224,12 +224,12 @@ PREFERRED_VERSION_db ?= "4.3.29" PREFERRED_VERSION_db-native ?= "4.3.29" PREFERRED_VERSION_db3 ?= "3.2.9" PREFERRED_VERSION_db3-native ?= "3.2.9" -PREFERRED_VERSION_dbench ?= "3.04" +PREFERRED_VERSION_dbench ?= "4.0" PREFERRED_VERSION_dbh ?= "1.0-18" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_dbus-glib-native ?= "0.74" -PREFERRED_VERSION_dbus-native ?= "1.0.1" +PREFERRED_VERSION_dbus-native ?= "1.0.3" PREFERRED_VERSION_dbus-python ?= "0.71" PREFERRED_VERSION_dcetest ?= "1.2" PREFERRED_VERSION_dcopidl-native ?= "3.5.4" @@ -613,11 +613,11 @@ PREFERRED_VERSION_gspcav1 ?= "20070110" PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2" PREFERRED_VERSION_gst-meta-base ?= "0.10" PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.4" -PREFERRED_VERSION_gst-plugins-bad ?= "0.10.5" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.14" +PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6" +PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1" -PREFERRED_VERSION_gst-plugins-good ?= "0.10.6" -PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.6" +PREFERRED_VERSION_gst-plugins-good ?= "0.10.7" +PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7" PREFERRED_VERSION_gstreamer ?= "0.10.14" PREFERRED_VERSION_gthumb ?= "2.6.9" PREFERRED_VERSION_gtk+ ?= "2.10.14" @@ -662,7 +662,7 @@ PREFERRED_VERSION_hexatrolic ?= "1.0beta3" PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4" PREFERRED_VERSION_hfsutils ?= "3.2.6" PREFERRED_VERSION_hibernate-script ?= "1.12" -PREFERRED_VERSION_hicolor-icon-theme ?= "0.10" +PREFERRED_VERSION_hicolor-icon-theme ?= "0.9" PREFERRED_VERSION_hiker ?= "0.9.1" PREFERRED_VERSION_hildon-base-lib ?= "0.11.1" PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2" @@ -884,7 +884,7 @@ PREFERRED_VERSION_libg15 ?= "1.2.1" PREFERRED_VERSION_libg15render ?= "1.2" PREFERRED_VERSION_libgalago ?= "0.3.3" PREFERRED_VERSION_libgc ?= "6.7" -PREFERRED_VERSION_libgcrypt ?= "1.2.3" +PREFERRED_VERSION_libgcrypt ?= "1.4.0" PREFERRED_VERSION_libgeda ?= "20050820" PREFERRED_VERSION_libgemwidget ?= "1.0" PREFERRED_VERSION_libglade ?= "2.6.2" @@ -985,7 +985,7 @@ PREFERRED_VERSION_libparams-util-perl ?= "0.20" PREFERRED_VERSION_libparams-util-perl-native ?= "0.20" PREFERRED_VERSION_libparams-validate-perl ?= "0.86" PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86" -PREFERRED_VERSION_libpcap ?= "0.9.6" +PREFERRED_VERSION_libpcap ?= "0.9.8" PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" @@ -1023,7 +1023,7 @@ PREFERRED_VERSION_libsndfile1 ?= "1.0.17" PREFERRED_VERSION_libsoundgen ?= "0.6" PREFERRED_VERSION_libsoup ?= "2.2.100" PREFERRED_VERSION_libspf2 ?= "1.0.4" -PREFERRED_VERSION_libspiff ?= "0.7.2" +PREFERRED_VERSION_libspiff ?= "0.8.2" PREFERRED_VERSION_libssh ?= "0.11" PREFERRED_VERSION_libsub-exporter-perl ?= "0.970" PREFERRED_VERSION_libsub-exporter-perl-native ?= "0.970" @@ -1404,7 +1404,7 @@ PREFERRED_VERSION_p4 ?= "05.2" PREFERRED_VERSION_package-index ?= "1.0" PREFERRED_VERSION_pad-native ?= "1.0" PREFERRED_VERSION_pairs ?= "1.1.1" -PREFERRED_VERSION_pango ?= "1.18.1" +PREFERRED_VERSION_pango ?= "1.18.3" PREFERRED_VERSION_panoramixext ?= "1.1" PREFERRED_VERSION_parted ?= "1.8.7" PREFERRED_VERSION_patch ?= "2.5.9" @@ -1492,7 +1492,7 @@ PREFERRED_VERSION_pxaregs ?= "1.14" PREFERRED_VERSION_python ?= "2.5.2" PREFERRED_VERSION_python-ao ?= "0.82" PREFERRED_VERSION_python-constraint ?= "1.1" -PREFERRED_VERSION_python-dbus ?= "0.81.1" +PREFERRED_VERSION_python-dbus ?= "0.82.4" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" @@ -1862,7 +1862,7 @@ PREFERRED_VERSION_tscalib ?= "0.0.1-3" PREFERRED_VERSION_tsclient ?= "0.140" PREFERRED_VERSION_tslib ?= "1.0" PREFERRED_VERSION_ttf-bitstream-vera ?= "1.10" -PREFERRED_VERSION_ttf-dejavu ?= "2.18" +PREFERRED_VERSION_ttf-dejavu ?= "2.23" PREFERRED_VERSION_ttf-gentium ?= "1.02" PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0" PREFERRED_VERSION_ttf-liberation ?= "0.2" @@ -1876,8 +1876,8 @@ PREFERRED_VERSION_twm ?= "1.0.3" PREFERRED_VERSION_twutils ?= "0.2" PREFERRED_VERSION_txdrug ?= "0.1" PREFERRED_VERSION_tximage ?= "0.2" -PREFERRED_VERSION_tzcode-native ?= "2007e" -PREFERRED_VERSION_tzdata ?= "2007e" +PREFERRED_VERSION_tzcode-native ?= "2007k" +PREFERRED_VERSION_tzdata ?= "2007k" PREFERRED_VERSION_u-boot ?= "1.2.0" PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" @@ -1944,7 +1944,7 @@ PREFERRED_VERSION_void11 ?= "0.2.0" PREFERRED_VERSION_vorbis-tools ?= "1.0.1" PREFERRED_VERSION_vpnc ?= "0.3.3" PREFERRED_VERSION_vsftpd ?= "2.0.5" -PREFERRED_VERSION_vte ?= "0.16.8" +PREFERRED_VERSION_vte ?= "0.16.9" PREFERRED_VERSION_vtun ?= "2.6" PREFERRED_VERSION_w3cam ?= "0.7.2" PREFERRED_VERSION_wakelan ?= "1.1" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 2c9543abd9..e326118a1a 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,8 +1,8 @@ PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_dbus = "1.1.20" -PREFERRED_VERSION_glib-2.0 = "2.15.6" +PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_vte = "0.16.10" diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc new file mode 100644 index 0000000000..7d65fc1f02 --- /dev/null +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -0,0 +1,22 @@ +# uclibc: +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "gettext" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +TARGET_OS_UC = "uclinux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" + +#Gcc will die with 'internal consistency error when using the above optimizations +FULL_OPTIMIZATION_avr32 = "" +BUILD_OPTIMIZATION_avr32 = "" + +CXXFLAGS += "-fvisibility-inlines-hidden" + diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 0f7ce15a9d..8699dc183c 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -11,6 +11,7 @@ TARGET_VENDOR = "-angstrom" # Can be "glibc", "eglibc" or "uclibc" ANGSTROM_MODE ?= "glibc" +PSTAGE_EXTRAPATH = "${ANGSTROM_MODE}" CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" @@ -28,8 +29,26 @@ ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs" MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>" #use debian style naming +INHERIT += "debian" + #use multimachine buildrules -INHERIT += "debian multimachine sanity devshell angstrom-mirrors insane" +INHERIT += "multimachine" + +#activate config checker +INHERIT += "sanity" + +#make devshell available as task +INHERIT += "devshell" + +#use angstrom source mirrors to combat 404s +INHERIT += "angstrom-mirrors" + +#run QA tests on builds and packages and log them +INHERIT += "insane" +QA_LOG = "1" + +#save statistical info on images +INHERIT += "testlab" ANGSTROM_PKG_FORMAT ?= "ipk" require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc @@ -46,6 +65,7 @@ ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" ENABLE_BINARY_LOCALE_GENERATION_omap2420h4 = "0" ENABLE_BINARY_LOCALE_GENERATION_omap2430sdp = "0" +ENABLE_BINARY_LOCALE_GENERATION_beagleboard = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 7fb0bc28e0..a54cf9174f 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -11,4 +11,5 @@ PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_midori = "0.0.17" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_vte = "0.16.10" +PREFERRED_VERSION_vte = "0.16.9" + diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 4af2405aa7..d81067302e 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -138,7 +138,7 @@ PREFERRED_VERSION_xorg-docs ?= "1.4" PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" # driver -PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1" +PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2" PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1" PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1" PREFERRED_VERSION_xf86-input-citron ?= "2.2.1" @@ -155,7 +155,7 @@ PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1" PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2" PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1" PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.1" PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3" PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0" PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0" @@ -169,7 +169,7 @@ PREFERRED_VERSION_xf86-input-void ?= "1.1.1" PREFERRED_VERSION_xf86-video-apm ?= "1.1.1" PREFERRED_VERSION_xf86-video-ark ?= "0.6.0" PREFERRED_VERSION_xf86-video-ast ?= "0.81.0" -PREFERRED_VERSION_xf86-video-ati ?= "6.6.193" +PREFERRED_VERSION_xf86-video-ati ?= "6.8.0" PREFERRED_VERSION_xf86-video-chips ?= "1.1.1" PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0" PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" @@ -181,7 +181,7 @@ PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0" PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.2.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.2.1" PREFERRED_VERSION_xf86-video-mga ?= "1.4.8" PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1" PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" @@ -237,7 +237,7 @@ PREFERRED_VERSION_libxdamage ?= "1.0.4" PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" PREFERRED_VERSION_libxdmcp ?= "1.0.2" PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.3" +PREFERRED_VERSION_libxext ?= "1.0.4" PREFERRED_VERSION_libxfixes ?= "4.0.3" PREFERRED_VERSION_libxfont ?= "1.3.1" PREFERRED_VERSION_libxfontcache ?= "1.0.4" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index dc5961c620..a3569ff226 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -17,14 +17,14 @@ SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" -SRCREV_pn-dfu-util ?= "2866" -SRCREV_pn-dfu-util-native ?= "2866" +SRCREV_pn-dfu-util ?= "4160" +SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "127" SRCREV_pn-diversity-nav ?= "238" SRCREV_pn-eds-dbus ?= "659" -SRCREV_pn-eglibc ?= "4355" -SRCREV_pn-eglibc-initial ?= "4355" -SRCREV_pn-eglibc-intermediate ?= "4355" +SRCREV_pn-eglibc ?= "5522" +SRCREV_pn-eglibc-initial ?= "5522" +SRCREV_pn-eglibc-intermediate ?= "5522" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" @@ -38,18 +38,18 @@ SRCREV_pn-gsm0710muxd ?= "90" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "12" +SRCREV_pn-illume ?= "14" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3684" +SRCREV_pn-libgsmd ?= "4216" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "700" +SRCREV_pn-libjana ?= "704" SRCREV_pn-libmokogsmd2 ?= "3663" -SRCREV_pn-libmokojournal2 ?= "3217" +SRCREV_pn-libmokojournal2 ?= "3473" SRCREV_pn-libmokopanelui2 ?= "3349" -SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libmokoui2 ?= "3976" SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" @@ -57,7 +57,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4102" +SRCREV_pn-linux-openmoko ?= "4194" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -66,11 +66,11 @@ SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-moko-gtk-engine ?= "3405" +SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-multitap-pad ?= "337" -SRCREV_pn-neod ?= "3421" +SRCREV_pn-neod ?= "4219" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "2887" SRCREV_pn-networkmanager-applet ?= "200" @@ -79,39 +79,39 @@ SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" -SRCREV_pn-openmoko-appearance ?= "3239" +SRCREV_pn-openmoko-appearance ?= "3262" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3646" +SRCREV_pn-openmoko-browser2 ?= "4172" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3655" SRCREV_pn-openmoko-common ?= "397" SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "387" +SRCREV_pn-openmoko-contacts2 ?= "412" SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "673" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3689" +SRCREV_pn-openmoko-dialer2 ?= "4224" SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "4225" +SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4225" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "4173" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-messages2 ?= "3712" +SRCREV_pn-openmoko-messages2 ?= "4182" SRCREV_pn-openmoko-panel-battery ?= "3360" -SRCREV_pn-openmoko-panel-bt ?= "3149" +SRCREV_pn-openmoko-panel-bt ?= "4197" 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 ?= "3664" +SRCREV_pn-openmoko-panel-gsm ?= "4191" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-memory ?= "3903" SRCREV_pn-openmoko-panel-usb ?= "3360" @@ -124,21 +124,22 @@ 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 ?= "361" -SRCREV_pn-openmoko-terminal2 ?= "3764" -SRCREV_pn-openmoko-theme-standard ?= "2370" -SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" +SRCREV_pn-openmoko-tasks2 ?= "398" +SRCREV_pn-openmoko-terminal2 ?= "4039" +SRCREV_pn-openmoko-theme-standard ?= "4167" +SRCREV_pn-openmoko-theme-standard-qvga ?= "4167" SRCREV_pn-openmoko-theme-standard2 ?= "3425" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3609" -SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-today2 ?= "4168" +SRCREV_pn-openmoko-today2-folders ?= "3704" SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" -SRCREV_pn-openocd ?= "206" -SRCREV_pn-openocd-native ?= "206" -SRCREV_pn-opkg ?= "4142" -SRCREV_pn-opkg-native ?= "4142" +SRCREV_pn-openocd ?= "517" +SRCREV_pn-openocd-native ?= "517" +SRCREV_pn-opkg ?= "4235" +SRCREV_pn-opkg-native ?= "4235" +SRCREV_pn-opkg-sdk ?= "4235" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" @@ -155,8 +156,8 @@ SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4138" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" +SRCREV_pn-usbpath ?= "3172" +SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 8fab5e5058..62d2189c8a 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -15,6 +15,7 @@ DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" +DISTRO = "openmoko" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 5246df3990..b5d28f9024 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -59,6 +59,10 @@ PREFERRED_VERSION_gcc ?= "3.4.4" PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" +# Whilst gcc 3.4.4 sypports sysroot, binutils 2.15.94.0.1 does not +# so we need the linkage helpers to help binutils find staging. +DEPENDS_append_pn-linux-libc-headers = "cross-linkage staging-linkage" + PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel" PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" @@ -76,3 +80,6 @@ INHERIT += "nslu2-mirrors" # - mwester 16 Dec 2006 # PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" + +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index add4c7e2d9..23c8942ab2 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -14,7 +14,7 @@ USE_VT = "0" MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen" # used by sysvinit_2 -SERIAL_CONSOLE = "115200" +SERIAL_CONSOLE = "115200 ttyS0" # used by some images IMAGE_FSTYPES ?= "jffs2" @@ -24,4 +24,7 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" PREFERRED_VERSION_u-boot = "1.1.4" +UBOOT_ENTRYPOINT = "0x90000000" +UBOOT_LOADADDRESS = "0x10000000" + diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 559bd40c75..77f9fdf34e 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -13,7 +13,7 @@ MACHINE_FEATURES = "kernel26 ext2 usbgadget" PREFERRED_PROVIDER_virtual/kernel = "linux" # used by sysvinit_2 -SERIAL_CONSOLE = "115200" +SERIAL_CONSOLE = "115200 ttyS0" # used by some images ROOT_FLASH_SIZE = "8" @@ -23,6 +23,6 @@ PREFERRED_VERSION_u-boot = "1.1.4" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x90000000" -UBOOT_LOADADRESS = "0x10000000" +UBOOT_LOADADDRESS = "0x10000000" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf new file mode 100644 index 0000000000..76c27b153e --- /dev/null +++ b/conf/machine/beagleboard.conf @@ -0,0 +1,34 @@ +#@TYPE: Machine +#@NAME: Beagleboard machine +#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7-a" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" +XSERVER = "xserver-kdrive-xomap" + +# Only has DVI connector for external screen +GUI_MACHINE_CLASS = "bigscreen" + +TARGET_FPU = "hard" +include conf/machine/include/tune-arm1136jf-s.inc +# requires gcc 4.3.0: +#include conf/machine/include/tune-cortexa8.inc + + +IMAGE_FSTYPES ?= "tar.bz2" + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +# No kernel recipe yet +PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard" + +KERNEL_IMAGETYPE = "uImage" + +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "0x80008000" + + +# and sdio +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index cad7d0393c..4c7e413fa0 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -41,6 +41,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" module_autoload_snd-h2200-audio = "snd-h2200-audio" +module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/include/tune-armv7.inc b/conf/machine/include/tune-armv7.inc new file mode 100644 index 0000000000..61b4685f10 --- /dev/null +++ b/conf/machine/include/tune-armv7.inc @@ -0,0 +1,5 @@ +# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m' +# valid option for -mtune: `cortex-a8', `cortex-r4', `cortex-m3', `cortex-m1' +TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv7" +PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc new file mode 100644 index 0000000000..2da31ecd35 --- /dev/null +++ b/conf/machine/include/tune-cortexa8.inc @@ -0,0 +1,4 @@ +# valid options for -march: `armv7', `armv7-a' +TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv7" +PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-cortexm1.inc b/conf/machine/include/tune-cortexm1.inc new file mode 100644 index 0000000000..a0d18b69c6 --- /dev/null +++ b/conf/machine/include/tune-cortexm1.inc @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc new file mode 100644 index 0000000000..72ec53d7c0 --- /dev/null +++ b/conf/machine/include/tune-cortexm3.inc @@ -0,0 +1,4 @@ +# valid options for -march: `armv7', `armv7-m' +TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv7" +PACKAGE_ARCH = "armv7" diff --git a/conf/machine/include/tune-cortexr4.inc b/conf/machine/include/tune-cortexr4.inc new file mode 100644 index 0000000000..5d9a30f629 --- /dev/null +++ b/conf/machine/include/tune-cortexr4.inc @@ -0,0 +1,4 @@ +# valid options for -march: `armv7', `armv7-r' +TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" +FEED_ARCH = "armv7" +PACKAGE_ARCH = "armv7" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index af3e5a5cc3..68dcfb069a 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -7,15 +7,14 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS = "smallscreen" PACKAGE_EXTRA_ARCHS = "armv5te" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" require conf/machine/include/tune-xscale.inc # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" -# used by opie-collections.inc 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" +EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x02000000" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 7a7b5c1a60..5c7f5bed7f 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" +UBOOT_ENTRYPOINT="0x10c08000" + # PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" @@ -26,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ kernel-module-nls-base \ kernel-module-vfat \ kernel-module-ohci-hcd \ + kernel-module-tlv320aic23 \ + kernel-module-snd-omap-alsa-aic23 \ " RDEPENDS_kernel-base = "" |