diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 6 | ||||
| -rw-r--r-- | conf/distro/generic.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/insane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 5 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.3.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 52 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 32 |
9 files changed, 80 insertions, 28 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9b3c3fed11..d291fbd3ac 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -217,7 +217,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-hh16" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.72" +PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_wpa-supplicant = "0.5.5" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 60557325a9..046c63ad54 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -42,3 +42,9 @@ PREFERRED_VERSION_gtk+ = "2.12.0" PREFERRED_VERSION_glib-2.0 = "2.14.0" PREFERRED_VERSION_pango = "1.18.1" +# prefer newest for speed and fun +PREFERRED_VERSION_udev = "115" + +# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable +PREFERRED_VERSION_busybox = "1.7.2" + diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index a9d667372f..7ab7818393 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -74,7 +74,7 @@ require conf/distro/include/sane-srcdates.inc # PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_tslib ?= "tslib" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +require conf/distro/include/preferred-xorg-versions-X11R7.2.inc # # GPE diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index ae1ec5fb9c..96fd84a6fd 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -79,5 +79,7 @@ SRCREV_pn-sphyrna ?= "${AUTOREV}" SRCREV_pn-webkit-gtk ?= "${AUTOREV}" SRCREV_pn-xoo ?= "${AUTOREV}" SRCREV_pn-mplayer ?= "${AUTOREV}" +SRCREV_pn-usbpath ?= "${AUTOREV}" +SRCREV_pn-usbpath-native ?= "${AUTOREV}" SRCREV ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index c4d478ccde..5c80cf0c20 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -61,3 +61,8 @@ SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" SRCREV_pn-uboot-openmoko ?= "${AUTOREV}" +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/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index 19ee48174d..d7e19284bc 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -71,7 +71,7 @@ PREFERRED_VERSION_xcursorgen ?= "1.0.2" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" PREFERRED_VERSION_xditview ?= "1.0.1" PREFERRED_VERSION_xdm ?= "1.1.6" -PREFERRED_VERSION_xdpyinfo ?= "1.0.1" +PREFERRED_VERSION_xdpyinfo ?= "1.0.2" PREFERRED_VERSION_xdriinfo ?= "1.0.2" PREFERRED_VERSION_xedit ?= "1.0.2" PREFERRED_VERSION_xev ?= "1.0.1" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index afd281b42a..1c094a12e4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -5,7 +5,7 @@ # This will miss recipes that have skippackage set (e.g. uclibc) -SRCREV_pn-bfin-uclibc ?= "1806" +SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" SRCREV_pn-eglibc ?= "3531" @@ -17,23 +17,25 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" -SRCREV_pn-hildon-1 ?= "13708" -SRCREV_pn-libgsmd ?= "2957" +SRCREV_pn-hildon-1 ?= "14173" +SRCREV_pn-libgsmd ?= "3074" SRCREV_pn-libmokogsmd2 ?= "2950" -SRCREV_pn-libmokojournal2 ?= "2780" +SRCREV_pn-libmokojournal2 ?= "3118" SRCREV_pn-libmokopanelui2 ?= "2958" -SRCREV_pn-libmokoui2 ?= "3053" +SRCREV_pn-libmokoui2 ?= "3111" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" +SRCREV_pn-linux-bfin ?= "3731" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "108" SRCREV_pn-matchbox-desktop-2 ?= "1649" -SRCREV_pn-matchbox-keyboard ?= "1675" -SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675" +SRCREV_pn-matchbox-keyboard ?= "1739" +SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3058" +SRCREV_pn-moko-gtk-engine ?= "3146" +SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-neod ?= "2956" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" @@ -41,27 +43,28 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appmanager ?= "1851" -SRCREV_pn-openmoko-browser2 ?= "3031" +SRCREV_pn-openmoko-appmanager2 ?= "3090" +SRCREV_pn-openmoko-browser2 ?= "3082" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "2789" SRCREV_pn-openmoko-common ?= "397" SRCREV_pn-openmoko-common2 ?= "2679" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "335" +SRCREV_pn-openmoko-contacts2 ?= "358" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "563" +SRCREV_pn-openmoko-dates2 ?= "617" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "2976" -SRCREV_pn-openmoko-feedreader2 ?= "2944" +SRCREV_pn-openmoko-dialer2 ?= "3182" +SRCREV_pn-openmoko-feedreader2 ?= "3080" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "2873" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066" +SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" -SRCREV_pn-openmoko-mediaplayer2 ?= "2952" +SRCREV_pn-openmoko-mediaplayer2 ?= "3208" SRCREV_pn-openmoko-messages ?= "2276" SRCREV_pn-openmoko-panel-battery ?= "2897" SRCREV_pn-openmoko-panel-bt ?= "2896" @@ -69,7 +72,7 @@ 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 ?= "2936" +SRCREV_pn-openmoko-panel-gsm ?= "3185" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "2893" SRCREV_pn-openmoko-session ?= "152" @@ -79,14 +82,14 @@ 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 ?= "320" +SRCREV_pn-openmoko-tasks2 ?= "343" SRCREV_pn-openmoko-terminal2 ?= "2972" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" -SRCREV_pn-openmoko-theme-standard2 ?= "2964" +SRCREV_pn-openmoko-theme-standard2 ?= "3044" SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964" -SRCREV_pn-openmoko-today ?= "2556" -SRCREV_pn-openmoko-today2 ?= "2955" +SRCREV_pn-openmoko-today ?= "3056" +SRCREV_pn-openmoko-today2 ?= "3180" SRCREV_pn-openmoko-today2-folders ?= "2680" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" @@ -94,7 +97,12 @@ SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "44" -SRCREV_pn-webkit-gtk ?= "25615" +SRCREV_pn-webkit-gtk ?= "26079" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" +SRCREV_pn-libw100 ?= "47" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index eabb2d7def..652373a3eb 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -161,3 +161,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" + +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 8657b1140a..3adc4a9d5e 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -11,7 +11,7 @@ require conf/distro/angstrom-2007.1.conf # DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" -DISTRO_VERSION = "P1-September-Snapshot-${DATE}" +DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" @@ -19,7 +19,7 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:bui CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" -PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/" +PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ @@ -39,3 +39,31 @@ require conf/distro/include/preferred-openmoko-versions.inc # Bleeding-edge developers should add the following line to their local.conf: # require conf/distro/include/moko-autorev.inc +# override the PACKAGE_ARCH of certain packages for openmoko distro +# +# Same kernel runs on both these machines +PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" +# Same touchscreen on both these machines +PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0" +# Same kernel so same usb +PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" +# same kernel so same keymaps +PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" +# neod knows about both machines +PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" + +# Select packge versions we wash to use. +PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" +PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" + +# deploy gta01 and gta02 in ${MACHINE_CLASS} directory +DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" + |