summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini2
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc35
-rw-r--r--conf/distro/include/sane-srcrevs.inc16
-rw-r--r--conf/distro/minimal-uclibc.conf2
-rw-r--r--conf/distro/openmoko.conf6
-rw-r--r--conf/machine/om-gta01.conf4
-rw-r--r--conf/machine/om-gta02.conf5
7 files changed, 39 insertions, 31 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index df007df044..648da96cb6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9502,7 +9502,7 @@ sha256=2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee
md5=c703192481d94dfa3f4e24eed22c8182
sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d
-[http://www.7-zip.org/dl/lzma417.tar.bz2]
+[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2]
md5=b1ab85e4dc1eb1323d77fef47a2cb71c
sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 211cad8956..13040fd45d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -202,7 +202,7 @@ PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
PREFERRED_VERSION_curl ?= "7.18.2"
-PREFERRED_VERSION_curl-native ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.2"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -222,8 +222,8 @@ PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_dbus ?= "1.2.1"
PREFERRED_VERSION_dbus-native ?= "1.2.1"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-PREFERRED_VERSION_dbus-glib-native ?= "0.74"
+PREFERRED_VERSION_dbus-glib ?= "0.76"
+PREFERRED_VERSION_dbus-glib-native ?= "0.76"
PREFERRED_VERSION_dbus-native ?= "1.0.3"
PREFERRED_VERSION_dbus-python ?= "0.71"
PREFERRED_VERSION_dcetest ?= "1.2"
@@ -323,7 +323,8 @@ PREFERRED_VERSION_e-uae ?= "0.8.28"
PREFERRED_VERSION_eventlog ?= "0.2.5"
PREFERRED_VERSION_evieext ?= "1.0.2"
PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_e-wm ?= "0.16.999.041"
+# The only e-wm recipe is a cvs one with SRCDATE floating!
+# PREFERRED_VERSION_e-wm ?= "0.16.999.042"
PREFERRED_VERSION_exiv2 ?= "0.15"
PREFERRED_VERSION_exmap-console ?= "0.4.1"
PREFERRED_VERSION_exml ?= "cvs"
@@ -390,7 +391,7 @@ PREFERRED_VERSION_foonas-init ?= "0.10"
PREFERRED_VERSION_foonas-packages ?= "1.0"
PREFERRED_VERSION_fortune-mod ?= "1.99.1"
PREFERRED_VERSION_fpdf ?= "1.53"
-PREFERRED_VERSION_free42-vga ?= "1.4.36"
+PREFERRED_VERSION_free42-vga ?= "1.4.41"
PREFERRED_VERSION_freeciv ?= "2.0.8"
PREFERRED_VERSION_freedoom ?= "0.3"
PREFERRED_VERSION_freedroid ?= "1.0.2"
@@ -810,7 +811,7 @@ PREFERRED_VERSION_libassa ?= "3.4.2"
PREFERRED_VERSION_libassuan ?= "0.6.9"
PREFERRED_VERSION_libatomics-ops ?= "1.2"
PREFERRED_VERSION_libbedic ?= "1.0"
-PREFERRED_VERSION_libbonobo ?= "2.14.0"
+PREFERRED_VERSION_libbonobo ?= "2.22.0"
PREFERRED_VERSION_libbonoboui ?= "2.18.0"
PREFERRED_VERSION_libcache-cache-perl ?= "1.05"
PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05"
@@ -944,7 +945,7 @@ PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
PREFERRED_VERSION_libmimedir ?= "0.4.2"
PREFERRED_VERSION_libmng ?= "1.0.8"
-PREFERRED_VERSION_libmodplug ?= "0.7"
+PREFERRED_VERSION_libmodplug ?= "0.8"
PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
PREFERRED_VERSION_libmrss ?= "0.17.2"
@@ -983,8 +984,8 @@ PREFERRED_VERSION_libparams-validate-perl ?= "0.86"
PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86"
PREFERRED_VERSION_libpcap ?= "0.9.8"
PREFERRED_VERSION_libpcl ?= "1.4"
-PREFERRED_VERSION_libpcre ?= "4.4"
-PREFERRED_VERSION_libpcre-native ?= "4.4"
+PREFERRED_VERSION_libpcre ?= "7.6"
+PREFERRED_VERSION_libpcre-native ?= "7.6"
PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
PREFERRED_VERSION_libpng ?= "1.2.20"
PREFERRED_VERSION_libpng-native ?= "1.2.20"
@@ -1056,7 +1057,7 @@ PREFERRED_VERSION_libversion-perl ?= "0.6701"
PREFERRED_VERSION_libversion-perl-native ?= "0.6701"
PREFERRED_VERSION_libvisual ?= "0.1.3"
PREFERRED_VERSION_libvisual-plugins ?= "0.1.3"
-PREFERRED_VERSION_libvncserver ?= "0.8.2"
+PREFERRED_VERSION_libvncserver ?= "0.9"
PREFERRED_VERSION_libvocenabler ?= "0.1"
PREFERRED_VERSION_libvorbis ?= "1.0.1"
PREFERRED_VERSION_libw100 ?= "0.0.2"
@@ -1107,7 +1108,7 @@ PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
PREFERRED_VERSION_libxsettings ?= "0.11"
PREFERRED_VERSION_libxsettings-client ?= "0.17"
PREFERRED_VERSION_libxslt ?= "1.1.22"
-PREFERRED_VERSION_libxslt-native ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.21"
PREFERRED_VERSION_libxt ?= "1.0.5"
PREFERRED_VERSION_libxtrap ?= "1.0.0"
PREFERRED_VERSION_libxtst ?= "1.0.3"
@@ -1312,7 +1313,7 @@ PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
-PREFERRED_VERSION_navit ?= "0.0.3"
+PREFERRED_VERSION_navit ?= "0.0.4"
PREFERRED_VERSION_nbd ?= "2.8.7"
PREFERRED_VERSION_ncftp ?= "3.2.0"
PREFERRED_VERSION_ncmpc ?= "0.11.1"
@@ -1454,7 +1455,7 @@ PREFERRED_VERSION_pmtools ?= "20050926"
PREFERRED_VERSION_poboxserver ?= "1.2.5"
PREFERRED_VERSION_pocketcellar ?= "1.1"
PREFERRED_VERSION_pocketsphinx ?= "0.2.1"
-PREFERRED_VERSION_poppler ?= "0.6"
+PREFERRED_VERSION_poppler ?= "0.8.4"
PREFERRED_VERSION_poppler-data ?= "0.1"
PREFERRED_VERSION_popt ?= "1.7"
PREFERRED_VERSION_popt-native ?= "1.7"
@@ -1538,7 +1539,7 @@ PREFERRED_VERSION_python-pycurl ?= "7.18.2"
PREFERRED_VERSION_python-pyephem ?= "3.7.2a"
PREFERRED_VERSION_python-pyfits ?= "1.1"
PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
-PREFERRED_VERSION_python-pygame ?= "1.7.1"
+PREFERRED_VERSION_python-pygame ?= "1.8.1"
PREFERRED_VERSION_python-pygnome ?= "2.16.2"
PREFERRED_VERSION_python-pygobject ?= "2.14.2"
PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
@@ -1892,7 +1893,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "115"
+PREFERRED_VERSION_udev ?= "092"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
@@ -1933,6 +1934,8 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
PREFERRED_VERSION_util-macros-native ?= "1.1.5"
PREFERRED_VERSION_uucp ?= "1.07"
PREFERRED_VERSION_v4l2apps ?= "20020317"
+PREFERRED_VERSION_vala ?= "0.1.5"
+PREFERRED_VERSION_vala-native ?= "0.1.5"
PREFERRED_VERSION_vde ?= "2.0.2"
PREFERRED_VERSION_vectoroids ?= "1.1.0"
PREFERRED_VERSION_videoplayer ?= "0.1"
@@ -1982,7 +1985,7 @@ PREFERRED_VERSION_wview-vpro ?= "3.1.3"
PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3"
PREFERRED_VERSION_wview-wxt510 ?= "3.1.3"
PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3"
-PREFERRED_VERSION_wxwidgets ?= "2.6.3"
+PREFERRED_VERSION_wxwidgets ?= "2.8.7"
PREFERRED_VERSION_x11perf ?= "1.4.1"
PREFERRED_VERSION_x11vnc ?= "0.9.3"
PREFERRED_VERSION_xaos ?= "3.2.3"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3b86c2a539..1447773296 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,8 +15,8 @@ SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
SRCREV_pn-assassin ?= "93"
SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "21996"
-SRCREV_pn-uclibc-initial ?= "21996"
+SRCREV_pn-uclibc ?= "23129"
+SRCREV_pn-uclibc-initial ?= "23129"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dasher-gpe ?= "1251"
SRCREV_pn-dbus-c++-native ?= "13131"
@@ -47,9 +47,9 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume ?= "170"
+SRCREV_pn-illume ?= "35605"
SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
+SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
@@ -57,6 +57,7 @@ SRCREV_pn-libexalt ?= "78"
SRCREV_pn-libexalt-dbus ?= "76"
SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libgsmd ?= "4335"
+SRCREV_pn-libiac ?= "1590"
SRCREV_pn-libjana ?= "704"
SRCREV_pn-libmokogsmd2 ?= "4334"
SRCREV_pn-libmokojournal2 ?= "3473"
@@ -71,7 +72,7 @@ SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759"
+SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -146,13 +147,10 @@ SRCREV_pn-opkg-utils ?= "4534"
SRCREV_pn-opkg-utils-native ?= "4534"
SRCREV_pn-oprofileui ?= "173"
SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
+SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
-SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
-SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
-SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
-SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index d76a9c444f..db08775d4a 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -8,7 +8,7 @@
#@COMMENT: It bases on conservative settings and should always be buildable.
#-----------------------------------------------------------------------------
-require conf/distro/generic.conf
+require conf/distro/minimal.conf
#
# Header
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 320d9c057b..d36a6188df 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -65,6 +65,12 @@ PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
PREFERRED_PROVIDER_midpath = "midpath-openmoko"
+# We don't use this, but select one to shut bitbake up.
+PREFERRED_PROVIDER_virtual/libqte2 = "qte"
+
+# opkg
+PREFERRED_PROVIDER_opkg = "opkg"
+
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 46bd42f2a2..57d81c2ade 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
+#@NAME: FIC GTA01 (Neo 1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 45dc0518a4..88aa3881c7 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@NAME: Openmoko GTA02 (NeoFreerunner)
+#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-snd-soc-neo1973-gta02-wm8753 \
"
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
SERIAL_CONSOLE = "115200 ttySAC2"
# used by some images
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 21:50:15 +0000