diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/foonas.conf | 1 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 7 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2009-versions.inc | 27 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 27 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 6 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 15 |
9 files changed, 57 insertions, 33 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0aeabe4f15..72787d69cf 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -95,6 +95,8 @@ ANGSTROM_GCC_VERSION_bfin = "4.1.2" #ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53" ANGSTROM_GCC_VERSION_armv7a = "4.3.1" +ANGSTROM_GCC_VERSION_486sx = "4.3.2" + #Horrible workaround for armv7a follows: # gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function # gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 30c1136f5f..cc5bbbbb32 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -20,7 +20,6 @@ DISTRO_FEATURES_n2100 += "raid" DISTRO_FEATURES_storcenter += "raid" DISTRO_FEATURES_lsppchd += "raid" DISTRO_FEATURES_lsppchg += "raid" -DISTRO_FEATURES_lsarm += "raid" # This isn't actually in OE yet #DISTRO_EXTRA_RDEPENDS = "openlink-machine" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 189e7123d5..74e531dc0e 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -33,6 +33,7 @@ require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" +ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index a82be491af..a84faf1234 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -4,9 +4,10 @@ SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" SRCREV_pn-fsod = "${AUTOREV}" SRCREV_pn-fso-apm = "${AUTOREV}" +SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" SRCREV_pn-fso-gpsd = "${AUTOREV}" +SRCREV_pn-fso-monitord = "${AUTOREV}" SRCREV_pn-fso-sounds = "${AUTOREV}" -SRCREV_pn-gsm0710muxd = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" @@ -14,7 +15,3 @@ SRCREV_pn-mickeydbus = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" SRCREV_pn-python-pytrc = "${AUTOREV}" SRCREV_pn-zhone = "${AUTOREV}" - -# Deps -SRCREV_pn-python-connexion = "${AUTOREV}" - diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 9f4229f224..4bba014b7e 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0" PREFERRED_VERSION_btsco ?= "0.42" PREFERRED_VERSION_btsco-module ?= "0.42" PREFERRED_VERSION_btxml ?= "1.0" -PREFERRED_VERSION_busybox = "1.11.3" +PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_busybox-static ?= "1.2.1" PREFERRED_VERSION_bvi ?= "1.3.1" PREFERRED_VERSION_bwmon ?= "1.3" @@ -1798,7 +1798,7 @@ PREFERRED_VERSION_syncml-client ?= "0.1" PREFERRED_VERSION_synergy ?= "1.3.1" PREFERRED_VERSION_sysfsutils ?= "2.0.0" PREFERRED_VERSION_sysklogd ?= "1.4.1" -PREFERRED_VERSION_syslinux-native ?= "3.36" +PREFERRED_VERSION_syslinux-native ?= "3.63" PREFERRED_VERSION_syslog-ng ?= "1.6.11" PREFERRED_VERSION_sysvinit ?= "2.86" PREFERRED_VERSION_t1lib ?= "5.0.2" diff --git a/conf/distro/include/preferred-om-2009-versions.inc b/conf/distro/include/preferred-om-2009-versions.inc new file mode 100644 index 0000000000..c65750d011 --- /dev/null +++ b/conf/distro/include/preferred-om-2009-versions.inc @@ -0,0 +1,27 @@ +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_busybox = "1.11.3" +PREFERRED_VERSION_cairo = "1.8.0" +PREFERRED_VERSION_fontconfig = "2.6.0" +PREFERRED_VERSION_glib-2.0 = "2.18.3" +PREFERRED_VERSION_glib-2.0-native = "2.18.0" +PREFERRED_VERSION_glibmm = "2.18.0" +PREFERRED_VERSION_glproto = "1.4.9" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_gtk+ = "2.14.2" +PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_libgemwidget = "1.0" +PREFERRED_VERSION_libgpephone = "0.4" +PREFERRED_VERSION_libosip2 = "2.2.2" +PREFERRED_VERSION_libsdl-x11 = "1.2.11" +PREFERRED_VERSION_libtool = "2.2.4" +PREFERRED_VERSION_libtool-native = "2.2.4" +PREFERRED_VERSION_libtool-cross = "2.2.4" +PREFERRED_VERSION_libtool-sdk = "2.2.4" +PREFERRED_VERSION_pango = "1.22.0" +PREFERRED_VERSION_pixman = "0.12.0" +PREFERRED_VERSION_pkgconfig = "0.23" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_pulseaudio = "0.9.10" +PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" +PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d25bd9e738..3aaa13276d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -18,6 +18,7 @@ SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-bootchart-lite ?= "4" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" @@ -49,17 +50,17 @@ SRCREV_pn-epydial ?= "215" SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd ?= "c44aa4c4067ecd680ec9523bdb67a25f23a6c57f" +SRCREV_pn-frameworkd ?= "b10138017b9fcf4dac8d16f22a184c333ddab9ab" SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "15f75f335efb52dd50a22a05f47a0f63eb07378b" -SRCREV_pn-fso-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5" +SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" -SRCREV_pn-gnuradio ?= "9809" +SRCREV_pn-gnuradio ?= "10302" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gpe-conf ?= "9798" @@ -107,15 +108,15 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" -SRCREV_pn-mickeyterm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" +SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9" +SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-mplayer ?= "28311" +SRCREV_pn-mplayer ?= "28346" SRCREV_pn-mplayer-maemo ?= "342" -SRCREV_pn-multicat ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" +SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" SRCREV_pn-neod ?= "4617" @@ -174,15 +175,14 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4878" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "196" -SRCREV_pn-opkg-native ?= "196" -SRCREV_pn-opkg-sdk ?= "196" +SRCREV_pn-opkg ?= "197" +SRCREV_pn-opkg-native ?= "197" +SRCREV_pn-opkg-sdk ?= "197" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" -SRCREV_pn-paroli-dialer ?= "118" -SRCREV_pn-paroli-gui ?= "118" +SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" @@ -208,6 +208,7 @@ SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" +SRCREV_pn-socketcan-modules ?= "917" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-table ?= "2191" @@ -229,7 +230,7 @@ SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" -SRCREV_pn-zhone ?= "cf48d98b8e994d6a7698fbc6f0689126892895f9" +SRCREV_pn-zhone ?= "cedaa8a6dd70fc3e13bd8bcda7fe84019cf9ef54" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 1ac6fe05ad..c74624b0ed 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -249,7 +249,7 @@ PREFERRED_PROVIDER_gconf ?= "gconf" # be pulled from a separate include file. But they can # go here for now. PREFERRED_VERSION_automake-native ?= "1.10" -PREFERRED_VERSION_busybox ?= "1.11.3" +PREFERRED_VERSION_busybox ?= "1.13.2" PREFERRED_VERSION_dbus ?= "1.2.1" PREFERRED_VERSION_glib-2.0 ?= "2.18.3" PREFERRED_VERSION_glib-2.0-native ?= "2.18.0" @@ -268,5 +268,9 @@ PREFERRED_VERSION_pkgconfig-native ?= "0.23" # libusb will overwrite libusb-compat in staging. PREFERRED_VERSION_libusb ?= "0.0.0" +# mtd-utils 1.2.0+git cannot be fetched, so SlugOS will stick +# with 1.1.0 for now: +PREFERRED_VERSION_mtd-utils ?= "1.1.0" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index bd58356f21..c038096231 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -38,8 +38,7 @@ DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost" # Some features (bluetooth, usbgadget) include packages we do not like. # Pick some of the packages manually. DISTRO_EXTRA_RDEPENDS += " \ - bluez-utils \ - bluez-utils-compat \ + bluez4 \ kernel-module-g-ether \ " @@ -47,9 +46,6 @@ DISTRO_EXTRA_RDEPENDS += " \ PREFERRED_VERSION_binutils ?= "2.17.50.0.12" PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" -# we want the openmoko svn version of gsmd -PREFERRED_PROVIDER_libgsmd = "libgsmd" - # Bleeding-edge developers should add the following lines to their local.conf: # require conf/distro/include/moko-autorev.inc # require conf/distro/include/fso-autorev.inc @@ -74,8 +70,10 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" -# Select package versions we want to use. +# Select package providers PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_PROVIDER_opkg = "opkg" +PREFERRED_PROVIDER_libgsmd = "libgsmd" # for jalimo PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" @@ -94,8 +92,3 @@ ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; ech ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;" ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};" ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};" - - - -# opkg -PREFERRED_PROVIDER_opkg = "opkg" |