aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS14
-rw-r--r--classes/angstrom-mirrors.bbclass4
-rw-r--r--classes/autotools.bbclass2
-rw-r--r--classes/base.bbclass17
-rw-r--r--classes/binconfig.bbclass2
-rw-r--r--classes/cmake.bbclass7
-rw-r--r--classes/image.bbclass11
-rw-r--r--classes/insane.bbclass167
-rw-r--r--classes/module-base.bbclass4
-rw-r--r--classes/module.bbclass3
-rw-r--r--classes/openmoko-base.bbclass2
-rw-r--r--classes/opie_i18n.bbclass20
-rw-r--r--classes/qmake2.bbclass7
-rw-r--r--classes/qtopia4core.bbclass7
-rw-r--r--classes/rootfs_deb.bbclass2
-rw-r--r--classes/rootfs_ipk.bbclass2
-rw-r--r--classes/sanity.bbclass8
-rw-r--r--classes/sdl.bbclass36
-rw-r--r--classes/xilinx-bsp.bbclass2
-rw-r--r--conf/checksums.ini55
-rw-r--r--conf/distro/amsdelta-oe.conf2
-rw-r--r--conf/distro/angstrom-2007.1-legacy.conf2
-rw-r--r--conf/distro/angstrom-2008.1.conf40
-rw-r--r--conf/distro/foonas.conf2
-rw-r--r--conf/distro/include/angstrom-2007-for-openmoko.inc (renamed from conf/distro/angstrom-2007.1.conf)8
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc26
-rw-r--r--conf/distro/include/angstrom.inc1
-rw-r--r--conf/distro/include/moko-autorev.inc4
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc1
-rw-r--r--conf/distro/include/sane-srcdates.inc7
-rw-r--r--conf/distro/include/sane-srcrevs.inc17
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/distro/mokoslug.conf2
-rw-r--r--conf/distro/openmoko.conf10
-rw-r--r--conf/distro/openwrt-sdk.conf29
-rw-r--r--conf/distro/unslung.conf2
-rw-r--r--conf/documentation.conf3
-rw-r--r--conf/machine/collie.conf5
-rw-r--r--conf/machine/dht-walnut.conf1
-rw-r--r--conf/machine/fic-gta01.conf9
-rw-r--r--conf/machine/fic-gta02.conf9
-rw-r--r--conf/machine/gesbc-9302.conf29
-rw-r--r--conf/machine/h2200.conf5
-rw-r--r--conf/machine/h3600.conf2
-rw-r--r--conf/machine/h5000.conf10
-rw-r--r--conf/machine/htcalpine.conf2
-rw-r--r--conf/machine/htcapache.conf2
-rw-r--r--conf/machine/htcblueangel.conf2
-rw-r--r--conf/machine/htchimalaya.conf2
-rw-r--r--conf/machine/htcsable.conf2
-rw-r--r--conf/machine/htctornado.conf2
-rw-r--r--conf/machine/htcwallaby.conf2
-rw-r--r--conf/machine/hx4700.conf2
-rw-r--r--conf/machine/include/collie-2.6.inc2
-rw-r--r--conf/machine/include/motorola-ezx-base.inc4
-rw-r--r--conf/machine/include/qemu.inc1
-rw-r--r--conf/machine/include/tune-strongarm.inc2
-rw-r--r--conf/machine/include/tune-strongarm1100.inc5
-rw-r--r--conf/machine/include/zaurus-2.6.inc2
-rw-r--r--conf/machine/jornada56x.conf2
-rw-r--r--conf/machine/jornada7xx.conf2
-rw-r--r--conf/machine/magician.conf6
-rw-r--r--conf/machine/mainstone.conf3
-rw-r--r--conf/machine/mx31moboard.conf33
-rw-r--r--conf/machine/shark.conf2
-rw-r--r--conf/machine/simpad.conf2
-rwxr-xr-xcontrib/angstrom/build-feeds.sh43
-rwxr-xr-xcontrib/angstrom/build-release.sh26
-rw-r--r--contrib/deploy/.mtn2git_empty (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty)0
-rw-r--r--contrib/deploy/README2
-rw-r--r--contrib/deploy/nfs/.mtn2git_empty (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty)0
-rw-r--r--contrib/deploy/nfs/exports.sample2
-rwxr-xr-xcontrib/deploy/nfs/oe-nfs-deploy-image51
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/.mtn2git_empty (renamed from packages/jamvm/jamvm-1.3.0/.mtn2git_empty)0
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/debian/.mtn2git_empty (renamed from packages/jamvm/jamvm/.mtn2git_empty)0
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/debian/changelog (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog)7
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/debian/compat (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat)0
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/debian/control (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/control)2
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.3/debian/copyright (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright)0
-rwxr-xr-xcontrib/distro-packages/debian/openembedded-essential-1.3/debian/rules (renamed from contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules)0
-rw-r--r--contrib/feed-browser/includes/config.inc1031
-rw-r--r--contrib/feed-browser/update.php10
-rwxr-xr-xcontrib/mtn2cl/mtn2cl.sh2
-rwxr-xr-xcontrib/mtn2git/mtn2git.py405
-rw-r--r--contrib/mtn2git/status.py11
-rwxr-xr-xcontrib/python/generate-manifest-2.5.py2
-rw-r--r--delete.txt27
-rw-r--r--packages/agg/agg_2.5.bb11
-rw-r--r--packages/alsa/alsa-state.bb6
-rw-r--r--packages/alsa/alsa-state/fic-gta02/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/.mtn2git_empty)0
-rw-r--r--packages/alsa/alsa-state/fic-gta02/asound.state875
-rw-r--r--packages/alsa/alsa-state/fic-gta02/stereoout.state875
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR73.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR69.bb)2
-rw-r--r--packages/angstrom/angstrom-gpe-task-base.bb3
-rw-r--r--packages/apex/apex-env_1.5.13.bb24
-rw-r--r--packages/apex/apex-env_1.5.8.bb6
-rw-r--r--packages/apex/apex-nslu2-1.5.13/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty)0
-rw-r--r--packages/apex/apex-nslu2-1.5.13/defconfig164
-rw-r--r--packages/apex/apex-nslu2-1.5.8/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty)0
-rw-r--r--packages/apex/apex-nslu2-1.5.8/defconfig (renamed from packages/apex/files/defconfig)0
-rw-r--r--packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty)0
-rw-r--r--packages/apex/apex-nslu2-16mb-1.5.13/defconfig164
-rw-r--r--packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty)0
-rw-r--r--packages/apex/apex-nslu2-16mb-1.5.8/defconfig (renamed from packages/apex/files/defconfig-16mb)0
-rw-r--r--packages/apex/apex-nslu2-16mb_1.5.13.bb63
-rw-r--r--packages/apex/apex-nslu2-16mb_1.5.8.bb8
-rw-r--r--packages/apex/apex-nslu2_1.5.13.bb63
-rw-r--r--packages/apex/files/find-apex-partition.patch34
-rw-r--r--packages/apr/apr-util_1.2.7.bb9
-rw-r--r--packages/apr/apr_1.2.7.bb3
-rw-r--r--packages/asterisk-core-sounds-en-alaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty)0
-rw-r--r--packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb46
-rw-r--r--packages/asterisk-core-sounds-en-g729/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty)0
-rw-r--r--packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb46
-rw-r--r--packages/asterisk-core-sounds-en-gsm/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty)0
-rw-r--r--packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb48
-rw-r--r--packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty)0
-rw-r--r--packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb46
-rw-r--r--packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty)0
-rw-r--r--packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb37
-rw-r--r--packages/asterisk-extra-sounds-en-g729/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty)0
-rw-r--r--packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb37
-rw-r--r--packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty)0
-rw-r--r--packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb37
-rw-r--r--packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty)0
-rw-r--r--packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb37
-rw-r--r--packages/asterisk-moh-freeplay-alaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty)0
-rw-r--r--packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb22
-rw-r--r--packages/asterisk-moh-freeplay-g729/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty)0
-rw-r--r--packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb20
-rw-r--r--packages/asterisk-moh-freeplay-gsm/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty)0
-rw-r--r--packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb20
-rw-r--r--packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty)0
-rw-r--r--packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb22
-rw-r--r--packages/asterisk/asterisk-1.4.17/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty)0
-rw-r--r--packages/asterisk/asterisk-1.4.17/Makefile.patch20
-rw-r--r--packages/asterisk/asterisk-1.4.17/init77
-rw-r--r--packages/asterisk/asterisk-1.4.17/logrotate12
-rw-r--r--packages/asterisk/asterisk-1.4.17/sounds.xml.patch18
-rw-r--r--packages/asterisk/asterisk-1.4.17/volatiles7
-rw-r--r--packages/asterisk/asterisk_1.4.17.bb171
-rw-r--r--packages/atftp/atftp_0.7.bb4
-rw-r--r--packages/atk/atk.inc9
-rw-r--r--packages/atk/atk_1.18.0.bb8
-rw-r--r--packages/atk/atk_1.19.3.bb10
-rw-r--r--packages/atk/atk_1.20.0.bb12
-rw-r--r--packages/avahi/avahi.inc8
-rw-r--r--packages/avetanabt/avetanabt_20060413.bb5
-rw-r--r--packages/avetanabt/avetanabt_cvs.bb5
-rw-r--r--packages/backsaver/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty)0
-rw-r--r--packages/backsaver/backsaver_1.0.bb14
-rw-r--r--packages/backsaver/files/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty)0
-rw-r--r--packages/backsaver/files/Makefile8
-rw-r--r--packages/backsaver/files/backsaver.c256
-rw-r--r--packages/bluez/bluez-cups-backend_3.24.bb28
-rw-r--r--packages/bluez/bluez-gnome_0.15.bb14
-rw-r--r--packages/bluez/bluez-gstreamer-plugin_3.24.bb28
-rw-r--r--packages/bluez/bluez-libs_3.24.bb4
-rw-r--r--packages/bluez/bluez-utils-alsa_3.24.bb26
-rw-r--r--packages/bluez/bluez-utils/hciattach-ti-bts.patch68
-rw-r--r--packages/bluez/bluez-utils3.inc8
-rw-r--r--packages/bluez/bluez-utils_3.23.bb1
-rw-r--r--packages/bluez/bluez-utils_3.24.bb30
-rw-r--r--packages/busybox/busybox_1.00.bb2
-rw-r--r--packages/cacao/cacao-cldc.inc64
-rw-r--r--packages/cacao/cacao-cldc_0.98.bb42
-rw-r--r--packages/cacao/cacao-initial_0.98.bb34
-rw-r--r--packages/cacao/cacao-native.inc27
-rw-r--r--packages/cacao/cacao-native_0.98+hg20071001.bb5
-rw-r--r--packages/cacao/cacao.inc52
-rw-r--r--packages/cacao/cacao_0.98+hg20071001.bb16
-rw-r--r--packages/cacao/cacaoh-cldc-native_0.98.bb25
-rw-r--r--packages/cacao/cacaoh-native.inc28
-rw-r--r--packages/cacao/cacaoh-native_0.98+hg20071001.bb5
-rw-r--r--packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch50
-rw-r--r--packages/cacao/files/cacao-0.98+hg-attachthread.patch12
-rw-r--r--packages/cacao/files/cacao-0.98+svn-classpath_var.patch56
-rw-r--r--packages/cacao/files/cacao-0.98+svn-libdir.diff30
-rw-r--r--packages/cacao/files/cacao-0.98-initial.patch45
-rw-r--r--packages/classpath/classpath-initial_0.93.bb28
-rw-r--r--packages/classpath/classpath-minimal_0.96.1.bb17
-rw-r--r--packages/classpath/classpath-native.inc32
-rw-r--r--packages/classpath/classpath-native_0.96.1.bb6
-rw-r--r--packages/classpath/classpath.inc60
-rw-r--r--packages/classpath/classpath_0.95.bb20
-rw-r--r--packages/classpath/classpath_0.96.1.bb20
-rw-r--r--packages/classpath/files/gjar-prefix-patch.diff40
-rw-r--r--packages/cmake/cmake-native_2.4.7.bb3
-rw-r--r--packages/cmake/cmake.inc (renamed from packages/cmake/cmake-native_2.2.3.bb)4
-rw-r--r--packages/cmake/cmake_2.4.7.bb2
-rw-r--r--packages/dbus/dbus-1.1.1/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty)0
-rw-r--r--packages/dbus/dbus-1.1.1/cross.patch10
-rw-r--r--packages/dbus/dbus-1.1.1/dbus-1.init110
-rw-r--r--packages/dbus/dbus-1.1.1/fix-install-daemon.patch13
-rw-r--r--packages/dbus/dbus-1.1.1/tmpdir.patch30
-rw-r--r--packages/dbus/dbus-native_1.1.1.bb31
-rw-r--r--packages/dbus/dbus_1.1.1.bb63
-rw-r--r--packages/distcc/distcc_2.18.3.bb15
-rw-r--r--packages/distcc/files/distcc2
-rw-r--r--packages/distcc/files/distcc-avahi.patch12305
-rw-r--r--packages/distcc/files/no-man.patch11
-rw-r--r--packages/docbook-dsssl-stylesheets/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty)0
-rw-r--r--packages/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb35
-rw-r--r--packages/docbook-sgml-dtd/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty)0
-rw-r--r--packages/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb12
-rw-r--r--packages/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb12
-rw-r--r--packages/docbook-sgml-dtd/docbook-sgml-dtd-4.4-native.bb10
-rw-r--r--packages/docbook-sgml-dtd/docbook-sgml-dtd-native.inc31
-rw-r--r--packages/docbook-utils/docbook-utils-native_0.6.13.bb2
-rw-r--r--packages/docbook-utils/docbook-utils-native_0.6.14.bb41
-rw-r--r--packages/docbook-utils/docbook-utils_0.6.13.bb3
-rw-r--r--packages/docbook-utils/docbook-utils_0.6.14.bb10
-rw-r--r--packages/dpkg/dpkg.inc4
-rw-r--r--packages/dtnrg/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty)0
-rw-r--r--packages/dtnrg/dtn_2.5.0.bb67
-rw-r--r--packages/e17/edje-viewer/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty)0
-rw-r--r--packages/e17/edje-viewer/no-minimal-size.patch27
-rw-r--r--packages/e17/edje-viewer_cvs.bb5
-rw-r--r--packages/e17/enna_cvs.bb (renamed from packages/e17/enna_svn.bb)5
-rw-r--r--packages/e2fsprogs/e2fsprogs_1.38.bb6
-rw-r--r--packages/ecj/ecj-bootstrap-native_3.3.bb38
-rw-r--r--packages/ecj/ecj-initial_3.3.bb84
-rw-r--r--packages/ecj/ecj-native_3.2.2.bb17
-rw-r--r--packages/ecj/ecj-native_3.3.bb17
-rwxr-xr-xpackages/ecj/files/ecj.in1
-rw-r--r--packages/ecj/files/ecj.sh3
-rw-r--r--packages/efl1/ecore-native_cvs.bb2
-rw-r--r--packages/efl1/ecore.inc12
-rw-r--r--packages/efl1/ecore_cvs.bb5
-rw-r--r--packages/efl1/edbus_cvs.bb10
-rw-r--r--packages/efl1/epdf/fix-plugin-path-check.patch24
-rw-r--r--packages/efl1/epdf_cvs.bb3
-rw-r--r--packages/efl1/etk_cvs.bb3
-rw-r--r--packages/efl1/evas.inc16
-rw-r--r--packages/efl1/evas_cvs.bb3
-rw-r--r--packages/efl1/ewl_cvs.bb5
-rw-r--r--packages/emacs/emacs-x11_20060801.bb4
-rw-r--r--packages/emacs/emacs-x11_cvs.bb3
-rw-r--r--packages/emacs/emacs_20060801.bb2
-rw-r--r--packages/emacs/emacs_cvs.bb12
-rw-r--r--packages/enca/enca_1.9.bb4
-rw-r--r--packages/espeak/.mtn2git_empty (renamed from packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty)0
-rw-r--r--packages/espeak/espeak_1.30.bb52
-rw-r--r--packages/flite/flite-1.3/flite-1.3-Makefile.patch405
-rw-r--r--packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch12
-rw-r--r--packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch15
-rw-r--r--packages/flite/flite-alsa-1.2/.mtn2git_empty (renamed from packages/linux/linux-rp-2.6.16/.mtn2git_empty)0
-rw-r--r--packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff (renamed from packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff)0
-rw-r--r--packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch12
-rw-r--r--packages/flite/flite-alsa-1.3/.mtn2git_empty (renamed from packages/linux/linux-rp-2.6.17/.mtn2git_empty)0
-rw-r--r--packages/flite/flite-alsa-1.3/flite-1.3-alsa_support-1.2.diff (renamed from packages/flite/flite-1.3/flite-1.3-alsa_support-1.2.diff)0
-rw-r--r--packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch12
-rw-r--r--packages/flite/flite-alsa_1.2.bb10
-rw-r--r--packages/flite/flite-alsa_1.3.bb11
-rw-r--r--packages/flite/flite.inc9
-rw-r--r--packages/flite/flite_1.2.bb9
-rw-r--r--packages/flite/flite_1.3.bb10
-rw-r--r--packages/flumotion/flumotion_0.4.1.bb16
-rw-r--r--packages/fmtools/.mtn2git_empty (renamed from packages/linux/linux-rp-2.6.21/.mtn2git_empty)0
-rw-r--r--packages/fmtools/files/.mtn2git_empty (renamed from packages/qmake/qmake2-native-2.10a/.mtn2git_empty)0
-rw-r--r--packages/fmtools/files/makefile.patch11
-rw-r--r--packages/fmtools/fmtools_1.0.2.bb15
-rw-r--r--packages/freenote/freenote_1.12.0.bb2
-rw-r--r--packages/fstests/fstests.bb4
-rw-r--r--packages/gallery/gallery_1.5.5.bb2
-rw-r--r--packages/gammu/gammu_1.17.0.bb (renamed from packages/gammu/gammu_1.13.0.bb)0
-rw-r--r--packages/gcc/gcc-cross-sdk_4.2.2.bb16
-rw-r--r--packages/gcc/gcc-native.inc28
-rw-r--r--packages/gcc/gcc-native_3.4.4.bb2
-rw-r--r--packages/gcc/gcc-package.inc6
-rw-r--r--packages/gettext/gettext_0.14.1.bb16
-rw-r--r--packages/git/files/git-gui-install-mode-arg-spaces.patch32
-rw-r--r--packages/git/git.inc4
-rw-r--r--packages/glibc/eglibc-package.bbclass8
-rw-r--r--packages/glibc/glibc-package.bbclass10
-rw-r--r--packages/gnome-mplayer/.mtn2git_empty (renamed from packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty)0
-rw-r--r--packages/gnome-mplayer/files/.mtn2git_empty (renamed from packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty)0
-rw-r--r--packages/gnome-mplayer/files/1.patch37
-rw-r--r--packages/gnome-mplayer/files/ac-gthread.patch12
-rw-r--r--packages/gnome-mplayer/files/non-utf8-id3-fallback.patch22
-rw-r--r--packages/gnome-mplayer/files/uchar-for-utf8-check.patch22
-rw-r--r--packages/gnome-mplayer/gnome-mplayer_0.5.3.bb14
-rw-r--r--packages/gnome-mplayer/gnome-mplayer_cvs.bb18
-rw-r--r--packages/gpe-login/files/c-locale.patch11
-rw-r--r--packages/gpe-login/gpe-login_0.90.bb3
-rw-r--r--packages/gpe-nmf/gpe-nmf.inc2
-rw-r--r--packages/gpe-nmf/gpe-nmf_0.22.bb2
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.67.bb2
-rw-r--r--packages/gpsd/files/fic-gta01/.mtn2git_empty (renamed from packages/qte/qtopia-core/.mtn2git_empty)0
-rw-r--r--packages/gpsd/files/fic-gta01/gps-hardware41
-rw-r--r--packages/gpsd/files/fic-gta01/gpsd-default3
-rw-r--r--packages/gpsd/files/fic-gta01/restart_gllin.sh6
-rw-r--r--packages/gpsd/files/gps-hardware2
-rwxr-xr-xpackages/gpsd/files/gpsd11
-rw-r--r--packages/gpsd/gpsd.inc40
-rw-r--r--packages/gpsd/gpsd_2.28.bb2
-rw-r--r--packages/gpsd/gpsd_2.34.bb2
-rw-r--r--packages/gpsd/gpsd_2.36.bb3
-rw-r--r--packages/gpsdrive/gpsdrive-pda/.mtn2git_empty (renamed from packages/quilt/quilt-0.39/.mtn2git_empty)0
-rw-r--r--packages/gpsdrive/gpsdrive-pda/makefile.patch16
-rw-r--r--packages/gpsdrive/gpsdrive-pda_2.10pre2.bb34
-rw-r--r--packages/gsm/files/default14
-rw-r--r--packages/gsm/gsmd.inc2
-rw-r--r--packages/gtk+/gtk+-2.10.14/small-gtkfilechooser.patch222
-rw-r--r--packages/gtk+/gtk+_2.10.14.bb3
-rw-r--r--packages/hal/hal_0.5.9.bb16
-rw-r--r--packages/helloworld/helloworld_1.0.0.bb2
-rw-r--r--packages/hwdata/hwdata_0.191.bb6
-rw-r--r--packages/imagemagick/imagemagick-native_6.3.5-10.bb3
-rw-r--r--packages/images/base-image.bb16
-rw-r--r--packages/images/initramfs-minimal-image.bb3
-rw-r--r--packages/images/minimal-gpe-image.bb3
-rw-r--r--packages/images/nas-server-image.bb53
-rw-r--r--packages/images/openmoko-python-devel-image.bb6
-rw-r--r--packages/images/opie-image-16mb.bb45
-rw-r--r--packages/images/opie-image.bb47
-rw-r--r--packages/images/unslung-image.bb14
-rw-r--r--packages/initrdscripts/files/30-bootmenu.sh4
-rw-r--r--packages/initrdscripts/files/80-nfsboot.sh2
-rw-r--r--packages/initrdscripts/initramfs-module-bootmenu_1.0.bb4
-rw-r--r--packages/initrdscripts/initramfs-module-nfs_1.0.bb4
-rw-r--r--packages/initscripts/initscripts-1.0/functions4
-rw-r--r--packages/initscripts/initscripts_1.0.bb2
-rw-r--r--packages/ipaq-sleep/files/unbreak.patch11
-rw-r--r--packages/ipaq-sleep/ipaq-sleep_0.9.bb4
-rw-r--r--packages/ipkg/ipkg-native_0.99.163.bb2
-rw-r--r--packages/ixp4xx/ixp4xx-npe-2.4/.mtn2git_empty (renamed from packages/roadmap/zroadmap-1.0.12/.mtn2git_empty)0
-rw-r--r--packages/ixp4xx/ixp4xx-npe-2.4/Intel40
-rw-r--r--packages/ixp4xx/ixp4xx-npe_2.4.bb9
-rw-r--r--packages/jamvm/files/.mtn2git_empty (renamed from packages/uboot/.mtn2git_empty)0
-rw-r--r--packages/jamvm/files/jamvm-1.3.1-size-defaults.patch (renamed from packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch)0
-rw-r--r--packages/jamvm/files/jamvm_1.5.0-initial.patch82
-rw-r--r--packages/jamvm/jamvm-initial_1.5.0.bb36
-rw-r--r--packages/jamvm/jamvm.inc22
-rw-r--r--packages/jamvm/jamvm/sh3sh4-support.patch11
-rw-r--r--packages/jamvm/jamvm_1.4.5.bb24
-rw-r--r--packages/jamvm/jamvm_1.5.0.bb5
-rw-r--r--packages/jikes/jikes-initial.bb23
-rw-r--r--packages/jikes/jikes-native_1.21.bb1
-rw-r--r--packages/kaffe/kaffe.inc2
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc2
-rw-r--r--packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch294
-rw-r--r--packages/kexec/kexec-tools_1.101.bb9
-rw-r--r--packages/kismet/kismet_2007-10-R1.bb4
-rw-r--r--packages/knights/knights_1.14.bb2
-rw-r--r--packages/libdotconf/.mtn2git_empty (renamed from packages/uboot/files/.mtn2git_empty)0
-rw-r--r--packages/libdotconf/files/.mtn2git_empty (renamed from packages/uboot/u-boot-1.1.2/.mtn2git_empty)0
-rw-r--r--packages/libdotconf/files/srcMakefile.am_00.patch9
-rw-r--r--packages/libdotconf/libdotconf_1.0.13.bb25
-rw-r--r--packages/libqanava/libqanava_0.0.7.bb4
-rw-r--r--packages/libsdl/libsdl-mixer_1.2.6.bb6
-rw-r--r--packages/libtool/libtool-1.5.6/.mtn2git_empty (renamed from packages/uboot/u-boot-1.1.4/.mtn2git_empty)0
-rw-r--r--packages/libtool/libtool-1.5.6/autotools.patch127
-rw-r--r--packages/libtool/libtool_1.5.6.bb38
-rw-r--r--packages/linux/linux-2.6.22.6/mx31moboard/.mtn2git_empty (renamed from packages/uboot/u-boot-1.1.6/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-2.6.22.6/mx31moboard/defconfig1492
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/alix/.mtn2git_empty (renamed from packages/uboot/u-boot-1.2.0/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/alix/defconfig1836
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/cm-x270/defconfig76
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/.mtn2git_empty (renamed from packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/0001-gesbc-nand.patch306
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc5/gesbc-9302/defconfig (renamed from packages/linux/linux-rp-2.6.17/defconfig-qemuarm)955
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc6/.mtn2git_empty (renamed from packages/uboot/u-boot-1.2.0/turbostation/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/.mtn2git_empty (renamed from packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0001-2.6.23-at91.patch16686
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/0002-at91sam9260ek_defconfig.patch959
-rw-r--r--packages/linux/linux-2.6.23+2.6.24-rc6/at91sam9260ek/defconfig1129
-rw-r--r--packages/linux/linux-2.6.23/kallsyms-missing-include.patch19
-rw-r--r--packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty (renamed from packages/uboot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig (renamed from packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig)0
-rw-r--r--packages/linux/linux-dht-walnut/.mtn2git_empty (renamed from packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty0
-rw-r--r--packages/linux/linux-dht-walnut/dht-walnut/defconfig2353
-rw-r--r--packages/linux/linux-dht-walnut/remove-todc.patch920
-rw-r--r--packages/linux/linux-dht-walnut_2.6.20.bb48
-rw-r--r--packages/linux/linux-dht-walnut_2.6.23.bb56
-rw-r--r--packages/linux/linux-efika_2.6.20.20.bb8
-rw-r--r--packages/linux/linux-efika_2.6.20.bb8
-rw-r--r--packages/linux/linux-efika_2.6.21+git.bb8
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig (renamed from packages/linux/linux-handhelds-2.6/asus620/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig (renamed from packages/linux/linux-handhelds-2.6/asus730/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig (renamed from packages/linux/linux-handhelds-2.6/aximx50/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig (renamed from packages/linux/linux-handhelds-2.6/eteng500/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig (renamed from packages/linux/linux-handhelds-2.6/h1910/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig (renamed from packages/linux/linux-handhelds-2.6/h2200/defconfig)95
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig (renamed from packages/linux/linux-handhelds-2.6/h3600/defconfig)80
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig (renamed from packages/linux/linux-handhelds-2.6/h3800/defconfig)80
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig (renamed from packages/linux/linux-handhelds-2.6/h3900/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig (renamed from packages/linux/linux-handhelds-2.6/h4000/defconfig)100
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig (renamed from packages/linux/linux-handhelds-2.6/h5000/defconfig)216
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcalpine/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcapache/defconfig)100
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcbeetles/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcblueangel/defconfig)106
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig (renamed from packages/linux/linux-handhelds-2.6/htchimalaya/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcsable/defconfig)100
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcuniversal/defconfig)101
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig (renamed from packages/linux/linux-handhelds-2.6/htcwallaby/defconfig)80
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig (renamed from packages/linux/linux-handhelds-2.6/hx4700/defconfig)95
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig (renamed from packages/linux/linux-handhelds-2.6/looxc550/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig (renamed from packages/linux/linux-handhelds-2.6/magician/defconfig)99
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig (renamed from packages/linux/linux-handhelds-2.6/rx1950/defconfig)89
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty0
-rw-r--r--packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig (renamed from packages/linux/linux-handhelds-2.6/rx3000/defconfig)102
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb11
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb4
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb4
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb11
-rw-r--r--packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb6
-rw-r--r--packages/linux/linux-handhelds-2.6_cvs.bb6
-rw-r--r--packages/linux/linux-ixp4xx.inc2
-rw-r--r--packages/linux/linux-ixp4xx/defconfig-2.6.23.12 (renamed from packages/linux/linux-ixp4xx/defconfig-2.6.23.8)0
-rw-r--r--packages/linux/linux-ixp4xx_2.6.23.12.bb (renamed from packages/linux/linux-ixp4xx_2.6.23.8.bb)26
-rw-r--r--packages/linux/linux-magicbox_2.6.18.6.bb8
-rw-r--r--packages/linux/linux-magicbox_2.6.19.2.bb10
-rw-r--r--packages/linux/linux-ml403-mvista-2.6.x_git.bb8
-rw-r--r--packages/linux/linux-ml403-slab-2.6.x_git.bb8
-rw-r--r--packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/omap2430sdp/defconfig (renamed from packages/linux/linux-omap2-git/defconfig)0
-rw-r--r--packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi (renamed from packages/linux/linux-omap2-git/defconfig.eabi)0
-rw-r--r--packages/linux/linux-openmoko-devel/defconfig-2.6.24-rc61814
-rw-r--r--packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb59
-rw-r--r--packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb68
-rw-r--r--packages/linux/linux-openmoko.inc19
-rw-r--r--packages/linux/linux-openmoko/gta02-sound.patch2
-rw-r--r--packages/linux/linux-openmoko_2.6.22.5.bb2
-rw-r--r--packages/linux/linux-rp-2.6.16/00-hostap.patch45
-rw-r--r--packages/linux/linux-rp-2.6.16/10-pcnet.patch27
-rw-r--r--packages/linux/linux-rp-2.6.16/add-oz-release-string.patch24
-rw-r--r--packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch12
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-akita1572
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-c7x01608
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-collie1154
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-hx20001028
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-poodle1556
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-qemuarm941
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-spitz1572
-rw-r--r--packages/linux/linux-rp-2.6.16/defconfig-tosa1608
-rw-r--r--packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch63
-rw-r--r--packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch48
-rw-r--r--packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch11
-rw-r--r--packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch49
-rw-r--r--packages/linux/linux-rp-2.6.16/maxpower-message.patch55
-rw-r--r--packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch73
-rw-r--r--packages/linux/linux-rp-2.6.16/rmk-mmc1.patch61
-rw-r--r--packages/linux/linux-rp-2.6.16/rmk-mmc2.patch26
-rw-r--r--packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch155
-rw-r--r--packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch4174
-rw-r--r--packages/linux/linux-rp-2.6.17/00-hostap.patch45
-rw-r--r--packages/linux/linux-rp-2.6.17/10-pcnet.patch27
-rw-r--r--packages/linux/linux-rp-2.6.17/add-oz-release-string.patch24
-rw-r--r--packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch31713
-rw-r--r--packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch12
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-akita1572
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-c7x01608
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-collie1641
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-hx20001028
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-poodle1655
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-qemux861562
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-spitz1603
-rw-r--r--packages/linux/linux-rp-2.6.17/defconfig-tosa1609
-rw-r--r--packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch63
-rw-r--r--packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch88
-rw-r--r--packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch73
-rw-r--r--packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch155
-rw-r--r--packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch4174
-rw-r--r--packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch157
-rw-r--r--packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch3089
-rw-r--r--packages/linux/linux-rp-2.6.17/wm9712-reset-loop-r2.patch44
-rw-r--r--packages/linux/linux-rp-2.6.17/wm9712-suspend-cold-res-r2.patch16
-rw-r--r--packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch208
-rw-r--r--packages/linux/linux-rp-2.6.20/defconfig-c7x02
-rw-r--r--packages/linux/linux-rp-2.6.20/defconfig-collie2
-rw-r--r--packages/linux/linux-rp-2.6.20/defconfig-poodle2
-rw-r--r--packages/linux/linux-rp-2.6.20/defconfig-tosa2
-rw-r--r--packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch17
-rw-r--r--packages/linux/linux-rp-2.6.21/connectplus-remove-ide-HACK.patch12
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-akita1744
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-bootcdx861606
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-c7x01787
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-collie1739
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-poodle1657
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-qemuarm1194
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-qemux861568
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-spitz1781
-rw-r--r--packages/linux/linux-rp-2.6.21/defconfig-tosa1613
-rw-r--r--packages/linux/linux-rp-2.6.21/hostap-monitor-mode.patch209
-rw-r--r--packages/linux/linux-rp-2.6.21/orinoco-remove-all-which-are-in-hostap-HACK.patch88
-rw-r--r--packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch90
-rw-r--r--packages/linux/linux-rp-2.6.21/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch155
-rw-r--r--packages/linux/linux-rp-2.6.21/sharpsl-rc-r1.patch519
-rw-r--r--packages/linux/linux-rp-2.6.21/squashfs3.0-2.6.15.patch4191
-rw-r--r--packages/linux/linux-rp-2.6.21/vesafb-tng-1.0-rc2-2.6.20-rc2.patch3141
-rw-r--r--packages/linux/linux-rp-2.6.21/wm97xx-lcdnoise-r0.patch208
-rw-r--r--packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie709
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-akita54
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-bootcdx8671
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-c7x054
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-collie53
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-htcuniversal68
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-hx200073
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-poodle871
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-qemuarm69
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-qemux8668
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-spitz74
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-tosa70
-rw-r--r--packages/linux/linux-rp-2.6.23/defconfig-zylonite71
-rw-r--r--packages/linux/linux-rp-2.6.23/hrw-add-wcf11-to-hostap.patch31
-rw-r--r--packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch135
-rw-r--r--packages/linux/linux-rp.inc6
-rw-r--r--packages/linux/linux-rp_2.6.16.bb156
-rw-r--r--packages/linux/linux-rp_2.6.17.bb127
-rw-r--r--packages/linux/linux-rp_2.6.20.bb3
-rw-r--r--packages/linux/linux-rp_2.6.21.bb119
-rw-r--r--packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb21
-rw-r--r--packages/linux/linux-rp_2.6.23.bb33
-rw-r--r--packages/linux/linux-sequoia_2.6.21.bb8
-rw-r--r--packages/linux/linux/simpad/defconfig44
-rw-r--r--packages/linux/linux_2.6.21.bb2
-rw-r--r--packages/linux/linux_2.6.22+2.6.23-rc3.bb4
-rw-r--r--packages/linux/linux_2.6.22.6.bb3
-rw-r--r--packages/linux/linux_2.6.23+2.6.24-rc5.bb8
-rw-r--r--packages/linux/linux_2.6.23+2.6.24-rc6.bb32
-rw-r--r--packages/linux/linux_2.6.23.bb10
-rw-r--r--packages/linux/mainstone-kernel/flash-unlock.patch14
-rw-r--r--packages/linux/mainstone-kernel/mainstone/.mtn2git_empty0
-rw-r--r--packages/linux/mainstone-kernel/mainstone/defconfig (renamed from packages/linux/linux-rp-2.6.21/defconfig-hx2000)622
-rw-r--r--packages/linux/mainstone-kernel/mainstone_defconfig972
-rw-r--r--packages/linux/mainstone-kernel_2.6.18.bb31
-rw-r--r--packages/matchbox-applet-startup-monitor/files/.mtn2git_empty0
-rwxr-xr-xpackages/matchbox-applet-startup-monitor/files/85mb-applet-startup-monitor2
-rw-r--r--packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb11
-rw-r--r--packages/meta/external-toolchain.bb10
-rw-r--r--packages/meta/meta-nas-server.bb10
-rw-r--r--packages/meta/slugos-packages.bb5
-rw-r--r--packages/meta/unslung-binary-kernel-packages.bb19
-rw-r--r--packages/mgetty/mgetty_1.1.30.bb2
-rw-r--r--packages/midpath/midpath-cldc-native_0.1.bb3
-rw-r--r--packages/midpath/midpath-cldc-x11_0.1.bb2
-rw-r--r--packages/midpath/midpath-cldc_0.1.bb15
-rw-r--r--packages/midpath/midpath.inc8
-rw-r--r--packages/mkbot/mkbot_0.3.bb2
-rw-r--r--packages/mtd/mtd-utils_1.0.0+git.bb6
-rw-r--r--packages/musicbrainz/libmusicbrainz_2.1.5.bb13
-rw-r--r--packages/musicbrainz/libmusicbrainz_3.0.1.bb4
-rw-r--r--packages/navit/files/compile-fix.patch8
-rw-r--r--packages/navit/files/navit.desktop12
-rw-r--r--packages/navit/files/navit.launcher30
-rw-r--r--packages/navit/files/navit.xml-so.patch13
-rw-r--r--packages/navit/navit.inc27
-rw-r--r--packages/navit/navit_0.0.1.bb13
-rw-r--r--packages/navit/navit_0.0.2.bb13
-rw-r--r--packages/navit/navit_0.0.3.bb5
-rw-r--r--packages/navit/navit_cvs.bb18
-rw-r--r--packages/ncurses/ncurses.inc23
-rw-r--r--packages/netbase/netbase/interfaces17
-rw-r--r--packages/netbase/netbase/mx31moboard/.mtn2git_empty0
-rw-r--r--packages/netbase/netbase/mx31moboard/interfaces14
-rw-r--r--packages/netbase/netbase_4.21.bb2
-rw-r--r--packages/nonworking/imkit/imkit_0.4.5.bb2
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs/NOTES18
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs/README415
-rwxr-xr-xpackages/nslu2-binary-only/unslung-rootfs/linuxrc8
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs/telnet.htm2
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs/upgrade.htm7
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb2
-rw-r--r--packages/ntpclient/ntpclient_2007_365.bb34
-rw-r--r--packages/nunome/nunome_1.0.2.bb8
-rw-r--r--packages/nut/.mtn2git_empty0
-rw-r--r--packages/nut/files/.mtn2git_empty0
-rw-r--r--packages/nut/files/libm.patch21
-rw-r--r--packages/nut/nut_2.2.1.bb14
-rw-r--r--packages/obsolete/classpath/.mtn2git_empty0
-rw-r--r--packages/obsolete/classpath/classpath-gtk_0.93.bb (renamed from packages/classpath/classpath-gtk_0.93.bb)2
-rw-r--r--packages/obsolete/classpath/classpath-gtk_cvs.bb (renamed from packages/classpath/classpath-gtk_cvs.bb)4
-rw-r--r--packages/obsolete/classpath/classpath-minimal-native_0.93.bb (renamed from packages/classpath/classpath-minimal-native_0.93.bb)2
-rw-r--r--packages/obsolete/classpath/classpath-minimal-native_0.95.bb (renamed from packages/classpath/classpath-minimal-native_0.95.bb)0
-rw-r--r--packages/obsolete/classpath/classpath-minimal_0.90.bb (renamed from packages/classpath/classpath-minimal_0.90.bb)2
-rw-r--r--packages/obsolete/classpath/classpath-minimal_0.95.bb (renamed from packages/classpath/classpath-minimal_0.95.bb)4
-rw-r--r--packages/obsolete/classpath/classpath.inc30
-rw-r--r--packages/obsolete/classpath/classpath_0.14.bb (renamed from packages/classpath/classpath_0.14.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_0.15.bb (renamed from packages/classpath/classpath_0.15.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_0.17.bb (renamed from packages/classpath/classpath_0.17.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_0.18.bb (renamed from packages/classpath/classpath_0.18.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_0.19.bb (renamed from packages/classpath/classpath_0.19.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_0.20.bb (renamed from packages/classpath/classpath_0.20.bb)2
-rw-r--r--packages/obsolete/classpath/classpath_cvs.bb (renamed from packages/classpath/classpath_cvs.bb)2
-rw-r--r--packages/obsolete/classpath/files/.mtn2git_empty0
-rw-r--r--packages/obsolete/classpath/files/disable-automake-checks-v2.patch (renamed from packages/classpath/files/disable-automake-checks-v2.patch)0
-rw-r--r--packages/obsolete/classpath/files/disable-automake-checks.patch (renamed from packages/classpath/files/disable-automake-checks.patch)0
-rw-r--r--packages/obsolete/classpath/files/fix-endian-arm-floats.patch (renamed from packages/classpath/files/fix-endian-arm-floats.patch)0
-rw-r--r--packages/obsolete/classpath/files/gconf_version.patch (renamed from packages/classpath/files/gconf_version.patch)0
-rw-r--r--packages/obsolete/jamvm/.mtn2git_empty0
-rw-r--r--packages/obsolete/jamvm/files/.mtn2git_empty0
-rw-r--r--packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch12
-rw-r--r--packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty0
-rw-r--r--packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch (renamed from packages/jamvm/jamvm-1.3.0/heap-size.patch)0
-rw-r--r--packages/obsolete/jamvm/jamvm_1.3.0.bb (renamed from packages/jamvm/jamvm_1.3.0.bb)0
-rw-r--r--packages/obsolete/jamvm/jamvm_1.3.1.bb (renamed from packages/jamvm/jamvm_1.3.1.bb)0
-rw-r--r--packages/obsolete/jamvm/jamvm_1.3.2.bb (renamed from packages/jamvm/jamvm_1.3.2.bb)0
-rw-r--r--packages/obsolete/jamvm/jamvm_1.4.1.bb (renamed from packages/jamvm/jamvm_1.4.1.bb)0
-rw-r--r--packages/obsolete/quilt/.mtn2git_empty0
-rw-r--r--packages/obsolete/quilt/quilt-0.39/.mtn2git_empty0
-rw-r--r--packages/obsolete/quilt/quilt-0.39/non-gnu.patch (renamed from packages/quilt/quilt-0.39/non-gnu.patch)0
-rw-r--r--packages/obsolete/quilt/quilt-0.39/nostrip.patch (renamed from packages/quilt/quilt-0.39/nostrip.patch)0
-rw-r--r--packages/obsolete/quilt/quilt-native_0.39.bb (renamed from packages/quilt/quilt-native_0.39.bb)0
-rw-r--r--packages/obsolete/quilt/quilt_0.39.bb (renamed from packages/quilt/quilt_0.39.bb)0
-rw-r--r--packages/obsolete/quilt/quilt_0.39.inc (renamed from packages/quilt/quilt_0.39.inc)0
-rw-r--r--packages/octave/octave.inc12
-rw-r--r--packages/octave/octave_2.1.73.bb2
-rw-r--r--packages/octave/octave_2.9.19.bb14
-rw-r--r--packages/octave/octave_3.0.0.bb27
-rw-r--r--packages/openjade/openjade-1.3.2/oj-native-libosp-fix.patch12
-rw-r--r--packages/openjade/openjade-native_1.3.2.bb23
-rw-r--r--packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb33
-rw-r--r--packages/openmoko2/openmoko-dialer2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-messages2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-sample2_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-terminal2_svn.bb8
-rw-r--r--packages/openmoko2/settingsgui_0.7+0.8-beta.bb11
-rw-r--r--packages/opensp/opensp-native_1.5.bb21
-rw-r--r--packages/opie-reader/uqtreader_cvs.bb2
-rw-r--r--packages/opie-taskbar/opie-taskbar/firstuse-path.patch11
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.3.bb1
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb3
-rw-r--r--packages/pngcrush/.mtn2git_empty0
-rw-r--r--packages/pngcrush/pngcrush-native_1.6.4.bb9
-rw-r--r--packages/pngcrush/pngcrush_1.6.4.bb14
-rw-r--r--packages/pointercal/files/fic-gta02/pointercalbin46 -> 46 bytes
-rw-r--r--packages/pointercal/pointercal_0.0.bb2
-rw-r--r--packages/poppler/poppler0.6_cvs.bb6
-rw-r--r--packages/portaudio/portaudio-v19_20071207.bb27
-rw-r--r--packages/portmap/portmap_6.0.bb4
-rw-r--r--packages/ppp-dialin/ppp-dialin_0.1.bb3
-rw-r--r--packages/ppp-dsl/files/.mtn2git_empty0
-rw-r--r--packages/ppp-dsl/files/dsl-provider (renamed from packages/ppp-dsl/dsl-provider)0
-rwxr-xr-xpackages/ppp-dsl/files/ppp_on_boot.dsl (renamed from packages/ppp-dsl/ppp_on_boot.dsl)0
-rw-r--r--packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb5
-rw-r--r--packages/ppp-dsl/ppp-dsl_0.1.bb6
-rw-r--r--packages/ppp/ppp-gprs/.mtn2git_empty0
-rw-r--r--packages/ppp/ppp-gprs/chats/.mtn2git_empty0
-rw-r--r--packages/ppp/ppp-gprs/chats/chat-gprs9
-rw-r--r--packages/ppp/ppp-gprs/peers/.mtn2git_empty0
-rw-r--r--packages/ppp/ppp-gprs/peers/_gprs68
-rw-r--r--packages/ppp/ppp-gprs/peers/_gprs-ap-internet3
-rw-r--r--packages/ppp/ppp-gprs_1.0.bb22
-rw-r--r--packages/psplash/files/psplash-init11
-rw-r--r--packages/psplash/psplash_svn.bb3
-rw-r--r--packages/python/python-2.5-manifest.inc116
-rw-r--r--packages/python/python-ecore_cvs.bb3
-rw-r--r--packages/python/python-edbus_cvs.bb9
-rw-r--r--packages/python/python-edje_cvs.bb3
-rw-r--r--packages/python/python-efl-examples.bb10
-rw-r--r--packages/python/python-efl.bb4
-rw-r--r--packages/python/python-efl.inc21
-rw-r--r--packages/python/python-emotion_cvs.bb3
-rw-r--r--packages/python/python-epsilon_cvs.bb3
-rw-r--r--packages/python/python-evas_cvs.bb3
-rw-r--r--packages/python/python-gammu_0.24.bb (renamed from packages/python/python-gammu_0.21.bb)0
-rw-r--r--packages/python/python-gsmd_svn.bb15
-rw-r--r--packages/python/python-pygtk_2.10.4.bb8
-rw-r--r--packages/python/python-pyqt/assistantclient-fix.patch13
-rw-r--r--packages/python/python-pyqt_4.3.3.bb18
-rw-r--r--packages/python/python24-pyqt2_3.13.bb2
-rw-r--r--packages/python/python24-pyqwt2_3.10.bb2
-rw-r--r--packages/python/python_2.5.1.bb4
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/.mtn2git_empty0
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/02_snapshot_use_tmpdir.patch23
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/04_do_not_print_rtc_freq_if_ok.patch26
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/05_non-fatal_if_linux_hd_missing.patch17
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/06_exit_segfault.patch45
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/10_signal_jobs.patch26
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/11_signal_sigaction.patch21
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/22_net_tuntap_stall.patch18
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/31_syscalls.patch48
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/32_syscall_sysctl.patch55
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/33_syscall_ppc_clone.patch22
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/39_syscall_fadvise64.patch21
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/41_arm_fpa_sigfpe.patch104
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/52_ne2000_return.patch17
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/61_safe_64bit_int.patch27
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/63_sparc_build.patch18
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/64_ppc_asm_constraints.patch18
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/65_kfreebsd.patch35
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/66_tls_ld.patch55
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/91-oh-sdl-cursor.patch18
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/disable-error-in-configure.patch17
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/fix_segfault.patch37
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/no-strip.patch22
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl-update.patch219
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/qemu-0.9.0-nptl.patch929
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/qemu-amd64-32b-mapping-0.9.0.patch37
-rw-r--r--packages/qemu/qemu-0.9.0+cvs20071121/workaround_bad_futex_headers.patch25
-rw-r--r--packages/qemu/qemu-gcc3-check.inc19
-rw-r--r--packages/qemu/qemu-native_20071121.bb8
-rw-r--r--packages/qemu/qemu_20071121.bb60
-rw-r--r--packages/qmake/qmake2-native.inc68
-rw-r--r--packages/qmake/qmake2-native/.mtn2git_empty0
-rw-r--r--packages/qmake/qmake2-native/0001-fix-mkspecs.patch (renamed from packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch)59
-rw-r--r--packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch33
-rw-r--r--packages/qmake/qmake2-native/linux-oe-qmake.conf (renamed from packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf)0
-rw-r--r--packages/qmake/qmake2-native/qt-config.patch27
-rw-r--r--packages/qmake/qmake2-native/use-lflags-last.patch (renamed from packages/qmake/qmake2-native-2.10a/use-lflags-last.patch)0
-rw-r--r--packages/qmake/qmake2-native_2.10a.bb69
-rw-r--r--packages/qpe-games/crossword_0.0.3.bb2
-rw-r--r--packages/qpegps/files/qpegps.desktop3
-rw-r--r--packages/qpegps/qpegps.inc6
-rw-r--r--packages/qpegps/qpegps_0.9.2.3.3.bb2
-rw-r--r--packages/qpegps/qpegps_0.9.3.1.bb8
-rw-r--r--packages/qpegps/qpegps_0.9.3.bb1
-rw-r--r--packages/qpegps/qpegps_svn.bb15
-rw-r--r--packages/qpf-fonts/qpf-unismall_1.0.0.bb4
-rw-r--r--packages/qsvn/qsvn-qte_0.3.0.bb3
-rw-r--r--packages/qsvn/qsvn.inc25
-rw-r--r--packages/qsvn/qsvn_0.3.0.bb22
-rw-r--r--packages/qt/qt4-x11-free_4.3.2.bb187
-rw-r--r--packages/qt/qt4_arch.inc13
-rw-r--r--packages/qt4/.mtn2git_empty0
-rw-r--r--packages/qt4/files/.mtn2git_empty0
-rw-r--r--packages/qt4/files/0001-cross-compile.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch)0
-rw-r--r--packages/qt4/files/0003-no-tools.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch)0
-rw-r--r--packages/qt4/files/0005-fix-mkspecs.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch)44
-rw-r--r--packages/qt4/files/0008-backport-qt-lib-infix.patch166
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch (renamed from packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch (renamed from packages/qt/qt4-x11-free-4.1.2/cross-compile.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch (renamed from packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch (renamed from packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch (renamed from packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch (renamed from packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch (renamed from packages/qt/qt4-x11-free-4.1.2/no-qmake.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.1.2/no-tools.patch (renamed from packages/qt/qt4-x11-free-4.1.2/no-tools.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty0
-rw-r--r--packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch)0
-rw-r--r--packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch (renamed from packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch)0
-rw-r--r--packages/qt4/qt4-x11-free.inc27
-rw-r--r--packages/qt4/qt4-x11-free_4.1.2.bb (renamed from packages/qt/qt4-x11-free_4.1.2.bb)0
-rw-r--r--packages/qt4/qt4-x11-free_4.3.3.bb5
-rw-r--r--packages/qt4/qt4_arch.inc23
-rw-r--r--packages/qt4/qt_configuration.inc82
-rw-r--r--packages/qt4/qt_depends.inc3
-rw-r--r--packages/qt4/qt_packaging.inc153
-rw-r--r--packages/qt4/qt_staging.inc36
-rw-r--r--packages/qt4/qtopia-core-4.3.3/.mtn2git_empty0
-rw-r--r--packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch23
-rw-r--r--packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch23
-rw-r--r--packages/qt4/qtopia-core.inc30
-rw-r--r--packages/qt4/qtopia-core/.mtn2git_empty0
-rw-r--r--packages/qt4/qtopia-core/0004-no-qmake.patch25
-rw-r--r--packages/qt4/qtopia-core/build-tools.patch28
-rw-r--r--packages/qt4/qtopia-core/linux-oe-qmake.conf (renamed from packages/qte/qtopia-core/linux-oe-qmake.conf)0
-rw-r--r--packages/qt4/qtopia-core_4.2.0.bb1
-rw-r--r--packages/qt4/qtopia-core_4.3.3.bb5
-rw-r--r--packages/qte/qtopia-core_4.2.0.bb218
-rw-r--r--packages/qte/qtopia-core_4.3.2.bb222
-rw-r--r--packages/quilt/files/non-gnu.patch (renamed from packages/quilt/quilt-0.45/non-gnu.patch)0
-rw-r--r--packages/quilt/quilt-0.45/install.patch (renamed from packages/quilt/files/install.patch)0
-rw-r--r--packages/quilt/quilt-0.46/.mtn2git_empty0
-rw-r--r--packages/quilt/quilt-0.46/aclocal.patch126
-rw-r--r--packages/quilt/quilt-0.46/install.patch13
-rw-r--r--packages/quilt/quilt-native.inc2
-rw-r--r--packages/quilt/quilt-native_0.45.bb1
-rw-r--r--packages/quilt/quilt-native_0.46.bb1
-rw-r--r--packages/quilt/quilt-package.inc19
-rw-r--r--packages/quilt/quilt.inc5
-rw-r--r--packages/quilt/quilt_0.45.bb8
-rw-r--r--packages/quilt/quilt_0.45.inc3
-rw-r--r--packages/quilt/quilt_0.46.bb1
-rw-r--r--packages/qxmp/qxmp_1.0.bb2
-rw-r--r--packages/roadmap/files/options.mk.patch34
-rw-r--r--packages/roadmap/files/roadmap.desktop.patch (renamed from packages/roadmap/files/qt/roadmap.desktop.patch)0
-rw-r--r--packages/roadmap/files/roadmap_path.patch57
-rw-r--r--packages/roadmap/roadmap-gtk2.inc11
-rw-r--r--packages/roadmap/roadmap-gtk2_1.1.0.bb12
-rw-r--r--packages/roadmap/roadmap-gtk2_cvs.bb34
-rw-r--r--packages/roadmap/roadmap.inc13
-rw-r--r--packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch36
-rw-r--r--packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch25
-rw-r--r--packages/roadmap/zroadmap.inc10
-rw-r--r--packages/roadmap/zroadmap_1.0.12.bb33
-rw-r--r--packages/roadmap/zroadmap_1.1.0.bb36
-rw-r--r--packages/roadmap/zroadmap_cvs.bb39
-rw-r--r--packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch11
-rw-r--r--packages/rp-pppoe/rp-pppoe_3.8.bb3
-rw-r--r--packages/sablevm/sablevm-classpath_1.1.9.bb2
-rw-r--r--packages/sablevm/sablevm-classpath_1.11.3.bb2
-rw-r--r--packages/sablevm/sablevm-classpath_1.12.bb2
-rw-r--r--packages/screen/screen_4.0.2.bb4
-rw-r--r--packages/settings-daemon/settings-daemon_svn.bb4
-rw-r--r--packages/sgml-common/sgml-common-native_0.6.3.bb25
-rw-r--r--packages/sgml-common/sgml-common_0.6.3.bb26
-rw-r--r--packages/sgmlspl/.mtn2git_empty0
-rw-r--r--packages/sgmlspl/files/.mtn2git_empty0
-rw-r--r--packages/sgmlspl/files/combined.patch454
-rw-r--r--packages/sgmlspl/sgmlspl-native_1.03ii.bb21
-rw-r--r--packages/slugos-init/slugos-init_4.8.bb149
-rw-r--r--packages/slutils/slutils_0.1.0.bb2
-rw-r--r--packages/speech-dispatcher/.mtn2git_empty0
-rw-r--r--packages/speech-dispatcher/files/.mtn2git_empty0
-rw-r--r--packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch31
-rw-r--r--packages/speech-dispatcher/files/speech-dispatcher.init42
-rw-r--r--packages/speech-dispatcher/files/srcMakefile.am.patch60
-rw-r--r--packages/speech-dispatcher/speech-dispatcher_0.6.5.bb56
-rw-r--r--packages/supertux/files/.mtn2git_empty0
-rw-r--r--packages/supertux/files/supertux.desktop21
-rw-r--r--packages/supertux/files/supertux.pngbin0 -> 4097 bytes
-rw-r--r--packages/supertux/supertux_0.1.2.bb16
-rw-r--r--packages/supertux/supertux_0.1.3.bb22
-rw-r--r--packages/tasks/task-base.bb4
-rw-r--r--packages/tasks/task-boot.bb2
-rw-r--r--packages/tasks/task-nas-server.bb102
-rw-r--r--packages/tasks/task-openmoko-feed.bb5
-rw-r--r--packages/tasks/task-openmoko-python-devel.bb11
-rw-r--r--packages/tasks/task-opie-16mb.bb2
-rw-r--r--packages/tasks/task-opie.bb2
-rw-r--r--packages/tasks/task-python-everything.bb6
-rw-r--r--packages/tea/tea_17.3.5.bb3
-rw-r--r--packages/texmaker/texmaker_1.3.bb2
-rw-r--r--packages/ttf-fonts/ttf.inc2
-rw-r--r--packages/tzdata/tzdata_2007e.bb5
-rw-r--r--packages/u-boot/.mtn2git_empty0
-rw-r--r--packages/u-boot/files/.mtn2git_empty0
-rw-r--r--packages/u-boot/files/arm_flags.patch (renamed from packages/uboot/files/arm_flags.patch)0
-rw-r--r--packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch29
-rw-r--r--packages/u-boot/files/fix-arm920t-eabi.patch (renamed from packages/uboot/files/fix-arm920t-eabi.patch)0
-rw-r--r--packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch11
-rw-r--r--packages/u-boot/files/makefile-no-dirafter.patch (renamed from packages/uboot/files/makefile-no-dirafter.patch)0
-rw-r--r--packages/u-boot/files/u-boot-20061030-ext2load_hex.patch (renamed from packages/uboot/files/u-boot-20061030-ext2load_hex.patch)0
-rw-r--r--packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch (renamed from packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch)0
-rw-r--r--packages/u-boot/files/uboot-eabi-fix-HACK.patch (renamed from packages/uboot/files/uboot-eabi-fix-HACK.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.1.2/arm_flags.patch (renamed from packages/uboot/u-boot-1.1.2/arm_flags.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/cmd-arm-linux.patch (renamed from packages/uboot/u-boot-1.1.2/cmd-arm-linux.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/command-names.patch (renamed from packages/uboot/u-boot-1.1.2/command-names.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/mnci-jffs2.patch (renamed from packages/uboot/u-boot-1.1.2/mnci-jffs2.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/mnci.patch (renamed from packages/uboot/u-boot-1.1.2/mnci.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch (renamed from packages/uboot/u-boot-1.1.2/u-boot-1.1.2-neon.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.2/u-boot-emetec.patch (renamed from packages/uboot/u-boot-1.1.2/u-boot-emetec.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-autoscript.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-autoscript.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-base.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-base.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-fw_printenv.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-fw_printenv.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-install.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-install.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-jerase-cmd.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-jerase-cmd.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-loadb-safe.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-loadb-safe.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-make381-fix.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-mmc-init.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-mmc-init.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-smc91x-multi.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-smc91x-multi.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.4/u-boot-zzz-osx.patch (renamed from packages/uboot/u-boot-1.1.4/u-boot-zzz-osx.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.1.6/devkit-idp.patch (renamed from packages/uboot/u-boot-1.1.6/devkit-idp.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/sarge-uboot.patch (renamed from packages/uboot/u-boot-1.1.6/sarge-uboot.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch)0
-rw-r--r--packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch (renamed from packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.2.0/defconfig_lsppchd (renamed from packages/uboot/u-boot-1.2.0/defconfig_lsppchd)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/defconfig_lsppchg (renamed from packages/uboot/u-boot-1.2.0/defconfig_lsppchg)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/env-Makefile.patch (renamed from packages/uboot/u-boot-1.2.0/env-Makefile.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config (renamed from packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/fw_env.c.patch (renamed from packages/uboot/u-boot-1.2.0/fw_env.c.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/fw_env.config (renamed from packages/uboot/u-boot-1.2.0/fw_env.config)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff (renamed from packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/qnap.diff (renamed from packages/uboot/u-boot-1.2.0/qnap.diff)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/tools-Makefile.patch (renamed from packages/uboot/u-boot-1.2.0/tools-Makefile.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-1.2.0/turbostation/fw_env.config (renamed from packages/uboot/u-boot-1.2.0/turbostation/fw_env.config)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/u-boot-kurobox-fdt.patch (renamed from packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/u-boot-kurobox.patch (renamed from packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch)0
-rw-r--r--packages/u-boot/u-boot-1.2.0/uboot-qnap.diff (renamed from packages/uboot/u-boot-1.2.0/uboot-qnap.diff)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/cmd-unzip.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/console-ansi.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/default-env.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/dontask.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/early-powerdown.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/ext2load_hex.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/nand-badisbad.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/nand-createbbt.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/preboot-override.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/raise-limits.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/series (renamed from packages/uboot/u-boot-mkimage-openmoko-native/series)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/splashimage-command.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch (renamed from packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch)0
-rw-r--r--packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb (renamed from packages/uboot/u-boot-mkimage-openmoko-native_oe.bb)2
-rw-r--r--packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty0
-rw-r--r--packages/u-boot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch (renamed from packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch)0
-rw-r--r--packages/u-boot/u-boot-omap2430sdp_1.1.4.bb (renamed from packages/uboot/u-boot-omap2430sdp_1.1.4.bb)0
-rw-r--r--packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb (renamed from packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb)10
-rw-r--r--packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb (renamed from packages/uboot/uboot-openmoko_svn.bb)28
-rw-r--r--packages/u-boot/u-boot-openmoko_svn.bb79
-rw-r--r--packages/u-boot/u-boot-utils-native_1.2.0.bb (renamed from packages/uboot/u-boot-utils-native_1.2.0.bb)0
-rw-r--r--packages/u-boot/u-boot-utils_1.2.0.bb (renamed from packages/uboot/u-boot-utils_1.2.0.bb)0
-rw-r--r--packages/u-boot/u-boot.inc (renamed from packages/uboot/u-boot.inc)0
-rw-r--r--packages/u-boot/u-boot_1.1.2.bb (renamed from packages/uboot/u-boot_1.1.2.bb)0
-rw-r--r--packages/u-boot/u-boot_1.1.4.bb (renamed from packages/uboot/u-boot_1.1.4.bb)0
-rw-r--r--packages/u-boot/u-boot_1.1.6.bb (renamed from packages/uboot/u-boot_1.1.6.bb)0
-rw-r--r--packages/u-boot/u-boot_1.2.0.bb (renamed from packages/uboot/u-boot_1.2.0.bb)0
-rw-r--r--packages/u-boot/u-boot_1.3.0.bb (renamed from packages/uboot/u-boot_1.3.0.bb)0
-rw-r--r--packages/u-boot/u-boot_git.bb (renamed from packages/uboot/u-boot_git.bb)0
-rw-r--r--packages/uicmoc/files/.mtn2git_empty0
-rw-r--r--packages/uicmoc/files/configure-fix.patch13
-rw-r--r--packages/uicmoc/uicmoc-native_2.3.10.bb2
-rw-r--r--packages/uicmoc/uicmoc4-native.inc30
-rw-r--r--packages/uicmoc/uicmoc4-native_4.3.3.bb (renamed from packages/uicmoc/uicmoc4-native_4.3.2.bb)0
-rw-r--r--packages/util-linux-ng/.mtn2git_empty0
-rw-r--r--packages/util-linux-ng/util-linux-ng.inc216
-rw-r--r--packages/util-linux-ng/util-linux-ng_2.13.1.bb7
-rw-r--r--packages/vala/vala-native_0.1.5.bb (renamed from packages/vala/vala-native_0.1.4.bb)2
-rw-r--r--packages/vala/vala_0.1.5.bb (renamed from packages/vala/vala_0.1.4.bb)0
-rw-r--r--packages/vlc/vlc-gpe_0.7.2.bb4
-rw-r--r--packages/vlc/vlc-gpe_0.8.1.bb4
-rw-r--r--packages/vlc/vlc-gpe_0.8.4.bb4
-rw-r--r--packages/vsftpd/vsftpd-charconv-2.0.5/.mtn2git_empty0
-rw-r--r--packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch4365
-rw-r--r--packages/vsftpd/vsftpd-charconv_2.0.5.bb50
-rw-r--r--packages/vte/vte.inc15
-rw-r--r--packages/vte/vte_0.16.8.bb16
-rw-r--r--packages/vte/vte_0.16.9.bb2
-rw-r--r--packages/webkit/files/GNUmakefile.am314
-rw-r--r--packages/webkit/files/autogen.sh40
-rw-r--r--packages/webkit/files/configure.ac384
-rw-r--r--packages/webkit/webkit-gtk_svn.bb5
-rw-r--r--packages/xcursor-transparent-theme/files/.mtn2git_empty0
-rw-r--r--packages/xcursor-transparent-theme/files/fix_watch_cursor.patch (renamed from packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch)0
-rw-r--r--packages/xcursor-transparent-theme/files/use-relative-symlinks.patch (renamed from packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch)0
-rw-r--r--packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb15
-rw-r--r--packages/xerces-c/xerces-c_2.6.0.bb47
-rw-r--r--packages/xerces-c/xerces-c_2.7.0.bb47
-rw-r--r--packages/xerces-c/xerces-c_2.8.0.bb36
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch13
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.bb3
-rw-r--r--packages/xrestop/xrestop_0.4.bb3
-rw-r--r--packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch72
-rw-r--r--packages/xscreensaver/xscreensaver_4.22.bb5
-rw-r--r--packages/xserver-common/files/unbreak-simpad.patch18
-rw-r--r--packages/xserver-common/xserver-common_1.18.bb4
-rw-r--r--packages/zaurus-updater/zaurus-updater.bb6
-rw-r--r--packages/zaurus-updater/zaurus-updater/updater.sh243
-rw-r--r--packages/zaurusd/files/alsa-6000x-default.state.patch750
-rw-r--r--packages/zaurusd/files/zaurus-hinge.bl-off15
-rw-r--r--packages/zaurusd/files/zaurus-hinge.bl-on51
-rw-r--r--packages/zaurusd/zaurusd_svn.bb3
-rw-r--r--site/arm-linux3
1027 files changed, 65702 insertions, 97394 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index dc59ea204c..9e5f8f4387 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -38,7 +38,7 @@ Person: Cliff Brake
Mail: cbrake@bec-systems.com
Website: http://bec-systems.com
Interests: Support in OE for single board computers, web application support
-Machines: compulab-pxa270, logicpd-pxa270,
+Machines: cm-x270, logicpd-pxa270, em-x270, gesbc-9302
Recipes: mono argtable
Person: Erik Hovland
@@ -74,7 +74,7 @@ Person: Holger Hans Peter Freyther
Mail: zecke@selfish.org
Website: http://www.openembedded.org/~zecke
Interests: icecream, insanity, QA
-Recipes: qtopia*, sqlite3, xine
+Recipes: qtopia*, qt*, qmake*, sqlite3, xine
Person: Jamie Lenehan
Mail: lenehan@twibble.org
@@ -152,17 +152,17 @@ Recipes: altboot, webcam-server
Person: Michael 'Mickey' Lauer
Mail: mlauer@vanille-media.de
-Distros: Ångström, generic
-Machines: poodle, c7x0, spitz, nokia770, x86, qemuarm, qemux86
-Interests: Core OE infrastructure, Python, GUI-Toolkits
-Recipes: python*, qt*, qte*, sip*
+Distros: OpenMoko, Ångström, Generic
+Machines: fic-gta01, fic-gta02, nokia810, x86, qemuarm, qemux86
+Interests: Core OE infrastructure, everything Python, EFL, E17, Qt4
+Recipes: *python*, efl/*, e17*
Person: Paul Sokolovsky
Mail: pmiscml@gmail.com
Machines: h3900, h4000, hx4700
Interests: PocketPC and Palm devices support, Win32 support
Interests: Cross-machine unification
-Recipes: linux-handhelds-2.6, opie-*
+Recipes: linux-handhelds-2.6, opie-*, initramfs-*, gnome-mplayer
Person: Philip Balister
Mail: Crofton@balister.org
diff --git a/classes/angstrom-mirrors.bbclass b/classes/angstrom-mirrors.bbclass
index e44a78c983..10bf75044f 100644
--- a/classes/angstrom-mirrors.bbclass
+++ b/classes/angstrom-mirrors.bbclass
@@ -1,4 +1,4 @@
MIRRORS_append () {
-ftp://.*/.*/ http://www.angstrom-distribution.org/unstable/sources/
-https?$://.*/.*/ http://www.angstrom-distribution.org/unstable/sources/
+ftp://.*/.* http://www.angstrom-distribution.org/unstable/sources/
+https?$://.*/.* http://www.angstrom-distribution.org/unstable/sources/
}
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 8e4fba9400..991e472b14 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -174,6 +174,8 @@ autotools_stage_all() {
fi
if [ -d ${STAGE_TEMP}/${libdir} ]
then
+ find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \;
+
for i in ${STAGE_TEMP}/${libdir}/*.la
do
if [ ! -f "$i" ]; then
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 2b508a8e84..d48d2a5726 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -902,6 +902,23 @@ python () {
base_after_parse(d)
}
+def check_app_exists(app, d):
+ from bb import which, data
+
+ app = data.expand(app, d)
+ path = data.getVar('PATH', d, 1)
+ return len(which(path, app)) != 0
+
+def check_gcc3(data):
+
+ gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
+
+ for gcc3 in gcc3_versions.split():
+ if check_app_exists(gcc3, data):
+ return gcc3
+
+ return False
+
# Patch handling
inherit patch
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 4e425a76d6..5ce9ff6f0d 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -20,6 +20,8 @@ def get_binconfig_mangle(d):
s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
+ if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
+ s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d)
return s
BINCONFIG_GLOB ?= "*-config"
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
new file mode 100644
index 0000000000..cec74349dc
--- /dev/null
+++ b/classes/cmake.bbclass
@@ -0,0 +1,7 @@
+inherit autotools
+
+cmake_do_configure() {
+ cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
+}
+
+EXPORT_FUNCTIONS do_configure
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 312307c831..ca9c9458e1 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -125,6 +125,17 @@ insert_feed_uris () {
# insert new feed-sources
echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
done
+
+ # Allow to use package deploy directory contents as quick devel-testing
+ # feed. This creates individual feed configs for each arch subdir of those
+ # specified as compatible for the current machine.
+ # NOTE: Development-helper feature, NOT a full-fledged feed.
+ if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
+ for arch in ${PACKAGE_ARCHS}
+ do
+ echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf
+ done
+ fi
}
log_check() {
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 473fe6ebbf..97cf036dd9 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -8,28 +8,25 @@
# -Check the RUNTIME path for the $TMPDIR
# -Check if .la files wrongly point to workdir
# -Check if .pc files wrongly point to workdir
-# -Check if packages contains .debug directories or .so files where they should be in -dev or -dbg
+# -Check if packages contains .debug directories or .so files
+# where they should be in -dev or -dbg
# -Check if config.log contains traces to broken autoconf tests
-#
#
# We need to have the scanelf utility as soon as
-# possible and this is contained within the pax-utils-native
+# possible and this is contained within the pax-utils-native.
+# The package.bbclass can help us here.
#
-
-
-# We play a special package function
inherit package
PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native"
-#PACKAGE_DEPENDS += chrpath-native"
PACKAGEFUNCS += " do_package_qa "
#
# dictionary for elf headers
#
-# feel free to add and correct.
+# feel free to add and correct.
#
# TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian, 32bit?
def package_qa_get_machine_dict():
@@ -75,7 +72,7 @@ def package_qa_get_machine_dict():
"arm" : (40, 0, 0, True, True),
"armeb" : (40, 0, 0, False, True),
},
-
+
}
# factory for a class, embedded in a method
@@ -102,11 +99,10 @@ def package_qa_get_elf(path, bits32):
ELFDATA2LSB = 1
ELFDATA2MSB = 2
- def my_assert(expectation, result):
+ def my_assert(self, expectation, result):
if not expectation == result:
- #print "'%x','%x'" % (ord(expectation), ord(result))
+ #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
raise Exception("This does not work as expected")
- my_assert = staticmethod(my_assert)
def __init__(self, name):
self.name = name
@@ -115,16 +111,16 @@ def package_qa_get_elf(path, bits32):
self.file = file(self.name, "r")
self.data = self.file.read(ELFFile.EI_NIDENT+4)
- ELFFile.my_assert(len(self.data), ELFFile.EI_NIDENT+4)
- ELFFile.my_assert(self.data[0], chr(0x7f) )
- ELFFile.my_assert(self.data[1], 'E')
- ELFFile.my_assert(self.data[2], 'L')
- ELFFile.my_assert(self.data[3], 'F')
+ self.my_assert(len(self.data), ELFFile.EI_NIDENT+4)
+ self.my_assert(self.data[0], chr(0x7f) )
+ self.my_assert(self.data[1], 'E')
+ self.my_assert(self.data[2], 'L')
+ self.my_assert(self.data[3], 'F')
if bits32 :
- ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) # only 32 bits
+ self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32))
else:
- ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) # only 64 bits
- ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) )
+ self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64))
+ self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) )
self.sex = self.data[ELFFile.EI_DATA]
if self.sex == chr(ELFFile.ELFDATANONE):
@@ -160,20 +156,19 @@ def package_qa_get_elf(path, bits32):
return ELFFile(path)
-#
-#
# Known Error classes
# 0 - non dev contains .so
# 1 - package contains a dangerous RPATH
# 2 - package depends on debug package
# 3 - non dbg contains .so
# 4 - wrong architecture
-# 5 - .la contains installed=yes or reference to the workdir
+# 5 - .la contains installed=yes
# 6 - .pc contains reference to /usr/include or workdir
-#
-#
+# 7 - the desktop file is not valid
+# 8 - .la contains reference to the workdir
def package_qa_clean_path(path,d):
+ """ Remove the common prefix from the path. In this case it is the TMPDIR"""
import bb
return path.replace(bb.data.getVar('TMPDIR',d,True),"")
@@ -183,14 +178,15 @@ def package_qa_make_fatal_error(error_class, name, path,d):
TODO: Load a whitelist of known errors
"""
- if error_class == 0:
- return False
- else:
- return True
+ return not error_class in [0, 5, 7, 8]
def package_qa_write_error(error_class, name, path, d):
+ """
+ Log the error
+ """
import bb, os
if not bb.data.getVar('QA_LOG', d):
+ bb.note("a QA error occured but will not be logged because QA_LOG is not set")
return
ERROR_NAMES =[
@@ -201,44 +197,45 @@ def package_qa_write_error(error_class, name, path, d):
"wrong architecture",
"evil hides inside the .la",
"evil hides inside the .pc",
+ "the desktop file is not valid",
+ ".la contains reference to the workdir",
]
-
log_path = os.path.join( bb.data.getVar('T', d, True), "log.qa_package" )
f = file( log_path, "a+")
- print >> f, "%s, %s, %s" % (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d))
+ print >> f, "%s, %s, %s" % \
+ (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d))
f.close()
+def package_qa_handle_error(error_class, error_msg, name, path, d):
+ import bb
+ bb.error("QA Issue: %s" % error_msg)
+ package_qa_write_error(error_class, name, path, d)
+ return not package_qa_make_fatal_error(error_class, name, path, d)
def package_qa_check_rpath(file,name,d):
"""
Check for dangerous RPATHs
"""
import bb, os
+ sane = True
scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
- #chrpath = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'chrpath')
bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work"
bad_dir_test = bb.data.getVar('TMPDIR', d, True)
if not os.path.exists(scanelf):
bb.fatal("Can not check RPATH, scanelf (part of pax-utils-native) not found")
- #if not os.path.exists(chrpath):
- # bb.fatal("Can not fix RPATH, chrpath (part of chrpath-native) not found")
+
if not bad_dir in bb.data.getVar('WORKDIR', d, True):
bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
- #bb.note("%s -B -F%%r#F %s" % (scanelf,file))
output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file))
txt = output.readline().split()
- #bb.note("???%s???" % bad_dir_test)
for line in txt:
- #bb.note("===%s===" % line)
if bad_dir in line:
- package_qa_write_error( 1, name, file, d)
- bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file))
- #bb.note("Fixing RPATH for you in %s" % file)
- #os.popen("%s -r /lib %s" % (chrpath,file))
- #return False
- return True
+ error_msg = "package %s contains bad RPATH %s in file %s" % (name, line, file)
+ sane = package_qa_handle_error(1, error_msg, name, file, d)
+
+ return sane
def package_qa_check_devdbg(path, name,d):
"""
@@ -251,17 +248,15 @@ def package_qa_check_devdbg(path, name,d):
if not "-dev" in name:
if path[-3:] == ".so" and os.path.islink(path):
- package_qa_write_error( 0, name, path, d )
- bb.error("QA Issue: non -dev package contains symlink .so: %s path '%s'" % (name, package_qa_clean_path(path,d)))
- if package_qa_make_fatal_error( 0, name, path, d ):
- sane = False
+ error_msg = "non -dev package contains symlink .so: %s path '%s'" % \
+ (name, package_qa_clean_path(path,d))
+ sane = package_qa_handle_error(0, error_msg, name, path, d)
if not "-dbg" in name:
if '.debug' in path:
- package_qa_write_error( 3, name, path, d )
- bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % (name, package_qa_clean_path(path,d)))
- if package_qa_make_fatal_error( 3, name, path, d ):
- sane = False
+ error_msg = "non debug package contains .debug directory: %s path %s" % \
+ (name, package_qa_clean_path(path,d))
+ sane = package_qa_handle_error(3, error_msg, name, path, d)
return sane
@@ -277,9 +272,10 @@ def package_qa_check_arch(path,name,d):
Check if archs are compatible
"""
import bb, os
+ sane = True
target_os = bb.data.getVar('TARGET_OS', d, True)
target_arch = bb.data.getVar('TARGET_ARCH', d, True)
-
+
# FIXME: Cross package confuse this check, so just skip them
if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d):
return True
@@ -290,29 +286,24 @@ def package_qa_check_arch(path,name,d):
return True
#if this will throw an exception, then fix the dict above
- (machine, osabi, abiversion, littleendian, bits32) = package_qa_get_machine_dict()[target_os][target_arch]
+ (machine, osabi, abiversion, littleendian, bits32) \
+ = package_qa_get_machine_dict()[target_os][target_arch]
elf = package_qa_get_elf(path, bits32)
try:
elf.open()
except:
- # just for debbugging to check the parser, remove once convinced...
return True
+ # Check the architecture and endiannes of the binary
if not machine == elf.machine():
- bb.error("Architecture did not match (%d to %d) on %s" %(machine, elf.machine(), package_qa_clean_path(path,d)))
- return not package_qa_make_fatal_error( 4, name, path, d )
+ error_msg = "Architecture did not match (%d to %d) on %s" % \
+ (machine, elf.machine(), package_qa_clean_path(path,d))
+ sane = package_qa_handle_error(4, error_msg, name, path, d)
elif not littleendian == elf.isLittleEndian():
- bb.error("Endiannes did not match (%d to %d) on %s" % (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d)))
- return not package_qa_make_fatal_error( 4, name, path, d )
-
- return True
+ error_msg = "Endiannes did not match (%d to %d) on %s" % \
+ (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))
+ sane = package_qa_handle_error(4, error_msg, name, path, d)
-def package_qa_check_pcla(path,name,d):
- """
- .pc and .la files should not point to the WORKDIR
- """
- sane = True
- # TODO
return sane
def package_qa_check_desktop(path, name, d):
@@ -320,13 +311,15 @@ def package_qa_check_desktop(path, name, d):
Run all desktop files through desktop-file-validate.
"""
import bb, os
+ sane = True
if path.endswith(".desktop"):
- validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate')
+ validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), \
+ 'desktop-file-validate')
output = os.popen("%s %s" % (validate, path))
- # This only produces output on errors
for l in output:
- bb.error(l.strip())
- return True
+ sane = package_qa_handle_error(7, l.strip(), name, path, d)
+
+ return sane
def package_qa_check_staged(path,d):
"""
@@ -355,16 +348,17 @@ def package_qa_check_staged(path,d):
path = os.path.join(root,file)
if file[-2:] == "la":
file_content = open(path).read()
- if installed in file_content or workdir in file_content:
- bb.error("QA issue: %s failed sanity test (reference to workdir or installed)" % file )
- if package_qa_make_fatal_error( 5, "staging", path, d):
- sane = True
+ if installed in file_content:
+ error_msg = "%s failed sanity test (installed) in path %s" % (file,root)
+ sane = package_qa_handle_error(5, error_msg, "staging", path, d)
+ if workdir in file_content:
+ error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
+ sane = package_qa_handle_error(8, error_msg, "staging", path, d)
elif file[-2:] == "pc":
file_content = open(path).read()
if workdir in file_content:
- bb.error("QA issue: %s failed sanity test (reference to workdir)" % file )
- if package_qa_make_fatal_error( 6, "staging", path, d):
- sane = False
+ error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
+ sane = package_qa_handle_error(6, error_msg, "staging", path, d)
return sane
@@ -382,7 +376,6 @@ def package_qa_walk(path, funcs, package,d):
return sane
-
def package_qa_check_rdepends(pkg, workdir, d):
import bb
sane = True
@@ -414,10 +407,8 @@ def package_qa_check_rdepends(pkg, workdir, d):
# Now do the sanity check!!!
for rdepend in rdepends:
if "-dbg" in rdepend:
- package_qa_write_error( 2, pkgname, rdepend, d )
- bb.error("QA issue: %s rdepends on %s" % (pkgname,rdepend))
- if package_qa_make_fatal_error( 2, pkgname, rdepend, d ):
- sane = False
+ error_msg = "%s rdepends on %s" % (pkgname,rdepend)
+ sane = package_qa_handle_error(2, error_msg, pkgname, rdepend, d)
return sane
@@ -431,6 +422,9 @@ python do_package_qa () {
if not packages:
return
+ checks = [package_qa_check_rpath, package_qa_check_devdbg,
+ package_qa_check_perm, package_qa_check_arch,
+ package_qa_check_desktop]
walk_sane = True
rdepends_sane = True
for package in packages.split():
@@ -440,7 +434,7 @@ python do_package_qa () {
bb.note("Checking Package: %s" % package)
path = "%s/install/%s" % (workdir, package)
- if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d):
+ if not package_qa_walk(path, checks, package, d):
walk_sane = False
if not package_qa_check_rdepends(package, workdir, d):
rdepends_sane = False
@@ -466,7 +460,10 @@ python do_qa_configure() {
bb.note("Checking sanity of the config.log file")
import os
for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)):
+ statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \
+ os.path.join(root,"config.log")
if "config.log" in files:
- if os.system("grep 'CROSS COMPILE Badness:' %s > /dev/null" % (os.path.join(root,"config.log"))) == 0:
- bb.fatal("This autoconf log indicates errors, it looked at host includes. Rerun configure task after fixing this. Path was '%s'" % root)
+ if os.system(statement) == 0:
+ bb.fatal("""This autoconf log indicates errors, it looked at host includes.
+Rerun configure task after fixing this. The path was '%s'""" % root)
}
diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass
index da5bd01dae..c98baceeab 100644
--- a/classes/module-base.bbclass
+++ b/classes/module-base.bbclass
@@ -10,6 +10,7 @@ export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')
KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}"
KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}"
KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}"
+KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}"
# Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture
# specific options necessary for building the kernel and modules.
@@ -17,9 +18,12 @@ TARGET_CC_KERNEL_ARCH ?= ""
HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}"
TARGET_LD_KERNEL_ARCH ?= ""
HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}"
+TARGET_AR_KERNEL_ARCH ?= ""
+HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH}"
KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}"
+KERNEL_AR = "${AR}${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}"
# kernel modules are generally machine specific
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/classes/module.bbclass b/classes/module.bbclass
index 7083076b5f..1d0f1dd4f8 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -9,7 +9,8 @@ module_do_compile() {
KERNEL_SRC=${STAGING_KERNEL_DIR} \
KERNEL_VERSION=${KERNEL_VERSION} \
CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
- ${MAKE_TARGETS}
+ AR="${KERNEL_AR}" \
+ ${MAKE_TARGETS}
}
module_do_install() {
diff --git a/classes/openmoko-base.bbclass b/classes/openmoko-base.bbclass
index 8643daa7a4..184477b1c0 100644
--- a/classes/openmoko-base.bbclass
+++ b/classes/openmoko-base.bbclass
@@ -1,6 +1,6 @@
HOMEPAGE = "http://www.openmoko.org"
LICENSE ?= "GPL"
-OPENMOKO_RELEASE ?= "OM-2007"
+OPENMOKO_RELEASE ?= "OM-2007.2"
OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
def openmoko_base_get_subdir(d):
diff --git a/classes/opie_i18n.bbclass b/classes/opie_i18n.bbclass
index cb3d07de75..107d090451 100644
--- a/classes/opie_i18n.bbclass
+++ b/classes/opie_i18n.bbclass
@@ -13,7 +13,7 @@ SRC_URI += "${HANDHELDS_CVS};module=opie/i18n"
DEPENDS += "opie-i18n"
die () {
- echo -e "opie_18n: ERROR: $1"
+ printf "opie_18n: ERROR: $1\n"
exit 1
}
@@ -60,21 +60,21 @@ do_build_opie_i18n () {
package_name2="`echo "${PN}"| sed "s/^opie\-//;s/\-//"`"
test "$package_name" != "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts ${package_name2}.ts lib${package_name2}.ts opie-${package_name2}.ts"
test "$package_name" = "$package_name2" && I18N_FILES="${package_name}.ts lib${package_name}.ts opie-${package_name}.ts"
- echo -e "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file"
+ printf "I18N Datafiles: ${I18N_FILES} (auto-detected)\nYou can overide the auto-detection by setting I18N_FILES in your .oe file\n"
else
echo "I18N Datafiles: ${I18N_FILES} (provided by .bb)"
fi
rm -f "${WORKDIR}/FILES.tmp" "${WORKDIR}/PACKAGES.tmp"
- echo -e "\nFILES is set to [${FILES}]\n"
+ printf "\nFILES is set to [${FILES}]\n\n"
for file in ${I18N_FILES}
do
echo "Working on [$file]"
for ts_file in `ls -1 */*.ts | egrep "/$file"`
do
- echo -e "\tCompiling [$ts_file]"
+ printf "\tCompiling [$ts_file]\n"
cd "${WORKDIR}/i18n/`dirname $ts_file`" || die "[${WORKDIR}/i18n/`dirname $ts_file`] not found"
opie-lrelease "`basename $ts_file`" || die "lrelease failed! Make sure that <inherit opie_i18n> or <inherit opie> is *below* <DEPENDS =>!"
@@ -82,7 +82,7 @@ do_build_opie_i18n () {
# to allow packaging as "_" is not allowed in a package name
lang="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"`"
lang_sane="`echo "$ts_file" | sed -n "s#\(.*\)/\(.*\)#\1#p"|sed s/\_/\-/`"
- echo -e "\tPackaging [`basename $ts_file`] for language [$lang]"
+ printf "\tPackaging [`basename $ts_file`] for language [$lang]\n"
install -d ${D}${palmtopdir}/i18n/$lang
install -m 0644 ${WORKDIR}/i18n/$lang/.directory ${D}${palmtopdir}/i18n/$lang/
@@ -93,14 +93,14 @@ do_build_opie_i18n () {
# function do_build_opie_i18n_data() which sets the variables FILES_* and
# PACKAGES as needed.
echo -n "${PN}-${lang_sane} " >> "${WORKDIR}/PACKAGES.tmp"
- echo -e "${PN}-${lang_sane}#${palmtopdir}/i18n/$lang" >> "${WORKDIR}/FILES.tmp"
+ printf "${PN}-${lang_sane}#${palmtopdir}/i18n/$lang" >> "${WORKDIR}/FILES.tmp\n"
ts_found_something=1
done
if test "$ts_found_something" != 1
then
- echo -e "\tNo translations found"
+ printf "\tNo translations found\n"
else
ts_found_something=""
ts_found="$ts_found $file"
@@ -109,7 +109,7 @@ do_build_opie_i18n () {
# Only used for debugging purposes
test "${I18N_STATS}" = 1 && cd "${WORKDIR}/i18n"
- echo -e "Completed [$file]\n\n"
+ printf "Completed [$file]\n\n\n"
done
qt_dirs="apps bin etc lib pics plugins share sounds"
@@ -125,7 +125,7 @@ do_build_opie_i18n () {
if (echo "${FILES}" | egrep "${palmtopdir}/? |${palmtopdir}/?$") &>/dev/null
then
echo "NOTE: FILES was set to ${palmtopdir} which would include the i18n directory"
- echo -e "\n\nI'll remove ${palmtopdir} from FILES and replace it with all directories"
+ printf "\n\nI'll remove ${palmtopdir} from FILES and replace it with all directories\n"
echo "below QtPalmtop, except i18n ($qt_dirs). See classes/opie_i18n.oeclass for details"
# Removes /opt/QtPalmtop from FILES but keeps /opt/QtPalmtop/$some_dir
@@ -138,7 +138,7 @@ do_build_opie_i18n () {
if test -z "${FILES}"
then
echo "NOTE:"
- echo -e "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )"
+ printf "Since FILES is empty, i'll add all directories below ${palmtopdir} to it,\nexcluding i18n: ( $qt_dirs )\n"
echo "${PN}#$FILES $dir_" >> "${WORKDIR}/FILES.tmp"
fi
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index d0f59d2cd4..cf3419f824 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -5,8 +5,7 @@ inherit qmake_base
DEPENDS_prepend = "qmake2-native uicmoc4-native "
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
-export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
@@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
export OE_QMAKE_LINK = "${CXX}"
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass
index 86bc7afc2f..fd8939a23f 100644
--- a/classes/qtopia4core.bbclass
+++ b/classes/qtopia4core.bbclass
@@ -4,8 +4,9 @@ inherit qmake2
#
# override variables set by qmake-base to compile QtopiaCore apps
#
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = ""
-EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "
+export OE_QMAKE_EXTRA_MODULES = "network"
+EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E "
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 853ea225fc..c2c4a764e4 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -145,7 +145,7 @@ rootfs_deb_log_check() {
if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
then
echo "log_check: There were error messages in the logfile"
- echo -e "log_check: Matched keyword: [$keyword_die]\n"
+ printf "log_check: Matched keyword: [$keyword_die]\n"
echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
echo ""
do_exit=1
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index c6e2099e7c..28ba03d675 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -71,7 +71,7 @@ rootfs_ipk_log_check() {
if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
then
echo "log_check: There were error messages in the logfile"
- echo -e "log_check: Matched keyword: [$keyword_die]\n"
+ printf "log_check: Matched keyword: [$keyword_die]\n"
echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die" -C1
echo ""
do_exit=1
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index cc413b7011..9994febf0d 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -24,14 +24,6 @@ def check_conf_exists(fn, data):
return True
return False
-def check_app_exists(app, d):
- from bb import which, data
-
- app = data.expand(app, d)
- path = data.getVar('PATH', d)
- return len(which(path, app)) != 0
-
-
def check_sanity(e):
from bb import note, error, data, __version__
from bb.event import Handled, NotHandled, getName
diff --git a/classes/sdl.bbclass b/classes/sdl.bbclass
index d478d97f18..23cbf10919 100644
--- a/classes/sdl.bbclass
+++ b/classes/sdl.bbclass
@@ -4,41 +4,41 @@
DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image"
-APPDESKTOP ?= "${PN}.desktop"
+APPDESKTOP ?= "${WORKDIR}/${PN}.desktop"
APPNAME ?= "${PN}"
-APPIMAGE ?= "${PN}.png"
+APPIMAGE ?= "${WORKDIR}/${PN}.png"
sdl_do_sdl_install() {
- install -d ${D}${palmtopdir}/bin
- install -d ${D}${palmtopdir}/pics
- install -d ${D}${palmtopdir}/apps/Games
- ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
- install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${PN}.png
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+
+ install -m 0644 ${APPIMAGE} ${D}${datadir}/pixmaps/${PN}.png
if [ -e "${APPDESKTOP}" ]
then
- echo ${APPDESKTOP} present, installing to palmtopdir...
- install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/apps/Games/${PN}.desktop
+ echo ${APPDESKTOP} present, using it...
+ install -m 0644 ${APPDESKTOP} ${D}${datadir}/applications/
else
echo ${APPDESKTOP} not present, creating one on-the-fly...
- cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF
+ cat >${D}${datadir}/applications/${PN}.desktop <<EOF
[Desktop Entry]
-Note=Auto Generated... this may be not what you want
+Name=${PN}
Comment=${DESCRIPTION}
+Note=Auto Generated by OE SDL bbclass
Exec=${APPNAME}
Icon=${PN}.png
Type=Application
-Name=${PN}
+Categories=Games
EOF
fi
}
EXPORT_FUNCTIONS do_sdl_install
-addtask sdl_install after do_compile before do_populate_staging
+addtask sdl_install after do_install before do_package
-SECTION = "x11/games"
-SECTION_${PN}-opie = "opie/games"
+#SECTION = "x11/games"
+#SECTION_${PN}-opie = "opie/games"
-PACKAGES += "${PN}-opie"
-RDEPENDS_${PN}-opie += "${PN}"
-FILES_${PN}-opie = "${palmtopdir}"
+#PACKAGES += "${PN}-opie"
+#RDEPENDS_${PN}-opie += "${PN}"
+#FILES_${PN}-opie = "${palmtopdir}"
diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass
index fd09946061..f657e5be94 100644
--- a/classes/xilinx-bsp.bbclass
+++ b/classes/xilinx-bsp.bbclass
@@ -34,7 +34,7 @@ fi
case "${XILINX_BOARD}" in
ML403)
oenote "ML403 board setup"
- cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
+ cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \
${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h
;;
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 76eacce219..66d2cf6f03 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -602,6 +602,10 @@ sha256=7a17403ac478cae0d837461b7efcd9075b17c6e7f3e2221fe1f2fdbd14f11dcf
md5=1ef39fb723f9209109134d6f4860cb21
sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.15.tar.bz2]
+md5=94254ea0d2c966a58184b134e9da29ff
+sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
+
[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
md5=3106c2d59a329263867fa3dd44133dda
sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -622,6 +626,10 @@ sha256=d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
md5=6d3009c157ac6fc803696d6590a48366
sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.15.tar.bz2]
+md5=287f46f891581c15018de4f8c0731575
+sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
+
[http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz]
md5=e3619c07bd175ce5f73d67388c0c2ea5
sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
@@ -1110,6 +1118,10 @@ sha256=fe6de9ccfab9e9fbdbe1a2cbe4a9ea771d1a2efc7f2122a2350214394587ff39
md5=9d7e02ea9a4c43d8f030500f282ee8bf
sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb
+[http://bluez.sourceforge.net/download/bluez-libs-3.23.tar.gz]
+md5=8f0368c6213abef36f1e563b44b2eed4
+sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
+
[http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
md5=8b73b0ccbcef6a4270468487b1309990
sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1134,6 +1146,10 @@ sha256=f8f242c6835ae826bf1f4eaee6c50d47d6208715e45450ba42c1769094c3f296
md5=ef596746d656ed034ed64596f72ef3c2
sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0
+[http://bluez.sourceforge.net/download/bluez-utils-3.23.tar.gz]
+md5=767ad814bff4e1806f873ecf2434ba89
+sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
+
[http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
md5=f63b440396baee7dee9259395a205d48
sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1506,6 +1522,10 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
md5=c0b57a115e24005f9828ca7b53908779
sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
+[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
+md5=4476c423b8f74266136964e42ea88028
+sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+
[ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff
@@ -2382,6 +2402,10 @@ sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841
md5=3654bbbf01deeb0d804df194e1b1a2b3
sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
+md5=3654bbbf01deeb0d804df194e1b1a2b3
+sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
+
[ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
md5=1c5a2ea659680bdd1e238d7828a857a7
sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -2762,6 +2786,11 @@ sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17
md5=f035852f521b54677f2b5c9e2f6d54a4
sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
+[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
+md5=c0124afc760d4fe8c24ffcf15ba7f391
+sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
+
+
[http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
md5=890615fa4b3e6c82cd1b9807b106f042
sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
@@ -4550,6 +4579,10 @@ sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
md5=a6f532770cf9286e1de38d6570cbc6bc
sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
+[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz]
+md5=c7005ccb1765d8359fd2348350770495
+sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
+
[http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
md5=bd9195d086566f56634c0bcbbbcbebea
sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
@@ -7898,6 +7931,10 @@ sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
md5=843422d90349800ee721f6710d051c87
sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc
+[http://www.mpfr.org/mpfr-2.3.0/mpfr-2.3.0.tar.bz2]
+md5=cf7c743e4be122e63eb6f372fc58b657
+sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
+
[http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
md5=bb403b35c2d25655d55f0f616b8f47bb
sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
@@ -8658,6 +8695,10 @@ sha256=46e20652ae4b9ceab5879ab939ec3eb2e57de742ea734272749ca53c93a20339
md5=6a33888e34c23f7fde09a6e94e4f5950
sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
+[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.31.tar.bz2]
+md5=3aa902cb7a57a4aa09427de603ebf17b
+sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
+
[http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.13.tar.bz2]
md5=5f09df47a16e83462384b44b75310539
sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
@@ -8778,6 +8819,10 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
md5=f9fea77e46ec7a3a16e925e137f146e7
sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
+[http://cairographics.org/releases/pixman-0.9.6.tar.gz]
+md5=d2b1071cdbb0b8da18039111ba2dfd22
+sha256=179abc613f5100081cdef833f24a35fe7b646b8a4f0c79647d9609f6bf8222d8
+
[http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz]
md5=fd5c547e9d66ba49bc735ccb8c791f2a
sha256=7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
@@ -9446,13 +9491,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
md5=8012acea71b35c18247bd92c4721589d
sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz]
+md5=19678fe35170559cd6a6fa531c57799c
+sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
+
[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz]
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
-[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
-md5=70b729dd5dd8b2b432d685918e1971f1
-sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz]
+md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f
+sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d
[http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz]
md5=0e2bab65b62784d8714057624373f70d
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6d3ad7bd6b..25b07e0038 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
DISTRO_NAME = "AmsDelta Linux"
DISTRO_VERSION = "unstable-${DATE}"
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf
index 298c8589e3..358ed06cf2 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2007.1-legacy.conf
@@ -4,6 +4,6 @@
# * no sysfs
# * no EABI for ARM
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
# We'll have to fill this in as we go.
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 44a7791ea2..ec8a5b9b30 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -6,11 +6,15 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
#@--------------------------------------------------------------------
-# This is a testbed for unstable and/or untested things, while angstrom-2007.1
-# is aiming for stability and a release.
+# This is a aimed to be the next stable angstrom release.
+# If you want something stable *right now*, use angstrom-2007.1
+# with the org.openembedded.angstrom-2007.12-stable branch
+#
# Use this at your own risk, we welcome bugreports filed at
# http://bugs.openembedded.org
-# In doubt, use DISTRO="angstrom-2007.1"
+#
+# Again, in doubt, use DISTRO="angstrom-2007.1" with the
+# org.openembedded.angstrom-2007.12-stable branch
#DISTRO_VERSION = "2008.1"
DISTRO_VERSION = "2008.1-test-${DATE}"
@@ -53,7 +57,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-hh19"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
#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"
@@ -83,16 +87,44 @@ PREFERRED_PROVIDER_avahi = "avahi"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+#powerpc needs additional patches to gcc
+PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1"
+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"
+
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"
+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"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 234c92f62a..fe079db92d 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -8,7 +8,7 @@
FOONAS_MODE ?= "glibc"
ANGSTROM_MODE = ${FOONAS_MODE}
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO = "foonas"
DISTRO_NAME = "foonas"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 665c5c8b6c..380c882c2c 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -6,8 +6,12 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
#@--------------------------------------------------------------------
-# The release will the 2007.12
-DISTRO_VERSION = "2007.11RC1.3"
+# If you want to use the angstrom 2007.12 release or if
+# you want to base you distro on angstrom 2007, switch to
+# the org.openembedded.angstrom-2007.12-stable branch
+# THIS FILE WILL GO AWAY IN JANUARY 2008!!
+
+DISTRO_VERSION = "2007.11RC3"
DISTRO_REVISION = "51"
require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 1b6ed46ac7..156b5b21a3 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -174,7 +174,7 @@ PREFERRED_VERSION_classpath-minimal ?= "0.95"
PREFERRED_VERSION_classpath-minimal-native ?= "0.95"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
-PREFERRED_VERSION_cmake-native ?= "2.2.3"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
PREFERRED_VERSION_cms92init ?= "0.1"
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_comprec ?= "0.02"
@@ -422,7 +422,7 @@ PREFERRED_VERSION_galago-daemon ?= "0.3.4"
PREFERRED_VERSION_galculator ?= "1.2.3"
PREFERRED_VERSION_gallery ?= "1.5.5"
PREFERRED_VERSION_gamin ?= "0.1.8"
-PREFERRED_VERSION_gammu ?= "1.13.0"
+PREFERRED_VERSION_gammu ?= "1.17.0"
PREFERRED_VERSION_gawk ?= "3.1.4"
PREFERRED_VERSION_gawk-native ?= "3.1.4"
PREFERRED_VERSION_gcalctool ?= "5.7.32"
@@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15"
PREFERRED_VERSION_imlib2 ?= "1.4.0.002"
PREFERRED_VERSION_imposter ?= "0.3"
PREFERRED_VERSION_inetutils ?= "1.4.2"
-PREFERRED_VERSION_initramfs-jffs2 ?= "0.1"
-PREFERRED_VERSION_initramfs-module-block ?= "0.1"
-PREFERRED_VERSION_initramfs-module-loop ?= "0.1"
-PREFERRED_VERSION_initramfs-module-nfs ?= "0.1"
-PREFERRED_VERSION_initramfs-uniboot ?= "0.2"
PREFERRED_VERSION_initscripts ?= "1.0"
PREFERRED_VERSION_initscripts-openprotium ?= "1.0"
PREFERRED_VERSION_initscripts-slugos ?= "1.0"
@@ -1169,7 +1164,6 @@ PREFERRED_VERSION_m4-native ?= "1.4.8"
PREFERRED_VERSION_macchanger ?= "1.5.0"
PREFERRED_VERSION_madfu ?= "1.2"
PREFERRED_VERSION_madplay ?= "0.15.2b"
-PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626"
PREFERRED_VERSION_mahjongg ?= "1.0.0"
PREFERRED_VERSION_mailutils ?= "0.3.1"
PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
@@ -1311,7 +1305,7 @@ PREFERRED_VERSION_nano ?= "2.0.6"
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.1"
+PREFERRED_VERSION_navit ?= "0.0.3"
PREFERRED_VERSION_nbd ?= "2.8.7"
PREFERRED_VERSION_ncftp ?= "3.2.0"
PREFERRED_VERSION_ncmpc ?= "0.11.1"
@@ -1502,7 +1496,7 @@ PREFERRED_VERSION_python-dbus ?= "0.81.1"
PREFERRED_VERSION_python-fam ?= "1.1.1"
PREFERRED_VERSION_python-fnorb ?= "1.3"
PREFERRED_VERSION_python-fpconst ?= "0.6.0"
-PREFERRED_VERSION_python-gammu ?= "0.21"
+PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
PREFERRED_VERSION_python-gst ?= "0.10.8"
@@ -1544,7 +1538,6 @@ PREFERRED_VERSION_python-pylinda ?= "0.6"
PREFERRED_VERSION_python-pylint ?= "0.13.2"
PREFERRED_VERSION_python-pymetar ?= "0.11"
PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
-PREFERRED_VERSION_python-pyqt ?= "4.3"
PREFERRED_VERSION_python-pyrad ?= "0.8"
PREFERRED_VERSION_python-pyraf ?= "1.4"
PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
@@ -1566,7 +1559,6 @@ PREFERRED_VERSION_python-scons-native ?= "0.97"
PREFERRED_VERSION_python-setuptools ?= "0.6c6"
PREFERRED_VERSION_python-sgmlop ?= "1.1"
PREFERRED_VERSION_python-simplejson ?= "1.7.1"
-PREFERRED_VERSION_python-sip ?= "4.7"
PREFERRED_VERSION_python-snmplib ?= "0.1.1"
PREFERRED_VERSION_python-soappy ?= "0.11.6"
PREFERRED_VERSION_python-spydi ?= "0.9.7"
@@ -1600,7 +1592,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
-PREFERRED_VERSION_qpegps ?= "0.9.3"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
PREFERRED_VERSION_qpf-arabic ?= "1.0"
PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
@@ -1622,7 +1614,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6"
PREFERRED_VERSION_qsvn ?= "0.3.0"
PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.3"
PREFERRED_VERSION_qtplot ?= "0.2"
PREFERRED_VERSION_quagga ?= "0.99.8"
PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1660,6 +1652,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2"
PREFERRED_VERSION_rglueap ?= "0.1"
PREFERRED_VERSION_rhythmbox ?= "0.8.7"
PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
PREFERRED_VERSION_rott ?= "1.0"
PREFERRED_VERSION_rox-filer ?= "2.5"
PREFERRED_VERSION_rp-pppoe ?= "3.8"
@@ -1726,7 +1719,6 @@ PREFERRED_VERSION_sidplayer ?= "1.5.0"
PREFERRED_VERSION_silo ?= "1.4.8"
PREFERRED_VERSION_simh ?= "3.7-1"
PREFERRED_VERSION_simpad-utilities ?= "1.0"
-PREFERRED_VERSION_sip-native ?= "4.7"
PREFERRED_VERSION_sip3-native ?= "4.0.1"
PREFERRED_VERSION_sipsak ?= "0.9.6"
PREFERRED_VERSION_skippy-xd ?= "0.5.0"
@@ -1898,7 +1890,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.3"
PREFERRED_VERSION_uim ?= "1.3.1"
PREFERRED_VERSION_uim-native ?= "1.3.1"
PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
@@ -2127,7 +2119,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1"
PREFERRED_VERSION_zope ?= "3.3.1"
PREFERRED_VERSION_zrally ?= "0.90"
PREFERRED_VERSION_zrev7 ?= "1.0.1"
-PREFERRED_VERSION_zroadmap ?= "1.0.12"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
PREFERRED_VERSION_zsafe ?= "2.1.3"
PREFERRED_VERSION_zsh ?= "4.1.1"
PREFERRED_VERSION_zshopi ?= "0.2"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 4e01298bf8..aff3ba90d1 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -151,6 +151,7 @@ FEED_ARCH_nslu2be = "armv5teb"
# armv6
FEED_ARCH_mx31ads = "armv6"
+FEED_ARCH_mx31moboard = "armv6"
FEED_ARCH_nokia800 = "armv6"
FEED_ARCH_omap2420h4 = "armv6"
FEED_ARCH_omap2430sdp = "armv6"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 63a4b55dd2..671babe1af 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -45,7 +45,9 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
-SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-python-gsmd ?= "${AUTOREV}"
+
+SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}"
SRCREV_pn-dfu-util ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-usbpath ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
new file mode 100644
index 0000000000..2c2e0acb03
--- /dev/null
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -0,0 +1 @@
+PREFERRED_VERSION_vte = "0.16.10"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index b3b47093b7..23e3ed3243 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 = "20071206"
+EFL_SRCDATE = "20080110"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}"
SRCDATE_python-evas ?= "${EFL_SRCDATE}"
SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-edbus ?= "${EFL_SRCDATE}"
SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
@@ -106,7 +107,8 @@ SRCDATE_entice ?= "${EFL_SRCDATE}"
SRCDATE_entrance ?= "${EFL_SRCDATE}"
SRCDATE_e-utils ?= "${EFL_SRCDATE}"
SRCDATE_e-wm ?= "${EFL_SRCDATE}"
-SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_enna = "20080116"
+#SRCDATE_enna ?= "${EFL_SRCDATE}"
SRCDATE_exquisite ?= "${EFL_SRCDATE}"
# Misc packages, sorted by alphabet
@@ -148,7 +150,6 @@ SRCDATE_xcompmgr ?= "20060814"
SRCDATE_xirssi ?= "20060814"
SRCDATE_xsvg ?= "20060814"
SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zroadmap ?= "20060814"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index fd2423e08e..f8516d2fc6 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,19 +31,19 @@ SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3657"
+SRCREV_pn-libgsmd ?= "3684"
SRCREV_pn-libgsmd-devel ?= "3293"
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"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "927"
-SRCREV_pn-linux-openmoko ?= "3238"
+SRCREV_pn-linux-ixp4xx ?= "957"
+SRCREV_pn-linux-openmoko ?= "3801"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -72,7 +72,7 @@ SRCREV_pn-openmoko-contacts2 ?= "387"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "673"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3561"
+SRCREV_pn-openmoko-dialer2 ?= "3689"
SRCREV_pn-openmoko-feedreader2 ?= "3645"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -84,7 +84,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3583"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3678"
+SRCREV_pn-openmoko-messages2 ?= "3712"
SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "3149"
SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -104,7 +104,7 @@ 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 ?= "3542"
+SRCREV_pn-openmoko-terminal2 ?= "3764"
SRCREV_pn-openmoko-theme-standard ?= "2370"
SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
SRCREV_pn-openmoko-theme-standard2 ?= "3425"
@@ -119,6 +119,7 @@ SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-python-formencode = "3148"
+SRCREV_pn-python-gsmd = "127"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index ab80719646..ea4980b55a 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.7"
+SLUGOS_VERSION = "4.9"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index 2c039dbcce..d68a03fa2b 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -6,7 +6,7 @@
#@--------------------------------------------------------------------
# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO = "mokoslug"
DISTRO_NAME = "MokoSlug"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index f2007c231f..dd6c2e0b7e 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,7 +4,8 @@
#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
#-----------------------------------------------------------------------------
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/include/preferred-om-2008-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko.inc
#
# Header
@@ -47,11 +48,8 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
# 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"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
# 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}"
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
new file mode 100644
index 0000000000..92e5ac5b39
--- /dev/null
+++ b/conf/distro/openwrt-sdk.conf
@@ -0,0 +1,29 @@
+#-----------------------------------------------------------------------------
+#@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"
+DISTRO_REVISION = "2"
+
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
+
+# 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 libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 0cf5e8e81e..5246df3990 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.9-alpha"
+DISTRO_VERSION = "6.11-beta"
DISTRO_TYPE = "beta"
FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
diff --git a/conf/documentation.conf b/conf/documentation.conf
index 96a292b9d7..6c71bc00c7 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -103,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/collie.conf b/conf/machine/collie.conf
index c91bdcfc92..b9e6f6e6aa 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
IMAGE_LINGUAS = ""
-
IMAGE_FSTYPES ?= "jffs2 tar.gz"
-require conf/machine/include/tune-strongarm.inc
-
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index a8a2d60c17..6eeb08825b 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_VERSION_u-boot = "1.1.4"
+KERNEL_IMAGETYPE = "uImage"
#tune for the 405 cpu
require conf/machine/include/tune-ppc405.inc
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 30784f0dc6..ad0c64bef2 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 ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
@@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-gsm \
kernel-module-gta01kbd \
kernel-module-s3cmci \
- kernel-module-ext2 \
- kernel-module-vfat \
kernel-module-snd-soc-neo1973-wm8753 \
kernel-module-snd-soc-smdk2440 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-cp437 \
"
# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
@@ -48,6 +44,3 @@ 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 b0933868c2..dad60e20c8 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 ext2"
MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
@@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-gsm \
kernel-module-gta01kbd \
kernel-module-s3cmci \
- kernel-module-ext2 \
- kernel-module-vfat \
kernel-module-snd-soc-neo1973-gta02-wm8753 \
kernel-module-snd-soc-smdk2440 \
- kernel-module-nls-iso8859-1 \
- kernel-module-nls-cp437 \
"
SERIAL_CONSOLE = "115200 ttySAC2"
@@ -50,6 +46,3 @@ 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/gesbc-9302.conf b/conf/machine/gesbc-9302.conf
new file mode 100644
index 0000000000..ce45606dbd
--- /dev/null
+++ b/conf/machine/gesbc-9302.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Glomation GESBC-9302 single board computer
+#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "57600 ttyAM0"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+#extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 "
+
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#require conf/machine/include/tune-ep9312.inc
+
+require conf/machine/include/tune-arm920t.inc
+
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 75ffc0d423..cad7d0393c 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -26,7 +26,8 @@ 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 \
@@ -39,7 +40,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-h2000-audio = "snd-h2000-audio"
+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 c037226154..6f0e37b803 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
# h3700, h3800 have 32, but let that be the bonus
ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index 62d3c21450..c4c1237bae 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
@@ -26,10 +26,16 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
- kernel-module-h5400-battery"
+ kernel-module-h5400-battery \
+ kernel-module-snd-soc-h5000"
#
# 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-soc-h5000 = "snd-soc-h5000"
+module_autoload_g_ether = "g_ether"
+
SERIAL_CONSOLE = "115200 ttyS0 vt100"
USE_VT = "0"
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index 6bf89999bf..f7f025413d 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 vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone"
#
# Software/packages selection
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index afaa6fc294..b3debb633c 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 vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone"
#
# Software/packages selection
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index a5feeb2d69..f95cb70833 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 vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat phone"
#
# Software/packages selection
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 003406bd88..472e5d69e6 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 vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone"
#
# Software/packages selection
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index a577cc78d2..2ae1419bae 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 vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone"
#
# Software/packages selection
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index 016247213d..b311afe1b4 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 vfat"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat phone"
MACHINE_EXTRA_RDEPENDS = "alsa-state"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..515700d9e6 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
ROOT_FLASH_SIZE = "16"
VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 1510cf8745..0d3a9bbcf0 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -21,7 +21,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "200"
-MACHINE_FEATURES = "alsa apm bluetooth irda pcmcia screen touchscreen usbgadget wifi vfat"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat"
MACHINE_FEATURES += "iwmmxt"
#
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
index bc80185fa0..8f8ccafeb1 100644
--- a/conf/machine/include/collie-2.6.inc
+++ b/conf/machine/include/collie-2.6.inc
@@ -12,7 +12,7 @@ zaurus_make_installkit () {
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
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
if [ "${MACHINE}" = "spitz" ]; then
cp gnu-tar ${IMAGE_NAME}-installkit/
cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 87571c0db0..da88b1494f 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -11,8 +11,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
#mtd2: 00580000 00020000 "VFM_Filesystem"
#mtd3: 00020000 00020000 "Logo"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-MACHINE_FEATURES += "iwmmxt"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
+MACHINE_FEATURES += " iwmmxt"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index d84f1efb26..26d1e3f8ca 100644
--- a/conf/machine/include/qemu.inc
+++ b/conf/machine/include/qemu.inc
@@ -1,7 +1,6 @@
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/machine/include/tune-strongarm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
new file mode 100644
index 0000000000..f136710409
--- /dev/null
+++ b/conf/machine/include/tune-strongarm1100.inc
@@ -0,0 +1,5 @@
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 3f84138ac8..eb020dbcba 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
mkdir ${IMAGE_NAME}-installkit/
# Get the latest kernel using the zImage-<machine>.bin symlink
- cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
if [ "${MACHINE}" = "spitz" ]; then
cp gnu-tar ${IMAGE_NAME}-installkit/
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 72fff1ed5e..a42dd8c127 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
SERIAL_CONSOLE = "115200 ttySA0"
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 8741eb4ff6..ee9117e406 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
TARGET_ARCH = "arm"
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 1c1d08afb1..ac565559aa 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -53,16 +53,16 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
#
# Modules autoload and other boot properties
#
-module_autoload_magician_ts = "magician_ts"
-module_autoload_leds-magician = "leds-magician"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_hci_usb = "hci_usb"
module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_magician_ts = "magician_ts"
+module_autoload_leds-magician = "leds-magician"
module_autoload_magician_phone = "magician_phone"
module_autoload_magician_pm = "magician_pm"
module_autoload_n_tihtc = "n_tihtc"
module_autoload_snd-soc-magician = "snd-soc-magician"
-module_autoload_hci_usb = "hci_usb"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
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/mx31moboard.conf b/conf/machine/mx31moboard.conf
new file mode 100644
index 0000000000..c918404d6c
--- /dev/null
+++ b/conf/machine/mx31moboard.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: EPFL mx31MoBoard
+#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard
+#@Website: http://mobots.epfl.ch/mx31MoBoard.html
+
+TARGET_ARCH = "arm"
+TARGET_FPU_arm = "hard"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+#
+# usb networking
+#
+module_conf_g_ether = "alias usb0 g_ether"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+# to avoid annoying jffs2 messages
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000"
+
+IMAGE_FSTYPES += "tar.gz"
+
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..87c260856d 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
ROOT_FLASH_SIZE = "16"
USE_VT = "0"
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 6334d34171..e187ee1e75 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
ROOT_FLASH_SIZE = "16"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 396350066c..c5d343205f 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-DO_UCLIBC=0
+DO_UCLIBC=1
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -32,24 +38,39 @@ do_report_success() {
echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
}
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700
do
BUILD_MACHINE=$machine
- BUILD_CLEAN="libtool-cross"
- BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \
- task-proper-tools mc screen \
+ BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
+ BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
+ usbutils pciutils mtd-utils usbview hal \
+ task-proper-tools mc screen findutils \
mono perl python ruby \
gtk+ qt-x11-free qt4-x11-free \
gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
- boa cherokee lighttpd thttpd \
- gpe-gallery gpe-scap pidgin \
- gpsdrive navit \
- xmms mplayer \
- wpa-gui wifi-radar \
+ samba meta-nas-server \
+ apache2 boa cherokee lighttpd thttpd \
+ gpe-gallery gpe-scap notecase \
+ pidgin irssi \
+ roadmap-gtk2 gpsdrive navit \
+ xmms mplayer quasar vlc-gpe gnome-mplayer \
+ wpa-gui wifi-radar kismet aircrack-ng dsniff \
+ nmap iptables iperf \
+ gpe-login ipaq-sleep \
gpe-bluetooth bluez-gnome python-pybluez \
- abiword gnumeric evince gimp \
+ abiword gnumeric evince epdfview gimp \
+ scummvm \
flite \
ctorrent \
+ asterisk \
+ gnuradio gnuplot mpfr gmp fftw fftwf fftwl \
+ gphoto2 gqview imagemagick ufraw \
+ tzdata \
+ xserver-kdrive xserver-xorg \
+ xf86-video-fbdev xf86-video-ati xf86-video-vesa \
+ xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
+ task-opie \
+ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
"
do_build
done
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 8b30212790..2f882450c8 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-DO_UCLIBC=0
+DO_UCLIBC=1
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -43,7 +49,7 @@ do_report_success() {
# No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
do
BUILD_MACHINE=$machine
BUILD_CLEAN="libtool-cross base-files"
@@ -55,7 +61,7 @@ for machine in ixp4xxle ixp4xxbe
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
- BUILD_TARGETS="base-image nslu2-base-image"
+ BUILD_TARGETS="base-image nslu2-base-image nas-server-image"
do_build
done
@@ -69,7 +75,7 @@ do
done
# graphics, flash storage
-for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie
+for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad
do
BUILD_CLEAN="base-files"
BUILD_MACHINE=$machine
@@ -95,10 +101,10 @@ do
done
# populate feeds
-for machine in ep93xx a780 efika collie ixp4xxbe
-do
- BUILD_MACHINE=$machine
- BUILD_TARGETS="meta-angstrom-2007"
- do_build
-done
+#for machine in ep93xx a780 efika collie ixp4xxbe
+#do
+# BUILD_MACHINE=$machine
+# BUILD_TARGETS="meta-angstrom-2007"
+# do_build
+#done
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty b/contrib/deploy/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty
+++ b/contrib/deploy/.mtn2git_empty
diff --git a/contrib/deploy/README b/contrib/deploy/README
new file mode 100644
index 0000000000..a285a7f75a
--- /dev/null
+++ b/contrib/deploy/README
@@ -0,0 +1,2 @@
+This directory contains script for deploying OE-generated images for various
+devices and boot methods.
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty b/contrib/deploy/nfs/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty
+++ b/contrib/deploy/nfs/.mtn2git_empty
diff --git a/contrib/deploy/nfs/exports.sample b/contrib/deploy/nfs/exports.sample
new file mode 100644
index 0000000000..6d82f49202
--- /dev/null
+++ b/contrib/deploy/nfs/exports.sample
@@ -0,0 +1,2 @@
+# /etc/exports: NFS file systems being exported. See exports(5).
+/srv/nfs/oe 192.168.0.0/16(rw,insecure,no_root_squash)
diff --git a/contrib/deploy/nfs/oe-nfs-deploy-image b/contrib/deploy/nfs/oe-nfs-deploy-image
new file mode 100755
index 0000000000..ee540696d7
--- /dev/null
+++ b/contrib/deploy/nfs/oe-nfs-deploy-image
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Wonder what the heck is /srv ? Read Filesystem Hierarchy Standard,
+# http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM
+# So, /srv/nfs is root of all NFS exports your system offers, and /srv/nfs/oe is
+# OpenEmbedded's subset (think security).
+NFS_ROOT=/srv/nfs/oe
+
+if [ -z "$1" ]; then
+ echo "$0 - Deploy OpenEmbedded-generated image for device NFS boot"
+ echo "Usage: $0 <image> | -l"
+ exit
+fi
+
+if [ "$1" == "-l" ]; then
+ if [ -n "$2" ]; then
+ extra="-name *$2*"
+ fi
+ find tmp/deploy/ -regextype posix-extended -wholename '*/images/*' -regex '.+\.(tar\.bz2|tar\.gz|cpio\.gz)$' $extra | xargs ls -l
+ exit
+fi
+
+if [ ! -f $1 ]; then
+ echo "Cannot find image $1"
+ exit
+fi
+
+ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'`
+basename=`basename $1 .$ext`
+
+if [ -z "$basename" ]; then
+ echo "Assertion failed"
+ exit 100
+fi
+
+echo "Deploying to: $NFS_ROOT/$basename"
+
+rm -rf $NFS_ROOT/$basename
+
+mkdir -p $NFS_ROOT/$basename
+
+if [ "$ext" == "tar.bz2" ]; then
+ tar -xj -f $1 -C $NFS_ROOT/$basename
+elif [ "$ext" == "tar.gz" ]; then
+ tar -xz -f $1 -C $NFS_ROOT/$basename
+else
+ FPATH=`pwd`
+ cd $NFS_ROOT/$basename
+ bash -c "gzip -d -c $FPATH/$1 | cpio -i --no-absolute-filenames"
+ cd $FPATH
+fi
diff --git a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty b/contrib/distro-packages/debian/openembedded-essential-1.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/.mtn2git_empty
diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/jamvm/jamvm/.mtn2git_empty
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/.mtn2git_empty
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/changelog
index c0eb3d660c..0cb30e8e18 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/changelog
@@ -1,3 +1,10 @@
+
+openembedded-essential (1.3) unstable; urgency=low
+
+ * add gfortran as dependency to complement a5c7b007eaa675cc904f5285291d2f8a597efc84
+
+ -- Rolf Leggewie <oe-devel@rolf.leggewie.biz> Mon, 7 Jan 2008 20:25:00 +0100
+
openembedded-essential (1.2) unstable; urgency=low
* fixed packaging to make lintian happy
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/compat
index 7ed6ff82de..7ed6ff82de 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/compat
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/control
index c7a7e5b9f7..62d55fbba6 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/control
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: openembedded-essential
Architecture: all
-Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk
+Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, gfortran
Description: Metapackage to install all needed packages to start using OpenEmbedded
OpenEmbedded is a full-featured development environment allowing users to
target a wide variety of devices. Supporting multiple build, release paths and
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/copyright
index 9e4905f97e..9e4905f97e 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/copyright
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/rules
index 586b2ff42f..586b2ff42f 100755
--- a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules
+++ b/contrib/distro-packages/debian/openembedded-essential-1.3/debian/rules
diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index c4a9fc0fc3..c2414b8013 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -1,301 +1,746 @@
<?php
-define('DB_FILENAME', './feeds.db');
+define('DB_FILENAME', '/home/angstrom/website/repo/feeds.db');
+$feed_base_url = "http://www.angstrom-distribution.org/unstable/feed/";
$feeds = array(
- array(
- 'distro_name'=>'OpenZaurus',
- 'distro_version'=>'3.5.4',
- 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
- 'feeds'=>array(
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'unstable',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/unstable/feed/',
+ 'feeds'=>
array(
- 'name'=>'base',
- 'url'=>'base',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'opie',
- 'url'=>'opie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'x11',
- 'url'=>'x11',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'upgrades',
- 'url'=>'upgrades',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'perl',
- 'url'=>'perl',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'python',
- 'url'=>'python',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie upgrades',
- 'url'=>'upgrades/machine/collie',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Tosa upgrades',
- 'url'=>'upgrades/machine/tosa',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle upgrades',
- 'url'=>'upgrades/machine/poodle',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle',
- 'url'=>'machine/poodle',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie',
- 'url'=>'machine/collie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Tosa',
- 'url'=>'machine/tosa',
- 'type'=>'normal',
- )
- )
- ),
- array(
- 'distro_name'=>'OpenZaurus',
- 'distro_version'=>'3.5.4.1',
- 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/',
- 'feeds'=>array(
- array(
- 'name'=>'base',
- 'url'=>'base',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'opie',
- 'url'=>'opie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'perl',
- 'url'=>'perl',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'python',
- 'url'=>'python',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'upgrades',
- 'url'=>'upgrades',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'x11',
- 'url'=>'x11',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'C7x0',
- 'url'=>'machine/c7x0',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Spitz',
- 'url'=>'machine/spitz',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Akita',
- 'url'=>'machine/akita',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Akita upgrades',
- 'url'=>'upgrades/machine/akita',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'C7x0 upgrades',
- 'url'=>'upgrades/machine/c7x0',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Spitz upgrades',
- 'url'=>'upgrades/machine/spitz',
- 'type'=>'upgrades',
- )
- )
- )
-);
+ array(
+ 'name'=>'All architectures',
+ 'url'=>'all',
+ ),
+ array(
+ 'name'=>'avr32 base',
+ 'url'=>'avr32/base',
+ ),
+ array(
+ 'name'=>'blackfin base',
+ 'url'=>'blackfin/base',
+ ),
+
+ array(
+ 'name'=>'armv5te base',
+ 'url'=>'armv5te/base',
+ ),
+ array(
+ 'name'=>'iwmmxt base',
+ 'url'=>'iwmmxt/base',
+ ),
+ array(
+ 'name'=>'armv5teb base',
+ 'url'=>'armv5teb/base',
+ ),
+ array(
+ 'name'=>'arm-oabi base',
+ 'url'=>'arm-oabi/base',
+ ),
+
+ array(
+ 'name'=>'i586 base',
+ 'url'=>'i586/base',
+ ),
+ array(
+ 'name'=>'i686 base',
+ 'url'=>'i686/base',
+ ),
+
+ array(
+ 'name'=>'armv4t base',
+ 'url'=>'armv4t/base',
+ ),
+ array(
+ 'name'=>'armv6 base',
+ 'url'=>'armv6/base',
+ ),
+ array(
+ 'name'=>'ppc603e base',
+ 'url'=>'ppc603e/base',
+ ),
+ array(
+ 'name'=>'ppc405 base',
+ 'url'=>'ppc405/base',
+ ),
+
+ array(
+ 'name'=>'armv5te perl',
+ 'url'=>'armv5te/perl',
+ ),
+ array(
+ 'name'=>'armv5te python',
+ 'url'=>'armv5te/python',
+ ),
+ array(
+ 'name'=>'armv5te debug',
+ 'url'=>'armv5te/debug',
+ ),
+ array(
+ 'name'=>'armv5te gstreamer',
+ 'url'=>'armv5te/gstreamer',
+ ),
+ array(
+ 'name'=>'avr32 perl',
+ 'url'=>'avr32/perl',
+ ),
+ array(
+ 'name'=>'avr32 python',
+ 'url'=>'avr32/python',
+ ),
+ array(
+ 'name'=>'avr32 debug',
+ 'url'=>'avr32/debug',
+ ),
+ array(
+ 'name'=>'avr32 gstreamer',
+ 'url'=>'avr32/gstreamer',
+ ),
+
+ array(
+ 'name'=>'blackfin perl',
+ 'url'=>'blackfin/perl',
+ ),
+ array(
+ 'name'=>'blackfin python',
+ 'url'=>'blackfin/python',
+ ),
+ array(
+ 'name'=>'blackfin debug',
+ 'url'=>'blackfin/debug',
+ ),
+ array(
+ 'name'=>'blackfin gstreamer',
+ 'url'=>'blackfin/gstreamer',
+ ),
+ array(
+ 'name'=>'armv4t perl',
+ 'url'=>'armv4t/perl',
+ ),
+ array(
+ 'name'=>'armv4t python',
+ 'url'=>'armv4t/python',
+ ),
+ array(
+ 'name'=>'armv4t debug',
+ 'url'=>'armv4t/debug',
+ ),
+ array(
+ 'name'=>'armv4t gstreamer',
+ 'url'=>'armv4t/gstreamer',
+ ),
+
+ array(
+ 'name'=>'armv6 perl',
+ 'url'=>'armv6/perl',
+ ),
+ array(
+ 'name'=>'armv6 python',
+ 'url'=>'armv6/python',
+ ),
+ array(
+ 'name'=>'armv6 debug',
+ 'url'=>'armv6/debug',
+ ),
+ array(
+ 'name'=>'armv6 gstreamer',
+ 'url'=>'armv6/gstreamer',
+ ),
+
+ array(
+ 'name'=>'i686 perl',
+ 'url'=>'i686/perl',
+ ),
+ array(
+ 'name'=>'i686 python',
+ 'url'=>'i686/python',
+ ),
+ array(
+ 'name'=>'i686 debug',
+ 'url'=>'i686/debug',
+ ),
+ array(
+ 'name'=>'i686 gstreamer',
+ 'url'=>'i686/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc603e perl',
+ 'url'=>'ppc603e/perl',
+ ),
+ array(
+ 'name'=>'ppc603e python',
+ 'url'=>'ppc603e/python',
+ ),
+ array(
+ 'name'=>'ppc603e debug',
+ 'url'=>'ppc603e/debug',
+ ),
+ array(
+ 'name'=>'ppc603e gstreamer',
+ 'url'=>'ppc603e/gstreamer',
+ ),
+
+ array(
+ 'name'=>'Motorola A780',
+ 'url'=>'armv5te/machine/a780',
+ ),
+ array(
+ 'name'=>'HP iPAQ h2200',
+ 'url'=>'armv5te/machine/h2200',
+ ),
+
+ array(
+ 'name'=>'HP iPAQ h4000',
+ 'url'=>'armv5te/machine/h4000',
+ ),
+
+ array(
+ 'name'=>'HTC universal/ iMate jasjar',
+ 'url'=>'armv5te/machine/htcuniversal',
+ ),
+ array(
+ 'name'=>'HP iPAQ hx4700',
+ 'url'=>'armv5te/machine/hx4700',
+ ),
+ array(
+ 'name'=>'HP iPAQ hx2000 series',
+ 'url'=>'armv5te/machine/hx2000',
+ ),
+
+ array(
+ 'name'=>'Psion Teklogix NetBook Pro',
+ 'url'=>'armv5te/machine/netbook-pro',
+ ),
+ array(
+ 'name'=>'HTC Magician',
+ 'url'=>'armv5te/machine/magician',
+ ),
+ array(
+ 'name'=>'Nokia 770 internet tablet',
+ 'url'=>'armv5te/machine/nokia770',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus 5600 (Poodle)',
+ 'url'=>'armv5te/machine/poodle',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus c7x0 (Corgi, Boxer, Husky, Shepher)',
+ 'url'=>'armv5te/machine/c7x0',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C1000 (akita)',
+ 'url'=>'armv5te/machine/akita',
+ ),
+ array(
+ 'name'=>'HP iPAQ h5xxx series',
+ 'url'=>'armv5te/machine/h5xxx',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C6000 (Tosa)',
+ 'url'=>'armv5te/machine/tosa',
+ ),
+ array(
+ 'name'=>'Sharp Zaurus SL-C3xxx (Spitz, Borzoi, Terrier)',
+ 'url'=>'armv5te/machine/spitz',
+ ),
+ array(
+ 'name'=>'Cirrus Logic ep93xx boards',
+ 'url'=>'armv4t/machine/ep93xx',
+ ),
+ array(
+ 'name'=>'FIC gta01/Neo1973 phone',
+ 'url'=>'armv4t/machine/fic-gta01',
+ ),
+ array(
+ 'name'=>'HP iPAQ h6300',
+ 'url'=>'armv4t/machine/h6300',
+ ),
+ array(
+ 'name'=>'Freescale i.mx31 ADS development board',
+ 'url'=>'armv6/machine/mx31ads',
+ ),
-$ipkpath = "/var/www/angstrom/unstable/feed/unsorted";
-$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc');
-$device_archs = array(
- "a1200" => "armv5te",
- "a780"=> "armv5te",
- "acern30",
- "adsp-bf537-stamp" => "bfin",
- "adzs-bf538f-ezlite" => "bfin",
- "akita" => "armv5te",
- "alix",
- "amsdelta",
- "asus620",
- "asus730",
- "at32stk1000" => "avr32",
- "at91sam9260ek" => "armv5te",
- "at91sam9261ek" => "armv5te",
- "at91sam9263ek" => "armv5te",
- "atngw100" => "avr32",
- "aximx50" => "armv5te",
- "aximx50v" => "armv5te",
- "borzoi" => "armv5te",
- "boxer" => "armv5te",
- "c7x0" => "armv5te",
- "colinux",
- "collie",
- "compulab-pxa270" => "armv5te",
- "corgi" => "armv5te",
- "davinci-dvevm",
- "db1200",
- "devkitidp-pxa255" => "armv5te",
- "dht-walnut" => "ppc405",
- "e680" => "armv5te",
- "efika" => "ppc603e",
- "ep93xx" => "armv4t",
- "epia",
- "er0100" => "armv5te",
- "eteng500" => "armv5te",
- "fic-gta01" => "armv4t",
- "fic-gta02" => "armv4t",
- "fsg3be",
- "geodegx",
- "geodelx",
- "guinness",
- "gumstix-connex" => "armv5te",
- "gumstix-verdex" => "armv5te",
- "h1910",
- "h1940",
- "h2200" => "armv5te",
- "h3600" => "arm-oabi",
- "h3800" => "arm-oabi",
- "h3900" => "armv5te",
- "h4000" => "armv5te",
- "h5000" => "armv5te",
- "h6300" => "armv4t",
- "htcalpine",
- "htcapache",
- "htcblueangel",
- "htchimalaya",
- "htcsable",
- "htctornado",
- "htcuniversal" => "armv5te",
- "htcwallaby",
- "husky" => "armv5te",
- "hx2000" => "armv5te",
- "hx4700" => "armv5te",
- "i586-generic" => "i586",
- "i686-generic" => "i586",
- "ixp4xx",
- "ixp4xxbe" => "armv5teb",
- "ixp4xxle" => "armv5te",
- "jornada56x",
- "jornada6xx",
- "jornada7xx",
- "kb9202" => "armv4t",
- "ks8695",
- "lite5200",
- "logicpd-pxa270" => "armv5te",
- "looxc550",
- "lsarm",
- "lsppchd",
- "lsppchg",
- "magicbox",
- "magician" => "armv5te",
- "mainstone" => "armv5te",
- "mnci",
- "mtx-1",
- "mtx-2",
- "mtx-3",
- "mtx-3a",
- "mx21ads" => "armv5te",
- "mx31ads" => "armv6",
- "n2100",
- "native",
- "navman-icn330",
- "netbook-pro" => "armv5te",
- "netvista",
- "nokia770" => "armv5te",
- "nokia800",
- "nslu2" => "armv5te",
- "nslu2be" => "armv5teb",
- "nslu2le" => "armv5te",
- "omap1510inn" => "armv5te",
- "omap1610h2" => "armv5te",
- "omap1710h3" => "armv5te",
- "omap2420h4",
- "omap2430sdp",
- "omap5912osk" => "armv5te",
- "palmld" => "armv5te",
- "palmt650" => "armv5te",
- "palmt680",
- "palmtc",
- "palmtt",
- "palmtt2",
- "palmtt3",
- "palmtt5",
- "palmtx",
- "palmz31",
- "palmz71",
- "palmz72",
- "poodle" => "armv5te",
- "progear",
- "qemuarm" => "armv5te",
- "qemux86",
- "rb500",
- "rokre2" => "armv5te",
- "rokre6" => "armv5te",
- "rt3000",
- "rx1950",
- "rx3000",
- "sarge-at91" => "armv4t",
- "sequoia",
- "shark" => "arm-oabi",
- "shepherd" => "armv5te",
- "simpad" => "arm-oabi",
- "smdk2440" => "armv4t",
- "smdk2443" => "armv4t",
- "spitz" => "armv5te",
- "storcenter",
- "sun4cdm",
- "terrier" => "armv5te",
- "titan",
- "tosa" => "armv5te",
- "triton",
- "ts72xx",
- "turbostation",
- "wgt634u",
- "wl500g",
- "wrap",
- "wrt54",
- "x86-32-nocona",
- "x86-prescott",
- "x86-uml",
- "x86",
- "xilinx-ml403",
- "xilinx-ml410",
- "xxs1500",
- );
+ array(
+ 'name'=>'Tyan thunder K7 s2462 mainboard (guinness)',
+ 'url'=>'i686/machine/guinness',
+ ),
+ array(
+ 'name'=>'Progear webpad',
+ 'url'=>'i686/machine/progear',
+ ),
+ array(
+ 'name'=>'Genesi Efika',
+ 'url'=>'ppc603e/machine/efika',
+ ),
-?>
+ )// end distro[feeds]
+ ), //end distro
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'2007.12',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2007/ipk/glibc/',
+ 'feeds'=>
+ array(
+ array(
+ 'name'=>'noarch feed',
+ 'url'=>'all',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture base feed',
+ 'url'=>'arm-oabi/base',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture gstreamer feed',
+ 'url'=>'arm-oabi/gstreamer',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture perl feed',
+ 'url'=>'arm-oabi/perl',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture python feed',
+ 'url'=>'arm-oabi/python',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture debug feed',
+ 'url'=>'arm-oabi/debug',
+ ),
+ array(
+ 'name'=>'armv4t architecture base feed',
+ 'url'=>'armv4t/base',
+ ),
+ array(
+ 'name'=>'armv4t architecture gstreamer feed',
+ 'url'=>'armv4t/gstreamer',
+ ),
+ array(
+ 'name'=>'armv4t architecture perl feed',
+ 'url'=>'armv4t/perl',
+ ),
+ array(
+ 'name'=>'armv4t architecture python feed',
+ 'url'=>'armv4t/python',
+ ),
+ array(
+ 'name'=>'armv4t architecture debug feed',
+ 'url'=>'armv4t/debug',
+ ),
+ array(
+ 'name'=>'armv5te architecture base feed',
+ 'url'=>'armv5te/base',
+ ),
+ array(
+ 'name'=>'armv5te architecture gstreamer feed',
+ 'url'=>'armv5te/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5te architecture perl feed',
+ 'url'=>'armv5te/perl',
+ ),
+ array(
+ 'name'=>'armv5te architecture python feed',
+ 'url'=>'armv5te/python',
+ ),
+ array(
+ 'name'=>'armv5te architecture debug feed',
+ 'url'=>'armv5te/debug',
+ ),
+ array(
+ 'name'=>'armv5teb architecture base feed',
+ 'url'=>'armv5teb/base',
+ ),
+ array(
+ 'name'=>'armv5teb architecture gstreamer feed',
+ 'url'=>'armv5teb/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5teb architecture perl feed',
+ 'url'=>'armv5teb/perl',
+ ),
+ array(
+ 'name'=>'armv5teb architecture python feed',
+ 'url'=>'armv5teb/python',
+ ),
+ array(
+ 'name'=>'armv5teb architecture debug feed',
+ 'url'=>'armv5teb/debug',
+ ),
+ array(
+ 'name'=>'armv6 architecture base feed',
+ 'url'=>'armv6/base',
+ ),
+ array(
+ 'name'=>'armv6 architecture gstreamer feed',
+ 'url'=>'armv6/gstreamer',
+ ),
+ array(
+ 'name'=>'armv6 architecture perl feed',
+ 'url'=>'armv6/perl',
+ ),
+ array(
+ 'name'=>'armv6 architecture python feed',
+ 'url'=>'armv6/python',
+ ),
+ array(
+ 'name'=>'armv6 architecture debug feed',
+ 'url'=>'armv6/debug',
+ ),
+ array(
+ 'name'=>'i486 architecture base feed',
+ 'url'=>'i486/base',
+ ),
+ array(
+ 'name'=>'i486 architecture gstreamer feed',
+ 'url'=>'i486/gstreamer',
+ ),
+ array(
+ 'name'=>'i486 architecture perl feed',
+ 'url'=>'i486/perl',
+ ),
+ array(
+ 'name'=>'i486 architecture python feed',
+ 'url'=>'i486/python',
+ ),
+ array(
+ 'name'=>'i486 architecture debug feed',
+ 'url'=>'i486/debug',
+ ),
+ array(
+ 'name'=>'i586 architecture base feed',
+ 'url'=>'i586/base',
+ ),
+ array(
+ 'name'=>'i586 architecture gstreamer feed',
+ 'url'=>'i586/gstreamer',
+ ),
+ array(
+ 'name'=>'i586 architecture perl feed',
+ 'url'=>'i586/perl',
+ ),
+ array(
+ 'name'=>'i586 architecture python feed',
+ 'url'=>'i586/python',
+ ),
+ array(
+ 'name'=>'i586 architecture debug feed',
+ 'url'=>'i586/debug',
+ ),
+ array(
+ 'name'=>'i686 architecture base feed',
+ 'url'=>'i686/base',
+ ),
+ array(
+ 'name'=>'i686 architecture gstreamer feed',
+ 'url'=>'i686/gstreamer',
+ ),
+ array(
+ 'name'=>'i686 architecture perl feed',
+ 'url'=>'i686/perl',
+ ),
+ array(
+ 'name'=>'i686 architecture python feed',
+ 'url'=>'i686/python',
+ ),
+ array(
+ 'name'=>'i686 architecture debug feed',
+ 'url'=>'i686/debug',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture base feed',
+ 'url'=>'iwmmxt/base',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture gstreamer feed',
+ 'url'=>'iwmmxt/gstreamer',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture perl feed',
+ 'url'=>'iwmmxt/perl',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture python feed',
+ 'url'=>'iwmmxt/python',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture debug feed',
+ 'url'=>'iwmmxt/debug',
+ ),
+ array(
+ 'name'=>'ppc405 architecture base feed',
+ 'url'=>'ppc405/base',
+ ),
+ array(
+ 'name'=>'ppc405 architecture gstreamer feed',
+ 'url'=>'ppc405/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc405 architecture perl feed',
+ 'url'=>'ppc405/perl',
+ ),
+ array(
+ 'name'=>'ppc405 architecture python feed',
+ 'url'=>'ppc405/python',
+ ),
+ array(
+ 'name'=>'ppc405 architecture debug feed',
+ 'url'=>'ppc405/debug',
+ ),
+ array(
+ 'name'=>'ppc603e architecture base feed',
+ 'url'=>'ppc603e/base',
+ ),
+ array(
+ 'name'=>'ppc603e architecture gstreamer feed',
+ 'url'=>'ppc603e/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc603e architecture perl feed',
+ 'url'=>'ppc603e/perl',
+ ),
+ array(
+ 'name'=>'ppc603e architecture python feed',
+ 'url'=>'ppc603e/python',
+ ),
+ array(
+ 'name'=>'ppc603e architecture debug feed',
+ 'url'=>'ppc603e/debug',
+ )
+ ) // end distro['feeds']
+ ), //end distro
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'2008.6',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/ipk/glibc/',
+ 'feeds'=>
+ array(
+ array(
+ 'name'=>'noarch feed',
+ 'url'=>'all',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture base feed',
+ 'url'=>'arm-oabi/base',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture gstreamer feed',
+ 'url'=>'arm-oabi/gstreamer',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture perl feed',
+ 'url'=>'arm-oabi/perl',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture python feed',
+ 'url'=>'arm-oabi/python',
+ ),
+ array(
+ 'name'=>'arm-oabi architecture debug feed',
+ 'url'=>'arm-oabi/debug',
+ ),
+ array(
+ 'name'=>'armv4t architecture base feed',
+ 'url'=>'armv4t/base',
+ ),
+ array(
+ 'name'=>'armv4t architecture gstreamer feed',
+ 'url'=>'armv4t/gstreamer',
+ ),
+ array(
+ 'name'=>'armv4t architecture perl feed',
+ 'url'=>'armv4t/perl',
+ ),
+ array(
+ 'name'=>'armv4t architecture python feed',
+ 'url'=>'armv4t/python',
+ ),
+ array(
+ 'name'=>'armv4t architecture debug feed',
+ 'url'=>'armv4t/debug',
+ ),
+ array(
+ 'name'=>'armv5te architecture base feed',
+ 'url'=>'armv5te/base',
+ ),
+ array(
+ 'name'=>'armv5te architecture gstreamer feed',
+ 'url'=>'armv5te/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5te architecture perl feed',
+ 'url'=>'armv5te/perl',
+ ),
+ array(
+ 'name'=>'armv5te architecture python feed',
+ 'url'=>'armv5te/python',
+ ),
+ array(
+ 'name'=>'armv5te architecture debug feed',
+ 'url'=>'armv5te/debug',
+ ),
+ array(
+ 'name'=>'armv5teb architecture base feed',
+ 'url'=>'armv5teb/base',
+ ),
+ array(
+ 'name'=>'armv5teb architecture gstreamer feed',
+ 'url'=>'armv5teb/gstreamer',
+ ),
+ array(
+ 'name'=>'armv5teb architecture perl feed',
+ 'url'=>'armv5teb/perl',
+ ),
+ array(
+ 'name'=>'armv5teb architecture python feed',
+ 'url'=>'armv5teb/python',
+ ),
+ array(
+ 'name'=>'armv5teb architecture debug feed',
+ 'url'=>'armv5teb/debug',
+ ),
+ array(
+ 'name'=>'armv6 architecture base feed',
+ 'url'=>'armv6/base',
+ ),
+ array(
+ 'name'=>'armv6 architecture gstreamer feed',
+ 'url'=>'armv6/gstreamer',
+ ),
+ array(
+ 'name'=>'armv6 architecture perl feed',
+ 'url'=>'armv6/perl',
+ ),
+ array(
+ 'name'=>'armv6 architecture python feed',
+ 'url'=>'armv6/python',
+ ),
+ array(
+ 'name'=>'armv6 architecture debug feed',
+ 'url'=>'armv6/debug',
+ ),
+ array(
+ 'name'=>'i486 architecture base feed',
+ 'url'=>'i486/base',
+ ),
+ array(
+ 'name'=>'i486 architecture gstreamer feed',
+ 'url'=>'i486/gstreamer',
+ ),
+ array(
+ 'name'=>'i486 architecture perl feed',
+ 'url'=>'i486/perl',
+ ),
+ array(
+ 'name'=>'i486 architecture python feed',
+ 'url'=>'i486/python',
+ ),
+ array(
+ 'name'=>'i486 architecture debug feed',
+ 'url'=>'i486/debug',
+ ),
+ array(
+ 'name'=>'i586 architecture base feed',
+ 'url'=>'i586/base',
+ ),
+ array(
+ 'name'=>'i586 architecture gstreamer feed',
+ 'url'=>'i586/gstreamer',
+ ),
+ array(
+ 'name'=>'i586 architecture perl feed',
+ 'url'=>'i586/perl',
+ ),
+ array(
+ 'name'=>'i586 architecture python feed',
+ 'url'=>'i586/python',
+ ),
+ array(
+ 'name'=>'i586 architecture debug feed',
+ 'url'=>'i586/debug',
+ ),
+ array(
+ 'name'=>'i686 architecture base feed',
+ 'url'=>'i686/base',
+ ),
+ array(
+ 'name'=>'i686 architecture gstreamer feed',
+ 'url'=>'i686/gstreamer',
+ ),
+ array(
+ 'name'=>'i686 architecture perl feed',
+ 'url'=>'i686/perl',
+ ),
+ array(
+ 'name'=>'i686 architecture python feed',
+ 'url'=>'i686/python',
+ ),
+ array(
+ 'name'=>'i686 architecture debug feed',
+ 'url'=>'i686/debug',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture base feed',
+ 'url'=>'iwmmxt/base',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture gstreamer feed',
+ 'url'=>'iwmmxt/gstreamer',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture perl feed',
+ 'url'=>'iwmmxt/perl',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture python feed',
+ 'url'=>'iwmmxt/python',
+ ),
+ array(
+ 'name'=>'iwmmxt architecture debug feed',
+ 'url'=>'iwmmxt/debug',
+ ),
+ array(
+ 'name'=>'ppc405 architecture base feed',
+ 'url'=>'ppc405/base',
+ ),
+ array(
+ 'name'=>'ppc405 architecture gstreamer feed',
+ 'url'=>'ppc405/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc405 architecture perl feed',
+ 'url'=>'ppc405/perl',
+ ),
+ array(
+ 'name'=>'ppc405 architecture python feed',
+ 'url'=>'ppc405/python',
+ ),
+ array(
+ 'name'=>'ppc405 architecture debug feed',
+ 'url'=>'ppc405/debug',
+ ),
+ array(
+ 'name'=>'ppc603e architecture base feed',
+ 'url'=>'ppc603e/base',
+ ),
+ array(
+ 'name'=>'ppc603e architecture gstreamer feed',
+ 'url'=>'ppc603e/gstreamer',
+ ),
+ array(
+ 'name'=>'ppc603e architecture perl feed',
+ 'url'=>'ppc603e/perl',
+ ),
+ array(
+ 'name'=>'ppc603e architecture python feed',
+ 'url'=>'ppc603e/python',
+ ),
+ array(
+ 'name'=>'ppc603e architecture debug feed',
+ 'url'=>'ppc603e/debug',
+ )
+ )// end distro[feeds]s
+ )// end distro
+ ); //end $feeds
+?>
diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php
index 53317ebb03..98751ea26c 100644
--- a/contrib/feed-browser/update.php
+++ b/contrib/feed-browser/update.php
@@ -46,9 +46,15 @@ if(!check_database())
$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
-if($argc > 1 AND $argv[1] == 'upgrades')
+if($argc == 2)
{
- $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'");
+ $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_uri = '${argv[1]}'");
+} else if ($argc == 3 && $argv[1] == "--type") {
+ $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = '${argv[2]}'");
+}
+
+if (!$feeds) {
+ die("Cannot find feed(s) in the DB\n");
}
$start = time();
diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh
index 416d393ccd..15d2722a8b 100755
--- a/contrib/mtn2cl/mtn2cl.sh
+++ b/contrib/mtn2cl/mtn2cl.sh
@@ -11,7 +11,7 @@ else
export OLD_REV="l:\"1 week ago\""
fi
-for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
+for i in `mtn log --brief --no-graph --no-merges --to "${OLD_REV}" --from "${REV_NOW}"| awk '{print $2 ":" $1}'` ; do \
export REV=`echo $i | awk -F: '{print $2}'`
export AUTHOR=`echo $i | awk -F: '{print $1}'`
export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : ' '{ print $2 }'`
diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py
index cda4f39fca..1de3010756 100755
--- a/contrib/mtn2git/mtn2git.py
+++ b/contrib/mtn2git/mtn2git.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
- Copyright (C) 2006, 2007 Holger Hans Peter Freyther
+ Copyright (C) 2006, 2007, 2008 Holger Hans Peter Freyther
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -27,18 +27,6 @@
# -tag handling
# -work with n-merges
#
-# DISCUSSION:
-# -For some reason the get_revision information might be inaccurate
-# and I should consider just comparing the manifests.
-# I would use the manifests of the parents and consider all files deleted
-# and then remove every dir/file that is inside the new manifest from this
-# list.
-# Benefits:
-# - 1:1 match of the manifest regardles of get_revision information
-# - Renaming is handled by git anyway
-# Downsides:
-# - The size of the import will grow.
-#
import mtn
import os
@@ -48,6 +36,17 @@ import email.Utils
import status
+# Interesting revisions:
+# Rename with dest==src: 24cba5923360fef7c5cc81d51000e30b90355eb9
+# Recursive rename: fca159c5c00ae4158c289f5aabce995378d4e41b
+# Delete+Rename: 91da98265a39c93946e00adf5d7bf92b341de847
+#
+#
+#
+
+# Our manifest/tree fifo construct
+cached_tree = {}
+cached_fifo = []
def get_mark(revision):
"""
@@ -104,21 +103,6 @@ def reset_git(ops, revision):
cmd += [""]
print "\n".join(cmd)
-def filter_renamed(manifest, renamed):
- """
- If we base from a revision that has already done
- the move, git-fast-import will complain that the file
- has been already moved
- """
- if len(renamed) == 0:
- return renamed
-
- for line in manifest:
- if line[0] == "file":
- renamed = filter(lambda (to,from_,manifest): to != line[1], renamed)
-
- return renamed
-
def get_git_date(revision):
"""
Convert the "date" cert of monotone to a time understandable by git. No timezone
@@ -127,135 +111,90 @@ def get_git_date(revision):
dt = datetime.datetime.strptime(revision["date"], "%Y-%m-%dT%H:%M:%S").strftime("%a, %d %b %Y %H:%M:%S +0000")
return dt
-def recursively_delete(ops, manifest, revision, dir_name, to_delete):
- """
- Recursively delete all files that dir_name inside the name
- """
- for line in manifest:
- if line[0] == "dir" or line[0] == "file":
- if line[1].startswith(dir_name):
- print >> sys.stderr, "Deleting '%s'" % line[1]
- to_delete.add((line[1], revision))
- elif line[0] in ["format_version"]:
- assert(line[1] == "1")
- else:
- print >> sys.stderr, line[0]
- assert(False)
+def is_executable_attribute_set(attributes, rev):
+ assert(len(attributes) % 3 == 0), rev
- return to_delete
+ if len(attributes) >= 3:
+ for i in range(0, len(attributes)%3+1):
+ if attributes[i] == "attr" and attributes[i+1] == "mtn:execute" and attributes[i+2] == "true":
+ return True
+ return False
-def recursively_rename(ops, manifest, revision, old_name, new_name, to_add_dirs, to_add_files, to_remove_items, files_deleted, files_sticky):
- """
- mtn has a rename command and can rename entrie directories. For git we will have to do the recursive renaming
- ourselves. Basicly we will get all files and replace old_name with new_name but only:
- If the file of the old_manifest is not in our to be deleted list
- """
- old_dir = old_name + "/"
- for line in manifest:
- if line[1].startswith(old_dir) or line[1] == old_name:
- already_handled = False
- for (deleted,_) in files_deleted:
- if line[1] == deleted:
- already_handled = True
- break
-
- # Don't rename files that should be in the same directory
- if line[1] in files_sticky:
- already_handled = True
-
- if already_handled:
- pass
- elif line[0] == "file":
- print >> sys.stderr, "Will add '%s' old: '%s' new: '%s' => result: '%s'" % (line[1], old_name, new_name, line[1].replace(old_name, new_name, 1))
- to_add_files.add((line[1].replace(old_name, new_name, 1), None, revision))
- elif line[0] == "dir":
- to_add_dirs.add((line[1].replace(old_name, new_name, 1), revision))
- elif line[0] in ["format_version"]:
- assert(line[1] == "1")
- else:
- print >> sys.stderr, line[0]
- assert(False)
-
- return (to_add_files, to_add_dirs)
+def build_tree(manifest, rev):
+ """Assemble a filesystem tree from a given manifest"""
-#
-# We need to recursively rename the directories. Now the difficult part is to undo certain operations.
-#
-# e.g we rename the whole dir and then rename a file back. We could revive a directory that was marked
-# for deletion.
-#
-# rename "weird/two/three"
-# to "unweird/four"
-#
-# rename "weird/two/three/four"
-# to "weird/two/three"
-#
-# Here we would schedule weird/two/three for deletion but then revive it again. So three does not
-# get copied to unweird/four/three
-# """
-def recursively_rename_directories(ops, manifests, rename_commands, files_deleted, files_moved_sticky):
- to_add_directories = set()
- to_add_files = set()
- to_remove_items = set()
-
- for (old_name, new_name, old_revision) in rename_commands:
- # Check if we have the above case and rename a more specific directory
- # and then we will alter the result...
- inner_rename = False
- for (other_old_name, other_new_name, other_rev) in rename_commands:
- if old_name.startswith(other_old_name + "/") and other_old_name != old_name:
- inner_rename = True
- print >> sys.stderr, "Inner rename detected", old_name, other_old_name
- # Fixup the renaming
- def rename(filename, filerev, rev, would_be_new_name):
- if filename.startswith(would_be_new_name + "/"):
- return filename.replace(would_be_new_name, new_name, 1), filerev, rev
- return filename, filerev, rev
-
- would_be_new_name = other_new_name + "/" + old_name[len(other_old_name)+1:]
- to_remove_items = set(filter(lambda (item,_): item != new_name, to_remove_items))
- to_add_directories = set(filter(lambda (item,_): item != would_be_new_name, to_add_directories))
- to_add_directories.add((new_name, old_revision))
- to_add_files = set(map(lambda (fn, fr, r): rename(fn, fr, r, would_be_new_name), to_add_files))
-
- if not inner_rename:
- to_remove_items.add((old_name, old_revision))
- recursively_delete(ops, manifests[old_revision], old_revision, old_name + "/", to_remove_items)
- recursively_rename(ops, manifests[old_revision], old_revision, old_name, new_name, to_add_directories, to_add_files, to_remove_items, files_deleted, files_moved_sticky)
-
- return (to_add_directories, to_add_files, to_remove_items)
-
-
-def build_tree(manifest):
- dirs = {}
- files = {}
+ class tree:
+ def __init__(self):
+ self.dirs = {}
+ self.files= {}
+
+ tree = tree()
for line in manifest:
if line[0] == "file":
- files[line[1]] = (line[3],line[4:])
+ tree.files[line[1]] = (line[3], is_executable_attribute_set(line[4:], rev))
elif line[0] == "dir":
- dirs[line[1]] = 1
+ tree.dirs[line[1]] = 1
elif line[0] != "format_version":
- print >> sys.stderr, line[0]
- assert(False)
- return (dirs,files)
+ assert(False), "Rev: %s: Line[0]: '%s'" % (rev, line[0])
-def compare_with_manifest(all_added, all_modified, all_deleted, new_manifest, old_manifests):
- """
- Sanity check that the difference between the old and the new manifest is the one
- we have in all_added, all_modified, all_deleted
- """
- old_trees = {}
- really_added = {}
- really_modified = {}
- really_removed = {}
+ return tree
+
+def get_and_cache_tree(ops, revision):
+ """Simple FIFO to cache a number of trees"""
+ global cached_tree, cached_fifo
+
+ if revision in cached_tree:
+ return cached_tree[revision]
- current_dirs, current_files = build_tree(new_manifest)
+ tree = build_tree([line for line in ops.get_manifest_of(revision)], revision)
+ cached_tree[revision] = tree
+ cached_fifo.append(revision)
+
+ # Shrink
+ if len(cached_fifo) > 100:
+ old_name = cached_fifo[0]
+ cached_fifo = cached_fifo[1:]
+ del cached_tree[old_name]
+
+ return tree
+
+def diff_manifest(old_tree, new_tree):
+ """Find additions, modifications and deletions"""
+ added = set()
+ modified = set()
+ deleted = set()
+
+ # Removed dirs
+ for dir in old_tree.dirs.keys():
+ if not dir in new_tree.dirs:
+ deleted.add((dir,True))
+
+ # New dirs
+ for dir in new_tree.dirs.keys():
+ if not dir in old_tree.dirs:
+ added.add(dir)
+
+ # Deleted files
+ for file in old_tree.files.keys():
+ if not file in new_tree.files:
+ deleted.add((file,False))
+
+ # Added files, goes to modifications
+ for file in new_tree.files.keys():
+ if not file in old_tree.files:
+ modified.add((file, new_tree.files[file][0]))
+ continue
+
+ # The file changed, either contents or executable attribute
+ old = old_tree.files[file]
+ new = new_tree.files[file]
+ if old != new:
+ modified.add((file, new_tree.files[file][0]))
+
- for parent in old_manifests.keys():
- old_trees[parent] = build_tree(old_manifests[parent])
+ return (added, modified, deleted)
- print >> sys.stderr, len(old_manifests)
def fast_import(ops, revision):
"""Import a revision into git using git-fast-import.
@@ -292,27 +231,28 @@ def fast_import(ops, revision):
return
# Use the manifest to find dirs and files
- manifest = [line for line in ops.get_manifest_of(revision["revision"])]
- manifests = {}
- dirs = {}
- for parent in revision["parent"]:
- manifests[parent] = [line for line in ops.get_manifest_of(parent)]
- for line in manifests[parent]:
- if line[0] == "dir":
- if not parent in dirs:
- dirs[parent] = {}
- dirs[parent][line[1]] = 1
+ current_tree = get_and_cache_tree(ops, revision["revision"])
- # We can not just change the mode of a file but we need to modifiy the whole file. We
- # will simply add it to the modified list and ask to retrieve the status from the manifest
- for (file, attribute, value, rev) in revision["set_attributes"]:
- if attribute == "mtn:execute":
- revision["modified"].append((file, None, rev))
- for (file, attribute, rev) in revision["clear_attributes"]:
- if attribute == "mtn:execute":
- revision["modified"].append((file, None, rev))
+ all_added = set()
+ all_modifications = set()
+ all_deleted = set()
+
+ # Now diff the manifests
+ for parent in revision["parent"]:
+ (added, modified, deleted) = diff_manifest(get_and_cache_tree(ops, parent), current_tree)
+ all_added = all_added.union(added)
+ all_modifications = all_modifications.union(modified)
+ all_deleted = all_deleted.union(deleted)
+ if len(revision["parent"]) == 0:
+ (added, modified, deleted) = diff_manifest(build_tree([],""), current_tree)
+ all_added = all_added.union(added)
+ all_modifications = all_modifications.union(modified)
+ all_deleted = all_deleted.union(deleted)
+ # TODO:
+ # Readd the sanity check to see if we deleted and modified an entry. This
+ # could probably happen if we have more than one parent (on a merge)?
cmd = []
cmd += ["commit refs/heads/%s" % branch]
@@ -322,97 +262,28 @@ def fast_import(ops, revision):
cmd += ["data %d" % len(revision["changelog"])]
cmd += ["%s" % revision["changelog"]]
- # Emulation for renaming. We will split them into two lists
- file_renamed_del = set()
- file_renamed_new = set()
- file_moved_sticky = set()
-
if len(revision["parent"]) != 0:
cmd += ["from :%s" % get_mark(revision["parent"][0])]
- renamed = revision["renamed"]
-
- to_rename_directories = []
- for (new_name, old_name, old_revision) in renamed:
- # 24cba5923360fef7c5cc81d51000e30b90355eb9 is a rev where src == dest but the
- # directory got renamed, so this means this file got added to the new directory
- # TODO, XXX, FIXME check if this can be done for directories as well
- if new_name == old_name and not old_name in dirs[old_revision]:
- print >> sys.stderr, "Bogus rename in %s (%s, %s)?" % (revision["revision"], new_name, old_name)
- file_moved_sticky.add(old_name)
-
- # Check if the old_name was a directory in the old manifest
- # If we rename a directory we will need to recursively remove and recursively
- # add...
- # Add the '/' otherwise we might rename the wrong directory which shares the
- # same prefix.
- # fca159c5c00ae4158c289f5aabce995378d4e41b is quite funny. It renames a directory
- # and then renames another directory within the renamed one and in the worse case
- # we will revive a deleted directory, file...
- elif old_name in dirs[old_revision]:
- print >> sys.stderr, "Detected directory rename '%s' => '%s'" % (old_name, new_name)
- assert(old_revision in manifests)
- to_rename_directories.append((old_name, new_name, old_revision))
- else:
- print >> sys.stderr, "Renaming %s => %s" % (old_name, new_name)
- file_renamed_new.add((new_name, None, revision["revision"]))
- file_renamed_del.add((old_name, old_revision))
# The first parent is our from.
for parent in revision["parent"][1:]:
cmd += ["merge :%s" % get_mark(parent)]
- # Do the renaming now
- (renamed_dirs, renamed_new, renamed_old) = recursively_rename_directories(ops, manifests, to_rename_directories, file_renamed_del.union(set(revision["removed"])), file_moved_sticky)
-
- # Sanity check, don't remove anything we modify
- all_added = set(revision["added_dirs"]).union(renamed_dirs)
- all_modifications = set(revision["modified"]).union(set(revision["added_files"])).union(renamed_new).union(file_renamed_new)
- all_deleted = set(revision["removed"]).union(renamed_old).union(file_renamed_del)
- all_deleted_new = all_deleted
-
- # Check if we delete and add at the same time
- for (deleted,rev) in all_deleted:
- for (added,_) in all_added:
- if added == deleted:
- print >> sys.stderr, "Added and Deleted", added, deleted
- all_deleted_new = set(filter(lambda (dele,_): dele != added, all_deleted_new))
- assert((added,rev) not in all_deleted_new)
-
- for (modified,_,_) in all_modifications:
- if modified == deleted:
- print >> sys.stderr, "Modified and Deleted", modified, deleted
- all_deleted_new = set(filter(lambda (dele,_): dele != modified, all_deleted_new))
- assert((modified,rev) not in all_deleted_new)
-
- # Filtered list of to be deleted items
- all_deleted = all_deleted_new
- # Check if we delete but the manifest has a file like this
- for line in manifest:
- if line[0] == "dir" or line[0] == "file":
- for (deleted,rev) in all_deleted:
- if line[1] == deleted:
- # 91da98265a39c93946e00adf5d7bf92b341de847 of mtn has a delete + rename
- print >> sys.stderr, "Trying to delete a file which is in the new manifest", line[1], deleted
- assert(False)
-
- compare_with_manifest(all_added, all_modifications, all_deleted, manifest, manifests)
-
- for (dir_name, rev) in all_added:
+ for dir_name in all_added:
cmd += ["M 644 inline %s" % os.path.join(dir_name, ".mtn2git_empty")]
cmd += ["data <<EOF"]
cmd += ["EOF"]
cmd += [""]
- for (file_name, file_revision, rev) in all_modifications:
- (mode, file) = get_file_and_mode(ops, manifest, file_name, file_revision, revision["revision"])
+ for (file_name, file_revision) in all_modifications:
+ (mode, file) = get_file_and_mode(ops, current_tree, file_name, file_revision, revision["revision"])
cmd += ["M %d inline %s" % (mode, file_name)]
cmd += ["data %d" % len(file)]
cmd += ["%s" % file]
- for (path, rev) in all_deleted:
- assert(rev in dirs)
- if path in dirs[rev]:
+ for (path, is_dir) in all_deleted:
+ if is_dir:
cmd += ["D %s" % os.path.join(path, ".mtn2git_empty")]
else:
cmd += ["D %s" % path]
@@ -428,33 +299,20 @@ def is_trusted(operations, revision):
return False
return True
-def get_file_and_mode(operations, manifest, file_name, _file_revision, rev = None):
- mode = 644
+def get_file_and_mode(operations, file_tree, file_name, _file_revision, rev = None):
+ assert file_name in file_tree.files, "get_file_and_mode: Revision '%s', file_name='%s' " % (rev, file_name)
- file_revision = None
- for line in manifest:
- if line[0] == "file" and line[1] == file_name:
- assert(line[1] == file_name)
- assert(line[2] == "content")
-
- if _file_revision:
- assert(line[3] == _file_revision)
- file_revision = line[3]
-
- attributes = line[4:]
- assert(len(attributes) % 3 == 0)
- if len(attributes) >= 3:
- for i in range(0, len(attributes)%3+1):
- if attributes[i] == "attr" and attributes[i+1] == "mtn:execute" and attributes[i+2] == "true":
- mode = 755
- break
+ (file_revision, executable) = file_tree.files[file_name]
+ if _file_revision:
+ assert _file_revision == file_revision, "Same filerevision for file_name='%s' in rev='%s' (%s,%s)" % (file_name, rev, file_revision, _file_revision)
- assert(file_revision)
- file = "".join([file for file in operations.get_file(file_revision)])
- return (mode, file)
+ if executable:
+ mode = 755
+ else:
+ mode = 644
- print >> sys.stderr, file_name, rev
- assert(False)
+ file = "".join([file for file in operations.get_file(file_revision)])
+ return (mode, file)
def parse_revision(operations, revision):
@@ -491,20 +349,12 @@ def parse_revision(operations, revision):
old_rev = line[1]
elif line[0] == "new_manifest":
revision_description["manifest"] = line[1]
- elif line[0] == "rename":
- revision_description["renamed"].append((line[3], line[1], old_rev))
- elif line[0] == "patch":
- revision_description["modified"].append((line[1], line[5], old_rev))
- elif line[0] == "delete":
- revision_description["removed"].append((line[1], old_rev))
- elif line[0] == "add_dir":
- revision_description["added_dirs"].append((line[1], old_rev))
- elif line[0] == "add_file":
- revision_description["added_files"].append((line[1], line[3], old_rev))
elif line[0] == "clear":
revision_description["clear_attributes"].append((line[1], line[3], old_rev))
elif line[0] == "set":
revision_description["set_attributes"].append((line[1], line[3], line[5], old_rev))
+ elif line[0] in ["rename", "patch", "delete", "add_dir", "add_file"]:
+ pass
else:
print >> sys.stderr, line
assert(False)
@@ -519,7 +369,7 @@ def parse_revision(operations, revision):
revision_description["committer"] = cert[1]
else:
print >> sys.stderr, "Unknown Cert: Ignoring", cert[5], cert[7]
- assert(False)
+ #assert(False)
return revision_description
@@ -565,25 +415,31 @@ def main(mtn_cli, db, rev):
ops.automate.stop()
all_revs = []
+ branch_heads = {}
for branch in branches:
heads = [head for head in ops.heads(branch)]
+ if len(heads) != 1:
+ print >> sys.stderr, "Skipping branch '%s' due multiple heads" % (branch)
+ continue
+
if branch in status.former_heads:
old_heads = status.former_heads[branch]
else:
old_heads = []
for head in heads:
+ print >> sys.stderr, old_heads, head
all_revs += ops.ancestry_difference(head, old_heads)
status.former_heads[branch] = heads
+
sorted_revs = [rev for rev in ops.toposort(all_revs)]
for rev in sorted_revs:
if has_mark(rev):
- print >> sys.stderr, "Already having commit '%s'" % rev
+ print >> sys.stderr, "B: Already having commit '%s'" % rev
else:
print >> sys.stderr, "Going to import revision ", rev
fast_import(ops, parse_revision(ops, rev))
-
if __name__ == "__main__":
import optparse
@@ -608,3 +464,4 @@ if __name__ == "__main__":
print >> sys.stderr, "Failed to open the status file"
main(options.mtn, options.database, options.rev)
status.store(options.status)
+
diff --git a/contrib/mtn2git/status.py b/contrib/mtn2git/status.py
index 47d06b51fd..bd83f85acf 100644
--- a/contrib/mtn2git/status.py
+++ b/contrib/mtn2git/status.py
@@ -20,7 +20,7 @@
THE SOFTWARE.
"""
-import pickle
+import os, pickle
marks = {}
last_mark = 0
@@ -39,9 +39,16 @@ def load(status_name):
def store(status_name):
global marks, last_mark, mark_file, former_heads, same_revisions
- file = open(status_name, "wb")
+ file = open("%s.tmp-foo" % status_name, "wb")
pickle.dump(marks, file)
pickle.dump(last_mark, file)
pickle.dump(former_heads, file)
pickle.dump(same_revisions, file)
file.close()
+
+ # Almost atomic rename, without the risk to destroy something
+ try:
+ os.remove(status_name)
+ except:
+ pass
+ os.rename("%s.tmp-foo" % status_name, status_name)
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py
index 440434229c..39031bf237 100755
--- a/contrib/python/generate-manifest-2.5.py
+++ b/contrib/python/generate-manifest-2.5.py
@@ -11,7 +11,7 @@ import time
VERSION = "2.5.1"
# increase when touching python-core, this should be the same ml version as in python_2.5.1.bb
-BASEREV = 5
+BASEREV = 6
__author__ = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
__version__ = "20071205"
diff --git a/delete.txt b/delete.txt
deleted file mode 100644
index 7c9dc251aa..0000000000
--- a/delete.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Packages to be removed from OpenEmbedded if no one will fix them.
-
-Dropping stuff from metadata is not best way so this file will be filled
-with informations about which parts of metadata will be removed.
-
-Please sort by removal date
-
-Package Name: recipe, directory or subsystem name
-Removal Date: YYYY-MM-DD
-Maintainer: Surname Name + e-mail
-Reason: description why it will get removed
-Proposed by: person which want entry to be removed
-
------------------------------------------------------------------------------
-
-Package Name: Maemo
-Removal Date: 2006-12-15
-Maintainer: none
-Reason: Unfetchable, obsoleted by IT2006 release.
-Proposed by: Marcin 'Hrw' Juszkiewicz
-
-Package Name: task-bootstrap*
-Removal Date: 2006-12-22
-Maintainer: None
-Reason: Obsoleted by task-base
-Proposed by: Koen Kooi
-Note: Moved to packages/obsolete/tasks on 2006-12-22
diff --git a/packages/agg/agg_2.5.bb b/packages/agg/agg_2.5.bb
index a3cf4b9557..ba76a7b4c6 100644
--- a/packages/agg/agg_2.5.bb
+++ b/packages/agg/agg_2.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "AGG License"
DEPENDS = "virtual/libx11 virtual/libsdl freetype"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.antigrain.com/${P}.tar.gz"
S = "${WORKDIR}/${P}"
@@ -32,6 +32,12 @@ do_stage() {
oe_libinstall -a -so libaggplatformsdl ${STAGING_LIBDIR}
install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
install -d ${STAGING_INCDIR}/agg2
+
+ for f in font_freetype font_win32_tt gpc
+ do
+ install -m 0644 ${S}/$f/*.h ${STAGING_INCDIR}/agg2/
+ done
+
cd include
headers=`find . -name "*.h"`
for f in $headers
@@ -39,6 +45,3 @@ do_stage() {
install -D -m 0644 $f ${STAGING_INCDIR}/agg2/$f
done
}
-
-
-
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 2707aa224a..02957aebe9 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
PV = "0.1.0"
-PR = "r7"
+PR = "r9"
SRC_URI = " \
file://asoundrc \
@@ -26,6 +26,10 @@ SRC_URI_append_fic-gta01 = " \
file://voip-handset.state \
file://voip-headset.state"
+SRC_URI_append_fic-gta02 = "\
+ file://stereoout.state \
+ "
+
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
diff --git a/packages/linux/linux-handhelds-2.6/.mtn2git_empty b/packages/alsa/alsa-state/fic-gta02/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/.mtn2git_empty
+++ b/packages/alsa/alsa-state/fic-gta02/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state
new file mode 100644
index 0000000000..df824b66b6
--- /dev/null
+++ b/packages/alsa/alsa-state/fic-gta02/asound.state
@@ -0,0 +1,875 @@
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 255
+ value.1 255
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 121
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 2
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 2
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 2
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 0
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 2
+ value.1 2
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 23
+ value.1 23
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 false
+ value.1 false
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value HiFi
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value true
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Off
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 15
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 12
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value Stereo
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 + 2'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Line Mix'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Line 2'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Line 1'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Left PGA'
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value PGA
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value Stereo
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value Stereo
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'
+ value false
+ }
+ control.68 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Left Capture Swi'
+ value false
+ }
+ control.69 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Right Capture Sw'
+ value false
+ }
+ control.70 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'Capture ST'
+ comment.item.2 LOUT2
+ iface MIXER
+ name 'Out4 Mux'
+ value VREF
+ }
+ control.71 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 ROUT2
+ comment.item.2 'Left + Right'
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.72 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Inverted Mono 1'
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 'Left + Right'
+ iface MIXER
+ name 'Mono 2 Mux'
+ value 'Inverted Mono 1'
+ }
+ control.73 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.74 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.75 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Voice Playback Switc'
+ value false
+ }
+ control.76 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.77 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Bypass Playback Swit'
+ value false
+ }
+ control.78 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Voice Playback Swit'
+ value false
+ }
+ control.79 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Sidetone Playback S'
+ value false
+ }
+ control.80 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Playback Swit'
+ value true
+ }
+ control.81 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Bypass Playback Swi'
+ value false
+ }
+ control.82 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Voice Playback Switc'
+ value false
+ }
+ control.83 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.84 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Playback Switch'
+ value true
+ }
+ control.85 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Bypass Playback Swit'
+ value false
+ }
+ control.86 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Stereo Out Switch'
+ value true
+ }
+ control.87 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line Out Switch'
+ value false
+ }
+ control.88 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line In Switch'
+ value false
+ }
+ control.89 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Headset Mic Switch'
+ value false
+ }
+ control.90 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Mic Switch'
+ value false
+ }
+ control.91 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Spk Switch'
+ value false
+ }
+ control.92 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp State Switch'
+ value true
+ }
+ control.93 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp Spk Switch'
+ value true
+ }
+}
diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state
new file mode 100644
index 0000000000..df824b66b6
--- /dev/null
+++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state
@@ -0,0 +1,875 @@
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 255
+ value.1 255
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 121
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 2
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 2
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 2
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 0
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 2
+ value.1 2
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 23
+ value.1 23
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 false
+ value.1 false
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value HiFi
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value true
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Off
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 15
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 12
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value Stereo
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 + 2'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Line Mix'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Line 2'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Line 1'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Left PGA'
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value PGA
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value Stereo
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value Stereo
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'
+ value false
+ }
+ control.68 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Left Capture Swi'
+ value false
+ }
+ control.69 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Right Capture Sw'
+ value false
+ }
+ control.70 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'Capture ST'
+ comment.item.2 LOUT2
+ iface MIXER
+ name 'Out4 Mux'
+ value VREF
+ }
+ control.71 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 ROUT2
+ comment.item.2 'Left + Right'
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.72 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Inverted Mono 1'
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 'Left + Right'
+ iface MIXER
+ name 'Mono 2 Mux'
+ value 'Inverted Mono 1'
+ }
+ control.73 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.74 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.75 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Voice Playback Switc'
+ value false
+ }
+ control.76 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.77 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Bypass Playback Swit'
+ value false
+ }
+ control.78 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Voice Playback Swit'
+ value false
+ }
+ control.79 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Sidetone Playback S'
+ value false
+ }
+ control.80 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Playback Swit'
+ value true
+ }
+ control.81 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Bypass Playback Swi'
+ value false
+ }
+ control.82 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Voice Playback Switc'
+ value false
+ }
+ control.83 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Sidetone Playback Sw'
+ value false
+ }
+ control.84 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Playback Switch'
+ value true
+ }
+ control.85 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Bypass Playback Swit'
+ value false
+ }
+ control.86 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Stereo Out Switch'
+ value true
+ }
+ control.87 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line Out Switch'
+ value false
+ }
+ control.88 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM GSM Line In Switch'
+ value false
+ }
+ control.89 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Headset Mic Switch'
+ value false
+ }
+ control.90 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Mic Switch'
+ value false
+ }
+ control.91 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'DAPM Handset Spk Switch'
+ value false
+ }
+ control.92 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp State Switch'
+ value true
+ }
+ control.93 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Amp Spk Switch'
+ value true
+ }
+}
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb
index b9ee96d048..58d5721dbf 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb
@@ -2,7 +2,7 @@ require altboot.inc
PR = "r0"
-SVN_REV = "69"
+SVN_REV = "73"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
"
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index cc3d08972f..036f1af75a 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r33"
+PR = "r34"
inherit task
@@ -8,6 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
RDEPENDS_${PN} = "\
matchbox \
matchbox-panel-hacks \
+ matchbox-applet-startup-monitor \
xcursor-transparent-theme \
rxvt-unicode \
gpe-terminal \
diff --git a/packages/apex/apex-env_1.5.13.bb b/packages/apex/apex-env_1.5.13.bb
new file mode 100644
index 0000000000..aad0b12af9
--- /dev/null
+++ b/packages/apex/apex-env_1.5.13.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
+SECTION = "util"
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+ file://find-apex-partition.patch;patch=1 \
+ "
+S = ${WORKDIR}/apex-${PV}/usr
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+do_install() {
+ ${STRIP} ${S}/apex-env
+ install -d ${D}/${sbindir}
+ install -m 755 ${S}/apex-env ${D}/${sbindir}
+}
diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb
index 0f310f107e..a0e44346bb 100644
--- a/packages/apex/apex-env_1.5.8.bb
+++ b/packages/apex/apex-env_1.5.8.bb
@@ -3,9 +3,11 @@ SECTION = "util"
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
-SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+ file://find-apex-partition.patch;patch=1 \
+ "
S = ${WORKDIR}/apex-${PV}/usr
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
diff --git a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty
diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig
new file mode 100644
index 0000000000..91517025bf
--- /dev/null
+++ b/packages/apex/apex-nslu2-1.5.13/defconfig
@@ -0,0 +1,164 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version:
+# Mon Dec 24 14:54:47 2007
+#
+CONFIG_ARM=y
+CONFIG_CPU_ARMV5=y
+CONFIG_CPU_XSCALE=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_MX3 is not set
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SMALL is not set
+
+#
+# General Setup
+#
+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)"
+CONFIG_CROSS_COMPILE=""
+CONFIG_AEABI=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+# CONFIG_CC_NO_OPTIMIZATION is not set
+CONFIG_STARTUP_UART=y
+# CONFIG_DEBUG_LL is not set
+CONFIG_SPINNER=y
+CONFIG_ATAG=y
+CONFIG_MMU=y
+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
+CONFIG_DISABLE_MMU_AT_BOOT=y
+# CONFIG_INTERRUPTS is not set
+CONFIG_SDRAMBOOT_REPORT=y
+CONFIG_STACK_SIZE=0x1000
+CONFIG_STACKLIMIT=y
+# CONFIG_BOOTSTRAP_MEMTEST is not set
+CONFIG_ATAG_PHYS=0x00000100
+CONFIG_ARCH_NUMBER=597
+CONFIG_APEX_VMA=0x00200000
+CONFIG_KERNEL_LMA=0x00008000
+# CONFIG_USE_RAMDISK is not set
+CONFIG_SDRAM_BANK0=y
+# CONFIG_SDRAM_BANK1 is not set
+CONFIG_NOR_BUSWIDTH=16
+CONFIG_NOR_BANK0=y
+CONFIG_NOR_BANK0_START=0x50000000
+CONFIG_NOR_BANK0_LENGTH=0x00800000
+CONFIG_MACH="ixp42x"
+CONFIG_MACH_NSLU2=y
+# CONFIG_MACH_NAS100D is not set
+# CONFIG_MACH_DSMG600 is not set
+# CONFIG_MACH_FSG3 is not set
+# CONFIG_MACH_AVILA2347 is not set
+# CONFIG_USER_DEFAULTENDIAN is not set
+# CONFIG_USER_BIGENDIAN is not set
+# CONFIG_USER_LITTLEENDIAN is not set
+
+#
+# Platform Setup
+#
+CONFIG_SDRAM_BANK_LENGTH=0x02000000
+# CONFIG_DISABLE_SECOND_UART_INIT is not set
+CONFIG_ARCH_IXP420=y
+
+#
+# Commands
+#
+CONFIG_ALLHELP=y
+CONFIG_ALPHABETIZE_COMMANDS=y
+CONFIG_DEL_IS_BS=y
+CONFIG_ANSI_KEYS=y
+CONFIG_COMMAND_HISTORY=y
+CONFIG_COMMAND_EDITING=y
+# CONFIG_TIME_COMMANDS is not set
+CONFIG_CMD_ALIAS=y
+CONFIG_CMD_CHECKSUM=y
+CONFIG_CMD_COPY=y
+CONFIG_CMD_COMPARE=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_DUMP=y
+CONFIG_CMD_ENV=y
+CONFIG_CMD_SETENV=y
+CONFIG_CMD_ERASE=y
+CONFIG_CMD_FILL=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_INFO=y
+# CONFIG_CMD_PAUSE is not set
+CONFIG_CMD_WAIT=y
+CONFIG_CMD_XRECEIVE=y
+CONFIG_CMD_MEMLIMIT=y
+CONFIG_CMD_MEMSCAN=y
+CONFIG_CMD_MEMTEST=y
+
+#
+# Generic Drivers
+#
+# CONFIG_DRIVER_FAT is not set
+# CONFIG_DRIVER_EXT2 is not set
+# CONFIG_DRIVER_JFFS2 is not set
+CONFIG_DRIVER_FIS=y
+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k"
+CONFIG_DRIVER_NOR_CFI=y
+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
+# CONFIG_DRIVER_ONENAND is not set
+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
+CONFIG_USES_NOR_CFI=y
+CONFIG_USES_PATHNAME_PARSER=y
+CONFIG_USES_IXP4XX_NPE_ETH=y
+
+#
+# Environment
+#
+CONFIG_ENV=y
+CONFIG_ENV_LINK=y
+CONFIG_ENV_MUTABLE=y
+CONFIG_ENV_REGION="nor:0x7c000+15k"
+# CONFIG_ENV_SAVEATONCE is not set
+CONFIG_ENV_CHECK_LEN=1024
+CONFIG_VARIATIONS=y
+CONFIG_VARIATION_SUFFIX="-alt"
+# CONFIG_NO_BOOTSTRAP is not set
+CONFIG_NOR_BOOT=y
+# CONFIG_NAND_BOOT is not set
+# CONFIG_ONENAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
+
+#
+# Default Startup
+#
+CONFIG_AUTOBOOT=y
+CONFIG_AUTOBOOT_DELAY=10
+CONFIG_ENV_STARTUP_KERNEL_COPY=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
+# CONFIG_ENV_STARTUP_PREFIX_P is not set
+
+#
+# Regions
+#
+CONFIG_ENV_REGION_KERNEL="fis://kernel"
+CONFIG_ENV_REGION_KERNEL_ALT_P=y
+CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel"
+
+#
+# Overrides
+#
+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_RELOCATE_SIMPLE=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
+# CONFIG_BIGENDIAN is not set
+# CONFIG_LITTLEENDIAN is not set
+CONFIG_CLEAR_STACKS=y
+CONFIG_ALIASES=y
diff --git a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty
diff --git a/packages/apex/files/defconfig b/packages/apex/apex-nslu2-1.5.8/defconfig
index 3c8522e2e8..3c8522e2e8 100644
--- a/packages/apex/files/defconfig
+++ b/packages/apex/apex-nslu2-1.5.8/defconfig
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty
diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
new file mode 100644
index 0000000000..420e0a61fd
--- /dev/null
+++ b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
@@ -0,0 +1,164 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version:
+# Mon Dec 24 15:00:01 2007
+#
+CONFIG_ARM=y
+CONFIG_CPU_ARMV5=y
+CONFIG_CPU_XSCALE=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_MX3 is not set
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SMALL is not set
+
+#
+# General Setup
+#
+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)"
+CONFIG_CROSS_COMPILE=""
+CONFIG_AEABI=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+# CONFIG_CC_NO_OPTIMIZATION is not set
+CONFIG_STARTUP_UART=y
+# CONFIG_DEBUG_LL is not set
+CONFIG_SPINNER=y
+CONFIG_ATAG=y
+CONFIG_MMU=y
+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
+CONFIG_DISABLE_MMU_AT_BOOT=y
+# CONFIG_INTERRUPTS is not set
+CONFIG_SDRAMBOOT_REPORT=y
+CONFIG_STACK_SIZE=0x1000
+CONFIG_STACKLIMIT=y
+# CONFIG_BOOTSTRAP_MEMTEST is not set
+CONFIG_ATAG_PHYS=0x00000100
+CONFIG_ARCH_NUMBER=597
+CONFIG_APEX_VMA=0x00200000
+CONFIG_KERNEL_LMA=0x00008000
+# CONFIG_USE_RAMDISK is not set
+CONFIG_SDRAM_BANK0=y
+# CONFIG_SDRAM_BANK1 is not set
+CONFIG_NOR_BUSWIDTH=16
+CONFIG_NOR_BANK0=y
+CONFIG_NOR_BANK0_START=0x50000000
+CONFIG_NOR_BANK0_LENGTH=0x01000000
+CONFIG_MACH="ixp42x"
+CONFIG_MACH_NSLU2=y
+# CONFIG_MACH_NAS100D is not set
+# CONFIG_MACH_DSMG600 is not set
+# CONFIG_MACH_FSG3 is not set
+# CONFIG_MACH_AVILA2347 is not set
+# CONFIG_USER_DEFAULTENDIAN is not set
+# CONFIG_USER_BIGENDIAN is not set
+# CONFIG_USER_LITTLEENDIAN is not set
+
+#
+# Platform Setup
+#
+CONFIG_SDRAM_BANK_LENGTH=0x02000000
+# CONFIG_DISABLE_SECOND_UART_INIT is not set
+CONFIG_ARCH_IXP420=y
+
+#
+# Commands
+#
+CONFIG_ALLHELP=y
+CONFIG_ALPHABETIZE_COMMANDS=y
+CONFIG_DEL_IS_BS=y
+CONFIG_ANSI_KEYS=y
+CONFIG_COMMAND_HISTORY=y
+CONFIG_COMMAND_EDITING=y
+# CONFIG_TIME_COMMANDS is not set
+CONFIG_CMD_ALIAS=y
+CONFIG_CMD_CHECKSUM=y
+CONFIG_CMD_COPY=y
+CONFIG_CMD_COMPARE=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_DUMP=y
+CONFIG_CMD_ENV=y
+CONFIG_CMD_SETENV=y
+CONFIG_CMD_ERASE=y
+CONFIG_CMD_FILL=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_INFO=y
+# CONFIG_CMD_PAUSE is not set
+CONFIG_CMD_WAIT=y
+CONFIG_CMD_XRECEIVE=y
+CONFIG_CMD_MEMLIMIT=y
+CONFIG_CMD_MEMSCAN=y
+CONFIG_CMD_MEMTEST=y
+
+#
+# Generic Drivers
+#
+# CONFIG_DRIVER_FAT is not set
+# CONFIG_DRIVER_EXT2 is not set
+# CONFIG_DRIVER_JFFS2 is not set
+CONFIG_DRIVER_FIS=y
+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k"
+CONFIG_DRIVER_NOR_CFI=y
+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
+# CONFIG_DRIVER_ONENAND is not set
+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
+CONFIG_USES_NOR_CFI=y
+CONFIG_USES_PATHNAME_PARSER=y
+CONFIG_USES_IXP4XX_NPE_ETH=y
+
+#
+# Environment
+#
+CONFIG_ENV=y
+CONFIG_ENV_LINK=y
+CONFIG_ENV_MUTABLE=y
+CONFIG_ENV_REGION="nor:0x7c000+15k"
+# CONFIG_ENV_SAVEATONCE is not set
+CONFIG_ENV_CHECK_LEN=1024
+CONFIG_VARIATIONS=y
+CONFIG_VARIATION_SUFFIX="-alt"
+# CONFIG_NO_BOOTSTRAP is not set
+CONFIG_NOR_BOOT=y
+# CONFIG_NAND_BOOT is not set
+# CONFIG_ONENAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
+
+#
+# Default Startup
+#
+CONFIG_AUTOBOOT=y
+CONFIG_AUTOBOOT_DELAY=10
+CONFIG_ENV_STARTUP_KERNEL_COPY=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
+# CONFIG_ENV_STARTUP_PREFIX_P is not set
+
+#
+# Regions
+#
+CONFIG_ENV_REGION_KERNEL="fis://kernel"
+CONFIG_ENV_REGION_KERNEL_ALT_P=y
+CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel"
+
+#
+# Overrides
+#
+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_RELOCATE_SIMPLE=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
+# CONFIG_BIGENDIAN is not set
+# CONFIG_LITTLEENDIAN is not set
+CONFIG_CLEAR_STACKS=y
+CONFIG_ALIASES=y
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty
diff --git a/packages/apex/files/defconfig-16mb b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig
index c9688e3d75..c9688e3d75 100644
--- a/packages/apex/files/defconfig-16mb
+++ b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig
diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.13.bb
new file mode 100644
index 0000000000..5fc835fc00
--- /dev/null
+++ b/packages/apex/apex-nslu2-16mb_1.5.13.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "APEX Boot Loader"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+ file://defconfig"
+S = ${WORKDIR}/apex-${PV}
+
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
+
+CMDLINE_DEBUG ?= ""
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
+# of the .config file and remove any settings in defconfig then append
+# defconfig to .config
+do_configure() {
+ rm -f ${S}/.config
+ . ${CONFIG_SITE}
+ if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+ sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
+ elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+ sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
+ else
+ oefatal do_configure cannot determine endianess
+ fi
+ oe_runmake oldconfig
+}
+
+DEPENDS += "devio-native"
+
+do_populate_staging() {
+ install -d ${STAGING_LOADER_DIR}
+ . ${CONFIG_SITE}
+ if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+ cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin
+ elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+ devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
+ else
+ oefatal do_populate_staging cannot determine endianess
+ fi
+}
diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb
index 48b8412088..6289d7c104 100644
--- a/packages/apex/apex-nslu2-16mb_1.5.8.bb
+++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb
@@ -3,10 +3,10 @@ SECTION = ""
PRIORITY = "optional"
HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
- file://defconfig-16mb"
+ file://defconfig"
S = ${WORKDIR}/apex-${PV}
CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
@@ -33,13 +33,13 @@ do_configure() {
-e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
- ${WORKDIR}/defconfig-16mb > ${S}/.config
+ ${WORKDIR}/defconfig > ${S}/.config
elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
- ${WORKDIR}/defconfig-16mb > ${S}/.config
+ ${WORKDIR}/defconfig > ${S}/.config
else
oefatal do_configure cannot determine endianess
fi
diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.13.bb
new file mode 100644
index 0000000000..ac3858f3a5
--- /dev/null
+++ b/packages/apex/apex-nslu2_1.5.13.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "APEX Boot Loader"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+ file://defconfig"
+S = ${WORKDIR}/apex-${PV}
+
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
+
+CMDLINE_DEBUG ?= ""
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
+# of the .config file and remove any settings in defconfig then append
+# defconfig to .config
+do_configure() {
+ rm -f ${S}/.config
+ . ${CONFIG_SITE}
+ if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+ sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+ -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
+ elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+ sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+ ${WORKDIR}/defconfig > ${S}/.config
+ else
+ oefatal do_configure cannot determine endianess
+ fi
+ oe_runmake oldconfig
+}
+
+DEPENDS += "devio-native"
+
+do_populate_staging() {
+ install -d ${STAGING_LOADER_DIR}
+ . ${CONFIG_SITE}
+ if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+ cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin
+ elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+ devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
+ else
+ oefatal do_populate_staging cannot determine endianess
+ fi
+}
diff --git a/packages/apex/files/find-apex-partition.patch b/packages/apex/files/find-apex-partition.patch
new file mode 100644
index 0000000000..3aa62a186a
--- /dev/null
+++ b/packages/apex/files/find-apex-partition.patch
@@ -0,0 +1,34 @@
+*** usr/link.cc.orig Sun Dec 23 20:31:49 2007
+--- usr/link.cc Sun Dec 23 20:32:46 2007
+***************
+*** 278,285 ****
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it uses the first partition with the assumption that APEX
+! may be the primary boot loader.
+
+ */
+
+--- 278,286 ----
+ fixed-up env_link structure, scanning for the environment variables
+ and their defaults, and opening the flash instance of the
+ environment. It first looks for the "Loader" partition. If there
+! is none, it then looks for the "apex" partition. If there is none,
+! it uses the first partition with the assumption that APEX may be
+! the primary boot loader.
+
+ */
+
+***************
+*** 289,294 ****
+--- 290,298 ----
+ MTDPartition mtd = MTDPartition::find ("Loader");
+
+ if (!mtd.is ())
++ mtd = MTDPartition::find ("apex");
++
++ if (!mtd.is ())
+ mtd = MTDPartition::first ();
+
+ bool fFound = mtd.is () && open_apex (mtd);
diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb
index ea81607953..904e41f8a3 100644
--- a/packages/apr/apr-util_1.2.7.bb
+++ b/packages/apr/apr-util_1.2.7.bb
@@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \
--without-sqlite3 \
--with-expat=${STAGING_DIR_HOST}${layout_prefix}"
+
inherit autotools lib_package binconfig
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
do_configure() {
+ cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk
oe_runconf
}
do_stage() {
- autotools_stage_all
+ autotools_stage_all
+ sed -i s,/usr/lib/libgdbm.la,-lgdbm,g ${STAGING_LIBDIR}/libaprutil-1.la
+ sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la
+ sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la
}
diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb
index 2016ca0126..d0f2916bfa 100644
--- a/packages/apr/apr_1.2.7.bb
+++ b/packages/apr/apr_1.2.7.bb
@@ -9,10 +9,13 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
inherit autotools lib_package binconfig
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
do_configure() {
oe_runconf
}
do_stage() {
autotools_stage_all
+ cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}
}
diff --git a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty b/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty
+++ b/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty
diff --git a/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
new file mode 100644
index 0000000000..f1b3d12cd7
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ #install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+ #install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+ mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+ #install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+ mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+ #install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+ mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+ #install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+ mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+ #install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+ mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty b/packages/asterisk-core-sounds-en-g729/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty
+++ b/packages/asterisk-core-sounds-en-g729/.mtn2git_empty
diff --git a/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
new file mode 100644
index 0000000000..205c8ff067
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ #install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+ #install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+ mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+ #install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+ mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+ #install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+ mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+ #install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+ mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+ #install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+ mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
+++ b/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty
diff --git a/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
new file mode 100644
index 0000000000..2a46c74f84
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
@@ -0,0 +1,48 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ #install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+ #install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+ mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+ #install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+ mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+ #install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+ mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+ #install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+ mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+ #install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+ mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty b/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty
+++ b/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty
diff --git a/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
new file mode 100644
index 0000000000..c29ae60f99
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ #install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+ #install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+ mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+ #install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+ mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+ #install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+ mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+ #install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+ mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+ #install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+ mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty b/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty
+++ b/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty
diff --git a/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
new file mode 100644
index 0000000000..f18d46258f
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ # HACK: moving the files in chunkes (too many of them)
+ rm ${WORKDIR}/conf-thereare.alaw
+ rm ${WORKDIR}/invalid.alaw
+ mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+ #install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+ mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+ #install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+ mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty b/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty
+++ b/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty
diff --git a/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
new file mode 100644
index 0000000000..48fabbbdc4
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ # HACK: moving the files in chunks (too many files)
+ rm ${WORKDIR}/conf-thereare.g729
+ rm ${WORKDIR}/invalid.g729
+ mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+ #install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+ mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+ #install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+ mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty b/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
+++ b/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty
diff --git a/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
new file mode 100644
index 0000000000..da463391b1
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ # HACK: moving the files in chunks (too many files)
+ rm ${WORKDIR}/conf-thereare.gsm
+ rm ${WORKDIR}/invalid.gsm
+ mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+ #install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+ mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+ #install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+ mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty
+++ b/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty
diff --git a/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
new file mode 100644
index 0000000000..6a6f3f5fba
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-${PV}.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/sounds
+ # HACK: moving the files in chunkes (too many of them)
+ rm ${WORKDIR}/conf-thereare.ulaw
+ rm ${WORKDIR}/invalid.ulaw
+ mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+ mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+ #install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+ #install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+ mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+ #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+ mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+ #install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+ #install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+ mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty b/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty
+++ b/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty
diff --git a/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb b/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
new file mode 100644
index 0000000000..96c662444e
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/moh
+ #install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/moh/
+ #install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+ mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/moh/
+ mv ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty b/packages/asterisk-moh-freeplay-g729/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty
+++ b/packages/asterisk-moh-freeplay-g729/.mtn2git_empty
diff --git a/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb b/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
new file mode 100644
index 0000000000..581e6bf84f
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/moh
+ install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/moh/
+ install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty b/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty
+++ b/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty
diff --git a/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb b/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
new file mode 100644
index 0000000000..e45c3eec4e
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/moh
+ install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/moh/
+ install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty b/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty
+++ b/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty
diff --git a/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb b/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
new file mode 100644
index 0000000000..e0e0293c34
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz"
+
+do_install() {
+ install -d ${D}${localstatedir}/lib/asterisk/moh
+ #install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/moh/
+ #install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+ mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/moh/
+ mv ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+ chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty b/packages/asterisk/asterisk-1.4.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.4.17/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.4.17/Makefile.patch b/packages/asterisk/asterisk-1.4.17/Makefile.patch
new file mode 100644
index 0000000000..a6d630949e
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/Makefile.patch
@@ -0,0 +1,20 @@
+--- asterisk-1.4.5/Makefile 2007-05-24 15:05:08.000000000 -0400
++++ asterisk-1.4.5/Makefile.new 2007-06-17 05:36:44.000000000 -0400
+@@ -115,7 +115,7 @@ else
+ ASTSBINDIR=$(sbindir)
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run
++ ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTMANDIR=$(mandir)
+ ifeq ($(OSARCH),FreeBSD)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+@@ -468,7 +468,7 @@ oldmodcheck:
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: datafiles bininstall $(SUBDIRS_INSTALL)
++install: datafiles bininstall $(SUBDIRS_INSTALL) samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
diff --git a/packages/asterisk/asterisk-1.4.17/init b/packages/asterisk/asterisk-1.4.17/init
new file mode 100644
index 0000000000..f26ad38db3
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/init
@@ -0,0 +1,77 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openpbx and type
+# > update-rc.d asterisk defaults 60
+#
+asterisk=/usr/sbin/asterisk
+pidfile=/var/run/asterisk/asterisk.pid
+asterisk_args="-npqT -U asterisk -G asterisk"
+
+test -x "$asterisk" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Asterisk"
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Asterisk"
+ $asterisk -rx "stop gracefully"
+ sleep 4
+ if [ -f $pidfile ]; then
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ fi
+ echo "."
+ ;;
+ force-stop)
+ echo -n "Stopping Asterisk"
+ $asterisk -rx "stop now"
+ sleep 2
+ if [ -f $pidfile ]; then
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ fi
+ echo "."
+ ;;
+ restart)
+ echo -n "Restarting Asterisk"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "restart gracefully"
+ sleep 2
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ force-restart)
+ echo -n "Forcibly Restarting Asterisk"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "restart now"
+ sleep 2
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ reload)
+ echo -n "Reloading Asterisk Configuration"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "reload"
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ logger-reload)
+ if [ -f $pidfile ]; then
+ $asterisk -rx "logger reload"
+ fi
+ ;;
+ *)
+ echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}"
+ exit 1
+esac
+
+exit 0
+
diff --git a/packages/asterisk/asterisk-1.4.17/logrotate b/packages/asterisk/asterisk-1.4.17/logrotate
new file mode 100644
index 0000000000..dfd25ee55c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/logrotate
@@ -0,0 +1,12 @@
+/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages {
+ daily
+ missingok
+ compress
+ delaycompress
+ rotate 30
+ sharedscripts
+ postrotate
+ /etc/init.d/asterisk logger-reload
+ endscript
+}
+
diff --git a/packages/asterisk/asterisk-1.4.17/sounds.xml.patch b/packages/asterisk/asterisk-1.4.17/sounds.xml.patch
new file mode 100644
index 0000000000..b549fea132
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/sounds.xml.patch
@@ -0,0 +1,18 @@
+--- asterisk-1.4.4/sounds/sounds.xml 2007-05-24 17:00:45.000000000 -0400
++++ asterisk-1.4.4/sounds/sounds.xml.new 2007-05-25 13:23:41.000000000 -0400
+@@ -6,7 +6,6 @@
+ <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
+ </member>
+ <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
+ </member>
+@@ -39,7 +38,6 @@
+ </category>
+ <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+ <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+ </member>
diff --git a/packages/asterisk/asterisk-1.4.17/volatiles b/packages/asterisk/asterisk-1.4.17/volatiles
new file mode 100644
index 0000000000..c68e786c90
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/volatiles
@@ -0,0 +1,7 @@
+d asterisk asterisk 0775 /var/run/asterisk none
+d asterisk asterisk 0775 /var/lib/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none
+d asterisk asterisk 0775 /var/spool/asterisk/outgoing none
+d asterisk asterisk 0775 /var/spool/asterisk/voicemail none
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
new file mode 100644
index 0000000000..fb64581364
--- /dev/null
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -0,0 +1,171 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "The Asterisk open source software PBX"
+HOMEPAGE = "http://www.asterisk.org"
+SECTION = "voip"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+SECTION = "console/telephony"
+DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+#RRECOMMENDS_${PN} = "logrotate"
+PR = "r0"
+
+
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
+ file://sounds.xml.patch;patch=1\
+ file://Makefile.patch;patch=1\
+ file://logrotate \
+ file://volatiles \
+ file://init"
+
+ARCH_efika="ppc"
+ARCH_dht-walnut="ppc"
+ARCH_magicbox="ppc"
+ARCH_sequoia="ppc"
+
+
+
+
+INITSCRIPT_NAME = "asterisk"
+INITSCRIPT_PARAMS = "defaults 60"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
+ --with-z=${STAGING_DIR}/${TARGET_SYS}\
+ --with-curl=${STAGING_DIR}/${TARGET_SYS}\
+ --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
+ --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
+ --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
+ --with-popt=${STAGING_DIR}/${TARGET_SYS}\
+ --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+ --without-curses\
+ --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --without-imap\
+ --without-netsnmp\
+ --without-odbc\
+ --without-osptk\
+ --without-nbs\
+ --without-pwlib\
+ --without-radius\
+ --without-tds\
+ --without-postgres\
+ --without-zaptel\
+ "
+
+#export NOISY_BUILD=yes
+
+export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096"
+export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv "
+export PROC="${ARCH}"
+
+do_configure_prepend () {
+ sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
+ sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate
+ sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles
+}
+
+do_configure () {
+ # Looks like rebuilding configure doesn't work, so we are skipping
+ # that and are just using the shipped one
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+
+do_compile() {
+ (
+ #make sure that menuselect gets build using host toolchain
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd menuselect
+ ./configure
+ oe_runmake
+ cd ../
+ ) || exit 1
+ oe_runmake
+}
+
+
+
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
+ install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk
+ install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk
+}
+
+pkg_postinst_prepend() {
+ grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk
+ grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk
+ chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk
+}
+
+FILES_${PN} += "${libdir}/asterisk/modules/*"
+FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \
+ ${localstatedir}/lib/asterisk/*/.debug"
+
+CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf"
+CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk"
diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb
index 23bdfaf64b..07040562dd 100644
--- a/packages/atftp/atftp_0.7.bb
+++ b/packages/atftp/atftp_0.7.bb
@@ -3,10 +3,10 @@ SECTION = "network"
PRIORITY = "optional"
HOMEPAGE = "http://packages.debian.org/atftp"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \
- ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \
+ ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \
file://atftpd.init"
S = "${WORKDIR}/atftp-${PV}"
diff --git a/packages/atk/atk.inc b/packages/atk/atk.inc
index e47a431e5c..5f81cdf67e 100644
--- a/packages/atk/atk.inc
+++ b/packages/atk/atk.inc
@@ -1,13 +1,14 @@
-DEPENDS = "glib-2.0 gtk-doc-native"
DESCRIPTION = "An accessibility toolkit for GNOME."
SECTION = "x11/libs"
PRIORITY = "optional"
LICENSE = "LGPL"
+DEPENDS = "glib-2.0 gtk-doc-native"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-glibtest"
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
- -I${STAGING_INCDIR}/glib-2.0/glib \
- -I${STAGING_INCDIR}/glib-2.0/gobject"
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/atk/atk_1.18.0.bb b/packages/atk/atk_1.18.0.bb
new file mode 100644
index 0000000000..116d8cabff
--- /dev/null
+++ b/packages/atk/atk_1.18.0.bb
@@ -0,0 +1,8 @@
+require atk.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-${PV}.tar.bz2"
+
+do_stage () {
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+}
diff --git a/packages/atk/atk_1.19.3.bb b/packages/atk/atk_1.19.3.bb
index 52136682d7..28adc02ea9 100644
--- a/packages/atk/atk_1.19.3.bb
+++ b/packages/atk/atk_1.19.3.bb
@@ -2,7 +2,13 @@ require atk.inc
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
+CFLAGS_append = "\
+ -I${STAGING_INCDIR}/glib-2.0 \
+ -I${STAGING_INCDIR}/glib-2.0/glib \
+ -I${STAGING_INCDIR}/glib-2.0/gobject \
+ "
+
do_stage () {
- oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
- autotools_stage_includes
+ oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
}
diff --git a/packages/atk/atk_1.20.0.bb b/packages/atk/atk_1.20.0.bb
index a909e0eb61..bb64492337 100644
--- a/packages/atk/atk_1.20.0.bb
+++ b/packages/atk/atk_1.20.0.bb
@@ -1,16 +1,6 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
+require atk.inc
SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
-inherit autotools pkgconfig
-EXTRA_OECONF = "--disable-glibtest"
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index e8e9e7c4a8..ae03d00e05 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
PR = "r5"
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
# uclibc has no nss
RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
@@ -22,10 +22,14 @@ inherit autotools pkgconfig update-rc.d
RDEPENDS_append = ""
# TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_uclinux-uclibc = " -lintl"
+
PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
diff --git a/packages/avetanabt/avetanabt_20060413.bb b/packages/avetanabt/avetanabt_20060413.bb
index 54e3d845bb..5b408e6a71 100644
--- a/packages/avetanabt/avetanabt_20060413.bb
+++ b/packages/avetanabt/avetanabt_20060413.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
SECTION = "devel"
-DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+DEPENDS = "findutils-native virtual/javac-native kaffeh-native fastjar-native bluez-libs classpath"
LICENSE = "GPL"
HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
@@ -22,9 +22,8 @@ do_compile() {
rm -fr build/*
# generate classes
- # javac -> jikes
${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
- ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
+ ${STAGING_BINDIR_NATIVE}/javac -verbose -bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
# create own version.xml (add version information available at runtime)
head -n 4 version.xml >> build/version.xml
diff --git a/packages/avetanabt/avetanabt_cvs.bb b/packages/avetanabt/avetanabt_cvs.bb
index a8f795989b..08fe2e9b82 100644
--- a/packages/avetanabt/avetanabt_cvs.bb
+++ b/packages/avetanabt/avetanabt_cvs.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
SECTION = "devel"
-DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+DEPENDS = "findutils-native virtual/javac-native kaffeh-native fastjar-native bluez-libs classpath"
LICENSE = "GPL"
HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
@@ -25,9 +25,8 @@ do_compile() {
rm -fr build/*
# generate classes
- # javac -> jikes
${STAGING_BINDIR_NATIVE}/find {de,javax,com} -iname *.java > file.list
- ${STAGING_BINDIR_NATIVE}/jikes -verbose --bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
+ ${STAGING_BINDIR_NATIVE}/javac -verbose -bootclasspath ${STAGING_DATADIR_NATIVE}/kaffeh/rt.jar -d build @file.list
# create own version.xml (add version information available at runtime)
head -n 4 version.xml >> build/version.xml
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty b/packages/backsaver/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty
+++ b/packages/backsaver/.mtn2git_empty
diff --git a/packages/backsaver/backsaver_1.0.bb b/packages/backsaver/backsaver_1.0.bb
new file mode 100644
index 0000000000..a63f9d7f60
--- /dev/null
+++ b/packages/backsaver/backsaver_1.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Lightweight backlight saver daemon"
+SECTION = "base"
+LICENSE="GPL"
+
+PR = "r0"
+
+SRC_URI = "file://Makefile \
+ file://backsaver.c"
+
+S = ${WORKDIR}
+
+do_install () {
+ oe_runmake 'prefix=${D}' install
+}
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/backsaver/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
+++ b/packages/backsaver/files/.mtn2git_empty
diff --git a/packages/backsaver/files/Makefile b/packages/backsaver/files/Makefile
new file mode 100644
index 0000000000..dd4d2b0875
--- /dev/null
+++ b/packages/backsaver/files/Makefile
@@ -0,0 +1,8 @@
+backsaver: backsaver.o
+
+backsaver.o: backsaver.c
+
+install:
+ install -d ${prefix}/usr/bin/
+ # Needs to be installed suid to access sysfs & dev/input
+ install -m 4755 backsaver ${prefix}/usr/bin/
diff --git a/packages/backsaver/files/backsaver.c b/packages/backsaver/files/backsaver.c
new file mode 100644
index 0000000000..3f030b9dd9
--- /dev/null
+++ b/packages/backsaver/files/backsaver.c
@@ -0,0 +1,256 @@
+/*
+ * backsaver - Small backlight power saver daemon
+ *
+ * This app relies on contemporary Linux 2.6 intefaces, like
+ * backlight class dev and generic input devices. Legacy interfaces
+ * are not supported by design.
+ *
+ * Copyright (C) 2007, 2008 Paul Sokolovsky <pmiscml@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <getopt.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int opt_verbose;
+int opt_timeout = 2;
+int opt_power;
+int opt_brightness = -1;
+
+char readbuf[256];
+fd_set read_fds;
+fd_set work_fds;
+int fds[32];
+
+int bl_state = 1;
+
+#define BL_PATH "/sys/class/backlight/"
+
+/* Backlight device properties */
+char bldev_brightness_path[256] = BL_PATH;
+char bldev_power_path[256] = BL_PATH;
+int bldev_max_brightness;
+int bldev_saved_brightness;
+int bldev_dim_brightness;
+
+void fatal(char *msg)
+{
+ fprintf(stderr, "%s\n", msg);
+ exit(1);
+}
+
+int sysfs_get_value(char *fname)
+{
+ char buf[64];
+ int fd = open(fname, O_RDONLY);
+ int sz = read(fd, buf, sizeof(buf) - 1);
+ buf[sz] = 0;
+ close(fd);
+ return atoi(buf);
+}
+
+void sysfs_set_value(char *fname, int val)
+{
+ char buf[64];
+ int fd = open(fname, O_WRONLY);
+ int sz = sprintf(buf, "%d\n", val);
+ write(fd, buf, sz);
+ close(fd);
+}
+
+char *bldev_scan()
+{
+ static char name[256];
+ DIR *dir;
+ struct dirent *de;
+ int more_than_one = 0;
+
+ dir = opendir(BL_PATH);
+ if (!dir)
+ fatal("Backlight device class does not seem to be support by kernel (" BL_PATH " is absent)");
+
+ *name = 0;
+ while (de = readdir(dir)) {
+ if (de->d_name[0] == '.')
+ continue;
+ if (*name == 0) {
+ strcpy(name, de->d_name);
+ } else {
+ more_than_one = 1;
+ break;
+ }
+ }
+
+ closedir(dir);
+ if (*name == 0)
+ fatal("There does not seem to be any backlight device available (" BL_PATH " is empty)");
+ if (more_than_one)
+ fatal("There seems to be several backlight devices available, use --device= option");
+
+ return name;
+}
+
+void bldev_init(char *bldev)
+{
+ strcat(bldev_brightness_path, bldev);
+ strcat(bldev_brightness_path, "/brightness");
+ strcat(bldev_power_path, bldev);
+ strcat(bldev_power_path, "/power");
+
+ char buf[PATH_MAX];
+ memcpy(buf, BL_PATH, sizeof(BL_PATH));
+ strcat(buf, bldev);
+ strcat(buf, "/max_brightness");
+ bldev_max_brightness = sysfs_get_value(buf);
+
+ bldev_dim_brightness = bldev_max_brightness * opt_brightness / 100;
+}
+
+void set_backlight(int state)
+{
+ if (!bl_state) {
+ if (opt_verbose)
+ printf("BL off\n");
+ if (opt_power) {
+ sysfs_set_value(bldev_power_path, 4);
+ } else {
+ bldev_saved_brightness = sysfs_get_value(bldev_brightness_path);
+ sysfs_set_value(bldev_brightness_path, bldev_dim_brightness);
+ }
+ } else {
+ if (opt_verbose)
+ printf("BL on\n");
+ if (opt_power) {
+ sysfs_set_value(bldev_power_path, 0);
+ } else {
+ sysfs_set_value(bldev_brightness_path, bldev_saved_brightness);
+ }
+ }
+}
+
+#define INPUT_PATH "/dev/input/"
+
+int main_loop(int argc, char *argv[], int argstart)
+{
+ fd_set read_fds;
+ struct timeval timeout;
+ int i, maxfd = 0, numfd = 0;
+
+ FD_ZERO(&read_fds);
+
+ if (argstart == argc) {
+ static char path[256] = INPUT_PATH;
+ DIR *dir;
+ struct dirent *de;
+ struct stat stat;
+
+ dir = opendir(INPUT_PATH);
+ if (!dir)
+ fatal("Cannot open generic input device directory (" INPUT_PATH " is absent)");
+
+ while (de = readdir(dir)) {
+ if (de->d_name[0] == '.')
+ continue;
+ strcpy(path + sizeof(INPUT_PATH) - 1, de->d_name);
+
+ if (lstat(path, &stat))
+ fatal("Cannot stat input device to monitor");
+ if (S_ISLNK(stat.st_mode)) {
+ if (opt_verbose)
+ printf("Skipping symlink %s\n", path);
+ continue;
+ }
+ if (opt_verbose)
+ printf("Using %s\n", path);
+
+ int fd = open(path, O_RDONLY);
+ if (fd == -1)
+ fatal("Cannot open input device to monitor");
+ if (fd > maxfd)
+ maxfd = fd;
+ fds[numfd++] = fd;
+ FD_SET(fd, &read_fds);
+ }
+
+ closedir(dir);
+ } else {
+ for (i = argstart; i < argc; i++) {
+ if (opt_verbose)
+ printf("Using: %s\n", argv[i]);
+ int fd = open(argv[i], O_RDONLY);
+ if (fd == -1)
+ fatal("Cannot open input device to monitor");
+ if (fd > maxfd)
+ maxfd = fd;
+ fds[numfd++] = fd;
+ FD_SET(fd, &read_fds);
+ }
+ }
+
+ timeout.tv_usec = 0;
+
+ while (1) {
+ memcpy(&work_fds, &read_fds, sizeof(read_fds));
+ timeout.tv_sec = opt_timeout;
+ i = select(maxfd + 1, &work_fds, NULL, NULL, &timeout);
+ if (opt_verbose)
+ printf("Select returned: %d\n", i);
+ if (i > 0) {
+ if (!bl_state) {
+ bl_state = 1;
+ set_backlight(bl_state);
+ }
+ for (i = 0; i < numfd; i++) {
+ if (FD_ISSET(fds[i], &work_fds)) {
+ int sz = read(fds[i], readbuf, sizeof(readbuf));
+ if (opt_verbose)
+ printf("Discarded %d bytes from fd %d\n", sz, fds[i]);
+ }
+ }
+ } else {
+ if (bl_state) {
+ bl_state = 0;
+ set_backlight(bl_state);
+ }
+ }
+
+ }
+}
+
+struct option options[] = {
+ { "verbose", no_argument, &opt_verbose, 1 },
+ { "timeout", required_argument, NULL, 't' },
+ { "power", no_argument, &opt_power, 1 },
+ { "brightness", required_argument, NULL, 'b' },
+ NULL
+};
+int main(int argc, char *argv[])
+{
+ int opt;
+ while ((opt = getopt_long(argc, argv, "?h", options, NULL)) != -1) {
+ switch (opt) {
+ case 't':
+ opt_timeout = atoi(optarg);
+ break;
+ case 'b':
+ opt_brightness = atoi(optarg);
+ break;
+ }
+ }
+ printf("%d\n", optind);
+
+ char *bldev = bldev_scan();
+ bldev_init(bldev);
+
+ return main_loop(argc, argv, optind);
+}
diff --git a/packages/bluez/bluez-cups-backend_3.24.bb b/packages/bluez/bluez-cups-backend_3.24.bb
new file mode 100644
index 0000000000..1c43313a8a
--- /dev/null
+++ b/packages/bluez/bluez-cups-backend_3.24.bb
@@ -0,0 +1,28 @@
+require bluez-utils3.inc
+
+PR = "r1"
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
diff --git a/packages/bluez/bluez-gnome_0.15.bb b/packages/bluez/bluez-gnome_0.15.bb
new file mode 100644
index 0000000000..e3aaeafeb3
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.15.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Bluetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+PR = "r1"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+RRECOMMENDS = "gnome-icon-theme"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.24.bb b/packages/bluez/bluez-gstreamer-plugin_3.24.bb
new file mode 100644
index 0000000000..e485d95c36
--- /dev/null
+++ b/packages/bluez/bluez-gstreamer-plugin_3.24.bb
@@ -0,0 +1,28 @@
+require bluez-utils3.inc
+
+PR = "r1"
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --enable-gstreamer \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-libs_3.24.bb b/packages/bluez/bluez-libs_3.24.bb
new file mode 100644
index 0000000000..eb515b4aba
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.24.bb
@@ -0,0 +1,4 @@
+require bluez-libs.inc
+
+PR = "r1"
+
diff --git a/packages/bluez/bluez-utils-alsa_3.24.bb b/packages/bluez/bluez-utils-alsa_3.24.bb
new file mode 100644
index 0000000000..5ef75b54a4
--- /dev/null
+++ b/packages/bluez/bluez-utils-alsa_3.24.bb
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+PR = "r1"
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --enable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils/hciattach-ti-bts.patch b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
index 217c32619d..1b208f7979 100644
--- a/packages/bluez/bluez-utils/hciattach-ti-bts.patch
+++ b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
@@ -1,6 +1,6 @@
--- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200
+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200
-@@ -58,6 +58,8 @@
+@@ -60,6 +60,8 @@
#define HCI_UART_3WIRE 2
#define HCI_UART_H4DS 3
@@ -9,15 +9,15 @@
struct uart_t {
char *type;
int m_id;
-@@ -67,6 +69,7 @@
- int speed;
+@@ -70,6 +72,7 @@
int flags;
+ char *bdaddr;
int (*init) (int fd, struct uart_t *u, struct termios *ti);
+ char *bts; /* bluetooth script */
};
#define FLOW_CTL 0x0001
-@@ -256,6 +259,114 @@
+@@ -279,6 +282,114 @@
return 0;
}
@@ -132,29 +132,17 @@
static int texas(int fd, struct uart_t *u, struct termios *ti)
{
struct timespec tm = {0, 50000};
-@@ -296,15 +407,26 @@
- } while (resp[4] != cmd[1] && resp[5] != cmd[2]);
-
- /* Verify manufacturer */
-- if ((resp[11] & 0xFF) != 0x0d)
-+ if (resp[11] != 0x0d)
- fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
-
- /* Print LMP version */
-- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
-+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
-
+@@ -328,6 +439,17 @@
/* Print LMP subversion */
-- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
+ fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
+
+ if ((resp[14] >> 2) == 3) {
++ /* BRF6150 */
+ int err;
++
+ nanosleep(&tm, NULL);
-
-+ /* BRF6150 */
-+ if ((err=brf6150( fd, u, ti )) != 0) {
-+ fprintf( stderr, "TI script failed (err=%d)\n",
-+ err );
++ if ((err = brf6150(fd, u, ti)) != 0) {
++ fprintf(stderr, "Texas module script failed (err=%d)\n", err);
+ return -1;
+ }
+ }
@@ -162,16 +150,16 @@
nanosleep(&tm, NULL);
return 0;
}
-@@ -1103,7 +1225,7 @@
+@@ -1204,7 +1326,7 @@
{
printf("hciattach - HCI UART driver initialization utility\n");
printf("Usage:\n");
-- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n");
-+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
+- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
printf("\thciattach -l\n");
}
-@@ -1118,11 +1240,12 @@
+@@ -1219,11 +1341,12 @@
struct sigaction sa;
struct pollfd p;
char dev[PATH_MAX];
@@ -185,7 +173,7 @@
switch(opt) {
case 'b':
send_break = 1;
-@@ -1144,6 +1267,10 @@
+@@ -1245,6 +1368,10 @@
init_speed = atoi(optarg);
break;
@@ -196,7 +184,7 @@
case 'l':
for (i = 0; uart[i].type; i++) {
printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1215,6 +1342,8 @@
+@@ -1320,6 +1447,8 @@
if (init_speed)
u->init_speed = init_speed;
@@ -205,17 +193,6 @@
memset(&sa, 0, sizeof(sa));
sa.sa_flags = SA_NOCLDSTOP;
sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
-@@ -37,7 +37,7 @@
-
- noinst_PROGRAMS = hcisecfilter ppporc
-
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
-
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
- hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200
+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200
@@ -0,0 +1,116 @@
@@ -487,3 +464,14 @@
+ }
+}
+
+--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200
++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200
+@@ -45,7 +45,7 @@
+
+ noinst_PROGRAMS = hcisecfilter ppporc
+
+-hciattach_SOURCES = hciattach.c hciattach_st.c
++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
+ hciattach_LDADD = @BLUEZ_LIBS@
+
+ hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index 8f787292ba..b995d6990c 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -8,10 +8,10 @@ RREPLACES = "bluez-utils-dbus"
RCONFLICTS_${PN} = "bluez-utils-nodbus"
LICENSE = "GPL"
-# ti patch doesn't apply, people using it should rediff it and send it upstream
+# ti patch should be sent it upstream!
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
- file://hcid.conf "
-# file://hciattach-ti-bts.patch;patch=1 \
+ file://hcid.conf \
+ file://hciattach-ti-bts.patch;patch=1"
S = "${WORKDIR}/bluez-utils-${PV}"
@@ -68,6 +68,8 @@ EXTRA_OECONF = " \
#disable it:
# --disable-hid2hci
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
do_install_append() {
install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb
index 48f147aa69..f96d1f2ba4 100644
--- a/packages/bluez/bluez-utils_3.23.bb
+++ b/packages/bluez/bluez-utils_3.23.bb
@@ -1,4 +1,5 @@
require bluez-utils3.inc
+PR = "r1"
# see bluez-utils3.inc for the explanation of these option
EXTRA_OECONF = " \
diff --git a/packages/bluez/bluez-utils_3.24.bb b/packages/bluez/bluez-utils_3.24.bb
new file mode 100644
index 0000000000..37365f67fc
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.24.bb
@@ -0,0 +1,30 @@
+require bluez-utils3.inc
+PR = "r2"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --disable-alsa \
+ --disable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index ca2db7e760..262d6afff1 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -94,7 +94,7 @@ pkg_prerm_${PN} () {
# providing its files, this will make update-alternatives work, but the update-rc.d part
# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
- cp -a /bin/busybox $tmpdir/
+ cp -pPR /bin/busybox $tmpdir/
ln -s /bin/busybox $tmpdir/[
ln -s /bin/busybox $tmpdir/test
ln -s /bin/busybox $tmpdir/head
diff --git a/packages/cacao/cacao-cldc.inc b/packages/cacao/cacao-cldc.inc
new file mode 100644
index 0000000000..86df369a32
--- /dev/null
+++ b/packages/cacao/cacao-cldc.inc
@@ -0,0 +1,64 @@
+DESCRIPTION = "Cacao-cldc is a Java Virtual Machine, which uses MIDPath CLDC as default Java core library"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "interpreters"
+
+DEPENDS = "zlib libtool classpath midpath-cldc cacaoh-cldc-native virtual/javac-native"
+
+# Avoid version number here, otherwise dpkg will expect a package name
+# and cannot be satisfied with a package that provides classpath.
+RDEPENDS = "midpath-cldc"
+
+PROVIDES = "cacao-cldc virtual/java-cldc"
+RPROVIDES_cacao-cldc = "java-cldc-runtime"
+
+inherit autotools update-alternatives