summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-10-05 15:31:39 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-10-05 15:31:39 +0000
commit5731ad06007b17aa25da00f99776de4c1bc16512 (patch)
treec098b80c1c5c9235e368508063f1391f29b9afe2
parent6265c89321d13996212881744128bd4ee25b202b (diff)
parent5e3b01d1b067e80b5e731c6cb384994e28d5f18d (diff)
merge of 'ae8724641e6c8131ac3706e49cd36a7e993fc697'
and 'e74e0c0ff5084d996f1c4b3b2c87244159a057ee'
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/distutils-base.bbclass3
-rw-r--r--classes/insane.bbclass2
-rw-r--r--conf/bitbake.conf30
-rw-r--r--conf/distro/angstrom-2008.1.conf1
-rw-r--r--conf/distro/include/angstromoabi.inc2
-rw-r--r--conf/distro/include/preferred-opie-versions-1.2.4.inc (renamed from conf/distro/include/preferred-opie-versions-1.2.4-pre.inc)206
-rw-r--r--conf/distro/include/sane-srcrevs.inc3
-rw-r--r--conf/sanity.conf2
-rwxr-xr-xcontrib/angstrom/build-feeds.sh2
-rwxr-xr-xcontrib/mtn2git/mtn2git.py2
-rw-r--r--packages/apache2/apache2-native_2.2.3.bb3
-rw-r--r--packages/gcc/gcc-4.2.4.inc5
-rw-r--r--packages/gcc/gcc-4.2.4/cppdefault_cross.patch12
-rw-r--r--packages/gcc/gcc-4.2.4/sh_unwind.patch18
-rw-r--r--packages/gcc/gcc-4.3.2.inc3
-rw-r--r--packages/gcc/gcc-4.3.2/sh_unwind.patch18
-rw-r--r--packages/gpsd/gpsd.inc2
-rw-r--r--packages/libopie/libopie2_1.2.4.bb9
-rw-r--r--packages/libopie/libopie2_cvs.bb3
-rw-r--r--packages/libopieobex/libopieobex0_1.2.4.bb6
-rw-r--r--packages/libopietooth/libopietooth1_1.2.4.bb4
-rw-r--r--packages/libqpe/libqpe-opie/no-include-pro.patch11
-rw-r--r--packages/libqpe/libqpe-opie_1.2.4.bb12
-rw-r--r--packages/libqtaux/libqtaux2_1.2.4.bb5
-rw-r--r--packages/libyaml/.mtn2git_empty0
-rw-r--r--packages/libyaml/libyaml_0.1.1.bb13
-rw-r--r--packages/linux/linux-2.6.24/time.h.patch25
-rw-r--r--packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2 (renamed from packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch)44
-rw-r--r--packages/linux/linux_2.6.24.bb5
-rw-r--r--packages/meta/distro-feed-configs.bb2
-rw-r--r--packages/mozilla/firefox-3.0.1+3.1a2/mozconfig2
-rw-r--r--packages/mozilla/firefox-3.0.1/mozconfig2
-rw-r--r--packages/mozilla/firefox_3.0.1.bb2
-rw-r--r--packages/mozilla/firefox_3.1a2.bb2
-rw-r--r--packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb6
-rw-r--r--packages/opie-aboutapplet/opie-aboutapplet_1.2.4.bb4
-rw-r--r--packages/opie-addressbook/opie-addressbook_1.2.4.bb5
-rw-r--r--packages/opie-advancedfm/opie-advancedfm_1.2.4.bb6
-rw-r--r--packages/opie-alarm/opie-alarm_1.2.4.bb7
-rw-r--r--packages/opie-appearance/opie-appearance_1.2.4.bb6
-rw-r--r--packages/opie-aqpkg/opie-aqpkg_1.2.4.bb6
-rw-r--r--packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb6
-rw-r--r--packages/opie-backgammon/opie-backgammon_1.2.4.bb6
-rw-r--r--packages/opie-backup/opie-backup_1.2.4.bb6
-rw-r--r--packages/opie-bartender/opie-bartender_1.2.4.bb6
-rw-r--r--packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb7
-rw-r--r--packages/opie-bluepin/opie-bluepin_1.2.4.bb4
-rw-r--r--packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb6
-rw-r--r--packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb7
-rw-r--r--packages/opie-bounce/opie-bounce_1.2.4.bb6
-rw-r--r--packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb6
-rw-r--r--packages/opie-button-settings/opie-button-settings_1.2.4.bb6
-rw-r--r--packages/opie-buzzword/opie-buzzword_1.2.4.bb7
-rw-r--r--packages/opie-calculator/opie-calculator_1.2.4.bb7
-rw-r--r--packages/opie-camera/opie-camera_1.2.4.bb6
-rw-r--r--packages/opie-checkbook/opie-checkbook_1.2.4.bb6
-rw-r--r--packages/opie-citytime/opie-citytime_1.2.4.bb6
-rw-r--r--packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb7
-rw-r--r--packages/opie-clock/opie-clock_1.2.4.bb6
-rw-r--r--packages/opie-clockapplet/opie-clockapplet_1.2.4.bb7
-rw-r--r--packages/opie-confeditor/opie-confeditor_1.2.4.bb6
-rw-r--r--packages/opie-console/files/.mtn2git_empty0
-rw-r--r--packages/opie-console/files/double_name.patch118
-rw-r--r--packages/opie-console/opie-console_1.2.4.bb8
-rw-r--r--packages/opie-dagger/opie-dagger_1.2.4.bb8
-rw-r--r--packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.4.bb4
-rw-r--r--packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.4.bb4
-rw-r--r--packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.4.bb5
-rw-r--r--packages/opie-datebook/opie-datebook_1.2.4.bb5
-rw-r--r--packages/opie-deco-flat/opie-deco-flat_1.2.4.bb4
-rw-r--r--packages/opie-deco-liquid/opie-deco-liquid_1.2.4.bb4
-rw-r--r--packages/opie-deco-polished/opie-deco-polished_1.2.4.bb4
-rw-r--r--packages/opie-doctab/opie-doctab_1.2.4.bb6
-rw-r--r--packages/opie-drawpad/opie-drawpad_1.2.4.bb6
-rw-r--r--packages/opie-dvorak/opie-dvorak_1.2.4.bb7
-rw-r--r--packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.4.bb6
-rw-r--r--packages/opie-euroconv/opie-euroconv_1.2.4.bb6
-rw-r--r--packages/opie-examples-python/opie-examples-python_1.2.4.bb6
-rw-r--r--packages/opie-examples/opie-examples_1.2.4.bb6
-rw-r--r--packages/opie-eye/opie-eye_1.2.4.bb7
-rw-r--r--packages/opie-fifteen/opie-fifteen_1.2.4.bb6
-rw-r--r--packages/opie-formatter/opie-formatter_1.2.4.bb6
-rw-r--r--packages/opie-freetype/opie-freetype_1.2.4.bb5
-rw-r--r--packages/opie-ftp/opie-ftp_1.2.4.bb6
-rw-r--r--packages/opie-ftplib/opie-ftplib_1.2.4.bb4
-rw-r--r--packages/opie-go/opie-go_1.2.4.bb6
-rw-r--r--packages/opie-gutenbrowser/opie-gutenbrowser_1.2.4.bb7
-rw-r--r--packages/opie-handwriting/opie-handwriting_1.2.4.bb6
-rw-r--r--packages/opie-help-en/opie-help-en_1.2.4.bb4
-rw-r--r--packages/opie-helpbrowser/opie-helpbrowser_1.2.4.bb6
-rw-r--r--packages/opie-homeapplet/opie-homeapplet_1.2.4.bb6
-rw-r--r--packages/opie-i18n/opie-i18n_1.2.4.bb6
-rw-r--r--packages/opie-i18n/opie-lrelease-native_1.2.4.bb5
-rw-r--r--packages/opie-i18n/opie-lupdate-native_1.2.4.bb6
-rw-r--r--packages/opie-icon-reload/opie-icon-reload_1.2.4.bb2
-rw-r--r--packages/opie-irc/opie-irc_1.2.4.bb8
-rw-r--r--packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb9
-rw-r--r--packages/opie-jumpx/opie-jumpx_1.2.4.bb6
-rw-r--r--packages/opie-kbill/opie-kbill_1.2.4.bb6
-rw-r--r--packages/opie-kcheckers/opie-kcheckers_1.2.4.bb6
-rw-r--r--packages/opie-keyboard/opie-keyboard_1.2.4.bb6
-rw-r--r--packages/opie-keypebble/opie-keypebble_1.2.4.bb6
-rw-r--r--packages/opie-keytabs/opie-keytabs_1.2.4.bb5
-rw-r--r--packages/opie-keyview/opie-keyview_1.2.4.bb5
-rw-r--r--packages/opie-kjumpx/opie-kjumpx_1.2.4.bb6
-rw-r--r--packages/opie-kpacman/opie-kpacman_1.2.4.bb7
-rw-r--r--packages/opie-language/opie-language_1.2.4.bb5
-rw-r--r--packages/opie-launcher-settings/opie-launcher-settings_1.2.4.bb6
-rw-r--r--packages/opie-libqrsync/opie-libqrsync_1.2.4.bb4
-rw-r--r--packages/opie-light-and-power/opie-light-and-power_1.2.4.bb6
-rw-r--r--packages/opie-lockapplet/opie-lockapplet_1.2.4.bb6
-rw-r--r--packages/opie-login/opie-login_1.2.4.bb10
-rw-r--r--packages/opie-logoutapplet/opie-logoutapplet_1.2.4.bb5
-rw-r--r--packages/opie-mail/opie-mail_1.2.4.bb6
-rw-r--r--packages/opie-mailapplet/opie-mailapplet_1.2.4.bb7
-rw-r--r--packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb5
-rw-r--r--packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb5
-rw-r--r--packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb6
-rw-r--r--packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb5
-rw-r--r--packages/opie-mediaplayer1/files/.mtn2git_empty0
-rw-r--r--packages/opie-mediaplayer1/files/double_name.patch11
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb6
-rw-r--r--packages/opie-mediaplayer1/opie-mediaplayer1_1.2.4.bb2
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.4.bb16
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb16
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb16
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb16
-rw-r--r--packages/opie-mediaplayer2/opie-mediaplayer2_1.2.4.bb6
-rw-r--r--packages/opie-mediummount/opie-mediummount_1.2.4.bb6
-rw-r--r--packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb7
-rw-r--r--packages/opie-mindbreaker/opie-mindbreaker_1.2.4.bb6
-rw-r--r--packages/opie-minesweep/opie-minesweep_1.2.4.bb6
-rw-r--r--packages/opie-multikey/opie-multikey_1.2.4.bb9
-rw-r--r--packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb6
-rw-r--r--packages/opie-networkapplet/opie-networkapplet_1.2.4.bb6
-rw-r--r--packages/opie-networksettings/opie-networksettings_1.2.4.bb9
-rw-r--r--packages/opie-notes/opie-notes_1.2.4.bb5
-rw-r--r--packages/opie-notesapplet/opie-notesapplet_1.2.4.bb5
-rw-r--r--packages/opie-odict/opie-odict_1.2.4.bb6
-rw-r--r--packages/opie-oxygen/opie-oxygen_1.2.4.bb7
-rw-r--r--packages/opie-oyatzee/opie-oyatzee_1.2.4.bb6
-rw-r--r--packages/opie-packagemanager/opie-packagemanager_1.2.4.bb6
-rw-r--r--packages/opie-parashoot/opie-parashoot_1.2.4.bb6
-rw-r--r--packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb6
-rw-r--r--packages/opie-pickboard/opie-pickboard_1.2.4.bb5
-rw-r--r--packages/opie-pics/opie-pics_1.2.4.bb8
-rw-r--r--packages/opie-pimconverter/opie-pimconverter_1.2.4.bb6
-rw-r--r--packages/opie-powerchord/opie-powerchord_1.2.4.bb7
-rw-r--r--packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb7
-rw-r--r--packages/opie-qasteroids/opie-qasteroids_1.2.4.bb6
-rw-r--r--packages/opie-qcop/opie-qcop_1.2.4.bb6
-rw-r--r--packages/opie-qss/opie-qss_1.2.4.bb5
-rw-r--r--packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb5
-rw-r--r--packages/opie-rdesktop/opie-rdesktop_1.2.4.bb6
-rw-r--r--packages/opie-reader/opie-reader_1.2.4.bb8
-rw-r--r--packages/opie-recorder/opie-recorder_1.2.4.bb6
-rw-r--r--packages/opie-remote/opie-remote_1.2.4.bb6
-rw-r--r--packages/opie-restartapplet/opie-restartapplet_1.2.4.bb5
-rw-r--r--packages/opie-restartapplet2/opie-restartapplet2_1.2.4.bb6
-rw-r--r--packages/opie-rotateapplet/opie-rotateapplet_1.2.4.bb5
-rw-r--r--packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb7
-rw-r--r--packages/opie-search/opie-search_1.2.4.bb6
-rw-r--r--packages/opie-security/opie-security_1.2.4.bb17
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_1.2.3.bb5
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_1.2.4.bb5
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_1.2.3.bb5
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_1.2.4.bb5
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_1.2.4.bb5
-rw-r--r--packages/opie-sfcave/opie-sfcave_1.2.4.bb6
-rw-r--r--packages/opie-sh-snes/opie-sh-snes_1.2.4.bb3
-rw-r--r--packages/opie-sh/opie-sh_1.2.4.bb11
-rw-r--r--packages/opie-sheet/opie-sheet_1.2.4.bb6
-rw-r--r--packages/opie-snake/opie-snake_1.2.4.bb6
-rw-r--r--packages/opie-solitaire/opie-solitaire_1.2.4.bb6
-rw-r--r--packages/opie-sounds/opie-sounds_1.2.4.bb5
-rw-r--r--packages/opie-sshkeys/opie-sshkeys_1.2.4.bb6
-rw-r--r--packages/opie-stumbler/opie-stumbler_1.2.4.bb6
-rw-r--r--packages/opie-style-flat/opie-style-flat_1.2.4.bb4
-rw-r--r--packages/opie-style-fresh/opie-style-fresh_1.2.4.bb4
-rw-r--r--packages/opie-style-liquid/opie-style-liquid_1.2.4.bb4
-rw-r--r--packages/opie-style-metal/opie-style-metal_1.2.4.bb4
-rw-r--r--packages/opie-style-phase/opie-style-phase_1.2.4.bb4
-rw-r--r--packages/opie-style-web/opie-style-web_1.2.4.bb4
-rw-r--r--packages/opie-suspendapplet/opie-suspendapplet_1.2.4.bb5
-rw-r--r--packages/opie-symlinker/opie-symlinker_1.2.4.bb4
-rw-r--r--packages/opie-sysinfo/opie-sysinfo_1.2.4.bb7
-rw-r--r--packages/opie-systemtime/opie-systemtime_1.2.4.bb7
-rw-r--r--packages/opie-tableviewer/opie-tableviewer_1.2.4.bb6
-rw-r--r--packages/opie-taskbar/opie-taskbar-images_1.2.4.bb6
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.4.bb17
-rw-r--r--packages/opie-tetrix/opie-tetrix_1.2.4.bb6
-rw-r--r--packages/opie-textedit/opie-textedit_1.2.4.bb6
-rw-r--r--packages/opie-theme/opie-theme_1.2.4.bb6
-rw-r--r--packages/opie-tictac/opie-tictac_1.2.4.bb6
-rw-r--r--packages/opie-tinykate/opie-tinykate_1.2.4.bb7
-rw-r--r--packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.4.bb4
-rw-r--r--packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.4.bb4
-rw-r--r--packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.4.bb4
-rw-r--r--packages/opie-today-mailplugin/opie-today-mailplugin_1.2.4.bb4
-rw-r--r--packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.4.bb6
-rw-r--r--packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.4.bb4
-rw-r--r--packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.4.bb5
-rw-r--r--packages/opie-today/opie-today_1.2.4.bb6
-rw-r--r--packages/opie-todo/opie-todo_1.2.4.bb7
-rw-r--r--packages/opie-tonleiter/opie-tonleiter_1.2.4.bb6
-rw-r--r--packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb5
-rw-r--r--packages/opie-vmemo-settings/opie-vmemo-settings_1.2.4.bb5
-rw-r--r--packages/opie-vmemo/opie-vmemo_1.2.4.bb6
-rw-r--r--packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb6
-rw-r--r--packages/opie-vtapplet/opie-vtapplet_1.2.4.bb5
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_1.2.4.bb6
-rw-r--r--packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb5
-rw-r--r--packages/opie-wordgame/opie-wordgame_1.2.4.bb6
-rw-r--r--packages/opie-write/opie-write_1.2.4.bb6
-rw-r--r--packages/opie-zkbapplet/opie-zkbapplet_1.2.4.bb7
-rw-r--r--packages/opie-zlines/opie-zlines_1.2.4.bb6
-rw-r--r--packages/opie-zsafe/opie-zsafe_1.2.4.bb6
-rw-r--r--packages/opie-zsame/opie-zsame_1.2.4.bb6
-rw-r--r--packages/python/python-cython-native_0.9.6.14.bb9
-rw-r--r--packages/python/python-cython-native_0.9.8.bb3
-rw-r--r--packages/python/python-cython_0.9.6.14.bb13
-rw-r--r--packages/python/python-cython_0.9.8.bb4
-rw-r--r--packages/python/python-pyrex-native_0.9.8.4.bb1
-rw-r--r--packages/python/python-pyrex_0.9.8.4.bb2
-rw-r--r--packages/python/python-pyyaml/.mtn2git_empty0
-rw-r--r--packages/python/python-pyyaml/setup.py64
-rw-r--r--packages/python/python-pyyaml_3.05.bb10
-rw-r--r--packages/python/python-pyyaml_svn.bb20
-rw-r--r--packages/python/python-setuptools_0.6c8.bb2
-rw-r--r--packages/starling/starling_svn.bb3
231 files changed, 1551 insertions, 278 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 540b891669..ac73e909f8 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -909,7 +909,7 @@ def get_subpkgedata_fn(pkg, d):
import bb, os
archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ")
archs.reverse()
- pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d)
+ pkgdata = bb.data.expand('${TMPDIR}/pkgdata/', d)
targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d)
for arch in archs:
fn = pkgdata + arch + targetdir + pkg
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index c4551ace83..70155619b3 100644
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -2,6 +2,9 @@ EXTRA_OEMAKE = ""
DEPENDS += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
RDEPENDS += "python-core"
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
def python_dir(d):
import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index a599689e8c..6608666e4d 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -60,6 +60,8 @@ def package_qa_get_machine_dict():
"i686": ( 3, 0, 0, True, True),
"mipsel": ( 8, 0, 0, True, True),
"avr32": (6317, 0, 0, False, True),
+ "sh4": (42, 0, 0, True, True),
+
},
"uclinux-uclibc" : {
"bfin": ( 106, 0, 0, True, True),
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 75eab15d9b..8fd24c637c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -94,11 +94,14 @@ PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}
MULTIMACH_ARCH = "${PACKAGE_ARCH}"
MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
MULTIMACH_HOST_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}"
+BASEPKG_HOST_SYS = "${BASE_PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
+BASEPKG_TARGET_SYS = "${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
# select proper CPU to get binary locales generated
QEMU_OPTIONS = ""
QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5"
QEMU_OPTIONS_armv6 = "-cpu arm1136"
+QEMU_OPTIONS_armv7a = "-cpu cortex-a8"
##################################################################
# Date/time variables.
@@ -236,13 +239,15 @@ STAGING_DIR = "${TMPDIR}/staging"
STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
-STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}"
+STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${MULTIMACH_HOST_SYS}"
STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
-STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}"
+# This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
+# specific packages - hack around it for now.
+STAGING_DIR_HOST = "${STAGING_DIR}/${BASEPKG_HOST_SYS}"
STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
@@ -252,7 +257,9 @@ STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
-STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}"
+# This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine
+# specific packages - hack around it for now.
+STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
@@ -262,7 +269,7 @@ DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
-PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
+PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
SDK_PREFIX = "/usr/local/${SDK_NAME}"
@@ -282,6 +289,7 @@ IMAGE_ROOTFS = "${TMPDIR}/rootfs"
IMAGE_BASENAME = "${PN}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
+IMAGE_EXTRA_SPACE = 10240
IMAGE_CMD = ""
IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
@@ -322,9 +330,9 @@ EXTRA_IMAGEDEPENDS = ""
# Toolchain info.
##################################################################
-CROSS_DIR = "${TMPDIR}/cross"
+CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
CROSS_DATADIR = "${CROSS_DIR}/share"
-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:"
+PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbindir}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:${STAGING_DIR_NATIVE}${layout_base_sbindir}:${STAGING_DIR_NATIVE}${layout_base_bindir}:"
export PATH
##################################################################
@@ -404,7 +412,7 @@ EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
##################################################################
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-DEBUG_OPTIMIZATION = "-O -g"
+DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer -g"
SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][bb.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
BUILD_OPTIMIZATION = "-O2"
@@ -462,7 +470,7 @@ FETCHCMD_hg = "/usr/bin/env hg"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
-FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
+FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
RESUMECOMMAND = "ERROR, this must be a BitBake bug"
RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
@@ -521,9 +529,9 @@ SLOT = "0"
# Other
-export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
-export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}"
-export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}"
+export PKG_CONFIG_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}${layout_libdir}/pkgconfig"
+export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
+export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index da0aabee38..33349fcde1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -26,6 +26,7 @@ INHERIT += "packaged-staging"
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2008-preferred-versions.inc
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
index bb7bc45fbd..81ffed71f8 100644
--- a/conf/distro/include/angstromoabi.inc
+++ b/conf/distro/include/angstromoabi.inc
@@ -1,4 +1,4 @@
require conf/distro/include/angstrom.inc
PACKAGE_ARCH = "arm-oabi"
-
+BASE_PACKAGE_ARCH = "arm-oabi"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4.inc
index 10d0833c6c..cc5dbd53b9 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.4.inc
@@ -1,12 +1,9 @@
#
# Default versions
QTE_VERSION ?= "2.3.10"
+OPIE_VERSION ?= "1.2.4"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20080914"
-OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
-OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
-
#
#
# Opie libraries
@@ -15,21 +12,12 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE
PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
PREFERRED_VERSION_qte = "${QTE_VERSION}"
-
PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}"
-
-SRCDATE_libopie2 ?= "${OPIE_SRCDATE}"
-SRCDATE_libopieobex0 = "${OPIE_SRCDATE}"
-SRCDATE_libopietooth1 = "${OPIE_SRCDATE}"
-SRCDATE_libqpe-opie = "${OPIE_SRCDATE}"
-SRCDATE_libqtaux2 = "${OPIE_SRCDATE}"
-SRCDATE_libmailwrapper = "${OPIE_SRCDATE}"
-
#
# Opie applications
#
@@ -141,7 +129,6 @@ PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
@@ -220,195 +207,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}"
-
PREFERRED_VERSION_konqueror-embedded = "20070316"
-
-
-SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-addressbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-advancedfm = "${OPIE_SRCDATE}"
-SRCDATE_opie-alarm = "${OPIE_SRCDATE}"
-SRCDATE_opie-appearance = "${OPIE_SRCDATE}"
-SRCDATE_opie-aqpkg = "${OPIE_SRCDATE}"
-SRCDATE_opie-autorotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-backgammon = "${OPIE_SRCDATE}"
-SRCDATE_opie-backup = "${OPIE_SRCDATE}"
-SRCDATE_opie-bartender = "${OPIE_SRCDATE}"
-SRCDATE_opie-batteryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-bluepin ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothapplet ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bluetoothmanager ?= "${OPIE_SRCDATE}"
-SRCDATE_opie-bounce = "${OPIE_SRCDATE}"
-SRCDATE_opie-brightnessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-button-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-buzzword = "${OPIE_SRCDATE}"
-SRCDATE_opie-calculator = "${OPIE_SRCDATE}"
-SRCDATE_opie-calibrate = "${OPIE_SRCDATE}"
-SRCDATE_opie-camera = "${OPIE_SRCDATE}"
-SRCDATE_opie-cardmon = "${OPIE_SRCDATE}"
-SRCDATE_opie-checkbook = "${OPIE_SRCDATE}"
-SRCDATE_opie-citytime = "${OPIE_SRCDATE}"
-SRCDATE_opie-clipboardapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-clock = "${OPIE_SRCDATE}"
-SRCDATE_opie-confeditor = "${OPIE_SRCDATE}"
-SRCDATE_opie-console = "${OPIE_SRCDATE}"
-SRCDATE_opie-dagger = "${OPIE_SRCDATE}"
-SRCDATE_opie-dasher = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-chrisholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-nationalholidayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-datebook-birthdayplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-deco-polished = "${OPIE_SRCDATE}"
-SRCDATE_opie-doctab = "${OPIE_SRCDATE}"
-SRCDATE_opie-drawpad = "${OPIE_SRCDATE}"
-SRCDATE_opie-dvorak = "${OPIE_SRCDATE}"
-SRCDATE_opie-embeddedkonsole = "${OPIE_SRCDATE}"
-SRCDATE_opie-euroconv = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples-python = "${OPIE_SRCDATE}"
-SRCDATE_opie-examples = "${OPIE_SRCDATE}"
-SRCDATE_opie-eye = "${OPIE_SRCDATE}"
-SRCDATE_opie-fifteen = "${OPIE_SRCDATE}"
-SRCDATE_opie-formatter = "${OPIE_SRCDATE}"
-SRCDATE_opie-freetype = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftplib = "${OPIE_SRCDATE}"
-SRCDATE_opie-ftp = "${OPIE_SRCDATE}"
-SRCDATE_opie-go = "${OPIE_SRCDATE}"
-SRCDATE_opie-gutenbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-handwriting = "${OPIE_SRCDATE}"
-SRCDATE_opie-helpbrowser = "${OPIE_SRCDATE}"
-SRCDATE_opie-help-en = "${OPIE_SRCDATE}"
-SRCDATE_opie-homeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-i18n = "${OPIE_SRCDATE}"
-SRCDATE_opie-lrelease-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-lupdate-native = "${OPIE_SRCDATE}"
-SRCDATE_opie-icon-reload = "${OPIE_SRCDATE}"
-SRCDATE_opie-irc = "${OPIE_SRCDATE}"
-SRCDATE_opie-irdaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-jumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kbill = "${OPIE_SRCDATE}"
-SRCDATE_opie-kcheckers = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-keypebble = "${OPIE_SRCDATE}"
-SRCDATE_opie-keytabs = "${OPIE_SRCDATE}"
-SRCDATE_opie-keyview = "${OPIE_SRCDATE}"
-SRCDATE_opie-kjumpx = "${OPIE_SRCDATE}"
-SRCDATE_opie-kpacman = "${OPIE_SRCDATE}"
-SRCDATE_opie-language = "${OPIE_SRCDATE}"
-SRCDATE_opie-launcher-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-libqrsync = "${OPIE_SRCDATE}"
-SRCDATE_opie-light-and-power = "${OPIE_SRCDATE}"
-SRCDATE_opie-lockapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-login = "${OPIE_SRCDATE}"
-SRCDATE_opie-logoutapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mailapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mail = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmadplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libmodplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libtremorplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-libwavplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1-core = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer1 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-default-landscape = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-pod = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediaplayer2-skin-techno = "${OPIE_SRCDATE}"
-SRCDATE_opie-mediummount = "${OPIE_SRCDATE}"
-SRCDATE_opie-memoryapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-mindbreaker = "${OPIE_SRCDATE}"
-SRCDATE_opie-minesweep = "${OPIE_SRCDATE}"
-SRCDATE_opie-mobilemsg = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikeyapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-multikey = "${OPIE_SRCDATE}"
-SRCDATE_opie-networkapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-networksettings = "${OPIE_SRCDATE}"
-SRCDATE_opie-notesapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-odict = "${OPIE_SRCDATE}"
-SRCDATE_opie-osearch = "${OPIE_SRCDATE}"
-SRCDATE_opie-oxygen = "${OPIE_SRCDATE}"
-SRCDATE_opie-oyatzee = "${OPIE_SRCDATE}"
-SRCDATE_opie-packagemanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-parashoot = "${OPIE_SRCDATE}"
-SRCDATE_opie-pcmciaapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-performance = "${OPIE_SRCDATE}"
-SRCDATE_opie-pickboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-pics = "${OPIE_SRCDATE}"
-SRCDATE_opie-pimconverter = "${OPIE_SRCDATE}"
-SRCDATE_opie-powerchord = "${OPIE_SRCDATE}"
-SRCDATE_opie-pyquicklaunchapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-qasteroids = "${OPIE_SRCDATE}"
-SRCDATE_opie-qcop = "${OPIE_SRCDATE}"
-SRCDATE_opie-quicklauncher = "${OPIE_SRCDATE}"
-SRCDATE_opie-qss = "${OPIE_SRCDATE}"
-SRCDATE_opie-rdesktop = "${OPIE_SRCDATE}"
-SRCDATE_opie-reader = "${OPIE_SRCDATE}"
-SRCDATE_opie-recorder = "${OPIE_SRCDATE}"
-SRCDATE_opie-remote = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet2 = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-restartapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-rotateapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-screenshotapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-search = "${OPIE_SRCDATE}"
-SRCDATE_opie-security = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-blueping = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-dummy = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-notice = "${OPIE_SRCDATE}"
-SRCDATE_opie-securityplugin-pin = "${OPIE_SRCDATE}"
-SRCDATE_opie-sfcave = "${OPIE_SRCDATE}"
-SRCDATE_opie-sheet = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh = "${OPIE_SRCDATE}"
-SRCDATE_opie-showimg = "${OPIE_SRCDATE}"
-SRCDATE_opie-snake = "${OPIE_SRCDATE}"
-SRCDATE_opie-solitaire = "${OPIE_SRCDATE}"
-SRCDATE_opie-sshkeys = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-flat = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-fresh = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-liquid = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-metal = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-phase = "${OPIE_SRCDATE}"
-SRCDATE_opie-style-web = "${OPIE_SRCDATE}"
-SRCDATE_opie-sounds = "${OPIE_SRCDATE}"
-SRCDATE_opie-suspendapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-symlinker = "${OPIE_SRCDATE}"
-SRCDATE_opie-sysinfo = "${OPIE_SRCDATE}"
-SRCDATE_opie-systemtime = "${OPIE_SRCDATE}"
-SRCDATE_opie-tableviewer = "${OPIE_SRCDATE}"
-SRCDATE_opie-tabmanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar = "${OPIE_SRCDATE}"
-SRCDATE_opie-taskbar-images = "${OPIE_SRCDATE}"
-SRCDATE_opie-tetrix = "${OPIE_SRCDATE}"
-SRCDATE_opie-textedit = "${OPIE_SRCDATE}"
-SRCDATE_opie-theme = "${OPIE_SRCDATE}"
-SRCDATE_opie-tictac = "${OPIE_SRCDATE}"
-SRCDATE_opie-tinykate = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-addressbookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-datebookplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-fortuneplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-mailplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-stocktickerplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-todolistplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-today-weatherplugin = "${OPIE_SRCDATE}"
-SRCDATE_opie-todo = "${OPIE_SRCDATE}"
-SRCDATE_opie-tonleiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-unikeyboard = "${OPIE_SRCDATE}"
-SRCDATE_opie-usermanager = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo = "${OPIE_SRCDATE}"
-SRCDATE_opie-vmemo-settings = "${OPIE_SRCDATE}"
-SRCDATE_opie-volumeapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-vtapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wellenreiter = "${OPIE_SRCDATE}"
-SRCDATE_opie-wirelessapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-wordgame = "${OPIE_SRCDATE}"
-SRCDATE_opie-write = "${OPIE_SRCDATE}"
-SRCDATE_opie-zkbapplet = "${OPIE_SRCDATE}"
-SRCDATE_opie-zlines = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsafe = "${OPIE_SRCDATE}"
-SRCDATE_opie-zsame = "${OPIE_SRCDATE}"
-SRCDATE_opie-sh-snes = "${OPIE_SRCDATE}"
-SRCDATE_opie-stumbler = "${OPIE_SRCDATE}"
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 56249594f8..7ccbd3248e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -44,7 +44,7 @@ SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e"
-SRCREV_pn-fso-gpsd ?= "daf0729351631f93f9f2f22af33d46658c6f5d68"
+SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
@@ -167,6 +167,7 @@ SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-python-pyyaml = "294"
SRCREV_pn-remoko = "115"
SRCREV_pn-remoko-server = "115"
SRCREV_pn-s3c24xx-gpio ?= "4130"
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 35d9d32de1..e5fe74894d 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -11,7 +11,7 @@ BB_MIN_VERSION = "1.8.10"
# that breaks the format and have been previously discussed on the mailing list
# with general agreement from the core team.
#
-SANITY_ABI = "1"
+SANITY_ABI = "2"
SANITY_ABIFILE = "${TMPDIR}/abi_version"
INHERIT += "sanity"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index bf640d872e..2b00692625 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -37,7 +37,7 @@ do_report_success() {
echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
}
-for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800
+for machine in beagleboard efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800
do
BUILD_MACHINE=$machine
BUILD_CLEAN="qmake-native qmake2-native qt-x11-free"
diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py
index 1de3010756..a4b43721d9 100755
--- a/contrib/mtn2git/mtn2git.py
+++ b/contrib/mtn2git/mtn2git.py
@@ -255,6 +255,8 @@ def fast_import(ops, revision):
# could probably happen if we have more than one parent (on a merge)?
cmd = []
+ if len(revision["parent"]) == 0:
+ cmd += ["reset refs/heads/%s" % branch]
cmd += ["commit refs/heads/%s" % branch]
cmd += ["mark :%s" % get_mark(revision["revision"])]
cmd += ["author <%s> %s" % (revision["author"], get_git_date(revision))]
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index ebf68b52e5..e6f9f4d3ab 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
inherit cross
-PR="r6"
+PR="r7"
SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
S = "${WORKDIR}/httpd-${PV}"
@@ -13,6 +13,7 @@ do_configure () {
}
do_stage () {
+ install -d ${STAGING_BINDIR}
cp srclib/pcre/dftables ${STAGING_BINDIR}
cp server/gen_test_char ${STAGING_BINDIR}
cp srclib/apr/apr-1-config ${STAGING_BINDIR}
diff --git a/packages/gcc/gcc-4.2.4.inc b/packages/gcc/gcc-4.2.4.inc
index ccca7705c1..b21569b270 100644
--- a/packages/gcc/gcc-4.2.4.inc
+++ b/packages/gcc/gcc-4.2.4.inc
@@ -63,6 +63,11 @@ PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \
+ file://cppdefault_cross.patch;patch=1 \
+ "
+
+
# Language Overrides
FORTRAN = ""
FORTRAN_linux-gnueabi = ",fortran"
diff --git a/packages/gcc/gcc-4.2.4/cppdefault_cross.patch b/packages/gcc/gcc-4.2.4/cppdefault_cross.patch
new file mode 100644
index 0000000000..dfdbeb32cf
--- /dev/null
+++ b/packages/gcc/gcc-4.2.4/cppdefault_cross.patch
@@ -0,0 +1,12 @@
+Index: gcc-4.2.4/gcc/cppdefault.c
+===================================================================
+--- gcc-4.2.4.orig/gcc/cppdefault.c 2008-10-04 00:07:13.161548578 +0200
++++ gcc-4.2.4/gcc/cppdefault.c 2008-10-04 00:07:32.548205652 +0200
+@@ -39,6 +39,7 @@
+ # undef STANDARD_INCLUDE_DIR
+ #else
+ # undef CROSS_INCLUDE_DIR
++# undef STANDARD_INCLUDE_DIR
+ #endif
+
+ const struct default_include cpp_include_defaults[]
diff --git a/packages/gcc/gcc-4.2.4/sh_unwind.patch b/packages/gcc/gcc-4.2.4/sh_unwind.patch
new file mode 100644
index 0000000000..94921636bc
--- /dev/null
+++ b/packages/gcc/gcc-4.2.4/sh_unwind.patch
@@ -0,0 +1,18 @@
+Index: gcc-4.2.4/gcc/config/sh/linux-unwind.h
+===================================================================
+--- gcc-4.2.4.orig/gcc/config/sh/linux-unwind.h 2008-10-04 00:05:29.434889757 +0200
++++ gcc-4.2.4/gcc/config/sh/linux-unwind.h 2008-10-04 00:06:02.594883544 +0200
+@@ -26,6 +26,7 @@
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
+
++#ifndef inhibit_libc
+ /* Do code reading to identify a signal frame, and set the frame
+ state data appropriately. See unwind-dw2.c for the structs. */
+
+@@ -251,3 +252,5 @@
+ return _URC_NO_REASON;
+ }
+ #endif /* defined (__SH5__) */
++
++#endif /* defined inhibit_libc */
diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc
index 49b2a63b70..21c08ffccc 100644
--- a/packages/gcc/gcc-4.3.2.inc
+++ b/packages/gcc/gcc-4.3.2.inc
@@ -59,6 +59,9 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
+SRC_URI_append_sh4 = " file://sh_unwind.patch;patch=1 \
+ "
+
# Language Overrides
FORTRAN = ""
JAVA = ""
diff --git a/packages/gcc/gcc-4.3.2/sh_unwind.patch b/packages/gcc/gcc-4.3.2/sh_unwind.patch
new file mode 100644
index 0000000000..94921636bc
--- /dev/null
+++ b/packages/gcc/gcc-4.3.2/sh_unwind.patch
@@ -0,0 +1,18 @@
+Index: gcc-4.2.4/gcc/config/sh/linux-unwind.h
+===================================================================
+--- gcc-4.2.4.orig/gcc/config/sh/linux-unwind.h 2008-10-04 00:05:29.434889757 +0200
++++ gcc-4.2.4/gcc/config/sh/linux-unwind.h 2008-10-04 00:06:02.594883544 +0200
+@@ -26,6 +26,7 @@
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
+
++#ifndef inhibit_libc
+ /* Do code reading to identify a signal frame, and set the frame
+ state data appropriately. See unwind-dw2.c for the structs. */
+
+@@ -251,3 +252,5 @@
+ return _URC_NO_REASON;
+ }
+ #endif /* defined (__SH5__) */
++
++#endif /* defined inhibit_libc */
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index 06be2fe2eb..82f541ea99 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -25,6 +25,8 @@ INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
export LDFLAGS = "-L${STAGING_LIBDIR} -lm"
+export STAGING_INCDIR
+export STAGING_LIBDIR
do_compile_prepend() {
export BUILD_SYS="${BUILD_SYS}"
diff --git a/packages/libopie/libopie2_1.2.4.bb b/packages/libopie/libopie2_1.2.4.bb
new file mode 100644
index 0000000000..ef1a4fb360
--- /dev/null
+++ b/packages/libopie/libopie2_1.2.4.bb
@@ -0,0 +1,9 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
+ file://include.pro \
+ file://c7x0_w100_disable.patch;patch=1"
+
+SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 338ddd28bd..c9f11b23e2 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,11 +1,12 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r11"
+PR = "r12"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
+ file://c7x0_w100_disable.patch;patch=1 \
file://include.pro"
# Patches merged upstream, keep for reference (for 1.2.2)
diff --git a/packages/libopieobex/libopieobex0_1.2.4.bb b/packages/libopieobex/libopieobex0_1.2.4.bb
new file mode 100644
index 0000000000..5e02c8860d
--- /dev/null
+++ b/packages/libopieobex/libopieobex0_1.2.4.bb
@@ -0,0 +1,6 @@
+require libopieobex0.inc
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ file://disable-bt-check.patch;patch=1"
diff --git a/packages/libopietooth/libopietooth1_1.2.4.bb b/packages/libopietooth/libopietooth1_1.2.4.bb
new file mode 100644
index 0000000000..cb625ff687
--- /dev/null
+++ b/packages/libopietooth/libopietooth1_1.2.4.bb
@@ -0,0 +1,4 @@
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
+PR = "r0"
+
+require libopietooth1.inc
diff --git a/packages/libqpe/libqpe-opie/no-include-pro.patch b/packages/libqpe/libqpe-opie/no-include-pro.patch
new file mode 100644
index 0000000000..5a836ca795
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/no-include-pro.patch
@@ -0,0 +1,11 @@
+--- library/library.pro.old 2008-10-01 23:43:30.000000000 +0100
++++ library/library.pro 2008-10-01 23:43:49.000000000 +0100
+@@ -134,8 +134,6 @@
+ DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
+ VERSION = 1.5.0.1
+
+-include( $(OPIEDIR)/include.pro )
+-
+ contains( CONFIG, LIBQPE_WITHROHFEEDBACK ){
+ DEFINES += OPIE_WITHROHFEEDBACK
+ SOURCES += backend/rohfeedback.cpp
diff --git a/packages/libqpe/libqpe-opie_1.2.4.bb b/packages/libqpe/libqpe-opie_1.2.4.bb
new file mode 100644
index 0000000000..8c2abc7af6
--- /dev/null
+++ b/packages/libqpe/libqpe-opie_1.2.4.bb
@@ -0,0 +1,12 @@
+require ${PN}.inc
+
+PR = "r0"
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
+ file://fix-titleheight.patch;patch=1 \
+ file://unbreak-logging.patch;patch=1 \
+ file://citytime-path-2.patch;patch=1 \
+ file://no-include-pro.patch;patch=1 \
+ "
+
diff --git a/packages/libqtaux/libqtaux2_1.2.4.bb b/packages/libqtaux/libqtaux2_1.2.4.bb
new file mode 100644
index 0000000000..5d971e35d1
--- /dev/null
+++ b/packages/libqtaux/libqtaux2_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux"
diff --git a/packages/libyaml/.mtn2git_empty b/packages/libyaml/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libyaml/.mtn2git_empty
diff --git a/packages/libyaml/libyaml_0.1.1.bb b/packages/libyaml/libyaml_0.1.1.bb
new file mode 100644
index 0000000000..4279f50b94
--- /dev/null
+++ b/packages/libyaml/libyaml_0.1.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "LibYAML is a YAML 1.1 parser and emitter written in C."
+HOMEPAGE = "http://pyyaml.org/wiki/LibYAML"
+SECTION = "libs/devel"
+LICENSE = "MIT"
+
+SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz"
+S = "${WORKDIR}/yaml-${PV}"
+
+inherit autotools
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/linux/linux-2.6.24/time.h.patch b/packages/linux/linux-2.6.24/time.h.patch
new file mode 100644
index 0000000000..fd22f3a01d
--- /dev/null
+++ b/packages/linux/linux-2.6.24/time.h.patch
@@ -0,0 +1,25 @@
+....since some architectures don't support __udivdi3() (and
+ we don't want to use that, anyway).
+
+ Signed-off-by: Segher Boessenkool
+ ---
+ include/linux/time.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+
+Index: linux-2.6.24/include/linux/time.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/time.h 2008-06-23 11:17:09.021841180 +0200
++++ linux-2.6.24/include/linux/time.h 2008-06-23 11:18:34.445167140 +0200
+@@ -173,6 +173,11 @@
+ {
+ ns += a->tv_nsec;
+ while(unlikely(ns >= NSEC_PER_SEC)) {
++ /* The following asm() prevents the compiler from
++ * optimising this loop into a modulo operation.
++ */
++ asm("" : "+r"(ns));
++
+ ns -= NSEC_PER_SEC;
+ a->tv_sec++;
+ }
diff --git a/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2
index 156b87cdbd..e47d99288f 100644
--- a/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch
+++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2
@@ -1,6 +1,6 @@
diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/arm/mach-sa1100/simpad.c
---- linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/arch/arm/mach-sa1100/simpad.c 2008-02-20 21:10:00.000000000 +0100
+--- linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c 2008-10-04 21:47:24.000000000 +0200
++++ linux-2.6.24/arch/arm/mach-sa1100/simpad.c 2008-10-04 22:01:20.000000000 +0200
@@ -1,5 +1,15 @@
/*
* linux/arch/arm/mach-sa1100/simpad.c
@@ -154,7 +154,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
static void __init simpad_map_io(void)
{
sa1100_map_io();
-@@ -144,13 +216,12 @@
+@@ -144,23 +216,45 @@
set_cs3_bit (EN1 | EN0 | LED2_ON | DISPLAY_ON | RS232_ON |
ENABLE_5V | RESET_SIMCARD | DECT_POWER_ON);
@@ -166,11 +166,37 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
sa1100_register_uart(1, 1); /* DECT */
- // Reassign UART 1 pins
-+ /* Reassign UART 1 pins */
++ /* Reassign UART 1 pins */
++ /* TEST SOME OLD KERNEL STUFF INSTEAD
GAFR |= GPIO_UART_TXD | GPIO_UART_RXD;
GPDR |= GPIO_UART_TXD | GPIO_LDD13 | GPIO_LDD15;
GPDR &= ~GPIO_UART_RXD;
-@@ -160,7 +231,6 @@
+ PPAR |= PPAR_UPR;
++ */
++
++ // txd and rxd use their alternate function
++ GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD);
++
++ // the control lines are gpio
++ GAFR &= ~(GPIO_UART1_RTS | GPIO_UART1_CTS | GPIO_UART1_DCD);
++ GAFR &= ~(GPIO_UART1_DSR | GPIO_UART1_DTR);
++ GAFR &= ~(GPIO_UART3_RTS | GPIO_UART3_CTS | GPIO_UART3_DCD);
++ GAFR &= ~(GPIO_UART3_DSR | GPIO_UART3_DTR);
++
++ // txd, rts and dtr are outputs
++ GPDR |= GPIO_UART_TXD;
++ GPDR |= GPIO_UART1_RTS | GPIO_UART3_RTS;
++ GPDR |= GPIO_UART1_DTR | GPIO_UART3_DTR;
++
++ // cts, dcd, dsr and rxd are inputs
++ GPDR &= ~(GPIO_UART1_CTS | GPIO_UART3_CTS);
++ GPDR &= ~(GPIO_UART1_DCD | GPIO_UART3_DCD);
++ GPDR &= ~(GPIO_UART1_DSR | GPIO_UART3_DSR);
++ GPDR &= ~GPIO_UART_RXD;
++
++ PPAR |= PPAR_UPR;
+
+ /*
* Set up registers for sleep mode.
*/
@@ -178,7 +204,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
PWER = PWER_GPIO0| PWER_RTC;
PGSR = 0x818;
PCFR = 0;
-@@ -171,9 +241,10 @@
+@@ -171,9 +265,10 @@
sa11x0_set_mcp_data(&simpad_mcp_data);
}
@@ -190,7 +216,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
set_cs3(0x800); /* only SD_MEDIAQ */
/* disable internal oscillator, float CS lines */
-@@ -191,31 +262,52 @@
+@@ -191,31 +286,52 @@
while(1);
local_irq_enable(); /* we won't ever call it */
@@ -248,8 +274,8 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
if(ret)
printk(KERN_WARNING "simpad: Unable to register mq200 framebuffer device");
diff -Nur linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h
---- linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h 2008-02-20 21:10:00.000000000 +0100
+--- linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h 2008-10-04 21:47:17.000000000 +0200
++++ linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h 2008-10-04 22:00:57.000000000 +0200
@@ -12,11 +12,12 @@
#define __ASM_ARCH_SIMPAD_H
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 7fd2f457e4..7c92cb2ed0 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,10 +10,11 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
DEFAULT_PREFERENCE_ts72xx = "1"
DEFAULT_PREFERENCE_cs-e9302 = "1"
-PR = "r14"
+PR = "r16"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+ file://time.h.patch;patch=1 \
file://defconfig"
# Moved away temporarely until committed properly (work in progress).
@@ -27,7 +28,7 @@ SRC_URI_append_simpad = "\
file://linux-2.6.24-SIMpad-cs3-simpad.patch;patch=1 \
file://linux-2.6.24-SIMpad-mq200.patch;patch=1 \
file://linux-2.6.24-SIMpad-pcmcia.patch;patch=1 \
- file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch;patch=1 \
+ file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;patch=1 \
file://linux-2.6.24-SIMpad-ucb1x00-switches.patch;patch=1 \
file://linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;patch=1 \
file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
index f30671d6d2..5884f85c21 100644
--- a/packages/meta/distro-feed-configs.bb
+++ b/packages/meta/distro-feed-configs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds"
PR = "r0"
DISTRO_FEED_PREFIX ?= "remote"
-DISTRO_FEED_URI ?= "http://my-distribution.org/remote-feed/"
+DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
do_compile() {
mkdir -p ${S}/${sysconfdir}/opkg
diff --git a/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig
index cd097165ab..f7ab5dd3a3 100644
--- a/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig
+++ b/packages/mozilla/firefox-3.0.1+3.1a2/mozconfig
@@ -46,7 +46,7 @@ ac_add_options --enable-crypto
ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
+#ac_add_options --enable-image-decoders=png,gif,jpeg
#ac_add_options --enable-reorder
#ac_add_options --enable-elf-dynstr-gc
diff --git a/packages/mozilla/firefox-3.0.1/mozconfig b/packages/mozilla/firefox-3.0.1/mozconfig
index cd097165ab..f7ab5dd3a3 100644
--- a/packages/mozilla/firefox-3.0.1/mozconfig
+++ b/packages/mozilla/firefox-3.0.1/mozconfig
@@ -46,7 +46,7 @@ ac_add_options --enable-crypto
ac_add_options --enable-necko-protocols=http,file,res,ftp,about,viewsource
# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
+#ac_add_options --enable-image-decoders=png,gif,jpeg
#ac_add_options --enable-reorder
#ac_add_options --enable-elf-dynstr-gc
diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb
index 7a6ce119e1..5d09bb4375 100644
--- a/packages/mozilla/firefox_3.0.1.bb
+++ b/packages/mozilla/firefox_3.0.1.bb
@@ -1,5 +1,5 @@
DEPENDS += "cairo"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://jsautocfg.h \
diff --git a/packages/mozilla/firefox_3.1a2.bb b/packages/mozilla/firefox_3.1a2.bb
index 5e7c996ef1..4d5c3cbf3b 100644
--- a/packages/mozilla/firefox_3.1a2.bb
+++ b/packages/mozilla/firefox_3.1a2.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
PV = "3.0.1+3.1a2"
MOZPV = "3.1a2"
-
+PR = "r1"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/firefox-${MOZPV}-source.tar.bz2 \
file://jsautocfg.h \
diff --git a/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
new file mode 100644
index 0000000000..e7774e33df
--- /dev/null
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share "
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.4.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.4.bb
new file mode 100644
index 0000000000..63acae328e
--- /dev/null
+++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet"
diff --git a/packages/opie-addressbook/opie-addressbook_1.2.4.bb b/packages/opie-addressbook/opie-addressbook_1.2.4.bb
new file mode 100644
index 0000000000..4e4ba7c4c5
--- /dev/null
+++ b/packages/opie-addressbook/opie-addressbook_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.4.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.4.bb
new file mode 100644
index 0000000000..e8dc4d95e8
--- /dev/null
+++ b/packages/opie-advancedfm/opie-advancedfm_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-alarm/opie-alarm_1.2.4.bb b/packages/opie-alarm/opie-alarm_1.2.4.bb
new file mode 100644
index 0000000000..d298efc34c
--- /dev/null
+++ b/packages/opie-alarm/opie-alarm_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \
+ file://01opiealarm \
+ file://dirdefines.patch;patch=1 "
diff --git a/packages/opie-appearance/opie-appearance_1.2.4.bb b/packages/opie-appearance/opie-appearance_1.2.4.bb
new file mode 100644
index 0000000000..e8c3ada524
--- /dev/null
+++ b/packages/opie-appearance/opie-appearance_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.4.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.4.bb
new file mode 100644
index 0000000000..5bc9df58b6
--- /dev/null
+++ b/packages/opie-aqpkg/opie-aqpkg_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb
new file mode 100644
index 0000000000..534c25c5b1
--- /dev/null
+++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-backgammon/opie-backgammon_1.2.4.bb b/packages/opie-backgammon/opie-backgammon_1.2.4.bb
new file mode 100644
index 0000000000..b7f87d1191
--- /dev/null
+++ b/packages/opie-backgammon/opie-backgammon_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-backup/opie-backup_1.2.4.bb b/packages/opie-backup/opie-backup_1.2.4.bb
new file mode 100644
index 0000000000..2714fd812b
--- /dev/null
+++ b/packages/opie-backup/opie-backup_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-bartender/opie-bartender_1.2.4.bb b/packages/opie-bartender/opie-bartender_1.2.4.bb
new file mode 100644
index 0000000000..2fb5e35856
--- /dev/null
+++ b/packages/opie-bartender/opie-bartender_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb
new file mode 100644
index 0000000000..1a678f0cff
--- /dev/null
+++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-bluepin/opie-bluepin_1.2.4.bb b/packages/opie-bluepin/opie-bluepin_1.2.4.bb
new file mode 100644
index 0000000000..1ea1deef96
--- /dev/null
+++ b/packages/opie-bluepin/opie-bluepin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb
new file mode 100644
index 0000000000..f54012285d
--- /dev/null
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb
new file mode 100644
index 0000000000..b688603b24
--- /dev/null
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-bounce/opie-bounce_1.2.4.bb b/packages/opie-bounce/opie-bounce_1.2.4.bb
new file mode 100644
index 0000000000..3ed77744d7
--- /dev/null
+++ b/packages/opie-bounce/opie-bounce_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb
new file mode 100644
index 0000000000..81c88fa51b
--- /dev/null
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-button-settings/opie-button-settings_1.2.4.bb b/packages/opie-button-settings/opie-button-settings_1.2.4.bb
new file mode 100644
index 0000000000..0458a28ba8
--- /dev/null
+++ b/packages/opie-button-settings/opie-button-settings_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-buzzword/opie-buzzword_1.2.4.bb b/packages/opie-buzzword/opie-buzzword_1.2.4.bb
new file mode 100644
index 0000000000..78ab5a966a
--- /dev/null
+++ b/packages/opie-buzzword/opie-buzzword_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-calculator/opie-calculator_1.2.4.bb b/packages/opie-calculator/opie-calculator_1.2.4.bb
new file mode 100644
index 0000000000..ce2b63a786
--- /dev/null
+++ b/packages/opie-calculator/opie-calculator_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc "
diff --git a/packages/opie-camera/opie-camera_1.2.4.bb b/packages/opie-camera/opie-camera_1.2.4.bb
new file mode 100644
index 0000000000..342abe8581
--- /dev/null
+++ b/packages/opie-camera/opie-camera_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-checkbook/opie-checkbook_1.2.4.bb b/packages/opie-checkbook/opie-checkbook_1.2.4.bb
new file mode 100644
index 0000000000..e8dc4d95e8
--- /dev/null
+++ b/packages/opie-checkbook/opie-checkbook_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-citytime/opie-citytime_1.2.4.bb b/packages/opie-citytime/opie-citytime_1.2.4.bb
new file mode 100644
index 0000000000..f95283417a
--- /dev/null
+++ b/packages/opie-citytime/opie-citytime_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb
new file mode 100644
index 0000000000..8831aeec3c
--- /dev/null
+++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-clock/opie-clock_1.2.4.bb b/packages/opie-clock/opie-clock_1.2.4.bb
new file mode 100644
index 0000000000..1d3880c208
--- /dev/null
+++ b/packages/opie-clock/opie-clock_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb
new file mode 100644
index 0000000000..cc1a2b5376
--- /dev/null
+++ b/packages/opie-clockapplet/opie-clockapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-confeditor/opie-confeditor_1.2.4.bb b/packages/opie-confeditor/opie-confeditor_1.2.4.bb
new file mode 100644
index 0000000000..1a00b21e01
--- /dev/null
+++ b/packages/opie-confeditor/opie-confeditor_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-console/files/.mtn2git_empty b/packages/opie-console/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-console/files/.mtn2git_empty
diff --git a/packages/opie-console/files/double_name.patch b/packages/opie-console/files/double_name.patch
new file mode 100644
index 0000000000..47e127e160
--- /dev/null
+++ b/packages/opie-console/files/double_name.patch
@@ -0,0 +1,118 @@
+Index: opie-console/profiledialogwidget.h
+===================================================================
+--- opie-console.orig/profiledialogwidget.h 2002-10-21 23:43:44.000000000 +0200
++++ opie-console/profiledialogwidget.h 2008-08-26 16:22:31.618071081 +0200
+@@ -13,7 +13,7 @@
+ Terminal,
+ Keyboard
+ };
+- ProfileDialogWidget( const QString& name, QWidget* parent, const char* name = 0l);
++ ProfileDialogWidget( const QString& name, QWidget* parent, const char* na = 0l);
+ ~ProfileDialogWidget();
+
+ /*
+@@ -34,7 +34,7 @@
+ Q_OBJECT
+ public:
+ ProfileDialogTerminalWidget( const QString& name, QWidget* widget,
+- const char* name =0l);
++ const char* na =0l);
+ ~ProfileDialogTerminalWidget();
+ Type type()const;
+ };
+@@ -42,7 +42,7 @@
+ Q_OBJECT
+ public:
+ ProfileDialogConnectionWidget( const QString& name, QWidget* parent,
+- const char* name =0l);
++ const char* na =0l);
+ ~ProfileDialogConnectionWidget();
+ Type type() const;
+
+@@ -51,7 +51,7 @@
+ Q_OBJECT
+ public:
+ ProfileDialogKeyWidget( const QString &name, QWidget* parent,
+- const char *name =0l);
++ const char *na =0l);
+ ~ProfileDialogKeyWidget();
+ Type type() const;
+ };
+Index: opie-console/function_keyboard.h
+===================================================================
+--- opie-console.orig/function_keyboard.h 2007-08-27 01:49:15.000000000 +0200
++++ opie-console/function_keyboard.h 2008-08-26 16:22:31.618071081 +0200
+@@ -86,7 +86,7 @@
+ Q_OBJECT
+
+ public:
+- FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l );
++ FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* na = 0l );
+ ~FunctionKeyboardConfig();
+
+ void load(const Profile&);
+Index: opie-console/serialconfigwidget.h
+===================================================================
+--- opie-console.orig/serialconfigwidget.h 2002-10-09 01:13:17.000000000 +0200
++++ opie-console/serialconfigwidget.h 2008-08-26 16:22:31.618071081 +0200
+@@ -10,7 +10,7 @@
+ class SerialConfigWidget : public ProfileDialogConnectionWidget {
+ Q_OBJECT
+ public:
+- SerialConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
++ SerialConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
+ ~SerialConfigWidget();
+
+ void load( const Profile& );
+Index: opie-console/irdaconfigwidget.h
+===================================================================
+--- opie-console.orig/irdaconfigwidget.h 2002-10-09 18:33:36.000000000 +0200
++++ opie-console/irdaconfigwidget.h 2008-08-26 16:22:31.618071081 +0200
+@@ -12,7 +12,7 @@
+ Q_OBJECT
+
+ public:
+- IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
++ IrdaConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
+ ~IrdaConfigWidget();
+
+ void load( const Profile& );
+Index: opie-console/btconfigwidget.h
+===================================================================
+--- opie-console.orig/btconfigwidget.h 2002-10-17 16:16:03.000000000 +0200
++++ opie-console/btconfigwidget.h 2008-08-26 16:22:31.618071081 +0200
+@@ -14,7 +14,7 @@
+ Q_OBJECT
+
+ public:
+- BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
++ BTConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
+ ~BTConfigWidget();
+
+ void load( const Profile& );
+Index: opie-console/modemconfigwidget.h
+===================================================================
+--- opie-console.orig/modemconfigwidget.h 2002-10-13 23:10:15.000000000 +0200
++++ opie-console/modemconfigwidget.h 2008-08-26 16:22:31.618071081 +0200
+@@ -15,7 +15,7 @@
+ Q_OBJECT
+
+ public:
+- ModemConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
++ ModemConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
+ ~ModemConfigWidget();
+
+ void load( const Profile& );
+Index: opie-console/consoleconfigwidget.h
+===================================================================
+--- opie-console.orig/consoleconfigwidget.h 2008-08-26 16:23:08.198065869 +0200
++++ opie-console/consoleconfigwidget.h 2008-08-26 16:23:12.938066770 +0200
+@@ -11,7 +11,7 @@
+ class ConsoleConfigWidget : public ProfileDialogConnectionWidget {
+ Q_OBJECT
+ public:
+- ConsoleConfigWidget( const QString& name, QWidget* parent, const char* name = 0l );
++ ConsoleConfigWidget( const QString& name, QWidget* parent, const char* na = 0l );
+ ~ConsoleConfigWidget();
+
+ void load( const Profile& );
diff --git a/packages/opie-console/opie-console_1.2.4.bb b/packages/opie-console/opie-console_1.2.4.bb
new file mode 100644
index 0000000000..034c98647f
--- /dev/null
+++ b/packages/opie-console/opie-console_1.2.4.bb
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ "
diff --git a/packages/opie-dagger/opie-dagger_1.2.4.bb b/packages/opie-dagger/opie-dagger_1.2.4.bb
new file mode 100644
index 0000000000..cdab20bcf6
--- /dev/null
+++ b/packages/opie-dagger/opie-dagger_1.2.4.bb
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.4.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.4.bb
new file mode 100644
index 0000000000..94bb9958c5
--- /dev/null
+++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday "
diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.4.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.4.bb
new file mode 100644
index 0000000000..80eea90c8c
--- /dev/null
+++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian "
diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.4.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.4.bb
new file mode 100644
index 0000000000..e47580581d
--- /dev/null
+++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays "
diff --git a/packages/opie-datebook/opie-datebook_1.2.4.bb b/packages/opie-datebook/opie-datebook_1.2.4.bb
new file mode 100644
index 0000000000..554f30cc38
--- /dev/null
+++ b/packages/opie-datebook/opie-datebook_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.4.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.4.bb
new file mode 100644
index 0000000000..4d7f0b544a
--- /dev/null
+++ b/packages/opie-deco-flat/opie-deco-flat_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat "
diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.4.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.4.bb
new file mode 100644
index 0000000000..dbbc119a46
--- /dev/null
+++ b/packages/opie-deco-liquid/opie-deco-liquid_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid "
diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.4.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.4.bb
new file mode 100644
index 0000000000..69a5031f8c
--- /dev/null
+++ b/packages/opie-deco-polished/opie-deco-polished_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished "
diff --git a/packages/opie-doctab/opie-doctab_1.2.4.bb b/packages/opie-doctab/opie-doctab_1.2.4.bb
new file mode 100644
index 0000000000..1a08b090d0
--- /dev/null
+++ b/packages/opie-doctab/opie-doctab_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-drawpad/opie-drawpad_1.2.4.bb b/packages/opie-drawpad/opie-drawpad_1.2.4.bb
new file mode 100644
index 0000000000..d8ac8a3d01
--- /dev/null
+++ b/packages/opie-drawpad/opie-drawpad_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-dvorak/opie-dvorak_1.2.4.bb b/packages/opie-dvorak/opie-dvorak_1.2.4.bb
new file mode 100644
index 0000000000..54af47b2bc
--- /dev/null
+++ b/packages/opie-dvorak/opie-dvorak_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard \
+ file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.4.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.4.bb
new file mode 100644
index 0000000000..20a417a9c3
--- /dev/null
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-euroconv/opie-euroconv_1.2.4.bb b/packages/opie-euroconv/opie-euroconv_1.2.4.bb
new file mode 100644
index 0000000000..662e916cc8
--- /dev/null
+++ b/packages/opie-euroconv/opie-euroconv_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-examples-python/opie-examples-python_1.2.4.bb b/packages/opie-examples-python/opie-examples-python_1.2.4.bb
new file mode 100644
index 0000000000..f9349e3364
--- /dev/null
+++ b/packages/opie-examples-python/opie-examples-python_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-examples/opie-examples_1.2.4.bb b/packages/opie-examples/opie-examples_1.2.4.bb
new file mode 100644
index 0000000000..4ae4f4425e
--- /dev/null
+++ b/packages/opie-examples/opie-examples_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-eye/opie-eye_1.2.4.bb b/packages/opie-eye/opie-eye_1.2.4.bb
new file mode 100644
index 0000000000..d17aa0c9a6
--- /dev/null
+++ b/packages/opie-eye/opie-eye_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-fifteen/opie-fifteen_1.2.4.bb b/packages/opie-fifteen/opie-fifteen_1.2.4.bb
new file mode 100644
index 0000000000..48ee868fda
--- /dev/null
+++ b/packages/opie-fifteen/opie-fifteen_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-formatter/opie-formatter_1.2.4.bb b/packages/opie-formatter/opie-formatter_1.2.4.bb
new file mode 100644
index 0000000000..ef4acbb9a2
--- /dev/null
+++ b/packages/opie-formatter/opie-formatter_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-freetype/opie-freetype_1.2.4.bb b/packages/opie-freetype/opie-freetype_1.2.4.bb
new file mode 100644
index 0000000000..f9159deb2a
--- /dev/null
+++ b/packages/opie-freetype/opie-freetype_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype"
diff --git a/packages/opie-ftp/opie-ftp_1.2.4.bb b/packages/opie-ftp/opie-ftp_1.2.4.bb
new file mode 100644
index 0000000000..c202f448c8
--- /dev/null
+++ b/packages/opie-ftp/opie-ftp_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-ftplib/opie-ftplib_1.2.4.bb b/packages/opie-ftplib/opie-ftplib_1.2.4.bb
new file mode 100644
index 0000000000..2374e80156
--- /dev/null
+++ b/packages/opie-ftplib/opie-ftplib_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib"
diff --git a/packages/opie-go/opie-go_1.2.4.bb b/packages/opie-go/opie-go_1.2.4.bb
new file mode 100644
index 0000000000..ff2217d99a
--- /dev/null
+++ b/packages/opie-go/opie-go_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.4.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.4.bb
new file mode 100644
index 0000000000..58d9136e16
--- /dev/null
+++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-handwriting/opie-handwriting_1.2.4.bb b/packages/opie-handwriting/opie-handwriting_1.2.4.bb
new file mode 100644
index 0000000000..6a81fe089c
--- /dev/null
+++ b/packages/opie-handwriting/opie-handwriting_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen"
diff --git a/packages/opie-help-en/opie-help-en_1.2.4.bb b/packages/opie-help-en/opie-help-en_1.2.4.bb
new file mode 100644
index 0000000000..b07babb527
--- /dev/null
+++ b/packages/opie-help-en/opie-help-en_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html "
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.4.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.4.bb
new file mode 100644
index 0000000000..20a417a9c3
--- /dev/null
+++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.4.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.4.bb
new file mode 100644
index 0000000000..bfd7a6d8d0
--- /dev/null
+++ b/packages/opie-homeapplet/opie-homeapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-i18n/opie-i18n_1.2.4.bb b/packages/opie-i18n/opie-i18n_1.2.4.bb
new file mode 100644
index 0000000000..ed4ac3aff5
--- /dev/null
+++ b/packages/opie-i18n/opie-i18n_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.4.bb b/packages/opie-i18n/opie-lrelease-native_1.2.4.bb
new file mode 100644
index 0000000000..ce4d83f1b6
--- /dev/null
+++ b/packages/opie-i18n/opie-lrelease-native_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.4.bb b/packages/opie-i18n/opie-lupdate-native_1.2.4.bb
new file mode 100644
index 0000000000..04e9728ee5
--- /dev/null
+++ b/packages/opie-i18n/opie-lupdate-native_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared"
+
diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.4.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.4.bb
new file mode 100644
index 0000000000..10510e5566
--- /dev/null
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.4.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+
diff --git a/packages/opie-irc/opie-irc_1.2.4.bb b/packages/opie-irc/opie-irc_1.2.4.bb
new file mode 100644
index 0000000000..838052bf5a
--- /dev/null
+++ b/packages/opie-irc/opie-irc_1.2.4.bb
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb
new file mode 100644
index 0000000000..aa0ece4c73
--- /dev/null
+++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.4.bb
@@ -0,0 +1,9 @@
+require ${PN}.inc
+
+PR = r3
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ "
diff --git a/packages/opie-jumpx/opie-jumpx_1.2.4.bb b/packages/opie-jumpx/opie-jumpx_1.2.4.bb
new file mode 100644
index 0000000000..222ad2d6f9
--- /dev/null
+++ b/packages/opie-jumpx/opie-jumpx_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kbill/opie-kbill_1.2.4.bb b/packages/opie-kbill/opie-kbill_1.2.4.bb
new file mode 100644
index 0000000000..609c97a89f
--- /dev/null
+++ b/packages/opie-kbill/opie-kbill_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.4.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.4.bb
new file mode 100644
index 0000000000..281577a290
--- /dev/null
+++ b/packages/opie-kcheckers/opie-kcheckers_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-keyboard/opie-keyboard_1.2.4.bb b/packages/opie-keyboard/opie-keyboard_1.2.4.bb
new file mode 100644
index 0000000000..04c368ba89
--- /dev/null
+++ b/packages/opie-keyboard/opie-keyboard_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard \
+ file://fix-rpath.patch;patch=1 "
diff --git a/packages/opie-keypebble/opie-keypebble_1.2.4.bb b/packages/opie-keypebble/opie-keypebble_1.2.4.bb
new file mode 100644
index 0000000000..f1a3e7aee0
--- /dev/null
+++ b/packages/opie-keypebble/opie-keypebble_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-keytabs/opie-keytabs_1.2.4.bb b/packages/opie-keytabs/opie-keytabs_1.2.4.bb
new file mode 100644
index 0000000000..2244f0153a
--- /dev/null
+++ b/packages/opie-keytabs/opie-keytabs_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc"
diff --git a/packages/opie-keyview/opie-keyview_1.2.4.bb b/packages/opie-keyview/opie-keyview_1.2.4.bb
new file mode 100644
index 0000000000..583e3a4507
--- /dev/null
+++ b/packages/opie-keyview/opie-keyview_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview "
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb
new file mode 100644
index 0000000000..430bebc56c
--- /dev/null
+++ b/packages/opie-kjumpx/opie-kjumpx_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-kpacman/opie-kpacman_1.2.4.bb b/packages/opie-kpacman/opie-kpacman_1.2.4.bb
new file mode 100644
index 0000000000..66bf9fcfc2
--- /dev/null
+++ b/packages/opie-kpacman/opie-kpacman_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-language/opie-language_1.2.4.bb b/packages/opie-language/opie-language_1.2.4.bb
new file mode 100644
index 0000000000..17635b6cf2
--- /dev/null
+++ b/packages/opie-language/opie-language_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.4.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.4.bb
new file mode 100644
index 0000000000..140309765b
--- /dev/null
+++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.4.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.4.bb
new file mode 100644
index 0000000000..4cbd183777
--- /dev/null
+++ b/packages/opie-libqrsync/opie-libqrsync_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync"
diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.4.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.4.bb
new file mode 100644
index 0000000000..a5ebbc9666
--- /dev/null
+++ b/packages/opie-light-and-power/opie-light-and-power_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb
new file mode 100644
index 0000000000..bc285bdc8c
--- /dev/null
+++ b/packages/opie-lockapplet/opie-lockapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/opie-login/opie-login_1.2.4.bb b/packages/opie-login/opie-login_1.2.4.bb
new file mode 100644
index 0000000000..449b6ba8ed
--- /dev/null
+++ b/packages/opie-login/opie-login_1.2.4.bb
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+ file://opie-session \
+ file://post-session \
+ file://pre-session \
+ file://opie-login.conf"
diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.4.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.4.bb
new file mode 100644
index 0000000000..14502f49d0
--- /dev/null
+++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mail/opie-mail_1.2.4.bb b/packages/opie-mail/opie-mail_1.2.4.bb
new file mode 100644
index 0000000000..d9f286d462
--- /dev/null
+++ b/packages/opie-mail/opie-mail_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb
new file mode 100644
index 0000000000..0795d423ae
--- /dev/null
+++ b/packages/opie-mailapplet/opie-mailapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb
new file mode 100644
index 0000000000..78f0796834
--- /dev/null
+++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://libmadplugin.pro"
diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb
new file mode 100644
index 0000000000..b40ab35295
--- /dev/null
+++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb
new file mode 100644
index 0000000000..9b700fb85b
--- /dev/null
+++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://vorbis.pro "
diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb
new file mode 100644
index 0000000000..b40ab35295
--- /dev/null
+++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
diff --git a/packages/opie-mediaplayer1/files/.mtn2git_empty b/packages/opie-mediaplayer1/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-mediaplayer1/files/.mtn2git_empty
diff --git a/packages/opie-mediaplayer1/files/double_name.patch b/packages/opie-mediaplayer1/files/double_name.patch
new file mode 100644
index 0000000000..d4e787f7f9
--- /dev/null
+++ b/packages/opie-mediaplayer1/files/double_name.patch
@@ -0,0 +1,11 @@
+--- opieplayer/mediaplayerplugininterface.h 3 Mar 2002 17:13:17 -0000 1.5
++++ opieplayer/mediaplayerplugininterface.h 4 Oct 2008 16:45:38 -0000 1.6
+@@ -65,7 +65,7 @@
+ virtual int audioSamples( int stream ) = 0;
+ virtual bool audioSetSample( long sample, int stream ) = 0;
+ virtual long audioGetSample( int stream ) = 0;
+- virtual bool audioReadSamples( short *samples, int channels, long samples, long& samplesRead, int stream ) = 0;
++ virtual bool audioReadSamples( short *output, int channels, long samples, long& samplesRead, int stream ) = 0;
+
+ // If decoder doesn't support video then return 0 here
+ virtual int videoStreams() = 0;
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
new file mode 100644
index 0000000000..db194b9a37
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://double_name.patch;patch=1"
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.4.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.4.bb
new file mode 100644
index 0000000000..10510e5566
--- /dev/null
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.4.bb
@@ -0,0 +1,2 @@
+require ${PN}.inc
+
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.4.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.4.bb
new file mode 100644
index 0000000000..0c6b505d8c
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES="opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb
new file mode 100644
index 0000000000..e0b8efe4dc
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb
new file mode 100644
index 0000000000..a40604c041
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb
new file mode 100644
index 0000000000..7a6715e5cf
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.4.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Skin for opie-mediaplayer2"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "opieplayer2"
+RPROVIDES = "opie-mediaplayer2-skin"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/
+}
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.4.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.4.bb
new file mode 100644
index 0000000000..2e6c7ec517
--- /dev/null
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-mediummount/opie-mediummount_1.2.4.bb b/packages/opie-mediummount/opie-mediummount_1.2.4.bb
new file mode 100644
index 0000000000..e86f5d9204
--- /dev/null
+++ b/packages/opie-mediummount/opie-mediummount_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb
new file mode 100644
index 0000000000..c28a321021
--- /dev/null
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.4.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.4.bb
new file mode 100644
index 0000000000..fde254851e
--- /dev/null
+++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-minesweep/opie-minesweep_1.2.4.bb b/packages/opie-minesweep/opie-minesweep_1.2.4.bb
new file mode 100644
index 0000000000..0ff2e278ee
--- /dev/null
+++ b/packages/opie-minesweep/opie-minesweep_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-multikey/opie-multikey_1.2.4.bb b/packages/opie-multikey/opie-multikey_1.2.4.bb
new file mode 100644
index 0000000000..a32dd47e7c
--- /dev/null
+++ b/packages/opie-multikey/opie-multikey_1.2.4.bb
@@ -0,0 +1,9 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ file://fix-rpath.patch;patch=1"
+
+# file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb
new file mode 100644
index 0000000000..11bd0e66ae
--- /dev/null
+++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb
new file mode 100644
index 0000000000..16d10de21b
--- /dev/null
+++ b/packages/opie-networkapplet/opie-networkapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-networksettings/opie-networksettings_1.2.4.bb b/packages/opie-networksettings/opie-networksettings_1.2.4.bb
new file mode 100644
index 0000000000..e5981ed121
--- /dev/null
+++ b/packages/opie-networksettings/opie-networksettings_1.2.4.bb
@@ -0,0 +1,9 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+ "
diff --git a/packages/opie-notes/opie-notes_1.2.4.bb b/packages/opie-notes/opie-notes_1.2.4.bb
new file mode 100644
index 0000000000..89ed98e583
--- /dev/null
+++ b/packages/opie-notes/opie-notes_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/notes \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb
new file mode 100644
index 0000000000..09d56c6b1f
--- /dev/null
+++ b/packages/opie-notesapplet/opie-notesapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet"
diff --git a/packages/opie-odict/opie-odict_1.2.4.bb b/packages/opie-odict/opie-odict_1.2.4.bb
new file mode 100644
index 0000000000..27dd17dd3d
--- /dev/null
+++ b/packages/opie-odict/opie-odict_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-oxygen/opie-oxygen_1.2.4.bb b/packages/opie-oxygen/opie-oxygen_1.2.4.bb
new file mode 100644
index 0000000000..0c32e244dc
--- /dev/null
+++ b/packages/opie-oxygen/opie-oxygen_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.4.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.4.bb
new file mode 100644
index 0000000000..f1063ac6b8
--- /dev/null
+++ b/packages/opie-oyatzee/opie-oyatzee_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.4.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.4.bb
new file mode 100644
index 0000000000..0b8f44981d
--- /dev/null
+++ b/packages/opie-packagemanager/opie-packagemanager_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-parashoot/opie-parashoot_1.2.4.bb b/packages/opie-parashoot/opie-parashoot_1.2.4.bb
new file mode 100644
index 0000000000..bf7f592bd8
--- /dev/null
+++ b/packages/opie-parashoot/opie-parashoot_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb
new file mode 100644
index 0000000000..90cd3bc08d
--- /dev/null
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-pickboard/opie-pickboard_1.2.4.bb b/packages/opie-pickboard/opie-pickboard_1.2.4.bb
new file mode 100644
index 0000000000..6640c1236f
--- /dev/null
+++ b/packages/opie-pickboard/opie-pickboard_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard"
diff --git a/packages/opie-pics/opie-pics_1.2.4.bb b/packages/opie-pics/opie-pics_1.2.4.bb
new file mode 100644
index 0000000000..7cbe65504d
--- /dev/null
+++ b/packages/opie-pics/opie-pics_1.2.4.bb
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PR = "r0"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires"
diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.4.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.4.bb
new file mode 100644
index 0000000000..a0638649fc
--- /dev/null
+++ b/packages/opie-pimconverter/opie-pimconverter_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-powerchord/opie-powerchord_1.2.4.bb b/packages/opie-powerchord/opie-powerchord_1.2.4.bb
new file mode 100644
index 0000000000..1fbe81ef71
--- /dev/null
+++ b/packages/opie-powerchord/opie-powerchord_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb
new file mode 100644
index 0000000000..1eb12e8b64
--- /dev/null
+++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.4.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.4.bb
new file mode 100644
index 0000000000..3af3240239
--- /dev/null
+++ b/packages/opie-qasteroids/opie-qasteroids_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-qcop/opie-qcop_1.2.4.bb b/packages/opie-qcop/opie-qcop_1.2.4.bb
new file mode 100644
index 0000000000..c62004a1db
--- /dev/null
+++ b/packages/opie-qcop/opie-qcop_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop \
+ file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-qss/opie-qss_1.2.4.bb b/packages/opie-qss/opie-qss_1.2.4.bb
new file mode 100644
index 0000000000..df7158b084
--- /dev/null
+++ b/packages/opie-qss/opie-qss_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss"
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb
new file mode 100644
index 0000000000..930c08a2f3
--- /dev/null
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher"
diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb
new file mode 100644
index 0000000000..8bf2649e72
--- /dev/null
+++ b/packages/opie-rdesktop/opie-rdesktop_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-reader/opie-reader_1.2.4.bb b/packages/opie-reader/opie-reader_1.2.4.bb
new file mode 100644
index 0000000000..43632416c5
--- /dev/null
+++ b/packages/opie-reader/opie-reader_1.2.4.bb
@@ -0,0 +1,8 @@
+require ${PN}.inc
+
+PR = r2
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
diff --git a/packages/opie-recorder/opie-recorder_1.2.4.bb b/packages/opie-recorder/opie-recorder_1.2.4.bb
new file mode 100644
index 0000000000..07dd91773b
--- /dev/null
+++ b/packages/opie-recorder/opie-recorder_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-remote/opie-remote_1.2.4.bb b/packages/opie-remote/opie-remote_1.2.4.bb
new file mode 100644
index 0000000000..f5df30b509
--- /dev/null
+++ b/packages/opie-remote/opie-remote_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.4.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.4.bb
new file mode 100644
index 0000000000..e06cc63df7
--- /dev/null
+++ b/packages/opie-restartapplet/opie-restartapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.4.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.4.bb
new file mode 100644
index 0000000000..797eb0eaf4
--- /dev/null
+++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.4.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.4.bb
new file mode 100644
index 0000000000..9317ac952b
--- /dev/null
+++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb
new file mode 100644
index 0000000000..27db092ec0
--- /dev/null
+++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
diff --git a/packages/opie-search/opie-search_1.2.4.bb b/packages/opie-search/opie-search_1.2.4.bb
new file mode 100644
index 0000000000..b1ed319fd2
--- /dev/null
+++ b/packages/opie-search/opie-search_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-security/opie-security_1.2.4.bb b/packages/opie-security/opie-security_1.2.4.bb
new file mode 100644
index 0000000000..495cdf1238
--- /dev/null
+++ b/packages/opie-security/opie-security_1.2.4.bb
@@ -0,0 +1,17 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
+# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security
+do_install() {
+ install -d ${D}${palmtopdir}/pics/${APPNAME}/
+
+ for icon in Security.png lock.png multiauth.png sync.png users.png ownerinfo.png;
+ do
+ install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/
+ done
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.3.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.3.bb
new file mode 100644
index 0000000000..3f6d9d1673
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.3.bb
@@ -0,0 +1,5 @@
+require opie-securityplugin-blueping.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.4.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.4.bb
new file mode 100644
index 0000000000..3f6d9d1673
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.4.bb
@@ -0,0 +1,5 @@
+require opie-securityplugin-blueping.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.3.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.3.bb
new file mode 100644
index 0000000000..331a35f0ac
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.3.bb
@@ -0,0 +1,5 @@
+require opie-securityplugin-notice.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.4.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.4.bb
new file mode 100644
index 0000000000..331a35f0ac
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.4.bb
@@ -0,0 +1,5 @@
+require opie-securityplugin-notice.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.4.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.4.bb
new file mode 100644
index 0000000000..8807bef0d2
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.4.bb
@@ -0,0 +1,5 @@
+require opie-securityplugin-pin.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
diff --git a/packages/opie-sfcave/opie-sfcave_1.2.4.bb b/packages/opie-sfcave/opie-sfcave_1.2.4.bb
new file mode 100644
index 0000000000..d6f9ffaede
--- /dev/null
+++ b/packages/opie-sfcave/opie-sfcave_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb
new file mode 100644
index 0000000000..9a48668e8a
--- /dev/null
+++ b/packages/opie-sh-snes/opie-sh-snes_1.2.4.bb
@@ -0,0 +1,3 @@
+require ${PN}.inc
+
+PR = "r0"
diff --git a/packages/opie-sh/opie-sh_1.2.4.bb b/packages/opie-sh/opie-sh_1.2.4.bb
new file mode 100644
index 0000000000..377aa887dd
--- /dev/null
+++ b/packages/opie-sh/opie-sh_1.2.4.bb
@@ -0,0 +1,11 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/help \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/bin \
+ file://opie-sh-path.patch;patch=1 \
+ file://opie-sh-fsmounter-name.patch;patch=1"
diff --git a/packages/opie-sheet/opie-sheet_1.2.4.bb b/packages/opie-sheet/opie-sheet_1.2.4.bb
new file mode 100644
index 0000000000..ca0cdaff5a
--- /dev/null
+++ b/packages/opie-sheet/opie-sheet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-snake/opie-snake_1.2.4.bb b/packages/opie-snake/opie-snake_1.2.4.bb
new file mode 100644
index 0000000000..7db3a3523a
--- /dev/null
+++ b/packages/opie-snake/opie-snake_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-solitaire/opie-solitaire_1.2.4.bb b/packages/opie-solitaire/opie-solitaire_1.2.4.bb
new file mode 100644
index 0000000000..9cc224e46b
--- /dev/null
+++ b/packages/opie-solitaire/opie-solitaire_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-sounds/opie-sounds_1.2.4.bb b/packages/opie-sounds/opie-sounds_1.2.4.bb
new file mode 100644
index 0000000000..9bd0cfa80f
--- /dev/null
+++ b/packages/opie-sounds/opie-sounds_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/sounds"
diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.4.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.4.bb
new file mode 100644
index 0000000000..2f31b97b95
--- /dev/null
+++ b/packages/opie-sshkeys/opie-sshkeys_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-stumbler/opie-stumbler_1.2.4.bb b/packages/opie-stumbler/opie-stumbler_1.2.4.bb
new file mode 100644
index 0000000000..4f666b67b1
--- /dev/null
+++ b/packages/opie-stumbler/opie-stumbler_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opiestumbler \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://opiestumbler.png"
diff --git a/packages/opie-style-flat/opie-style-flat_1.2.4.bb b/packages/opie-style-flat/opie-style-flat_1.2.4.bb
new file mode 100644
index 0000000000..90abf56f25
--- /dev/null
+++ b/packages/opie-style-flat/opie-style-flat_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat "
diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.4.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.4.bb
new file mode 100644
index 0000000000..286645a1bc
--- /dev/null
+++ b/packages/opie-style-fresh/opie-style-fresh_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh "
diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.4.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.4.bb
new file mode 100644
index 0000000000..2fe947cea9
--- /dev/null
+++ b/packages/opie-style-liquid/opie-style-liquid_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid "
diff --git a/packages/opie-style-metal/opie-style-metal_1.2.4.bb b/packages/opie-style-metal/opie-style-metal_1.2.4.bb
new file mode 100644
index 0000000000..0fd97a513e
--- /dev/null
+++ b/packages/opie-style-metal/opie-style-metal_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal "
diff --git a/packages/opie-style-phase/opie-style-phase_1.2.4.bb b/packages/opie-style-phase/opie-style-phase_1.2.4.bb
new file mode 100644
index 0000000000..3655182e40
--- /dev/null
+++ b/packages/opie-style-phase/opie-style-phase_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase"
diff --git a/packages/opie-style-web/opie-style-web_1.2.4.bb b/packages/opie-style-web/opie-style-web_1.2.4.bb
new file mode 100644
index 0000000000..5fd6161cc1
--- /dev/null
+++ b/packages/opie-style-web/opie-style-web_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web"
diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.4.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.4.bb
new file mode 100644
index 0000000000..6516dfca1e
--- /dev/null
+++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-symlinker/opie-symlinker_1.2.4.bb b/packages/opie-symlinker/opie-symlinker_1.2.4.bb
new file mode 100644
index 0000000000..1c4c137b1f
--- /dev/null
+++ b/packages/opie-symlinker/opie-symlinker_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker "
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.4.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.4.bb
new file mode 100644
index 0000000000..2584941cc5
--- /dev/null
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
diff --git a/packages/opie-systemtime/opie-systemtime_1.2.4.bb b/packages/opie-systemtime/opie-systemtime_1.2.4.bb
new file mode 100644
index 0000000000..3aa8378912
--- /dev/null
+++ b/packages/opie-systemtime/opie-systemtime_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.4.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.4.bb
new file mode 100644
index 0000000000..61b3825eaa
--- /dev/null
+++ b/packages/opie-tableviewer/opie-tableviewer_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb
new file mode 100644
index 0000000000..afffae51f0
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar-images_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.4.bb b/packages/opie-taskbar/opie-taskbar_1.2.4.bb
new file mode 100644
index 0000000000..c22e3bed5f
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -0,0 +1,17 @@
+require ${PN}.inc
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \
+ file://nomax.patch;patch=1;pnum=3 \
+ file://no-builtin-qss-startup.patch;patch=1 \
+ file://kbdlocks-runtime.patch;patch=1 \
+ file://restart-from-bindir.patch;patch=1 \
+ file://server.pro \
+ file://firstuse-path.patch;patch=1 \
+ "
diff --git a/packages/opie-tetrix/opie-tetrix_1.2.4.bb b/packages/opie-tetrix/opie-tetrix_1.2.4.bb
new file mode 100644
index 0000000000..ef6ee0fc42
--- /dev/null
+++ b/packages/opie-tetrix/opie-tetrix_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-textedit/opie-textedit_1.2.4.bb b/packages/opie-textedit/opie-textedit_1.2.4.bb
new file mode 100644
index 0000000000..20a417a9c3
--- /dev/null
+++ b/packages/opie-textedit/opie-textedit_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-theme/opie-theme_1.2.4.bb b/packages/opie-theme/opie-theme_1.2.4.bb
new file mode 100644
index 0000000000..2e3900855a
--- /dev/null
+++ b/packages/opie-theme/opie-theme_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles "
diff --git a/packages/opie-tictac/opie-tictac_1.2.4.bb b/packages/opie-tictac/opie-tictac_1.2.4.bb
new file mode 100644
index 0000000000..dc3d928149
--- /dev/null
+++ b/packages/opie-tictac/opie-tictac_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-tinykate/opie-tinykate_1.2.4.bb b/packages/opie-tinykate/opie-tinykate_1.2.4.bb
new file mode 100644
index 0000000000..4c175b57e4
--- /dev/null
+++ b/packages/opie-tinykate/opie-tinykate_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.4.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.4.bb
new file mode 100644
index 0000000000..7ef69bc053
--- /dev/null
+++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook "
diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.4.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.4.bb
new file mode 100644
index 0000000000..eeff6f8bce
--- /dev/null
+++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook "
diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.4.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.4.bb
new file mode 100644
index 0000000000..b176078017
--- /dev/null
+++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune "
diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.4.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.4.bb
new file mode 100644
index 0000000000..4eb01b603c
--- /dev/null
+++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail "
diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.4.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.4.bb
new file mode 100644
index 0000000000..edec6c53a5
--- /dev/null
+++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.4.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.4.bb
new file mode 100644
index 0000000000..1c60fed2df
--- /dev/null
+++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.4.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist "
diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.4.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.4.bb
new file mode 100644
index 0000000000..61d1b2b00e
--- /dev/null
+++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-today/opie-today_1.2.4.bb b/packages/opie-today/opie-today_1.2.4.bb
new file mode 100644
index 0000000000..286e7cf1bb
--- /dev/null
+++ b/packages/opie-today/opie-today_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-todo/opie-todo_1.2.4.bb b/packages/opie-todo/opie-todo_1.2.4.bb
new file mode 100644
index 0000000000..f68a559f97
--- /dev/null
+++ b/packages/opie-todo/opie-todo_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://unbreak-logging.patch;patch=1"
diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.4.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.4.bb
new file mode 100644
index 0000000000..d019c73c30
--- /dev/null
+++ b/packages/opie-tonleiter/opie-tonleiter_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb
new file mode 100644
index 0000000000..afb665b203
--- /dev/null
+++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard "
diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.4.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.4.bb
new file mode 100644
index 0000000000..020afa743a
--- /dev/null
+++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vmemo/opie-vmemo_1.2.4.bb b/packages/opie-vmemo/opie-vmemo_1.2.4.bb
new file mode 100644
index 0000000000..969623fdd6
--- /dev/null
+++ b/packages/opie-vmemo/opie-vmemo_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb
new file mode 100644
index 0000000000..364a8f3b31
--- /dev/null
+++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.4.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.4.bb
new file mode 100644
index 0000000000..51c55c5b8f
--- /dev/null
+++ b/packages/opie-vtapplet/opie-vtapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.4.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.4.bb
new file mode 100644
index 0000000000..ea09149bce
--- /dev/null
+++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb
new file mode 100644
index 0000000000..edbe99c21e
--- /dev/null
+++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.4.bb
@@ -0,0 +1,5 @@
+require ${PN}.inc
+
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet"
diff --git a/packages/opie-wordgame/opie-wordgame_1.2.4.bb b/packages/opie-wordgame/opie-wordgame_1.2.4.bb
new file mode 100644
index 0000000000..4929765204
--- /dev/null
+++ b/packages/opie-wordgame/opie-wordgame_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-write/opie-write_1.2.4.bb b/packages/opie-write/opie-write_1.2.4.bb
new file mode 100644
index 0000000000..e8dc4d95e8
--- /dev/null
+++ b/packages/opie-write/opie-write_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.4.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.4.bb
new file mode 100644
index 0000000000..393546bea2
--- /dev/null
+++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.4.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-zlines/opie-zlines_1.2.4.bb b/packages/opie-zlines/opie-zlines_1.2.4.bb
new file mode 100644
index 0000000000..3ead45de53
--- /dev/null
+++ b/packages/opie-zlines/opie-zlines_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-zsafe/opie-zsafe_1.2.4.bb b/packages/opie-zsafe/opie-zsafe_1.2.4.bb
new file mode 100644
index 0000000000..c33925c0f3
--- /dev/null
+++ b/packages/opie-zsafe/opie-zsafe_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/opie-zsame/opie-zsame_1.2.4.bb b/packages/opie-zsame/opie-zsame_1.2.4.bb
new file mode 100644
index 0000000000..263dba7a95
--- /dev/null
+++ b/packages/opie-zsame/opie-zsame_1.2.4.bb
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
diff --git a/packages/python/python-cython-native_0.9.6.14.bb b/packages/python/python-cython-native_0.9.6.14.bb
deleted file mode 100644
index cb7743e1bf..0000000000
--- a/packages/python/python-cython-native_0.9.6.14.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require python-cython_${PV}.bb
-inherit native
-DEPENDS = "python-native"
-RDEPENDS = ""
-
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
-}
diff --git a/packages/python/python-cython-native_0.9.8.bb b/packages/python/python-cython-native_0.9.8.bb
index cb7743e1bf..a5c78cebe2 100644
--- a/packages/python/python-cython-native_0.9.8.bb
+++ b/packages/python/python-cython-native_0.9.8.bb
@@ -4,6 +4,7 @@ DEPENDS = "python-native"
RDEPENDS = ""
do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
}
diff --git a/packages/python/python-cython_0.9.6.14.bb b/packages/python/python-cython_0.9.6.14.bb
deleted file mode 100644
index 6077089bf2..0000000000
--- a/packages/python/python-cython_0.9.6.14.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Cython is a language specially designed for writing Python extension modules. \
-It's designed to bridge the gap between the nice, high-level, easy-to-use world of Python \
-and the messy, low-level world of C."
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "GPL"
-SRCNAME = "Cython"
-PR = "ml0"
-
-SRC_URI = "http://pypi.python.org/packages/source/C/Cython/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-cython_0.9.8.bb b/packages/python/python-cython_0.9.8.bb
index 9243aa61f0..69d73fe969 100644
--- a/packages/python/python-cython_0.9.8.bb
+++ b/packages/python/python-cython_0.9.8.bb
@@ -5,12 +5,10 @@ SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "GPL"
SRCNAME = "Cython"
-PR = "ml0"
+PR = "ml1"
SRC_URI = "http://www.cython.org/${SRCNAME}-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/python/python-pyrex-native_0.9.8.4.bb b/packages/python/python-pyrex-native_0.9.8.4.bb
index d7ec81fd8e..4405212040 100644
--- a/packages/python/python-pyrex-native_0.9.8.4.bb
+++ b/packages/python/python-pyrex-native_0.9.8.4.bb
@@ -5,5 +5,6 @@ RDEPENDS = ""
do_stage() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
}
diff --git a/packages/python/python-pyrex_0.9.8.4.bb b/packages/python/python-pyrex_0.9.8.4.bb
index d0a5f826e0..80371c396a 100644
--- a/packages/python/python-pyrex_0.9.8.4.bb
+++ b/packages/python/python-pyrex_0.9.8.4.bb
@@ -5,7 +5,7 @@ SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "GPL"
SRCNAME = "Pyrex"
-PR = "ml0"
+PR = "ml1"
SRC_URI = "http://nz.cosc.canterbury.ac.nz/~greg/python/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
diff --git a/packages/python/python-pyyaml/.mtn2git_empty b/packages/python/python-pyyaml/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pyyaml/.mtn2git_empty
diff --git a/packages/python/python-pyyaml/setup.py b/packages/python/python-pyyaml/setup.py
new file mode 100644
index 0000000000..fb64983419
--- /dev/null
+++ b/packages/python/python-pyyaml/setup.py
@@ -0,0 +1,64 @@
+NAME = 'PyYAML'
+VERSION = '3.06'
+DESCRIPTION = "YAML parser and emitter for Python"
+LONG_DESCRIPTION = """\
+YAML is a data serialization format designed for human readability and
+interaction with scripting languages. PyYAML is a YAML parser and
+emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
+support, capable extension API, and sensible error messages. PyYAML
+supports standard YAML tags and provides Python-specific tags that allow
+to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from complex
+configuration files to object serialization and persistance."""
+AUTHOR = "Kirill Simonov"
+AUTHOR_EMAIL = 'xi@resolvent.net'
+LICENSE = "MIT"
+PLATFORMS = "Any"
+URL = "http://pyyaml.org/wiki/PyYAML"
+DOWNLOAD_URL = "http://pyyaml.org/download/pyyaml/%s-%s.tar.gz" % (NAME, VERSION)
+CLASSIFIERS = [
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: MIT License",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Text Processing :: Markup",
+]
+
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+
+import sys, os.path
+
+
+if __name__ == '__main__':
+
+ setup(
+ name=NAME,
+ version=VERSION,
+ description=DESCRIPTION,
+ long_description=LONG_DESCRIPTION,
+ author=AUTHOR,
+ author_email=AUTHOR_EMAIL,
+ license=LICENSE,
+ platforms=PLATFORMS,
+ url=URL,
+ download_url=DOWNLOAD_URL,
+ classifiers=CLASSIFIERS,
+
+ package_dir={'': 'lib'},
+ packages=['yaml'],
+
+ ext_modules = [
+ Extension( "_yaml", ["ext/_yaml.pyx"], libraries = ["yaml"] )
+ ],
+
+ cmdclass={
+ 'build_ext': build_ext,
+ },
+ )
diff --git a/packages/python/python-pyyaml_3.05.bb b/packages/python/python-pyyaml_3.05.bb
deleted file mode 100644
index 7f86bbadf7..0000000000
--- a/packages/python/python-pyyaml_3.05.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Python support for YAML"
-HOMEPAGE = "http://www.pyyaml.org"
-SECTION = "devel/python"
-LICENSE = "MIT"
-PR = "ml0"
-
-SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz"
-S = "${WORKDIR}/PyYAML-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-pyyaml_svn.bb b/packages/python/python-pyyaml_svn.bb
new file mode 100644
index 0000000000..3f316cff82
--- /dev/null
+++ b/packages/python/python-pyyaml_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Python support for YAML"
+HOMEPAGE = "http://www.pyyaml.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+DEPENDS = "libyaml python-cython-native"
+PV = "3.05+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "\
+ svn://svn.pyyaml.org/pyyaml;module=trunk;proto=http \
+ file://setup.py \
+"
+S = "${WORKDIR}/trunk"
+
+inherit distutils
+
+do_configure_prepend() {
+ # upstream setup.py overcomplicated, use ours
+ install -m 0644 ${WORKDIR}/setup.py ${S}
+}
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 5b82ecea69..5409c8a7bc 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
LICENSE = "MIT-like"
RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
-PR = "ml1"
+PR = "ml2"
SRC_URI = "\
http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb
index 937a73b1c1..d16a3fe300 100644
--- a/packages/starling/starling_svn.bb
+++ b/packages/starling/starling_svn.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Starling audio player for GPE"
SECTION = "gpe/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup libhandoff"
PV = "0.2+svnr${SRCREV}"
+PR = "r1"
inherit gpe autotools