aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-05-13 23:58:58 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-05-20 22:34:17 +0100
commit1786b04aa2fde02e0b1db4dcd2ff7be54381e8ce (patch)
treeba88dc80edd9c2f2614053065b46794878131ea8
parenta4791297c8f8ee265337beb3678e5411cabaddf1 (diff)
downloadmeta-opie-1786b04aa2fde02e0b1db4dcd2ff7be54381e8ce.tar.gz
Fix Opie Git recipes to use SRCPV
Using SRCPV we get e.g. 1.2.5+git1+... and the number will increment when OPIE_SRCREV changes, ensuring that the version number doesn't go backwards (although it will once for this change if you have existing packages beforehand, unfortunately). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--classes/opie_git.bbclass12
-rw-r--r--conf/distro/include/preferred-opie-git-versions.inc2
-rw-r--r--recipes-opie/libdbus-qt2/libdbus-qt2_git.bb4
-rw-r--r--recipes-opie/libmailwrapper/libmailwrapper_git.bb4
-rw-r--r--recipes-opie/libopie/libopie2_git.bb4
-rw-r--r--recipes-opie/libopieobex/libopieobex0_git.bb4
-rw-r--r--recipes-opie/libopietooth/libopietooth1_git.bb4
-rw-r--r--recipes-opie/libqpe/libqpe-opie_git.bb4
-rw-r--r--recipes-opie/libqtaux/libqtaux2_git.bb4
-rw-r--r--recipes-opie/nonworking/opie-dagger/opie-dagger_git.bb4
-rw-r--r--recipes-opie/nonworking/opie-dasher/opie-dasher_git.bb4
-rw-r--r--recipes-opie/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_git.bb4
-rw-r--r--recipes-opie/opie-aboutapplet/opie-aboutapplet_git.bb4
-rw-r--r--recipes-opie/opie-addressbook/opie-addressbook_git.bb4
-rw-r--r--recipes-opie/opie-advancedfm/opie-advancedfm_git.bb4
-rw-r--r--recipes-opie/opie-alarm/opie-alarm_git.bb4
-rw-r--r--recipes-opie/opie-appearance/opie-appearance_git.bb4
-rw-r--r--recipes-opie/opie-aqpkg/opie-aqpkg_git.bb4
-rw-r--r--recipes-opie/opie-autorotateapplet/opie-autorotateapplet_git.bb4
-rw-r--r--recipes-opie/opie-backgammon/opie-backgammon_git.bb4
-rw-r--r--recipes-opie/opie-backup/opie-backup_git.bb4
-rw-r--r--recipes-opie/opie-bartender/opie-bartender_git.bb4
-rw-r--r--recipes-opie/opie-batteryapplet/opie-batteryapplet_git.bb4
-rw-r--r--recipes-opie/opie-bluetoothapplet/opie-bluetoothapplet_git.bb4
-rw-r--r--recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb4
-rw-r--r--recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_git.bb4
-rw-r--r--recipes-opie/opie-bounce/opie-bounce_git.bb4
-rw-r--r--recipes-opie/opie-brightnessapplet/opie-brightnessapplet_git.bb4
-rw-r--r--recipes-opie/opie-button-settings/opie-button-settings_git.bb4
-rw-r--r--recipes-opie/opie-buzzword/opie-buzzword_git.bb4
-rw-r--r--recipes-opie/opie-calculator/opie-calculator_git.bb4
-rw-r--r--recipes-opie/opie-camera/opie-camera_git.bb4
-rw-r--r--recipes-opie/opie-cardapplet/opie-cardapplet_git.bb4
-rw-r--r--recipes-opie/opie-checkbook/opie-checkbook_git.bb4
-rw-r--r--recipes-opie/opie-citytime/opie-citytime_git.bb4
-rw-r--r--recipes-opie/opie-clipboardapplet/opie-clipboardapplet_git.bb4
-rw-r--r--recipes-opie/opie-clock/opie-clock_git.bb4
-rw-r--r--recipes-opie/opie-clockapplet/opie-clockapplet_git.bb4
-rw-r--r--recipes-opie/opie-confeditor/opie-confeditor_git.bb4
-rw-r--r--recipes-opie/opie-connmanapplet/opie-connmanapplet_git.bb4
-rw-r--r--recipes-opie/opie-connmansettings/opie-connmansettings_git.bb4
-rw-r--r--recipes-opie/opie-console/opie-console_git.bb4
-rw-r--r--recipes-opie/opie-currconv/opie-currconv_git.bb4
-rw-r--r--recipes-opie/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_git.bb4
-rw-r--r--recipes-opie/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_git.bb4
-rw-r--r--recipes-opie/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_git.bb4
-rw-r--r--recipes-opie/opie-datebook/opie-datebook_git.bb4
-rw-r--r--recipes-opie/opie-deco-flat/opie-deco-flat_git.bb4
-rw-r--r--recipes-opie/opie-deco-liquid/opie-deco-liquid_git.bb4
-rw-r--r--recipes-opie/opie-deco-polished/opie-deco-polished_git.bb4
-rw-r--r--recipes-opie/opie-doctab/opie-doctab_git.bb4
-rw-r--r--recipes-opie/opie-drawpad/opie-drawpad_git.bb4
-rw-r--r--recipes-opie/opie-dvorak/opie-dvorak_git.bb4
-rw-r--r--recipes-opie/opie-embeddedkonsole/opie-embeddedkonsole_git.bb4
-rw-r--r--recipes-opie/opie-euroconv/opie-euroconv_git.bb4
-rw-r--r--recipes-opie/opie-examples-python/opie-examples-python_git.bb4
-rw-r--r--recipes-opie/opie-examples/opie-examples_git.bb4
-rw-r--r--recipes-opie/opie-eye/opie-eye_git.bb4
-rw-r--r--recipes-opie/opie-fifteen/opie-fifteen_git.bb4
-rw-r--r--recipes-opie/opie-formatter/opie-formatter_git.bb4
-rw-r--r--recipes-opie/opie-freetype/opie-freetype_git.bb4
-rw-r--r--recipes-opie/opie-ftp/opie-ftp_git.bb4
-rw-r--r--recipes-opie/opie-ftplib/opie-ftplib_git.bb4
-rw-r--r--recipes-opie/opie-go/opie-go_git.bb4
-rw-r--r--recipes-opie/opie-gutenbrowser/opie-gutenbrowser_git.bb4
-rw-r--r--recipes-opie/opie-handwriting/opie-handwriting_git.bb4
-rw-r--r--recipes-opie/opie-help-en/opie-help-en_git.bb4
-rw-r--r--recipes-opie/opie-helpbrowser/opie-helpbrowser_git.bb4
-rw-r--r--recipes-opie/opie-homeapplet/opie-homeapplet_git.bb4
-rw-r--r--recipes-opie/opie-i18n/opie-i18n_git.bb4
-rw-r--r--recipes-opie/opie-i18n/opie-lrelease-native_git.bb4
-rw-r--r--recipes-opie/opie-i18n/opie-lupdate-native_git.bb4
-rw-r--r--recipes-opie/opie-icon-reload/opie-icon-reload_git.bb3
-rw-r--r--recipes-opie/opie-irc/opie-irc_git.bb4
-rw-r--r--recipes-opie/opie-irdaapplet/opie-irdaapplet_git.bb4
-rw-r--r--recipes-opie/opie-jumpx/opie-jumpx_git.bb4
-rw-r--r--recipes-opie/opie-kbill/opie-kbill_git.bb4
-rw-r--r--recipes-opie/opie-kcheckers/opie-kcheckers_git.bb4
-rw-r--r--recipes-opie/opie-keyboard/opie-keyboard_git.bb4
-rw-r--r--recipes-opie/opie-keypebble/opie-keypebble_git.bb4
-rw-r--r--recipes-opie/opie-keytabs/opie-keytabs_git.bb4
-rw-r--r--recipes-opie/opie-keyview/opie-keyview_git.bb4
-rw-r--r--recipes-opie/opie-kjumpx/opie-kjumpx_git.bb4
-rw-r--r--recipes-opie/opie-kpacman/opie-kpacman_git.bb4
-rw-r--r--recipes-opie/opie-language/opie-language_git.bb4
-rw-r--r--recipes-opie/opie-launcher-settings/opie-launcher-settings_git.bb4
-rw-r--r--recipes-opie/opie-libqrsync/opie-libqrsync_git.bb4
-rw-r--r--recipes-opie/opie-light-and-power/opie-light-and-power_git.bb4
-rw-r--r--recipes-opie/opie-lockapplet/opie-lockapplet_git.bb4
-rw-r--r--recipes-opie/opie-login/opie-login_git.bb4
-rw-r--r--recipes-opie/opie-logoutapplet/opie-logoutapplet_git.bb4
-rw-r--r--recipes-opie/opie-mail/opie-mail_git.bb4
-rw-r--r--recipes-opie/opie-mailapplet/opie-mailapplet_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1/opie-mediaplayer1-core_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer1/opie-mediaplayer1_git.bb2
-rw-r--r--recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb4
-rw-r--r--recipes-opie/opie-mediaplayer2/opie-mediaplayer2_git.bb4
-rw-r--r--recipes-opie/opie-mediummount/opie-mediummount_git.bb4
-rw-r--r--recipes-opie/opie-memoryapplet/opie-memoryapplet_git.bb4
-rw-r--r--recipes-opie/opie-mindbreaker/opie-mindbreaker_git.bb4
-rw-r--r--recipes-opie/opie-minesweep/opie-minesweep_git.bb4
-rw-r--r--recipes-opie/opie-multikey/opie-multikey_git.bb4
-rw-r--r--recipes-opie/opie-multikeyapplet/opie-multikeyapplet_git.bb4
-rw-r--r--recipes-opie/opie-networkapplet/opie-networkapplet_git.bb4
-rw-r--r--recipes-opie/opie-networksettings/opie-networksettings_git.bb4
-rw-r--r--recipes-opie/opie-notes/opie-notes_git.bb4
-rw-r--r--recipes-opie/opie-notesapplet/opie-notesapplet_git.bb4
-rw-r--r--recipes-opie/opie-odict/opie-odict_git.bb4
-rw-r--r--recipes-opie/opie-oxygen/opie-oxygen_git.bb4
-rw-r--r--recipes-opie/opie-oyatzee/opie-oyatzee_git.bb4
-rw-r--r--recipes-opie/opie-packagemanager/opie-packagemanager_git.bb4
-rw-r--r--recipes-opie/opie-parashoot/opie-parashoot_git.bb4
-rw-r--r--recipes-opie/opie-pickboard/opie-pickboard_git.bb4
-rw-r--r--recipes-opie/opie-pics/opie-pics_git.bb4
-rw-r--r--recipes-opie/opie-pimconverter/opie-pimconverter_git.bb4
-rw-r--r--recipes-opie/opie-powerchord/opie-powerchord_git.bb4
-rw-r--r--recipes-opie/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_git.bb4
-rw-r--r--recipes-opie/opie-qasteroids/opie-qasteroids_git.bb4
-rw-r--r--recipes-opie/opie-qcop/opie-qcop_git.bb4
-rw-r--r--recipes-opie/opie-qss/opie-qss_git.bb4
-rw-r--r--recipes-opie/opie-quicklauncher/opie-quicklauncher_git.bb4
-rw-r--r--recipes-opie/opie-rdesktop/opie-rdesktop_git.bb4
-rw-r--r--recipes-opie/opie-reader/opie-reader_git.bb4
-rw-r--r--recipes-opie/opie-reader/uqtreader_git.bb2
-rw-r--r--recipes-opie/opie-recorder/opie-recorder_git.bb4
-rw-r--r--recipes-opie/opie-remote/opie-remote_git.bb4
-rw-r--r--recipes-opie/opie-restartapplet/opie-restartapplet_git.bb4
-rw-r--r--recipes-opie/opie-restartapplet2/opie-restartapplet2_git.bb4
-rw-r--r--recipes-opie/opie-rotateapplet/opie-rotateapplet_git.bb4
-rw-r--r--recipes-opie/opie-screenshotapplet/opie-screenshotapplet_git.bb4
-rw-r--r--recipes-opie/opie-search/opie-search_git.bb4
-rw-r--r--recipes-opie/opie-security/opie-security_git.bb4
-rw-r--r--recipes-opie/opie-securityplugins/opie-securityplugin-blueping_git.bb4
-rw-r--r--recipes-opie/opie-securityplugins/opie-securityplugin-dummy_git.bb4
-rw-r--r--recipes-opie/opie-securityplugins/opie-securityplugin-notice_git.bb4
-rw-r--r--recipes-opie/opie-securityplugins/opie-securityplugin-pin_git.bb4
-rw-r--r--recipes-opie/opie-sfcave/opie-sfcave_git.bb4
-rw-r--r--recipes-opie/opie-sh-snes/opie-sh-snes_git.bb2
-rw-r--r--recipes-opie/opie-sh/opie-sh_git.bb4
-rw-r--r--recipes-opie/opie-sheet/opie-sheet_git.bb4
-rw-r--r--recipes-opie/opie-snake/opie-snake_git.bb4
-rw-r--r--recipes-opie/opie-solitaire/opie-solitaire_git.bb4
-rw-r--r--recipes-opie/opie-sounds/opie-sounds_git.bb4
-rw-r--r--recipes-opie/opie-sshkeys/opie-sshkeys_git.bb4
-rw-r--r--recipes-opie/opie-stumbler/opie-stumbler_git.bb4
-rw-r--r--recipes-opie/opie-style-flat/opie-style-flat_git.bb4
-rw-r--r--recipes-opie/opie-style-fresh/opie-style-fresh_git.bb4
-rw-r--r--recipes-opie/opie-style-liquid/opie-style-liquid_git.bb4
-rw-r--r--recipes-opie/opie-style-metal/opie-style-metal_git.bb4
-rw-r--r--recipes-opie/opie-style-phase/opie-style-phase_git.bb4
-rw-r--r--recipes-opie/opie-style-web/opie-style-web_git.bb4
-rw-r--r--recipes-opie/opie-suspendapplet/opie-suspendapplet_git.bb4
-rw-r--r--recipes-opie/opie-symlinker/opie-symlinker_git.bb4
-rw-r--r--recipes-opie/opie-sysinfo/opie-sysinfo_git.bb4
-rw-r--r--recipes-opie/opie-systemtime/opie-systemtime_git.bb4
-rw-r--r--recipes-opie/opie-tableviewer/opie-tableviewer_git.bb4
-rw-r--r--recipes-opie/opie-taskbar/opie-taskbar-images_git.bb4
-rw-r--r--recipes-opie/opie-taskbar/opie-taskbar_git.bb4
-rw-r--r--recipes-opie/opie-tetrix/opie-tetrix_git.bb4
-rw-r--r--recipes-opie/opie-textedit/opie-textedit_git.bb4
-rw-r--r--recipes-opie/opie-theme/opie-theme_git.bb4
-rw-r--r--recipes-opie/opie-tictac/opie-tictac_git.bb4
-rw-r--r--recipes-opie/opie-tinykate/opie-tinykate_git.bb4
-rw-r--r--recipes-opie/opie-today-addressbookplugin/opie-today-addressbookplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-datebookplugin/opie-today-datebookplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-fortuneplugin/opie-today-fortuneplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-mailplugin/opie-today-mailplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-stocktickerplugin/opie-today-stocktickerplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-todolistplugin/opie-today-todolistplugin_git.bb4
-rw-r--r--recipes-opie/opie-today-weatherplugin/opie-today-weatherplugin_git.bb4
-rw-r--r--recipes-opie/opie-today/opie-today_git.bb4
-rw-r--r--recipes-opie/opie-todo/opie-todo_git.bb4
-rw-r--r--recipes-opie/opie-tonleiter/opie-tonleiter_git.bb4
-rw-r--r--recipes-opie/opie-unikeyboard/opie-unikeyboard_git.bb4
-rw-r--r--recipes-opie/opie-vmemo-settings/opie-vmemo-settings_git.bb4
-rw-r--r--recipes-opie/opie-vmemo/opie-vmemo_git.bb4
-rw-r--r--recipes-opie/opie-volumeapplet/opie-volumeapplet_git.bb4
-rw-r--r--recipes-opie/opie-vtapplet/opie-vtapplet_git.bb4
-rw-r--r--recipes-opie/opie-wellenreiter/opie-wellenreiter_git.bb4
-rw-r--r--recipes-opie/opie-wirelessapplet/opie-wirelessapplet_git.bb4
-rw-r--r--recipes-opie/opie-wordgame/opie-wordgame_git.bb4
-rw-r--r--recipes-opie/opie-write/opie-write_git.bb4
-rw-r--r--recipes-opie/opie-zkbapplet/opie-zkbapplet_git.bb4
-rw-r--r--recipes-opie/opie-zlines/opie-zlines_git.bb4
-rw-r--r--recipes-opie/opie-zsafe/opie-zsafe_git.bb4
-rw-r--r--recipes-opie/opie-zsame/opie-zsame_git.bb4
193 files changed, 392 insertions, 379 deletions
diff --git a/classes/opie_git.bbclass b/classes/opie_git.bbclass
new file mode 100644
index 0000000..d705555
--- /dev/null
+++ b/classes/opie_git.bbclass
@@ -0,0 +1,12 @@
+# Class for Opie git recipes to ensure they get the correct PV
+# Relies on OPIE_GIT_PV and OPIE_SRCREV being set (see
+# conf/distro/include/preferred-opie-git-versions.inc)
+
+# Note: you will need to ensure the first entry in SRC_URI pointing
+# to the Opie git repository has name=first
+
+PV = "${OPIE_GIT_PV}${SRCPV}"
+
+SRCREV = "${OPIE_SRCREV}"
+SRCREV_FORMAT = "first"
+
diff --git a/conf/distro/include/preferred-opie-git-versions.inc b/conf/distro/include/preferred-opie-git-versions.inc
index a15e2dd..91d9f9d 100644
--- a/conf/distro/include/preferred-opie-git-versions.inc
+++ b/conf/distro/include/preferred-opie-git-versions.inc
@@ -5,7 +5,7 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
OPIE_SRCREV ?= "f5c8bd6272b5bee393736f401232ce0ccc984fec"
-OPIE_VERSION = "1.2.5+gitr${OPIE_SRCREV}"
+OPIE_VERSION = "1.2.5+git"
OPIE_GIT_PV = "${OPIE_VERSION}"
diff --git a/recipes-opie/libdbus-qt2/libdbus-qt2_git.bb b/recipes-opie/libdbus-qt2/libdbus-qt2_git.bb
index 10aa123..04b8a99 100644
--- a/recipes-opie/libdbus-qt2/libdbus-qt2_git.bb
+++ b/recipes-opie/libdbus-qt2/libdbus-qt2_git.bb
@@ -1,5 +1,5 @@
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=libdbus-qt2"
-PV = "${OPIE_GIT_PV}"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=libdbus-qt2;name=first"
+inherit opie_git
PR = "r0"
require libdbus-qt2.inc
diff --git a/recipes-opie/libmailwrapper/libmailwrapper_git.bb b/recipes-opie/libmailwrapper/libmailwrapper_git.bb
index 24b3884..c234689 100644
--- a/recipes-opie/libmailwrapper/libmailwrapper_git.bb
+++ b/recipes-opie/libmailwrapper/libmailwrapper_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail/libmailwrapper"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail/libmailwrapper;name=first"
diff --git a/recipes-opie/libopie/libopie2_git.bb b/recipes-opie/libopie/libopie2_git.bb
index e80d95d..a1b63ab 100644
--- a/recipes-opie/libopie/libopie2_git.bb
+++ b/recipes-opie/libopie/libopie2_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "${INC_PR}.0"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=libopie2 \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=libopie2;name=first \
file://include.pro"
# libdbus-qt2 is needed for new bluez4 support
diff --git a/recipes-opie/libopieobex/libopieobex0_git.bb b/recipes-opie/libopieobex/libopieobex0_git.bb
index ad5aad2..394f6e2 100644
--- a/recipes-opie/libopieobex/libopieobex0_git.bb
+++ b/recipes-opie/libopieobex/libopieobex0_git.bb
@@ -1,7 +1,7 @@
require libopieobex0.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r9"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/obex \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/obex;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
file://disable-bt-check-git.patch"
diff --git a/recipes-opie/libopietooth/libopietooth1_git.bb b/recipes-opie/libopietooth/libopietooth1_git.bb
index 7c0cf52..f8651ff 100644
--- a/recipes-opie/libopietooth/libopietooth1_git.bb
+++ b/recipes-opie/libopietooth/libopietooth1_git.bb
@@ -1,5 +1,5 @@
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/lib"
-PV = "${OPIE_GIT_PV}"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/lib;name=first"
+inherit opie_git
PR = "r2"
require libopietooth1.inc
diff --git a/recipes-opie/libqpe/libqpe-opie_git.bb b/recipes-opie/libqpe/libqpe-opie_git.bb
index 8dc3c50..5b8310f 100644
--- a/recipes-opie/libqpe/libqpe-opie_git.bb
+++ b/recipes-opie/libqpe/libqpe-opie_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "${INC_PR}.1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=library \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=library;name=first \
file://fix-titleheight.patch \
file://unbreak-logging-2.patch \
file://no-include-pro.patch \
diff --git a/recipes-opie/libqtaux/libqtaux2_git.bb b/recipes-opie/libqtaux/libqtaux2_git.bb
index b07112f..0ac3be7 100644
--- a/recipes-opie/libqtaux/libqtaux2_git.bb
+++ b/recipes-opie/libqtaux/libqtaux2_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "${INC_PR}.0"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=libqtaux"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=libqtaux;name=first"
diff --git a/recipes-opie/nonworking/opie-dagger/opie-dagger_git.bb b/recipes-opie/nonworking/opie-dagger/opie-dagger_git.bb
index 2bffd49..857a252 100644
--- a/recipes-opie/nonworking/opie-dagger/opie-dagger_git.bb
+++ b/recipes-opie/nonworking/opie-dagger/opie-dagger_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/dagger \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/dagger;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/nonworking/opie-dasher/opie-dasher_git.bb b/recipes-opie/nonworking/opie-dasher/opie-dasher_git.bb
index 273e098..cc1a7b0 100644
--- a/recipes-opie/nonworking/opie-dasher/opie-dasher_git.bb
+++ b/recipes-opie/nonworking/opie-dasher/opie-dasher_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PR = "r2"
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/dasher \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/dasher;name=first \
${OPIE_GIT};protocol=git;subpath=share "
diff --git a/recipes-opie/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_git.bb b/recipes-opie/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_git.bb
index b6b408a..3c17034 100644
--- a/recipes-opie/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_git.bb
+++ b/recipes-opie/nonworking/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_git.bb
@@ -5,11 +5,11 @@ LICENSE = "GPL"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
DEPENDS = "opie-mediaplayer1"
RDEPENDS_${PN} = "opie-mediaplayer1"
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
APPNAME = "mpeg3plugin"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first"
S = "${WORKDIR}/opieplayer/libmpeg3"
diff --git a/recipes-opie/opie-aboutapplet/opie-aboutapplet_git.bb b/recipes-opie/opie-aboutapplet/opie-aboutapplet_git.bb
index 22ae828..ad1c900 100644
--- a/recipes-opie/opie-aboutapplet/opie-aboutapplet_git.bb
+++ b/recipes-opie/opie-aboutapplet/opie-aboutapplet_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/aboutapplet"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/aboutapplet;name=first"
diff --git a/recipes-opie/opie-addressbook/opie-addressbook_git.bb b/recipes-opie/opie-addressbook/opie-addressbook_git.bb
index 05d8822..d3ed672 100644
--- a/recipes-opie/opie-addressbook/opie-addressbook_git.bb
+++ b/recipes-opie/opie-addressbook/opie-addressbook_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/addressbook \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/addressbook;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-advancedfm/opie-advancedfm_git.bb b/recipes-opie/opie-advancedfm/opie-advancedfm_git.bb
index e49a27e..09d8b20 100644
--- a/recipes-opie/opie-advancedfm/opie-advancedfm_git.bb
+++ b/recipes-opie/opie-advancedfm/opie-advancedfm_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-alarm/opie-alarm_git.bb b/recipes-opie/opie-alarm/opie-alarm_git.bb
index 2482ed4..0ad8136 100644
--- a/recipes-opie/opie-alarm/opie-alarm_git.bb
+++ b/recipes-opie/opie-alarm/opie-alarm_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r5"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/opiealarm \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/opiealarm;name=first \
file://01opiealarm \
file://dirdefines-git.patch "
diff --git a/recipes-opie/opie-appearance/opie-appearance_git.bb b/recipes-opie/opie-appearance/opie-appearance_git.bb
index 2d84379..c4522ef 100644
--- a/recipes-opie/opie-appearance/opie-appearance_git.bb
+++ b/recipes-opie/opie-appearance/opie-appearance_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/appearance2 \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/appearance2;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-aqpkg/opie-aqpkg_git.bb b/recipes-opie/opie-aqpkg/opie-aqpkg_git.bb
index f116aba..ed65820 100644
--- a/recipes-opie/opie-aqpkg/opie-aqpkg_git.bb
+++ b/recipes-opie/opie-aqpkg/opie-aqpkg_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/aqpkg \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/aqpkg;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-autorotateapplet/opie-autorotateapplet_git.bb b/recipes-opie/opie-autorotateapplet/opie-autorotateapplet_git.bb
index de7ae8b..00415bc 100644
--- a/recipes-opie/opie-autorotateapplet/opie-autorotateapplet_git.bb
+++ b/recipes-opie/opie-autorotateapplet/opie-autorotateapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/autorotateapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/autorotateapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-backgammon/opie-backgammon_git.bb b/recipes-opie/opie-backgammon/opie-backgammon_git.bb
index 6c08c38..8a72a04 100644
--- a/recipes-opie/opie-backgammon/opie-backgammon_git.bb
+++ b/recipes-opie/opie-backgammon/opie-backgammon_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/backgammon \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/backgammon;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-backup/opie-backup_git.bb b/recipes-opie/opie-backup/opie-backup_git.bb
index 50530cb..fe46428 100644
--- a/recipes-opie/opie-backup/opie-backup_git.bb
+++ b/recipes-opie/opie-backup/opie-backup_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/backup \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/backup;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-bartender/opie-bartender_git.bb b/recipes-opie/opie-bartender/opie-bartender_git.bb
index c9d001d..bc92475 100644
--- a/recipes-opie/opie-bartender/opie-bartender_git.bb
+++ b/recipes-opie/opie-bartender/opie-bartender_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-bartender \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-bartender;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-batteryapplet/opie-batteryapplet_git.bb b/recipes-opie/opie-batteryapplet/opie-batteryapplet_git.bb
index c17d104..4b94711 100644
--- a/recipes-opie/opie-batteryapplet/opie-batteryapplet_git.bb
+++ b/recipes-opie/opie-batteryapplet/opie-batteryapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/batteryapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/batteryapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-bluetoothapplet/opie-bluetoothapplet_git.bb b/recipes-opie/opie-bluetoothapplet/opie-bluetoothapplet_git.bb
index b90c7c2..e352c02 100644
--- a/recipes-opie/opie-bluetoothapplet/opie-bluetoothapplet_git.bb
+++ b/recipes-opie/opie-bluetoothapplet/opie-bluetoothapplet_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
RDEPENDS_${PN} += "opie-bluetoothd"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/applet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/applet;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb b/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
index dac89e4..fe2fa8f 100644
--- a/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
+++ b/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
@@ -1,4 +1,4 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/opiebluetoothd"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/opiebluetoothd;name=first"
diff --git a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_git.bb b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_git.bb
index 7a531fb..9a54694 100644
--- a/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_git.bb
+++ b/recipes-opie/opie-bluetoothmanager/opie-bluetoothmanager_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
RDEPENDS_${PN} += "opie-bluetoothd"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/manager \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/manager;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-bounce/opie-bounce_git.bb b/recipes-opie/opie-bounce/opie-bounce_git.bb
index be36ca2..1fda7ef 100644
--- a/recipes-opie/opie-bounce/opie-bounce_git.bb
+++ b/recipes-opie/opie-bounce/opie-bounce_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/bounce \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/bounce;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-brightnessapplet/opie-brightnessapplet_git.bb b/recipes-opie/opie-brightnessapplet/opie-brightnessapplet_git.bb
index 435c975..e71a18b 100644
--- a/recipes-opie/opie-brightnessapplet/opie-brightnessapplet_git.bb
+++ b/recipes-opie/opie-brightnessapplet/opie-brightnessapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/brightnessapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/brightnessapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-button-settings/opie-button-settings_git.bb b/recipes-opie/opie-button-settings/opie-button-settings_git.bb
index 07657f3..dd68c0b 100644
--- a/recipes-opie/opie-button-settings/opie-button-settings_git.bb
+++ b/recipes-opie/opie-button-settings/opie-button-settings_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/button \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/button;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-buzzword/opie-buzzword_git.bb b/recipes-opie/opie-buzzword/opie-buzzword_git.bb
index 0211afa..a22d653 100644
--- a/recipes-opie/opie-buzzword/opie-buzzword_git.bb
+++ b/recipes-opie/opie-buzzword/opie-buzzword_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/buzzword \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/buzzword;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-calculator/opie-calculator_git.bb b/recipes-opie/opie-calculator/opie-calculator_git.bb
index b1224db..2daefc5 100644
--- a/recipes-opie/opie-calculator/opie-calculator_git.bb
+++ b/recipes-opie/opie-calculator/opie-calculator_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/calculator \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/calculator;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=etc "
diff --git a/recipes-opie/opie-camera/opie-camera_git.bb b/recipes-opie/opie-camera/opie-camera_git.bb
index a33f874..c5770d4 100644
--- a/recipes-opie/opie-camera/opie-camera_git.bb
+++ b/recipes-opie/opie-camera/opie-camera_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-cardapplet/opie-cardapplet_git.bb b/recipes-opie/opie-cardapplet/opie-cardapplet_git.bb
index fbcb98d..d5cea5a 100644
--- a/recipes-opie/opie-cardapplet/opie-cardapplet_git.bb
+++ b/recipes-opie/opie-cardapplet/opie-cardapplet_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/cardapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/cardapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=sounds \
${OPIE_GIT};protocol=git;subpath=apps \
diff --git a/recipes-opie/opie-checkbook/opie-checkbook_git.bb b/recipes-opie/opie-checkbook/opie-checkbook_git.bb
index e49a27e..09d8b20 100644
--- a/recipes-opie/opie-checkbook/opie-checkbook_git.bb
+++ b/recipes-opie/opie-checkbook/opie-checkbook_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-citytime/opie-citytime_git.bb b/recipes-opie/opie-citytime/opie-citytime_git.bb
index 461951c..53c7739 100644
--- a/recipes-opie/opie-citytime/opie-citytime_git.bb
+++ b/recipes-opie/opie-citytime/opie-citytime_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/citytime \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/citytime;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-clipboardapplet/opie-clipboardapplet_git.bb b/recipes-opie/opie-clipboardapplet/opie-clipboardapplet_git.bb
index 9a77aea..76cf9fa 100644
--- a/recipes-opie/opie-clipboardapplet/opie-clipboardapplet_git.bb
+++ b/recipes-opie/opie-clipboardapplet/opie-clipboardapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/clipboardapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/clipboardapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-clock/opie-clock_git.bb b/recipes-opie/opie-clock/opie-clock_git.bb
index 41fded0..f30d889 100644
--- a/recipes-opie/opie-clock/opie-clock_git.bb
+++ b/recipes-opie/opie-clock/opie-clock_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/clock \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/clock;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-clockapplet/opie-clockapplet_git.bb b/recipes-opie/opie-clockapplet/opie-clockapplet_git.bb
index 7f7fc5e..8269aad 100644
--- a/recipes-opie/opie-clockapplet/opie-clockapplet_git.bb
+++ b/recipes-opie/opie-clockapplet/opie-clockapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/clockapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/clockapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-confeditor/opie-confeditor_git.bb b/recipes-opie/opie-confeditor/opie-confeditor_git.bb
index ed8b673..6817658 100644
--- a/recipes-opie/opie-confeditor/opie-confeditor_git.bb
+++ b/recipes-opie/opie-confeditor/opie-confeditor_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/confedit \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/confedit;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-connmanapplet/opie-connmanapplet_git.bb b/recipes-opie/opie-connmanapplet/opie-connmanapplet_git.bb
index 6078a0a..735fa51 100644
--- a/recipes-opie/opie-connmanapplet/opie-connmanapplet_git.bb
+++ b/recipes-opie/opie-connmanapplet/opie-connmanapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r0"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/connman/applet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/connman/applet;name=first \
${OPIE_GIT};protocol=git;subpath=noncore/net/connman/settings \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-connmansettings/opie-connmansettings_git.bb b/recipes-opie/opie-connmansettings/opie-connmansettings_git.bb
index d374907..b31f2c6 100644
--- a/recipes-opie/opie-connmansettings/opie-connmansettings_git.bb
+++ b/recipes-opie/opie-connmansettings/opie-connmansettings_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r0"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/connman/settings \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/connman/settings;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-console/opie-console_git.bb b/recipes-opie/opie-console/opie-console_git.bb
index dee5ab0..d4378bd 100644
--- a/recipes-opie/opie-console/opie-console_git.bb
+++ b/recipes-opie/opie-console/opie-console_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
"
diff --git a/recipes-opie/opie-currconv/opie-currconv_git.bb b/recipes-opie/opie-currconv/opie-currconv_git.bb
index f95e7d6..bd86ece 100644
--- a/recipes-opie/opie-currconv/opie-currconv_git.bb
+++ b/recipes-opie/opie-currconv/opie-currconv_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/currconv \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/currconv;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_git.bb b/recipes-opie/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_git.bb
index 3739384..956eec9 100644
--- a/recipes-opie/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_git.bb
+++ b/recipes-opie/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/birthday "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/birthday;name=first "
diff --git a/recipes-opie/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_git.bb b/recipes-opie/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_git.bb
index 563fdf4..921d951 100644
--- a/recipes-opie/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_git.bb
+++ b/recipes-opie/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/christian "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/christian;name=first "
diff --git a/recipes-opie/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_git.bb b/recipes-opie/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_git.bb
index ff9e427..92a2be6 100644
--- a/recipes-opie/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_git.bb
+++ b/recipes-opie/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/national \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook/plugins/national;name=first \
${OPIE_GIT};protocol=git;subpath=etc/nationaldays "
diff --git a/recipes-opie/opie-datebook/opie-datebook_git.bb b/recipes-opie/opie-datebook/opie-datebook_git.bb
index 54ec763..898240e 100644
--- a/recipes-opie/opie-datebook/opie-datebook_git.bb
+++ b/recipes-opie/opie-datebook/opie-datebook_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/datebook;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-deco-flat/opie-deco-flat_git.bb b/recipes-opie/opie-deco-flat/opie-deco-flat_git.bb
index a99d841..7b1975a 100644
--- a/recipes-opie/opie-deco-flat/opie-deco-flat_git.bb
+++ b/recipes-opie/opie-deco-flat/opie-deco-flat_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/flat "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/flat;name=first "
diff --git a/recipes-opie/opie-deco-liquid/opie-deco-liquid_git.bb b/recipes-opie/opie-deco-liquid/opie-deco-liquid_git.bb
index fee6dbc..bef01b8 100644
--- a/recipes-opie/opie-deco-liquid/opie-deco-liquid_git.bb
+++ b/recipes-opie/opie-deco-liquid/opie-deco-liquid_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/liquid "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/liquid;name=first "
diff --git a/recipes-opie/opie-deco-polished/opie-deco-polished_git.bb b/recipes-opie/opie-deco-polished/opie-deco-polished_git.bb
index afd1587..9cf6d77 100644
--- a/recipes-opie/opie-deco-polished/opie-deco-polished_git.bb
+++ b/recipes-opie/opie-deco-polished/opie-deco-polished_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/polished "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/decorations/polished;name=first "
diff --git a/recipes-opie/opie-doctab/opie-doctab_git.bb b/recipes-opie/opie-doctab/opie-doctab_git.bb
index e2eb18d..76111a6 100644
--- a/recipes-opie/opie-doctab/opie-doctab_git.bb
+++ b/recipes-opie/opie-doctab/opie-doctab_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/doctab \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/doctab;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-drawpad/opie-drawpad_git.bb b/recipes-opie/opie-drawpad/opie-drawpad_git.bb
index a11686c..fb3cc52 100644
--- a/recipes-opie/opie-drawpad/opie-drawpad_git.bb
+++ b/recipes-opie/opie-drawpad/opie-drawpad_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/graphics/drawpad \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/graphics/drawpad;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-dvorak/opie-dvorak_git.bb b/recipes-opie/opie-dvorak/opie-dvorak_git.bb
index de9631c..d470bbc 100644
--- a/recipes-opie/opie-dvorak/opie-dvorak_git.bb
+++ b/recipes-opie/opie-dvorak/opie-dvorak_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/dvorak \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/dvorak;name=first \
${OPIE_GIT};protocol=git;subpath=inputmethods/pickboard \
file://fix-rpath.patch "
diff --git a/recipes-opie/opie-embeddedkonsole/opie-embeddedkonsole_git.bb b/recipes-opie/opie-embeddedkonsole/opie-embeddedkonsole_git.bb
index 3b6e748..f933127 100644
--- a/recipes-opie/opie-embeddedkonsole/opie-embeddedkonsole_git.bb
+++ b/recipes-opie/opie-embeddedkonsole/opie-embeddedkonsole_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-euroconv/opie-euroconv_git.bb b/recipes-opie/opie-euroconv/opie-euroconv_git.bb
index 8abb72f..1bd268e 100644
--- a/recipes-opie/opie-euroconv/opie-euroconv_git.bb
+++ b/recipes-opie/opie-euroconv/opie-euroconv_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/euroconv \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/euroconv;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-examples-python/opie-examples-python_git.bb b/recipes-opie/opie-examples-python/opie-examples-python_git.bb
index 330e09d..e6c497d 100644
--- a/recipes-opie/opie-examples-python/opie-examples-python_git.bb
+++ b/recipes-opie/opie-examples-python/opie-examples-python_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=examples/python \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=examples/python;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-examples/opie-examples_git.bb b/recipes-opie/opie-examples/opie-examples_git.bb
index fa426a8..f97e55b 100644
--- a/recipes-opie/opie-examples/opie-examples_git.bb
+++ b/recipes-opie/opie-examples/opie-examples_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=examples \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=examples;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-eye/opie-eye_git.bb b/recipes-opie/opie-eye/opie-eye_git.bb
index 7ae0402..c1d2afa 100644
--- a/recipes-opie/opie-eye/opie-eye_git.bb
+++ b/recipes-opie/opie-eye/opie-eye_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/graphics/opie-eye \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/graphics/opie-eye;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-fifteen/opie-fifteen_git.bb b/recipes-opie/opie-fifteen/opie-fifteen_git.bb
index e0ee7c2..5d5085b 100644
--- a/recipes-opie/opie-fifteen/opie-fifteen_git.bb
+++ b/recipes-opie/opie-fifteen/opie-fifteen_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/fifteen \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/fifteen;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-formatter/opie-formatter_git.bb b/recipes-opie/opie-formatter/opie-formatter_git.bb
index 4c15f2d..f26a3b0 100644
--- a/recipes-opie/opie-formatter/opie-formatter_git.bb
+++ b/recipes-opie/opie-formatter/opie-formatter_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/formatter \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/formatter;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-freetype/opie-freetype_git.bb b/recipes-opie/opie-freetype/opie-freetype_git.bb
index 6a7198e..223aae9 100644
--- a/recipes-opie/opie-freetype/opie-freetype_git.bb
+++ b/recipes-opie/opie-freetype/opie-freetype_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=freetype"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=freetype;name=first"
diff --git a/recipes-opie/opie-ftp/opie-ftp_git.bb b/recipes-opie/opie-ftp/opie-ftp_git.bb
index a796093..e0bd2d5 100644
--- a/recipes-opie/opie-ftp/opie-ftp_git.bb
+++ b/recipes-opie/opie-ftp/opie-ftp_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opieftp \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opieftp;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-ftplib/opie-ftplib_git.bb b/recipes-opie/opie-ftplib/opie-ftplib_git.bb
index f9cfad7..c234a6d 100644
--- a/recipes-opie/opie-ftplib/opie-ftplib_git.bb
+++ b/recipes-opie/opie-ftplib/opie-ftplib_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/ftplib"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/ftplib;name=first"
diff --git a/recipes-opie/opie-go/opie-go_git.bb b/recipes-opie/opie-go/opie-go_git.bb
index 870f951..46f3a9a 100644
--- a/recipes-opie/opie-go/opie-go_git.bb
+++ b/recipes-opie/opie-go/opie-go_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/go \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/go;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-gutenbrowser/opie-gutenbrowser_git.bb b/recipes-opie/opie-gutenbrowser/opie-gutenbrowser_git.bb
index 4f21450..1740b02 100644
--- a/recipes-opie/opie-gutenbrowser/opie-gutenbrowser_git.bb
+++ b/recipes-opie/opie-gutenbrowser/opie-gutenbrowser_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-gutenbrowser \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-gutenbrowser;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=etc"
diff --git a/recipes-opie/opie-handwriting/opie-handwriting_git.bb b/recipes-opie/opie-handwriting/opie-handwriting_git.bb
index a38ec9e..d30a2bd 100644
--- a/recipes-opie/opie-handwriting/opie-handwriting_git.bb
+++ b/recipes-opie/opie-handwriting/opie-handwriting_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/handwriting \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/handwriting;name=first \
${OPIE_GIT};protocol=git;subpath=etc/qimpen"
diff --git a/recipes-opie/opie-help-en/opie-help-en_git.bb b/recipes-opie/opie-help-en/opie-help-en_git.bb
index 78a7590..b181e29 100644
--- a/recipes-opie/opie-help-en/opie-help-en_git.bb
+++ b/recipes-opie/opie-help-en/opie-help-en_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=help/en/html "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=help/en/html;name=first "
diff --git a/recipes-opie/opie-helpbrowser/opie-helpbrowser_git.bb b/recipes-opie/opie-helpbrowser/opie-helpbrowser_git.bb
index 3b6e748..f933127 100644
--- a/recipes-opie/opie-helpbrowser/opie-helpbrowser_git.bb
+++ b/recipes-opie/opie-helpbrowser/opie-helpbrowser_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-homeapplet/opie-homeapplet_git.bb b/recipes-opie/opie-homeapplet/opie-homeapplet_git.bb
index 3aeaeda..94150a7 100644
--- a/recipes-opie/opie-homeapplet/opie-homeapplet_git.bb
+++ b/recipes-opie/opie-homeapplet/opie-homeapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/homeapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/homeapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-i18n/opie-i18n_git.bb b/recipes-opie/opie-i18n/opie-i18n_git.bb
index bf53a7a..7b9b3d4 100644
--- a/recipes-opie/opie-i18n/opie-i18n_git.bb
+++ b/recipes-opie/opie-i18n/opie-i18n_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=i18n \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=i18n;name=first \
${OPIE_GIT};protocol=git;subpath=etc/dict"
diff --git a/recipes-opie/opie-i18n/opie-lrelease-native_git.bb b/recipes-opie/opie-i18n/opie-lrelease-native_git.bb
index 1581f95..0c32625 100644
--- a/recipes-opie/opie-i18n/opie-lrelease-native_git.bb
+++ b/recipes-opie/opie-i18n/opie-lrelease-native_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/translation/opie-lrelease \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/translation/opie-lrelease;name=first \
${OPIE_GIT};protocol=git;subpath=development/translation/shared"
diff --git a/recipes-opie/opie-i18n/opie-lupdate-native_git.bb b/recipes-opie/opie-i18n/opie-lupdate-native_git.bb
index e42251f..cc90e4c 100644
--- a/recipes-opie/opie-i18n/opie-lupdate-native_git.bb
+++ b/recipes-opie/opie-i18n/opie-lupdate-native_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/translation/opie-lupdate \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/translation/opie-lupdate;name=first \
${OPIE_GIT};protocol=git;subpath=development/translation/shared"
diff --git a/recipes-opie/opie-icon-reload/opie-icon-reload_git.bb b/recipes-opie/opie-icon-reload/opie-icon-reload_git.bb
index 90f40fe..3457d12 100644
--- a/recipes-opie/opie-icon-reload/opie-icon-reload_git.bb
+++ b/recipes-opie/opie-icon-reload/opie-icon-reload_git.bb
@@ -1,3 +1,4 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+PV = "${OPIE_GIT_PV}0-${OPIE_SRCREV}"
+
diff --git a/recipes-opie/opie-irc/opie-irc_git.bb b/recipes-opie/opie-irc/opie-irc_git.bb
index e9b1f63..9960ec8 100644
--- a/recipes-opie/opie-irc/opie-irc_git.bb
+++ b/recipes-opie/opie-irc/opie-irc_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opieirc \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opieirc;name=first \
${OPIE_GIT};protocol=git;subpath=help \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-irdaapplet/opie-irdaapplet_git.bb b/recipes-opie/opie-irdaapplet/opie-irdaapplet_git.bb
index dffc2b9..3925a44 100644
--- a/recipes-opie/opie-irdaapplet/opie-irdaapplet_git.bb
+++ b/recipes-opie/opie-irdaapplet/opie-irdaapplet_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/irdaapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/irdaapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=sounds \
${OPIE_GIT};protocol=git;subpath=apps \
diff --git a/recipes-opie/opie-jumpx/opie-jumpx_git.bb b/recipes-opie/opie-jumpx/opie-jumpx_git.bb
index 3e42ca5..c0f1a35 100644
--- a/recipes-opie/opie-jumpx/opie-jumpx_git.bb
+++ b/recipes-opie/opie-jumpx/opie-jumpx_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/jumpx \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/jumpx;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-kbill/opie-kbill_git.bb b/recipes-opie/opie-kbill/opie-kbill_git.bb
index f4864e7..74e75d7 100644
--- a/recipes-opie/opie-kbill/opie-kbill_git.bb
+++ b/recipes-opie/opie-kbill/opie-kbill_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kbill \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kbill;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-kcheckers/opie-kcheckers_git.bb b/recipes-opie/opie-kcheckers/opie-kcheckers_git.bb
index 8395f79..ed52f3b 100644
--- a/recipes-opie/opie-kcheckers/opie-kcheckers_git.bb
+++ b/recipes-opie/opie-kcheckers/opie-kcheckers_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kcheckers \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kcheckers;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-keyboard/opie-keyboard_git.bb b/recipes-opie/opie-keyboard/opie-keyboard_git.bb
index f75f62f..b59b857 100644
--- a/recipes-opie/opie-keyboard/opie-keyboard_git.bb
+++ b/recipes-opie/opie-keyboard/opie-keyboard_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/keyboard \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/keyboard;name=first \
file://fix-rpath.patch "
diff --git a/recipes-opie/opie-keypebble/opie-keypebble_git.bb b/recipes-opie/opie-keypebble/opie-keypebble_git.bb
index 404a280..8954235 100644
--- a/recipes-opie/opie-keypebble/opie-keypebble_git.bb
+++ b/recipes-opie/opie-keypebble/opie-keypebble_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/comm/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/comm/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-keytabs/opie-keytabs_git.bb b/recipes-opie/opie-keytabs/opie-keytabs_git.bb
index 4af259f..aff0dcd 100644
--- a/recipes-opie/opie-keytabs/opie-keytabs_git.bb
+++ b/recipes-opie/opie-keytabs/opie-keytabs_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=etc"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=etc;name=first"
diff --git a/recipes-opie/opie-keyview/opie-keyview_git.bb b/recipes-opie/opie-keyview/opie-keyview_git.bb
index f1ed53e..86ff111 100644
--- a/recipes-opie/opie-keyview/opie-keyview_git.bb
+++ b/recipes-opie/opie-keyview/opie-keyview_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/keyview "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=development/keyview;name=first "
diff --git a/recipes-opie/opie-kjumpx/opie-kjumpx_git.bb b/recipes-opie/opie-kjumpx/opie-kjumpx_git.bb
index 9cc97c6..cb98b4c 100644
--- a/recipes-opie/opie-kjumpx/opie-kjumpx_git.bb
+++ b/recipes-opie/opie-kjumpx/opie-kjumpx_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/kjumpx \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/kjumpx;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-kpacman/opie-kpacman_git.bb b/recipes-opie/opie-kpacman/opie-kpacman_git.bb
index dd860fb..6b1973b 100644
--- a/recipes-opie/opie-kpacman/opie-kpacman_git.bb
+++ b/recipes-opie/opie-kpacman/opie-kpacman_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kpacman \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/kpacman;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-language/opie-language_git.bb b/recipes-opie/opie-language/opie-language_git.bb
index f9f9d9b..0a8a1be 100644
--- a/recipes-opie/opie-language/opie-language_git.bb
+++ b/recipes-opie/opie-language/opie-language_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/language \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/language;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-launcher-settings/opie-launcher-settings_git.bb b/recipes-opie/opie-launcher-settings/opie-launcher-settings_git.bb
index 9bac172..114b44f 100644
--- a/recipes-opie/opie-launcher-settings/opie-launcher-settings_git.bb
+++ b/recipes-opie/opie-launcher-settings/opie-launcher-settings_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/launcher \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/launcher;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-libqrsync/opie-libqrsync_git.bb b/recipes-opie/opie-libqrsync/opie-libqrsync_git.bb
index c5cd3c4..c279a01 100644
--- a/recipes-opie/opie-libqrsync/opie-libqrsync_git.bb
+++ b/recipes-opie/opie-libqrsync/opie-libqrsync_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=rsync"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=rsync;name=first"
diff --git a/recipes-opie/opie-light-and-power/opie-light-and-power_git.bb b/recipes-opie/opie-light-and-power/opie-light-and-power_git.bb
index cc24b80..b6999db 100644
--- a/recipes-opie/opie-light-and-power/opie-light-and-power_git.bb
+++ b/recipes-opie/opie-light-and-power/opie-light-and-power_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/light-and-power \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/light-and-power;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-lockapplet/opie-lockapplet_git.bb b/recipes-opie/opie-lockapplet/opie-lockapplet_git.bb
index 0525b5f..33a2cb2 100644
--- a/recipes-opie/opie-lockapplet/opie-lockapplet_git.bb
+++ b/recipes-opie/opie-lockapplet/opie-lockapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/lockapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/lockapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-login/opie-login_git.bb b/recipes-opie/opie-login/opie-login_git.bb
index 9c1f0e4..0f0f932 100644
--- a/recipes-opie/opie-login/opie-login_git.bb
+++ b/recipes-opie/opie-login/opie-login_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \
${OPIE_GIT};protocol=git;subpath=core/launcher \
file://opie-session \
diff --git a/recipes-opie/opie-logoutapplet/opie-logoutapplet_git.bb b/recipes-opie/opie-logoutapplet/opie-logoutapplet_git.bb
index b22500e..ed014d6 100644
--- a/recipes-opie/opie-logoutapplet/opie-logoutapplet_git.bb
+++ b/recipes-opie/opie-logoutapplet/opie-logoutapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/logoutapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/logoutapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-mail/opie-mail_git.bb b/recipes-opie/opie-mail/opie-mail_git.bb
index 5730169..b132748 100644
--- a/recipes-opie/opie-mail/opie-mail_git.bb
+++ b/recipes-opie/opie-mail/opie-mail_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-mailapplet/opie-mailapplet_git.bb b/recipes-opie/opie-mailapplet/opie-mailapplet_git.bb
index e09ee3d..8a413ed 100644
--- a/recipes-opie/opie-mailapplet/opie-mailapplet_git.bb
+++ b/recipes-opie/opie-mailapplet/opie-mailapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail/taskbarapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/mail/taskbarapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_git.bb b/recipes-opie/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_git.bb
index 4ec5e36..c5f971e 100644
--- a/recipes-opie/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_git.bb
+++ b/recipes-opie/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first \
file://libmadplugin.pro"
diff --git a/recipes-opie/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_git.bb b/recipes-opie/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_git.bb
index 467fb37..c9ed10c 100644
--- a/recipes-opie/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_git.bb
+++ b/recipes-opie/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first "
diff --git a/recipes-opie/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_git.bb b/recipes-opie/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_git.bb
index 9e6e12c..c652791 100644
--- a/recipes-opie/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_git.bb
+++ b/recipes-opie/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first \
file://vorbis.pro "
diff --git a/recipes-opie/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_git.bb b/recipes-opie/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_git.bb
index 3437b9e..34d7589 100644
--- a/recipes-opie/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_git.bb
+++ b/recipes-opie/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first "
diff --git a/recipes-opie/opie-mediaplayer1/opie-mediaplayer1-core_git.bb b/recipes-opie/opie-mediaplayer1/opie-mediaplayer1-core_git.bb
index febf16e..7209612 100644
--- a/recipes-opie/opie-mediaplayer1/opie-mediaplayer1-core_git.bb
+++ b/recipes-opie/opie-mediaplayer1/opie-mediaplayer1-core_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/multimedia/opieplayer;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-mediaplayer1/opie-mediaplayer1_git.bb b/recipes-opie/opie-mediaplayer1/opie-mediaplayer1_git.bb
index 2ec08c6..3457d12 100644
--- a/recipes-opie/opie-mediaplayer1/opie-mediaplayer1_git.bb
+++ b/recipes-opie/opie-mediaplayer1/opie-mediaplayer1_git.bb
@@ -1,4 +1,4 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+PV = "${OPIE_GIT_PV}0-${OPIE_SRCREV}"
diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb
index 7cf0215..8a4bf18 100644
--- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb
+++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb
@@ -1,8 +1,8 @@
SKINNAME = "default_landscape"
require opie-mediaplayer2-skin.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r4"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb
index da74a51..0a974a7 100644
--- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb
+++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb
@@ -1,8 +1,8 @@
SKINNAME = "default"
require opie-mediaplayer2-skin.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r5"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb
index ef9cd63..1bb945b 100644
--- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb
+++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb
@@ -1,8 +1,8 @@
SKINNAME = "Pod"
require opie-mediaplayer2-skin.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r4"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb
index 9239dfb..c9c1e7a 100644
--- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb
+++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb
@@ -1,8 +1,8 @@
SKINNAME = "techno"
require opie-mediaplayer2-skin.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r4"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2_git.bb
index 812c9c6..ea77369 100644
--- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2_git.bb
+++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/opieplayer2 \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/opieplayer2;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-mediummount/opie-mediummount_git.bb b/recipes-opie/opie-mediummount/opie-mediummount_git.bb
index 2f2a401..2936db6 100644
--- a/recipes-opie/opie-mediummount/opie-mediummount_git.bb
+++ b/recipes-opie/opie-mediummount/opie-mediummount_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/mediummount \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/mediummount;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-memoryapplet/opie-memoryapplet_git.bb b/recipes-opie/opie-memoryapplet/opie-memoryapplet_git.bb
index b8fd3d5..abfeb05 100644
--- a/recipes-opie/opie-memoryapplet/opie-memoryapplet_git.bb
+++ b/recipes-opie/opie-memoryapplet/opie-memoryapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/memoryapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/memoryapplet;name=first \
${OPIE_GIT};protocol=git;subpath=noncore/settings/sysinfo \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-mindbreaker/opie-mindbreaker_git.bb b/recipes-opie/opie-mindbreaker/opie-mindbreaker_git.bb
index 2825d38..2da87aa 100644
--- a/recipes-opie/opie-mindbreaker/opie-mindbreaker_git.bb
+++ b/recipes-opie/opie-mindbreaker/opie-mindbreaker_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/mindbreaker \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/mindbreaker;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-minesweep/opie-minesweep_git.bb b/recipes-opie/opie-minesweep/opie-minesweep_git.bb
index 8fb9738..115a321 100644
--- a/recipes-opie/opie-minesweep/opie-minesweep_git.bb
+++ b/recipes-opie/opie-minesweep/opie-minesweep_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/minesweep \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/minesweep;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-multikey/opie-multikey_git.bb b/recipes-opie/opie-multikey/opie-multikey_git.bb
index c16218b..a6ffc65 100644
--- a/recipes-opie/opie-multikey/opie-multikey_git.bb
+++ b/recipes-opie/opie-multikey/opie-multikey_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r5"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/multikey \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/multikey;name=first \
${OPIE_GIT};protocol=git;subpath=share \
file://fix-rpath.patch"
diff --git a/recipes-opie/opie-multikeyapplet/opie-multikeyapplet_git.bb b/recipes-opie/opie-multikeyapplet/opie-multikeyapplet_git.bb
index ddb2bab..f69ad33 100644
--- a/recipes-opie/opie-multikeyapplet/opie-multikeyapplet_git.bb
+++ b/recipes-opie/opie-multikeyapplet/opie-multikeyapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/multikeyapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/multikeyapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-networkapplet/opie-networkapplet_git.bb b/recipes-opie/opie-networkapplet/opie-networkapplet_git.bb
index ac865e6..63a1e57 100644
--- a/recipes-opie/opie-networkapplet/opie-networkapplet_git.bb
+++ b/recipes-opie/opie-networkapplet/opie-networkapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/networkapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/networkapplet;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-networksettings/opie-networksettings_git.bb b/recipes-opie/opie-networksettings/opie-networksettings_git.bb
index b5bd601..5914f2e 100644
--- a/recipes-opie/opie-networksettings/opie-networksettings_git.bb
+++ b/recipes-opie/opie-networksettings/opie-networksettings_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r5"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/networksettings \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/networksettings;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=root \
diff --git a/recipes-opie/opie-notes/opie-notes_git.bb b/recipes-opie/opie-notes/opie-notes_git.bb
index a1a91d9..3704a15 100644
--- a/recipes-opie/opie-notes/opie-notes_git.bb
+++ b/recipes-opie/opie-notes/opie-notes_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/notes \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/notes;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-notesapplet/opie-notesapplet_git.bb b/recipes-opie/opie-notesapplet/opie-notesapplet_git.bb
index 1dd6151..7304ea3 100644
--- a/recipes-opie/opie-notesapplet/opie-notesapplet_git.bb
+++ b/recipes-opie/opie-notesapplet/opie-notesapplet_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/notesapplet"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/notesapplet;name=first"
diff --git a/recipes-opie/opie-odict/opie-odict_git.bb b/recipes-opie/opie-odict/opie-odict_git.bb
index e376f9e..393bac9 100644
--- a/recipes-opie/opie-odict/opie-odict_git.bb
+++ b/recipes-opie/opie-odict/opie-odict_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/odict \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/odict;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-oxygen/opie-oxygen_git.bb b/recipes-opie/opie-oxygen/opie-oxygen_git.bb
index 4b703a3..1cc8687 100644
--- a/recipes-opie/opie-oxygen/opie-oxygen_git.bb
+++ b/recipes-opie/opie-oxygen/opie-oxygen_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-oyatzee/opie-oyatzee_git.bb b/recipes-opie/opie-oyatzee/opie-oyatzee_git.bb
index 52e7ea2..315fd6a 100644
--- a/recipes-opie/opie-oyatzee/opie-oyatzee_git.bb
+++ b/recipes-opie/opie-oyatzee/opie-oyatzee_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/oyatzee \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/oyatzee;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-packagemanager/opie-packagemanager_git.bb b/recipes-opie/opie-packagemanager/opie-packagemanager_git.bb
index d53149d..21df62f 100644
--- a/recipes-opie/opie-packagemanager/opie-packagemanager_git.bb
+++ b/recipes-opie/opie-packagemanager/opie-packagemanager_git.bb
@@ -1,12 +1,12 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
DEPENDS = "opkg"
EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-parashoot/opie-parashoot_git.bb b/recipes-opie/opie-parashoot/opie-parashoot_git.bb
index 98eb14e..9652df8 100644
--- a/recipes-opie/opie-parashoot/opie-parashoot_git.bb
+++ b/recipes-opie/opie-parashoot/opie-parashoot_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/parashoot \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/parashoot;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-pickboard/opie-pickboard_git.bb b/recipes-opie/opie-pickboard/opie-pickboard_git.bb
index ac2d01c..5767b7e 100644
--- a/recipes-opie/opie-pickboard/opie-pickboard_git.bb
+++ b/recipes-opie/opie-pickboard/opie-pickboard_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/pickboard"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/pickboard;name=first"
diff --git a/recipes-opie/opie-pics/opie-pics_git.bb b/recipes-opie/opie-pics/opie-pics_git.bb
index 4dac786..ea0296d 100644
--- a/recipes-opie/opie-pics/opie-pics_git.bb
+++ b/recipes-opie/opie-pics/opie-pics_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first \
${OPIE_GIT};protocol=git;subpath=pics-hires"
diff --git a/recipes-opie/opie-pimconverter/opie-pimconverter_git.bb b/recipes-opie/opie-pimconverter/opie-pimconverter_git.bb
index 00fe4a6..601d9f0 100644
--- a/recipes-opie/opie-pimconverter/opie-pimconverter_git.bb
+++ b/recipes-opie/opie-pimconverter/opie-pimconverter_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/pimconverter \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/pimconverter;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-powerchord/opie-powerchord_git.bb b/recipes-opie/opie-powerchord/opie-powerchord_git.bb
index dbf5679..e0e4c13 100644
--- a/recipes-opie/opie-powerchord/opie-powerchord_git.bb
+++ b/recipes-opie/opie-powerchord/opie-powerchord_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/powerchord \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/powerchord;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_git.bb b/recipes-opie/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_git.bb
index 26a51ae..c5d3de4 100644
--- a/recipes-opie/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_git.bb
+++ b/recipes-opie/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/pyquicklaunch \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/pyquicklaunch;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-qasteroids/opie-qasteroids_git.bb b/recipes-opie/opie-qasteroids/opie-qasteroids_git.bb
index fcb209e..c9fd090 100644
--- a/recipes-opie/opie-qasteroids/opie-qasteroids_git.bb
+++ b/recipes-opie/opie-qasteroids/opie-qasteroids_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/qasteroids \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/qasteroids;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-qcop/opie-qcop_git.bb b/recipes-opie/opie-qcop/opie-qcop_git.bb
index 61abdb0..cc109a6 100644
--- a/recipes-opie/opie-qcop/opie-qcop_git.bb
+++ b/recipes-opie/opie-qcop/opie-qcop_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r3"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/qcop \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/qcop;name=first \
file://unbreak-logging.patch"
diff --git a/recipes-opie/opie-qss/opie-qss_git.bb b/recipes-opie/opie-qss/opie-qss_git.bb
index ae3eb3a..6fc800a 100644
--- a/recipes-opie/opie-qss/opie-qss_git.bb
+++ b/recipes-opie/opie-qss/opie-qss_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/qss"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/qss;name=first"
diff --git a/recipes-opie/opie-quicklauncher/opie-quicklauncher_git.bb b/recipes-opie/opie-quicklauncher/opie-quicklauncher_git.bb
index c0e4145..9ea5a8e 100644
--- a/recipes-opie/opie-quicklauncher/opie-quicklauncher_git.bb
+++ b/recipes-opie/opie-quicklauncher/opie-quicklauncher_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/tools/quicklauncher"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/tools/quicklauncher;name=first"
diff --git a/recipes-opie/opie-rdesktop/opie-rdesktop_git.bb b/recipes-opie/opie-rdesktop/opie-rdesktop_git.bb
index 8777f30..063050b 100644
--- a/recipes-opie/opie-rdesktop/opie-rdesktop_git.bb
+++ b/recipes-opie/opie-rdesktop/opie-rdesktop_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opierdesktop \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opierdesktop;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-reader/opie-reader_git.bb b/recipes-opie/opie-reader/opie-reader_git.bb
index cb25629..9bfe75b 100644
--- a/recipes-opie/opie-reader/opie-reader_git.bb
+++ b/recipes-opie/opie-reader/opie-reader_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "${INC_PR}.0"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-reader \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-reader;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-reader/uqtreader_git.bb b/recipes-opie/opie-reader/uqtreader_git.bb
index 019d8c0..f6261d4 100644
--- a/recipes-opie/opie-reader/uqtreader_git.bb
+++ b/recipes-opie/opie-reader/uqtreader_git.bb
@@ -10,7 +10,7 @@ SRCDATE = "20070601"
PV = "1.2.2opie+cvs${SRCDATE}"
PR = "r4"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-reader \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-reader;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
file://qt4.patch"
diff --git a/recipes-opie/opie-recorder/opie-recorder_git.bb b/recipes-opie/opie-recorder/opie-recorder_git.bb
index b647414..b39e4de 100644
--- a/recipes-opie/opie-recorder/opie-recorder_git.bb
+++ b/recipes-opie/opie-recorder/opie-recorder_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/opierec \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/opierec;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-remote/opie-remote_git.bb b/recipes-opie/opie-remote/opie-remote_git.bb
index f70a6a8..dc01fa2 100644
--- a/recipes-opie/opie-remote/opie-remote_git.bb
+++ b/recipes-opie/opie-remote/opie-remote_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/remote \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/remote;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-restartapplet/opie-restartapplet_git.bb b/recipes-opie/opie-restartapplet/opie-restartapplet_git.bb
index 500ce4d..65d687d 100644
--- a/recipes-opie/opie-restartapplet/opie-restartapplet_git.bb
+++ b/recipes-opie/opie-restartapplet/opie-restartapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/restartapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/restartapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-restartapplet2/opie-restartapplet2_git.bb b/recipes-opie/opie-restartapplet2/opie-restartapplet2_git.bb
index b6f241f..d3f6652 100644
--- a/recipes-opie/opie-restartapplet2/opie-restartapplet2_git.bb
+++ b/recipes-opie/opie-restartapplet2/opie-restartapplet2_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/restartapplet2 \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/restartapplet2;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-rotateapplet/opie-rotateapplet_git.bb b/recipes-opie/opie-rotateapplet/opie-rotateapplet_git.bb
index 30edbcd..6e47784 100644
--- a/recipes-opie/opie-rotateapplet/opie-rotateapplet_git.bb
+++ b/recipes-opie/opie-rotateapplet/opie-rotateapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/rotateapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/rotateapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-screenshotapplet/opie-screenshotapplet_git.bb b/recipes-opie/opie-screenshotapplet/opie-screenshotapplet_git.bb
index ae749ea..6530f04 100644
--- a/recipes-opie/opie-screenshotapplet/opie-screenshotapplet_git.bb
+++ b/recipes-opie/opie-screenshotapplet/opie-screenshotapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/screenshotapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/screenshotapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-search/opie-search_git.bb b/recipes-opie/opie-search/opie-search_git.bb
index 1f8f9e8..164b0fa 100644
--- a/recipes-opie/opie-search/opie-search_git.bb
+++ b/recipes-opie/opie-search/opie-search_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/osearch \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/osearch;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-security/opie-security_git.bb b/recipes-opie/opie-security/opie-security_git.bb
index d22767d..7bd326e 100644
--- a/recipes-opie/opie-security/opie-security_git.bb
+++ b/recipes-opie/opie-security/opie-security_git.bb
@@ -1,9 +1,9 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/security \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/settings/security;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-securityplugins/opie-securityplugin-blueping_git.bb b/recipes-opie/opie-securityplugins/opie-securityplugin-blueping_git.bb
index 37e661f..c8779d0 100644
--- a/recipes-opie/opie-securityplugins/opie-securityplugin-blueping_git.bb
+++ b/recipes-opie/opie-securityplugins/opie-securityplugin-blueping_git.bb
@@ -1,7 +1,7 @@
require opie-securityplugin-blueping.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/blueping \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/blueping;name=first \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-securityplugins/opie-securityplugin-dummy_git.bb b/recipes-opie/opie-securityplugins/opie-securityplugin-dummy_git.bb
index 0bb50d6..dd875c1 100644
--- a/recipes-opie/opie-securityplugins/opie-securityplugin-dummy_git.bb
+++ b/recipes-opie/opie-securityplugins/opie-securityplugin-dummy_git.bb
@@ -1,7 +1,7 @@
require opie-securityplugin-dummy.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/dummy \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/dummy;name=first \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-securityplugins/opie-securityplugin-notice_git.bb b/recipes-opie/opie-securityplugins/opie-securityplugin-notice_git.bb
index 93df53c..22f4e9b 100644
--- a/recipes-opie/opie-securityplugins/opie-securityplugin-notice_git.bb
+++ b/recipes-opie/opie-securityplugins/opie-securityplugin-notice_git.bb
@@ -1,7 +1,7 @@
require opie-securityplugin-notice.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/notice \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/notice;name=first \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-securityplugins/opie-securityplugin-pin_git.bb b/recipes-opie/opie-securityplugins/opie-securityplugin-pin_git.bb
index 4b6f7f8..b063af2 100644
--- a/recipes-opie/opie-securityplugins/opie-securityplugin-pin_git.bb
+++ b/recipes-opie/opie-securityplugins/opie-securityplugin-pin_git.bb
@@ -1,7 +1,7 @@
require opie-securityplugin-pin.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/pin \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/securityplugins/pin;name=first \
${OPIE_GIT};protocol=git;subpath=pics "
diff --git a/recipes-opie/opie-sfcave/opie-sfcave_git.bb b/recipes-opie/opie-sfcave/opie-sfcave_git.bb
index 7dbb824..7dff047 100644
--- a/recipes-opie/opie-sfcave/opie-sfcave_git.bb
+++ b/recipes-opie/opie-sfcave/opie-sfcave_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/sfcave \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/sfcave;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-sh-snes/opie-sh-snes_git.bb b/recipes-opie/opie-sh-snes/opie-sh-snes_git.bb
index 7788d32..cba648d 100644
--- a/recipes-opie/opie-sh-snes/opie-sh-snes_git.bb
+++ b/recipes-opie/opie-sh-snes/opie-sh-snes_git.bb
@@ -1,4 +1,4 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+PV = "${OPIE_GIT_PV}0-${OPIE_SRCREV}"
PR = "r2"
diff --git a/recipes-opie/opie-sh/opie-sh_git.bb b/recipes-opie/opie-sh/opie-sh_git.bb
index 915376c..531b0f6 100644
--- a/recipes-opie/opie-sh/opie-sh_git.bb
+++ b/recipes-opie/opie-sh/opie-sh_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/opie-sh \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/tools/opie-sh;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=help \
${OPIE_GIT};protocol=git;subpath=share \
diff --git a/recipes-opie/opie-sheet/opie-sheet_git.bb b/recipes-opie/opie-sheet/opie-sheet_git.bb
index 13d6c58..c819ea9 100644
--- a/recipes-opie/opie-sheet/opie-sheet_git.bb
+++ b/recipes-opie/opie-sheet/opie-sheet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-sheet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/opie-sheet;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-snake/opie-snake_git.bb b/recipes-opie/opie-snake/opie-snake_git.bb
index 93e3d7e..9ecb052 100644
--- a/recipes-opie/opie-snake/opie-snake_git.bb
+++ b/recipes-opie/opie-snake/opie-snake_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/snake \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/snake;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-solitaire/opie-solitaire_git.bb b/recipes-opie/opie-solitaire/opie-solitaire_git.bb
index 469c374..fbe4df9 100644
--- a/recipes-opie/opie-solitaire/opie-solitaire_git.bb
+++ b/recipes-opie/opie-solitaire/opie-solitaire_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/solitaire \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/solitaire;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-sounds/opie-sounds_git.bb b/recipes-opie/opie-sounds/opie-sounds_git.bb
index 0d2b802..72e6383 100644
--- a/recipes-opie/opie-sounds/opie-sounds_git.bb
+++ b/recipes-opie/opie-sounds/opie-sounds_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=sounds"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=sounds;name=first"
diff --git a/recipes-opie/opie-sshkeys/opie-sshkeys_git.bb b/recipes-opie/opie-sshkeys/opie-sshkeys_git.bb
index 7099c35..c34696c 100644
--- a/recipes-opie/opie-sshkeys/opie-sshkeys_git.bb
+++ b/recipes-opie/opie-sshkeys/opie-sshkeys_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sshkeys \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sshkeys;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-stumbler/opie-stumbler_git.bb b/recipes-opie/opie-stumbler/opie-stumbler_git.bb
index 7be8587..8a4bceb 100644
--- a/recipes-opie/opie-stumbler/opie-stumbler_git.bb
+++ b/recipes-opie/opie-stumbler/opie-stumbler_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opiestumbler \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opiestumbler;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
file://opiestumbler.png"
diff --git a/recipes-opie/opie-style-flat/opie-style-flat_git.bb b/recipes-opie/opie-style-flat/opie-style-flat_git.bb
index 508dcc6..67113c9 100644
--- a/recipes-opie/opie-style-flat/opie-style-flat_git.bb
+++ b/recipes-opie/opie-style-flat/opie-style-flat_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/flat "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/flat;name=first "
diff --git a/recipes-opie/opie-style-fresh/opie-style-fresh_git.bb b/recipes-opie/opie-style-fresh/opie-style-fresh_git.bb
index 70bbae9..f9b51b9 100644
--- a/recipes-opie/opie-style-fresh/opie-style-fresh_git.bb
+++ b/recipes-opie/opie-style-fresh/opie-style-fresh_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/fresh "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/fresh;name=first "
diff --git a/recipes-opie/opie-style-liquid/opie-style-liquid_git.bb b/recipes-opie/opie-style-liquid/opie-style-liquid_git.bb
index bb33645..5ca3ca7 100644
--- a/recipes-opie/opie-style-liquid/opie-style-liquid_git.bb
+++ b/recipes-opie/opie-style-liquid/opie-style-liquid_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/liquid "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/liquid;name=first "
diff --git a/recipes-opie/opie-style-metal/opie-style-metal_git.bb b/recipes-opie/opie-style-metal/opie-style-metal_git.bb
index 6e2e33c..eb7909a 100644
--- a/recipes-opie/opie-style-metal/opie-style-metal_git.bb
+++ b/recipes-opie/opie-style-metal/opie-style-metal_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/metal "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/metal;name=first "
diff --git a/recipes-opie/opie-style-phase/opie-style-phase_git.bb b/recipes-opie/opie-style-phase/opie-style-phase_git.bb
index 00eee54..6269079 100644
--- a/recipes-opie/opie-style-phase/opie-style-phase_git.bb
+++ b/recipes-opie/opie-style-phase/opie-style-phase_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/phase"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/phase;name=first"
diff --git a/recipes-opie/opie-style-web/opie-style-web_git.bb b/recipes-opie/opie-style-web/opie-style-web_git.bb
index 2fcc901..d271fd2 100644
--- a/recipes-opie/opie-style-web/opie-style-web_git.bb
+++ b/recipes-opie/opie-style-web/opie-style-web_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/web"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/web;name=first"
diff --git a/recipes-opie/opie-suspendapplet/opie-suspendapplet_git.bb b/recipes-opie/opie-suspendapplet/opie-suspendapplet_git.bb
index 05887b8..dd95946 100644
--- a/recipes-opie/opie-suspendapplet/opie-suspendapplet_git.bb
+++ b/recipes-opie/opie-suspendapplet/opie-suspendapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/suspendapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/suspendapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-symlinker/opie-symlinker_git.bb b/recipes-opie/opie-symlinker/opie-symlinker_git.bb
index 334a1dc..cff4a7e 100644
--- a/recipes-opie/opie-symlinker/opie-symlinker_git.bb
+++ b/recipes-opie/opie-symlinker/opie-symlinker_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/symlinker "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/symlinker;name=first "
diff --git a/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb b/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
index bb6aafc..33cd798 100644
--- a/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
+++ b/recipes-opie/opie-sysinfo/opie-sysinfo_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sysinfo \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sysinfo;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps \
${OPIE_GIT};protocol=git;subpath=share"
diff --git a/recipes-opie/opie-systemtime/opie-systemtime_git.bb b/recipes-opie/opie-systemtime/opie-systemtime_git.bb
index 9a65f01..2a0c716 100644
--- a/recipes-opie/opie-systemtime/opie-systemtime_git.bb
+++ b/recipes-opie/opie-systemtime/opie-systemtime_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/netsystemtime \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/netsystemtime;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=etc \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-tableviewer/opie-tableviewer_git.bb b/recipes-opie/opie-tableviewer/opie-tableviewer_git.bb
index 3c91ab5..f481e91 100644
--- a/recipes-opie/opie-tableviewer/opie-tableviewer_git.bb
+++ b/recipes-opie/opie-tableviewer/opie-tableviewer_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/tableviewer \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/tableviewer;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-taskbar/opie-taskbar-images_git.bb b/recipes-opie/opie-taskbar/opie-taskbar-images_git.bb
index 3a90e79..838c856 100644
--- a/recipes-opie/opie-taskbar/opie-taskbar-images_git.bb
+++ b/recipes-opie/opie-taskbar/opie-taskbar-images_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r8"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics;name=first"
diff --git a/recipes-opie/opie-taskbar/opie-taskbar_git.bb b/recipes-opie/opie-taskbar/opie-taskbar_git.bb
index 7a9be31..0896ebf 100644
--- a/recipes-opie/opie-taskbar/opie-taskbar_git.bb
+++ b/recipes-opie/opie-taskbar/opie-taskbar_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r22"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/calibrate;name=first \
${OPIE_GIT};protocol=git;subpath=noncore/settings/mediummount \
${OPIE_GIT};protocol=git;subpath=core/launcher \
${OPIE_GIT};protocol=git;subpath=pics \
diff --git a/recipes-opie/opie-tetrix/opie-tetrix_git.bb b/recipes-opie/opie-tetrix/opie-tetrix_git.bb
index 93d4396..4ea9306 100644
--- a/recipes-opie/opie-tetrix/opie-tetrix_git.bb
+++ b/recipes-opie/opie-tetrix/opie-tetrix_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/tetrix \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/tetrix;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-textedit/opie-textedit_git.bb b/recipes-opie/opie-textedit/opie-textedit_git.bb
index cbf9f46..e64f6e9 100644
--- a/recipes-opie/opie-textedit/opie-textedit_git.bb
+++ b/recipes-opie/opie-textedit/opie-textedit_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
SECTION = "opie/applications"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-theme/opie-theme_git.bb b/recipes-opie/opie-theme/opie-theme_git.bb
index c3a1161..a05f24b 100644
--- a/recipes-opie/opie-theme/opie-theme_git.bb
+++ b/recipes-opie/opie-theme/opie-theme_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
PR = "r1"
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/theme \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/styles/theme;name=first \
${OPIE_GIT};protocol=git;subpath=plugins/styles "
diff --git a/recipes-opie/opie-tictac/opie-tictac_git.bb b/recipes-opie/opie-tictac/opie-tictac_git.bb
index ab10eec..4e9c594 100644
--- a/recipes-opie/opie-tictac/opie-tictac_git.bb
+++ b/recipes-opie/opie-tictac/opie-tictac_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/tictac \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/tictac;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-tinykate/opie-tinykate_git.bb b/recipes-opie/opie-tinykate/opie-tinykate_git.bb
index 93eb450..7206f6c 100644
--- a/recipes-opie/opie-tinykate/opie-tinykate_git.bb
+++ b/recipes-opie/opie-tinykate/opie-tinykate_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/tinykate \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/tinykate;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-today-addressbookplugin/opie-today-addressbookplugin_git.bb b/recipes-opie/opie-today-addressbookplugin/opie-today-addressbookplugin_git.bb
index 3d6acb9..e010e13 100644
--- a/recipes-opie/opie-today-addressbookplugin/opie-today-addressbookplugin_git.bb
+++ b/recipes-opie/opie-today-addressbookplugin/opie-today-addressbookplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/addressbook "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/addressbook;name=first "
diff --git a/recipes-opie/opie-today-datebookplugin/opie-today-datebookplugin_git.bb b/recipes-opie/opie-today-datebookplugin/opie-today-datebookplugin_git.bb
index 2c6db8c..4caec4c 100644
--- a/recipes-opie/opie-today-datebookplugin/opie-today-datebookplugin_git.bb
+++ b/recipes-opie/opie-today-datebookplugin/opie-today-datebookplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/datebook "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/datebook;name=first "
diff --git a/recipes-opie/opie-today-fortuneplugin/opie-today-fortuneplugin_git.bb b/recipes-opie/opie-today-fortuneplugin/opie-today-fortuneplugin_git.bb
index 201f0e1..25ac609 100644
--- a/recipes-opie/opie-today-fortuneplugin/opie-today-fortuneplugin_git.bb
+++ b/recipes-opie/opie-today-fortuneplugin/opie-today-fortuneplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/fortune "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/fortune;name=first "
diff --git a/recipes-opie/opie-today-mailplugin/opie-today-mailplugin_git.bb b/recipes-opie/opie-today-mailplugin/opie-today-mailplugin_git.bb
index 0e64987..7a68e14 100644
--- a/recipes-opie/opie-today-mailplugin/opie-today-mailplugin_git.bb
+++ b/recipes-opie/opie-today-mailplugin/opie-today-mailplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/mail "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/mail;name=first "
diff --git a/recipes-opie/opie-today-stocktickerplugin/opie-today-stocktickerplugin_git.bb b/recipes-opie/opie-today-stocktickerplugin/opie-today-stocktickerplugin_git.bb
index 2fc4d9f..101a8b8 100644
--- a/recipes-opie/opie-today-stocktickerplugin/opie-today-stocktickerplugin_git.bb
+++ b/recipes-opie/opie-today-stocktickerplugin/opie-today-stocktickerplugin_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/stockticker \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/stockticker;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-today-todolistplugin/opie-today-todolistplugin_git.bb b/recipes-opie/opie-today-todolistplugin/opie-today-todolistplugin_git.bb
index c13e517..cb0cb7f 100644
--- a/recipes-opie/opie-today-todolistplugin/opie-today-todolistplugin_git.bb
+++ b/recipes-opie/opie-today-todolistplugin/opie-today-todolistplugin_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/todolist "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today/plugins/todolist;name=first "
diff --git a/recipes-opie/opie-today-weatherplugin/opie-today-weatherplugin_git.bb b/recipes-opie/opie-today-weatherplugin/opie-today-weatherplugin_git.bb
index 64630c8..adf33ee 100644
--- a/recipes-opie/opie-today-weatherplugin/opie-today-weatherplugin_git.bb
+++ b/recipes-opie/opie-today-weatherplugin/opie-today-weatherplugin_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/weather \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/todayplugins/weather;name=first \
${OPIE_GIT};protocol=git;subpath=pics"
diff --git a/recipes-opie/opie-today/opie-today_git.bb b/recipes-opie/opie-today/opie-today_git.bb
index 2b9e3e7..91e237c 100644
--- a/recipes-opie/opie-today/opie-today_git.bb
+++ b/recipes-opie/opie-today/opie-today_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/today;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-todo/opie-todo_git.bb b/recipes-opie/opie-todo/opie-todo_git.bb
index cf98d40..f8eb276 100644
--- a/recipes-opie/opie-todo/opie-todo_git.bb
+++ b/recipes-opie/opie-todo/opie-todo_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r2"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/todo \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/pim/todo;name=first \
${OPIE_GIT};protocol=git;subpath=apps \
file://unbreak-logging.patch"
diff --git a/recipes-opie/opie-tonleiter/opie-tonleiter_git.bb b/recipes-opie/opie-tonleiter/opie-tonleiter_git.bb
index 2508bb0..6ad0d89 100644
--- a/recipes-opie/opie-tonleiter/opie-tonleiter_git.bb
+++ b/recipes-opie/opie-tonleiter/opie-tonleiter_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/tonleiter \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/multimedia/tonleiter;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-unikeyboard/opie-unikeyboard_git.bb b/recipes-opie/opie-unikeyboard/opie-unikeyboard_git.bb
index d161aa8..204ab01 100644
--- a/recipes-opie/opie-unikeyboard/opie-unikeyboard_git.bb
+++ b/recipes-opie/opie-unikeyboard/opie-unikeyboard_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/unikeyboard "
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=inputmethods/unikeyboard;name=first "
diff --git a/recipes-opie/opie-vmemo-settings/opie-vmemo-settings_git.bb b/recipes-opie/opie-vmemo-settings/opie-vmemo-settings_git.bb
index 472014b..de7bb3c 100644
--- a/recipes-opie/opie-vmemo-settings/opie-vmemo-settings_git.bb
+++ b/recipes-opie/opie-vmemo-settings/opie-vmemo-settings_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sound \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/settings/sound;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-vmemo/opie-vmemo_git.bb b/recipes-opie/opie-vmemo/opie-vmemo_git.bb
index 6e7f551..744d09d 100644
--- a/recipes-opie/opie-vmemo/opie-vmemo_git.bb
+++ b/recipes-opie/opie-vmemo/opie-vmemo_git.bb
@@ -1,10 +1,10 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/vmemo \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/vmemo;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
DEPENDS = "libopiecore2 libopieui2 libopiemm2"
diff --git a/recipes-opie/opie-volumeapplet/opie-volumeapplet_git.bb b/recipes-opie/opie-volumeapplet/opie-volumeapplet_git.bb
index b7671e8..58e32db 100644
--- a/recipes-opie/opie-volumeapplet/opie-volumeapplet_git.bb
+++ b/recipes-opie/opie-volumeapplet/opie-volumeapplet_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
PR = "r1"
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/volumeapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/volumeapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-vtapplet/opie-vtapplet_git.bb b/recipes-opie/opie-vtapplet/opie-vtapplet_git.bb
index d2e259a..10780c2 100644
--- a/recipes-opie/opie-vtapplet/opie-vtapplet_git.bb
+++ b/recipes-opie/opie-vtapplet/opie-vtapplet_git.bb
@@ -1,6 +1,6 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/vtapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/applets/vtapplet;name=first \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-wellenreiter/opie-wellenreiter_git.bb b/recipes-opie/opie-wellenreiter/opie-wellenreiter_git.bb
index 9824e44..2e75475 100644
--- a/recipes-opie/opie-wellenreiter/opie-wellenreiter_git.bb
+++ b/recipes-opie/opie-wellenreiter/opie-wellenreiter_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/wellenreiter \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/wellenreiter;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-wirelessapplet/opie-wirelessapplet_git.bb b/recipes-opie/opie-wirelessapplet/opie-wirelessapplet_git.bb
index fafb736..53a41a4 100644
--- a/recipes-opie/opie-wirelessapplet/opie-wirelessapplet_git.bb
+++ b/recipes-opie/opie-wirelessapplet/opie-wirelessapplet_git.bb
@@ -1,5 +1,5 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/wirelessapplet"
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/wirelessapplet;name=first"
diff --git a/recipes-opie/opie-wordgame/opie-wordgame_git.bb b/recipes-opie/opie-wordgame/opie-wordgame_git.bb
index bf84535..e873f0e 100644
--- a/recipes-opie/opie-wordgame/opie-wordgame_git.bb
+++ b/recipes-opie/opie-wordgame/opie-wordgame_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/wordgame \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/wordgame;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-write/opie-write_git.bb b/recipes-opie/opie-write/opie-write_git.bb
index e49a27e..09d8b20 100644
--- a/recipes-opie/opie-write/opie-write_git.bb
+++ b/recipes-opie/opie-write/opie-write_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME} \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/${APPNAME};name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-zkbapplet/opie-zkbapplet_git.bb b/recipes-opie/opie-zkbapplet/opie-zkbapplet_git.bb
index ed84d88..0d7a254 100644
--- a/recipes-opie/opie-zkbapplet/opie-zkbapplet_git.bb
+++ b/recipes-opie/opie-zkbapplet/opie-zkbapplet_git.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/zkbapplet \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/applets/zkbapplet;name=first \
${OPIE_GIT};protocol=git;subpath=share \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-zlines/opie-zlines_git.bb b/recipes-opie/opie-zlines/opie-zlines_git.bb
index 3dc0dc4..eb454b8 100644
--- a/recipes-opie/opie-zlines/opie-zlines_git.bb
+++ b/recipes-opie/opie-zlines/opie-zlines_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/zlines \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/zlines;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-zsafe/opie-zsafe_git.bb b/recipes-opie/opie-zsafe/opie-zsafe_git.bb
index 1dddf31..7363a49 100644
--- a/recipes-opie/opie-zsafe/opie-zsafe_git.bb
+++ b/recipes-opie/opie-zsafe/opie-zsafe_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/zsafe \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/apps/zsafe;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"
diff --git a/recipes-opie/opie-zsame/opie-zsame_git.bb b/recipes-opie/opie-zsame/opie-zsame_git.bb
index a11891c..80b2960 100644
--- a/recipes-opie/opie-zsame/opie-zsame_git.bb
+++ b/recipes-opie/opie-zsame/opie-zsame_git.bb
@@ -1,7 +1,7 @@
require ${PN}.inc
-PV = "${OPIE_GIT_PV}"
+inherit opie_git
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/zsame \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/games/zsame;name=first \
${OPIE_GIT};protocol=git;subpath=pics \
${OPIE_GIT};protocol=git;subpath=apps"