From 09f317a13d8e1ed60dd1a2d2f06db392189723e2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 29 Jun 2006 19:28:26 +0000 Subject: watchdog: Added patch to use mkinstalldirs variable. --- packages/watchdog/files/.mtn2git_empty | 0 packages/watchdog/files/mkinstalldirs.patch | 17 +++++++++++++++++ packages/watchdog/watchdog_5.2.bb | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/watchdog/files/.mtn2git_empty create mode 100644 packages/watchdog/files/mkinstalldirs.patch diff --git a/packages/watchdog/files/.mtn2git_empty b/packages/watchdog/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/watchdog/files/mkinstalldirs.patch b/packages/watchdog/files/mkinstalldirs.patch new file mode 100644 index 0000000000..468f269965 --- /dev/null +++ b/packages/watchdog/files/mkinstalldirs.patch @@ -0,0 +1,17 @@ +--- + watchdog-5.2/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: watchdog-5.2/Makefile.am +=================================================================== +--- watchdog-5.2.orig/Makefile.am ++++ watchdog-5.2/Makefile.am +@@ -15,7 +15,7 @@ + echo "NOT installing $(CONFIG_FILENAME) - exists already"; \ + else \ + echo "installing $(CONFIG_FILENAME)"; \ +- mkinstalldirs `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ ++ $(mkinstalldirs) `dirname $(DESTDIR)$(CONFIG_FILENAME)`; \ + $(INSTALL_DATA) watchdog.conf $(DESTDIR)$(CONFIG_FILENAME); \ + fi + diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb index fc3509466a..12f41b6ee7 100644 --- a/packages/watchdog/watchdog_5.2.bb +++ b/packages/watchdog/watchdog_5.2.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Software watchdog" MAINTAINER = "Oyvind Repvik " -PR = "r2" +PR = "r3" LICENSE = "GPL" SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + FILES = "${sysconfdir}/watchdog.conf ${sbindir}/watchdog" #CONFFILES = "${sysconfdir}/watchdog.conf" -- cgit v1.2.3 From 8d9c2a3d933e3b957a687982d36bd5c5072c2022 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 2 Jul 2006 15:24:29 +0000 Subject: Opie: Rename Opie 1.2.1 to 1.2.2, Remove PRs --- packages/libmailwrapper/libmailwrapper_1.2.1.bb | 5 ----- packages/libmailwrapper/libmailwrapper_1.2.2.bb | 5 +++++ packages/libopie/libopie2_1.2.1.bb | 9 --------- packages/libopie/libopie2_1.2.2.bb | 8 ++++++++ packages/libopieobex/libopieobex0_1.2.1.bb | 6 ------ packages/libopieobex/libopieobex0_1.2.2.bb | 5 +++++ packages/libopieobex/libopieobex0_cvs.bb | 1 - packages/libopietooth/libopietooth1_1.2.1.bb | 5 ----- packages/libopietooth/libopietooth1_1.2.2.bb | 5 +++++ packages/libqpe/libqpe-opie_1.2.1.bb | 9 --------- packages/libqpe/libqpe-opie_1.2.2.bb | 8 ++++++++ packages/libqpe/libqpe-opie_cvs.bb | 3 +-- packages/libqtaux/libqtaux2_1.2.1.bb | 5 ----- packages/libqtaux/libqtaux2_1.2.2.bb | 5 +++++ packages/meta/task-bootstrap-unionroot.bb | 2 -- packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb | 7 ------- packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb | 6 ++++++ packages/opie-addressbook/opie-addressbook_1.2.1.bb | 6 ------ packages/opie-addressbook/opie-addressbook_1.2.2.bb | 6 ++++++ packages/opie-advancedfm/opie-advancedfm_1.2.1.bb | 7 ------- packages/opie-advancedfm/opie-advancedfm_1.2.2.bb | 7 +++++++ packages/opie-alarm/opie-alarm_1.2.1.bb | 6 ------ packages/opie-alarm/opie-alarm_1.2.2.bb | 6 ++++++ packages/opie-appearance/opie-appearance_1.2.1.bb | 8 -------- packages/opie-appearance/opie-appearance_1.2.2.bb | 7 +++++++ packages/opie-aqpkg/opie-aqpkg_1.2.1.bb | 7 ------- packages/opie-aqpkg/opie-aqpkg_1.2.2.bb | 7 +++++++ .../opie-autorotateapplet_1.2.1.bb | 6 ------ .../opie-autorotateapplet_1.2.2.bb | 6 ++++++ packages/opie-backgammon/opie-backgammon_1.2.1.bb | 7 ------- packages/opie-backgammon/opie-backgammon_1.2.2.bb | 7 +++++++ packages/opie-backup/opie-backup_1.2.1.bb | 8 -------- packages/opie-backup/opie-backup_1.2.2.bb | 7 +++++++ packages/opie-bartender/opie-bartender_1.2.1.bb | 7 ------- packages/opie-bartender/opie-bartender_1.2.2.bb | 7 +++++++ .../opie-batteryapplet/opie-batteryapplet_1.2.1.bb | 7 ------- .../opie-batteryapplet/opie-batteryapplet_1.2.2.bb | 6 ++++++ .../opie-batteryapplet/opie-batteryapplet_cvs.bb | 1 - packages/opie-bluepin/opie-bluepin_1.2.1.bb | 5 ----- packages/opie-bluepin/opie-bluepin_1.2.2.bb | 4 ++++ .../opie-bluetoothapplet_1.2.1.bb | 6 ------ .../opie-bluetoothapplet_1.2.2.bb | 6 ++++++ .../opie-bluetoothmanager_1.2.1.bb | 6 ------ .../opie-bluetoothmanager_1.2.2.bb | 5 +++++ .../opie-bluetoothmanager_cvs.bb | 1 - packages/opie-bounce/opie-bounce_1.2.1.bb | 7 ------- packages/opie-bounce/opie-bounce_1.2.2.bb | 7 +++++++ .../opie-brightnessapplet_1.2.1.bb | 6 ------ .../opie-brightnessapplet_1.2.2.bb | 6 ++++++ .../opie-button-settings_1.2.1.bb | 8 -------- .../opie-button-settings_1.2.2.bb | 7 +++++++ packages/opie-buzzword/opie-buzzword_1.2.1.bb | 8 -------- packages/opie-buzzword/opie-buzzword_1.2.2.bb | 8 ++++++++ packages/opie-calculator/opie-calculator_1.2.1.bb | 7 ------- packages/opie-calculator/opie-calculator_1.2.2.bb | 7 +++++++ packages/opie-camera/opie-camera_1.2.1.bb | 7 ------- packages/opie-camera/opie-camera_1.2.2.bb | 7 +++++++ packages/opie-cardmon/opie-cardmon_1.2.1.bb | 8 -------- packages/opie-cardmon/opie-cardmon_1.2.2.bb | 8 ++++++++ packages/opie-checkbook/opie-checkbook_1.2.1.bb | 7 ------- packages/opie-checkbook/opie-checkbook_1.2.2.bb | 7 +++++++ packages/opie-citytime/opie-citytime_1.2.1.bb | 7 ------- packages/opie-citytime/opie-citytime_1.2.2.bb | 7 +++++++ .../opie-clipboardapplet_1.2.1.bb | 7 ------- .../opie-clipboardapplet_1.2.2.bb | 6 ++++++ .../opie-clipboardapplet/opie-clipboardapplet_cvs.bb | 1 - packages/opie-clock/opie-clock_1.2.1.bb | 7 ------- packages/opie-clock/opie-clock_1.2.2.bb | 7 +++++++ packages/opie-clockapplet/opie-clockapplet_1.2.1.bb | 7 ------- packages/opie-clockapplet/opie-clockapplet_1.2.2.bb | 6 ++++++ packages/opie-clockapplet/opie-clockapplet_cvs.bb | 1 - packages/opie-confeditor/opie-confeditor_1.2.1.bb | 7 ------- packages/opie-confeditor/opie-confeditor_1.2.2.bb | 7 +++++++ packages/opie-console/opie-console_1.2.1.bb | 10 ---------- packages/opie-console/opie-console_1.2.2.bb | 9 +++++++++ packages/opie-dagger/opie-dagger_1.2.1.bb | 7 ------- packages/opie-dagger/opie-dagger_1.2.2.bb | 7 +++++++ packages/opie-dasher/opie-dasher_1.2.1.bb | 6 ------ packages/opie-dasher/opie-dasher_1.2.2.bb | 6 ++++++ .../opie-datebook-birthdayplugin_1.2.1.bb | 5 ----- .../opie-datebook-birthdayplugin_1.2.2.bb | 5 +++++ .../opie-datebook-chrisholidayplugin_1.2.1.bb | 5 ----- .../opie-datebook-chrisholidayplugin_1.2.2.bb | 5 +++++ .../opie-datebook-nationalholidayplugin_1.2.1.bb | 6 ------ .../opie-datebook-nationalholidayplugin_1.2.2.bb | 6 ++++++ packages/opie-datebook/opie-datebook_1.2.1.bb | 7 ------- packages/opie-datebook/opie-datebook_1.2.2.bb | 6 ++++++ packages/opie-deco-flat/opie-deco-flat_1.2.1.bb | 5 ----- packages/opie-deco-flat/opie-deco-flat_1.2.2.bb | 5 +++++ packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb | 5 ----- packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb | 5 +++++ .../opie-deco-polished/opie-deco-polished_1.2.1.bb | 5 ----- .../opie-deco-polished/opie-deco-polished_1.2.2.bb | 5 +++++ packages/opie-doctab/opie-doctab_1.2.1.bb | 7 ------- packages/opie-doctab/opie-doctab_1.2.2.bb | 7 +++++++ packages/opie-drawpad/opie-drawpad_1.2.1.bb | 7 ------- packages/opie-drawpad/opie-drawpad_1.2.2.bb | 7 +++++++ packages/opie-dvorak/opie-dvorak_1.2.1.bb | 6 ------ packages/opie-dvorak/opie-dvorak_1.2.2.bb | 6 ++++++ .../opie-embeddedkonsole_1.2.1.bb | 6 ------ .../opie-embeddedkonsole_1.2.2.bb | 6 ++++++ packages/opie-euroconv/opie-euroconv_1.2.1.bb | 7 ------- packages/opie-euroconv/opie-euroconv_1.2.2.bb | 7 +++++++ .../opie-examples-python_1.2.1.bb | 7 ------- .../opie-examples-python_1.2.2.bb | 6 ++++++ .../opie-examples-python/opie-examples-python_cvs.bb | 1 - packages/opie-examples/opie-examples_1.2.1.bb | 7 ------- packages/opie-examples/opie-examples_1.2.2.bb | 7 +++++++ packages/opie-eye/opie-eye_1.2.1.bb | 7 ------- packages/opie-eye/opie-eye_1.2.2.bb | 7 +++++++ packages/opie-fifteen/opie-fifteen_1.2.1.bb | 7 ------- packages/opie-fifteen/opie-fifteen_1.2.2.bb | 7 +++++++ packages/opie-formatter/opie-formatter_1.2.1.bb | 7 ------- packages/opie-formatter/opie-formatter_1.2.2.bb | 7 +++++++ packages/opie-freetype/opie-freetype_1.2.1.bb | 4 ---- packages/opie-freetype/opie-freetype_1.2.2.bb | 4 ++++ packages/opie-ftp/opie-ftp_1.2.1.bb | 7 ------- packages/opie-ftp/opie-ftp_1.2.2.bb | 7 +++++++ packages/opie-ftplib/opie-ftplib_1.2.1.bb | 5 ----- packages/opie-ftplib/opie-ftplib_1.2.2.bb | 5 +++++ packages/opie-go/opie-go_1.2.1.bb | 7 ------- packages/opie-go/opie-go_1.2.2.bb | 7 +++++++ .../opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb | 8 -------- .../opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb | 8 ++++++++ packages/opie-handwriting/opie-handwriting_1.2.1.bb | 6 ------ packages/opie-handwriting/opie-handwriting_1.2.2.bb | 6 ++++++ packages/opie-help-en/opie-help-en_1.2.1.bb | 5 ----- packages/opie-help-en/opie-help-en_1.2.2.bb | 5 +++++ packages/opie-help-en/opie-help-en_cvs.bb | 2 +- packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb | 7 ------- packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb | 7 +++++++ packages/opie-homeapplet/opie-homeapplet_1.2.1.bb | 7 ------- packages/opie-homeapplet/opie-homeapplet_1.2.2.bb | 7 +++++++ packages/opie-i18n/opie-i18n_1.2.1.bb | 6 ------ packages/opie-i18n/opie-i18n_1.2.2.bb | 6 ++++++ packages/opie-i18n/opie-i18n_cvs.bb | 2 +- packages/opie-i18n/opie-lrelease-native_1.2.1.bb | 5 ----- packages/opie-i18n/opie-lrelease-native_1.2.2.bb | 5 +++++ packages/opie-i18n/opie-lrelease-native_cvs.bb | 2 +- packages/opie-i18n/opie-lupdate-native_1.2.1.bb | 6 ------ packages/opie-i18n/opie-lupdate-native_1.2.2.bb | 6 ++++++ packages/opie-i18n/opie-lupdate-native_cvs.bb | 2 +- packages/opie-icon-reload/opie-icon-reload_1.2.1.bb | 4 ---- packages/opie-icon-reload/opie-icon-reload_1.2.2.bb | 4 ++++ packages/opie-icon-reload/opie-icon-reload_cvs.bb | 2 +- packages/opie-irc/opie-irc_1.2.1.bb | 8 -------- packages/opie-irc/opie-irc_1.2.2.bb | 8 ++++++++ packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb | 8 -------- packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb | 7 +++++++ packages/opie-irdaapplet/opie-irdaapplet_cvs.bb | 1 - packages/opie-jumpx/opie-jumpx_1.2.1.bb | 6 ------ packages/opie-jumpx/opie-jumpx_1.2.2.bb | 6 ++++++ packages/opie-kbill/opie-kbill_1.2.1.bb | 7 ------- packages/opie-kbill/opie-kbill_1.2.2.bb | 7 +++++++ packages/opie-kcheckers/opie-kcheckers_1.2.1.bb | 7 ------- packages/opie-kcheckers/opie-kcheckers_1.2.2.bb | 7 +++++++ packages/opie-keyboard/opie-keyboard_1.2.1.bb | 5 ----- packages/opie-keyboard/opie-keyboard_1.2.2.bb | 5 +++++ packages/opie-keypebble/opie-keypebble_1.2.1.bb | 7 ------- packages/opie-keypebble/opie-keypebble_1.2.2.bb | 7 +++++++ packages/opie-keytabs/opie-keytabs_1.2.1.bb | 5 ----- packages/opie-keytabs/opie-keytabs_1.2.2.bb | 5 +++++ packages/opie-keytabs/opie-keytabs_cvs.bb | 2 +- packages/opie-keyview/opie-keyview_1.2.1.bb | 5 ----- packages/opie-keyview/opie-keyview_1.2.2.bb | 5 +++++ packages/opie-kjumpx/opie-kjumpx_1.2.1.bb | 6 ------ packages/opie-kjumpx/opie-kjumpx_1.2.2.bb | 6 ++++++ packages/opie-kpacman/opie-kpacman_1.2.1.bb | 8 -------- packages/opie-kpacman/opie-kpacman_1.2.2.bb | 8 ++++++++ packages/opie-language/opie-language_1.2.1.bb | 6 ------ packages/opie-language/opie-language_1.2.2.bb | 6 ++++++ .../opie-launcher-settings_1.2.1.bb | 5 ----- .../opie-launcher-settings_1.2.2.bb | 5 +++++ packages/opie-libqrsync/opie-libqrsync_1.2.1.bb | 5 ----- packages/opie-libqrsync/opie-libqrsync_1.2.2.bb | 5 +++++ .../opie-light-and-power_1.2.1.bb | 7 ------- .../opie-light-and-power_1.2.2.bb | 7 +++++++ packages/opie-lockapplet/opie-lockapplet_1.2.1.bb | 6 ------ packages/opie-lockapplet/opie-lockapplet_1.2.2.bb | 5 +++++ packages/opie-lockapplet/opie-lockapplet_cvs.bb | 1 - packages/opie-login/opie-login_1.2.1.bb | 11 ----------- packages/opie-login/opie-login_1.2.2.bb | 11 +++++++++++ .../opie-logoutapplet/opie-logoutapplet_1.2.1.bb | 6 ------ .../opie-logoutapplet/opie-logoutapplet_1.2.2.bb | 6 ++++++ packages/opie-mail/opie-mail_1.2.1.bb | 7 ------- packages/opie-mail/opie-mail_1.2.2.bb | 7 +++++++ packages/opie-mailapplet/opie-mailapplet_1.2.1.bb | 7 ------- packages/opie-mailapplet/opie-mailapplet_1.2.2.bb | 7 +++++++ .../opie-mediaplayer1-libmadplugin_1.2.1.bb | 6 ------ .../opie-mediaplayer1-libmadplugin_1.2.2.bb | 6 ++++++ .../opie-mediaplayer1-libmodplugin_1.2.1.bb | 5 ----- .../opie-mediaplayer1-libmodplugin_1.2.2.bb | 5 +++++ .../opie-mediaplayer1-libtremorplugin_1.2.1.bb | 6 ------ .../opie-mediaplayer1-libtremorplugin_1.2.2.bb | 6 ++++++ .../opie-mediaplayer1-libwavplugin_1.2.1.bb | 5 ----- .../opie-mediaplayer1-libwavplugin_1.2.2.bb | 5 +++++ .../opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb | 7 ------- .../opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb | 7 +++++++ ...opie-mediaplayer2-skin-default-landscape_1.2.1.bb | 17 ----------------- ...opie-mediaplayer2-skin-default-landscape_1.2.2.bb | 17 +++++++++++++++++ .../opie-mediaplayer2-skin-default-landscape_cvs.bb | 2 +- .../opie-mediaplayer2-skin-default_1.2.1.bb | 17 ----------------- .../opie-mediaplayer2-skin-default_1.2.2.bb | 17 +++++++++++++++++ .../opie-mediaplayer2-skin-default_cvs.bb | 2 +- .../opie-mediaplayer2-skin-pod_1.2.1.bb | 17 ----------------- .../opie-mediaplayer2-skin-pod_1.2.2.bb | 17 +++++++++++++++++ .../opie-mediaplayer2-skin-pod_cvs.bb | 2 +- .../opie-mediaplayer2-skin-techno_1.2.1.bb | 17 ----------------- .../opie-mediaplayer2-skin-techno_1.2.2.bb | 17 +++++++++++++++++ .../opie-mediaplayer2-skin-techno_cvs.bb | 2 +- .../opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb | 7 ------- .../opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb | 6 ++++++ packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb | 3 +-- packages/opie-mediummount/opie-mediummount_1.2.1.bb | 7 ------- packages/opie-mediummount/opie-mediummount_1.2.2.bb | 6 ++++++ .../opie-memoryapplet/opie-memoryapplet_1.2.1.bb | 7 ------- .../opie-memoryapplet/opie-memoryapplet_1.2.2.bb | 6 ++++++ packages/opie-memoryapplet/opie-memoryapplet_cvs.bb | 1 - packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb | 7 ------- packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb | 7 +++++++ packages/opie-minesweep/opie-minesweep_1.2.1.bb | 7 ------- packages/opie-minesweep/opie-minesweep_1.2.2.bb | 7 +++++++ packages/opie-multikey/opie-multikey_1.2.1.bb | 6 ------ packages/opie-multikey/opie-multikey_1.2.2.bb | 6 ++++++ .../opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb | 6 ------ .../opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb | 5 +++++ .../opie-multikeyapplet/opie-multikeyapplet_cvs.bb | 1 - .../opie-networkapplet/opie-networkapplet_1.2.1.bb | 6 ------ .../opie-networkapplet/opie-networkapplet_1.2.2.bb | 6 ++++++ .../opie-networksettings_1.2.1.bb | 8 -------- .../opie-networksettings_1.2.2.bb | 8 ++++++++ packages/opie-notesapplet/opie-notesapplet_1.2.1.bb | 5 ----- packages/opie-notesapplet/opie-notesapplet_1.2.2.bb | 5 +++++ packages/opie-odict/opie-odict_1.2.1.bb | 7 ------- packages/opie-odict/opie-odict_1.2.2.bb | 7 +++++++ packages/opie-oxygen/opie-oxygen_1.2.1.bb | 8 -------- packages/opie-oxygen/opie-oxygen_1.2.2.bb | 8 ++++++++ packages/opie-oyatzee/opie-oyatzee_1.2.1.bb | 7 ------- packages/opie-oyatzee/opie-oyatzee_1.2.2.bb | 7 +++++++ .../opie-packagemanager/opie-packagemanager_1.2.1.bb | 8 -------- .../opie-packagemanager/opie-packagemanager_1.2.2.bb | 7 +++++++ packages/opie-parashoot/opie-parashoot_1.2.1.bb | 7 ------- packages/opie-parashoot/opie-parashoot_1.2.2.bb | 7 +++++++ .../opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb | 7 ------- .../opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb | 6 ++++++ packages/opie-pickboard/opie-pickboard_1.2.1.bb | 5 ----- packages/opie-pickboard/opie-pickboard_1.2.2.bb | 5 +++++ packages/opie-pics/opie-pics_1.2.1.bb | 6 ------ packages/opie-pics/opie-pics_1.2.2.bb | 6 ++++++ packages/opie-pics/opie-pics_cvs.bb | 2 +- .../opie-pimconverter/opie-pimconverter_1.2.1.bb | 7 ------- .../opie-pimconverter/opie-pimconverter_1.2.2.bb | 6 ++++++ packages/opie-pimconverter/opie-pimconverter_cvs.bb | 1 - packages/opie-powerchord/opie-powerchord_1.2.1.bb | 8 -------- packages/opie-powerchord/opie-powerchord_1.2.2.bb | 8 ++++++++ .../opie-pyquicklaunchapplet_1.2.1.bb | 7 ------- .../opie-pyquicklaunchapplet_1.2.2.bb | 6 ++++++ .../opie-pyquicklaunchapplet_cvs.bb | 1 - packages/opie-qasteroids/opie-qasteroids_1.2.1.bb | 7 ------- packages/opie-qasteroids/opie-qasteroids_1.2.2.bb | 7 +++++++ packages/opie-qcop/opie-qcop_1.2.1.bb | 5 ----- packages/opie-qcop/opie-qcop_1.2.2.bb | 5 +++++ packages/opie-qss/opie-qss_1.2.1.bb | 5 ----- packages/opie-qss/opie-qss_1.2.2.bb | 5 +++++ .../opie-quicklauncher/opie-quicklauncher_1.2.1.bb | 5 ----- .../opie-quicklauncher/opie-quicklauncher_1.2.2.bb | 5 +++++ packages/opie-rdesktop/opie-rdesktop_1.2.1.bb | 7 ------- packages/opie-rdesktop/opie-rdesktop_1.2.2.bb | 7 +++++++ packages/opie-reader/opie-reader_1.2.1.bb | 6 ------ packages/opie-reader/opie-reader_1.2.2.bb | 6 ++++++ packages/opie-recorder/opie-recorder_1.2.1.bb | 7 ------- packages/opie-recorder/opie-recorder_1.2.2.bb | 7 +++++++ packages/opie-remote/opie-remote_1.2.1.bb | 7 ------- packages/opie-remote/opie-remote_1.2.2.bb | 7 +++++++ .../opie-restartapplet/opie-restartapplet2_1.2.1.bb | 20 -------------------- .../opie-restartapplet/opie-restartapplet2_1.2.2.bb | 20 ++++++++++++++++++++ .../opie-restartapplet/opie-restartapplet_1.2.1.bb | 6 ------ .../opie-restartapplet/opie-restartapplet_1.2.2.bb | 6 ++++++ .../opie-restartapplet2/opie-restartapplet2_1.2.1.bb | 6 ------ .../opie-restartapplet2/opie-restartapplet2_1.2.2.bb | 6 ++++++ .../opie-rotateapplet/opie-rotateapplet_1.2.1.bb | 6 ------ .../opie-rotateapplet/opie-rotateapplet_1.2.2.bb | 6 ++++++ .../opie-screenshotapplet_1.2.1.bb | 7 ------- .../opie-screenshotapplet_1.2.2.bb | 6 ++++++ .../opie-screenshotapplet_cvs.bb | 1 - packages/opie-search/opie-search_1.2.1.bb | 7 ------- packages/opie-search/opie-search_1.2.2.bb | 7 +++++++ packages/opie-security/opie-security_1.2.1.bb | 7 ------- packages/opie-security/opie-security_1.2.2.bb | 6 ++++++ packages/opie-security/opie-security_cvs.bb | 1 - .../opie-securityplugin-blueping_1.2.1.bb | 5 ----- .../opie-securityplugin-blueping_1.2.2.bb | 5 +++++ .../opie-securityplugin-dummy_1.2.1.bb | 5 ----- .../opie-securityplugin-dummy_1.2.2.bb | 5 +++++ .../opie-securityplugin-notice_1.2.1.bb | 5 ----- .../opie-securityplugin-notice_1.2.2.bb | 5 +++++ .../opie-securityplugin-pin_1.2.1.bb | 5 ----- .../opie-securityplugin-pin_1.2.2.bb | 5 +++++ packages/opie-sfcave/opie-sfcave_1.2.1.bb | 7 ------- packages/opie-sfcave/opie-sfcave_1.2.2.bb | 7 +++++++ packages/opie-sh-snes/opie-sh-snes_1.2.1.bb | 4 ---- packages/opie-sh-snes/opie-sh-snes_1.2.2.bb | 4 ++++ packages/opie-sh-snes/opie-sh-snes_cvs.bb | 2 +- packages/opie-sh/opie-sh_1.2.1.bb | 9 --------- packages/opie-sh/opie-sh_1.2.2.bb | 9 +++++++++ packages/opie-sheet/opie-sheet_1.2.1.bb | 7 ------- packages/opie-sheet/opie-sheet_1.2.2.bb | 7 +++++++ packages/opie-snake/opie-snake_1.2.1.bb | 7 ------- packages/opie-snake/opie-snake_1.2.2.bb | 7 +++++++ packages/opie-solitaire/opie-solitaire_1.2.1.bb | 7 ------- packages/opie-solitaire/opie-solitaire_1.2.2.bb | 7 +++++++ packages/opie-sounds/opie-sounds_1.2.1.bb | 5 ----- packages/opie-sounds/opie-sounds_1.2.2.bb | 5 +++++ packages/opie-sounds/opie-sounds_cvs.bb | 2 +- packages/opie-sshkeys/opie-sshkeys_1.2.1.bb | 7 ------- packages/opie-sshkeys/opie-sshkeys_1.2.2.bb | 7 +++++++ packages/opie-stumbler/opie-stumbler_1.2.1.bb | 5 ----- packages/opie-stumbler/opie-stumbler_1.2.2.bb | 5 +++++ packages/opie-style-flat/opie-style-flat_1.2.1.bb | 5 ----- packages/opie-style-flat/opie-style-flat_1.2.2.bb | 5 +++++ packages/opie-style-fresh/opie-style-fresh_1.2.1.bb | 5 ----- packages/opie-style-fresh/opie-style-fresh_1.2.2.bb | 5 +++++ .../opie-style-liquid/opie-style-liquid_1.2.1.bb | 5 ----- .../opie-style-liquid/opie-style-liquid_1.2.2.bb | 5 +++++ packages/opie-style-metal/opie-style-metal_1.2.1.bb | 5 ----- packages/opie-style-metal/opie-style-metal_1.2.2.bb | 5 +++++ packages/opie-style-phase/opie-style-phase_1.2.1.bb | 5 ----- packages/opie-style-phase/opie-style-phase_1.2.2.bb | 5 +++++ packages/opie-style-web/opie-style-web_1.2.1.bb | 5 ----- packages/opie-style-web/opie-style-web_1.2.2.bb | 5 +++++ .../opie-suspendapplet/opie-suspendapplet_1.2.1.bb | 6 ------ .../opie-suspendapplet/opie-suspendapplet_1.2.2.bb | 6 ++++++ packages/opie-symlinker/opie-symlinker_1.2.1.bb | 5 ----- packages/opie-symlinker/opie-symlinker_1.2.2.bb | 5 +++++ packages/opie-sysinfo/opie-sysinfo_1.2.1.bb | 8 -------- packages/opie-sysinfo/opie-sysinfo_1.2.2.bb | 8 ++++++++ packages/opie-systemtime/opie-systemtime_1.2.1.bb | 8 -------- packages/opie-systemtime/opie-systemtime_1.2.2.bb | 8 ++++++++ packages/opie-tableviewer/opie-tableviewer_1.2.1.bb | 7 ------- packages/opie-tableviewer/opie-tableviewer_1.2.2.bb | 7 +++++++ packages/opie-taskbar/opie-taskbar_1.2.1.bb | 19 ------------------- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 18 ++++++++++++++++++ packages/opie-taskbar/opie-taskbar_cvs.bb | 1 - packages/opie-tetrix/opie-tetrix_1.2.1.bb | 7 ------- packages/opie-tetrix/opie-tetrix_1.2.2.bb | 7 +++++++ packages/opie-textedit/opie-textedit_1.2.1.bb | 7 ------- packages/opie-textedit/opie-textedit_1.2.2.bb | 7 +++++++ packages/opie-theme/opie-theme_1.2.1.bb | 6 ------ packages/opie-theme/opie-theme_1.2.2.bb | 6 ++++++ packages/opie-tictac/opie-tictac_1.2.1.bb | 7 ------- packages/opie-tictac/opie-tictac_1.2.2.bb | 7 +++++++ packages/opie-tinykate/opie-tinykate_1.2.1.bb | 8 -------- packages/opie-tinykate/opie-tinykate_1.2.2.bb | 8 ++++++++ .../opie-today-addressbookplugin_1.2.1.bb | 5 ----- .../opie-today-addressbookplugin_1.2.2.bb | 5 +++++ .../opie-today-datebookplugin_1.2.1.bb | 5 ----- .../opie-today-datebookplugin_1.2.2.bb | 5 +++++ .../opie-today-fortuneplugin_1.2.1.bb | 5 ----- .../opie-today-fortuneplugin_1.2.2.bb | 5 +++++ .../opie-today-mailplugin_1.2.1.bb | 5 ----- .../opie-today-mailplugin_1.2.2.bb | 5 +++++ .../opie-today-stocktickerplugin_1.2.1.bb | 7 ------- .../opie-today-stocktickerplugin_1.2.2.bb | 7 +++++++ .../opie-today-todolistplugin_1.2.1.bb | 5 ----- .../opie-today-todolistplugin_1.2.2.bb | 5 +++++ .../opie-today-weatherplugin_1.2.1.bb | 6 ------ .../opie-today-weatherplugin_1.2.2.bb | 6 ++++++ packages/opie-today/opie-today_1.2.1.bb | 7 ------- packages/opie-today/opie-today_1.2.2.bb | 7 +++++++ packages/opie-todo/opie-todo_1.2.1.bb | 6 ------ packages/opie-todo/opie-todo_1.2.2.bb | 6 ++++++ packages/opie-tonleiter/opie-tonleiter_1.2.1.bb | 7 ------- packages/opie-tonleiter/opie-tonleiter_1.2.2.bb | 7 +++++++ packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb | 5 ----- packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb | 5 +++++ packages/opie-usermanager/opie-usermanager_1.2.1.bb | 7 ------- packages/opie-usermanager/opie-usermanager_1.2.2.bb | 7 +++++++ .../opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb | 6 ------ .../opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb | 6 ++++++ packages/opie-vmemo/opie-vmemo_1.2.1.bb | 6 ------ packages/opie-vmemo/opie-vmemo_1.2.2.bb | 6 ++++++ .../opie-volumeapplet/opie-volumeapplet_1.2.1.bb | 6 ------ .../opie-volumeapplet/opie-volumeapplet_1.2.2.bb | 5 +++++ packages/opie-volumeapplet/opie-volumeapplet_cvs.bb | 1 - packages/opie-vtapplet/opie-vtapplet_1.2.1.bb | 6 ------ packages/opie-vtapplet/opie-vtapplet_1.2.2.bb | 6 ++++++ .../opie-wellenreiter/opie-wellenreiter_1.2.1.bb | 8 -------- .../opie-wellenreiter/opie-wellenreiter_1.2.2.bb | 7 +++++++ .../opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb | 5 ----- .../opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb | 5 +++++ packages/opie-wordgame/opie-wordgame_1.2.1.bb | 7 ------- packages/opie-wordgame/opie-wordgame_1.2.2.bb | 7 +++++++ packages/opie-write/opie-write_1.2.1.bb | 7 ------- packages/opie-write/opie-write_1.2.2.bb | 7 +++++++ packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb | 8 -------- packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb | 8 ++++++++ packages/opie-zlines/opie-zlines_1.2.1.bb | 7 ------- packages/opie-zlines/opie-zlines_1.2.2.bb | 7 +++++++ packages/opie-zsafe/opie-zsafe_1.2.1.bb | 7 ------- packages/opie-zsafe/opie-zsafe_1.2.2.bb | 7 +++++++ packages/opie-zsame/opie-zsame_1.2.1.bb | 7 ------- packages/opie-zsame/opie-zsame_1.2.2.bb | 7 +++++++ 402 files changed, 1242 insertions(+), 1292 deletions(-) delete mode 100644 packages/libmailwrapper/libmailwrapper_1.2.1.bb create mode 100644 packages/libmailwrapper/libmailwrapper_1.2.2.bb delete mode 100644 packages/libopie/libopie2_1.2.1.bb create mode 100644 packages/libopie/libopie2_1.2.2.bb delete mode 100644 packages/libopieobex/libopieobex0_1.2.1.bb create mode 100644 packages/libopieobex/libopieobex0_1.2.2.bb delete mode 100644 packages/libopietooth/libopietooth1_1.2.1.bb create mode 100644 packages/libopietooth/libopietooth1_1.2.2.bb delete mode 100644 packages/libqpe/libqpe-opie_1.2.1.bb create mode 100644 packages/libqpe/libqpe-opie_1.2.2.bb delete mode 100644 packages/libqtaux/libqtaux2_1.2.1.bb create mode 100644 packages/libqtaux/libqtaux2_1.2.2.bb delete mode 100644 packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb create mode 100644 packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb delete mode 100644 packages/opie-addressbook/opie-addressbook_1.2.1.bb create mode 100644 packages/opie-addressbook/opie-addressbook_1.2.2.bb delete mode 100644 packages/opie-advancedfm/opie-advancedfm_1.2.1.bb create mode 100644 packages/opie-advancedfm/opie-advancedfm_1.2.2.bb delete mode 100644 packages/opie-alarm/opie-alarm_1.2.1.bb create mode 100644 packages/opie-alarm/opie-alarm_1.2.2.bb delete mode 100644 packages/opie-appearance/opie-appearance_1.2.1.bb create mode 100644 packages/opie-appearance/opie-appearance_1.2.2.bb delete mode 100644 packages/opie-aqpkg/opie-aqpkg_1.2.1.bb create mode 100644 packages/opie-aqpkg/opie-aqpkg_1.2.2.bb delete mode 100644 packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb create mode 100644 packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb delete mode 100644 packages/opie-backgammon/opie-backgammon_1.2.1.bb create mode 100644 packages/opie-backgammon/opie-backgammon_1.2.2.bb delete mode 100644 packages/opie-backup/opie-backup_1.2.1.bb create mode 100644 packages/opie-backup/opie-backup_1.2.2.bb delete mode 100644 packages/opie-bartender/opie-bartender_1.2.1.bb create mode 100644 packages/opie-bartender/opie-bartender_1.2.2.bb delete mode 100644 packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb create mode 100644 packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb delete mode 100644 packages/opie-bluepin/opie-bluepin_1.2.1.bb create mode 100644 packages/opie-bluepin/opie-bluepin_1.2.2.bb delete mode 100644 packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb create mode 100644 packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb delete mode 100644 packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb create mode 100644 packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb delete mode 100644 packages/opie-bounce/opie-bounce_1.2.1.bb create mode 100644 packages/opie-bounce/opie-bounce_1.2.2.bb delete mode 100644 packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb create mode 100644 packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb delete mode 100644 packages/opie-button-settings/opie-button-settings_1.2.1.bb create mode 100644 packages/opie-button-settings/opie-button-settings_1.2.2.bb delete mode 100644 packages/opie-buzzword/opie-buzzword_1.2.1.bb create mode 100644 packages/opie-buzzword/opie-buzzword_1.2.2.bb delete mode 100644 packages/opie-calculator/opie-calculator_1.2.1.bb create mode 100644 packages/opie-calculator/opie-calculator_1.2.2.bb delete mode 100644 packages/opie-camera/opie-camera_1.2.1.bb create mode 100644 packages/opie-camera/opie-camera_1.2.2.bb delete mode 100644 packages/opie-cardmon/opie-cardmon_1.2.1.bb create mode 100644 packages/opie-cardmon/opie-cardmon_1.2.2.bb delete mode 100644 packages/opie-checkbook/opie-checkbook_1.2.1.bb create mode 100644 packages/opie-checkbook/opie-checkbook_1.2.2.bb delete mode 100644 packages/opie-citytime/opie-citytime_1.2.1.bb create mode 100644 packages/opie-citytime/opie-citytime_1.2.2.bb delete mode 100644 packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb create mode 100644 packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb delete mode 100644 packages/opie-clock/opie-clock_1.2.1.bb create mode 100644 packages/opie-clock/opie-clock_1.2.2.bb delete mode 100644 packages/opie-clockapplet/opie-clockapplet_1.2.1.bb create mode 100644 packages/opie-clockapplet/opie-clockapplet_1.2.2.bb delete mode 100644 packages/opie-confeditor/opie-confeditor_1.2.1.bb create mode 100644 packages/opie-confeditor/opie-confeditor_1.2.2.bb delete mode 100644 packages/opie-console/opie-console_1.2.1.bb create mode 100644 packages/opie-console/opie-console_1.2.2.bb delete mode 100644 packages/opie-dagger/opie-dagger_1.2.1.bb create mode 100644 packages/opie-dagger/opie-dagger_1.2.2.bb delete mode 100644 packages/opie-dasher/opie-dasher_1.2.1.bb create mode 100644 packages/opie-dasher/opie-dasher_1.2.2.bb delete mode 100644 packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb create mode 100644 packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb delete mode 100644 packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb create mode 100644 packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb delete mode 100644 packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb create mode 100644 packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb delete mode 100644 packages/opie-datebook/opie-datebook_1.2.1.bb create mode 100644 packages/opie-datebook/opie-datebook_1.2.2.bb delete mode 100644 packages/opie-deco-flat/opie-deco-flat_1.2.1.bb create mode 100644 packages/opie-deco-flat/opie-deco-flat_1.2.2.bb delete mode 100644 packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb create mode 100644 packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb delete mode 100644 packages/opie-deco-polished/opie-deco-polished_1.2.1.bb create mode 100644 packages/opie-deco-polished/opie-deco-polished_1.2.2.bb delete mode 100644 packages/opie-doctab/opie-doctab_1.2.1.bb create mode 100644 packages/opie-doctab/opie-doctab_1.2.2.bb delete mode 100644 packages/opie-drawpad/opie-drawpad_1.2.1.bb create mode 100644 packages/opie-drawpad/opie-drawpad_1.2.2.bb delete mode 100644 packages/opie-dvorak/opie-dvorak_1.2.1.bb create mode 100644 packages/opie-dvorak/opie-dvorak_1.2.2.bb delete mode 100644 packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb create mode 100644 packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb delete mode 100644 packages/opie-euroconv/opie-euroconv_1.2.1.bb create mode 100644 packages/opie-euroconv/opie-euroconv_1.2.2.bb delete mode 100644 packages/opie-examples-python/opie-examples-python_1.2.1.bb create mode 100644 packages/opie-examples-python/opie-examples-python_1.2.2.bb delete mode 100644 packages/opie-examples/opie-examples_1.2.1.bb create mode 100644 packages/opie-examples/opie-examples_1.2.2.bb delete mode 100644 packages/opie-eye/opie-eye_1.2.1.bb create mode 100644 packages/opie-eye/opie-eye_1.2.2.bb delete mode 100644 packages/opie-fifteen/opie-fifteen_1.2.1.bb create mode 100644 packages/opie-fifteen/opie-fifteen_1.2.2.bb delete mode 100644 packages/opie-formatter/opie-formatter_1.2.1.bb create mode 100644 packages/opie-formatter/opie-formatter_1.2.2.bb delete mode 100644 packages/opie-freetype/opie-freetype_1.2.1.bb create mode 100644 packages/opie-freetype/opie-freetype_1.2.2.bb delete mode 100644 packages/opie-ftp/opie-ftp_1.2.1.bb create mode 100644 packages/opie-ftp/opie-ftp_1.2.2.bb delete mode 100644 packages/opie-ftplib/opie-ftplib_1.2.1.bb create mode 100644 packages/opie-ftplib/opie-ftplib_1.2.2.bb delete mode 100644 packages/opie-go/opie-go_1.2.1.bb create mode 100644 packages/opie-go/opie-go_1.2.2.bb delete mode 100644 packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb create mode 100644 packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb delete mode 100644 packages/opie-handwriting/opie-handwriting_1.2.1.bb create mode 100644 packages/opie-handwriting/opie-handwriting_1.2.2.bb delete mode 100644 packages/opie-help-en/opie-help-en_1.2.1.bb create mode 100644 packages/opie-help-en/opie-help-en_1.2.2.bb delete mode 100644 packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb create mode 100644 packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb delete mode 100644 packages/opie-homeapplet/opie-homeapplet_1.2.1.bb create mode 100644 packages/opie-homeapplet/opie-homeapplet_1.2.2.bb delete mode 100644 packages/opie-i18n/opie-i18n_1.2.1.bb create mode 100644 packages/opie-i18n/opie-i18n_1.2.2.bb delete mode 100644 packages/opie-i18n/opie-lrelease-native_1.2.1.bb create mode 100644 packages/opie-i18n/opie-lrelease-native_1.2.2.bb delete mode 100644 packages/opie-i18n/opie-lupdate-native_1.2.1.bb create mode 100644 packages/opie-i18n/opie-lupdate-native_1.2.2.bb delete mode 100644 packages/opie-icon-reload/opie-icon-reload_1.2.1.bb create mode 100644 packages/opie-icon-reload/opie-icon-reload_1.2.2.bb delete mode 100644 packages/opie-irc/opie-irc_1.2.1.bb create mode 100644 packages/opie-irc/opie-irc_1.2.2.bb delete mode 100644 packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb create mode 100644 packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb delete mode 100644 packages/opie-jumpx/opie-jumpx_1.2.1.bb create mode 100644 packages/opie-jumpx/opie-jumpx_1.2.2.bb delete mode 100644 packages/opie-kbill/opie-kbill_1.2.1.bb create mode 100644 packages/opie-kbill/opie-kbill_1.2.2.bb delete mode 100644 packages/opie-kcheckers/opie-kcheckers_1.2.1.bb create mode 100644 packages/opie-kcheckers/opie-kcheckers_1.2.2.bb delete mode 100644 packages/opie-keyboard/opie-keyboard_1.2.1.bb create mode 100644 packages/opie-keyboard/opie-keyboard_1.2.2.bb delete mode 100644 packages/opie-keypebble/opie-keypebble_1.2.1.bb create mode 100644 packages/opie-keypebble/opie-keypebble_1.2.2.bb delete mode 100644 packages/opie-keytabs/opie-keytabs_1.2.1.bb create mode 100644 packages/opie-keytabs/opie-keytabs_1.2.2.bb delete mode 100644 packages/opie-keyview/opie-keyview_1.2.1.bb create mode 100644 packages/opie-keyview/opie-keyview_1.2.2.bb delete mode 100644 packages/opie-kjumpx/opie-kjumpx_1.2.1.bb create mode 100644 packages/opie-kjumpx/opie-kjumpx_1.2.2.bb delete mode 100644 packages/opie-kpacman/opie-kpacman_1.2.1.bb create mode 100644 packages/opie-kpacman/opie-kpacman_1.2.2.bb delete mode 100644 packages/opie-language/opie-language_1.2.1.bb create mode 100644 packages/opie-language/opie-language_1.2.2.bb delete mode 100644 packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb create mode 100644 packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb delete mode 100644 packages/opie-libqrsync/opie-libqrsync_1.2.1.bb create mode 100644 packages/opie-libqrsync/opie-libqrsync_1.2.2.bb delete mode 100644 packages/opie-light-and-power/opie-light-and-power_1.2.1.bb create mode 100644 packages/opie-light-and-power/opie-light-and-power_1.2.2.bb delete mode 100644 packages/opie-lockapplet/opie-lockapplet_1.2.1.bb create mode 100644 packages/opie-lockapplet/opie-lockapplet_1.2.2.bb delete mode 100644 packages/opie-login/opie-login_1.2.1.bb create mode 100644 packages/opie-login/opie-login_1.2.2.bb delete mode 100644 packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb create mode 100644 packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb delete mode 100644 packages/opie-mail/opie-mail_1.2.1.bb create mode 100644 packages/opie-mail/opie-mail_1.2.2.bb delete mode 100644 packages/opie-mailapplet/opie-mailapplet_1.2.1.bb create mode 100644 packages/opie-mailapplet/opie-mailapplet_1.2.2.bb delete mode 100644 packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb create mode 100644 packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb delete mode 100644 packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb create mode 100644 packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb delete mode 100644 packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb create mode 100644 packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb delete mode 100644 packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb create mode 100644 packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb delete mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb create mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb delete mode 100644 packages/opie-mediummount/opie-mediummount_1.2.1.bb create mode 100644 packages/opie-mediummount/opie-mediummount_1.2.2.bb delete mode 100644 packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb create mode 100644 packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb delete mode 100644 packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb create mode 100644 packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb delete mode 100644 packages/opie-minesweep/opie-minesweep_1.2.1.bb create mode 100644 packages/opie-minesweep/opie-minesweep_1.2.2.bb delete mode 100644 packages/opie-multikey/opie-multikey_1.2.1.bb create mode 100644 packages/opie-multikey/opie-multikey_1.2.2.bb delete mode 100644 packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb create mode 100644 packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb delete mode 100644 packages/opie-networkapplet/opie-networkapplet_1.2.1.bb create mode 100644 packages/opie-networkapplet/opie-networkapplet_1.2.2.bb delete mode 100644 packages/opie-networksettings/opie-networksettings_1.2.1.bb create mode 100644 packages/opie-networksettings/opie-networksettings_1.2.2.bb delete mode 100644 packages/opie-notesapplet/opie-notesapplet_1.2.1.bb create mode 100644 packages/opie-notesapplet/opie-notesapplet_1.2.2.bb delete mode 100644 packages/opie-odict/opie-odict_1.2.1.bb create mode 100644 packages/opie-odict/opie-odict_1.2.2.bb delete mode 100644 packages/opie-oxygen/opie-oxygen_1.2.1.bb create mode 100644 packages/opie-oxygen/opie-oxygen_1.2.2.bb delete mode 100644 packages/opie-oyatzee/opie-oyatzee_1.2.1.bb create mode 100644 packages/opie-oyatzee/opie-oyatzee_1.2.2.bb delete mode 100644 packages/opie-packagemanager/opie-packagemanager_1.2.1.bb create mode 100644 packages/opie-packagemanager/opie-packagemanager_1.2.2.bb delete mode 100644 packages/opie-parashoot/opie-parashoot_1.2.1.bb create mode 100644 packages/opie-parashoot/opie-parashoot_1.2.2.bb delete mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb create mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb delete mode 100644 packages/opie-pickboard/opie-pickboard_1.2.1.bb create mode 100644 packages/opie-pickboard/opie-pickboard_1.2.2.bb delete mode 100644 packages/opie-pics/opie-pics_1.2.1.bb create mode 100644 packages/opie-pics/opie-pics_1.2.2.bb delete mode 100644 packages/opie-pimconverter/opie-pimconverter_1.2.1.bb create mode 100644 packages/opie-pimconverter/opie-pimconverter_1.2.2.bb delete mode 100644 packages/opie-powerchord/opie-powerchord_1.2.1.bb create mode 100644 packages/opie-powerchord/opie-powerchord_1.2.2.bb delete mode 100644 packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb create mode 100644 packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb delete mode 100644 packages/opie-qasteroids/opie-qasteroids_1.2.1.bb create mode 100644 packages/opie-qasteroids/opie-qasteroids_1.2.2.bb delete mode 100644 packages/opie-qcop/opie-qcop_1.2.1.bb create mode 100644 packages/opie-qcop/opie-qcop_1.2.2.bb delete mode 100644 packages/opie-qss/opie-qss_1.2.1.bb create mode 100644 packages/opie-qss/opie-qss_1.2.2.bb delete mode 100644 packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb create mode 100644 packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb delete mode 100644 packages/opie-rdesktop/opie-rdesktop_1.2.1.bb create mode 100644 packages/opie-rdesktop/opie-rdesktop_1.2.2.bb delete mode 100644 packages/opie-reader/opie-reader_1.2.1.bb create mode 100644 packages/opie-reader/opie-reader_1.2.2.bb delete mode 100644 packages/opie-recorder/opie-recorder_1.2.1.bb create mode 100644 packages/opie-recorder/opie-recorder_1.2.2.bb delete mode 100644 packages/opie-remote/opie-remote_1.2.1.bb create mode 100644 packages/opie-remote/opie-remote_1.2.2.bb delete mode 100644 packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb create mode 100644 packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb delete mode 100644 packages/opie-restartapplet/opie-restartapplet_1.2.1.bb create mode 100644 packages/opie-restartapplet/opie-restartapplet_1.2.2.bb delete mode 100644 packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb create mode 100644 packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb delete mode 100644 packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb create mode 100644 packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb delete mode 100644 packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb create mode 100644 packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb delete mode 100644 packages/opie-search/opie-search_1.2.1.bb create mode 100644 packages/opie-search/opie-search_1.2.2.bb delete mode 100644 packages/opie-security/opie-security_1.2.1.bb create mode 100644 packages/opie-security/opie-security_1.2.2.bb delete mode 100644 packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb create mode 100644 packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb delete mode 100644 packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb create mode 100644 packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb delete mode 100644 packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb create mode 100644 packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb delete mode 100644 packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb create mode 100644 packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb delete mode 100644 packages/opie-sfcave/opie-sfcave_1.2.1.bb create mode 100644 packages/opie-sfcave/opie-sfcave_1.2.2.bb delete mode 100644 packages/opie-sh-snes/opie-sh-snes_1.2.1.bb create mode 100644 packages/opie-sh-snes/opie-sh-snes_1.2.2.bb delete mode 100644 packages/opie-sh/opie-sh_1.2.1.bb create mode 100644 packages/opie-sh/opie-sh_1.2.2.bb delete mode 100644 packages/opie-sheet/opie-sheet_1.2.1.bb create mode 100644 packages/opie-sheet/opie-sheet_1.2.2.bb delete mode 100644 packages/opie-snake/opie-snake_1.2.1.bb create mode 100644 packages/opie-snake/opie-snake_1.2.2.bb delete mode 100644 packages/opie-solitaire/opie-solitaire_1.2.1.bb create mode 100644 packages/opie-solitaire/opie-solitaire_1.2.2.bb delete mode 100644 packages/opie-sounds/opie-sounds_1.2.1.bb create mode 100644 packages/opie-sounds/opie-sounds_1.2.2.bb delete mode 100644 packages/opie-sshkeys/opie-sshkeys_1.2.1.bb create mode 100644 packages/opie-sshkeys/opie-sshkeys_1.2.2.bb delete mode 100644 packages/opie-stumbler/opie-stumbler_1.2.1.bb create mode 100644 packages/opie-stumbler/opie-stumbler_1.2.2.bb delete mode 100644 packages/opie-style-flat/opie-style-flat_1.2.1.bb create mode 100644 packages/opie-style-flat/opie-style-flat_1.2.2.bb delete mode 100644 packages/opie-style-fresh/opie-style-fresh_1.2.1.bb create mode 100644 packages/opie-style-fresh/opie-style-fresh_1.2.2.bb delete mode 100644 packages/opie-style-liquid/opie-style-liquid_1.2.1.bb create mode 100644 packages/opie-style-liquid/opie-style-liquid_1.2.2.bb delete mode 100644 packages/opie-style-metal/opie-style-metal_1.2.1.bb create mode 100644 packages/opie-style-metal/opie-style-metal_1.2.2.bb delete mode 100644 packages/opie-style-phase/opie-style-phase_1.2.1.bb create mode 100644 packages/opie-style-phase/opie-style-phase_1.2.2.bb delete mode 100644 packages/opie-style-web/opie-style-web_1.2.1.bb create mode 100644 packages/opie-style-web/opie-style-web_1.2.2.bb delete mode 100644 packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb create mode 100644 packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb delete mode 100644 packages/opie-symlinker/opie-symlinker_1.2.1.bb create mode 100644 packages/opie-symlinker/opie-symlinker_1.2.2.bb delete mode 100644 packages/opie-sysinfo/opie-sysinfo_1.2.1.bb create mode 100644 packages/opie-sysinfo/opie-sysinfo_1.2.2.bb delete mode 100644 packages/opie-systemtime/opie-systemtime_1.2.1.bb create mode 100644 packages/opie-systemtime/opie-systemtime_1.2.2.bb delete mode 100644 packages/opie-tableviewer/opie-tableviewer_1.2.1.bb create mode 100644 packages/opie-tableviewer/opie-tableviewer_1.2.2.bb delete mode 100644 packages/opie-taskbar/opie-taskbar_1.2.1.bb create mode 100644 packages/opie-taskbar/opie-taskbar_1.2.2.bb delete mode 100644 packages/opie-tetrix/opie-tetrix_1.2.1.bb create mode 100644 packages/opie-tetrix/opie-tetrix_1.2.2.bb delete mode 100644 packages/opie-textedit/opie-textedit_1.2.1.bb create mode 100644 packages/opie-textedit/opie-textedit_1.2.2.bb delete mode 100644 packages/opie-theme/opie-theme_1.2.1.bb create mode 100644 packages/opie-theme/opie-theme_1.2.2.bb delete mode 100644 packages/opie-tictac/opie-tictac_1.2.1.bb create mode 100644 packages/opie-tictac/opie-tictac_1.2.2.bb delete mode 100644 packages/opie-tinykate/opie-tinykate_1.2.1.bb create mode 100644 packages/opie-tinykate/opie-tinykate_1.2.2.bb delete mode 100644 packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb create mode 100644 packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb delete mode 100644 packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb create mode 100644 packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb delete mode 100644 packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb create mode 100644 packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb delete mode 100644 packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb create mode 100644 packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb delete mode 100644 packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb create mode 100644 packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb delete mode 100644 packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb create mode 100644 packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb delete mode 100644 packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb create mode 100644 packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb delete mode 100644 packages/opie-today/opie-today_1.2.1.bb create mode 100644 packages/opie-today/opie-today_1.2.2.bb delete mode 100644 packages/opie-todo/opie-todo_1.2.1.bb create mode 100644 packages/opie-todo/opie-todo_1.2.2.bb delete mode 100644 packages/opie-tonleiter/opie-tonleiter_1.2.1.bb create mode 100644 packages/opie-tonleiter/opie-tonleiter_1.2.2.bb delete mode 100644 packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb create mode 100644 packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb delete mode 100644 packages/opie-usermanager/opie-usermanager_1.2.1.bb create mode 100644 packages/opie-usermanager/opie-usermanager_1.2.2.bb delete mode 100644 packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb create mode 100644 packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb delete mode 100644 packages/opie-vmemo/opie-vmemo_1.2.1.bb create mode 100644 packages/opie-vmemo/opie-vmemo_1.2.2.bb delete mode 100644 packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb create mode 100644 packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb delete mode 100644 packages/opie-vtapplet/opie-vtapplet_1.2.1.bb create mode 100644 packages/opie-vtapplet/opie-vtapplet_1.2.2.bb delete mode 100644 packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb create mode 100644 packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb delete mode 100644 packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb create mode 100644 packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb delete mode 100644 packages/opie-wordgame/opie-wordgame_1.2.1.bb create mode 100644 packages/opie-wordgame/opie-wordgame_1.2.2.bb delete mode 100644 packages/opie-write/opie-write_1.2.1.bb create mode 100644 packages/opie-write/opie-write_1.2.2.bb delete mode 100644 packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb create mode 100644 packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb delete mode 100644 packages/opie-zlines/opie-zlines_1.2.1.bb create mode 100644 packages/opie-zlines/opie-zlines_1.2.2.bb delete mode 100644 packages/opie-zsafe/opie-zsafe_1.2.1.bb create mode 100644 packages/opie-zsafe/opie-zsafe_1.2.2.bb delete mode 100644 packages/opie-zsame/opie-zsame_1.2.1.bb create mode 100644 packages/opie-zsame/opie-zsame_1.2.2.bb diff --git a/packages/libmailwrapper/libmailwrapper_1.2.1.bb b/packages/libmailwrapper/libmailwrapper_1.2.1.bb deleted file mode 100644 index 29aa09c148..0000000000 --- a/packages/libmailwrapper/libmailwrapper_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper " diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb new file mode 100644 index 0000000000..29aa09c148 --- /dev/null +++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/libmailwrapper " diff --git a/packages/libopie/libopie2_1.2.1.bb b/packages/libopie/libopie2_1.2.1.bb deleted file mode 100644 index 7037f48d06..0000000000 --- a/packages/libopie/libopie2_1.2.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -include ${PN}.inc - -PR = "r2" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ - file://openzaurus-branding.patch;patch=1 \ - file://include.pro" - -SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb new file mode 100644 index 0000000000..e48ae0c23e --- /dev/null +++ b/packages/libopie/libopie2_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ + file://openzaurus-branding.patch;patch=1 \ + file://include.pro" + +SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb deleted file mode 100644 index 5e7c51e7cc..0000000000 --- a/packages/libopieobex/libopieobex0_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include libopieobex0.inc - -PR = "r2" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/libopieobex/libopieobex0_1.2.2.bb b/packages/libopieobex/libopieobex0_1.2.2.bb new file mode 100644 index 0000000000..f5a2b1bc45 --- /dev/null +++ b/packages/libopieobex/libopieobex0_1.2.2.bb @@ -0,0 +1,5 @@ +include libopieobex0.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb index ed160d86c8..f401f01a3e 100644 --- a/packages/libopieobex/libopieobex0_cvs.bb +++ b/packages/libopieobex/libopieobex0_cvs.bb @@ -1,6 +1,5 @@ include libopieobex0.inc PV = "${OPIE_CVS_PV}" -PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \ ${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/libopietooth/libopietooth1_1.2.1.bb b/packages/libopietooth/libopietooth1_1.2.1.bb deleted file mode 100644 index 0dc91b2731..0000000000 --- a/packages/libopietooth/libopietooth1_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib" - -include libopietooth1.inc - - diff --git a/packages/libopietooth/libopietooth1_1.2.2.bb b/packages/libopietooth/libopietooth1_1.2.2.bb new file mode 100644 index 0000000000..0dc91b2731 --- /dev/null +++ b/packages/libopietooth/libopietooth1_1.2.2.bb @@ -0,0 +1,5 @@ +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib" + +include libopietooth1.inc + + diff --git a/packages/libqpe/libqpe-opie_1.2.1.bb b/packages/libqpe/libqpe-opie_1.2.1.bb deleted file mode 100644 index fd806b8ca6..0000000000 --- a/packages/libqpe/libqpe-opie_1.2.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ - file://0905_datebookmonth.patch;patch=1;pnum=0 \ - file://fix-titleheight.patch;patch=1" - diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb new file mode 100644 index 0000000000..6cd4368187 --- /dev/null +++ b/packages/libqpe/libqpe-opie_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ + file://0905_datebookmonth.patch;patch=1;pnum=0 \ + file://fix-titleheight.patch;patch=1" + diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 9657868b0f..8b4e74afe7 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,8 +1,7 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes -PV = "1.2.1+cvs-${SRCDATE}" -PR = "r1" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1" diff --git a/packages/libqtaux/libqtaux2_1.2.1.bb b/packages/libqtaux/libqtaux2_1.2.1.bb deleted file mode 100644 index aa694d43f1..0000000000 --- a/packages/libqtaux/libqtaux2_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux" diff --git a/packages/libqtaux/libqtaux2_1.2.2.bb b/packages/libqtaux/libqtaux2_1.2.2.bb new file mode 100644 index 0000000000..aa694d43f1 --- /dev/null +++ b/packages/libqtaux/libqtaux2_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux" diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb index c800fca9f1..0df162a9e5 100644 --- a/packages/meta/task-bootstrap-unionroot.bb +++ b/packages/meta/task-bootstrap-unionroot.bb @@ -1,8 +1,6 @@ DESCRIPTION = "Core packages required for a basic installation with unionroot" MAINTAINER = "Chris Lord " PROVIDES = "task-bootstrap" -PN = "task-bootstrap" -PV = "1.0unionroot" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb deleted file mode 100644 index 41533f8d3b..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r2" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet \ - file://opie-1.2.1.patch;patch=1 \ - file://add-hrw-to-authors.patch;patch=1" diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb new file mode 100644 index 0000000000..963728e20b --- /dev/null +++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet \ + file://opie-1.2.2.patch;patch=1 \ + file://add-hrw-to-authors.patch;patch=1" diff --git a/packages/opie-addressbook/opie-addressbook_1.2.1.bb b/packages/opie-addressbook/opie-addressbook_1.2.1.bb deleted file mode 100644 index a8bf6f7e5a..0000000000 --- a/packages/opie-addressbook/opie-addressbook_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-addressbook/opie-addressbook_1.2.2.bb b/packages/opie-addressbook/opie-addressbook_1.2.2.bb new file mode 100644 index 0000000000..a8bf6f7e5a --- /dev/null +++ b/packages/opie-addressbook/opie-addressbook_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/addressbook \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.1.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.1.bb deleted file mode 100644 index 8a4cc0ebc5..0000000000 --- a/packages/opie-advancedfm/opie-advancedfm_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb new file mode 100644 index 0000000000..8a4cc0ebc5 --- /dev/null +++ b/packages/opie-advancedfm/opie-advancedfm_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-alarm/opie-alarm_1.2.1.bb b/packages/opie-alarm/opie-alarm_1.2.1.bb deleted file mode 100644 index ada72aea1b..0000000000 --- a/packages/opie-alarm/opie-alarm_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \ - file://01opiealarm " diff --git a/packages/opie-alarm/opie-alarm_1.2.2.bb b/packages/opie-alarm/opie-alarm_1.2.2.bb new file mode 100644 index 0000000000..ada72aea1b --- /dev/null +++ b/packages/opie-alarm/opie-alarm_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/opiealarm \ + file://01opiealarm " diff --git a/packages/opie-appearance/opie-appearance_1.2.1.bb b/packages/opie-appearance/opie-appearance_1.2.1.bb deleted file mode 100644 index d6ba9fb452..0000000000 --- a/packages/opie-appearance/opie-appearance_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r2" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://add-ui-settings.patch;patch=1" diff --git a/packages/opie-appearance/opie-appearance_1.2.2.bb b/packages/opie-appearance/opie-appearance_1.2.2.bb new file mode 100644 index 0000000000..ee26b50ca6 --- /dev/null +++ b/packages/opie-appearance/opie-appearance_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://add-ui-settings.patch;patch=1" diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.1.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.1.bb deleted file mode 100644 index 17a7683cef..0000000000 --- a/packages/opie-aqpkg/opie-aqpkg_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb new file mode 100644 index 0000000000..17a7683cef --- /dev/null +++ b/packages/opie-aqpkg/opie-aqpkg_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/aqpkg \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb deleted file mode 100644 index f1b992d7c8..0000000000 --- a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb new file mode 100644 index 0000000000..f1b992d7c8 --- /dev/null +++ b/packages/opie-autorotateapplet/opie-autorotateapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/autorotateapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-backgammon/opie-backgammon_1.2.1.bb b/packages/opie-backgammon/opie-backgammon_1.2.1.bb deleted file mode 100644 index 0cae5c2a10..0000000000 --- a/packages/opie-backgammon/opie-backgammon_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-backgammon/opie-backgammon_1.2.2.bb b/packages/opie-backgammon/opie-backgammon_1.2.2.bb new file mode 100644 index 0000000000..0cae5c2a10 --- /dev/null +++ b/packages/opie-backgammon/opie-backgammon_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/backgammon \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-backup/opie-backup_1.2.1.bb b/packages/opie-backup/opie-backup_1.2.1.bb deleted file mode 100644 index 8f276e0c3c..0000000000 --- a/packages/opie-backup/opie-backup_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1492-bugfix.patch;patch=1" diff --git a/packages/opie-backup/opie-backup_1.2.2.bb b/packages/opie-backup/opie-backup_1.2.2.bb new file mode 100644 index 0000000000..3004eeae34 --- /dev/null +++ b/packages/opie-backup/opie-backup_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://1492-bugfix.patch;patch=1" diff --git a/packages/opie-bartender/opie-bartender_1.2.1.bb b/packages/opie-bartender/opie-bartender_1.2.1.bb deleted file mode 100644 index 40c46f0070..0000000000 --- a/packages/opie-bartender/opie-bartender_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-bartender/opie-bartender_1.2.2.bb b/packages/opie-bartender/opie-bartender_1.2.2.bb new file mode 100644 index 0000000000..40c46f0070 --- /dev/null +++ b/packages/opie-bartender/opie-bartender_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-bartender \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb deleted file mode 100644 index 3feba24a63..0000000000 --- a/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb b/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb new file mode 100644 index 0000000000..f8136964fc --- /dev/null +++ b/packages/opie-batteryapplet/opie-batteryapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb index f7148388a2..8f109df1cc 100644 --- a/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb +++ b/packages/opie-batteryapplet/opie-batteryapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/batteryapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-bluepin/opie-bluepin_1.2.1.bb b/packages/opie-bluepin/opie-bluepin_1.2.1.bb deleted file mode 100644 index 4df972dc5a..0000000000 --- a/packages/opie-bluepin/opie-bluepin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluepin/opie-bluepin_1.2.2.bb b/packages/opie-bluepin/opie-bluepin_1.2.2.bb new file mode 100644 index 0000000000..fdfdffa0a5 --- /dev/null +++ b/packages/opie-bluepin/opie-bluepin_1.2.2.bb @@ -0,0 +1,4 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/blue-pin" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb deleted file mode 100644 index 43d21d82db..0000000000 --- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet" diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb new file mode 100644 index 0000000000..43d21d82db --- /dev/null +++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb deleted file mode 100644 index 7f022404b1..0000000000 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb new file mode 100644 index 0000000000..3232b06c61 --- /dev/null +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/manager \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb index 0dcb90892f..7ff2ac0f64 100644 --- a/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb +++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager_cvs.bb @@ -1,6 +1,5 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/manager \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-bounce/opie-bounce_1.2.1.bb b/packages/opie-bounce/opie-bounce_1.2.1.bb deleted file mode 100644 index 3c49e91391..0000000000 --- a/packages/opie-bounce/opie-bounce_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-bounce/opie-bounce_1.2.2.bb b/packages/opie-bounce/opie-bounce_1.2.2.bb new file mode 100644 index 0000000000..3c49e91391 --- /dev/null +++ b/packages/opie-bounce/opie-bounce_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/bounce \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb deleted file mode 100644 index 854ebd07fa..0000000000 --- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb new file mode 100644 index 0000000000..854ebd07fa --- /dev/null +++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/brightnessapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-button-settings/opie-button-settings_1.2.1.bb b/packages/opie-button-settings/opie-button-settings_1.2.1.bb deleted file mode 100644 index 1f671597ba..0000000000 --- a/packages/opie-button-settings/opie-button-settings_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1624-bugfix.patch;patch=1" diff --git a/packages/opie-button-settings/opie-button-settings_1.2.2.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb new file mode 100644 index 0000000000..63b924ee36 --- /dev/null +++ b/packages/opie-button-settings/opie-button-settings_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://1624-bugfix.patch;patch=1" diff --git a/packages/opie-buzzword/opie-buzzword_1.2.1.bb b/packages/opie-buzzword/opie-buzzword_1.2.1.bb deleted file mode 100644 index f87d0bbf1f..0000000000 --- a/packages/opie-buzzword/opie-buzzword_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-buzzword/opie-buzzword_1.2.2.bb b/packages/opie-buzzword/opie-buzzword_1.2.2.bb new file mode 100644 index 0000000000..f87d0bbf1f --- /dev/null +++ b/packages/opie-buzzword/opie-buzzword_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/buzzword \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-calculator/opie-calculator_1.2.1.bb b/packages/opie-calculator/opie-calculator_1.2.1.bb deleted file mode 100644 index 984765fe89..0000000000 --- a/packages/opie-calculator/opie-calculator_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-calculator/opie-calculator_1.2.2.bb b/packages/opie-calculator/opie-calculator_1.2.2.bb new file mode 100644 index 0000000000..984765fe89 --- /dev/null +++ b/packages/opie-calculator/opie-calculator_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/calculator \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-camera/opie-camera_1.2.1.bb b/packages/opie-camera/opie-camera_1.2.1.bb deleted file mode 100644 index 22b4c9b773..0000000000 --- a/packages/opie-camera/opie-camera_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-camera/opie-camera_1.2.2.bb b/packages/opie-camera/opie-camera_1.2.2.bb new file mode 100644 index 0000000000..22b4c9b773 --- /dev/null +++ b/packages/opie-camera/opie-camera_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-cardmon/opie-cardmon_1.2.1.bb b/packages/opie-cardmon/opie-cardmon_1.2.1.bb deleted file mode 100644 index 7283fa75f8..0000000000 --- a/packages/opie-cardmon/opie-cardmon_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-cardmon/opie-cardmon_1.2.2.bb b/packages/opie-cardmon/opie-cardmon_1.2.2.bb new file mode 100644 index 0000000000..7283fa75f8 --- /dev/null +++ b/packages/opie-cardmon/opie-cardmon_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/cardmon \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-checkbook/opie-checkbook_1.2.1.bb b/packages/opie-checkbook/opie-checkbook_1.2.1.bb deleted file mode 100644 index 8a4cc0ebc5..0000000000 --- a/packages/opie-checkbook/opie-checkbook_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-checkbook/opie-checkbook_1.2.2.bb b/packages/opie-checkbook/opie-checkbook_1.2.2.bb new file mode 100644 index 0000000000..8a4cc0ebc5 --- /dev/null +++ b/packages/opie-checkbook/opie-checkbook_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-citytime/opie-citytime_1.2.1.bb b/packages/opie-citytime/opie-citytime_1.2.1.bb deleted file mode 100644 index 29d244a555..0000000000 --- a/packages/opie-citytime/opie-citytime_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-citytime/opie-citytime_1.2.2.bb b/packages/opie-citytime/opie-citytime_1.2.2.bb new file mode 100644 index 0000000000..29d244a555 --- /dev/null +++ b/packages/opie-citytime/opie-citytime_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/citytime \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb deleted file mode 100644 index a9d681b5b9..0000000000 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb new file mode 100644 index 0000000000..f123790cea --- /dev/null +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clipboardapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb index b0ba1ba507..67cc639a0b 100644 --- a/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb +++ b/packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clipboardapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-clock/opie-clock_1.2.1.bb b/packages/opie-clock/opie-clock_1.2.1.bb deleted file mode 100644 index f86c3d2832..0000000000 --- a/packages/opie-clock/opie-clock_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clock/opie-clock_1.2.2.bb b/packages/opie-clock/opie-clock_1.2.2.bb new file mode 100644 index 0000000000..f86c3d2832 --- /dev/null +++ b/packages/opie-clock/opie-clock_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/clock \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb deleted file mode 100644 index 9d4dfa7723..0000000000 --- a/packages/opie-clockapplet/opie-clockapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb new file mode 100644 index 0000000000..6810381989 --- /dev/null +++ b/packages/opie-clockapplet/opie-clockapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 52276b64c3..8b107589c0 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-confeditor/opie-confeditor_1.2.1.bb b/packages/opie-confeditor/opie-confeditor_1.2.1.bb deleted file mode 100644 index dce2d43da5..0000000000 --- a/packages/opie-confeditor/opie-confeditor_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-confeditor/opie-confeditor_1.2.2.bb b/packages/opie-confeditor/opie-confeditor_1.2.2.bb new file mode 100644 index 0000000000..dce2d43da5 --- /dev/null +++ b/packages/opie-confeditor/opie-confeditor_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/confedit \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb deleted file mode 100644 index 061c489c7e..0000000000 --- a/packages/opie-console/opie-console_1.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -include ${PN}.inc - -PR = "r3" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1686-bugfix.patch;patch=1 \ - file://1647-bugfix.patch;patch=1 \ - file://0117_opie-console-use-default-fixed.diff;patch=1" diff --git a/packages/opie-console/opie-console_1.2.2.bb b/packages/opie-console/opie-console_1.2.2.bb new file mode 100644 index 0000000000..5dbdba0790 --- /dev/null +++ b/packages/opie-console/opie-console_1.2.2.bb @@ -0,0 +1,9 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://1686-bugfix.patch;patch=1 \ + file://1647-bugfix.patch;patch=1 \ + file://0117_opie-console-use-default-fixed.diff;patch=1" diff --git a/packages/opie-dagger/opie-dagger_1.2.1.bb b/packages/opie-dagger/opie-dagger_1.2.1.bb deleted file mode 100644 index 52b34898aa..0000000000 --- a/packages/opie-dagger/opie-dagger_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-dagger/opie-dagger_1.2.2.bb b/packages/opie-dagger/opie-dagger_1.2.2.bb new file mode 100644 index 0000000000..52b34898aa --- /dev/null +++ b/packages/opie-dagger/opie-dagger_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-dasher/opie-dasher_1.2.1.bb b/packages/opie-dasher/opie-dasher_1.2.1.bb deleted file mode 100644 index a8b5176961..0000000000 --- a/packages/opie-dasher/opie-dasher_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share " diff --git a/packages/opie-dasher/opie-dasher_1.2.2.bb b/packages/opie-dasher/opie-dasher_1.2.2.bb new file mode 100644 index 0000000000..a8b5176961 --- /dev/null +++ b/packages/opie-dasher/opie-dasher_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dasher \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share " diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb deleted file mode 100644 index 515c5c9de1..0000000000 --- a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday " diff --git a/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb new file mode 100644 index 0000000000..515c5c9de1 --- /dev/null +++ b/packages/opie-datebook-birthdayplugin/opie-datebook-birthdayplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/birthday " diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb deleted file mode 100644 index bf937db7e1..0000000000 --- a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian " diff --git a/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb new file mode 100644 index 0000000000..bf937db7e1 --- /dev/null +++ b/packages/opie-datebook-chrisholidayplugin/opie-datebook-chrisholidayplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/christian " diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb deleted file mode 100644 index d6d19655a7..0000000000 --- a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays " diff --git a/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb new file mode 100644 index 0000000000..d6d19655a7 --- /dev/null +++ b/packages/opie-datebook-nationalholidayplugin/opie-datebook-nationalholidayplugin_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook/holiday/national \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/nationaldays " diff --git a/packages/opie-datebook/opie-datebook_1.2.1.bb b/packages/opie-datebook/opie-datebook_1.2.1.bb deleted file mode 100644 index 1470bc05f0..0000000000 --- a/packages/opie-datebook/opie-datebook_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://bug1707fix.patch;patch=1" diff --git a/packages/opie-datebook/opie-datebook_1.2.2.bb b/packages/opie-datebook/opie-datebook_1.2.2.bb new file mode 100644 index 0000000000..83493f01a3 --- /dev/null +++ b/packages/opie-datebook/opie-datebook_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://bug1707fix.patch;patch=1" diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.1.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.1.bb deleted file mode 100644 index 59aa1d2a23..0000000000 --- a/packages/opie-deco-flat/opie-deco-flat_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat " diff --git a/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb new file mode 100644 index 0000000000..59aa1d2a23 --- /dev/null +++ b/packages/opie-deco-flat/opie-deco-flat_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/flat " diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb deleted file mode 100644 index 6f07a57e40..0000000000 --- a/packages/opie-deco-liquid/opie-deco-liquid_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid " diff --git a/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb new file mode 100644 index 0000000000..6f07a57e40 --- /dev/null +++ b/packages/opie-deco-liquid/opie-deco-liquid_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/liquid " diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.1.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.1.bb deleted file mode 100644 index 2dde102adf..0000000000 --- a/packages/opie-deco-polished/opie-deco-polished_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished " diff --git a/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb new file mode 100644 index 0000000000..2dde102adf --- /dev/null +++ b/packages/opie-deco-polished/opie-deco-polished_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/decorations/polished " diff --git a/packages/opie-doctab/opie-doctab_1.2.1.bb b/packages/opie-doctab/opie-doctab_1.2.1.bb deleted file mode 100644 index 317b556300..0000000000 --- a/packages/opie-doctab/opie-doctab_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-doctab/opie-doctab_1.2.2.bb b/packages/opie-doctab/opie-doctab_1.2.2.bb new file mode 100644 index 0000000000..317b556300 --- /dev/null +++ b/packages/opie-doctab/opie-doctab_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/doctab \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-drawpad/opie-drawpad_1.2.1.bb b/packages/opie-drawpad/opie-drawpad_1.2.1.bb deleted file mode 100644 index d4a6c7a665..0000000000 --- a/packages/opie-drawpad/opie-drawpad_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-drawpad/opie-drawpad_1.2.2.bb b/packages/opie-drawpad/opie-drawpad_1.2.2.bb new file mode 100644 index 0000000000..d4a6c7a665 --- /dev/null +++ b/packages/opie-drawpad/opie-drawpad_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/drawpad \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-dvorak/opie-dvorak_1.2.1.bb b/packages/opie-dvorak/opie-dvorak_1.2.1.bb deleted file mode 100644 index f7c4394c3f..0000000000 --- a/packages/opie-dvorak/opie-dvorak_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-dvorak/opie-dvorak_1.2.2.bb b/packages/opie-dvorak/opie-dvorak_1.2.2.bb new file mode 100644 index 0000000000..f7c4394c3f --- /dev/null +++ b/packages/opie-dvorak/opie-dvorak_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/dvorak \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb deleted file mode 100644 index 68af4cfec6..0000000000 --- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb new file mode 100644 index 0000000000..68af4cfec6 --- /dev/null +++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-euroconv/opie-euroconv_1.2.1.bb b/packages/opie-euroconv/opie-euroconv_1.2.1.bb deleted file mode 100644 index 2397fda504..0000000000 --- a/packages/opie-euroconv/opie-euroconv_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-euroconv/opie-euroconv_1.2.2.bb b/packages/opie-euroconv/opie-euroconv_1.2.2.bb new file mode 100644 index 0000000000..2397fda504 --- /dev/null +++ b/packages/opie-euroconv/opie-euroconv_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/euroconv \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-examples-python/opie-examples-python_1.2.1.bb b/packages/opie-examples-python/opie-examples-python_1.2.1.bb deleted file mode 100644 index 3dd011c0b9..0000000000 --- a/packages/opie-examples-python/opie-examples-python_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-examples-python/opie-examples-python_1.2.2.bb b/packages/opie-examples-python/opie-examples-python_1.2.2.bb new file mode 100644 index 0000000000..57a745a480 --- /dev/null +++ b/packages/opie-examples-python/opie-examples-python_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples/python \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-examples-python/opie-examples-python_cvs.bb b/packages/opie-examples-python/opie-examples-python_cvs.bb index 75a52cb7a7..25cfe334b4 100644 --- a/packages/opie-examples-python/opie-examples-python_cvs.bb +++ b/packages/opie-examples-python/opie-examples-python_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/examples/python \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-examples/opie-examples_1.2.1.bb b/packages/opie-examples/opie-examples_1.2.1.bb deleted file mode 100644 index 7b28fc1a9c..0000000000 --- a/packages/opie-examples/opie-examples_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-examples/opie-examples_1.2.2.bb b/packages/opie-examples/opie-examples_1.2.2.bb new file mode 100644 index 0000000000..7b28fc1a9c --- /dev/null +++ b/packages/opie-examples/opie-examples_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/examples \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-eye/opie-eye_1.2.1.bb b/packages/opie-eye/opie-eye_1.2.1.bb deleted file mode 100644 index 0fc47e6b10..0000000000 --- a/packages/opie-eye/opie-eye_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-eye/opie-eye_1.2.2.bb b/packages/opie-eye/opie-eye_1.2.2.bb new file mode 100644 index 0000000000..0fc47e6b10 --- /dev/null +++ b/packages/opie-eye/opie-eye_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/graphics/opie-eye \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-fifteen/opie-fifteen_1.2.1.bb b/packages/opie-fifteen/opie-fifteen_1.2.1.bb deleted file mode 100644 index d80333bada..0000000000 --- a/packages/opie-fifteen/opie-fifteen_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-fifteen/opie-fifteen_1.2.2.bb b/packages/opie-fifteen/opie-fifteen_1.2.2.bb new file mode 100644 index 0000000000..d80333bada --- /dev/null +++ b/packages/opie-fifteen/opie-fifteen_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/fifteen \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-formatter/opie-formatter_1.2.1.bb b/packages/opie-formatter/opie-formatter_1.2.1.bb deleted file mode 100644 index f8020d60a0..0000000000 --- a/packages/opie-formatter/opie-formatter_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-formatter/opie-formatter_1.2.2.bb b/packages/opie-formatter/opie-formatter_1.2.2.bb new file mode 100644 index 0000000000..f8020d60a0 --- /dev/null +++ b/packages/opie-formatter/opie-formatter_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/formatter \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-freetype/opie-freetype_1.2.1.bb b/packages/opie-freetype/opie-freetype_1.2.1.bb deleted file mode 100644 index 81996992a2..0000000000 --- a/packages/opie-freetype/opie-freetype_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype" diff --git a/packages/opie-freetype/opie-freetype_1.2.2.bb b/packages/opie-freetype/opie-freetype_1.2.2.bb new file mode 100644 index 0000000000..81996992a2 --- /dev/null +++ b/packages/opie-freetype/opie-freetype_1.2.2.bb @@ -0,0 +1,4 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/freetype" diff --git a/packages/opie-ftp/opie-ftp_1.2.1.bb b/packages/opie-ftp/opie-ftp_1.2.1.bb deleted file mode 100644 index 7a7335ca67..0000000000 --- a/packages/opie-ftp/opie-ftp_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-ftp/opie-ftp_1.2.2.bb b/packages/opie-ftp/opie-ftp_1.2.2.bb new file mode 100644 index 0000000000..7a7335ca67 --- /dev/null +++ b/packages/opie-ftp/opie-ftp_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieftp \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-ftplib/opie-ftplib_1.2.1.bb b/packages/opie-ftplib/opie-ftplib_1.2.1.bb deleted file mode 100644 index 0339703a5d..0000000000 --- a/packages/opie-ftplib/opie-ftplib_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib" diff --git a/packages/opie-ftplib/opie-ftplib_1.2.2.bb b/packages/opie-ftplib/opie-ftplib_1.2.2.bb new file mode 100644 index 0000000000..0339703a5d --- /dev/null +++ b/packages/opie-ftplib/opie-ftplib_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/ftplib" diff --git a/packages/opie-go/opie-go_1.2.1.bb b/packages/opie-go/opie-go_1.2.1.bb deleted file mode 100644 index 4c9f590e9e..0000000000 --- a/packages/opie-go/opie-go_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-go/opie-go_1.2.2.bb b/packages/opie-go/opie-go_1.2.2.bb new file mode 100644 index 0000000000..4c9f590e9e --- /dev/null +++ b/packages/opie-go/opie-go_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/go \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb deleted file mode 100644 index 19d2a29213..0000000000 --- a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb new file mode 100644 index 0000000000..19d2a29213 --- /dev/null +++ b/packages/opie-gutenbrowser/opie-gutenbrowser_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-gutenbrowser \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-handwriting/opie-handwriting_1.2.1.bb b/packages/opie-handwriting/opie-handwriting_1.2.1.bb deleted file mode 100644 index ba3da45f95..0000000000 --- a/packages/opie-handwriting/opie-handwriting_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen" diff --git a/packages/opie-handwriting/opie-handwriting_1.2.2.bb b/packages/opie-handwriting/opie-handwriting_1.2.2.bb new file mode 100644 index 0000000000..ba3da45f95 --- /dev/null +++ b/packages/opie-handwriting/opie-handwriting_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/handwriting \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/qimpen" diff --git a/packages/opie-help-en/opie-help-en_1.2.1.bb b/packages/opie-help-en/opie-help-en_1.2.1.bb deleted file mode 100644 index 7bf8bd0ad4..0000000000 --- a/packages/opie-help-en/opie-help-en_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html" diff --git a/packages/opie-help-en/opie-help-en_1.2.2.bb b/packages/opie-help-en/opie-help-en_1.2.2.bb new file mode 100644 index 0000000000..7bf8bd0ad4 --- /dev/null +++ b/packages/opie-help-en/opie-help-en_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/help/en/html" diff --git a/packages/opie-help-en/opie-help-en_cvs.bb b/packages/opie-help-en/opie-help-en_cvs.bb index c54c006709..09c56ae9f4 100644 --- a/packages/opie-help-en/opie-help-en_cvs.bb +++ b/packages/opie-help-en/opie-help-en_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/help/en/html " diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb deleted file mode 100644 index f2e144d3ca..0000000000 --- a/packages/opie-helpbrowser/opie-helpbrowser_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb new file mode 100644 index 0000000000..f2e144d3ca --- /dev/null +++ b/packages/opie-helpbrowser/opie-helpbrowser_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.1.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.1.bb deleted file mode 100644 index b80e85ac52..0000000000 --- a/packages/opie-homeapplet/opie-homeapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb new file mode 100644 index 0000000000..b80e85ac52 --- /dev/null +++ b/packages/opie-homeapplet/opie-homeapplet_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/homeapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-i18n/opie-i18n_1.2.1.bb b/packages/opie-i18n/opie-i18n_1.2.1.bb deleted file mode 100644 index b5011c0501..0000000000 --- a/packages/opie-i18n/opie-i18n_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-i18n_1.2.2.bb b/packages/opie-i18n/opie-i18n_1.2.2.bb new file mode 100644 index 0000000000..b5011c0501 --- /dev/null +++ b/packages/opie-i18n/opie-i18n_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb index 1a1ef7c35b..93183b79a3 100644 --- a/packages/opie-i18n/opie-i18n_cvs.bb +++ b/packages/opie-i18n/opie-i18n_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \ ${HANDHELDS_CVS};module=opie/etc/dict" diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.1.bb b/packages/opie-i18n/opie-lrelease-native_1.2.1.bb deleted file mode 100644 index 699a72256c..0000000000 --- a/packages/opie-i18n/opie-lrelease-native_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lrelease-native_1.2.2.bb b/packages/opie-i18n/opie-lrelease-native_1.2.2.bb new file mode 100644 index 0000000000..699a72256c --- /dev/null +++ b/packages/opie-i18n/opie-lrelease-native_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lrelease \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lrelease-native_cvs.bb b/packages/opie-i18n/opie-lrelease-native_cvs.bb index 6f52c45d74..be811dd010 100644 --- a/packages/opie-i18n/opie-lrelease-native_cvs.bb +++ b/packages/opie-i18n/opie-lrelease-native_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lrelease \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.1.bb b/packages/opie-i18n/opie-lupdate-native_1.2.1.bb deleted file mode 100644 index d4e7f18284..0000000000 --- a/packages/opie-i18n/opie-lupdate-native_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" - diff --git a/packages/opie-i18n/opie-lupdate-native_1.2.2.bb b/packages/opie-i18n/opie-lupdate-native_1.2.2.bb new file mode 100644 index 0000000000..d4e7f18284 --- /dev/null +++ b/packages/opie-i18n/opie-lupdate-native_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/opie-lupdate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/development/translation/shared" + diff --git a/packages/opie-i18n/opie-lupdate-native_cvs.bb b/packages/opie-i18n/opie-lupdate-native_cvs.bb index f7f9a79c25..2628d23224 100644 --- a/packages/opie-i18n/opie-lupdate-native_cvs.bb +++ b/packages/opie-i18n/opie-lupdate-native_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/development/translation/opie-lupdate \ ${HANDHELDS_CVS};module=opie/development/translation/shared" diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.1.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.1.bb deleted file mode 100644 index c541bc78ed..0000000000 --- a/packages/opie-icon-reload/opie-icon-reload_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - - - diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb new file mode 100644 index 0000000000..c541bc78ed --- /dev/null +++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb @@ -0,0 +1,4 @@ +include ${PN}.inc + + + diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb index 0ce2a6b704..a8fb137b9e 100644 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ b/packages/opie-icon-reload/opie-icon-reload_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc #Remove the dash below when 1.2.1 changes -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-irc/opie-irc_1.2.1.bb b/packages/opie-irc/opie-irc_1.2.1.bb deleted file mode 100644 index a186316b10..0000000000 --- a/packages/opie-irc/opie-irc_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-irc/opie-irc_1.2.2.bb b/packages/opie-irc/opie-irc_1.2.2.bb new file mode 100644 index 0000000000..a186316b10 --- /dev/null +++ b/packages/opie-irc/opie-irc_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb deleted file mode 100644 index 0dda1a3918..0000000000 --- a/packages/opie-irdaapplet/opie-irdaapplet_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb b/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb new file mode 100644 index 0000000000..2d05c1fbf4 --- /dev/null +++ b/packages/opie-irdaapplet/opie-irdaapplet_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/irdaapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/sounds \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index 836c6dfeef..4fde5d8591 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-jumpx/opie-jumpx_1.2.1.bb b/packages/opie-jumpx/opie-jumpx_1.2.1.bb deleted file mode 100644 index 24b86582c5..0000000000 --- a/packages/opie-jumpx/opie-jumpx_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-jumpx/opie-jumpx_1.2.2.bb b/packages/opie-jumpx/opie-jumpx_1.2.2.bb new file mode 100644 index 0000000000..24b86582c5 --- /dev/null +++ b/packages/opie-jumpx/opie-jumpx_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kbill/opie-kbill_1.2.1.bb b/packages/opie-kbill/opie-kbill_1.2.1.bb deleted file mode 100644 index 90f2a1c1b8..0000000000 --- a/packages/opie-kbill/opie-kbill_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-kbill/opie-kbill_1.2.2.bb b/packages/opie-kbill/opie-kbill_1.2.2.bb new file mode 100644 index 0000000000..90f2a1c1b8 --- /dev/null +++ b/packages/opie-kbill/opie-kbill_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kbill \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.1.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.1.bb deleted file mode 100644 index 868d99e868..0000000000 --- a/packages/opie-kcheckers/opie-kcheckers_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb new file mode 100644 index 0000000000..868d99e868 --- /dev/null +++ b/packages/opie-kcheckers/opie-kcheckers_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kcheckers \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-keyboard/opie-keyboard_1.2.1.bb b/packages/opie-keyboard/opie-keyboard_1.2.1.bb deleted file mode 100644 index ec608f70d9..0000000000 --- a/packages/opie-keyboard/opie-keyboard_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keyboard/opie-keyboard_1.2.2.bb b/packages/opie-keyboard/opie-keyboard_1.2.2.bb new file mode 100644 index 0000000000..ec608f70d9 --- /dev/null +++ b/packages/opie-keyboard/opie-keyboard_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/keyboard " diff --git a/packages/opie-keypebble/opie-keypebble_1.2.1.bb b/packages/opie-keypebble/opie-keypebble_1.2.1.bb deleted file mode 100644 index ec7979ea82..0000000000 --- a/packages/opie-keypebble/opie-keypebble_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-keypebble/opie-keypebble_1.2.2.bb b/packages/opie-keypebble/opie-keypebble_1.2.2.bb new file mode 100644 index 0000000000..ec7979ea82 --- /dev/null +++ b/packages/opie-keypebble/opie-keypebble_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/comm/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-keytabs/opie-keytabs_1.2.1.bb b/packages/opie-keytabs/opie-keytabs_1.2.1.bb deleted file mode 100644 index 71588448ee..0000000000 --- a/packages/opie-keytabs/opie-keytabs_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-keytabs/opie-keytabs_1.2.2.bb b/packages/opie-keytabs/opie-keytabs_1.2.2.bb new file mode 100644 index 0000000000..71588448ee --- /dev/null +++ b/packages/opie-keytabs/opie-keytabs_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/etc" diff --git a/packages/opie-keytabs/opie-keytabs_cvs.bb b/packages/opie-keytabs/opie-keytabs_cvs.bb index 51c58328ca..853405f2fd 100644 --- a/packages/opie-keytabs/opie-keytabs_cvs.bb +++ b/packages/opie-keytabs/opie-keytabs_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/etc" diff --git a/packages/opie-keyview/opie-keyview_1.2.1.bb b/packages/opie-keyview/opie-keyview_1.2.1.bb deleted file mode 100644 index f922d2f629..0000000000 --- a/packages/opie-keyview/opie-keyview_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview " diff --git a/packages/opie-keyview/opie-keyview_1.2.2.bb b/packages/opie-keyview/opie-keyview_1.2.2.bb new file mode 100644 index 0000000000..f922d2f629 --- /dev/null +++ b/packages/opie-keyview/opie-keyview_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/development/keyview " diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.1.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.1.bb deleted file mode 100644 index 6b29e8833d..0000000000 --- a/packages/opie-kjumpx/opie-kjumpx_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb new file mode 100644 index 0000000000..6b29e8833d --- /dev/null +++ b/packages/opie-kjumpx/opie-kjumpx_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kpacman/opie-kpacman_1.2.1.bb b/packages/opie-kpacman/opie-kpacman_1.2.1.bb deleted file mode 100644 index b8372fbbad..0000000000 --- a/packages/opie-kpacman/opie-kpacman_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-kpacman/opie-kpacman_1.2.2.bb b/packages/opie-kpacman/opie-kpacman_1.2.2.bb new file mode 100644 index 0000000000..b8372fbbad --- /dev/null +++ b/packages/opie-kpacman/opie-kpacman_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/kpacman \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-language/opie-language_1.2.1.bb b/packages/opie-language/opie-language_1.2.1.bb deleted file mode 100644 index 891999851d..0000000000 --- a/packages/opie-language/opie-language_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-language/opie-language_1.2.2.bb b/packages/opie-language/opie-language_1.2.2.bb new file mode 100644 index 0000000000..891999851d --- /dev/null +++ b/packages/opie-language/opie-language_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/language \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb deleted file mode 100644 index 4590f81108..0000000000 --- a/packages/opie-launcher-settings/opie-launcher-settings_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb b/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb new file mode 100644 index 0000000000..4590f81108 --- /dev/null +++ b/packages/opie-launcher-settings/opie-launcher-settings_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/launcher \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.1.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.1.bb deleted file mode 100644 index 884cce4a93..0000000000 --- a/packages/opie-libqrsync/opie-libqrsync_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync" diff --git a/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb new file mode 100644 index 0000000000..884cce4a93 --- /dev/null +++ b/packages/opie-libqrsync/opie-libqrsync_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/rsync" diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.1.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.1.bb deleted file mode 100644 index c881fdcf41..0000000000 --- a/packages/opie-light-and-power/opie-light-and-power_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb new file mode 100644 index 0000000000..c881fdcf41 --- /dev/null +++ b/packages/opie-light-and-power/opie-light-and-power_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/light-and-power \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb deleted file mode 100644 index add4ad4b4f..0000000000 --- a/packages/opie-lockapplet/opie-lockapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb b/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb new file mode 100644 index 0000000000..a903dbde2e --- /dev/null +++ b/packages/opie-lockapplet/opie-lockapplet_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/lockapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb index 4a67fc8558..d9dcb81fd0 100644 --- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb +++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/lockapplet \ ${HANDHELDS_CVS};module=opie/pics " diff --git a/packages/opie-login/opie-login_1.2.1.bb b/packages/opie-login/opie-login_1.2.1.bb deleted file mode 100644 index a8753f95ce..0000000000 --- a/packages/opie-login/opie-login_1.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ - file://opie-session \ - file://post-session \ - file://pre-session \ - file://opie-login.conf" diff --git a/packages/opie-login/opie-login_1.2.2.bb b/packages/opie-login/opie-login_1.2.2.bb new file mode 100644 index 0000000000..a8753f95ce --- /dev/null +++ b/packages/opie-login/opie-login_1.2.2.bb @@ -0,0 +1,11 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ + file://opie-session \ + file://post-session \ + file://pre-session \ + file://opie-login.conf" diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb deleted file mode 100644 index 0da3119e9d..0000000000 --- a/packages/opie-logoutapplet/opie-logoutapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb new file mode 100644 index 0000000000..0da3119e9d --- /dev/null +++ b/packages/opie-logoutapplet/opie-logoutapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/logoutapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mail/opie-mail_1.2.1.bb b/packages/opie-mail/opie-mail_1.2.1.bb deleted file mode 100644 index 9d322d38b7..0000000000 --- a/packages/opie-mail/opie-mail_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-mail/opie-mail_1.2.2.bb b/packages/opie-mail/opie-mail_1.2.2.bb new file mode 100644 index 0000000000..9d322d38b7 --- /dev/null +++ b/packages/opie-mail/opie-mail_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.1.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.1.bb deleted file mode 100644 index fdea7ee361..0000000000 --- a/packages/opie-mailapplet/opie-mailapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb new file mode 100644 index 0000000000..fdea7ee361 --- /dev/null +++ b/packages/opie-mailapplet/opie-mailapplet_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/mail/taskbarapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb deleted file mode 100644 index 44f420ce08..0000000000 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ - file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb new file mode 100644 index 0000000000..44f420ce08 --- /dev/null +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb deleted file mode 100644 index 47adefb1a8..0000000000 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb new file mode 100644 index 0000000000..47adefb1a8 --- /dev/null +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb deleted file mode 100644 index 3cbb3caba8..0000000000 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ - file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb new file mode 100644 index 0000000000..3cbb3caba8 --- /dev/null +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb deleted file mode 100644 index 47adefb1a8..0000000000 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb new file mode 100644 index 0000000000..47adefb1a8 --- /dev/null +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb deleted file mode 100644 index e6e8fa3762..0000000000 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" - -EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb new file mode 100644 index 0000000000..e6e8fa3762 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + +EXTRA_QMAKEVARS_POST += "HEADERS+=rssparser.h SOURCES+=rssparser.cpp" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb deleted file mode 100644 index 7707e9671a..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -PRIORITY = "optional" -LICENSE = "GPL" -MAINTAINER = "Team Opie " -APPNAME = "opieplayer2" -RPROVIDES="opie-mediaplayer2-skin" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png" - -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ -} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb new file mode 100644 index 0000000000..7707e9671a --- /dev/null +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Skin for opie-mediaplayer2" +SECTION = "opie/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie " +APPNAME = "opieplayer2" +RPROVIDES="opie-mediaplayer2-skin" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + +FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png" + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ +} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb index 387af9c0e8..81d4c9d7a9 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie " # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb deleted file mode 100644 index 43fe357625..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -PRIORITY = "optional" -LICENSE = "GPL" -MAINTAINER = "Team Opie " -APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png" - -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ -} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb new file mode 100644 index 0000000000..43fe357625 --- /dev/null +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Skin for opie-mediaplayer2" +SECTION = "opie/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie " +APPNAME = "opieplayer2" +RPROVIDES = "opie-mediaplayer2-skin" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + +FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png" + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ +} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb index 2e189417dc..60990e99f1 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie " # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb deleted file mode 100644 index f40e4ea658..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -PRIORITY = "optional" -LICENSE = "GPL" -MAINTAINER = "Team Opie " -APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png" - -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ -} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb new file mode 100644 index 0000000000..f40e4ea658 --- /dev/null +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Skin for opie-mediaplayer2" +SECTION = "opie/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie " +APPNAME = "opieplayer2" +RPROVIDES = "opie-mediaplayer2-skin" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + +FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png" + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ +} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb index 279eb2caff..170c26c42a 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie " # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb deleted file mode 100644 index bcff4f1702..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -PRIORITY = "optional" -LICENSE = "GPL" -MAINTAINER = "Team Opie " -APPNAME = "opieplayer2" -RPROVIDES = "opie-mediaplayer2-skin" - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png" - -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ -} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb new file mode 100644 index 0000000000..bcff4f1702 --- /dev/null +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Skin for opie-mediaplayer2" +SECTION = "opie/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Team Opie " +APPNAME = "opieplayer2" +RPROVIDES = "opie-mediaplayer2-skin" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + +FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png" + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ +} diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb index 17c3a030c5..27f4745d57 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" MAINTAINER = "Team Opie " # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" APPNAME = "opieplayer2" RPROVIDES = "opie-mediaplayer2-skin" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb deleted file mode 100644 index 41de8fc487..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb new file mode 100644 index 0000000000..1dcf37adae --- /dev/null +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 5d887b073f..19c16f8e10 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,8 +1,7 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" -PR = "r1" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-mediummount/opie-mediummount_1.2.1.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb deleted file mode 100644 index c80bbb032b..0000000000 --- a/packages/opie-mediummount/opie-mediummount_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r2" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps " diff --git a/packages/opie-mediummount/opie-mediummount_1.2.2.bb b/packages/opie-mediummount/opie-mediummount_1.2.2.bb new file mode 100644 index 0000000000..a4a432c193 --- /dev/null +++ b/packages/opie-mediummount/opie-mediummount_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps " diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb deleted file mode 100644 index 0947c45cc1..0000000000 --- a/packages/opie-memoryapplet/opie-memoryapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb new file mode 100644 index 0000000000..cb1d51f468 --- /dev/null +++ b/packages/opie-memoryapplet/opie-memoryapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/memoryapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb index e219cf59bb..f15720105b 100644 --- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/memoryapplet \ ${HANDHELDS_CVS};module=opie/noncore/settings/sysinfo \ diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb deleted file mode 100644 index 1955e77482..0000000000 --- a/packages/opie-mindbreaker/opie-mindbreaker_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb new file mode 100644 index 0000000000..1955e77482 --- /dev/null +++ b/packages/opie-mindbreaker/opie-mindbreaker_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/mindbreaker \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-minesweep/opie-minesweep_1.2.1.bb b/packages/opie-minesweep/opie-minesweep_1.2.1.bb deleted file mode 100644 index a88f61e387..0000000000 --- a/packages/opie-minesweep/opie-minesweep_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-minesweep/opie-minesweep_1.2.2.bb b/packages/opie-minesweep/opie-minesweep_1.2.2.bb new file mode 100644 index 0000000000..a88f61e387 --- /dev/null +++ b/packages/opie-minesweep/opie-minesweep_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/minesweep \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-multikey/opie-multikey_1.2.1.bb b/packages/opie-multikey/opie-multikey_1.2.1.bb deleted file mode 100644 index 307a92f100..0000000000 --- a/packages/opie-multikey/opie-multikey_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb new file mode 100644 index 0000000000..307a92f100 --- /dev/null +++ b/packages/opie-multikey/opie-multikey_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb deleted file mode 100644 index ee8694a02d..0000000000 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb new file mode 100644 index 0000000000..e287e321c8 --- /dev/null +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/multikeyapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb index be6a1ed2d6..fb7346513f 100644 --- a/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb +++ b/packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.1.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.1.bb deleted file mode 100644 index aae7d373b1..0000000000 --- a/packages/opie-networkapplet/opie-networkapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb new file mode 100644 index 0000000000..aae7d373b1 --- /dev/null +++ b/packages/opie-networkapplet/opie-networkapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-networksettings/opie-networksettings_1.2.1.bb b/packages/opie-networksettings/opie-networksettings_1.2.1.bb deleted file mode 100644 index e652b48e36..0000000000 --- a/packages/opie-networksettings/opie-networksettings_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/root" diff --git a/packages/opie-networksettings/opie-networksettings_1.2.2.bb b/packages/opie-networksettings/opie-networksettings_1.2.2.bb new file mode 100644 index 0000000000..e652b48e36 --- /dev/null +++ b/packages/opie-networksettings/opie-networksettings_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/root" diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.1.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.1.bb deleted file mode 100644 index b0b468ec69..0000000000 --- a/packages/opie-notesapplet/opie-notesapplet_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb new file mode 100644 index 0000000000..b0b468ec69 --- /dev/null +++ b/packages/opie-notesapplet/opie-notesapplet_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-odict/opie-odict_1.2.1.bb b/packages/opie-odict/opie-odict_1.2.1.bb deleted file mode 100644 index eb9b93180d..0000000000 --- a/packages/opie-odict/opie-odict_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-odict/opie-odict_1.2.2.bb b/packages/opie-odict/opie-odict_1.2.2.bb new file mode 100644 index 0000000000..eb9b93180d --- /dev/null +++ b/packages/opie-odict/opie-odict_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/odict \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-oxygen/opie-oxygen_1.2.1.bb b/packages/opie-oxygen/opie-oxygen_1.2.1.bb deleted file mode 100644 index da2e79c01d..0000000000 --- a/packages/opie-oxygen/opie-oxygen_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-oxygen/opie-oxygen_1.2.2.bb b/packages/opie-oxygen/opie-oxygen_1.2.2.bb new file mode 100644 index 0000000000..da2e79c01d --- /dev/null +++ b/packages/opie-oxygen/opie-oxygen_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.1.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.1.bb deleted file mode 100644 index 41e557f09f..0000000000 --- a/packages/opie-oyatzee/opie-oyatzee_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb new file mode 100644 index 0000000000..41e557f09f --- /dev/null +++ b/packages/opie-oyatzee/opie-oyatzee_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/oyatzee \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb deleted file mode 100644 index 66dfd0604d..0000000000 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb new file mode 100644 index 0000000000..4e032baf63 --- /dev/null +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" diff --git a/packages/opie-parashoot/opie-parashoot_1.2.1.bb b/packages/opie-parashoot/opie-parashoot_1.2.1.bb deleted file mode 100644 index 60816499b8..0000000000 --- a/packages/opie-parashoot/opie-parashoot_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-parashoot/opie-parashoot_1.2.2.bb b/packages/opie-parashoot/opie-parashoot_1.2.2.bb new file mode 100644 index 0000000000..60816499b8 --- /dev/null +++ b/packages/opie-parashoot/opie-parashoot_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/parashoot \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb deleted file mode 100644 index 570155a275..0000000000 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - file://activate-as-default.patch;patch=1" diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb new file mode 100644 index 0000000000..565cec4272 --- /dev/null +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + file://activate-as-default.patch;patch=1" diff --git a/packages/opie-pickboard/opie-pickboard_1.2.1.bb b/packages/opie-pickboard/opie-pickboard_1.2.1.bb deleted file mode 100644 index 9737c8d192..0000000000 --- a/packages/opie-pickboard/opie-pickboard_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pickboard/opie-pickboard_1.2.2.bb b/packages/opie-pickboard/opie-pickboard_1.2.2.bb new file mode 100644 index 0000000000..9737c8d192 --- /dev/null +++ b/packages/opie-pickboard/opie-pickboard_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/pickboard" diff --git a/packages/opie-pics/opie-pics_1.2.1.bb b/packages/opie-pics/opie-pics_1.2.1.bb deleted file mode 100644 index 95c945ffd0..0000000000 --- a/packages/opie-pics/opie-pics_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires" diff --git a/packages/opie-pics/opie-pics_1.2.2.bb b/packages/opie-pics/opie-pics_1.2.2.bb new file mode 100644 index 0000000000..95c945ffd0 --- /dev/null +++ b/packages/opie-pics/opie-pics_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics-hires" diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 55b3caf94d..7574464e02 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb deleted file mode 100644 index b1920c1290..0000000000 --- a/packages/opie-pimconverter/opie-pimconverter_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb b/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb new file mode 100644 index 0000000000..011d9bfdbd --- /dev/null +++ b/packages/opie-pimconverter/opie-pimconverter_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/pimconverter \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pimconverter/opie-pimconverter_cvs.bb b/packages/opie-pimconverter/opie-pimconverter_cvs.bb index 736ecca4aa..671a37401f 100644 --- a/packages/opie-pimconverter/opie-pimconverter_cvs.bb +++ b/packages/opie-pimconverter/opie-pimconverter_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/tools/pimconverter \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-powerchord/opie-powerchord_1.2.1.bb b/packages/opie-powerchord/opie-powerchord_1.2.1.bb deleted file mode 100644 index 81edc26a73..0000000000 --- a/packages/opie-powerchord/opie-powerchord_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-powerchord/opie-powerchord_1.2.2.bb b/packages/opie-powerchord/opie-powerchord_1.2.2.bb new file mode 100644 index 0000000000..81edc26a73 --- /dev/null +++ b/packages/opie-powerchord/opie-powerchord_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/powerchord \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb deleted file mode 100644 index 3e3dc6d919..0000000000 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb new file mode 100644 index 0000000000..247a163f67 --- /dev/null +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb index c0e9c777e5..dc7e3c78ef 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pyquicklaunch \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.1.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.1.bb deleted file mode 100644 index 19ed04a4ec..0000000000 --- a/packages/opie-qasteroids/opie-qasteroids_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb new file mode 100644 index 0000000000..19ed04a4ec --- /dev/null +++ b/packages/opie-qasteroids/opie-qasteroids_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/qasteroids \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-qcop/opie-qcop_1.2.1.bb b/packages/opie-qcop/opie-qcop_1.2.1.bb deleted file mode 100644 index bcde99c437..0000000000 --- a/packages/opie-qcop/opie-qcop_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop" diff --git a/packages/opie-qcop/opie-qcop_1.2.2.bb b/packages/opie-qcop/opie-qcop_1.2.2.bb new file mode 100644 index 0000000000..bcde99c437 --- /dev/null +++ b/packages/opie-qcop/opie-qcop_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qcop" diff --git a/packages/opie-qss/opie-qss_1.2.1.bb b/packages/opie-qss/opie-qss_1.2.1.bb deleted file mode 100644 index 1ef8cb4c29..0000000000 --- a/packages/opie-qss/opie-qss_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss" diff --git a/packages/opie-qss/opie-qss_1.2.2.bb b/packages/opie-qss/opie-qss_1.2.2.bb new file mode 100644 index 0000000000..1ef8cb4c29 --- /dev/null +++ b/packages/opie-qss/opie-qss_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/qss" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb deleted file mode 100644 index bda2b41f8d..0000000000 --- a/packages/opie-quicklauncher/opie-quicklauncher_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb new file mode 100644 index 0000000000..bda2b41f8d --- /dev/null +++ b/packages/opie-quicklauncher/opie-quicklauncher_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/tools/quicklauncher" diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.1.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.1.bb deleted file mode 100644 index 57991916f4..0000000000 --- a/packages/opie-rdesktop/opie-rdesktop_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb new file mode 100644 index 0000000000..57991916f4 --- /dev/null +++ b/packages/opie-rdesktop/opie-rdesktop_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opierdesktop \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-reader/opie-reader_1.2.1.bb b/packages/opie-reader/opie-reader_1.2.1.bb deleted file mode 100644 index 6765f70718..0000000000 --- a/packages/opie-reader/opie-reader_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-reader/opie-reader_1.2.2.bb b/packages/opie-reader/opie-reader_1.2.2.bb new file mode 100644 index 0000000000..6765f70718 --- /dev/null +++ b/packages/opie-reader/opie-reader_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-recorder/opie-recorder_1.2.1.bb b/packages/opie-recorder/opie-recorder_1.2.1.bb deleted file mode 100644 index 7bc13602bc..0000000000 --- a/packages/opie-recorder/opie-recorder_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-recorder/opie-recorder_1.2.2.bb b/packages/opie-recorder/opie-recorder_1.2.2.bb new file mode 100644 index 0000000000..7bc13602bc --- /dev/null +++ b/packages/opie-recorder/opie-recorder_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opierec \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-remote/opie-remote_1.2.1.bb b/packages/opie-remote/opie-remote_1.2.1.bb deleted file mode 100644 index a71e0657aa..0000000000 --- a/packages/opie-remote/opie-remote_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-remote/opie-remote_1.2.2.bb b/packages/opie-remote/opie-remote_1.2.2.bb new file mode 100644 index 0000000000..a71e0657aa --- /dev/null +++ b/packages/opie-remote/opie-remote_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/remote \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb b/packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb deleted file mode 100644 index d38fcba863..0000000000 --- a/packages/opie-restartapplet/opie-restartapplet2_1.2.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Restart Applet" -SECTION = "opie/applets" -PRIORITY = "optional" -MAINTAINER = "Team Opie " -LICENSE = "GPL" - -APPNAME = "restartapplet" - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" - -S = "${WORKDIR}/restartapplet2" - -inherit opie - -# FILES plugins/applets/librestartapplet.so* -do_install() { -} - diff --git a/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb new file mode 100644 index 0000000000..d38fcba863 --- /dev/null +++ b/packages/opie-restartapplet/opie-restartapplet2_1.2.2.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Restart Applet" +SECTION = "opie/applets" +PRIORITY = "optional" +MAINTAINER = "Team Opie " +LICENSE = "GPL" + +APPNAME = "restartapplet" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + +S = "${WORKDIR}/restartapplet2" + +inherit opie + +# FILES plugins/applets/librestartapplet.so* +do_install() { +} + diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.1.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.1.bb deleted file mode 100644 index c4473724bd..0000000000 --- a/packages/opie-restartapplet/opie-restartapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb new file mode 100644 index 0000000000..c4473724bd --- /dev/null +++ b/packages/opie-restartapplet/opie-restartapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb deleted file mode 100644 index f1bdf5299a..0000000000 --- a/packages/opie-restartapplet2/opie-restartapplet2_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb new file mode 100644 index 0000000000..f1bdf5299a --- /dev/null +++ b/packages/opie-restartapplet2/opie-restartapplet2_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb deleted file mode 100644 index 48674b9dce..0000000000 --- a/packages/opie-rotateapplet/opie-rotateapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb new file mode 100644 index 0000000000..48674b9dce --- /dev/null +++ b/packages/opie-rotateapplet/opie-rotateapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/rotateapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb deleted file mode 100644 index ccc414ef94..0000000000 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb new file mode 100644 index 0000000000..3df01b4a55 --- /dev/null +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/screenshotapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " diff --git a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb index d03726301c..e06983da74 100644 --- a/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb +++ b/packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/screenshotapplet \ ${HANDHELDS_CVS};module=opie/apps \ diff --git a/packages/opie-search/opie-search_1.2.1.bb b/packages/opie-search/opie-search_1.2.1.bb deleted file mode 100644 index f2682401f0..0000000000 --- a/packages/opie-search/opie-search_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-search/opie-search_1.2.2.bb b/packages/opie-search/opie-search_1.2.2.bb new file mode 100644 index 0000000000..f2682401f0 --- /dev/null +++ b/packages/opie-search/opie-search_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/osearch \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-security/opie-security_1.2.1.bb b/packages/opie-security/opie-security_1.2.1.bb deleted file mode 100644 index 7ebe6cf5a0..0000000000 --- a/packages/opie-security/opie-security_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-security/opie-security_1.2.2.bb b/packages/opie-security/opie-security_1.2.2.bb new file mode 100644 index 0000000000..ecdf14a187 --- /dev/null +++ b/packages/opie-security/opie-security_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/security \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 980b03b7c1..7f68f03cad 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ ${HANDHELDS_CVS};module=opie/pics \ diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb deleted file mode 100644 index 65de7b78ec..0000000000 --- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include opie-securityplugin-blueping.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " - diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb new file mode 100644 index 0000000000..65de7b78ec --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.2.bb @@ -0,0 +1,5 @@ +include opie-securityplugin-blueping.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " + diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb deleted file mode 100644 index 4a5bc3c2e0..0000000000 --- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include opie-securityplugin-dummy.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " - diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb new file mode 100644 index 0000000000..4a5bc3c2e0 --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.2.bb @@ -0,0 +1,5 @@ +include opie-securityplugin-dummy.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " + diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb deleted file mode 100644 index 08bd1b13c0..0000000000 --- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include opie-securityplugin-notice.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " - diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb new file mode 100644 index 0000000000..08bd1b13c0 --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.2.bb @@ -0,0 +1,5 @@ +include opie-securityplugin-notice.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics " + diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb deleted file mode 100644 index c5ccde6b5c..0000000000 --- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include opie-securityplugin-pin.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" - diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb new file mode 100644 index 0000000000..c5ccde6b5c --- /dev/null +++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.2.bb @@ -0,0 +1,5 @@ +include opie-securityplugin-pin.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" + diff --git a/packages/opie-sfcave/opie-sfcave_1.2.1.bb b/packages/opie-sfcave/opie-sfcave_1.2.1.bb deleted file mode 100644 index fda3aae425..0000000000 --- a/packages/opie-sfcave/opie-sfcave_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-sfcave/opie-sfcave_1.2.2.bb b/packages/opie-sfcave/opie-sfcave_1.2.2.bb new file mode 100644 index 0000000000..fda3aae425 --- /dev/null +++ b/packages/opie-sfcave/opie-sfcave_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/sfcave \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.1.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.1.bb deleted file mode 100644 index c541bc78ed..0000000000 --- a/packages/opie-sh-snes/opie-sh-snes_1.2.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include ${PN}.inc - - - diff --git a/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb new file mode 100644 index 0000000000..c541bc78ed --- /dev/null +++ b/packages/opie-sh-snes/opie-sh-snes_1.2.2.bb @@ -0,0 +1,4 @@ +include ${PN}.inc + + + diff --git a/packages/opie-sh-snes/opie-sh-snes_cvs.bb b/packages/opie-sh-snes/opie-sh-snes_cvs.bb index 0ce2a6b704..a8fb137b9e 100644 --- a/packages/opie-sh-snes/opie-sh-snes_cvs.bb +++ b/packages/opie-sh-snes/opie-sh-snes_cvs.bb @@ -1,5 +1,5 @@ include ${PN}.inc #Remove the dash below when 1.2.1 changes -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" diff --git a/packages/opie-sh/opie-sh_1.2.1.bb b/packages/opie-sh/opie-sh_1.2.1.bb deleted file mode 100644 index 69de686ed0..0000000000 --- a/packages/opie-sh/opie-sh_1.2.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -include ${PN}.inc - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/bin" diff --git a/packages/opie-sh/opie-sh_1.2.2.bb b/packages/opie-sh/opie-sh_1.2.2.bb new file mode 100644 index 0000000000..69de686ed0 --- /dev/null +++ b/packages/opie-sh/opie-sh_1.2.2.bb @@ -0,0 +1,9 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/bin" diff --git a/packages/opie-sheet/opie-sheet_1.2.1.bb b/packages/opie-sheet/opie-sheet_1.2.1.bb deleted file mode 100644 index a231ee9a90..0000000000 --- a/packages/opie-sheet/opie-sheet_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-sheet/opie-sheet_1.2.2.bb b/packages/opie-sheet/opie-sheet_1.2.2.bb new file mode 100644 index 0000000000..a231ee9a90 --- /dev/null +++ b/packages/opie-sheet/opie-sheet_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-sheet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-snake/opie-snake_1.2.1.bb b/packages/opie-snake/opie-snake_1.2.1.bb deleted file mode 100644 index 9bff0ac043..0000000000 --- a/packages/opie-snake/opie-snake_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-snake/opie-snake_1.2.2.bb b/packages/opie-snake/opie-snake_1.2.2.bb new file mode 100644 index 0000000000..9bff0ac043 --- /dev/null +++ b/packages/opie-snake/opie-snake_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/snake \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-solitaire/opie-solitaire_1.2.1.bb b/packages/opie-solitaire/opie-solitaire_1.2.1.bb deleted file mode 100644 index 5cd42c8d53..0000000000 --- a/packages/opie-solitaire/opie-solitaire_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-solitaire/opie-solitaire_1.2.2.bb b/packages/opie-solitaire/opie-solitaire_1.2.2.bb new file mode 100644 index 0000000000..5cd42c8d53 --- /dev/null +++ b/packages/opie-solitaire/opie-solitaire_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/solitaire \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-sounds/opie-sounds_1.2.1.bb b/packages/opie-sounds/opie-sounds_1.2.1.bb deleted file mode 100644 index 8053e4f26e..0000000000 --- a/packages/opie-sounds/opie-sounds_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/sounds" diff --git a/packages/opie-sounds/opie-sounds_1.2.2.bb b/packages/opie-sounds/opie-sounds_1.2.2.bb new file mode 100644 index 0000000000..8053e4f26e --- /dev/null +++ b/packages/opie-sounds/opie-sounds_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/sounds" diff --git a/packages/opie-sounds/opie-sounds_cvs.bb b/packages/opie-sounds/opie-sounds_cvs.bb index 63854616fa..f430ca0aee 100644 --- a/packages/opie-sounds/opie-sounds_cvs.bb +++ b/packages/opie-sounds/opie-sounds_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes in PV -PV = "1.2.1+cvs-${SRCDATE}" +PV = "1.2.2+cvs-${SRCDATE}" SRC_URI = "${HANDHELDS_CVS};module=opie/sounds" diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.1.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.1.bb deleted file mode 100644 index f04ccf5609..0000000000 --- a/packages/opie-sshkeys/opie-sshkeys_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb new file mode 100644 index 0000000000..f04ccf5609 --- /dev/null +++ b/packages/opie-sshkeys/opie-sshkeys_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sshkeys \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-stumbler/opie-stumbler_1.2.1.bb b/packages/opie-stumbler/opie-stumbler_1.2.1.bb deleted file mode 100644 index 93b3c1ff67..0000000000 --- a/packages/opie-stumbler/opie-stumbler_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opiestumbler \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://opiestumbler.png" diff --git a/packages/opie-stumbler/opie-stumbler_1.2.2.bb b/packages/opie-stumbler/opie-stumbler_1.2.2.bb new file mode 100644 index 0000000000..93b3c1ff67 --- /dev/null +++ b/packages/opie-stumbler/opie-stumbler_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opiestumbler \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://opiestumbler.png" diff --git a/packages/opie-style-flat/opie-style-flat_1.2.1.bb b/packages/opie-style-flat/opie-style-flat_1.2.1.bb deleted file mode 100644 index 5e55870851..0000000000 --- a/packages/opie-style-flat/opie-style-flat_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat " diff --git a/packages/opie-style-flat/opie-style-flat_1.2.2.bb b/packages/opie-style-flat/opie-style-flat_1.2.2.bb new file mode 100644 index 0000000000..5e55870851 --- /dev/null +++ b/packages/opie-style-flat/opie-style-flat_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/flat " diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.1.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.1.bb deleted file mode 100644 index 9e56bb2750..0000000000 --- a/packages/opie-style-fresh/opie-style-fresh_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh " diff --git a/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb new file mode 100644 index 0000000000..9e56bb2750 --- /dev/null +++ b/packages/opie-style-fresh/opie-style-fresh_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/fresh " diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.1.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.1.bb deleted file mode 100644 index fd1e93900f..0000000000 --- a/packages/opie-style-liquid/opie-style-liquid_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid " diff --git a/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb new file mode 100644 index 0000000000..fd1e93900f --- /dev/null +++ b/packages/opie-style-liquid/opie-style-liquid_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/liquid " diff --git a/packages/opie-style-metal/opie-style-metal_1.2.1.bb b/packages/opie-style-metal/opie-style-metal_1.2.1.bb deleted file mode 100644 index 014734d8b3..0000000000 --- a/packages/opie-style-metal/opie-style-metal_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal " diff --git a/packages/opie-style-metal/opie-style-metal_1.2.2.bb b/packages/opie-style-metal/opie-style-metal_1.2.2.bb new file mode 100644 index 0000000000..014734d8b3 --- /dev/null +++ b/packages/opie-style-metal/opie-style-metal_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/metal " diff --git a/packages/opie-style-phase/opie-style-phase_1.2.1.bb b/packages/opie-style-phase/opie-style-phase_1.2.1.bb deleted file mode 100644 index ee41eb027c..0000000000 --- a/packages/opie-style-phase/opie-style-phase_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase" diff --git a/packages/opie-style-phase/opie-style-phase_1.2.2.bb b/packages/opie-style-phase/opie-style-phase_1.2.2.bb new file mode 100644 index 0000000000..ee41eb027c --- /dev/null +++ b/packages/opie-style-phase/opie-style-phase_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/phase" diff --git a/packages/opie-style-web/opie-style-web_1.2.1.bb b/packages/opie-style-web/opie-style-web_1.2.1.bb deleted file mode 100644 index dda9db378c..0000000000 --- a/packages/opie-style-web/opie-style-web_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web" diff --git a/packages/opie-style-web/opie-style-web_1.2.2.bb b/packages/opie-style-web/opie-style-web_1.2.2.bb new file mode 100644 index 0000000000..dda9db378c --- /dev/null +++ b/packages/opie-style-web/opie-style-web_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/web" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb deleted file mode 100644 index e88f417b7c..0000000000 --- a/packages/opie-suspendapplet/opie-suspendapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb new file mode 100644 index 0000000000..e88f417b7c --- /dev/null +++ b/packages/opie-suspendapplet/opie-suspendapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/suspendapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-symlinker/opie-symlinker_1.2.1.bb b/packages/opie-symlinker/opie-symlinker_1.2.1.bb deleted file mode 100644 index 682493bafd..0000000000 --- a/packages/opie-symlinker/opie-symlinker_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker " diff --git a/packages/opie-symlinker/opie-symlinker_1.2.2.bb b/packages/opie-symlinker/opie-symlinker_1.2.2.bb new file mode 100644 index 0000000000..682493bafd --- /dev/null +++ b/packages/opie-symlinker/opie-symlinker_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/symlinker " diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.1.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.1.bb deleted file mode 100644 index 6aa27a6242..0000000000 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb new file mode 100644 index 0000000000..6aa27a6242 --- /dev/null +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share" diff --git a/packages/opie-systemtime/opie-systemtime_1.2.1.bb b/packages/opie-systemtime/opie-systemtime_1.2.1.bb deleted file mode 100644 index 97fa149a56..0000000000 --- a/packages/opie-systemtime/opie-systemtime_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-systemtime/opie-systemtime_1.2.2.bb b/packages/opie-systemtime/opie-systemtime_1.2.2.bb new file mode 100644 index 0000000000..97fa149a56 --- /dev/null +++ b/packages/opie-systemtime/opie-systemtime_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/netsystemtime \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.1.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.1.bb deleted file mode 100644 index 3d9158d616..0000000000 --- a/packages/opie-tableviewer/opie-tableviewer_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb new file mode 100644 index 0000000000..3d9158d616 --- /dev/null +++ b/packages/opie-tableviewer/opie-tableviewer_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tableviewer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb deleted file mode 100644 index 662db8ee93..0000000000 --- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -include ${PN}.inc -PR = "r4" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/root \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ - file://nomax.patch;patch=1;pnum=3 \ - file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb new file mode 100644 index 0000000000..440ddf6465 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -0,0 +1,18 @@ +include ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/root \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ + file://nomax.patch;patch=1;pnum=3 \ + file://server.pro \ + file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 69ee9ab7a6..63ce8c0d7f 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,5 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-tetrix/opie-tetrix_1.2.1.bb b/packages/opie-tetrix/opie-tetrix_1.2.1.bb deleted file mode 100644 index 25435cb30a..0000000000 --- a/packages/opie-tetrix/opie-tetrix_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tetrix/opie-tetrix_1.2.2.bb b/packages/opie-tetrix/opie-tetrix_1.2.2.bb new file mode 100644 index 0000000000..25435cb30a --- /dev/null +++ b/packages/opie-tetrix/opie-tetrix_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tetrix \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-textedit/opie-textedit_1.2.1.bb b/packages/opie-textedit/opie-textedit_1.2.1.bb deleted file mode 100644 index f2e144d3ca..0000000000 --- a/packages/opie-textedit/opie-textedit_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-textedit/opie-textedit_1.2.2.bb b/packages/opie-textedit/opie-textedit_1.2.2.bb new file mode 100644 index 0000000000..f2e144d3ca --- /dev/null +++ b/packages/opie-textedit/opie-textedit_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-theme/opie-theme_1.2.1.bb b/packages/opie-theme/opie-theme_1.2.1.bb deleted file mode 100644 index e79214dc88..0000000000 --- a/packages/opie-theme/opie-theme_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles " diff --git a/packages/opie-theme/opie-theme_1.2.2.bb b/packages/opie-theme/opie-theme_1.2.2.bb new file mode 100644 index 0000000000..e79214dc88 --- /dev/null +++ b/packages/opie-theme/opie-theme_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/styles/theme \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/plugins/styles " diff --git a/packages/opie-tictac/opie-tictac_1.2.1.bb b/packages/opie-tictac/opie-tictac_1.2.1.bb deleted file mode 100644 index e8c07ccf64..0000000000 --- a/packages/opie-tictac/opie-tictac_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tictac/opie-tictac_1.2.2.bb b/packages/opie-tictac/opie-tictac_1.2.2.bb new file mode 100644 index 0000000000..e8c07ccf64 --- /dev/null +++ b/packages/opie-tictac/opie-tictac_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/tictac \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tinykate/opie-tinykate_1.2.1.bb b/packages/opie-tinykate/opie-tinykate_1.2.1.bb deleted file mode 100644 index 70b03dfdd1..0000000000 --- a/packages/opie-tinykate/opie-tinykate_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb new file mode 100644 index 0000000000..70b03dfdd1 --- /dev/null +++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb deleted file mode 100644 index 5e3bc26ae3..0000000000 --- a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook " diff --git a/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb new file mode 100644 index 0000000000..5e3bc26ae3 --- /dev/null +++ b/packages/opie-today-addressbookplugin/opie-today-addressbookplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/addressbook " diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb deleted file mode 100644 index a52ba48ef4..0000000000 --- a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook " diff --git a/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb new file mode 100644 index 0000000000..a52ba48ef4 --- /dev/null +++ b/packages/opie-today-datebookplugin/opie-today-datebookplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/datebook " diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb deleted file mode 100644 index 90eec22eca..0000000000 --- a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune " diff --git a/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb new file mode 100644 index 0000000000..90eec22eca --- /dev/null +++ b/packages/opie-today-fortuneplugin/opie-today-fortuneplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/fortune " diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb deleted file mode 100644 index d9fa557397..0000000000 --- a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail " diff --git a/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb new file mode 100644 index 0000000000..d9fa557397 --- /dev/null +++ b/packages/opie-today-mailplugin/opie-today-mailplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/mail " diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb deleted file mode 100644 index b98d8170a6..0000000000 --- a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb new file mode 100644 index 0000000000..b98d8170a6 --- /dev/null +++ b/packages/opie-today-stocktickerplugin/opie-today-stocktickerplugin_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/stockticker \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb deleted file mode 100644 index 73bd121a45..0000000000 --- a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist " diff --git a/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb new file mode 100644 index 0000000000..73bd121a45 --- /dev/null +++ b/packages/opie-today-todolistplugin/opie-today-todolistplugin_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today/plugins/todolist " diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb deleted file mode 100644 index 6da83c79dc..0000000000 --- a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb new file mode 100644 index 0000000000..6da83c79dc --- /dev/null +++ b/packages/opie-today-weatherplugin/opie-today-weatherplugin_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/todayplugins/weather \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-today/opie-today_1.2.1.bb b/packages/opie-today/opie-today_1.2.1.bb deleted file mode 100644 index 6200f9e4e8..0000000000 --- a/packages/opie-today/opie-today_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-today/opie-today_1.2.2.bb b/packages/opie-today/opie-today_1.2.2.bb new file mode 100644 index 0000000000..6200f9e4e8 --- /dev/null +++ b/packages/opie-today/opie-today_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/today \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-todo/opie-todo_1.2.1.bb b/packages/opie-todo/opie-todo_1.2.1.bb deleted file mode 100644 index 21151ae14a..0000000000 --- a/packages/opie-todo/opie-todo_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-todo/opie-todo_1.2.2.bb b/packages/opie-todo/opie-todo_1.2.2.bb new file mode 100644 index 0000000000..21151ae14a --- /dev/null +++ b/packages/opie-todo/opie-todo_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/todo \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.1.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.1.bb deleted file mode 100644 index f24f4864d3..0000000000 --- a/packages/opie-tonleiter/opie-tonleiter_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb new file mode 100644 index 0000000000..f24f4864d3 --- /dev/null +++ b/packages/opie-tonleiter/opie-tonleiter_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/tonleiter \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb deleted file mode 100644 index d83f21559f..0000000000 --- a/packages/opie-unikeyboard/opie-unikeyboard_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb new file mode 100644 index 0000000000..d83f21559f --- /dev/null +++ b/packages/opie-unikeyboard/opie-unikeyboard_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/unikeyboard " diff --git a/packages/opie-usermanager/opie-usermanager_1.2.1.bb b/packages/opie-usermanager/opie-usermanager_1.2.1.bb deleted file mode 100644 index a37dc07e42..0000000000 --- a/packages/opie-usermanager/opie-usermanager_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-usermanager/opie-usermanager_1.2.2.bb b/packages/opie-usermanager/opie-usermanager_1.2.2.bb new file mode 100644 index 0000000000..a37dc07e42 --- /dev/null +++ b/packages/opie-usermanager/opie-usermanager_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/usermanager \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb deleted file mode 100644 index 0ae8478846..0000000000 --- a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb new file mode 100644 index 0000000000..0ae8478846 --- /dev/null +++ b/packages/opie-vmemo-settings/opie-vmemo-settings_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sound \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo/opie-vmemo_1.2.1.bb b/packages/opie-vmemo/opie-vmemo_1.2.1.bb deleted file mode 100644 index e7a2703c24..0000000000 --- a/packages/opie-vmemo/opie-vmemo_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vmemo/opie-vmemo_1.2.2.bb b/packages/opie-vmemo/opie-vmemo_1.2.2.bb new file mode 100644 index 0000000000..e7a2703c24 --- /dev/null +++ b/packages/opie-vmemo/opie-vmemo_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb deleted file mode 100644 index 38cf693d0e..0000000000 --- a/packages/opie-volumeapplet/opie-volumeapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb b/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb new file mode 100644 index 0000000000..112ad749ae --- /dev/null +++ b/packages/opie-volumeapplet/opie-volumeapplet_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/volumeapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb index 50e180dd8f..0d4c369198 100644 --- a/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb +++ b/packages/opie-volumeapplet/opie-volumeapplet_cvs.bb @@ -1,7 +1,6 @@ include ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/volumeapplet \ ${HANDHELDS_CVS};module=opie/apps" diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.1.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.1.bb deleted file mode 100644 index 44a61cccd1..0000000000 --- a/packages/opie-vtapplet/opie-vtapplet_1.2.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb new file mode 100644 index 0000000000..44a61cccd1 --- /dev/null +++ b/packages/opie-vtapplet/opie-vtapplet_1.2.2.bb @@ -0,0 +1,6 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vtapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb deleted file mode 100644 index 7dc43ad8d6..0000000000 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0916_wellenreiter-fontfix.patch;patch=1" diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb new file mode 100644 index 0000000000..8d06318bb5 --- /dev/null +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://0916_wellenreiter-fontfix.patch;patch=1" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb deleted file mode 100644 index b20c5f5f73..0000000000 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb new file mode 100644 index 0000000000..b20c5f5f73 --- /dev/null +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.2.bb @@ -0,0 +1,5 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/opie-wordgame/opie-wordgame_1.2.1.bb b/packages/opie-wordgame/opie-wordgame_1.2.1.bb deleted file mode 100644 index faf4d44ef8..0000000000 --- a/packages/opie-wordgame/opie-wordgame_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-wordgame/opie-wordgame_1.2.2.bb b/packages/opie-wordgame/opie-wordgame_1.2.2.bb new file mode 100644 index 0000000000..faf4d44ef8 --- /dev/null +++ b/packages/opie-wordgame/opie-wordgame_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/wordgame \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-write/opie-write_1.2.1.bb b/packages/opie-write/opie-write_1.2.1.bb deleted file mode 100644 index 8a4cc0ebc5..0000000000 --- a/packages/opie-write/opie-write_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-write/opie-write_1.2.2.bb b/packages/opie-write/opie-write_1.2.2.bb new file mode 100644 index 0000000000..8a4cc0ebc5 --- /dev/null +++ b/packages/opie-write/opie-write_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb deleted file mode 100644 index 95216c7570..0000000000 --- a/packages/opie-zkbapplet/opie-zkbapplet_1.2.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb new file mode 100644 index 0000000000..95216c7570 --- /dev/null +++ b/packages/opie-zkbapplet/opie-zkbapplet_1.2.2.bb @@ -0,0 +1,8 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/zkbapplet \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zlines/opie-zlines_1.2.1.bb b/packages/opie-zlines/opie-zlines_1.2.1.bb deleted file mode 100644 index 8a1ad20373..0000000000 --- a/packages/opie-zlines/opie-zlines_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zlines/opie-zlines_1.2.2.bb b/packages/opie-zlines/opie-zlines_1.2.2.bb new file mode 100644 index 0000000000..8a1ad20373 --- /dev/null +++ b/packages/opie-zlines/opie-zlines_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zlines \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zsafe/opie-zsafe_1.2.1.bb b/packages/opie-zsafe/opie-zsafe_1.2.1.bb deleted file mode 100644 index 7e2c2a020b..0000000000 --- a/packages/opie-zsafe/opie-zsafe_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zsafe/opie-zsafe_1.2.2.bb b/packages/opie-zsafe/opie-zsafe_1.2.2.bb new file mode 100644 index 0000000000..7e2c2a020b --- /dev/null +++ b/packages/opie-zsafe/opie-zsafe_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/zsafe \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zsame/opie-zsame_1.2.1.bb b/packages/opie-zsame/opie-zsame_1.2.1.bb deleted file mode 100644 index 0c4691b578..0000000000 --- a/packages/opie-zsame/opie-zsame_1.2.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -include ${PN}.inc - - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-zsame/opie-zsame_1.2.2.bb b/packages/opie-zsame/opie-zsame_1.2.2.bb new file mode 100644 index 0000000000..0c4691b578 --- /dev/null +++ b/packages/opie-zsame/opie-zsame_1.2.2.bb @@ -0,0 +1,7 @@ +include ${PN}.inc + + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/games/zsame \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 41bd48366810c868f1991a4baf0bedee90af58b0 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 2 Jul 2006 15:33:53 +0000 Subject: Opie: bump the CSV Opie version to 1.2.2+CSV, drop old backports --- classes/opie.bbclass | 2 +- .../opie-aboutapplet-1.2.1/.mtn2git_empty | 0 .../opie-aboutapplet-1.2.1/add-hrw-to-authors.patch | 18 ------------------ .../opie-aboutapplet-1.2.1/opie-1.2.1.patch | 18 ------------------ packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb | 4 +--- 5 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch delete mode 100644 packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 47f364a644..6430d46d6a 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -18,7 +18,7 @@ inherit palmtop # Note that when CVS changes to 1.2.2, the dash # should be removed from OPIE_CVS_PV to convert # to the standardised version format -OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}" +OPIE_CVS_PV = "1.2.2+cvs-${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch deleted file mode 100644 index 93a251ccac..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/add-hrw-to-authors.patch +++ /dev/null @@ -1,18 +0,0 @@ -Backport from CVS - -Index: widget.ui -=================================================================== -RCS file: /cvs/opie/core/applets/aboutapplet/widget.ui,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -u -r1.6 -r1.7 ---- aboutapplet/widget.ui 22 Apr 2005 13:01:47 -0000 1.6 -+++ aboutapplet/widget.ui 13 Nov 2005 14:40:31 -0000 1.7 -@@ -134,6 +134,7 @@ - <b>Holger 'Zecke' Freyther</b> (zecke@handhelds.org)<br/> - <b>Robert 'Sandman' Griebl</b> (sandman@handhelds.org)<br/> - <b>Alberto 'Skyhusker' Hierro</b> (skyhusker@handhelds.org)<br/> -+<b>Marcin 'Hrw' Juszkiewicz</b> (hrw@handhelds.org)<br/> - <b>Chris 'Kergoth' Larson</b> (kergoth@handhelds.org)<br/> - <b>Michael 'Mickey' Lauer</b> (mickeyl@handhelds.org)<br/> - <b>Lorn 'ljp' Potter</b> (ljp@handhelds.org)<br/> diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch deleted file mode 100644 index 31e66ced31..0000000000 --- a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -Backport from CVS - -Index: widget.ui -=================================================================== -RCS file: /cvs/opie/core/applets/aboutapplet/widget.ui,v -retrieving revision 1.7 -diff -u -u -r1.7 widget.ui ---- aboutapplet/widget.ui 13 Nov 2005 14:40:31 -0000 1.7 -+++ aboutapplet/widget.ui 22 Jan 2006 20:49:33 -0000 -@@ -42,7 +42,7 @@ - - - text -- <center><b>The Open Palmtop Integrated Environment V1.2</b></center> -+ <center><b>The Open Palmtop Integrated Environment V1.2.1</b></center> - - - diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb index 963728e20b..65cb96a6e1 100644 --- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb +++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.2.bb @@ -1,6 +1,4 @@ include ${PN}.inc -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet \ - file://opie-1.2.2.patch;patch=1 \ - file://add-hrw-to-authors.patch;patch=1" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet" -- cgit v1.2.3 From db3f9ad7c1fa0d1549de183b5f05e30b2f8dcb3c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 2 Jul 2006 15:38:11 +0000 Subject: packages/autoconf/autoconf-native: Do not RRECOMMEND automake-native For the native case do not ask BitBake to build automake-native, packages that need automake can DEPEND on it directly. This avoids circular depenendencies as autoconf-native would ask for automake-native and automake-native would ask for autoconf-native again. This 'fix' (I think it is proper) avoids build errors on broken debian systems. And making OpenEmbedded independant of the host once again. --- packages/autoconf/autoconf-native_2.59.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/autoconf/autoconf-native_2.59.bb b/packages/autoconf/autoconf-native_2.59.bb index 21a2002453..aac4b67ada 100644 --- a/packages/autoconf/autoconf-native_2.59.bb +++ b/packages/autoconf/autoconf-native_2.59.bb @@ -2,7 +2,7 @@ SECTION = "devel" include autoconf_${PV}.bb DEPENDS = "m4-native gnu-config-native" RDEPENDS_${PN} = "m4-native gnu-config-native" -RRECOMMENDS_${PN} = "automake-native" +RRECOMMENDS_${PN} = "" S = "${WORKDIR}/autoconf-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" -- cgit v1.2.3 From 54e07fc67c35d34921da893075e231d4b8062141 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 16:58:20 +0000 Subject: libqpe-opie 1.2.2 datebookmonth patch has been applied upstream --- .../libqpe/libqpe-opie/0905_datebookmonth.patch | 23 ---------------------- packages/libqpe/libqpe-opie_1.2.2.bb | 4 +--- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 packages/libqpe/libqpe-opie/0905_datebookmonth.patch diff --git a/packages/libqpe/libqpe-opie/0905_datebookmonth.patch b/packages/libqpe/libqpe-opie/0905_datebookmonth.patch deleted file mode 100644 index 7c4d5fb389..0000000000 --- a/packages/libqpe/libqpe-opie/0905_datebookmonth.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: datebookmonth.cpp -=================================================================== -RCS file: /cvs/opie/library/datebookmonth.cpp,v -retrieving revision 1.10 -diff -u -r1.10 datebookmonth.cpp ---- datebookmonth.cpp 20 Mar 2005 18:29:19 -0000 1.10 -+++ datebookmonth.cpp 5 Sep 2005 19:53:47 -0000 -@@ -661,7 +661,14 @@ - - // Finally, draw the number. - QFont f = p->font(); -- f.setPointSize( ( f.pointSize() / 3 ) * 2 ); -+ if(qApp->desktop()->width() >= 480) -+ { -+ f.setPointSize( f.pointSize() - 2 ); -+ } -+ else -+ { -+ f.setPointSize( ( f.pointSize() / 3 ) * 2 ); -+ } - p->setFont( f ); - QFontMetrics fm( f ); - p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); diff --git a/packages/libqpe/libqpe-opie_1.2.2.bb b/packages/libqpe/libqpe-opie_1.2.2.bb index 6cd4368187..00e5ca859a 100644 --- a/packages/libqpe/libqpe-opie_1.2.2.bb +++ b/packages/libqpe/libqpe-opie_1.2.2.bb @@ -1,8 +1,6 @@ include ${PN}.inc - + TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ - file://0905_datebookmonth.patch;patch=1;pnum=0 \ file://fix-titleheight.patch;patch=1" - -- cgit v1.2.3 From d97742caf19b3003e0da63cf8cf780d3cd6fda7e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 17:46:20 +0000 Subject: libopie2 1.2.2 remove openzaurus branding patch, has been applied upstream --- packages/libopie/libopie2-1.2.1/.mtn2git_empty | 0 packages/libopie/libopie2-1.2.1/openzaurus-branding.patch | 11 ----------- packages/libopie/libopie2_1.2.2.bb | 1 - 3 files changed, 12 deletions(-) delete mode 100644 packages/libopie/libopie2-1.2.1/.mtn2git_empty delete mode 100644 packages/libopie/libopie2-1.2.1/openzaurus-branding.patch diff --git a/packages/libopie/libopie2-1.2.1/.mtn2git_empty b/packages/libopie/libopie2-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libopie/libopie2-1.2.1/openzaurus-branding.patch b/packages/libopie/libopie2-1.2.1/openzaurus-branding.patch deleted file mode 100644 index 8b2a33ab82..0000000000 --- a/packages/libopie/libopie2-1.2.1/openzaurus-branding.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libopie2/opiecore/device/odevice.cpp.orig 2006-01-22 19:07:22.000000000 +0100 -+++ libopie2/opiecore/device/odevice.cpp 2006-01-22 19:07:24.000000000 +0100 -@@ -74,7 +74,7 @@ - /* STATIC and common implementation */ - /* EXPORT */ ODistribution distributions[] = { - { System_Familiar, "FamiliarLinux", "/etc/familiar-version" }, -- { System_OpenZaurus, "OpenZaurus", "/etc/oz_version" }, -+ { System_OpenZaurus, "OpenZaurus", "/etc/openzaurus-version" }, - { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" }, - { System_Unknown, "Linux", "/etc/issue" }, - }; diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index e48ae0c23e..3f21426e46 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -2,7 +2,6 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ - file://openzaurus-branding.patch;patch=1 \ file://include.pro" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 2a879a41ae068dbd9c2d43b355ff65e492b7be77 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 18:01:45 +0000 Subject: opie-button-settings 1.2.2 remove bugfix patch; has been applied upstream --- .../opie-button-settings-1.2.1/.mtn2git_empty | 0 .../opie-button-settings-1.2.1/1624-bugfix.patch | 25 ---------------------- .../opie-button-settings/opie-button-settings.inc | 2 +- .../opie-button-settings_1.2.2.bb | 3 +-- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty b/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch b/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch deleted file mode 100644 index 91a22bc976..0000000000 --- a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: button/buttonsettings.cpp -=================================================================== -RCS file: /cvs/opie/core/settings/button/buttonsettings.cpp,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -u -r1.13 -r1.14 ---- button/buttonsettings.cpp 24 Apr 2005 20:24:00 -0000 1.13 -+++ button/buttonsettings.cpp 12 Oct 2005 21:08:35 -0000 1.14 -@@ -37,7 +37,7 @@ - #include - #include - #include -- -+#include - - using namespace Opie::Core; - -@@ -157,6 +157,7 @@ - ButtonSettings::~ButtonSettings ( ) - { - QPEApplication::ungrabKeyboard ( ); -+ QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" ); - } - - void ButtonSettings::updateLabels ( ) diff --git a/packages/opie-button-settings/opie-button-settings.inc b/packages/opie-button-settings/opie-button-settings.inc index ec935e7112..733b7d9a5d 100644 --- a/packages/opie-button-settings/opie-button-settings.inc +++ b/packages/opie-button-settings/opie-button-settings.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Device-buttons settings dialog" +DESCRIPTION = "Opie device buttons settings dialog" SECTION = "opie/settings" PRIORITY = "optional" MAINTAINER = "Team Opie " diff --git a/packages/opie-button-settings/opie-button-settings_1.2.2.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb index 63b924ee36..576eba1dba 100644 --- a/packages/opie-button-settings/opie-button-settings_1.2.2.bb +++ b/packages/opie-button-settings/opie-button-settings_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1624-bugfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 538548f125d52702713a8f8fe25c57b321d25bfe Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 2 Jul 2006 19:23:08 +0000 Subject: fluxbox: Add fluxbox-gpe, a GPE session using the fluxbox windowmanager and toolbar. --- packages/fluxbox/.mtn2git_empty | 0 packages/fluxbox/fluxbox-gpe/.mtn2git_empty | 0 packages/fluxbox/fluxbox-gpe/apps.gpe | 13 +++ packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session | 30 +++++ packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session | 9 ++ packages/fluxbox/fluxbox-gpe/gpe-init.patch | 121 ++++++++++++++++++++ packages/fluxbox/fluxbox-gpe/style.gpe-default | 137 +++++++++++++++++++++++ packages/fluxbox/fluxbox-gpe_1.0rc.bb | 77 +++++++++++++ 8 files changed, 387 insertions(+) create mode 100644 packages/fluxbox/.mtn2git_empty create mode 100644 packages/fluxbox/fluxbox-gpe/.mtn2git_empty create mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe create mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session create mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session create mode 100644 packages/fluxbox/fluxbox-gpe/gpe-init.patch create mode 100644 packages/fluxbox/fluxbox-gpe/style.gpe-default create mode 100644 packages/fluxbox/fluxbox-gpe_1.0rc.bb diff --git a/packages/fluxbox/.mtn2git_empty b/packages/fluxbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty b/packages/fluxbox/fluxbox-gpe/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe new file mode 100644 index 0000000000..24d095f0fc --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/apps.gpe @@ -0,0 +1,13 @@ +[app] (title=Panel 0) + [Deco] {NONE} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] +[app] (title=rxvt) + [Dimensions] {635 440} +[end] +[app] (title=x-terminal-emulator) + [Dimensions] {635 440} +[end] + diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session new file mode 100644 index 0000000000..ca0afea35d --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Session script for fluxbox-gpe, heavily based on matchbox's session script +# + +# Install "apps" file with defaults for GPE usage +if test -e /usr/share/fluxbox/apps.gpe +then + mkdir -p $HOME/.fluxbox + test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/apps.gpe $HOME/.fluxbox/apps +fi + + +if [ -e $HOME/.fluxbox/session ] +then +exec $HOME/.fluxbox/session +fi + +if [ -e /usr/share/fluxbox/session ] +then +exec /usr/share/fluxbox/session +fi + +# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session +# dont exist. + +matchbox-desktop & +matchbox-panel --orientation south -no-flip & +sleep 5 +exec startfluxbox $@ diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session new file mode 100644 index 0000000000..16b7a2703a --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session @@ -0,0 +1,9 @@ +#!/bin/sh + +XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` + +matchbox-desktop & +matchbox-panel --orientation south --no-flip& +sleep 5 +exec startfluxbox $@ + diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox-gpe/gpe-init.patch new file mode 100644 index 0000000000..c9836923d8 --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/gpe-init.patch @@ -0,0 +1,121 @@ +--- fluxbox-1.0rc/data/init.in.orig 2006-07-02 20:45:39.119045500 +0200 ++++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200 +@@ -1,35 +1,95 @@ ++session.screen0.slit.onTop: False + session.screen0.slit.placement: BottomRight ++session.screen0.slit.alpha: 255 ++session.screen0.slit.onhead: 0 + session.screen0.slit.direction: Vertical +-session.screen0.slit.onTop: False +-session.screen0.slit.autoHide: False +-session.screen0.tab.placement: Top ++session.screen0.slit.layer: Dock ++session.screen0.slit.maxOver: false ++session.screen0.slit.autoHide: false ++session.screen0.menu.alpha: 255 ++session.screen0.iconbar.iconTextPadding: 10l ++session.screen0.iconbar.alignment: Left ++session.screen0.iconbar.wheelMode: Screen ++session.screen0.iconbar.mode: Workspace ++session.screen0.iconbar.deiconifyMode: Follow ++session.screen0.iconbar.iconWidth: 70 ++session.screen0.iconbar.usePixmap: true ++session.screen0.window.focus.alpha: 255 ++session.screen0.window.unfocus.alpha: 255 ++session.screen0.tab.height: 16 + session.screen0.tab.alignment: Left + session.screen0.tab.rotatevertical: True +-session.screen0.toolbar.onTop: False +-session.screen0.toolbar.autoHide: False +-session.screen0.toolbar.placement: BottomCenter +-session.screen0.toolbar.widthPercent: 66 +-session.screen0.workspaceNames: one,two,three,four ++session.screen0.tab.placement: TopLeft ++session.screen0.tab.width: 64 ++session.screen0.tabs.intitlebar: true ++session.screen0.titlebar.left: Stick ++session.screen0.titlebar.right: Minimize Maximize Close ++session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, clock ++session.screen0.toolbar.visible: true ++session.screen0.toolbar.layer: Top ++session.screen0.toolbar.placement: TopCenter ++session.screen0.toolbar.onhead: 0 ++session.screen0.toolbar.widthPercent: 69 ++session.screen0.toolbar.onTop: true ++session.screen0.toolbar.height: 0 ++session.screen0.toolbar.alpha: 254 ++session.screen0.toolbar.autoHide: false ++session.screen0.toolbar.maxOver: true ++session.screen0.overlay.lineWidth: 1 ++session.screen0.overlay.lineStyle: LineSolid ++session.screen0.overlay.joinStyle: JoinMiter ++session.screen0.overlay.capStyle: CapNotLast ++session.screen0.autoRaise: false + session.screen0.strftimeFormat: %k:%M +-session.screen0.focusNewWindows: True +-session.screen0.focusModel: ClickToFocus +-session.screen0.fullMaximization: False ++session.screen0.clickRaises: true ++session.screen0.imageDither: false ++session.screen0.workspaces: 4 ++session.screen0.menuDelay: 0 ++session.screen0.focusNewWindows: true ++session.screen0.workspaceNames: one,two,three,four, + session.screen0.edgeSnapThreshold: 0 ++session.screen0.menuDelayClose: 0 ++session.screen0.windowScrollReverse: false + session.screen0.rowPlacementDirection: LeftToRight +-session.screen0.workspaces: 4 +-session.screen0.focusLastWindow: True ++session.screen0.followModel: Ignore ++session.screen0.windowMenu: ++session.screen0.reversewheeling: false ++session.screen0.windowScrollAction: ++session.screen0.sloppywindowgrouping: true ++session.screen0.resizeMode: Bottom + session.screen0.colPlacementDirection: TopToBottom ++session.screen0.desktopwheeling: true ++session.screen0.tabFocusModel: ClickToTabFocus ++session.screen0.antialias: false ++session.screen0.focusLastWindow: true + session.screen0.windowPlacement: RowSmartPlacement +-session.screen0.tab.width: 64 +-session.screen0.tab.height: 16 +-session.screen0.showwindowposition: true +-session.opaqueMove: False +-session.autoRaiseDelay: 250 ++session.screen0.focusModel: ClickFocus ++session.screen0.opaqueMove: false ++session.screen0.workspacewarping: true ++session.screen0.menuMode: Delay ++session.screen0.decorateTransient: false ++session.screen0.showwindowposition: true ++session.screen0.rootCommand: ++session.screen0.fullMaximization: false ++session.focusTabMinWidth: 0 + session.menuFile: ~/.fluxbox/menu +-session.cacheLife: 5 +-session.styleFile: @default_style@ +-session.keyFile: ~/.fluxbox/keys ++session.imageDither: True + session.colorsPerChannel: 4 ++session.tabPadding: 0 ++session.styleFile: /usr/share/fluxbox/styles/gpe-default ++session.cacheMax: 200l ++session.autoRaiseDelay: 250 + session.doubleClickInterval: 250 +-session.cacheMax: 200 +-session.imageDither: True ++session.tabsAttachArea: Window ++session.numLayers: 13 ++session.keyFile: ~/.fluxbox/keys ++session.ignoreBorder: false ++session.appsFile: ~/.fluxbox/apps ++session.tabs: false ++session.useMod1: true ++session.slitlistFile: ~/.fluxbox/slitlist ++session.forcePseudoTransparency: false ++session.opaqueMove: False ++session.groupFile: ~/.fluxbox/groups ++session.cacheLife: 5l ++session.styleOverlay: ~/.fluxbox/overlay diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox-gpe/style.gpe-default new file mode 100644 index 0000000000..f94aaf7cdd --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/style.gpe-default @@ -0,0 +1,137 @@ +! meta +! (c) joel carlbark 2003 +! please dont turn on aa with this style +! make sure you have the font 'glisp' (or similar). + +toolbar: flat gradient vertical +toolbar.color: #849ec6 +toolbar.colorTo: #526d8c + +toolbar.button: parentrelative +toolbar.button.picColor: #d6d7e7 + +toolbar.button.pressed: sunken solid +toolbar.button.pressed.color: #526d8c +toolbar.button.pressed.picColor: #000000 + +! clock +toolbar.clock: parentrelative +toolbar.clock.textColor: white + +! shows workspace nr +toolbar.label: parentrelative +toolbar.label.textColor: white + +! current active window / toolbar +toolbar.windowLabel: parentrelative +toolbar.windowLabel.textColor: white + +! menu --------- +menu.title: flat gradient vertical +menu.title.color: #849ec6 +menu.title.colorTo: #526d8c +menu.title.textColor: #d6d7e7 + +menu.frame: flat gradient vertical +menu.frame.color: #efefef +menu.frame.colorTo: #c6c3c6 +menu.frame.textColor: black + +menu.hilite: flat solid +menu.hilite.color: #849ec6 +menu.hilite.textColor: white + +menu.bullet: triangle +menu.bullet.position: right + +! window -------------- +window.title.focus: flat gradient vertical +window.title.focus.color: #849ec6 +window.title.focus.colorTo: #526d8c + +window.label.focus: parentrelative +window.label.focus.textColor: white + +window.button.focus: flat gradient vertical +window.button.focus.color: #849ec6 +window.button.focus.colorTo: #526d8c +window.button.focus.picColor: #d6d7e7 + +window.button.pressed: sunken solid +window.button.pressed.color: #405060 +window.button.pressed.picColor: #000000 + +window.handle.focus: flat gradient vertical +window.handle.focus.color: #efefef +window.handle.focus.colorTo: #c6c3c6 + +window.grip.focus: flat gradient vertical +window.grip.focus.color: #efefef +window.grip.focus.colorTo: #c6c3c6 + +window.frame.focus: flat solid +window.frame.focus.color: white + +! unfocused +window.title.unfocus: flat gradient vertical +window.title.unfocus.color: #efefef +window.title.unfocus.colorTo: #c6c3c6 + +window.label.unfocus: parentrelative +window.label.unfocus.textColor: #949694 + +window.handle.unfocus: flat gradient vertical +window.handle.unfocus.color: #efefef +window.handle.unfocus.colorTo: #c6c3c6 + +window.grip.unfocus: flat gradient vertical +window.grip.unfocus.color: #efefef +window.grip.unfocus.colorTo: #c6c3c6 + +window.frame.unfocus: flat solid +window.frame.unfocus.color: white + +window.button.unfocus: flat gradient vertical +window.button.unfocus.color: #efefef +window.button.unfocus.colorTo: #c6c3c6 +window.button.unfocus.picColor: #949694 + +! tabs ------ +window.tab.justify: left + +window.tab.label.focus: flat gradient vertical +window.tab.label.focus.color: #849ec6 +window.tab.label.focus.colorTo: #526d8c +window.tab.label.focus.textColor: #d6d7e7 + +window.tab.label.unfocus: flat gradient vertical +window.tab.label.unfocus.color: #efefef +window.tab.label.unfocus.colorTo: #c6c3c6 +window.tab.label.unfocus.textColor: #949694 + +window.tab.borderWidth: 1 +window.tab.borderColor: #949694 +! ------- + +toolbar.justify: left +window.justify: center +menu.title.justify: center +menu.frame.justify: left + +borderColor: #000000 +borderWidth: 1 +bevelWidth: 1 +frameWidth: 1 +handleWidth: 4 + +background: flat +background.color: #d6d7e7 + +#*font: Vera-4 +#toolbar.font: Vera-4 + +toolbar*.font: Vera-6 +window.font: Vera-6 +menu.title.font: Vera-7 +menu.frame.font: Vera-7 + diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb new file mode 100644 index 0000000000..6becbe365d --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb @@ -0,0 +1,77 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) +# +# Filename: fluxbox-gpe_1.0rc.bb +# Date: 01-Jul-06 + +DESCRIPTION = "The Fluxbox WindowManager for use with GPE" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://fluxbox.sourceforge.net" +LICENSE = "MIT" +RCONFLICTS = "fluxbox" + +###################################################################################### + +PR = "r0" +S = "${WORKDIR}/fluxbox-${PV}" + +###################################################################################### + +SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ + file://gpe-init.patch;patch=1\ + file://apps.gpe \ + file://style.gpe-default \ + file://fluxbox-gpe-session \ + file://fluxbox-gpe.session" + +###################################################################################### + +PACKAGES = "${PN} ${PN}-styles" + +DESCRIPTION_${PN}-styles = "The default styles for fluxbox" + +###################################################################################### + +FILES_${PN} = "/usr/bin \ + /usr/share/fluxbox/init \ + /usr/share/fluxbox/keys \ + /usr/share/fluxbox/menu \ + /usr/share/fluxbox/apps.gpe \ + /usr/share/fluxbox/session \ + /usr/share/fluxbox/styles/gpe-default" + +FILES_${PN}-styles = "/usr/share/fluxbox/styles" + +###################################################################################### + +inherit autotools + +###################################################################################### + +EXTRA_OECONF = "--disable-xmb \ + " + +###################################################################################### + +do_install_append() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/fluxbox + install -d ${D}/usr/share/fluxbox/styles + + install -m 0644 ${WORKDIR}/apps.gpe ${D}/usr/share/fluxbox + install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session + install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default + install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin +} + +###################################################################################### + +pkg_postinst_${PN}() { + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 +} + +pkg_postrm_${PN}() { + update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session +} + -- cgit v1.2.3 From 286fabb636e8ea9eefefe16714ad0b08da5e7fce Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:27:31 +0000 Subject: opie-packagemanager 1.2.2 remove patch for recursive wget; applied upstream --- .../opie-packagemanager-1.2.1/.mtn2git_empty | 0 .../0114_opie-pm-recursive-verbose_wget.diff | 123 --------------------- .../opie-packagemanager_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty b/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff b/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff deleted file mode 100644 index 37b4b9bc13..0000000000 --- a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff +++ /dev/null @@ -1,123 +0,0 @@ -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v -retrieving revision 1.23 -diff -u -u -r1.23 oipkg.cpp ---- packagemanager/oipkg.cpp 5 Jun 2005 22:18:10 -0000 1.23 -+++ packagemanager/oipkg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -422,6 +422,8 @@ - m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); - // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); - m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); -+ m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); -+ m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); - m_ipkgArgs.verbosity = m_ipkgExecVerbosity; - if ( m_ipkgArgs.dest ) - free( m_ipkgArgs.dest ); -Index: oipkg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v -retrieving revision 1.8 -diff -u -u -r1.8 oipkg.h ---- packagemanager/oipkg.h 5 Jun 2005 22:18:10 -0000 1.8 -+++ packagemanager/oipkg.h 14 Jan 2006 12:10:24 -0000 -@@ -43,6 +43,8 @@ - #define FORCE_REMOVE 0x0002 - #define FORCE_REINSTALL 0x0004 - #define FORCE_OVERWRITE 0x0008 -+#define FORCE_RECURSIVE 0x0010 -+#define FORCE_VERBOSE_WGET 0x0020 - - class OConfItemList; - -Index: oipkgconfigdlg.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.cpp,v -retrieving revision 1.20 -diff -u -u -r1.20 oipkgconfigdlg.cpp ---- packagemanager/oipkgconfigdlg.cpp 5 Jun 2005 22:41:15 -0000 1.20 -+++ packagemanager/oipkgconfigdlg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -150,6 +150,10 @@ - options |= FORCE_REMOVE; - if ( m_optForceOverwrite->isChecked() ) - options |= FORCE_OVERWRITE; -+ if ( m_optForceRecursive->isChecked() ) -+ options |= FORCE_RECURSIVE; -+ if ( m_optVerboseWget->isChecked() ) -+ options |= FORCE_VERBOSE_WGET; - m_ipkg->setIpkgExecOptions( options ); - m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); - -@@ -336,9 +340,17 @@ - QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); - layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); - -+ m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); -+ QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); -+ -+ m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); -+ QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); -+ - QLabel *l = new QLabel( tr( "Information level:" ), container ); - QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); -- layout->addMultiCellWidget( l, 4, 4, 0, 1 ); -+ layout->addMultiCellWidget( l, 6, 6, 0, 1 ); - - m_optVerboseIpkg = new QComboBox( container ); - QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); -@@ -346,15 +358,15 @@ - m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); -- layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); -+ layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); - - l = new QLabel( tr( "Package source lists directory:" ), container ); - QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addMultiCellWidget( l, 6, 6, 0, 1 ); -+ layout->addMultiCellWidget( l, 8, 8, 0, 1 ); - - m_optSourceLists = new QLineEdit( container ); - QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addWidget( m_optSourceLists, 7, 0 ); -+ layout->addWidget( m_optSourceLists, 9, 0 ); - - QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), - QString::null, container ); -@@ -362,7 +374,7 @@ - btn->setMaximumWidth( btn->height() ); - QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); - connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); -- layout->addWidget( btn, 7, 1 ); -+ layout->addWidget( btn, 9, 1 ); - - layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - } -@@ -433,6 +445,10 @@ - m_optForceRemove->setChecked( true ); - if ( options & FORCE_OVERWRITE ) - m_optForceOverwrite->setChecked( true ); -+ if ( options & FORCE_RECURSIVE ) -+ m_optForceRecursive->setChecked( true ); -+ if ( options & FORCE_VERBOSE_WGET ) -+ m_optVerboseWget->setChecked( true ); - - m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); - } -Index: oipkgconfigdlg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.h,v -retrieving revision 1.10 -diff -u -u -r1.10 oipkgconfigdlg.h ---- packagemanager/oipkgconfigdlg.h 5 Jun 2005 22:18:10 -0000 1.10 -+++ packagemanager/oipkgconfigdlg.h 14 Jan 2006 12:10:24 -0000 -@@ -96,6 +96,8 @@ - QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox - QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox - QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox -+ QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox -+ QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox - QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection - QLineEdit *m_optSourceLists; // Ipkg source lists destination directory - diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb index 4e032baf63..385ca61fdb 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From c51f011f9aeb125346e597c260fe7dfeb71da98e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:36:04 +0000 Subject: opie-appearance 1.2.2 remove ui settings patch; patch applied upstream --- .../opie-appearance-1.2.1/.mtn2git_empty | 0 .../opie-appearance-1.2.1/add-ui-settings.patch | 86 ---------------------- packages/opie-appearance/opie-appearance_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch diff --git a/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty b/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch b/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch deleted file mode 100644 index 27fc32bac3..0000000000 --- a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: appearance.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.cpp,v -retrieving revision 1.35 -retrieving revision 1.37 -diff -u -r1.35 -r1.37 ---- appearance2/appearance.cpp 9 Jun 2005 20:47:58 -0000 1.35 -+++ appearance2/appearance.cpp 26 Oct 2005 15:36:04 -0000 1.37 -@@ -394,6 +394,39 @@ - m_rotdir_ccw-> setChecked ( rot == CCW ); - m_rotdir_flip-> setChecked ( rot == Flip ); - -+ QFrame *f2 = new QFrame ( tab ); -+ f2-> setFrameStyle ( QFrame::HLine | QFrame::Sunken ); -+ vertLayout-> addWidget ( f2 ); -+ vertLayout-> addSpacing ( 3 ); -+ -+ QHBoxLayout *bigIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label2 = new QLabel( tr( "Big Icon size:" ), tab ); -+ bigIconlay-> addWidget ( label2, 0, 0 ); -+ -+ m_bigIconSize = new QSpinBox(0, 128, 1, tab); -+ m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize", AppLnk::bigIconSize() )); -+ bigIconlay->addWidget( m_bigIconSize ); -+ label2->setBuddy( m_bigIconSize ); -+ QWhatsThis::add( label2, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ QWhatsThis::add( m_bigIconSize, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ -+ QHBoxLayout *smallIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label3 = new QLabel( tr( "Small Icon size:" ), tab ); -+ smallIconlay-> addWidget ( label3, 0, 0 ); -+ -+ m_smallIconSize = new QSpinBox(0, 128, 1, tab); -+ m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize", AppLnk::smallIconSize() )); -+ smallIconlay->addWidget( m_smallIconSize ); -+ label3->setBuddy( m_smallIconSize ); -+ QWhatsThis::add( label3, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ QWhatsThis::add( m_smallIconSize, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ -+ m_useBigPixmaps = new QCheckBox( tr("use Big Pixmaps"), tab); -+ m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps", qApp->desktop()->width() > 320 )); -+ vertLayout->addWidget( m_useBigPixmaps ); -+ QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps, you probably want to enable this option for devices with screen resolution greater than 240x320" ) ); - - /* - * add a spacing -@@ -513,6 +546,10 @@ - - config. writeEntry( "LeftHand", m_leftHand->isChecked() ); - -+ config. writeEntry( "useBigPixmaps", m_useBigPixmaps->isChecked() ); -+ config. writeEntry( "BigIconSize", m_bigIconSize->value() ); -+ config. writeEntry( "SmallIconSize", m_smallIconSize->value() ); -+ - config. write ( ); // need to flush the config info first - Global::applyStyle ( ); - -Index: appearance.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.h,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -r1.13 -r1.14 ---- appearance2/appearance.h 5 Jun 2005 22:47:00 -0000 1.13 -+++ appearance2/appearance.h 17 Oct 2005 13:28:10 -0000 1.14 -@@ -37,6 +37,7 @@ - #include - - #include -+#include - - using Opie::Ui::OFontSelector; - -@@ -123,6 +124,10 @@ - - QWidget * m_advtab; - QCheckBox *m_leftHand; -+ -+ QSpinBox *m_bigIconSize; -+ QSpinBox *m_smallIconSize; -+ QCheckBox *m_useBigPixmaps; - }; - - #endif diff --git a/packages/opie-appearance/opie-appearance_1.2.2.bb b/packages/opie-appearance/opie-appearance_1.2.2.bb index ee26b50ca6..7b154b7422 100644 --- a/packages/opie-appearance/opie-appearance_1.2.2.bb +++ b/packages/opie-appearance/opie-appearance_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://add-ui-settings.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From b464f87dffccc2a4b0d2fd501930dd1ba31ca98b Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sun, 2 Jul 2006 22:06:07 +0000 Subject: linux-jlime-arm_2.6.16.bb: Addition of new jlime-7xx kernel * Addition of jlime 7xx arm kernel, need of changes linux-jlime-sh3_2.6.16.20: Patch & new defconfig * Add of patch line * Change in defconfig file unexpected-int-fx.patch: Addition of patch * Removes "unexpected ide interrupt" spam --- conf/distro/jlime-donkey.conf | 2 +- packages/linux/linux-jlime-arm_2.6.17.bb | 31 ++++++++++++++++ .../linux-jlime-sh3-2.6.16.20/defconfig_jlime | 41 ++++++++++++++-------- .../unexpected-int-fix.patch | 17 +++++++++ packages/linux/linux-jlime-sh3_2.6.16.20.bb | 3 +- 5 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 packages/linux/linux-jlime-arm_2.6.17.bb create mode 100644 packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index a103ddaf7c..89a10705ca 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,7 +78,7 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.2" +OPIE_VERSION = "1.2.3" include conf/distro/preferred-opie-versions.inc #<> diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb new file mode 100644 index 0000000000..c6d9ba8877 --- /dev/null +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -0,0 +1,31 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" +LICENSE = "GPL" +PR = "r0" + +COMPATIBLE_HOST = "sh.*-linux" +COMPATIBLE_MACHINE = 'jornada6xx' + +SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ + file://defconfig_jlime \ + file://unexpected-int-fix.patch;patch=1" + +S = "${WORKDIR}/linux-${PV}" + +inherit kernel + +#Lets let 3.4.x handle the compilation of this one +KERNEL_CCSUFFIX = "-3.4.4" + +ARCH = "sh" +KERNEL_IMAGETYPE = "zImage" +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig_jlime ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE) +} diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime index 452b8d8210..8479d714c3 100644 --- a/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-sh -# Thu Jun 8 03:45:30 2006 +# Sun Jul 2 00:14:05 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -432,7 +432,7 @@ CONFIG_IEEE80211_CRYPT_WEP=m # # Generic Driver Options # -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -614,12 +614,12 @@ CONFIG_ATMEL=m # CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m -# CONFIG_AIRO_CS is not set +CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y @@ -858,7 +858,7 @@ CONFIG_FONT_PEARL_8x8=y # # Sound # -CONFIG_SOUND=y +CONFIG_SOUND=m # # Advanced Linux Sound Architecture @@ -868,11 +868,11 @@ CONFIG_SOUND=y # # Open Sound System # -CONFIG_SOUND_PRIME=y +CONFIG_SOUND_PRIME=m # CONFIG_OBSOLETE_OSS_DRIVER is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set -CONFIG_SOUND_SH_DAC_AUDIO=y +CONFIG_SOUND_SH_DAC_AUDIO=m CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1 # @@ -913,10 +913,7 @@ CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set @@ -979,9 +976,25 @@ CONFIG_RAMFS=y # # Network File Systems # -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set -# CONFIG_SMB_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch new file mode 100644 index 0000000000..72801acf8e --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch @@ -0,0 +1,17 @@ +--- linux-2.6.16.20/drivers/ide/ide-io.c_orig 2006-07-01 23:54:34.000000000 +0000 ++++ linux-2.6.16.20/drivers/ide/ide-io.c 2006-07-01 23:55:50.000000000 +0000 +@@ -1442,10 +1442,10 @@ + ++count; + if (time_after(jiffies, last_msgtime + HZ)) { + last_msgtime = jiffies; +- printk(KERN_ERR "%s%s: unexpected interrupt, " +- "status=0x%02x, count=%ld\n", +- hwif->name, +- (hwif->next==hwgroup->hwif) ? "" : "(?)", stat, count); ++ //printk(KERN_ERR "%s%s: unexpected interrupt, " ++ // "status=0x%02x, count=%ld\n", ++ // hwif->name, ++ // (hwif->next==hwgroup->hwif) ? "" : "(?)", stat, count); + } + } + } diff --git a/packages/linux/linux-jlime-sh3_2.6.16.20.bb b/packages/linux/linux-jlime-sh3_2.6.16.20.bb index ef5db85812..c6d9ba8877 100644 --- a/packages/linux/linux-jlime-sh3_2.6.16.20.bb +++ b/packages/linux/linux-jlime-sh3_2.6.16.20.bb @@ -7,7 +7,8 @@ COMPATIBLE_HOST = "sh.*-linux" COMPATIBLE_MACHINE = 'jornada6xx' SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ - file://defconfig_jlime" + file://defconfig_jlime \ + file://unexpected-int-fix.patch;patch=1" S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 4263f08d566c572c252e994f650bc2a554342127 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:39:32 +0000 Subject: opie-pcmciaapplet 1.2.2 remove activate-as-default; patch has been applied upstream --- .../opie-pcmciaapplet-1.2.1/.mtn2git_empty | 0 .../activate-as-default.patch | 42 ---------------------- .../opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch deleted file mode 100644 index 4ec24ebaf8..0000000000 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch +++ /dev/null @@ -1,42 +0,0 @@ -Backported from CVS - -Index: noncore/applets/pcmcia/configdialogbase.ui -=================================================================== -RCS file: /cvs/opie/noncore/applets/pcmcia/configdialogbase.ui,v -retrieving revision 1.6 -diff -u -u -r1.6 configdialogbase.ui ---- pcmcia/configdialogbase.ui 20 Jun 2005 12:46:33 -0000 1.6 -+++ pcmcia/configdialogbase.ui 15 Nov 2005 21:37:22 -0000 -@@ -288,13 +288,13 @@ - - - text -- suspend -+ activate - - - - - text -- activate -+ suspend - - - -@@ -319,13 +319,13 @@ - - - text -- suspend -+ activate - - - - - text -- activate -+ suspend - - - - diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb index 565cec4272..ff6f2a337a 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb @@ -2,5 +2,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - file://activate-as-default.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" -- cgit v1.2.3 From 7dfc337831690d310ebe78bf0b767ba8dd83d06d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:48:31 +0000 Subject: qte all-versions enable threads in mt-static variants --- packages/qte/qte-mt-static_2.3.10.bb | 4 ++-- packages/qte/qte-mt-static_2.3.12.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index a71b2af103..e7256f7b1d 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,7 +1,7 @@ require qte-common_${PV}.inc -PR = "r3" +PR = "r4" -EXTRA_OECONF += "-static" +EXTRA_OECONF += "-static -thread" do_stage() { rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index 7cc0b3fdc0..4ed9458991 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -1,7 +1,7 @@ require qte-common_${PV}.inc -PR = "r2" +PR = "r3" -EXTRA_OECONF += "-static" +EXTRA_OECONF += "-static -thread" do_stage() { rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 -- cgit v1.2.3 From eaa94a9c8ad9a688958f8a5f050833226aa4d964 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 21:04:48 +0000 Subject: opie-backup 1.2.2 remove bugfix; patch has been applied upstream --- packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty | 0 packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch | 16 ---------------- packages/opie-backup/opie-backup_1.2.2.bb | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch diff --git a/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty b/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch b/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch deleted file mode 100644 index 3a8bd7280d..0000000000 --- a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: backup/backuprestore.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/backup/backuprestore.cpp,v -retrieving revision 1.42 -retrieving revision 1.43 -diff -u -u -r1.42 -r1.43 ---- backup/backuprestore.cpp 9 Jun 2005 21:04:56 -0000 1.42 -+++ backup/backuprestore.cpp 16 Oct 2005 19:00:43 -0000 1.43 -@@ -102,6 +102,7 @@ - scanForApplicationSettings(); - refreshLocations(); - refreshBackupLocations(); -+ sourceDirChanged(restoreSource->currentItem()); - - // Read the list of items to ignore. - QList dontBackupList; diff --git a/packages/opie-backup/opie-backup_1.2.2.bb b/packages/opie-backup/opie-backup_1.2.2.bb index 3004eeae34..597fc577b8 100644 --- a/packages/opie-backup/opie-backup_1.2.2.bb +++ b/packages/opie-backup/opie-backup_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1492-bugfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From c2fd5f3f9f19914fc7a1e41ffdc9935f54022b49 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 21:11:53 +0000 Subject: opie-console 1.2.2 remove bug fixes that have been applied upstream --- .../opie-console/opie-console-1.2.1/.mtn2git_empty | 0 .../0117_opie-console-use-default-fixed.diff | 25 ---- .../opie-console-1.2.1/1647-bugfix.patch | 40 ------ .../opie-console-1.2.1/1686-bugfix.patch | 146 --------------------- packages/opie-console/opie-console_1.2.2.bb | 5 +- 5 files changed, 1 insertion(+), 215 deletions(-) delete mode 100644 packages/opie-console/opie-console-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff delete mode 100644 packages/opie-console/opie-console-1.2.1/1647-bugfix.patch delete mode 100644 packages/opie-console/opie-console-1.2.1/1686-bugfix.patch diff --git a/packages/opie-console/opie-console-1.2.1/.mtn2git_empty b/packages/opie-console/opie-console-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff deleted file mode 100644 index e871e8e1e4..0000000000 --- a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: terminalwidget.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v -retrieving revision 1.12 -diff -u -u -r1.12 terminalwidget.cpp ---- opie-console/terminalwidget.cpp 16 Oct 2004 21:06:28 -0000 1.12 -+++ opie-console/terminalwidget.cpp 17 Jan 2006 10:00:13 -0000 -@@ -1,4 +1,5 @@ - #include "terminalwidget.h" -+#include - - /* QT */ - #include -@@ -151,8 +152,10 @@ - break; - }; - -+ Config qpecfg("qpe"); -+ qpecfg.setGroup("Appearance"); - -- m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") ); -+ m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") ); - - // switch( fontsize ) { - // case Profile::Micro: diff --git a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch deleted file mode 100644 index c4603333cf..0000000000 --- a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: opie-console/TEWidget.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/TEWidget.cpp,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -u -r1.13 -r1.14 ---- opie-console/TEWidget.cpp 21 Jan 2005 19:56:17 -0000 1.13 -+++ opie-console/TEWidget.cpp 18 Oct 2005 13:56:12 -0000 1.14 -@@ -320,16 +320,21 @@ - - Config cfg("Konsole"); - cfg.setGroup("ScrollBar"); -- switch( cfg.readNumEntry("Position",2)){ -- case 0: -- scrollLoc = SCRNONE; -- break; -- case 1: -- scrollLoc = SCRLEFT; -- break; -- case 2: -- scrollLoc = SCRRIGHT; -- break; -+ -+ scrollLoc = cfg.readNumEntry("Position", -1); -+ -+ // bugfix for #1647 -+ // if user set 'show scrollbar on left' then let it be on left -+ // but only if it is not set in opie-console itself -+ if(scrollLoc == -1) -+ { -+ Config qpecfg ("qpe"); -+ qpecfg.setGroup("Appearance"); -+ scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT); -+ if(scrollLoc == 0) // user set LeftHand in past and switched it off later -+ { -+ scrollLoc = SCRRIGHT; -+ } - }; - - blinkT = new QTimer(this); diff --git a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch deleted file mode 100644 index f615581b32..0000000000 --- a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch +++ /dev/null @@ -1,146 +0,0 @@ -Index: emulation_handler.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.cpp,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -u -r1.25 -r1.26 ---- opie-console/emulation_handler.cpp 11 Jun 2005 12:22:32 -0000 1.25 -+++ opie-console/emulation_handler.cpp 12 Oct 2005 21:05:47 -0000 1.26 -@@ -250,3 +250,6 @@ - m_teWid->setWrapAt(columns); - } - -+void EmulationHandler::setScrollbarLocation(int index) { -+ m_teWid->setScrollbarLocation(index); -+} -Index: emulation_handler.h -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.h,v -retrieving revision 1.8 -retrieving revision 1.9 -diff -u -u -r1.8 -r1.9 ---- opie-console/emulation_handler.h 8 Oct 2004 20:03:40 -0000 1.8 -+++ opie-console/emulation_handler.h 12 Oct 2005 21:05:47 -0000 1.9 -@@ -83,6 +83,7 @@ - - /* Propagate change to widget */ - void setWrap(int columns); -+ void setScrollbarLocation(int index); - signals: - void send( const QByteArray& ); - void changeSize(int rows, int cols ); -Index: mainwindow.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.cpp,v -retrieving revision 1.94 -retrieving revision 1.95 -diff -u -u -r1.94 -r1.95 ---- opie-console/mainwindow.cpp 16 May 2005 18:56:02 -0000 1.94 -+++ opie-console/mainwindow.cpp 12 Oct 2005 21:05:47 -0000 1.95 -@@ -69,6 +69,7 @@ - m_scripts = new QPopupMenu( this ); - m_sessionsPop= new QPopupMenu( this ); - m_scriptsPop = new QPopupMenu( this ); -+ m_scrollbar = new QPopupMenu( this ); - - /* add a toolbar for icons */ - m_icons = new QToolBar(this); -@@ -164,6 +165,17 @@ - connect( m_fullscreen, SIGNAL( activated() ), - this, SLOT( slotFullscreen() ) ); - -+ /* -+ * scrollbar -+ */ -+ sm_none = m_scrollbar->insertItem(tr( "None" )); -+ sm_left = m_scrollbar->insertItem(tr( "Left" )); -+ sm_right = m_scrollbar->insertItem(tr( "Right" )); -+ -+ m_console->insertItem(tr("Scrollbar"), m_scrollbar, -1, 0); -+ connect( m_scrollbar, SIGNAL(activated(int)), -+ this, SLOT(slotScrollbarSelected(int))); -+ - m_console->insertSeparator(); - - m_recordLog = new QAction(); -@@ -693,6 +705,35 @@ - m_isFullscreen = !m_isFullscreen; - } - -+void MainWindow::slotScrollbarSelected(int index) -+{ -+ int loc; -+ -+ Config cfg( "Konsole" ); -+ cfg.setGroup("ScrollBar"); -+ if(index == sm_none) -+ { -+ loc = 0; -+ } -+ else if(index == sm_left) -+ { -+ loc = 1; -+ } -+ else if(index == sm_right) -+ { -+ loc = 2; -+ } -+ -+ cfg.writeEntry("Position", loc); -+ -+ if (currentSession()) { -+ currentSession()->emulationHandler()->setScrollbarLocation(loc); -+ } -+ -+ m_scrollbar->setItemChecked(sm_none, index == sm_none); -+ m_scrollbar->setItemChecked(sm_left, index == sm_left); -+ m_scrollbar->setItemChecked(sm_right, index == sm_right); -+} - - void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) { - -Index: mainwindow.h -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.h,v -retrieving revision 1.29 -retrieving revision 1.30 -diff -u -u -r1.29 -r1.30 ---- opie-console/mainwindow.h 8 Oct 2004 20:03:40 -0000 1.29 -+++ opie-console/mainwindow.h 12 Oct 2005 21:05:47 -0000 1.30 -@@ -24,6 +24,7 @@ - class FKey; - class DocLnk; - -+ - class MainWindow : public QMainWindow { - Q_OBJECT - public: -@@ -75,6 +76,7 @@ - void slotKeyReceived(FKey, ushort, ushort, bool); - void slotSaveHistory(); - void slotSaveLog(); -+ void slotScrollbarSelected(int); - - /* what could these both slot do? */ - void slotCopy(); -@@ -105,6 +107,12 @@ - MetaFactory* m_factory; - ProfileManager* m_manager; - -+ /* -+ * scrollbar -+ */ -+ -+ int sm_none, sm_left, sm_right; -+ - TabWidget* m_consoleWindow; - QToolBar* m_tool; - QToolBar* m_icons; -@@ -115,6 +123,7 @@ - QPopupMenu* m_sessionsPop; - QPopupMenu* m_scriptsPop; - QPopupMenu* m_scripts; -+ QPopupMenu* m_scrollbar; - QAction* m_connect; - QAction* m_disconnect; - QAction* m_quickLaunch; diff --git a/packages/opie-console/opie-console_1.2.2.bb b/packages/opie-console/opie-console_1.2.2.bb index 5dbdba0790..795e3fcb11 100644 --- a/packages/opie-console/opie-console_1.2.2.bb +++ b/packages/opie-console/opie-console_1.2.2.bb @@ -3,7 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1686-bugfix.patch;patch=1 \ - file://1647-bugfix.patch;patch=1 \ - file://0117_opie-console-use-default-fixed.diff;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 410863206ae912187e07c48f31d4398881c97233 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 22:21:03 +0000 Subject: opie-wellenreiter 1.2.2 remove upstream patch --- packages/opie-wellenreiter/files/.mtn2git_empty | 0 .../files/0916_wellenreiter-fontfix.patch | 43 ---------------------- .../opie-wellenreiter/opie-wellenreiter_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 packages/opie-wellenreiter/files/.mtn2git_empty delete mode 100644 packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/opie-wellenreiter/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch deleted file mode 100644 index b85d46cb08..0000000000 --- a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch +++ /dev/null @@ -1,43 +0,0 @@ - -This patch is backport from OPIE CVS. -Submitted upstream by Marcin Juszkiewicz -Date: 2005-09-16 - -Index: packetview.cpp -=================================================================== -RCS file: /cvs/opie/noncore/net/wellenreiter/gui/packetview.cpp,v -retrieving revision 1.9 -diff -u -r1.9 packetview.cpp ---- wellenreiter/gui/packetview.cpp 24 Aug 2004 11:53:44 -0000 1.9 -+++ wellenreiter/gui/packetview.cpp 16 Sep 2005 17:41:03 -0000 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /* QT */ - #include -@@ -38,6 +39,9 @@ - PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) - :QFrame( parent, name, f ) - { -+ Config c( "qpe" ); -+ c.setGroup( "Appearance" ); -+ - _number = new QSpinBox( this ); - _number->setPrefix( "Pkt# " ); - _label = new QLabel( this ); -@@ -47,11 +51,10 @@ - _list->setColumnAlignment( 0, Qt::AlignCenter ); - _list->setColumnAlignment( 1, Qt::AlignLeft ); - _list->setAllColumnsShowFocus( true ); -- _list->setFont( QFont( "Fixed", 8 ) ); - - _hex = new QTextView( this ); - _hex->setMargin( 0 ); -- _hex->setFont( QFont( "Fixed", 8 ) ); -+ _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) ); - - QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); - QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb index 8d06318bb5..b2e3975f7a 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0916_wellenreiter-fontfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 085c69220f3ab2f01fb840407815e56523544c8f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 2 Jul 2006 23:12:43 +0000 Subject: fluxbox: Add more geometry defaults for gpe apps --- packages/fluxbox/fluxbox-gpe/apps.gpe | 50 ++++++++++++++++++++++++++++++++--- packages/fluxbox/fluxbox-gpe_1.0rc.bb | 2 +- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe index 24d095f0fc..7aca442752 100644 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe +++ b/packages/fluxbox/fluxbox-gpe/apps.gpe @@ -1,5 +1,6 @@ [app] (title=Panel 0) [Deco] {NONE} + [Sticky] {yes} [end] [app] (title=Panel 1) [Deco] {NONE} @@ -8,6 +9,49 @@ [Dimensions] {635 440} [end] [app] (title=x-terminal-emulator) - [Dimensions] {635 440} -[end] - + [Dimensions] {635 440} +[end] +[app] (abiword) + [Dimensions] {635 440} + [Sticky] {no} +[end] +[app] (gpe-filemanager) + [Dimensions] {635 440} + [Sticky] {yes} +[end] +[app] (gpe-info) + [Dimensions] {424 336} +[end] +[app] (gpe-edit) + [Dimensions] {635 440} +[end] +[app] (gpe-calculator) + [Dimensions] {266 321} +[end] +[app] (main) + [Dimensions] {635 440} +[end] +[app] (Gnumeric) + [Dimensions] {635 440} +[end] +[app] (gpdf) + [Dimensions] {635 440} +[end] +[app] (main_window) + [Dimensions] {635 440} +[end] +[app] (gaim) + [Dimensions] {635 440} +[end] +[app] (gpe-calendar) + [Dimensions] {380 343} +[end] +[app] (gpe-mini-browser) + [Dimensions] {635 440} +[end] +[app] (figment) + [Dimensions] {635 440} +[end] +[app] (gpe-sketchbook) + [Dimensions] {471 314} +[end] diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb index 6becbe365d..50c5d6ce1d 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb @@ -13,7 +13,7 @@ RCONFLICTS = "fluxbox" ###################################################################################### -PR = "r0" +PR = "r1" S = "${WORKDIR}/fluxbox-${PV}" ###################################################################################### -- cgit v1.2.3 From 41877a64eb6d2e3ad8722ea89eb8eaa424a73516 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 3 Jul 2006 00:45:47 +0000 Subject: packages/linux/linux-jlime-arm-2.6.17/* : Addition of patches for HP 7xx * Addition of patches to make the vanilla kernel know of the HP Jornada 7xx. Patches kept seperate because development is ongoing. Should work resonable though and should get incorperated into the mainline tree within 1-2 versions. packages/linux/linux-jlime-arm_2.6.17.bb: Changes to reflect updates * Addition of patches to file and also removal of all sh leftovers. --- .../linux/linux-jlime-arm-2.6.17/.mtn2git_empty | 0 .../AsmArm-ArchSa1100-Jornada720.patch | 40 +++ .../Cpu-Sa1110-Jornada720.patch | 32 ++ .../Kconfig-Arch-Jornada720.patch | 11 + .../Kconfig-Keyboard-Jornada720.patch | 13 + .../Kconfig-Touchscreen-Jornada720.patch | 14 + .../Kconfig-Video-Jornada720.patch | 20 ++ .../Mach-Sa1100-Jornada720.patch | 153 +++++++++ .../Makefile-Keyboard-Jornada720.patch | 8 + .../Makefile-Touchscreen-Jornada720.patch | 7 + .../Makefile-Video-Jornada720.patch | 10 + .../Newfile-Epson1356fb.patch | 344 +++++++++++++++++++++ .../Newfile-Jornada720_kbd.patch | 100 ++++++ .../Newfile-Jornada720_ts.patch | 106 +++++++ packages/linux/linux-jlime-arm_2.6.17.bb | 24 +- 15 files changed, 876 insertions(+), 6 deletions(-) create mode 100644 packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty create mode 100644 packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch diff --git a/packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty b/packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch new file mode 100644 index 0000000000..a1bc077242 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch @@ -0,0 +1,40 @@ +--- linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h_orig 2006-07-02 23:42:42.000000000 +0000 ++++ linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h 2006-07-02 23:50:32.000000000 +0000 +@@ -19,9 +19,37 @@ + #define GPIO_JORNADA720_KEYBOARD_IRQ IRQ_GPIO0 + #define GPIO_JORNADA720_MOUSE_IRQ IRQ_GPIO9 + ++/* Epson 1356 LCD controll parameters */ ++#define REGISTER_OFFSET ((unsigned char *) 0xf00000000) ++#define DISP_MEM_OFFSET ((unsigned char *) 0xf10000000) ++#define DISP_MEM_OFFSET_PHYS ((unsigned char *) 0x482000000) ++ ++#define MAX_BPP 16 ++#define MAX_XRES 640 ++#define MAX_YRES 240 ++#define MIN_XRES 64 ++#define MIN_YRES 64 ++ ++/* MCU COMMANDS */ ++#define MCU_GetBatteryData 0xc0 ++#define MCU_GetScanKeyCode 0x90 ++#define MCU_GetTouchSamples 0xa0 ++#define MCU_GetContrast 0xD0 ++#define MCU_SetContrast 0xD1 ++#define MCU_GetBrightness 0xD2 ++#define MCU_SetBrightness 0xD3 ++#define MCU_ContrastOff 0xD8 ++#define MCU_BrightnessOff 0xD9 ++#define MCU_PWMOFF 0xDF ++#define MCU_TxDummy 0x11 ++#define MCU_ErrorCode 0x00 ++ + #ifndef __ASSEMBLY__ + + void jornada720_mcu_init(void); ++int jornada720_mcu_byte(int arg_data); ++int jornada720_mcu_start(int arg_data); ++voide jornada720_mcu_end(void); + void jornada_contrast(int arg_contrast); + void jornada720_battery(void); + int jornada720_getkey(unsigned char *data, int size); diff --git a/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch new file mode 100644 index 0000000000..c957971629 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch @@ -0,0 +1,32 @@ +--- linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c_orig 2006-07-02 20:44:56.000000000 +0000 ++++ linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c 2006-07-02 20:50:11.000000000 +0000 +@@ -70,6 +70,17 @@ + .cas_latency = 3, + }; + ++static struct sdram_params samsung_k4s281632b_1h __initdata = { ++ .rows = 12, ++ .tck = 10, ++ .trcd = 20, ++ .trp = 20, ++ .twr = 10, ++ .refresh = 64000, ++ .cas_latency = 3, ++ }; ++ ++ + static struct sdram_params samsung_k4s641632d_tc75 __initdata = { + .rows = 14, + .tck = 9, +@@ -349,6 +360,11 @@ + if (machine_is_h3100()) + sdram = &samsung_km416s4030ct; + ++ #if 0 ++ if (machine_is_jornada720()) ++ sdram = &samsung_k4s281632b_1h; ++ #endif ++ + if (sdram) { + printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d" + " twr: %d refresh: %d cas_latency: %d\n", diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch new file mode 100644 index 0000000000..61784c4040 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch @@ -0,0 +1,11 @@ +--- linux-2.6.17/arch/arm/Kconfig_orig 2006-07-02 20:41:49.000000000 +0000 ++++ linux-2.6.17/arch/arm/Kconfig 2006-07-02 20:42:57.000000000 +0000 +@@ -669,7 +669,7 @@ + + config CPU_FREQ_SA1110 + bool +- depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3) ++ depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3 || SA1100_JORNADA720) + default y + + config CPU_FREQ_INTEGRATOR diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch new file mode 100644 index 0000000000..a66aec2e98 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch @@ -0,0 +1,13 @@ +--- linux-2.6.17/drivers/input/keyboard/Kconfig_orig 2006-07-02 23:14:40.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Kconfig 2006-07-02 23:16:12.000000000 +0000 +@@ -183,4 +183,10 @@ + This driver implements support for HIL-keyboards attached + to your machine, so normally you should say Y here. + ++config KEYBOARD_JORNADA720 ++ tristate "HP Jornada 720 Keyboard Support" ++ depends on SA110_JORNADA720 ++ default y ++ help ++ Say yes here if you want Jornada 720 keyboard support. + endif diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch new file mode 100644 index 0000000000..9b7fac44d5 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch @@ -0,0 +1,14 @@ +--- linux-2.6.17/drivers/input/touchscreen/Kconfig_orig 2006-07-02 23:31:00.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/Kconfig 2006-07-02 23:32:53.000000000 +0000 +@@ -108,4 +108,11 @@ + To compile this driver as a module, choose M here: the + module will be called hp680_ts_input. + ++config TOUCHSCREEN_JORNADA720 ++ tristate "HP Jornada 720 touchscreen support" ++ depends on SA1100_JORNADA720 ++ help ++ Say Y here if you are using a HP Jornada 710/720/728 handheld ++ and want to user the touchscreen. ++ + endif diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch new file mode 100644 index 0000000000..aafcb90ecc --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch @@ -0,0 +1,20 @@ +--- linux-2.6.17/drivers/video/Kconfig_orig 2006-07-02 23:34:29.000000000 +0000 ++++ linux-2.6.17/drivers/video/Kconfig 2006-07-02 23:38:36.000000000 +0000 +@@ -613,6 +613,17 @@ + framebuffer. Product specs at + . + ++config FB_EPSON1356 ++ bool "Epson 1356 framebuffer support" ++ depends on FB && ARM && SA1100_JORNADA720 ++ select FB_CFB_FILLRECT ++ select FB_CFB_COPYAREA ++ select FB_CFB_IMAGEBLIT ++ select FB_SOFT_CURSOR ++ help ++ Support for the 1356 framebuffer device on the HP Jornada ++ 710/720/728 hanheld pc. ++ + config FB_S1D13XXX + tristate "Epson S1D13XXX framebuffer support" + depends on FB diff --git a/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch new file mode 100644 index 0000000000..cbbb98f2bb --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch @@ -0,0 +1,153 @@ +--- linux-2.6.17/arch/arm/mach-sa1100/jornada720.c_orig 2006-07-02 20:54:55.000000000 +0000 ++++ linux-2.6.17/arch/arm/mach-sa1100/jornada720.c 2006-07-02 23:12:58.000000000 +0000 +@@ -22,11 +22,139 @@ + #include + #include + ++#include ++#include ++#include + #include "generic.h" + + + #define JORTUCR_VAL 0x20000400 + ++/* Jornada 720 MCU functions */ ++#define MCU_REVERSE(i) ((unsigned char)(((0x80 & i) >> 7) | ((0x40 & i) >> 5) \ ++ | ((0x20 & i) >> 3) | ((0x10 & i) >> 1) | ((0x08 & i) << 1) \ ++ | ((0x04 & i) << 3) | ((0x02 & i) << 5) | ((0x01 & i) << 7))) ++ ++void jornada720_init_ser(void) ++{ ++ int i; ++ ++ GPSR = GPIO_GPIO25; ++ Ser4SSCR0 = 0x0307; ++ Ser4MCCR0 = 0; ++ Ser4SSCR1 = 0x18; ++ Ser4SSCR0 = 0x0387; ++ while (Ser4SSSR & SSSR_RNE) ++ i = Ser4SSDR; ++} ++ ++int jornada720_mcu_byte(int arg_data) ++{ ++ int i; ++ ++ while ((Ser4SSSR & SSSR_TNF) == 0); ++ i = 0; ++ while ((GPLR & 0x400) && i++ < 400000); ++ /* wait for MCU */ ++ ++ if (i >= 400000) { ++ printk("jornada 720_mcu_byte: timed out\n"); ++ return -1; ++ } ++ Ser4SSDR = MCU_rEVERSE(arg_data) << 8; ++ udelay(100); ++ while ((Ser4SSSR & SSSR_RNE) == 0); ++ i = Ser4SSDR; ++ if (i > 0xff) ++ printk("jornada720 mcu_byte: read %x\n". i): ++ return MCU_REVERSE(i & 0xff) & 0xff; ++} ++ ++int jornada720_mcu_start(int arg_data) ++{ ++ int i; ++ ++ GPCR = GPIO_GPIO25; /* clear -> enable */ ++ udelay(100); ++ i = jornada720_mcu_byte(arg_data); ++ if (i != MCU_TxDummy) ++ { ++ printk("jornada720_mcu_start: sent %x got %x\n", arg_data, i); ++ for (i = 0; i < 256; i++) ++ if (jornada720_mcu_read() == -1) ++ break; ++ ++ jornada720_init_ser(); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++void jornada720_mcu_end(void) ++{ ++ udelay(100); ++ GPSR = GPIO_GPIO25; /* set */ ++} ++ ++void jornada720_mcu_init(void) ++{ ++ ++ int i; ++ ++ if (state) { ++ PPSR &= ~PPC_LDD1; ++ PPDR &= PPC_LDD1; ++ } ++ else { ++ PPSR |= PPC_LDD1; ++ } ++ return 0; ++} ++ ++static int jornada720_backlight_get_power(struct backlight_device *bd) ++{ ++ ++ return ~(PPSR&PPC_LDD1); ++} ++ ++static int jornada720_backlight_get_brightness(struct backlight_device *bd) ++{ ++ int brightness; ++ jornada720_mcu_start(MCU_GetBrightness); ++ brightness = jornada720_mcu_read(); ++ jornada720_mcu_end(); ++ return brightness; ++} ++ ++static int jornada720_backlight_set_brightness(struct backlight_device *bd) ++{ ++ int brightness = 255 - value; ++ jornada720_mcu_start(MCU_SetBrightness); ++ jornada720_mcu_byte(brightness); ++ jornada720_mcu_end(); ++ return 0; ++} ++ ++static struct backlight_properties jornada720_backlight_properties = { ++ .owner = THIS_MODULE, ++ .set_power = jornada720_backlight_set_power, ++ .get_power = jornada720_backlight_get_power, ++ .get_brightness = jornada720_backlight_get_brightness, ++ .set_brightness = jornada720_backlight_set_brightness, ++ .max_brightness = 255, ++} ++ ++static struct lcd_properties jornada 720_lcd_properties = { ++ .owner = THIS_MODULE, ++ .set_power = jornada720_lcd_set_power, ++ .get_power = jornada720_lcd_get_power, ++ .set_contrast = jornada720_lcd_set_contrast, ++ .get_contrast = jornada720_lcd_set_contrast, ++ .max_contrast = 255, ++} ++ + static struct resource sa1111_resources[] = { + [0] = { + .start = 0x40000000, +@@ -77,6 +205,10 @@ + PPDR |= PPC_LDD3 | PPC_LDD4; + + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); ++ ++ jornada720_mcu_init(); ++ backlight_device_register("e1356fb", 0, &jornada720_backlight_properties); ++ ldc_device_register("e1356fb", 0, &jornada720_lcd_properties); + } + return ret; + } diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch new file mode 100644 index 0000000000..b1e2ab10e7 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch @@ -0,0 +1,8 @@ +--- linux-2.6.17/drivers/input/keyboard/Makefile_orig 2006-07-02 23:22:40.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Makefile 2006-07-02 23:23:03.000000000 +0000 +@@ -15,4 +15,4 @@ + obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o + obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o + obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o +- ++obj-$(CONFIG_KEYBOARD_JORNADA720) += jornada720_kbd.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch new file mode 100644 index 0000000000..deabd5cded --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch @@ -0,0 +1,7 @@ +--- linux-2.6.17/drivers/input/touchscreen/Makefile_orig 2006-07-02 23:28:02.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/Makefile 2006-07-02 23:29:42.000000000 +0000 +@@ -12,3 +12,4 @@ + obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o + obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o + obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o ++obj-$(CONFIG_TOUCHSCREEN_JORNADA720) += jornada720_ts.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch new file mode 100644 index 0000000000..ae53cce9f3 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch @@ -0,0 +1,10 @@ +--- linux-2.6.17/drivers/video/Makefile_orig 2006-07-02 23:39:37.000000000 +0000 ++++ linux-2.6.17/drivers/video/Makefile 2006-07-02 23:40:15.000000000 +0000 +@@ -75,6 +75,7 @@ + obj-$(CONFIG_FB_SUN3) += sun3fb.o + obj-$(CONFIG_FB_HIT) += hitfb.o + obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o ++obj-$(CONFIG_FB_EPSON1356) += epson1356fb.o + obj-$(CONFIG_FB_PVR2) += pvr2fb.o + obj-$(CONFIG_FB_VOODOO1) += sstfb.o + obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch new file mode 100644 index 0000000000..7516f06dc9 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch @@ -0,0 +1,344 @@ +--- linux-2.6.17/drivers/video/epson1356fb.c_orig 2006-07-03 00:20:43.000000000 +0000 ++++ linux-2.6.17/drivers/video/epson1356fb.c 2006-07-03 00:16:37.000000000 +0000 +@@ -0,0 +1,341 @@ ++/* ++ * linux/drivers/video/epson1356fb.c -- Epson 1356 LCD Controller Frame Buffer Device ++ * ++ * Copyright (C) 2001 MIT ++ * ++ * Edited from sa1100fb.c ++ * Copyright (C) 1999 Eric A. Thomas ++ * Based on acornfb.c Copyright (C) Russell King. ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive ++ * for more details. ++ * ++ * 20050203: Ported to kernel 2.6. Very basic interface for the Jornada 720 (C) Alex Lange (chicken@handhelds.org) ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++u32 pseudo_pal[16]; ++ ++struct fb_info fb_info; ++ ++static int e1356fb_setcolreg(unsigned regno, unsigned red, unsigned green, ++ unsigned blue, unsigned transp, ++ struct fb_info *fb_info) ++{ ++ int bpp, m = 0; ++ ++ bpp = fb_info->var.bits_per_pixel; ++ m = (bpp <= 8) ? (1 << bpp) : 256; ++ if (regno >= m) { ++ printk("regno %d out of range (max %d)\n", regno, m); ++ return -EINVAL; ++ } ++ switch (bpp) { ++ case 8: ++ break; ++ case 16: ++ /* RGB 565 */ ++ pseudo_pal[regno] = ((red & 0xF800) | ++ ((green & 0xFC00) >> 5) | ++ ((blue & 0xF800) >> 11)); ++ break; ++ } ++ ++ return 0; ++} ++ ++static int e1356fb_blank(int blank, struct fb_info *info) ++{ ++ switch (blank) { ++ case FB_BLANK_POWERDOWN: ++ case FB_BLANK_VSYNC_SUSPEND: ++ case FB_BLANK_HSYNC_SUSPEND: ++ case FB_BLANK_NORMAL: ++ PPSR &= ~PPC_LDD1; ++ PPDR |= PPC_LDD1; ++ break; ++ ++ case FB_BLANK_UNBLANK: ++ PPSR |= PPC_LDD1; ++ mdelay(100); ++ } ++ return 0; ++} ++ ++static struct fb_var_screeninfo e1356fb_screeninfo = { ++ .xres = 640, ++ .yres = 240, ++ .xres_virtual = 640, ++ .yres_virtual = 240, ++ .bits_per_pixel = 16, ++ .red.length = 5, ++ .green.length = 6, ++ .blue.length = 5, ++ .transp.length = 0, ++ .red.offset = 11, ++ .green.offset = 5, ++ .blue.offset = 0, ++ .transp.offset = 0, ++ .activate = FB_ACTIVATE_NOW, ++ .height = -1, ++ .width = -1, ++ .vmode = FB_VMODE_NONINTERLACED, ++ .accel_flags = 0, ++ .nonstd = 0, ++}; ++ ++static struct fb_ops e1356fb_ops = { ++ .owner = THIS_MODULE, ++ .fb_setcolreg = e1356fb_setcolreg, ++ .fb_fillrect = cfb_fillrect, ++ .fb_copyarea = cfb_copyarea, ++ .fb_imageblit = cfb_imageblit, ++ .fb_cursor = soft_cursor, ++ .fb_blank = e1356fb_blank, ++}; ++ ++static struct fb_fix_screeninfo e1356fb_fix = { ++ .id = "e1356fb", ++ .smem_len = (MAX_XRES * MAX_YRES * MAX_BPP)/8, ++ .smem_start = (unsigned long)DISP_MEM_OFFSET_PHYS, ++ .type = FB_TYPE_PACKED_PIXELS, ++ .visual = FB_VISUAL_TRUECOLOR, ++ .line_length = (640 * 16) / 8, ++ .accel = FB_ACCEL_NONE, ++ .type_aux = 0, ++ .ypanstep = 0, ++ .ywrapstep = 0, ++}; ++ ++unsigned char LUT8[256*3] = { ++ /* Primary and secondary colors */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x00, 0xA0, 0xA0, ++ 0xA0, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0xA0, 0xA0, 0x00, 0xA0, 0xA0, 0xA0, ++ 0x50, 0x50, 0x50, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0x00, 0x00, 0xF0, 0xF0, ++ 0xF0, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0xF0, 0xF0, 0x00, 0xF0, 0xF0, 0xF0 ++}; ++ ++static char lut_base[] = { ++ /*red green blue rinc ginc binc */ ++ 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, /* Gray shades */ ++ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, /* Black to red */ ++ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, /* Black to green */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* Black to blue */ ++ 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, /* Blue to cyan (blue and green) */ ++ 0x00, 0xf0, 0xf0, 0x00, 0x00, -0x10, /* Cyan (blue and green) to green */ ++ 0x00, 0xf0, 0x00, 0x10, 0x00, 0x00, /* Green to yellow (red and green)*/ ++ 0xf0, 0xf0, 0x00, 0x00, -0x10, 0x00, /* Yellow (red and green) to red */ ++ 0xf0, 0x00, 0x00, 0x00, 0x00, 0x10, /* Red to magenta (blue and red) */ ++ 0xf0, 0x00, 0xf0, -0x10, 0x00, 0x00, /* Magenta (blue and red) to blue */ ++ 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, /* Black to magenta (blue and red)*/ ++ 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, /* Black to cyan (blue and green) */ ++ 0xf0, 0x00, 0x00, 0x00, 0x10, 0x10, /* Red to white */ ++ 0x00, 0xf0, 0x00, 0x10, 0x00, 0x10, /* Green to white */ ++ 0x00, 0x00, 0xf0, 0x10, 0x10, 0x00, /* Blue to white */ ++}; ++ ++void e1356fb_init_hardware(void) ++{ ++ unsigned char *pRegs = REGISTER_OFFSET; ++ unsigned char *pLUT = LUT8; ++ unsigned char *pseed = lut_base; ++ unsigned char plast[3]; ++ int i, j, rgb; ++ ++ /* Enable access to SED1356 by setting memory/register select bit to 0. */ ++ pRegs[0x001] = 0; ++ udelay(2); ++ /* Disable display outputs during initialization) */ ++ pRegs[0x1FC] = 0; ++ ++ /* Set the GPIOs to input. Should GPIO bits in register [004] get switched ++ then the GPIO outputs, according to register [008], are driven low. */ ++ pRegs[0x004] = 0; ++ pRegs[0x008] = 0; ++ ++ /* Program the LCD panel type and panel timing registers. ++ * The horizontal and vertical non-display times have been ++ * calculated for a 78 Hz frame rate. ++ * LCD PCLK ++ * FrameRate = ----------------------------- ++ * (HDP + HNDP) * (VDP/2 + VNDP) ++ * ++ * 20,000,000 ++ * = ---------------------------- = 78 Hz ++ * (640 + 256) * (480 / 2 + 45) ++ */ ++ ++ pRegs[0x10] = 0x1; /* Memory Clock Configuration Register */ ++ pRegs[0x14] = 0x11; /* LCD Pixel Clock Configuration Register */ ++ pRegs[0x18] = 0x1; /* CRT/TV Pixel Clock Configuration Register */ ++ pRegs[0x1c] = 0x1; /* MediaPlug Clock Configuration Register */ ++ pRegs[0x1e] = 0x1; /* CPU To Memory Wait State Select Register */ ++ pRegs[0x20] = 0; /* Memory Configuration Register */ ++ pRegs[0x21] = 0x45; /* DRAM Refresh Rate Register */ ++ pRegs[0x2a] = 0x1; /* DRAM Timings Control Register 0 */ ++ pRegs[0x2b] = 0x1; /* DRAM Timings Control Register 1 */ ++ pRegs[0x30] = 0x1c; /* Panel Type Register */ ++ pRegs[0x31] = 0; /* MOD Rate Register */ ++ pRegs[0x32] = 0x4f; /* LCD Horizontal Display Width Register */ ++ pRegs[0x34] = 0x7; /* LCD Horizontal Non-Display Period Register */ ++ pRegs[0x35] = 0x1; /* TFT FPLINE Start Position Register */ ++ pRegs[0x36] = 0xb; /* TFT FPLINE Pulse Width Register */ ++ pRegs[0x38] = 0xef; /* LCD Vertical Display Height Register 0 */ ++ pRegs[0x39] = 0; /* LCD Vertical Display Height Register 1 */ ++ pRegs[0x3a] = 0x13; /* LCD Vertical Non-Display Period Register */ ++ pRegs[0x3b] = 0xb; /* TFT FPFRAME Start Position Register */ ++ pRegs[0x3c] = 0x1; /* TFT FPFRAME Pulse Width Register */ ++ pRegs[0x40] = 0x5; /* LCD Display Mode Register */ ++ pRegs[0x41] = 0; /* LCD Miscellaneous Register */ ++ pRegs[0x42] = 0; /* LCD Display Start Address Register 0 */ ++ pRegs[0x43] = 0; /* LCD Display Start Address Register 1 */ ++ pRegs[0x44] = 0; /* LCD Display Start Address Register 2 */ ++ pRegs[0x46] = 0x80; /* LCD Memory Address Offset Register 0 */ ++ pRegs[0x47] = 0x2; /* LCD Memory Address Offset Register 1 */ ++ pRegs[0x48] = 0; /* LCD Pixel Panning Register */ ++ pRegs[0x4a] = 0; /* LCD Display FIFO High Threshold Control Register */ ++ pRegs[0x4b] = 0; /* LCD Display FIFO Low Threshold Control Register */ ++ pRegs[0x50] = 0x4f; /* CRT/TV Horizontal Display Width Register */ ++ pRegs[0x52] = 0x13; /* CRT/TV Horizontal Non-Display Period Register */ ++ pRegs[0x53] = 0x1; /* CRT/TV HRTC Start Position Register */ ++ pRegs[0x54] = 0xb; /* CRT/TV HRTC Pulse Width Register */ ++ pRegs[0x56] = 0xdf; /* CRT/TV Vertical Display Height Register 0 */ ++ pRegs[0x57] = 0x1; /* CRT/TV Vertical Display Height Register 1 */ ++ pRegs[0x58] = 0x2b; /* CRT/TV Vertical Non-Display Period Register */ ++ pRegs[0x59] = 0x9; /* CRT/TV VRTC Start Position Register */ ++ pRegs[0x5a] = 0x1; /* CRT/TV VRTC Pulse Width Register */ ++ pRegs[0x5b] = 0x10; /* TV Output Control Register */ ++ pRegs[0x60] = 0x3; /* CRT/TV Display Mode Register */ ++ pRegs[0x62] = 0; /* CRT/TV Display Start Address Register 0 */ ++ pRegs[0x63] = 0; /* CRT/TV Display Start Address Register 1 */ ++ pRegs[0x64] = 0; /* CRT/TV Display Start Address Register 2 */ ++ pRegs[0x66] = 0x40; /* CRT/TV Memory Address Offset Register 0 */ ++ pRegs[0x67] = 0x1; /* CRT/TV Memory Address Offset Register 1 */ ++ pRegs[0x68] = 0; /* CRT/TV Pixel Panning Register */ ++ pRegs[0x6a] = 0; /* CRT/TV Display FIFO High Threshold Control Register */ ++ pRegs[0x6b] = 0; /* CRT/TV Display FIFO Low Threshold Control Register */ ++ pRegs[0x70] = 0; /* LCD Ink/Cursor Control Register */ ++ pRegs[0x71] = 0x1; /* LCD Ink/Cursor Start Address Register */ ++ pRegs[0x72] = 0; /* LCD Cursor X Position Register 0 */ ++ pRegs[0x73] = 0; /* LCD Cursor X Position Register 1 */ ++ pRegs[0x74] = 0; /* LCD Cursor Y Position Register 0 */ ++ pRegs[0x75] = 0; /* LCD Cursor Y Position Register 1 */ ++ pRegs[0x76] = 0; /* LCD Ink/Cursor Blue Color 0 Register */ ++ pRegs[0x77] = 0; /* LCD Ink/Cursor Green Color 0 Register */ ++ pRegs[0x78] = 0; /* LCD Ink/Cursor Red Color 0 Register */ ++ pRegs[0x7a] = 0x1f; /* LCD Ink/Cursor Blue Color 1 Register */ ++ pRegs[0x7b] = 0x3f; /* LCD Ink/Cursor Green Color 1 Register */ ++ pRegs[0x7c] = 0x1f; /* LCD Ink/Cursor Red Color 1 Register */ ++ pRegs[0x7e] = 0; /* LCD Ink/Cursor FIFO Threshold Register */ ++ pRegs[0x80] = 0; /* CRT/TV Ink/Cursor Control Register */ ++ pRegs[0x81] = 0x1; /* CRT/TV Ink/Cursor Start Address Register */ ++ pRegs[0x82] = 0; /* CRT/TV Cursor X Position Register 0 */ ++ pRegs[0x83] = 0; /* CRT/TV Cursor X Position Register 1 */ ++ pRegs[0x84] = 0; /* CRT/TV Cursor Y Position Register 0 */ ++ pRegs[0x85] = 0; /* CRT/TV Cursor Y Position Register 1 */ ++ pRegs[0x86] = 0; /* CRT/TV Ink/Cursor Blue Color 0 Register */ ++ pRegs[0x87] = 0; /* CRT/TV Ink/Cursor Green Color 0 Register */ ++ pRegs[0x88] = 0; /* CRT/TV Ink/Cursor Red Color 0 Register */ ++ pRegs[0x8a] = 0x1f; /* CRT/TV Ink/Cursor Blue Color 1 Register */ ++ pRegs[0x8b] = 0x3f; /* CRT/TV Ink/Cursor Green Color 1 Register */ ++ pRegs[0x8c] = 0x1f; /* CRT/TV Ink/Cursor Red Color 1 Register */ ++ pRegs[0x8e] = 0; /* CRT/TV Ink/Cursor FIFO Threshold Register */ ++ ++ /* Set the 2D acceleration (BitBLT) registers to a known state */ ++ for (i = 0x100; i <= 0x119; i++) ++ if (i != 0x107 && i != 0x10b && i != 0x10e && i != 0x10f && i != 0x117) ++ pRegs[i] = 0x00; ++ ++ /* Program the look-up table to a known state. */ ++ pRegs[0x1E0] = 0x01; /* Enable the LCD LUT for read/write. */ ++ pRegs[0x1E2] = 0; /* Reset the LUT address. */ ++ for (i = 0; i < 16 * 3; i++) ++ pRegs[0x1E4] = *pLUT++; /* non-regular color template */ ++ ++ for (i = 0; i < 15; i++) { ++ for (rgb = 0; rgb < 3; rgb++) { ++ plast[rgb] = *pseed++; /* base color value */ ++ pRegs[0x1E4] = plast[rgb]; ++ } ++ for (j = 0; j < 15; j++) ++ for (rgb = 0; rgb < 3; rgb++) { ++ plast[rgb] += pseed[rgb]; /* increment through color values*/ ++ pRegs[0x1E4] = plast[rgb]; ++ } ++ pseed += 3; ++ } ++ ++ pRegs[0x1e4] = 0; /* Look-Up Table Data Register */ ++ pRegs[0x1f0] = 0; /* Power Save Configuration Register */ ++ pRegs[0x1f1] = 0; /* Power Save Status Register */ ++ pRegs[0x1f4] = 0; /* CPU-to-Memory Access Watchdog Timer Register */ ++ ++ PPSR |= PPC_LDD0; ++ ++ mdelay(100); /* Wait for 100ms */ ++ pRegs[0x1F0] = 0; /* Turn off power save mode */ ++ pRegs[0x1F4] = 0; /* Disable the watchdog timer */ ++ pRegs[0x1FC] = 0x01; /* Disable power save mode, enable display */ ++} ++ ++int __init e1356fb_init(void) ++{ ++ if (fb_get_options("e1356fb", NULL)) ++ return -ENODEV; ++ ++ printk("Configuring the Jornada 720 screen...\n"); ++ ++ fb_info.screen_base = (u_char *) DISP_MEM_OFFSET; ++ fb_info.screen_size = ALLOCATED_FB_MEM_SIZE; ++ memset(&fb_info.var, 0, sizeof(fb_info.var)); ++ ++ PPSR &= ~(PPC_LDD0 | PPC_LDD1 | PPC_LDD2); ++ PPDR |= PPC_LDD0 | PPC_LDD1 | PPC_LDD2; ++ LCCR3 = 0; ++ LCCR2 = 0; ++ LCCR1 = 0; ++ LCCR0 = 0; ++ DBAR1 = 0; ++ DBAR2 = 0; ++ ++ e1356fb_init_hardware(); ++ memset ((unsigned char *)DISP_MEM_OFFSET, 0, ALLOCATED_FB_MEM_SIZE); ++ ++ PPSR |= PPC_LDD1; ++ mdelay(100); /* delay again */ ++ PPSR |= PPC_LDD2; ++ ++ fb_info.fbops = &e1356fb_ops; ++ fb_info.var = e1356fb_screeninfo; ++ fb_info.fix = e1356fb_fix; ++ fb_info.flags = FBINFO_DEFAULT; ++ ++ fb_info.pseudo_palette = &pseudo_pal; ++ ++ if (register_framebuffer(&fb_info) < 0) ++ return 1; ++ ++ return 0; ++} ++ ++module_init(e1356fb_init); ++ diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch new file mode 100644 index 0000000000..d75cc7cd85 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch @@ -0,0 +1,100 @@ +--- linux-2.6.17/drivers/input/keyboard/jornada720_kbd.c_orig 2006-07-03 00:18:52.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/jornada720_kbd.c 2006-07-03 00:16:36.000000000 +0000 +@@ -0,0 +1,97 @@ ++/* ++ * Jornada 720 keyboard interface ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++MODULE_AUTHOR("Alex Lange "); ++MODULE_DESCRIPTION("Jornada 720 keyboard driver"); ++MODULE_LICENSE("GPL"); ++ ++static char jornada720_kbd_name[] = "Jornada 720 keyboard"; ++ ++static struct input_dev dev; ++ ++static unsigned char jornada720_normal_keymap[128] = { ++ 0, 1, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 87, KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_MUTE, ++ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 0, 0, ++ 0, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 43, 14, 0, 0, 0, ++ 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, KEY_LEFTBRACE, KEY_RIGHTBRACE, 0, 0, 0, ++ 0, 44, 45, 46, 47, 48, 49, 50, 51, 52, KEY_KPMINUS, 40, 28, 0, 0, 0, ++ 0, 15, 0, 42, 0, 40, 0, 0, 0, 0, 103, 0, 54, 0, 0, 0, ++ 0, 0, 0, 0, 0, 56, KEY_GRAVE, 0, 0, 105, 108, 106, 0, 0, 0, 0, ++ 0, 55, 29, 0, 57, 0, 0, 0, 53, 111, 0, 0, 0, 0, 0, 116, ++}; ++ ++static irqreturn_t jornada720_keyboard_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ int key, keycode; ++ int count, mcu_data=0; ++ ++ jornada720_mcu_start(MCU_GetScanKeyCode); ++ count = jornada720_mcu_read(); ++ ++ while (count-- > 0) { ++ key = mcu_data = jornada720_mcu_read(); ++ ++ if (key > 128) ++ key = key - 128; ++ ++ keycode = jornada720_normal_keymap[key]; ++ ++ if (mcu_data < 128) { ++ input_report_key(&dev, keycode, 1); ++ input_sync(&dev); ++ } ++ else { ++ input_report_key(&dev, keycode, 0); ++ input_sync(&dev); ++ } ++ } ++ ++ jornada720_mcu_end(); ++ ++ return IRQ_HANDLED; ++} ++ ++static int __init jornada720_kbd_init(void) ++{ ++ int i; ++ printk("jorada720_kbd: Jornada 720 keyboard\n"); ++ ++ init_input_dev(&dev); ++ dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); ++ dev.keybit[LONG(KEY_SUSPEND)] |= BIT(KEY_SUSPEND); ++ ++ for ( i=0 ; i<=128 ; i++ ) { ++ if (!(jornada720_normal_keymap[i])) { ++ } ++ else ++ set_bit(jornada720_normal_keymap[i], dev.keybit); ++ } ++ ++ dev.name = jornada720_kbd_name; ++ ++ if (request_irq(GPIO_JORNADA720_KEYBOARD_IRQ, jornada720_keyboard_interrupt, SA_INTERRUPT, "Jornada720 Keyboard", NULL)) ++ printk("Unable to grab Jornada 720 keyboard IRQ!\n"); ++ ++ set_irq_type(GPIO_JORNADA720_KEYBOARD_IRQ, IRQT_FALLING); ++ ++ input_register_device(&dev); ++ ++ return 0; ++} ++ ++module_init(jornada720_kbd_init); diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch new file mode 100644 index 0000000000..6cfab690f3 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch @@ -0,0 +1,106 @@ +--- linux-2.6.17/drivers/input/touchscreen/jornada720_ts.c_orig 2006-07-03 00:17:18.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/jornada720_ts.c 2006-07-03 00:16:37.000000000 +0000 +@@ -0,0 +1,103 @@ ++/* ++ * Jornada 720 touchscreen interface based on Jornada 56x interface ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++MODULE_AUTHOR("Alex Lange "); ++MODULE_DESCRIPTION("Jornada 720 touchscreen driver"); ++MODULE_LICENSE("GPL"); ++ ++static char jornada720_ts_name[] = "Jornada 720 touchscreen"; ++ ++static struct input_dev dev; ++ ++static irqreturn_t jornada720_mouse_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++{ ++ int down; ++ int X[3], Y[3], high_x, high_y, x, y; ++ ++ udelay(1); ++ ++ down = ( (GPLR & GPIO_JORNADA720_MOUSE) == 0); ++ ++ if(!down) { ++ input_report_key(&dev, BTN_TOUCH, down); /* report a pen up */ ++ input_report_abs(&dev, ABS_PRESSURE, 0); ++ input_sync(&dev); ++ return IRQ_HANDLED; ++ } ++ ++ /* read x & y data from mcu interface and pass it on */ ++ ++ jornada720_mcu_start(MCU_GetTouchSamples); ++ X[0] = jornada720_mcu_read(); ++ X[1] = jornada720_mcu_read(); ++ X[2] = jornada720_mcu_read(); ++ Y[0] = jornada720_mcu_read(); ++ Y[1] = jornada720_mcu_read(); ++ Y[2] = jornada720_mcu_read(); ++ high_x = jornada720_mcu_read(); /* msbs of samples */ ++ high_y = jornada720_mcu_read(); ++ jornada720_mcu_end(); ++ ++ X[0] |= (high_x & 3) << 8; ++ X[1] |= (high_x & 0xc) << 6; ++ X[2] |= (high_x & 0x30) << 4; ++ ++ Y[0] |= (high_y & 3) << 8; ++ Y[1] |= (high_y & 0xc) << 6; ++ Y[2] |= (high_y & 0x30) << 4; ++ ++ /* simple averaging filter */ ++ x = (X[0] + X[1] + X[2])/3; ++ y = (Y[0] + Y[1] + Y[2])/3; ++ ++ input_report_key(&dev, BTN_TOUCH, down); ++ input_report_abs(&dev, ABS_X, x); ++ input_report_abs(&dev, ABS_Y, y); ++ input_report_abs(&dev, ABS_PRESSURE, 1); ++ input_sync(&dev); ++ ++ return IRQ_HANDLED; ++ ++} ++ ++static int __init jornada720_ts_init(void) ++{ ++ printk("jornada720_ts: Jornada 720 touchscreen\n"); ++ ++ init_input_dev(&dev); ++ dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); ++ dev.absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE); ++ dev.keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH); ++ ++ dev.absmin[ABS_X] = 270; dev.absmin[ABS_Y] = 180; ++ dev.absmax[ABS_X] = 3900; dev.absmax[ABS_Y] = 3700; ++ ++ dev.name = jornada720_ts_name; ++ ++ if (request_irq(GPIO_JORNADA720_MOUSE_IRQ, jornada720_mouse_interrupt, SA_INTERRUPT, "Jornada720 Mouse", NULL)) ++ printk("Unable to grab Jornada 720 touchscreen IRQ!\n"); ++ ++ set_irq_type(GPIO_JORNADA720_MOUSE_IRQ, IRQT_RISING); ++ ++ input_register_device(&dev); ++ ++ return 0; ++} ++ ++module_init(jornada720_ts_init); ++ diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index c6d9ba8877..bceaaebef7 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -1,14 +1,26 @@ SECTION = "kernel" -DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" +DESCRIPTION = "JLime Linux kernel for Arm based Jornada 7xx" LICENSE = "GPL" PR = "r0" -COMPATIBLE_HOST = "sh.*-linux" -COMPATIBLE_MACHINE = 'jornada6xx' +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'jornada7xx' -SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ +SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconfig_jlime \ - file://unexpected-int-fix.patch;patch=1" + file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ + file://Cpu-Sa1110-Jornada720.patch;patch=0 \ + file://Kconfig-Arch-Jornada720.patch;patch=0 \ + file://Kconfig-Keyboard-Jornada720.patch;patch=0\ + file://Kconfig-Touchscreen-Jornada720.patch;patch=0 + file://Kconfig-Video-Jornada720.patch;patch=0 \ + file://Mach-Sa1100-Jornada720.patch;patch=0 \ + file://Makefile-Keyboard-Jornada720.patch;patch=0 \ + file://Makefile-Touchscreen-Jornada720.patch;patch=0 \ + file://Makefile-Video-Jornada720.patch;patch=0 \ + file://Newfile-Epson1356fb.patch;patch=0 \ + file://Newfile-Jornada720_kbd.patch;patch=0 \ + file://Newfile-Jornada720_ts.patch;patch=0" S = "${WORKDIR}/linux-${PV}" @@ -17,7 +29,7 @@ inherit kernel #Lets let 3.4.x handle the compilation of this one KERNEL_CCSUFFIX = "-3.4.4" -ARCH = "sh" +ARCH = "arm" KERNEL_IMAGETYPE = "zImage" FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" -- cgit v1.2.3 From b4bb893ec2ad5251d461916703576a8295b1d513 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 3 Jul 2006 00:58:54 +0000 Subject: /linux/linux-jlime-arm-2.6.17/defconf_jlime: Addition of new config file * Addition of new config file for HP jornada 7xx /linux/linux-jlime-arm_2.6.17.bb: Changes to reflect new conf file * Changes defconfig_jlime > defconf_jlime --- .../linux/linux-jlime-arm-2.6.17/defconf_jlime | 1028 ++++++++++++++++++++ packages/linux/linux-jlime-arm_2.6.17.bb | 2 +- 2 files changed, 1029 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-jlime-arm-2.6.17/defconf_jlime diff --git a/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime b/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime new file mode 100644 index 0000000000..d5daef4e31 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/defconf_jlime @@ -0,0 +1,1028 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17 +# Mon Jul 3 00:55:03 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +# CONFIG_IKCONFIG_PROC is not set +CONFIG_RELAY=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_BLK_DEV_IO_TRACE=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +CONFIG_ARCH_SA1100=y +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set +CONFIG_DMABOUNCE=y + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ASSABET is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_COLLIE is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_BADGE4 is not set +CONFIG_SA1100_JORNADA720=y +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SSP is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_SA1100=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4=y +CONFIG_CPU_CACHE_V4WB=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WB=y + +# +# Processor Features +# +CONFIG_SA1111=y +CONFIG_FORCE_MAX_ZONEORDER=9 + +# +# Bus support +# +CONFIG_ISA=y + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_SA1111=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +# CONFIG_NO_IDLE_HZ is not set +CONFIG_HZ=100 +# CONFIG_AEABI is not set +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_NODES_SHIFT=2 +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_DISCONTIGMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CMDLINE="" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_FPE_NWFPE is not set +CONFIG_FPE_FASTFPE=y + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_ARTHUR=y + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_NETDEBUG=y +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +CONFIG_NET_KEY=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +CONFIG_ARPD=y +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=y +CONFIG_INET_ESP=y +CONFIG_INET_IPCOMP=y +CONFIG_INET_XFRM_TUNNEL=y +CONFIG_INET_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +# CONFIG_IRNET is not set +# CONFIG_IRCOMM is not set +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +# CONFIG_IRTTY_SIR is not set + +# +# Dongle support +# + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +# CONFIG_SA1100_FIR is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +# CONFIG_BT_RFCOMM is not set +CONFIG_BT_BNEP=m +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +CONFIG_BT_HCIDTL1=m +CONFIG_BT_HCIBT3C=m +CONFIG_BT_HCIBLUECARD=m +CONFIG_BT_HCIBTUART=m +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=y + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_NET_SB1000 is not set + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set +# CONFIG_NET_PCI is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +CONFIG_HERMES=m +CONFIG_ATMEL=m + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m +CONFIG_HOSTAP=m +# CONFIG_HOSTAP_FIRMWARE is not set +CONFIG_HOSTAP_CS=m +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=640 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=640 +CONFIG_INPUT_TSDEV_SCREEN_Y=240 +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_INPORT is not set +# CONFIG_MOUSE_LOGIBM is not set +# CONFIG_MOUSE_PC110PAD is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_TOUCHSCREEN_JORNADA720=y +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_SA1111 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_SA1100 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP_SA11X0 is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_SA1100 is not set +CONFIG_FB_EPSON1356=y +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_MDA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=m +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=y +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_FS=y +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index bceaaebef7..0f67a7c2be 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -7,7 +7,7 @@ COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = 'jornada7xx' SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ - file://defconfig_jlime \ + file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ -- cgit v1.2.3 From 602af584cc98ccfa10ca30cd850ec0ac92fe8ac0 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 3 Jul 2006 02:37:00 +0000 Subject: fluxbox: Add mult-machine support for geometry defaults --- packages/fluxbox/fluxbox-gpe/apps.gpe | 57 ------------------------ packages/fluxbox/fluxbox-gpe/apps.gpe.akita | 57 ++++++++++++++++++++++++ packages/fluxbox/fluxbox-gpe/apps.gpe.default | 7 +++ packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session | 14 +++++- packages/fluxbox/fluxbox-gpe_1.0rc.bb | 8 ++-- 5 files changed, 80 insertions(+), 63 deletions(-) delete mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe create mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.akita create mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.default diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe b/packages/fluxbox/fluxbox-gpe/apps.gpe deleted file mode 100644 index 7aca442752..0000000000 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe +++ /dev/null @@ -1,57 +0,0 @@ -[app] (title=Panel 0) - [Deco] {NONE} - [Sticky] {yes} -[end] -[app] (title=Panel 1) - [Deco] {NONE} -[end] -[app] (title=rxvt) - [Dimensions] {635 440} -[end] -[app] (title=x-terminal-emulator) - [Dimensions] {635 440} -[end] -[app] (abiword) - [Dimensions] {635 440} - [Sticky] {no} -[end] -[app] (gpe-filemanager) - [Dimensions] {635 440} - [Sticky] {yes} -[end] -[app] (gpe-info) - [Dimensions] {424 336} -[end] -[app] (gpe-edit) - [Dimensions] {635 440} -[end] -[app] (gpe-calculator) - [Dimensions] {266 321} -[end] -[app] (main) - [Dimensions] {635 440} -[end] -[app] (Gnumeric) - [Dimensions] {635 440} -[end] -[app] (gpdf) - [Dimensions] {635 440} -[end] -[app] (main_window) - [Dimensions] {635 440} -[end] -[app] (gaim) - [Dimensions] {635 440} -[end] -[app] (gpe-calendar) - [Dimensions] {380 343} -[end] -[app] (gpe-mini-browser) - [Dimensions] {635 440} -[end] -[app] (figment) - [Dimensions] {635 440} -[end] -[app] (gpe-sketchbook) - [Dimensions] {471 314} -[end] diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita new file mode 100644 index 0000000000..7aca442752 --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita @@ -0,0 +1,57 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] +[app] (title=rxvt) + [Dimensions] {635 440} +[end] +[app] (title=x-terminal-emulator) + [Dimensions] {635 440} +[end] +[app] (abiword) + [Dimensions] {635 440} + [Sticky] {no} +[end] +[app] (gpe-filemanager) + [Dimensions] {635 440} + [Sticky] {yes} +[end] +[app] (gpe-info) + [Dimensions] {424 336} +[end] +[app] (gpe-edit) + [Dimensions] {635 440} +[end] +[app] (gpe-calculator) + [Dimensions] {266 321} +[end] +[app] (main) + [Dimensions] {635 440} +[end] +[app] (Gnumeric) + [Dimensions] {635 440} +[end] +[app] (gpdf) + [Dimensions] {635 440} +[end] +[app] (main_window) + [Dimensions] {635 440} +[end] +[app] (gaim) + [Dimensions] {635 440} +[end] +[app] (gpe-calendar) + [Dimensions] {380 343} +[end] +[app] (gpe-mini-browser) + [Dimensions] {635 440} +[end] +[app] (figment) + [Dimensions] {635 440} +[end] +[app] (gpe-sketchbook) + [Dimensions] {471 314} +[end] diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default new file mode 100644 index 0000000000..d7a0a83f22 --- /dev/null +++ b/packages/fluxbox/fluxbox-gpe/apps.gpe.default @@ -0,0 +1,7 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session index ca0afea35d..f6e03ede7e 100644 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session +++ b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session @@ -4,10 +4,20 @@ # # Install "apps" file with defaults for GPE usage -if test -e /usr/share/fluxbox/apps.gpe + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" + +case $MACHINE in +*Akita | *Spitz | *Borzoi | *Terrier) + APPS="apps.gpe.akita";; +*) + APPS="apps.gpe.default";; +esac + +if test -e /usr/share/fluxbox/$APPS then mkdir -p $HOME/.fluxbox - test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/apps.gpe $HOME/.fluxbox/apps + test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps fi diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb index 50c5d6ce1d..0d962ca6f5 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb @@ -13,14 +13,14 @@ RCONFLICTS = "fluxbox" ###################################################################################### -PR = "r1" +PR = "r2" S = "${WORKDIR}/fluxbox-${PV}" ###################################################################################### SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ file://gpe-init.patch;patch=1\ - file://apps.gpe \ + file://apps.gpe.* \ file://style.gpe-default \ file://fluxbox-gpe-session \ file://fluxbox-gpe.session" @@ -37,7 +37,7 @@ FILES_${PN} = "/usr/bin \ /usr/share/fluxbox/init \ /usr/share/fluxbox/keys \ /usr/share/fluxbox/menu \ - /usr/share/fluxbox/apps.gpe \ + /usr/share/fluxbox/apps.gpe* \ /usr/share/fluxbox/session \ /usr/share/fluxbox/styles/gpe-default" @@ -59,7 +59,7 @@ do_install_append() { install -d ${D}/usr/share/fluxbox install -d ${D}/usr/share/fluxbox/styles - install -m 0644 ${WORKDIR}/apps.gpe ${D}/usr/share/fluxbox + install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin -- cgit v1.2.3 From 9b820e6f7a397dbf74f92b2596bd58fd2528283b Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 3 Jul 2006 03:09:47 +0000 Subject: lilo-sh 0.21: Add lilo-sh, a port of the LILO bootloader to the sh architecture. Required for the titan SH4 boards to boot from the internal flash which has a translation layer to make it look like a standard block device. --- packages/lilo-sh/.mtn2git_empty | 0 packages/lilo-sh/files/.mtn2git_empty | 0 packages/lilo-sh/files/lilo-0.21-1.1.patch | 35 + packages/lilo-sh/files/lilo-0.21-include.patch | 10 + packages/lilo-sh/files/lilo-0.21-loopdev.patch | 11 + packages/lilo-sh/files/lilo-0.21-second.patch | 36 + packages/lilo-sh/files/lilo-linkgear.patch | 1039 +++++++++++++ packages/lilo-sh/files/lilo-noconfig-h.patch | 23 + packages/lilo-sh/files/lilo-sh-linux.patch | 1971 ++++++++++++++++++++++++ packages/lilo-sh/files/lilo.patch | 42 + packages/lilo-sh/files/lilo.raid1 | 552 +++++++ packages/lilo-sh/lilo-sh_21.bb | 41 + 12 files changed, 3760 insertions(+) create mode 100644 packages/lilo-sh/.mtn2git_empty create mode 100644 packages/lilo-sh/files/.mtn2git_empty create mode 100644 packages/lilo-sh/files/lilo-0.21-1.1.patch create mode 100644 packages/lilo-sh/files/lilo-0.21-include.patch create mode 100644 packages/lilo-sh/files/lilo-0.21-loopdev.patch create mode 100644 packages/lilo-sh/files/lilo-0.21-second.patch create mode 100644 packages/lilo-sh/files/lilo-linkgear.patch create mode 100644 packages/lilo-sh/files/lilo-noconfig-h.patch create mode 100644 packages/lilo-sh/files/lilo-sh-linux.patch create mode 100644 packages/lilo-sh/files/lilo.patch create mode 100644 packages/lilo-sh/files/lilo.raid1 create mode 100644 packages/lilo-sh/lilo-sh_21.bb diff --git a/packages/lilo-sh/.mtn2git_empty b/packages/lilo-sh/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/lilo-sh/files/.mtn2git_empty b/packages/lilo-sh/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/lilo-sh/files/lilo-0.21-1.1.patch b/packages/lilo-sh/files/lilo-0.21-1.1.patch new file mode 100644 index 0000000000..dfbab2a82c --- /dev/null +++ b/packages/lilo-sh/files/lilo-0.21-1.1.patch @@ -0,0 +1,35 @@ +--- lilo/Makefile- Fri Dec 4 15:35:07 1998 ++++ lilo/Makefile Wed Mar 17 01:04:07 1999 +@@ -24,7 +24,7 @@ + # VARSETUP Enables use of variable-size setup segments. + # XL_SECS=n Support for extra large (non-standard) floppies. + +-CONFIG=-DIGNORECASE -DVARSETUP -DREWRITE_TABLE ++CONFIG=-DIGNORECASE -DVARSETUP -DREWRITE_TABLE -DLARGE_EBDA -DONE_SHOT + + # End of configuration variables + +--- lilo/second.S- Fri Dec 4 15:20:07 1998 ++++ lilo/second.S Wed Mar 17 01:03:53 1999 +@@ -830,9 +830,20 @@ + call load1 + seg es + mov CL_MAGIC_ADDR,#CL_MAGIC ! set magic number ++#ifndef LCF_LARGE_EBDA + seg es + mov word ptr CL_OFFSET,#PARMLINE+SECOND_SS + ! set parameter line offset ++#else ++ mov di,#0x8000 ++ mov si,#PARMLINE ++ mov cx,#CL_LENGTH ++ rep ++ movsb ++ seg es ++ mov word ptr CL_OFFSET,#0x8000 ++ ! set parameter line offset ++#endif + pop si ! restore SI + lodsw ! get flags bit map + mov bx,ax + diff --git a/packages/lilo-sh/files/lilo-0.21-include.patch b/packages/lilo-sh/files/lilo-0.21-include.patch new file mode 100644 index 0000000000..61e298013c --- /dev/null +++ b/packages/lilo-sh/files/lilo-0.21-include.patch @@ -0,0 +1,10 @@ +--- lilo.orig/common.h Wed Oct 14 17:44:28 1998 ++++ lilo/common.h Mon Dec 7 18:05:17 1998 +@@ -7,6 +7,7 @@ + #define COMMON_H + + #include ++#include + #include + + #include "lilo.h" diff --git a/packages/lilo-sh/files/lilo-0.21-loopdev.patch b/packages/lilo-sh/files/lilo-0.21-loopdev.patch new file mode 100644 index 0000000000..e739c5b104 --- /dev/null +++ b/packages/lilo-sh/files/lilo-0.21-loopdev.patch @@ -0,0 +1,11 @@ +--- lilo/device.c.oot Mon Jan 10 09:37:00 2000 ++++ lilo/device.c Mon Jan 10 09:37:37 2000 +@@ -192,4 +192,8 @@ + sprintf(tmp,"/dev/sdb%d",i); + cache_add(tmp,0x810+i); + } ++ for (i = 0; i <= 7; i++) { ++ sprintf(tmp,"/dev/loop%d",i); ++ cache_add(tmp,0x700+i); ++ } + } diff --git a/packages/lilo-sh/files/lilo-0.21-second.patch b/packages/lilo-sh/files/lilo-0.21-second.patch new file mode 100644 index 0000000000..12a9af04c7 --- /dev/null +++ b/packages/lilo-sh/files/lilo-0.21-second.patch @@ -0,0 +1,36 @@ +I have a problem to report with lilo, and the fix for it. I am not sure +whether this is the right place for it though, I am also CCing the lilo +maintainer Werner Almesberger. + +When lilo gets control from the bios (whether lilo is on disk, or on the +floppy), it is checking the wrong location when it tries to parse the +parameter line construction area to determine whether it needs to clean +up extra blank spaces. This is causing lilo to eat up the last character(s) +of the command line that it passes to the kernel. + +Specifically, the code + +cpcodn: cmp byte ptr (di-1),#32 ! last was space ? + +is using the memory contents of ds:di-1 for the compare. It should +really be using es:di-1. I checked, ds=0x0b00 around here, so the +code ended up checking 0x0b00:(di-1) instead of 0x9000:(di-1). It +is quite possible that the memory that lilo checks has garbage, +causing it to make wrong decision. A "seg es" just before the cmp +fixes the problem. I am attaching the patch below. + +Kanoj + +--- second.0 Mon Sep 20 13:52:01 1999 ++++ second.S Tue Sep 28 10:20:54 1999 +@@ -816,7 +816,8 @@ + je cpcodsp ! yes -> discard next + lodsb ! get next byte + jmp cpcolp +-cpcodn: cmp byte ptr (di-1),#32 ! last was space ? ++cpcodn: seg es ++ cmp byte ptr (di-1),#32 ! last was space ? + jne nocopt ! no -> go on + dec di ! discard it + nocopt: mov si,options ! append variable options + diff --git a/packages/lilo-sh/files/lilo-linkgear.patch b/packages/lilo-sh/files/lilo-linkgear.patch new file mode 100644 index 0000000000..598a92a7af --- /dev/null +++ b/packages/lilo-sh/files/lilo-linkgear.patch @@ -0,0 +1,1039 @@ +diff -Naur --exclude=CVS --exclude='*.orig' lilo/Makefile lilosh/Makefile +--- lilo/Makefile 2006-02-01 21:16:29.000000000 +0000 ++++ lilosh/Makefile 2006-02-01 21:23:37.000000000 +0000 +@@ -40,7 +40,6 @@ + + SHELL=/bin/sh + +-CROSS_COMPILE = sh3-linux- + CC =$(CROSS_COMPILE)gcc + LD =$(CROSS_COMPILE)ld + OBJCOPY =$(CROSS_COMPILE)objcopy +@@ -72,10 +71,10 @@ + $(OBJCOPY) -R .comment -S second.exe -O binary second.bin + + first.exe: first.o +- $(LD) -EL -e start first.o -o first.exe -Ttext 0x8c200000 ++ $(LD) -EL -e start first.o -o first.exe -Ttext 0x88a00000 + + second.exe: second.o string.o +- $(LD) -T second.lds -EL second.o string.o -o second.exe -Ttext 0x8c201000 ++ $(LD) -T second.lds -EL second.o string.o -o second.exe -Ttext 0x88a01000 + + first.o: first.S + $(CC) $(CFLAGS) -c first.S +diff -Naur --exclude=CVS --exclude='*.orig' lilo/boot.c lilosh/boot.c +--- lilo/boot.c 1997-06-20 12:48:28.000000000 +0000 ++++ lilosh/boot.c 2006-01-31 19:46:21.000000000 +0000 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include "config.h" + #include "common.h" +@@ -70,6 +71,7 @@ + geo_close(&geo); + if (verbose > 1) + printf("Mapped %d sector%s.\n",sectors,sectors == 1 ? "" : "s"); ++ memset(&descr->initrd, 0, sizeof(descr->initrd)); + if ((initrd = cfg_get_strg(cf_kernel,"initrd")) || (initrd = cfg_get_strg( + cf_options,"initrd"))) { + if (!modern_kernel) die("Kernel doesn't support initial RAM disks"); +diff -Naur --exclude=CVS --exclude='*.orig' lilo/bsect.c lilosh/bsect.c +--- lilo/bsect.c 1998-10-14 20:30:32.000000000 +0000 ++++ lilosh/bsect.c 2004-10-01 19:05:58.000000000 +0000 +@@ -189,11 +189,11 @@ + } + } + bsect.par_1.prompt = cfg_get_flag(cf_options,"prompt"); +- if (delay*100/55 > 0xffff) die("Maximum delay is one hour."); +- else bsect.par_1.delay = delay*100/55; ++ if (delay >= 36000) die("Maximum delay is one hour."); ++ else bsect.par_1.delay = delay; + if (timeout == -1) bsect.par_1.timeout = 0xffff; +- else if (timeout*100/55 >= 0xffff) die("Maximum timeout is one hour."); +- else bsect.par_1.timeout = timeout*100/55; ++ else if (timeout >= 36000) die("Maximum timeout is one hour."); ++ else bsect.par_1.timeout = timeout; + if (!(keytable = cfg_get_strg(cf_options,"keytable"))) { + int i; + +diff -Naur --exclude=CVS --exclude='*.orig' lilo/defs.h lilosh/defs.h +--- lilo/defs.h 2006-02-01 21:16:29.000000000 +0000 ++++ lilosh/defs.h 2004-05-19 16:39:08.000000000 +0000 +@@ -1,2 +1,3 @@ + extern void *memcpy (void *__dest, const void *__src, unsigned int __n); + extern int strlen (__const char *__s); ++extern void *memset(void *s, int c, unsigned int n); +diff -Naur --exclude=CVS --exclude='*.orig' lilo/first.S lilosh/first.S +--- lilo/first.S 2006-02-01 21:16:29.000000000 +0000 ++++ lilosh/first.S 2006-02-01 22:02:02.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $Id: first.S,v 1.16 2000/11/26 07:11:58 gniibe Exp $ ++/* $Id: first.S,v 1.1.1.1 2002/05/15 06:44:39 bmann Exp $ + * + * Primary boot loader + * +@@ -54,7 +54,7 @@ + ! /* ^--- Minor Version*/ + #endif + +-/* x86 LILO parameters (Not used for SuperH... yet) */ ++/* x86 LILO parameters (port and sparam not used for SuperH... yet) */ + timeout:.word 0 ! input timeout + delay: .word 0 ! boot delay + port: .byte 0 ! COM port (0 = unused, 1 = COM1, etc.) +@@ -67,11 +67,13 @@ + d1_cx: .word 0 + d1_dx: .word 0 + d1_al: .byte 0 ++ .byte 0 ! align next .word + + /* Second descripter sector (Filled by LILO command) */ + d2_cx: .word 0 + d2_dx: .word 0 + d2_al: .byte 0 ++ .byte 0 ! align next .word + + /* Default command-line sector (Filled by LILO command) */ + dc_cx: .word 0 +@@ -87,11 +89,13 @@ + ms_cx: .word 0 + ms_dx: .word 0 + ms_al: .byte 0 ++ .byte 0 ! align next .word + + /* Second descripter sector (Filled by LILO command) */ + kt_cx: .word 0 ! keyboard translation table + kt_dx: .word 0 + kt_al: .byte 0 ++ .byte 0 ! align next .long + + d_addr: ! second stage sector addresses + +diff -Naur --exclude=CVS --exclude='*.orig' lilo/geometry.c lilosh/geometry.c +--- lilo/geometry.c 2006-02-01 21:15:51.000000000 +0000 ++++ lilosh/geometry.c 2006-02-01 22:13:05.000000000 +0000 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "config.h" + #include "lilo.h" +@@ -37,7 +38,7 @@ + + + DT_ENTRY *disktab = NULL; +-int old_disktab = 0; ++static int old_disktab = 0; + + + void geo_init(char *name) +@@ -297,6 +298,7 @@ + case MAJOR_ESDI: + /* fall through */ + case MAJOR_XT: ++ /* fall through */ + geo->device = 0x80+(MINOR(device) >> 6)+(MAJOR(device) == MAJOR_HD ? + 0 : last_dev(MAJOR_HD,64)); + if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0) +@@ -353,6 +355,17 @@ + geo->sectors = hdprm.sectors; + geo->start = hdprm.start; + break; ++ case MAJOR_NAND: ++ /* fall through */ ++ geo->device = 0x80+(MINOR(device)); ++ if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0) ++ die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device, ++ strerror(errno)); ++ geo->heads = hdprm.heads; ++ geo->cylinders = hdprm.cylinders; ++ geo->sectors = hdprm.sectors; ++ geo->start = hdprm.start; ++ break; + + default: + die("Sorry, don't know how to handle device 0x%04x",device); +diff -Naur --exclude=CVS --exclude='*.orig' lilo/geometry.h lilosh/geometry.h +--- lilo/geometry.h 2006-02-01 21:15:51.000000000 +0000 ++++ lilosh/geometry.h 2006-02-01 22:14:07.000000000 +0000 +@@ -8,7 +8,6 @@ + + #include "lilo.h" + +- + typedef struct { + int device,heads; + int cylinders,sectors; +@@ -29,6 +28,7 @@ + + extern DT_ENTRY *disktab; + ++ + void geo_init(char *name); + + /* Loads the disk geometry table. */ +diff -Naur --exclude=CVS --exclude='*.orig' lilo/lilo.c lilosh/lilo.c +--- lilo/lilo.c 2006-02-01 21:15:51.000000000 +0000 ++++ lilosh/lilo.c 2006-02-01 21:56:56.000000000 +0000 +@@ -85,11 +85,11 @@ + if (verbose > 0) { + bsect_read(cfg_get_strg(cf_options,"boot"),&boot); + printf("Global settings:\n"); +- tsecs = (boot.par_1.delay*55+50)/100; ++ tsecs = boot.par_1.delay; + printf(" Delay before booting: %d.%d seconds\n",tsecs/10,tsecs % 10); + if (boot.par_1.timeout == 0xffff) printf(" No command-line timeout\n"); + else { +- tsecs = (boot.par_1.timeout*55+50)/100; ++ tsecs = boot.par_1.timeout; + printf(" Command-line timeout: %d.%d seconds\n",tsecs/10, + tsecs % 10); + } +@@ -411,11 +411,11 @@ + else if (st.st_mode & (S_IWGRP | S_IWOTH)) + fprintf(stderr,"Warning: %s should be writable only for " + "root\n",config_file); +- else if ((cfg_get_strg(cf_all,"password") || cfg_get_strg( +- cf_options,"password")) && (st.st_mode & (S_IRGRP | +- S_IROTH))) +- fprintf(stderr,"Warning: %s should be readable only " +- "for root if using PASSWORD\n",config_file); ++ else if ((cfg_get_strg(cf_all,"password") || cfg_get_strg( ++ cf_options,"password")) && (st.st_mode & (S_IRGRP | ++ S_IROTH))) ++ fprintf(stderr,"Warning: %s should be readable only " ++ "for root if using PASSWORD\n",config_file); + } + } + preload_dev_cache(); +@@ -491,7 +491,7 @@ + md_disk.cylinders = geo.cylinders; + md_disk.start = geo.start; + } +- ++ + pass++; + if (uninstall) + bsect_uninstall(uninst_dev ? uninst_dev : cfg_get_strg(cf_options, +@@ -517,8 +517,8 @@ + cf_options,"delay")) : 0,cfg_get_strg(cf_options,"timeout") ? + to_number(cfg_get_strg(cf_options,"timeout")) : -1); + if (more) { +- cfg_init(cf_top); +- if (cfg_parse(cf_top)) cfg_error("Syntax error"); ++ cfg_init(cf_top); ++ if (cfg_parse(cf_top)) cfg_error("Syntax error"); + } + if (!bsect_number()) die("No images have been defined."); + check_fallback(); +diff -Naur --exclude=CVS --exclude='*.orig' lilo/lilo.h lilosh/lilo.h +--- lilo/lilo.h 2006-02-01 21:15:44.000000000 +0000 ++++ lilosh/lilo.h 2006-02-01 21:28:33.000000000 +0000 +@@ -39,6 +39,7 @@ + #define MAJOR_DAC960 48 /* First Mylex DAC960 PCI RAID controller */ + #define MAJOR_IDE5 55 /* IDE on fifth interface */ + #define MAJOR_IDE6 57 /* IDE on sixth interface */ ++#define MAJOR_NAND 240 /* proprietary (board-level) nand flash block device */ + #define COMPAQ_SMART2_MAJOR 72 /* First Smart/2 Major */ + + #define MAX_IMAGES ((SECTOR_SIZE*2-2)/sizeof(IMAGE_DESCR)) +diff -Naur --exclude=CVS --exclude='*.orig' lilo/md-int.h lilosh/md-int.h +--- lilo/md-int.h 2006-02-01 21:15:51.000000000 +0000 ++++ lilosh/md-int.h 2006-02-01 22:11:13.000000000 +0000 +@@ -287,4 +287,4 @@ + #define RAID5_ALGORITHM_LEFT_SYMMETRIC 2 + #define RAID5_ALGORITHM_RIGHT_SYMMETRIC 3 + +-#endif _MD_H ++#endif /* _MD_H */ +diff -Naur --exclude=CVS --exclude='*.orig' lilo/md-int.h~ lilosh/md-int.h~ +--- lilo/md-int.h~ 1970-01-01 00:00:00.000000000 +0000 ++++ lilosh/md-int.h~ 2006-02-01 21:15:51.000000000 +0000 +@@ -0,0 +1,290 @@ ++/* ++ md.h : Multiple Devices driver for Linux ++ Copyright (C) 1994-96 Marc ZYNGIER ++ or ++ ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ You should have received a copy of the GNU General Public License ++ (for example /usr/src/linux/COPYING); if not, write to the Free ++ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++ ++#ifndef MD_INT_H ++#define MD_INT_H ++ ++/* don't include the kernel RAID header! */ ++#define _MD_H ++ ++typedef unsigned int md_u32; ++typedef unsigned short md_u16; ++typedef unsigned char md_u8; ++ ++#include ++#include ++ ++/* ++ * Different major versions are not compatible. ++ * Different minor versions are only downward compatible. ++ * Different patchlevel versions are downward and upward compatible. ++ */ ++ ++struct md_version { ++ int major; ++ int minor; ++ int patchlevel; ++}; ++ ++/* ++ * default readahead ++ */ ++#define MD_READAHEAD (256 * 1024) ++ ++/* These are the ioctls for md versions < 0.50 */ ++#define REGISTER_MD_DEV _IO (MD_MAJOR, 1) ++#define START_MD _IO (MD_MAJOR, 2) ++#define STOP_MD _IO (MD_MAJOR, 3) ++ ++/* status */ ++#define RAID_VERSION _IOR (MD_MAJOR, 0x10, struct md_version) ++#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, md_array_info_t) ++#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, md_disk_info_t) ++#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13) ++ ++/* configuration */ ++#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20) ++#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, md_disk_info_t) ++#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22) ++#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, md_array_info_t) ++#define SET_DISK_INFO _IO (MD_MAJOR, 0x24) ++#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25) ++#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26) ++#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27) ++#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28) ++ ++/* usage */ ++#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, struct md_param) ++#define START_ARRAY _IO (MD_MAJOR, 0x31) ++#define STOP_ARRAY _IO (MD_MAJOR, 0x32) ++#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) ++#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) ++ ++ ++/* for raid < 0.50 only */ ++#define MD_PERSONALITY_SHIFT 16 ++ ++#define MD_RESERVED 0UL ++#define LINEAR 1UL ++#define STRIPED 2UL ++#define RAID0 STRIPED ++#define RAID1 3UL ++#define RAID5 4UL ++#define TRANSLUCENT 5UL ++#define LVM 6UL ++#define MAX_PERSONALITY 7UL ++ ++/* ++ * MD superblock. ++ * ++ * The MD superblock maintains some statistics on each MD configuration. ++ * Each real device in the MD set contains it near the end of the device. ++ * Some of the ideas are copied from the ext2fs implementation. ++ * ++ * We currently use 4096 bytes as follows: ++ * ++ * word offset function ++ * ++ * 0 - 31 Constant generic MD device information. ++ * 32 - 63 Generic state information. ++ * 64 - 127 Personality specific information. ++ * 128 - 511 12 32-words descriptors of the disks in the raid set. ++ * 512 - 911 Reserved. ++ * 912 - 1023 Disk specific descriptor. ++ */ ++ ++/* ++ * If x is the real device size in bytes, we return an apparent size of: ++ * ++ * y = (x & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES ++ * ++ * and place the 4kB superblock at offset y. ++ */ ++#define MD_RESERVED_BYTES (64 * 1024) ++#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512) ++#define MD_RESERVED_BLOCKS (MD_RESERVED_BYTES / BLOCK_SIZE) ++ ++#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS) ++#define MD_NEW_SIZE_BLOCKS(x) ((x & ~(MD_RESERVED_BLOCKS - 1)) - MD_RESERVED_BLOCKS) ++ ++#define MD_SB_BYTES 4096 ++#define MD_SB_WORDS (MD_SB_BYTES / 4) ++#define MD_SB_BLOCKS (MD_SB_BYTES / BLOCK_SIZE) ++#define MD_SB_SECTORS (MD_SB_BYTES / 512) ++ ++/* ++ * The following are counted in 32-bit words ++ */ ++#define MD_SB_GENERIC_OFFSET 0 ++#define MD_SB_PERSONALITY_OFFSET 64 ++#define MD_SB_DISKS_OFFSET 128 ++#define MD_SB_DESCRIPTOR_OFFSET 992 ++ ++#define MD_SB_GENERIC_CONSTANT_WORDS 32 ++#define MD_SB_GENERIC_STATE_WORDS 32 ++#define MD_SB_GENERIC_WORDS (MD_SB_GENERIC_CONSTANT_WORDS + MD_SB_GENERIC_STATE_WORDS) ++#define MD_SB_PERSONALITY_WORDS 64 ++#define MD_SB_DISKS_WORDS 384 ++#define MD_SB_DESCRIPTOR_WORDS 32 ++#define MD_SB_RESERVED_WORDS (1024 - MD_SB_GENERIC_WORDS - MD_SB_PERSONALITY_WORDS - MD_SB_DISKS_WORDS - MD_SB_DESCRIPTOR_WORDS) ++#define MD_SB_EQUAL_WORDS (MD_SB_GENERIC_WORDS + MD_SB_PERSONALITY_WORDS + MD_SB_DISKS_WORDS) ++#define MD_SB_DISKS (MD_SB_DISKS_WORDS / MD_SB_DESCRIPTOR_WORDS) ++ ++/* ++ * Device "operational" state bits ++ */ ++#define MD_DISK_FAULTY 0 /* disk is faulty / operational */ ++#define MD_DISK_ACTIVE 1 /* disk is running or spare disk */ ++#define MD_DISK_SYNC 2 /* disk is in sync with the raid set */ ++ ++typedef struct md_device_descriptor_s { ++ md_u32 number; /* 0 Device number in the entire set */ ++ md_u32 major; /* 1 Device major number */ ++ md_u32 minor; /* 2 Device minor number */ ++ md_u32 raid_disk; /* 3 The role of the device in the raid set */ ++ md_u32 state; /* 4 Operational state */ ++ md_u32 reserved[MD_SB_DESCRIPTOR_WORDS - 5]; ++} md_descriptor_t; ++ ++#define MD_SB_MAGIC 0xa92b4efc ++ ++/* ++ * Superblock state bits ++ */ ++#define MD_SB_CLEAN 0 ++#define MD_SB_ERRORS 1 ++ ++typedef struct md_superblock_s { ++ /* ++ * Constant generic information ++ */ ++ md_u32 md_magic; /* 0 MD identifier */ ++ md_u32 major_version; /* 1 major version to which the set conforms */ ++ md_u32 minor_version; /* 2 minor version ... */ ++ md_u32 patch_version; /* 3 patchlevel version ... */ ++ md_u32 gvalid_words; /* 4 Number of used words in this section */ ++ md_u32 set_magic; /* 5 Raid set identifier */ ++ md_u32 ctime; /* 6 Creation time */ ++ md_u32 level; /* 7 Raid personality */ ++ md_u32 size; /* 8 Apparent size of each individual disk */ ++ md_u32 nr_disks; /* 9 total disks in the raid set */ ++ md_u32 raid_disks; /* 10 disks in a fully functional raid set */ ++ md_u32 md_minor; /* 11 preferred MD minor device number */ ++ md_u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 12]; ++ ++ /* ++ * Generic state information ++ */ ++ md_u32 utime; /* 0 Superblock update time */ ++ md_u32 state; /* 1 State bits (clean, ...) */ ++ md_u32 active_disks; /* 2 Number of currently active disks */ ++ md_u32 working_disks; /* 3 Number of working disks */ ++ md_u32 failed_disks; /* 4 Number of failed disks */ ++ md_u32 spare_disks; /* 5 Number of spare disks */ ++ md_u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 6]; ++ ++ /* ++ * Personality information ++ */ ++ md_u32 layout; /* 0 the array's physical layout */ ++ md_u32 chunk_size; /* 1 chunk size in bytes */ ++ md_u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 2]; ++ ++ /* ++ * Disks information ++ */ ++ md_descriptor_t disks[MD_SB_DISKS]; ++ ++ /* ++ * Reserved ++ */ ++ md_u32 reserved[MD_SB_RESERVED_WORDS]; ++ ++ /* ++ * Active descriptor ++ */ ++ md_descriptor_t descriptor; ++ ++} md_superblock_t; ++ ++/* ++ * options passed in raidstart: ++ */ ++ ++#define MAX_CHUNK_SIZE (4096*1024) ++ ++struct md_param ++{ ++ int personality; /* 1,2,3,4 */ ++ int chunk_size; /* in bytes */ ++ int max_fault; /* unused for now */ ++}; ++ ++typedef struct md_array_info_s { ++ /* ++ * Generic constant information ++ */ ++ md_u32 major_version; ++ md_u32 minor_version; ++ md_u32 patch_version; ++ md_u32 ctime; ++ md_u32 level; ++ md_u32 size; ++ md_u32 nr_disks; ++ md_u32 raid_disks; ++ md_u32 md_minor; ++ md_u32 not_persistent; ++ ++ /* ++ * Generic state information ++ */ ++ md_u32 utime; /* 0 Superblock update time */ ++ md_u32 state; /* 1 State bits (clean, ...) */ ++ md_u32 active_disks; /* 2 Number of currently active disks */ ++ md_u32 working_disks; /* 3 Number of working disks */ ++ md_u32 failed_disks; /* 4 Number of failed disks */ ++ md_u32 spare_disks; /* 5 Number of spare disks */ ++ ++ /* ++ * Personality information ++ */ ++ md_u32 layout; /* 0 the array's physical layout */ ++ md_u32 chunk_size; /* 1 chunk size in bytes */ ++ ++} md_array_info_t; ++ ++typedef struct md_disk_info_s { ++ /* ++ * configuration/status of one particular disk ++ */ ++ md_u32 number; ++ md_u32 major; ++ md_u32 minor; ++ md_u32 raid_disk; ++ md_u32 state; ++ ++} md_disk_info_t; ++ ++ ++/* ++ * Supported RAID5 algorithms ++ */ ++#define RAID5_ALGORITHM_LEFT_ASYMMETRIC 0 ++#define RAID5_ALGORITHM_RIGHT_ASYMMETRIC 1 ++#define RAID5_ALGORITHM_LEFT_SYMMETRIC 2 ++#define RAID5_ALGORITHM_RIGHT_SYMMETRIC 3 ++ ++#endif _MD_H +diff -Naur --exclude=CVS --exclude='*.orig' lilo/partition.c lilosh/partition.c +--- lilo/partition.c 1998-10-14 20:12:42.000000000 +0000 ++++ lilosh/partition.c 2006-01-31 19:51:58.000000000 +0000 +@@ -13,6 +13,8 @@ + #include + + #include ++#include ++#include + + #include "config.h" + #include "lilo.h" +@@ -23,7 +25,7 @@ + + + /* For older kernels ... */ +- ++#if 0 + #ifndef DOS_EXTENDED_PARTITION + #define DOS_EXTENDED_PARTITION EXTENDED_PARTITION + #endif +@@ -31,6 +33,7 @@ + #ifndef LINUX_EXTENDED_PARTITION + #define LINUX_EXTENDED_PARTITION EXTENDED_PARTITION + #endif ++#endif + + + void part_verify(int dev_nr,int type) +diff -Naur --exclude=CVS --exclude='*.orig' lilo/second.c lilosh/second.c +--- lilo/second.c 2006-02-01 21:16:41.000000000 +0000 ++++ lilosh/second.c 2006-02-01 20:25:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $Id: second.c,v 1.22 2000/11/26 07:11:16 gniibe Exp $ ++/* $Id: second.c,v 1.6 2004/10/01 19:05:58 cpchen Exp $ + * + * Secondary boot loader + * +@@ -12,7 +12,35 @@ + */ + + #include "defs.h" ++#include "common.h" + ++#define TAB_CHAR '\t' ++#define BACKSPACE '\b' ++ ++#define R64CNT 0xFFC80000 ++#define RSECCNT 0xFFC80004 ++#define RMINCNT 0xFFC80008 ++#define RHRCNT 0xFFC8000C ++#define RSECAR 0xFFC80020 ++#define RMINAR 0xFFC80024 ++#define RHRAR 0xFFC80028 ++#define RWKAR 0xFFC8002C ++#define RDAYAR 0xFFC80030 ++#define RMONAR 0xFFC80034 ++#define RTCRCR1 0xFFC80038 ++#define RTCRCR2 0xFFC8003C ++ ++#ifndef BCD_TO_BIN ++#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10) ++#endif ++ ++#ifndef BIN_TO_BCD ++#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10) ++#endif ++ ++static inline char get_char(void); ++static void dump_image_names(DESCR_SECTORS *); ++static IMAGE_DESCR * descr_label_match(char *); + static void put_string (unsigned char *); + static int get_sector_address (unsigned long, int *, unsigned long *); + static int load_sectors (unsigned long, unsigned long); +@@ -30,19 +58,35 @@ + static inline char highhex (int x) { return hexchars[(x >> 4) & 0xf]; } + static inline char lowhex (int x) { return hexchars[x & 0xf]; } + static void printouthex (int); ++static void set_delay(short delay); ++static inline int lilo_timeout() { ++ return *((char *) RTCRCR1) & 0x01; ++} + + static unsigned long base_pointer = 0; /* Avoid BSS */ + static unsigned long kernel_image = 0; /* Avoid BSS */ ++static unsigned long initrd_start = 0; ++static unsigned long initrd_end = 0; ++ ++#define INPUT_BUF_SIZE 256 ++static char input_buffer[INPUT_BUF_SIZE]; + + /* Sector descriptor */ + #define SD_DESCR1 24 ++#define SD_DESCR1_MEM 0x3200 + #define SD_DESCR2 29 ++#define SD_DESCR2_MEM 0x3400 + #define SD_DEFCMD 34 + /* 39 prompt (byte) */ + /* 40 length (word) */ + #define SD_MSG 42 + #define SD_KBDTBL 47 + ++/* use the section attribute and linker script to force the start function to ++ the beginning of the second stage reserved area. ++ This is where first.S will jmp */ ++void start (unsigned long base) __attribute__((section(".entry"))); ++ + static inline char *string_set (char *dest, const char *str) + { + int len = strlen (str); +@@ -53,11 +97,16 @@ + void + start (unsigned long base) + { +- base_pointer = base; ++ base_pointer = base; ++ unsigned char ch; ++ int input_idx; ++ IMAGE_DESCR *image_descr; ++ int desc; ++ int defer_delay=0; + + put_string ("I"); +- load_sectors (SD_DESCR1, 0x3200); +- load_sectors (SD_DESCR2, 0x3400); ++ load_sectors (SD_DESCR1, SD_DESCR1_MEM); ++ load_sectors (SD_DESCR2, SD_DESCR2_MEM); + put_string ("L"); + /* XXX: checksum */ + +@@ -73,30 +122,72 @@ + /* XXX: check signature */ + /* Input command line */ + /* XXX: Is there default command line? Use it! */ +- put_string ("boot: "); +- put_string ("first-image\n"); /* XXX: should handle input commandline... */ + +- /* Structure of descriptor +- [ checksum 2byte ] +- [ DESCR_SIZE:52-byte +- (image-name (16-byte) +- passwd (16-byte) +- rd_size (4-byte) +- initrd (5-byte sector desc) +- start (5-byte sector desc) +- start_page (16-bit) +- flags (16-bit) +- vga_mode (16-bit) +- ) +- ] * 19 +- */ ++ /* Structure of descriptor ++ [ checksum 2byte ] ++ [ DESCR_SIZE:52-byte ++ (image-name (16-byte) ++ passwd (16-byte) ++ rd_size (4-byte) ++ initrd (5-byte sector desc) ++ start (5-byte sector desc) ++ start_page (16-bit) ++ flags (16-bit) ++ vga_mode (16-bit) ++ ) ++ ] * 19 ++ */ ++ ++ input_buffer[0] = '\0'; ++ if (((BOOT_SECTOR *) base_pointer)->par_1.prompt) { ++ if (((BOOT_SECTOR *) base_pointer)->par_1.timeout != 0xffff) ++ set_delay(((BOOT_SECTOR *) base_pointer)->par_1.timeout); ++boot_loop: ++ input_idx = 0; ++ put_string ("boot: "); ++ while ((ch=get_char()) != 0x0d && input_idx < INPUT_BUF_SIZE-1) { ++ switch (ch) { ++ case TAB_CHAR: ++ defer_delay = 1; ++ dump_image_names((DESCR_SECTORS *) (base_pointer + SD_DESCR1_MEM)); ++ goto boot_loop; ++ break; ++ case BACKSPACE: ++ defer_delay = 1; ++ if (input_idx) --input_idx; ++ break; ++ case 0x00FF: ++ break; ++ default: ++ defer_delay = 1; ++ input_buffer[input_idx++] = ch; ++ break; ++ } ++ if (!defer_delay && lilo_timeout()) ++ break; ++ } ++ input_buffer[input_idx++] = ' '; ++ input_buffer[input_idx] = '\0'; ++ if ( ! (image_descr = descr_label_match(input_buffer)) ) { ++ put_string("No such image. [Tab] shows a list.\n"); ++ goto boot_loop; ++ } ++ } ++ else { ++ // dispatch the default image after the delayed timeout ++ // 0 or default == immediate dispatch ++ set_delay(((BOOT_SECTOR *) base_pointer)->par_1.delay); ++ do { ++ } while (!lilo_timeout()); /* NULL */ ++ image_descr = descr_label_match(input_buffer); ++ } + + put_string ("Loading "); +- put_string ((char *)(base_pointer+0x3200+2)); /* Image name */ ++ put_string (image_descr->name); /* Image name */ + + kernel_image = base_pointer + 0x10000 - 0x400; + { +- int desc = 0x3200+2+16+16+4+5; /* kernel image */ ++ desc = (int) image_descr+(16+16+4+5) - (int) base_pointer; + + /* Skip two sectors: Fallback command line and options */ + desc = load_sectors_with_maps (desc, 0, &kernel_image); +@@ -108,7 +199,21 @@ + put_string ("."); + } + } +- put_string ("done.\n"); ++ put_string ("done.\n\n"); ++ ++ desc = (int) image_descr+(16+16+4) - (int) base_pointer; ++ initrd_start = kernel_image = 0x88000000 + memory_size() / 2; ++ desc = load_sectors_with_maps (desc, 0, &kernel_image); ++ if (desc) { ++ put_string("ramdisk image loading"); ++ put_string("."); ++ while (desc != 0) { ++ desc = load_sectors_with_maps (desc, 0, &kernel_image); ++ put_string("."); ++ } ++ put_string ("done.\n\n"); ++ } ++ initrd_end = kernel_image; + + #if 0 + { +@@ -123,24 +228,39 @@ + + /* XXX: kernel paramerter setting */ + { +- unsigned long parm = base_pointer - 0x200000 + 0x1000; ++ unsigned long parm = base_pointer + (~0x9cf000+1); + char *cmdline = (char *)(parm+256); + int mem_size; +- unsigned char *p; ++ unsigned char *p, *debug_p; + + *(long *)parm = 1; /* Read only mount? */ + *(long *)(parm+4) = 0; /* RAMDISK Flags */ + *(long *)(parm+8) = 0x0301; /* Root device: XXX should get from cls.. */ + *(long *)(parm+12) = 1; /* Loader type (LILO = 1) */ +- *(long *)(parm+16) = 0; /* Initrd start */ +- *(long *)(parm+20) = 0; /* Initrd size */ ++ if (initrd_end - initrd_start) { ++ initrd_start += ~0x88030000 + 1; ++ *(long *)(parm+16) = initrd_start; /* Initrd start */ ++ initrd_end += ~0x88030000 + 1; /* Initrd size */ ++ *(long *)(parm+20) = initrd_end + (~initrd_start + 1);/* Initrd size */ ++ } ++ else { ++ *(long *)(parm+16) = 0; /* Initrd start */ ++ *(long *)(parm+20) = 0; /* Initrd size */ ++ } + *(long *)(parm+24) = 0; /* Not defined yet */ + + /* XXX: Should take the line from command line sector... */ ++ if (*input_buffer) { ++ debug_p = cmdline; ++ cmdline = string_set(cmdline, input_buffer); ++ *cmdline = '\0'; ++ } ++ + #define DC_MAGIC 0xf4f2 /* magic number of default cmd. line sector */ + p = (unsigned char *)(base_pointer+0x3600); + if(p[0] == (DC_MAGIC & 0xff) && p[1] == (DC_MAGIC >> 8)) + cmdline = string_set(cmdline, p+2); ++ + cmdline = string_set(cmdline, (char *)(base_pointer + 0x10000 - 0x200)); + + #if 0 +@@ -231,7 +351,7 @@ + /* There's next map */ + return 0x3000+505; + } +- ++ + static int + machine_type (void) + { +@@ -296,6 +416,77 @@ + : "memory"); + } + ++static char inline ++get_char(void) ++{ ++ register long __sc0 __asm__ ("r0") = 1; /* OUTPUT */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0) ++ : "memory"); ++ return __sc0; ++} ++ ++static IMAGE_DESCR * ++descr_label_match(char * boot_buffer) ++{ ++ IMAGE_DESCR *descr = ++ ((DESCR_SECTORS *) (base_pointer + SD_DESCR1_MEM))->d.descr; ++ char * buf_ptr=boot_buffer; ++ char * name; ++ ++ while (*boot_buffer && (*boot_buffer == ' ' || *boot_buffer == '\t')) ++ ++boot_buffer; ++ ++ if ( ! *boot_buffer ) { ++ return descr; ++ } ++ ++ for ( buf_ptr=boot_buffer; *descr->name; ++descr, buf_ptr=boot_buffer) { ++ name = descr->name; ++ for ( ; *name == *buf_ptr; ++name, ++buf_ptr) ; ++ if (!*name && (!*buf_ptr || *buf_ptr == ' ' || *buf_ptr == '\t')) { ++ // overwrite the boot_buffer with the string after the ++ // boot image name. ++ while (*boot_buffer++ = *buf_ptr++) ; ++ return descr; ++ } ++ } ++ return NULL; ++} ++ ++static void ++dump_image_names(DESCR_SECTORS *descr_area) ++{ ++ int buf_idx=0, name_len; ++ char * name; ++ IMAGE_DESCR *descr = descr_area->d.descr; ++ ++ put_string("\n"); ++ for ( ; *descr->name; ++descr) ++ { ++ name = descr->name; ++ name_len = strlen(name); ++ memcpy(input_buffer + buf_idx, name, name_len); ++ buf_idx += name_len; ++ name_len = MAX_IMAGE_NAME+1 - name_len; ++ memset(input_buffer + buf_idx, ' ', name_len); ++ buf_idx += name_len; ++ if ( buf_idx >= 78 ) { ++ input_buffer[buf_idx++] = '\n'; ++ input_buffer[buf_idx++] = '\0'; ++ put_string(input_buffer); ++ buf_idx = 0; ++ } ++ } ++ if (buf_idx) { ++ input_buffer[buf_idx++] = '\n'; ++ input_buffer[buf_idx] = '\0'; ++ put_string(input_buffer); ++ } ++} ++ + static void inline + put_string_1 (unsigned char *str, long len) + { +@@ -344,15 +535,17 @@ + unsigned char *p = (unsigned char *)(sector_desc+base_pointer); + int len; + ++ + /* Number of sectors */ + len = (int)p[4]; + if (len == 0) + return 0; + + /* p[2]: drive number */ +- if ((int)p[2] < 0xc0) ++ if ((int)p[2] < 0xc0) { + /* XXX: should return error */ + put_string ("ERROR: Sector address is not in LBA\n"); ++ } + + *devp = (int)p[2] & 0x0f; + +@@ -394,8 +587,56 @@ + + return -1; + } +- +-#if 0 ++ ++static void set_delay(short delay) ++{ ++ char rtc_sec, rtc_min, rtc_hr; ++ int alarm_time; ++ char arm_sec, arm_min, arm_hr; ++ char regval; ++ char tenths, seconds, minutes, hour; ++ ++ // Make sure the RTC is running ++ *(char*)RTCRCR2 = 0x09; ++ ++ // Make sure ENB bits are off ++ *(char*)RWKAR &= 0x7f; ++ *(char*)RDAYAR &= 0x7f; ++ *(char*)RMONAR &= 0x7f; ++ ++ // Read time ++ do { ++ *(char*)RTCRCR1 = 0x00; // Clear CF-bit ++ rtc_sec = *(char*)RSECCNT; ++ rtc_min = *(char*)RMINCNT; ++ rtc_hr = *(char*)RHRCNT; ++ } while ((*(char*)RTCRCR1 & 0x80) != 0); ++ ++ BCD_TO_BIN(rtc_hr); ++ BCD_TO_BIN(rtc_min); ++ BCD_TO_BIN(rtc_sec); ++ ++ alarm_time = ((rtc_hr * 60) + rtc_min) * 60 + rtc_sec + (delay / 10); ++ ++ arm_sec = alarm_time % 60; ++ arm_min = (alarm_time / 60) % 60; ++ arm_hr = alarm_time / 3600; ++ if (arm_hr >= 24) ++ arm_hr = arm_hr - 24; ++ ++ BIN_TO_BCD(arm_sec); ++ BIN_TO_BCD(arm_min); ++ BIN_TO_BCD(arm_hr); ++ ++ *(char*)RSECAR = arm_sec | 0x80; ++ *(char*)RMINAR = arm_min | 0x80; ++ *(char*)RHRAR = arm_hr | 0x80; ++ ++ // Clear AF bit ++ *(char*)RTCRCR1 = 0; ++} ++ ++#if 1 + static void + printouthex(int x) + { +@@ -408,4 +649,14 @@ + + put_string (z); + } ++ ++static void dump_desc(char * desc) ++{ ++ printouthex((int) desc[0]); ++ printouthex((int) desc[1]); ++ printouthex((int) desc[2]); ++ printouthex((int) desc[3]); ++ printouthex((int) desc[4]); ++ put_string("\n"); ++} + #endif +diff -Naur --exclude=CVS --exclude='*.orig' lilo/second.lds lilosh/second.lds +--- lilo/second.lds 2006-02-01 21:16:41.000000000 +0000 ++++ lilosh/second.lds 2006-01-31 22:44:27.000000000 +0000 +@@ -83,6 +83,7 @@ + .plt : { *(.plt) } + .text : + { ++ *(.entry) + *(.text) + *(.text.*) + *(.stub) +diff -Naur --exclude=CVS --exclude='*.orig' lilo/string.c lilosh/string.c +--- lilo/string.c 2006-02-01 21:16:41.000000000 +0000 ++++ lilosh/string.c 2004-05-19 16:39:08.000000000 +0000 +@@ -20,3 +20,8 @@ + + return dest; + } ++ ++void * memset(void * dest, int val, unsigned int count) ++{ ++ while (count--) *((char *)dest++) = val; ++} diff --git a/packages/lilo-sh/files/lilo-noconfig-h.patch b/packages/lilo-sh/files/lilo-noconfig-h.patch new file mode 100644 index 0000000000..01b6cbddd3 --- /dev/null +++ b/packages/lilo-sh/files/lilo-noconfig-h.patch @@ -0,0 +1,23 @@ +Stop it looking for config.h. It doesn't need it and trying to include this +from libc-headers results in an compile time error. + +--- lilo/lilo.h 2006/06/28 05:40:25 1.1 ++++ lilo/lilo.h 2006/06/28 05:40:36 +@@ -11,17 +11,6 @@ + #ifndef LILO_H + #define LILO_H + +-/* +- * Starting with 2.1.something, Linux kernels put VGA constants and segment +- * definitions into asm/boot.h instead of linux/config.h +- */ +- +-#ifdef HAS_BOOT_H +-#include +-#else +-#include +-#endif +- + #define VERSION 20 /* Boot sector, map file, and chain loader format + revision. This number does not necessarily have + to correspond to the version number of the entire diff --git a/packages/lilo-sh/files/lilo-sh-linux.patch b/packages/lilo-sh/files/lilo-sh-linux.patch new file mode 100644 index 0000000000..0eadf26cff --- /dev/null +++ b/packages/lilo-sh/files/lilo-sh-linux.patch @@ -0,0 +1,1971 @@ +This is the patch that upgrade lilo to match the version included in +the old lilosh CVS. + +diff -ruN lilo.orig/ChangeLog lilo/ChangeLog +--- lilo.orig/ChangeLog Thu Jan 1 09:00:00 1970 ++++ lilo/ChangeLog Thu Dec 7 16:17:10 2000 +@@ -0,0 +1,44 @@ ++2000-11-26 NIIBE Yutaka ++ ++ * first.S (done): Flush the cache. ++ * second.c (start): Call cache_flush. ++ (cache_flush): New function. ++ ++2000-11-25 NIIBE Yutaka ++ ++ * first.S: Don't put '$' for register spec. ++ * second.c (start): Don't put '$' for register spec. ++ (machine_type, memory_size, io_base, put_string_1, read_sectors): ++ Likewise. ++ * second.lds: Use new tool chain's ldscript. ++ * defs.h: Add declaration of memcpy. ++ ++2000-09-09 NIIBE Yutaka ++ ++ * first.S (real_start): Set argument 0 for cache enable call. ++ ++2000-08-19 NIIBE Yutaka ++ ++ * second.c (get_sector_address): Bug fix for # of sector == 0. ++ (start): Support machine types of CqREEK and SolutionEngine. ++ ++ * first.S (load_sector_address): Bug fix for checking LBA. ++ (real_start): Call "enable cache" BIOS feature. ++ ++2000-08-05 NIIBE Yutaka ++ ++ * Makefile (first.o): Added -traditional for "'" in comments. ++ ++ * second.c (machine_type, serial_type, memory_size, io_base): New ++ functions. ++ (start): Implement kernel command line handling a bit. ++ (read_sectors): Emit error message. ++ (get_sector_address): Emit error message. ++ ++ * first.S (read_a_sector): Implement error handling. ++ (load_sector_address): Check if it's LBA. ++ ++2000-07-22 NIIBE Yutaka ++ ++ * second.c (start): Don't load two magic sectors at the memory ++ of executable image. +diff -ruN lilo.orig/Makefile lilo/Makefile +--- lilo.orig/Makefile Fri Dec 8 10:10:02 2000 ++++ lilo/Makefile Fri Dec 8 11:46:04 2000 +@@ -39,76 +39,55 @@ + GO=-DGO=0x`sed '/go/s/^.*go 0 \(....\) A.*$$/\1/p;d' first.lis` + + SHELL=/bin/sh +-CC=cc +-CPP=$(CC) -E +-AS86=as86 -0 -a +-LD86=ld86 -0 + +-CFLAGS=-Wall -g $(PCONFIG) +-LDFLAGS=#-Xlinker -qmagic ++CROSS_COMPILE = sh3-linux- ++CC =$(CROSS_COMPILE)gcc ++LD =$(CROSS_COMPILE)ld ++OBJCOPY =$(CROSS_COMPILE)objcopy ++STRIP =$(CROSS_COMPILE)strip ++ ++CFLAGS = -O2 -I. -pipe -fPIC $(CONFIG) -DPATH_MAX=255 ++CPP=$(CC) -E -traditional ++ ++#CFLAGS=-Wall -g $(PCONFIG) ++#LDFLAGS=#-Xlinker -qmagic + + OBJS=lilo.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o temp.o \ + partition.o identify.o + +-.SUFFIXES: .img .b ++.SUFFIXES: .b + +-all: check-config lilo boot.b dump.b os2_d.b chain.b dparam.com \ +- activate +- +-check-config: +- $(CPP) check-config.cpp $(PCONFIG) >/dev/null ++all: lilo boot.b + + .c.o: + $(CC) -c $(CFLAGS) $*.c + +-.s.o: +- $(AS86) -w -o $*.o $*.s +- +-.o.img: +- $(LD86) -s -o $*.img $*.o ++boot.b: first.bin second.bin ++ cat first.bin second.bin >boot.b + +-.img.b: +- dd if=$*.img of=$*.b bs=32 skip=1 ++first.bin: first.exe ++ $(OBJCOPY) -S first.exe -O binary first.bin + +-activate: activate.c +- $(CC) -Wall -s -O -o activate activate.c $(LDFLAGS) +- +-dparam.com: dparam.img +- dd if=dparam.img of=dparam.com bs=288 skip=1 +- +-lilo: $(OBJS) +- $(CC) -o lilo $(LDFLAGS) $(OBJS) ++second.bin: second.exe ++ $(OBJCOPY) -R .comment -S second.exe -O binary second.bin + +-boot.b: first.b second.b +- (dd if=first.b bs=512 conv=sync; dd if=second.b) >boot.b ++first.exe: first.o ++ $(LD) -EL -e start first.o -o first.exe -Ttext 0x8c200000 + +-first.s: first.S lilo.h lilo +- $(CPP) $(PCONFIG) `./lilo -X` first.S -o first.s ++second.exe: second.o string.o ++ $(LD) -T second.lds -EL second.o string.o -o second.exe -Ttext 0x8c201000 + +-second.s: second.S lilo.h lilo +- $(CPP) $(PCONFIG) $(GO) `./lilo -X` second.S -o second.s ++first.o: first.S ++ $(CC) $(CFLAGS) -c first.S + +-chain.s: chain.S lilo.h +- $(CPP) $(PCONFIG) $(GO) chain.S -o chain.s ++second.o: second.c ++ $(CC) $(CFLAGS) -c second.c + +-os2_d.s: chain.S lilo.h +- $(CPP) $(PCONFIG) $(GO) chain.S -DDOS_D -o os2_d.s ++string.o: string.c ++ $(CC) $(CFLAGS) -c string.c + +-#dos_d.s: chain.S lilo.h first.lis +-# $(CPP) $(PCONFIG) $(GO) chain.S -DDOS_D -o dos_d.s +- +-dump.s: dump.S lilo.h first.lis +- $(CPP) $(PCONFIG) `./lilo -X` dump.S -DDOS_D -o dump.s \ +- -DGO=0x`sed '/go/s/^.*go 0 \(....\) A.*$$/\1/p;d' first.lis` +- +-xxx.s: chain.S lilo.h +- $(CPP) chain.S -DXXX -o xxx.s +- +-first.o first.lis: first.s +- $(AS86) -w -o first.o -l first.lis first.s +- +-second.lis: second.s +- $(AS86) -w -l second.lis second.s ++lilo: $(OBJS) ++ $(CC) -o lilo $(LDFLAGS) $(OBJS) + + install: all + if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir $$ROOT$(SBIN_DIR); fi +@@ -118,13 +97,9 @@ + mkdir $$ROOT$(USRSBIN_DIR); fi + if [ -f $$ROOT$(BOOT_DIR)/boot.b ]; then \ + mv $$ROOT$(BOOT_DIR)/boot.b $$ROOT$(BOOT_DIR)/boot.old; fi +- if [ -f $$ROOT$(BOOT_DIR)/chain.b ]; then \ +- mv $$ROOT$(BOOT_DIR)/chain.b $$ROOT$(BOOT_DIR)/chain.old; fi +- if [ -f $$ROOT$(BOOT_DIR)/os2_d.b ]; then \ +- mv $$ROOT$(BOOT_DIR)/os2_d.b $$ROOT$(BOOT_DIR)/os2_d.old; fi +- cp boot.b chain.b os2_d.b $$ROOT$(BOOT_DIR) ++ cp boot.b $$ROOT$(BOOT_DIR) + cp lilo $$ROOT$(SBIN_DIR) +- strip $$ROOT$(SBIN_DIR)/lilo ++ $(STRIP) $$ROOT$(SBIN_DIR)/lilo + cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR) + @if [ -e $$ROOT/etc/lilo/install ]; then echo; \ + echo -n "$$ROOT/etc/lilo/install is obsolete. LILO is now ";\ +@@ -142,11 +117,8 @@ + && mv ../lilo ../lilo-`cat VERSION` + + clean: +- rm -f *.o *.img *.lis first.s second.s chain.s \ +- os2_d.s dump.s tmp_make first.b second.b +- +-spotless: clean +- rm -f lilo activate boot.b chain.b os2_d.b dump.b dparam.com ++ rm -f *.o *.exe *.bin tmp_make ++ rm -f lilo boot.b + + ### Dependencies + activate.o : activate.c +diff -ruN lilo.orig/chain.S lilo/chain.S +--- lilo.orig/chain.S Thu Oct 15 05:14:25 1998 ++++ lilo/chain.S Thu Jan 1 09:00:00 1970 +@@ -1,255 +0,0 @@ +-/* chain.S - LILO boot chainer */ +- +-/* Copyright 1992-1998 Werner Almesberger. See file COPYING for details. */ +- +- +-#define LILO_ASM +-#include "lilo.h" +- +- +- .text +- +- .globl _main +- .org 0 +- +-_main: jmp start +- +- .org 6 +- +- .ascii "LILO" +- .word STAGE_CHAIN +- .word VERSION +- +-offset: .word 0 +-drive: .byte 0 +- .byte 0 ! head, always zero +- +-hint: .word drvmap ! pointer to drive map +- +-ptable: .blkw 0x20 ! partition table to preload +- +-start: cli ! set SS:SP to 0:7C00 +- xor ax,ax +- mov ss,ax +- mov ax,#0x7c00 +- mov sp,ax +- sti +- mov ax,#SETUPSEG ! move boot sector to default location +- mov ds,ax +- xor ax,ax +- mov es,ax +- mov cx,#256 +-mtmp = SETUPSECS-1 ! broken math ... +- mov si,#mtmp*512 +- mov di,#BOOTSEG*16 +- rep +- movsw +-#ifdef DOS_D +-dos4: seg es +- mov byte ptr BOOTSEG*16+0x24,#0x81 +-#endif +- mov cx,#0x20 ! move partition table +- mov si,#ptable +- mov di,#PART_TABLE +- rep +- movsw +- ! mess with the partition table +-#if defined(LCF_REWRITE_TABLE) || defined(LCF_READONLY) +- mov si,#prtmap ! get partition table change rules +-prtclp: lodsw ! bios == 0 indicates end +- or al,al +- jz pmend ! at end -> quit +- cmp al,cache ! already in cache ? +- je incache ! yes -> no loading required +- push ax ! save table data +- call flush ! flush the cache +- pop ax +- push ax +- mov cache,al ! remember drive in cache +- cmp al,drive ! boot drive ? +- jne noc ! no -> load into scratch area +- xor ax,ax ! load at 0000:0600 +- mov bx,#PARTS_LOAD +- jmp loadit +-noc: mov ax,ds +- mov bx,#PARTS_SCR ! scratch area +-loadit: mov es,ax ! set up pointers and remember them +- mov ces,ax +- mov cbx,bx +- mov ax,#0x201 ! load partition table, one sector +- mov dx,cache ! drive from cache (DH = 0) +- mov cx,#1 +- int 0x13 ! load it +- jc wrfail ! error -> abort +- pop ax ! get BIOS and offset +-incache:les bx,cbx ! load pointer +- add bx,#PART_TABLE_OFFSET ! move to partition table +- add bl,ah ! offset is always in [0x1be,0x1fd] +- lodsw ! see what we need to do +- seg es ! match ? +- cmp byte ptr (bx),al +- jne nocng ! no -> do not change +- seg es ! change +- mov byte ptr (bx),ah +- mov byte ptr dirty,#1 ! mark as dirty +-nocng: br prtclp ! next one +- +-flush: test byte ptr dirty,#1 ! dirty ? +- jz noflush ! no -> do not write +- mov ax,#0x301 ! write one sector +- mov dx,cache ! get the drive +- or dl,dl ! nothing cached ? +- jz noflush ! no -> do not flush +- les bx,cbx ! reload pointer +- int 0x13 ! write ... +- jc wrfail ! argl +-noflush:ret +-pmend: call flush ! flush table +- br nopp ! and proceed +-wrfail: mov si,#failmsg ! complain +- call say +- mov ax,#FIRSTSEG ! try to restart LILO +- jmpi #GO,FIRSTSEG +- +-cache: .byte 0 ! drive, 0 means not cached +- .byte 0 ! head, always 0 +-cbx: .blkw 1 +-ces: .blkw 1 +-dirty: .byte 0 +- +-#endif +- +-nopp: +- mov ax,drvmap ! need to install mapper ? +- or ax,ax +- jz noimap ! no -> go on +- call swap13 +-noimap: +- +- mov si,offset ! DS:SI and ES:SI point to the partition +- add si,#PART_TABLE +- mov dx,drive ! initialize DX (drive and head) +- xor ax,ax ! set DS and ES to zero +-#ifdef XXX +- mov ax,ds +- mov es,ax +- mov si,#lilosig +- mov bx,#cmd +- mov dl,#0xfe +-#else +- mov ds,ax +- mov es,ax +-#endif +- mov bp,#0 ! might help some boot problems +- mov ax,#0xaa55 ! boot signature (just in case ...) +- jmpi #BOOTSEG*16,0 ! start boot sector +- +-#ifdef XXX +-lilosig:.ascii "LILO" +-cmd: .ascii "98" +- .byte 0 +-#endif +- +-#if defined(LCF_REWRITE_TABLE) +- +-! Display a NUL-terminated string on the console +- +-say: lodsb ! get byte +- or al,al ! NUL ? +- jz aret ! yes -> done +- mov ah,#14 ! display, tty-style +- xor bh,bh +- int 0x10 +- jmp say ! next one +-aret: ret ! done +- +-failmsg:.ascii "Rewrite error." +- .byte 13,10,0 +- +-#endif +- +-swap13: seg es ! allocate 1 kB +- dec word ptr [0x413] +- int 0x12 ! get start segment +- mov cl,#6 +- shl ax,cl +- cli ! disable interrupts +- xor bx,bx ! zero a few registers +- mov di,bx +- seg es ! change offset +- xchg bx,[0x4c] +- mov old13of,bx +- mov bx,ax ! change segment +- seg es +- xchg bx,[0x4e] +- mov old13sg,bx +- mov es,ax ! move drive swapper +- mov si,#new13 +- mov cx,#new13end-new13 +- rep +- movsb +- sti ! enable interrupts +- ret ! done +- +-new13: push ax ! save AX (contains function code in AH) +- push bp ! need BP to mess with stack +- mov bp,sp +- ! Stack layout: +- ! +- ! +8 INT flags +- ! +6 INT CS +- ! +4 INT IP +- ! +2 AX +- ! BP+0 BP +- pushf ! push flags (to act like interrupt) +- push si +- mov si,#drvmap-new13 +-mapfl: seg cs ! get next entry +- lodsw +- or ax,ax ! at end ? +- jz nomap ! yes -> do not map +- cmp dl,al ! match ? +- jne mapfl ! no -> continue +- mov dl,ah ! map drive +-nomap: pop si ! restore SI +- mov 8(bp),ax ! overwrite old flags (to remember mapping) +- mov ax,2(bp) ! restore AX +- mov bp,(bp) ! restore BP +- .byte 0x9a ! CALL FAR +-old13of:.word 0 +-old13sg:.word 0 +- push bp ! save BP again +- mov bp,sp +- ! New stack layout: +- ! +- ! +10 mapping (was flags) +- ! +8 INT CS +- ! +6 INT IP +- ! +4 AX +- ! +2 obsolete BP +- ! BP+0 BP +- xchg ax,4(bp) ! save AX and get command +- pushf ! fix driver number, if necessary +- cmp ah,#8 ! do not fix +- je done13 +- cmp ah,#0x15 ! do not fix +- je done13 +- mov ax,10(bp) ! no mapping ? +- or ax,ax +- jz done13 +- mov dl,al ! fix mapping +-done13: mov ax,4(bp) ! restore AX +- pop 10(bp) ! restore flags +- pop bp ! get BP +- add sp,#4 ! fix SP +- iret ! done +- +-drvmap: .blkw DRVMAP_SIZE+1 +- +-new13end: +- +-#if defined(LCF_REWRITE_TABLE) +-prtmap: .blkw PRTMAP_SIZE*2+1 ! only first word of last entry is read +-#endif +- +-theend: +diff -ruN lilo.orig/chain.old.S lilo/chain.old.S +--- lilo.orig/chain.old.S Wed Jun 18 16:42:15 1997 ++++ lilo/chain.old.S Thu Jan 1 09:00:00 1970 +@@ -1,260 +0,0 @@ +-/* chain.S - LILO boot chainer */ +- +-/* Copyright 1992-1997 Werner Almesberger. See file COPYING for details. */ +- +- +-#define LILO_ASM +-#include "lilo.h" +- +- +- .text +- +- .globl _main +- .org 0 +- +-_main: jmp start +- +- .org 2 +- +- .ascii "LILO" +- .word STAGE_CHAIN +- .word VERSION +- +-offset: .word 0 +-drive: .byte 0 +- .byte 0 ! head, always zero +- +-start: cli ! set SS:SP to 0:7C00 +- xor ax,ax +- mov ss,ax +- mov ax,#0x7c00 +- mov sp,ax +- sti +- mov ax,#SETUPSEG ! move boot sector to default location +- mov ds,ax +- xor ax,ax +- mov es,ax +- mov cx,#256 +- mov si,#512 +- mov di,#BOOTSEG*16 +- rep +- movsw +- push bx ! save secret message +-#ifdef DOS_D +-#if 0 +- seg es +- cmp byte ptr BOOTSEG*16+0x26,#0x29 +- je dos4 +- mov bx,#baddos ! complain +- call say +- mov ax,#FIRSTSEG ! restart LILO +- jmpi #GO,FIRSTSEG +-#endif +-dos4: seg es +- mov byte ptr BOOTSEG*16+0x24,#0x81 +-#endif +- mov cx,#0x20 ! move partition table +- mov si,#PART_TABLE_OFFSET +- mov di,#PART_TABLE +- rep +- movsw +-#if defined(SWAP_HD) || defined(SWAP_FD) +- call swap13 +-#endif +- ! table entry +- pop bx ! get secret message (active partition) +-#ifdef LCF_REWRITE_TABLE +- or bl,bl ! none set ? +- jz tonopp ! yes -> do not patch +-br tonopp +- cmp bx,#0x81 ! valid code ? +- jb towrfail ! no -> abort +- cmp bx,#0x84 +- jna wrokay ! yes -> continue +-towrfail:br wrfail +-tonopp: br nopp +-wrokay: push bx ! save BX +- xor ax,ax ! ES becomes 0 +- mov es,ax +- mov ax,#0x201 ! load partition table, one sector +- mov dx,#0x80 ! first drive +- mov cx,#1 +- mov bx,#PARTS_LOAD +- int 0x13 ! load it +- jc wrfail ! error -> abort +- mov cx,#4 ! process all four entries +- mov bx,#PART_TABLE +-ptchpt: seg es ! clear all active flags +- mov byte ptr (bx),#0 +-#if defined(LCF_FIX_TYPE) && defined(LCF_HIDE_DOS) +- seg es +- mov al,(bx+4) ! get partition type +- cmp al,#PART_DOS12 ! hidden ? +- je hideme ! no -> hide it +- cmp al,#PART_DOS16 +- je hideme +- cmp al,#PART_DOS32 +- jne nonrel ! already hidden -> continue +-hideme: add al,#HIDDEN_OFF ! write back corrected value +- seg es +- mov (bx+4),al +-#endif +-nonrel: add bx,#16 ! next entry +- loop ptchpt +- pop bx ! compute active flag position +- dec bx +- shl bl,1 +- shl bx,1 +- shl bx,1 +- shl bx,1 +- cmp bx,offset ! right ? +- jne wrfail ! no -> abort +- seg es ! set active flag +- mov byte ptr (bx+PART_TABLE),#0x80 +-#ifdef LCF_FIX_TYPE +- seg es ! is this a +- mov al,byte ptr (bx+PART_TABLE+4) +- cmp al,#PART_HDOS12 ! hidden ? +- je unhideme ! yes -> unhide it +- cmp al,#PART_HDOS16 +- je unhideme +- cmp al,#PART_HDOS32 +- jne nounhid ! not hidden -> continue +-unhideme:sub al,#HIDDEN_OFF ! write back corrected value +- seg es +- mov (bx+PART_TABLE+4),al +-#endif +-nounhid:mov ax,#0x301 ! save it (restore all registers for +- mov dx,#0x80 ! paranoia) +- mov cx,#1 +- mov bx,#0x600 +- int 0x13 ! write ... +- jc wrfail ! argl +- mov bx,#passmsg ! confirm modification +- call say +- jmp nopp +-wrfail: mov bx,#failmsg ! complain +- call say +- mov ax,#FIRSTSEG ! restart LILO +- jmpi #GO,FIRSTSEG +-#endif +-nopp: mov si,offset ! DS:SI and ES:SI point to the partition +- add si,#PART_TABLE +- mov dx,drive ! initialize DX (drive and head) +- xor ax,ax ! set DS and ES to zero +-#ifdef XXX +- mov ax,ds +- mov es,ax +- mov si,#lilosig +- mov bx,#cmd +- mov dl,#0xfe +-#else +- mov ds,ax +- mov es,ax +-#endif +- mov bp,#0 ! might help some boot problems +- mov ax,#0xaa55 ! boot signature (just in case ...) +- jmpi #BOOTSEG*16,0 ! start boot sector +- +-#ifdef XXX +-lilosig:.ascii "LILO" +-cmd: .ascii "98" +- .byte 0 +-#endif +- +-#if defined(DOS_D) || defined(LCF_REWRITE_TABLE) +- +-! Display a NUL-terminated string on the console +- +-say: mov al,(bx) ! get byte +- or al,al ! NUL ? +- jz aret ! yes -> done +- push bx ! save pointer +- mov ah,#14 ! display, tty-style +- xor bh,bh +- int 0x10 +- pop bx +- inc bx ! next one +- jmp say +-aret: ret ! done +- +-#ifdef DOS_D +-baddos: .ascii "Need DOS version 4 or newer." +- .byte 13,10,0 +-#endif +- +-failmsg:.ascii "Rewrite error." +- .byte 13,10,0 +- +-passmsg:.ascii "Rewrote the partition table." +- .byte 13,10,0 +- +-#endif +- +-#if defined(SWAP_HD) || defined(SWAP_FD) +- +-swap13: seg es ! allocate 1 kB +- dec word ptr [0x413] +- int 0x12 ! get start segment +- mov cl,#6 +- shl ax,cl +- cli ! disable interrupts +- xor bx,bx ! zero a few registers +- mov di,bx +- seg es ! change offset +- xchg bx,[0x4c] +- mov old13of,bx +- mov bx,ax ! change segment +- seg es +- xchg bx,[0x4e] +- mov old13sg,bx +- mov es,ax ! move drive swapper +- mov si,#new13 +- mov cx,#new13end-new13 +- rep +- movsb +- sti ! enable interrupts +- ret ! done +- +-new13: seg cs ! save function code +- mov fcode-new13,ah +- test dl,#0x80 ! hard disk drive ? +-#ifdef SWAP_FD +- jnz noswap ! yes -> go on +-#else +- jz noswap ! no -> go on +-#endif +- xor dl,#1 ! swap drive 0 and 1 +-noswap: pushf +- .byte 0x9a ! CALL FAR +-old13of:.word 0 +-old13sg:.word 0 +- pushf ! fix driver number, if necessary +- seg cs +- cmp byte ptr fcode-new13,#8 ! do not fix +- je done13 +- seg cs +- cmp byte ptr fcode-new13,#0x15 ! do not fix +- je done13 +- test dl,#0x80 ! hard disk drive ? +-#ifdef SWAP_FD +- jnz done13 ! yes -> go on +-#else +- jz done13 ! no -> go on +-#endif +- xor dl,#1 ! fix it +-done13: seg cs +- mov tmpbx-new13,bx ! restore flags +- mov bx,sp +- seg ss +- pop 6(bx) +- seg cs +- mov bx,tmpbx-new13 +- iret ! done +-new13end: +-fcode: .byte 0 ! function code +-tmpbx: .word 0 +- +-#endif +- +-theend: +diff -ruN lilo.orig/defs.h lilo/defs.h +--- lilo.orig/defs.h Thu Jan 1 09:00:00 1970 ++++ lilo/defs.h Thu Dec 7 16:17:10 2000 +@@ -0,0 +1,2 @@ ++extern void *memcpy (void *__dest, const void *__src, unsigned int __n); ++extern int strlen (__const char *__s); +diff -ruN lilo.orig/dump.S lilo/dump.S +--- lilo.orig/dump.S Wed Jun 18 16:42:22 1997 ++++ lilo/dump.S Thu Jan 1 09:00:00 1970 +@@ -1,131 +0,0 @@ +-/* dump.S - LILO register dumper */ +- +-/* Copyright 1995-1997 Werner Almesberger. See file COPYING for details. */ +- +- +-#define LILO_ASM +-#include "lilo.h" +- +- +- .text +- +- .globl _main +- .org 0 +- +-_main: push sp ! push all registers +- push ss +- pushf +- push es +- push ds +- push cs +- push bp +- push di +- push si +- push dx +- push cx +- push bx +- push ax +- mov ax,#BOOTSEG ! let DS point to where we really are +- mov ds,ax +- mov bx,#msgs ! set up loop +-l: call say ! output message +- cmp byte ptr (bx),#0 ! at end ? +- je back ! yes -> back to LILO +- pop ax ! get next data word +- push bx +- call wout ! output data word +- pop bx +- jmp l ! next round +- +-#if 0 +-back: mov ax,#FIRSTSEG +- mov ds,ax +- mov word ptr (CODE_START_1),#CODE_START_1+8 +- mov word ptr (CODE_START_1+2),#FIRSTSEG +- mov word ptr (CODE_START_1+4),#CODE_START_1+12 +- mov byte ptr (CODE_START_1+6),#0xfe +- mov es,ax ! adjust segments +- mov ax,#BOOTSEG +- mov ds,ax +- mov word ptr (10),#0xffff ! no timeout +- mov si,#haltnow ! copy string data +- mov di,#CODE_START_1+8 +- mov cx,#6 +- rep +- movsb +- mov ax,#FIRSTSEG ! restart LILO +- jmpi #GO,FIRSTSEG +-#else +-back: hlt ! stay here +- jmp back +-#endif +- +-! Display a NUL-terminated string on the console +- +-say: mov al,(bx) ! get byte +- inc bx ! move pointer +- or al,al ! NUL ? +- jz aret ! yes -> done +- push bx ! save pointer +- mov ah,#14 ! display, tty-style +- xor bh,bh +- int 0x10 +- pop bx +- jmp say ! next one +- +-wout: push ax ! display one word +- mov al,ah +- call bout +- pop ax +-bout: push ax ! display one byte +- shr al,#4 +- call nout +- pop ax +-nout: and al,#15 ! display one nibble +- add al,#48 +- cmp al,#58 +- jb nokay +- add al,#7 +-nokay: xor bh,bh ! display on screen +- mov ah,#14 +- int 0x10 +-aret: ret +- +-msgs: .byte 13,10 +- .ascii "Register dump:" +- .byte 13,10,10 +- .ascii "AX=" +- .byte 0 +- .ascii " BX=" +- .byte 0 +- .ascii " CX=" +- .byte 0 +- .ascii " DX=" +- .byte 0,13,10 +- .ascii "SI=" +- .byte 0 +- .ascii " DI=" +- .byte 0 +- .ascii " BP=" +- .byte 0,13,10 +- .ascii "CS=" +- .byte 0 +- .ascii " DS=" +- .byte 0 +- .ascii " ES=" +- .byte 0,13,10 +- .ascii "F=" +- .byte 0,13,10 +- .ascii "SS:SP=" +- .byte 0 +- .ascii ":" +- .byte 0,13,10,10 +-#if 0 +- .ascii "Restarting LILO ..." +-#else +- .ascii "System halted." +-#endif +- .byte 13,10,10,0,0 +- +-haltnow:.ascii "LILO" ! prevent automatic reboot +- .byte 0 +diff -ruN lilo.orig/first.S lilo/first.S +--- lilo.orig/first.S Sat Dec 5 08:20:12 1998 ++++ lilo/first.S Thu Dec 7 16:17:10 2000 +@@ -1,226 +1,257 @@ +-/* first.S - LILO first stage boot loader */ +- +-/* Copyright 1992-1998 Werner Almesberger. See file COPYING for details. */ +- +- +-#define LILO_ASM +-#include "lilo.h" +- +-#ifndef LCF_NO1STDIAG +-#define CYL_CHECK +-#endif +- +- +- .text +- +- .globl _main +- +- .org 0 +- +-_main: cli ! NT 4 blows up if this is missing +- jmp start +- +- .org 6 +- +-! Boot device parameters. They are set by the installer. +- ++/* $Id: first.S,v 1.16 2000/11/26 07:11:58 gniibe Exp $ ++ * ++ * Primary boot loader ++ * ++ * lilo/arch/sh/first.S ++ * ++ * Copyright (C) 2000 Niibe Yutaka ++ * ++ * This file is subject to the terms and conditions of the GNU General ++ * Public License. ++ * ++ */ ++ ++/* ++ * NOTE: Keep this code "position independent", so that this works well ++ * among machines with different memory map. ++ * ++ * Some machine starts its memmory at 0x08000000 (Area2), ++ * while others starts at 0x0c000000 (Area3). ++ */ ++ ++/* ++ * Memory map: ++ * [ First Loader ] 512 ++ * [ Stack ] 4096-512 ++ * [ Second Loader ] 4KB ++ * [ Reserved ] 4KB ++ * [ MAP load area ] 512 ++ * [ Descriptor table 1/2 ] 512 ++ * [ Descriptor table 2/2 ] 512 ++ * [ Default Command Line ] 512 ++ * [ Keyboard Translation ] 512 ++ * [ Greeting Message ] 512 ++ * [ Reserved ] ++ * [ Reserved ] ++ * ++ */ ++ .global start ++start: ++ bra real_start ++ .byte 3 ! This becomes "mov r0, r12" with next "l" ++ ! ++ .ascii "lba" ! special marker for LBA32 ++ ! + .ascii "LILO" +- .word STAGE_FIRST +- .word VERSION ++ .word 1 ++#if 1 ++ /* EDIT HERE ! */ ++ ! Depends LILOs version ++ .word 20 ++#else ++ /* v--- Major Version */ ++ .word 4*256 + 21 ++ ! /* ^--- Minor Version*/ ++#endif + ++/* x86 LILO parameters (Not used for SuperH... yet) */ + timeout:.word 0 ! input timeout + delay: .word 0 ! boot delay + port: .byte 0 ! COM port (0 = unused, 1 = COM1, etc.) + sparam: .byte 0 ! serial port parameters (0 = unused) + +-tstamp: .long 0 ! timestamp ++/* Timestamp (Filled by LILO command) */ ++tstamp: .long 0 + +-d1_cx: .word 0 ! first descriptor sector address ++/* First descripter sector (Filled by LILO command) */ ++d1_cx: .word 0 + d1_dx: .word 0 +-d1_al: .byte 0 ! (unused) ++d1_al: .byte 0 + +-d2_cx: .word 0 ! second descriptor sector address ++/* Second descripter sector (Filled by LILO command) */ ++d2_cx: .word 0 + d2_dx: .word 0 +-d2_al: .byte 0 ! (unused) ++d2_al: .byte 0 + +-dc_cx: .word 0 ! default command-line sector address ++/* Default command-line sector (Filled by LILO command) */ ++dc_cx: .word 0 + dc_dx: .word 0 +-dc_al: .byte 0 ! (unused) ++dc_al: .byte 0 + ++/* Prompt? (Filled by LILO command) */ + prompt: .byte 0 ! indicates whether to always enter prompt + ! (also used as alignment byte) + ++/* Greeting message length & sector (Filled by LILO command) */ + ms_len: .word 0 ! initial greeting message + ms_cx: .word 0 + ms_dx: .word 0 +-ms_al: .byte 0 ! (unused) ++ms_al: .byte 0 + ++/* Second descripter sector (Filled by LILO command) */ + kt_cx: .word 0 ! keyboard translation table + kt_dx: .word 0 + kt_al: .byte 0 + + d_addr: ! second stage sector addresses + +- .org CODE_START_1 +- +-ext_si: .word 0 ! external interface +-ext_es: .word 0 +-ext_bx: .word 0 +-ext_dl: .byte 0 +- +-start: mov ax,#BOOTSEG ! set DS +- mov ds,ax +- mov ext_es,es ! copy possible external parameters +- mov ext_si,si +- mov ext_bx,bx +- mov ext_dl,dl +- mov ax,#FIRSTSEG ! beam us up ... +- mov es,ax +- mov cx,#256 +- sub si,si +- sub di,di +- cld +- rep +- movsw +- jmpi go,FIRSTSEG +- +-go: cli ! no interrupts +- mov ds,ax ! AX is already set +- mov es,ax ! (ES may be wrong when restarting) +- mov sp,#STACK ! set the stack +- mov ax,#STACKSEG +- mov ss,ax +- sti ! now it is safe +- +- mov al,#0x0d ! gimme a CR ... +- call display +- mov al,#0x0a ! ... an LF ... +- call display +- mov al,#0x4c ! ... an 'L' ... +- call display +- +-lagain: mov si,#d_addr ! ready to load the second stage loader +- mov bx,#SECOND +- cld +-sload: lodsw ! get CX +- mov cx,ax +- lodsw ! get DX +- mov dx,ax +- or ax,cx ! at EOF ? +- jz done ! yes -> start it +- inc si ! skip the length byte +- call cread +- jc error ! error -> start over again +- add bx,#512 ! next sector +- jmp sload +-error: +-#ifndef LCF_NO1STDIAG +- push ax ! display a space +- mov al,#32 +- call display +- pop ax +- mov al,ah ! display error code +- call bout +-#endif +- xor ax,ax ! reset the FDC +- mov dl,al +- int 0x13 +- jmp lagain ! redo from start +-done: mov al,#0x49 ! display an 'I' +- call display +- jmpi 0,SECONDSEG ! start the second stage loader +- +-#ifndef LCF_NO1STDIAG +-bout: push ax ! display one byte +- shr al,#4 +- call nout +- pop ax +-nout: and al,#15 ! display one nibble +- add al,#48 +- cmp al,#58 +- jb nokay +- add al,#7 +-nokay: ! fall through +-#endif +- +-display:xor bh,bh ! display on screen +- mov ah,#14 +- int 0x10 +- ret +- +-linerr: pop dx ! discard stack contents +- pop cx +- pop bx +- ret ! (carry is already set) +- +-cread: test dl,#LINEAR_FLAG ! linear address ? +- jz readsect ! no -> go on +- and dl,#0xff-LINEAR_FLAG ! remove flag +- +-! +-! Translate the linear address into a sector/track/cylinder address +-! +- push bx ! BX is used as scratch +- push cx ! LSW +- push dx ! MSW with drive +- mov ah,#8 ! get drive geometry (do not clobber ES:DI) +- int 0x13 +- jc linerr ! error -> quit +- mov al,dh ! AL <- #heads-1 +- pop dx ! get MSW +- mov t_drive,dl ! save drive +- mov dl,dh ! linear address (high) into DX +- xor dh,dh +-#ifdef CYL_CHECK +- push cx ! compute #cyls-1 +- xchg ch,cl +- rol ch,1 +- rol ch,1 +- and ch,#3 +- mov n_cyl,cx ! save #cyls-1 +- pop cx +-#endif +- and cx,#0x3f ! CX <- #secs +- mul cl ! AX <- #secs/cyl +- add ax,cx +- xchg ax,bx +- pop ax ! linear address (low) into AX +- div bx ! DX <- cylinder, AX <- remaining secs +- xchg ax,dx +- div cl ! AL <- track, AH <- sector +- inc ah +- mov t_sector,ah +- xchg ax,dx ! AX <- cylinder, DL <- track +- mov dh,dl ! set up DX (head:drive) +- mov dl,t_drive +-#ifdef CYL_CHECK +- cmp ax,n_cyl ! valid cylinder number ? +- ja linerr3 ! no -> error +-#endif +- xchg ah,al ! build cylinder number +- ror al,1 +- ror al,1 +- or al,t_sector +- mov cx,ax +- pop bx ! restore BX +-readsect: +- mov ax,#0x201 ! read one sector +- int 0x13 +- ret ! quit, possibly with errors +- +-#ifdef CYL_CHECK +-linerr3:pop bx ! pop BX and linear address +- xor ax,ax ! zero indicates internal error +- stc ! error +- ret +- +-n_cyl: .word 0 ! temporary space +-#endif +-t_drive:.byte 0 +-t_sector:.byte 0 +- +- +-/* Here are at least 66 bytes of free space. This is reserved for the +- partition table and the boot signature. */ ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ .long 0xffffffff ++ ++ .word 0xffff ++ ++ .align 2 ++real_start: ++ /* Get base pointer, to be position independent */ ++ mova next, r0 ++ mov #0x02, r1 ++ shll8 r1 ++ sub r1, r0 ++ mov r0, r12 ! Base pointer ++ ! ++ mov #0x10, r1 ++ shll8 r1 ++ mov r12, r15 ++ add r1, r15 ! Setup stack pointer ++ ! ++ mov #0x10, r13 ! buffer number ++ ! ++ /* Enable cache */ ++ mov #6, r0 ! Cache "on" ++ mov #0, r4 ++ trapa #0x3f ++ ! ++ /* Output message "L" */ ++ mova message, r0 ++ mov r0, r4 ++ mov #1, r5 ++ mov #0, r0 ! Serial Output ++ trapa #0x3f ++ ! ++ /* Load second stage loader */ ++ mov #52, r11 ! #52: desc# of second stage loader ++loop: mov r11, r4 ++ bsr load_sector_address ! get r4 (=dev) and r5 (=lba) ++ add r12, r4 ! desc# --> address of descriptor ++ bt done ++ ! ++ mov r13, r6 ++ shll8 r6 ++ bsr read_a_sector ++ add r12, r6 ! buffer number -> buffer address ++ ! ++ add #2, r13 ! buffer # += 2 ++ bra loop ++ add #5, r11 ! next desc# is +5 ++ ++done: ++ /* Flush cache */ ++ mov #6, r0 ! Cache "on" ++ mov #0, r4 ++ trapa #0x3f ++ ++ /* Jump to the second loader */ ++ mov #0x10, r0 ++ shll8 r0 ++ add r12, r0 ! Get the address into r0 ++ jmp @r0 ++ mov r12, r4 ! First argument is base pointer ++ ++ .align 2 ++message: ++ .string "L" ++ ++ .align 2 ++/* ++ * LOAD_SECTOR_ADDRESS: ++ * Read the sector descripter (5-byte tuple), and translate ++ * it as device number and lba. Set T flag if its NULL. ++ * ++ * INPUT: r4 (pointer to descripter (5-byte long, not aligned) ++ * OUTPUT: r4 (DEVICE #), r5 (LBA) and T register (T when done) ++ * Clobbers: r0, r1, r2, r3 ++ */ ++load_sector_address: ++ mov.b @r4+, r0 ++ extu.b r0, r0 ++ mov.b @r4+, r1 ++ extu.b r1, r1 ++ mov.b @r4+, r2 ++ extu.b r2, r2 ++ mov.b @r4+, r3 ++ extu.b r3, r3 ++ ! ++ shll8 r3 ++ or r3, r1 ++ shll8 r1 ++ or r0, r1 ++ mov r1, r5 ++ mov.b @r4, r0 ++ cmp/eq #0, r0 ++ bt 1f ! NULL (end of descriptor) ++ ! ++ /* Check if its really LBA... */ ++ mov r2, r0 ++ and #0x0F, r0 ! Get device number ++ mov #0xc0, r3 ++ extu.b r3, r3 ++ cmp/hi r2, r3 ++ bf 1f ! Unset T ++ ! ++ /* Its not LBA!! */ ++ mova not_lba_message, r0 ++ mov r0, r4 ++ mov #36, r5 ++ mov #0, r0 ! Serial Output ++ trapa #0x3f ++ sett ! End of descriptor ++ ! ++1: rts ++ mov r0, r4 ! device number ++ ++/* ++ * READ a sector ++ * INPUT: r4 (DEVICE #), r5 (LBA), r6 (BUFFER ADDRESS) ++ * OUTPUT: r0 (RESULT) ++ * ++ * Invoke BIOS call READ_SECTORS with number_of_sectors=1. ++ */ ++read_a_sector: ++ mov #2, r0 ! READ SECTORS ++ mov #1, r7 ! number of sectors ++ trapa #0x3f ++ ! ++ tst r0, r0 ++ bt 1f ++ ! /* ERROR */ ++ mova read_error_message, r0 ++ mov r0, r4 ++ mov #19, r5 ++ mov #0, r0 ! Serial Output ++ trapa #0x3f ++ ! /* Go to the monitor */ ++ mov #0, r0 ++ jmp @r0 ++ nop ++ ! ++1: rts ++ nop ++ ++ .align 2 ++not_lba_message: ++ .string "ERROR: Sector address is not in LBA\n" ++ .align 2 ++read_error_message: ++ .string "ERROR: Sector read\n" + +-theend: ++ .align 9 ++next: +--- lilo.orig/second.c Thu Jan 1 09:00:00 1970 ++++ lilo/second.c Thu Dec 7 21:03:56 2000 +@@ -0,0 +1,411 @@ ++/* $Id: second.c,v 1.22 2000/11/26 07:11:16 gniibe Exp $ ++ * ++ * Secondary boot loader ++ * ++ * lilo/arch/sh/second.c ++ * ++ * Copyright (C) 2000 Niibe Yutaka ++ * ++ * This file is subject to the terms and conditions of the GNU General ++ * Public License. ++ * ++ */ ++ ++#include "defs.h" ++ ++static void put_string (unsigned char *); ++static int get_sector_address (unsigned long, int *, unsigned long *); ++static int load_sectors (unsigned long, unsigned long); ++static int read_sectors (int, unsigned long, unsigned char *, int); ++static int load_sectors_with_maps (int, int, unsigned long *); ++ ++static int machine_type (void); ++static int serial_type (void); ++static int memory_size (void); ++static int io_base (void); ++static void cache_flush (void); ++ ++static const char hexchars[] = "0123456789abcdef"; ++#define digits hexchars /* 10base is same for 16base (up to 10) */ ++static inline char highhex (int x) { return hexchars[(x >> 4) & 0xf]; } ++static inline char lowhex (int x) { return hexchars[x & 0xf]; } ++static void printouthex (int); ++ ++static unsigned long base_pointer = 0; /* Avoid BSS */ ++static unsigned long kernel_image = 0; /* Avoid BSS */ ++ ++/* Sector descriptor */ ++#define SD_DESCR1 24 ++#define SD_DESCR2 29 ++#define SD_DEFCMD 34 ++/* 39 prompt (byte) */ ++/* 40 length (word) */ ++#define SD_MSG 42 ++#define SD_KBDTBL 47 ++ ++static inline char *string_set (char *dest, const char *str) ++{ ++ int len = strlen (str); ++ memcpy (dest, str, len); ++ return dest + len; ++} ++ ++void ++start (unsigned long base) ++{ ++ base_pointer = base; ++ ++ put_string ("I"); ++ load_sectors (SD_DESCR1, 0x3200); ++ load_sectors (SD_DESCR2, 0x3400); ++ put_string ("L"); ++ /* XXX: checksum */ ++ ++ load_sectors (SD_DEFCMD, 0x3600); ++ load_sectors (SD_KBDTBL, 0x3800); ++ put_string ("O "); ++ ++#if 0 ++ load_sectors (SD_MSG, 0x3a00); ++#endif ++ /* XXX: delay, key check... */ ++ /* XXX: list up images */ ++ /* XXX: check signature */ ++ /* Input command line */ ++ /* XXX: Is there default command line? Use it! */ ++ put_string ("boot: "); ++ put_string ("first-image\n"); /* XXX: should handle input commandline... */ ++ ++ /* Structure of descriptor ++ [ checksum 2byte ] ++ [ DESCR_SIZE:52-byte ++ (image-name (16-byte) ++ passwd (16-byte) ++ rd_size (4-byte) ++ initrd (5-byte sector desc) ++ start (5-byte sector desc) ++ start_page (16-bit) ++ flags (16-bit) ++ vga_mode (16-bit) ++ ) ++ ] * 19 ++ */ ++ ++ put_string ("Loading "); ++ put_string ((char *)(base_pointer+0x3200+2)); /* Image name */ ++ ++ kernel_image = base_pointer + 0x10000 - 0x400; ++ { ++ int desc = 0x3200+2+16+16+4+5; /* kernel image */ ++ ++ /* Skip two sectors: Fallback command line and options */ ++ desc = load_sectors_with_maps (desc, 0, &kernel_image); ++ put_string ("."); ++ ++ while (desc != 0) ++ { ++ desc = load_sectors_with_maps (desc, 0, &kernel_image); ++ put_string ("."); ++ } ++ } ++ put_string ("done.\n"); ++ ++#if 0 ++ { ++ int i; ++ ++ put_string ("DUMP: "); ++ for (i=0; i<16; i++) ++ printouthex (*(unsigned char *)(base_pointer+0x10000+i)); ++ put_string ("\n"); ++ } ++#endif ++ ++ /* XXX: kernel paramerter setting */ ++ { ++ unsigned long parm = base_pointer - 0x200000 + 0x1000; ++ char *cmdline = (char *)(parm+256); ++ int mem_size; ++ unsigned char *p; ++ ++ *(long *)parm = 1; /* Read only mount? */ ++ *(long *)(parm+4) = 0; /* RAMDISK Flags */ ++ *(long *)(parm+8) = 0x0301; /* Root device: XXX should get from cls.. */ ++ *(long *)(parm+12) = 1; /* Loader type (LILO = 1) */ ++ *(long *)(parm+16) = 0; /* Initrd start */ ++ *(long *)(parm+20) = 0; /* Initrd size */ ++ *(long *)(parm+24) = 0; /* Not defined yet */ ++ ++ /* XXX: Should take the line from command line sector... */ ++#define DC_MAGIC 0xf4f2 /* magic number of default cmd. line sector */ ++ p = (unsigned char *)(base_pointer+0x3600); ++ if(p[0] == (DC_MAGIC & 0xff) && p[1] == (DC_MAGIC >> 8)) ++ cmdline = string_set(cmdline, p+2); ++ cmdline = string_set(cmdline, (char *)(base_pointer + 0x10000 - 0x200)); ++ ++#if 0 ++ /* Query to BIOS and build the command line string */ ++ /* Build string "mem=XXM" */ ++ mem_size = memory_size (); ++ mem_size >>= 20; /* In Mega-byte */ ++ cmdline = string_set (cmdline, "mem="); ++ if (mem_size >= 100) ++ { ++ *cmdline++ = digits[mem_size/100]; ++ mem_size = mem_size % 100; ++ } ++ if (mem_size >= 10) ++ { ++ *cmdline++ = digits[mem_size/10]; ++ mem_size = mem_size % 10; ++ } ++ *cmdline++ = digits[mem_size]; ++ *cmdline++ = 'M'; ++ *cmdline++ = ' '; ++ ++ switch (machine_type ()) ++ { ++ case 0: /* Unknown board */ ++ { /* Build string "sh_mv=unknown,0xXXXXXX,1" */ ++ unsigned int io = io_base (); ++ int b31_24, b23_16, b15_08, b07_00; ++ ++ b31_24 = (io>>24)&0xff; ++ b23_16 = (io>>16)&0xff; ++ b15_08 = (io>>8)&0xff; ++ b07_00 = (io>>0)&0xff; ++ ++ cmdline = string_set (cmdline, "sh_mv=unknown,0x"); ++ *cmdline++ = highhex (b31_24); *cmdline++ = lowhex (b31_24); ++ *cmdline++ = highhex (b23_16); *cmdline++ = lowhex (b23_16); ++ *cmdline++ = highhex (b15_08); *cmdline++ = lowhex (b15_08); ++ *cmdline++ = highhex (b07_00); *cmdline++ = lowhex (b07_00); ++ cmdline = string_set (cmdline, ",1 "); ++ break; ++ } ++ ++ case 1: ++ cmdline = string_set (cmdline, "sh_mv=CqREEK "); ++ break; ++ ++ case 3: ++ cmdline = string_set (cmdline, "sh_mv=SolutionEngine "); ++ break; ++ } ++ ++ if (serial_type () == 0) ++ cmdline = string_set (cmdline, "console=ttySC0,115200"); ++ else ++ cmdline = string_set (cmdline, "console=ttySC1,115200"); ++#endif ++ ++ *cmdline = '\0'; /* Terminate the string */ ++ } ++ ++ cache_flush (); ++ asm volatile ("jmp @r0; nop" ++ : /* no output */ ++ : "z" (base_pointer + 0x10000)); ++} ++ ++static int ++load_sectors_with_maps (int desc, int offset, unsigned long *buf_p) ++{ ++ int dev; ++ unsigned long lba; ++ int i, count; ++ ++ /* Load the map at 0x3000 */ ++ if (load_sectors (desc, 0x3000) < 0) ++ return 0; ++ ++ for (i = offset*5; i<505; i+=5) ++ { ++ if ((count = get_sector_address (0x3000+i, &dev, &lba)) == 0) ++ return 0; ++ ++ read_sectors (dev, lba, (unsigned char *)*buf_p, count); ++ *buf_p += count*512; ++ } ++ ++ /* There's next map */ ++ return 0x3000+505; ++} ++ ++static int ++machine_type (void) ++{ ++ register long __sc0 __asm__ ("r0") = 3; /* FEATURE QUERY */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0) ++ : "memory"); ++ ++ return (__sc0 >> 8); ++} ++ ++static int ++serial_type (void) ++{ ++ register long __sc0 __asm__ ("r0") = 3; /* FEATURE QUERY */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0) ++ : "memory"); ++ ++ return (__sc0 & 0x07); ++} ++ ++static int ++memory_size (void) ++{ ++ register long __sc0 __asm__ ("r0") = 4; /* MEMORY SIZE */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0) ++ : "memory"); ++ ++ return (__sc0); ++} ++ ++static int ++io_base (void) ++{ ++ register long __sc0 __asm__ ("r0") = 5; /* IO BASE */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0) ++ : "memory"); ++ ++ return (__sc0); ++} ++ ++static void ++cache_flush (void) ++{ ++ register long __sc0 __asm__ ("r0") = 6; /* CACHE_CONTROL */ ++ register long __sc4 __asm__ ("r4") = 0; /* ENABLE */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0), "r" (__sc4) ++ : "memory"); ++} ++ ++static void inline ++put_string_1 (unsigned char *str, long len) ++{ ++ register long __sc0 __asm__ ("r0") = 0; /* OUTPUT */ ++ register long __sc4 __asm__ ("r4") = (long) str; ++ register long __sc5 __asm__ ("r5") = (long) len; /* For New BIOS */ ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0), "r" (__sc4), "r" (__sc5) ++ : "memory"); ++} ++ ++static void ++put_string (unsigned char *str) ++{ ++ int len = strlen (str); ++ put_string_1 (str, len); ++} ++ ++static int ++read_sectors (int dev, unsigned long lba, unsigned char *buf, int count) ++{ ++ register long __sc0 __asm__ ("r0") = 2; /* READ SECTORS */ ++ register long __sc4 __asm__ ("r4") = (long) dev; ++ register long __sc5 __asm__ ("r5") = (long) lba; ++ register long __sc6 __asm__ ("r6") = (long) buf; ++ register long __sc7 __asm__ ("r7") = (long) count; ++ ++ asm volatile ("trapa #0x3F" ++ : "=z" (__sc0) ++ : "0" (__sc0), "r" (__sc4), "r" (__sc5), ++ "r" (__sc6), "r" (__sc7) ++ : "memory"); ++ ++ if (__sc0 < 0) ++ put_string ("ERROR: Sector read\n"); ++ ++ return __sc0; ++} ++ ++static int ++get_sector_address (unsigned long sector_desc, int *devp, unsigned long *lbap) ++{ ++ unsigned long s; ++ unsigned char *p = (unsigned char *)(sector_desc+base_pointer); ++ int len; ++ ++ /* Number of sectors */ ++ len = (int)p[4]; ++ if (len == 0) ++ return 0; ++ ++ /* p[2]: drive number */ ++ if ((int)p[2] < 0xc0) ++ /* XXX: should return error */ ++ put_string ("ERROR: Sector address is not in LBA\n"); ++ ++ *devp = (int)p[2] & 0x0f; ++ ++ s = p[0] + (p[1]<<8) + (p[3]<<16); ++ ++ *lbap = s; ++ ++#if 0 ++ { ++ unsigned long lba = *lbap; ++ ++ put_string ("DEV= "); ++ printouthex ((*devp)&0xff); ++ put_string ("\n"); ++ put_string ("LBA= "); ++ printouthex ((lba>>24)&0xff); ++ printouthex ((lba>>16)&0xff); ++ printouthex ((lba>>8)&0xff); ++ printouthex (lba&0xff); ++ put_string ("\n"); ++ } ++#endif ++ ++ return len; ++} ++ ++static int ++load_sectors (unsigned long sector_desc, unsigned long mem) ++{ ++ int dev; ++ unsigned long lba; ++ int count; ++ unsigned char *buf = (unsigned char *)(mem+base_pointer); ++ ++ count = get_sector_address (sector_desc, &dev, &lba); ++ ++ if (count) ++ return read_sectors (dev, lba, buf, count); ++ ++ return -1; ++} ++ ++#if 0 ++static void ++printouthex(int x) ++{ ++ char z[4]; ++ ++ z[0] = highhex (x); ++ z[1] = lowhex (x); ++ z[2] = ' '; ++ z[3] = '\0'; ++ ++ put_string (z); ++} ++#endif +diff -ruN lilo.orig/second.lds lilo/second.lds +--- lilo.orig/second.lds Thu Jan 1 09:00:00 1970 ++++ lilo/second.lds Fri Dec 8 11:13:20 2000 +@@ -0,0 +1,212 @@ ++OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux") ++OUTPUT_ARCH(sh) ++ENTRY(start) ++SECTIONS ++{ ++ /* Read-only sections, merged into text segment: */ ++ . = 0x400000 + SIZEOF_HEADERS; ++ .interp : { *(.interp) } ++ .hash : { *(.hash) } ++ .dynsym : { *(.dynsym) } ++ .dynstr : { *(.dynstr) } ++ .gnu.version : { *(.gnu.version) } ++ .gnu.version_d : { *(.gnu.version_d) } ++ .gnu.version_r : { *(.gnu.version_r) } ++ .rel.init : { *(.rel.init) } ++ .rela.init : { *(.rela.init) } ++ .rel.text : ++ { ++ *(.rel.text) ++ *(.rel.text.*) ++ *(.rel.gnu.linkonce.t*) ++ } ++ .rela.text : ++ { ++ *(.rela.text) ++ *(.rela.text.*) ++ *(.rela.gnu.linkonce.t*) ++ } ++ .rel.fini : { *(.rel.fini) } ++ .rela.fini : { *(.rela.fini) } ++ .rel.rodata : ++ { ++ *(.rel.rodata) ++ *(.rel.rodata.*) ++ *(.rel.gnu.linkonce.r*) ++ } ++ .rela.rodata : ++ { ++ *(.rela.rodata) ++ *(.rela.rodata.*) ++ *(.rela.gnu.linkonce.r*) ++ } ++ .rel.data : ++ { ++ *(.rel.data) ++ *(.rel.data.*) ++ *(.rel.gnu.linkonce.d*) ++ } ++ .rela.data : ++ { ++ *(.rela.data) ++ *(.rela.data.*) ++ *(.rela.gnu.linkonce.d*) ++ } ++ .rel.ctors : { *(.rel.ctors) } ++ .rela.ctors : { *(.rela.ctors) } ++ .rel.dtors : { *(.rel.dtors) } ++ .rela.dtors : { *(.rela.dtors) } ++ .rel.got : { *(.rel.got) } ++ .rela.got : { *(.rela.got) } ++ .rel.sdata : ++ { ++ *(.rel.sdata) ++ *(.rel.sdata.*) ++ *(.rel.gnu.linkonce.s*) ++ } ++ .rela.sdata : ++ { ++ *(.rela.sdata) ++ *(.rela.sdata.*) ++ *(.rela.gnu.linkonce.s*) ++ } ++ .rel.sbss : { *(.rel.sbss) } ++ .rela.sbss : { *(.rela.sbss) } ++ .rel.bss : { *(.rel.bss) } ++ .rela.bss : { *(.rela.bss) } ++ .rel.plt : { *(.rel.plt) } ++ .rela.plt : { *(.rela.plt) } ++ .init : ++ { ++ KEEP (*(.init)) ++ } =0 ++ .plt : { *(.plt) } ++ .text : ++ { ++ *(.text) ++ *(.text.*) ++ *(.stub) ++ /* .gnu.warning sections are handled specially by elf32.em. */ ++ *(.gnu.warning) ++ *(.gnu.linkonce.t*) ++ } =0 ++ _etext = .; ++ PROVIDE (etext = .); ++ .fini : ++ { ++ KEEP (*(.fini)) ++ } =0 ++ .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r*) } ++ .rodata1 : { *(.rodata1) } ++ /* Adjust the address for the data segment. We want to adjust up to ++ the same address within the page on the next page up. */ ++/* . = ALIGN(0x10000) + (. & (0x10000 - 1)); */ ++ .data : ++ { ++ __data_start = . ; ++ *(.data) ++ *(.data.*) ++ *(.gnu.linkonce.d*) ++ SORT(CONSTRUCTORS) ++ } ++ .data1 : { *(.data1) } ++ .eh_frame : { *(.eh_frame) } ++ .gcc_except_table : { *(.gcc_except_table) } ++ .note.ABI-tag : { *(.note.ABI-tag) } ++ .ctors : ++ { ++ /* gcc uses crtbegin.o to find the start of ++ the constructors, so we make sure it is ++ first. Because this is a wildcard, it ++ doesn't matter if the user does not ++ actually link against crtbegin.o; the ++ linker won't look for a file to match a ++ wildcard. The wildcard also means that it ++ doesn't matter which directory crtbegin.o ++ is in. */ ++ KEEP (*crtbegin.o(.ctors)) ++ /* We don't want to include the .ctor section from ++ from the crtend.o file until after the sorted ctors. ++ The .ctor section from the crtend file contains the ++ end of ctors marker and it must be last */ ++ KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) ++ KEEP (*(SORT(.ctors.*))) ++ KEEP (*(.ctors)) ++ } ++ .dtors : ++ { ++ KEEP (*crtbegin.o(.dtors)) ++ KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) ++ KEEP (*(SORT(.dtors.*))) ++ KEEP (*(.dtors)) ++ } ++ .got : { *(.got.plt) *(.got) } ++ .dynamic : { *(.dynamic) } ++ /* We want the small data sections together, so single-instruction offsets ++ can access them all, and initialized data all before uninitialized, so ++ we can shorten the on-disk segment size. */ ++ .sdata : ++ { ++ *(.sdata) ++ *(.sdata.*) ++ *(.gnu.linkonce.s.*) ++ } ++ _edata = .; ++ PROVIDE (edata = .); ++ __bss_start = .; ++ .sbss : ++ { ++ *(.dynsbss) ++ *(.sbss) ++ *(.sbss.*) ++ *(.scommon) ++ } ++ .bss : ++ { ++ *(.dynbss) ++ *(.bss) ++ *(.bss.*) ++ *(COMMON) ++ /* Align here to ensure that the .bss section occupies space up to ++ _end. Align after .bss to ensure correct alignment even if the ++ .bss section disappears because there are no input sections. */ ++ . = ALIGN(32 / 8); ++ } ++ . = ALIGN(32 / 8); ++ _end = .; ++ PROVIDE (end = .); ++ /* Stabs debugging sections. */ ++ .stab 0 : { *(.stab) } ++ .stabstr 0 : { *(.stabstr) } ++ .stab.excl 0 : { *(.stab.excl) } ++ .stab.exclstr 0 : { *(.stab.exclstr) } ++ .stab.index 0 : { *(.stab.index) } ++ .stab.indexstr 0 : { *(.stab.indexstr) } ++ .comment 0 : { *(.comment) } ++ /* DWARF debug sections. ++ Symbols in the DWARF debugging sections are relative to the beginning ++ of the section so we begin them at 0. */ ++ /* DWARF 1 */ ++ .debug 0 : { *(.debug) } ++ .line 0 : { *(.line) } ++ /* GNU DWARF 1 extensions */ ++ .debug_srcinfo 0 : { *(.debug_srcinfo) } ++ .debug_sfnames 0 : { *(.debug_sfnames) } ++ /* DWARF 1.1 and DWARF 2 */ ++ .debug_aranges 0 : { *(.debug_aranges) } ++ .debug_pubnames 0 : { *(.debug_pubnames) } ++ /* DWARF 2 */ ++ .debug_info 0 : { *(.debug_info) } ++ .debug_abbrev 0 : { *(.debug_abbrev) } ++ .debug_line 0 : { *(.debug_line) } ++ .debug_frame 0 : { *(.debug_frame) } ++ .debug_str 0 : { *(.debug_str) } ++ .debug_loc 0 : { *(.debug_loc) } ++ .debug_macinfo 0 : { *(.debug_macinfo) } ++ /* SGI/MIPS DWARF 2 extensions */ ++ .debug_weaknames 0 : { *(.debug_weaknames) } ++ .debug_funcnames 0 : { *(.debug_funcnames) } ++ .debug_typenames 0 : { *(.debug_typenames) } ++ .debug_varnames 0 : { *(.debug_varnames) } ++ /* These must appear regardless of . */ ++} +diff -ruN lilo.orig/string.c lilo/string.c +--- lilo.orig/string.c Thu Jan 1 09:00:00 1970 ++++ lilo/string.c Thu Dec 7 16:17:10 2000 +@@ -0,0 +1,22 @@ ++#include ++ ++/* Implementation taken from Linux kernel (linux/lib/string.c) */ ++ ++size_t strlen(const char * s) ++{ ++ const char *sc; ++ ++ for (sc = s; *sc != '\0'; ++sc) ++ /* nothing */; ++ return sc - s; ++} ++ ++void * memcpy(void * dest,const void *src,size_t count) ++{ ++ char *tmp = (char *) dest, *s = (char *) src; ++ ++ while (count--) ++ *tmp++ = *s++; ++ ++ return dest; ++} diff --git a/packages/lilo-sh/files/lilo.patch b/packages/lilo-sh/files/lilo.patch new file mode 100644 index 0000000000..227eaf69f1 --- /dev/null +++ b/packages/lilo-sh/files/lilo.patch @@ -0,0 +1,42 @@ +diff -u --new-file --recursive lilo.old/geometry.c lilo/geometry.c +--- lilo.old/geometry.c Wed Oct 14 15:24:41 1998 ++++ lilo/geometry.c Sat Feb 20 15:27:23 1999 +@@ -342,6 +342,27 @@ + geo->sectors = hdprm.sectors; + geo->start = hdprm.start; + break; ++ case COMPAQ_SMART2_MAJOR+0: ++ case COMPAQ_SMART2_MAJOR+1: ++ case COMPAQ_SMART2_MAJOR+2: ++ case COMPAQ_SMART2_MAJOR+3: ++ case COMPAQ_SMART2_MAJOR+4: ++ case COMPAQ_SMART2_MAJOR+5: ++ case COMPAQ_SMART2_MAJOR+6: ++ case COMPAQ_SMART2_MAJOR+7: ++ geo->device = 0x80+last_dev(MAJOR_HD,64)+(MINOR(device) >> 4); ++ if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0) ++ die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device, ++ strerror(errno)); ++ if (all && !hdprm.sectors) ++ die("HDIO_REQ not supported for your Array controller. Please " ++ "use a DISK section"); ++ geo->heads = hdprm.heads; ++ geo->cylinders = hdprm.cylinders; ++ geo->sectors = hdprm.sectors; ++ geo->start = hdprm.start; ++ break; ++ + default: + die("Sorry, don't know how to handle device 0x%04x",device); + } +diff -u --new-file --recursive lilo.old/lilo.h lilo/lilo.h +--- lilo.old/lilo.h Fri Dec 4 12:55:31 1998 ++++ lilo/lilo.h Sat Feb 20 15:29:10 1999 +@@ -39,6 +39,7 @@ + #define MAJOR_DAC960 48 /* First Mylex DAC960 PCI RAID controller */ + #define MAJOR_IDE5 55 /* IDE on fifth interface */ + #define MAJOR_IDE6 57 /* IDE on sixth interface */ ++#define COMPAQ_SMART2_MAJOR 72 /* First Smart/2 Major */ + + #define MAX_IMAGES ((SECTOR_SIZE*2-2)/sizeof(IMAGE_DESCR)) + /* maximum number of images */ diff --git a/packages/lilo-sh/files/lilo.raid1 b/packages/lilo-sh/files/lilo.raid1 new file mode 100644 index 0000000000..5f29bc9fc1 --- /dev/null +++ b/packages/lilo-sh/files/lilo.raid1 @@ -0,0 +1,552 @@ +--- lilo.new/lilo.c.noraid Tue Sep 21 23:58:01 1999 ++++ lilo.new/lilo.c Wed Sep 22 04:18:22 1999 +@@ -24,11 +24,11 @@ + #include "cfg.h" + #include "identify.h" + #include "partition.h" +- ++#include "md-int.h" + + #define S2(x) #x + #define S(x) S2(x) +- ++#define MAX_TOKEN 200 + + static void show_other(int fd) + { +@@ -227,15 +227,21 @@ + { + char *name,*config_file,*reboot_arg,*identify,*ident_opt,*new_root; + char *uninst_dev; +- int query,more,version,uninstall,validate; ++ int query,more,version,uninstall,validate,do_md_install,pass; + BOOT_SECTOR dummy; + IMAGE_DESCR dummy2; + struct stat st; +- int fd; ++ int fd, md_fd; ++ md_array_info_t md_array_info; ++ md_disk_info_t md_disk_info; ++ char md_boot_name[MAX_TOKEN+1]; ++ char md_boot_map[MAX_TOKEN+1]; ++ DT_ENTRY md_disk; ++ DT_ENTRY *disk; + + config_file = DFL_CONFIG; + reboot_arg = identify = ident_opt = new_root = uninst_dev = NULL; +- query = version = uninstall = validate = 0; ++ pass = do_md_install = query = version = uninstall = validate = 0; + name = *argv++; + argc--; + cfg_init(cf_options); +@@ -414,43 +420,117 @@ + } + preload_dev_cache(); + if (identify) identify_image(identify,ident_opt); +- if (uninstall) +- bsect_uninstall(uninst_dev ? uninst_dev : cfg_get_strg(cf_options, +- "boot"),cfg_get_strg(cf_options,"backup"),validate); +- compact = cfg_get_flag(cf_options,"compact"); +- linear = cfg_get_flag(cf_options,"linear"); +- nowarn = cfg_get_flag(cf_options,"nowarn"); +- if (cfg_get_strg(cf_options,"verbose")) +- verbose += to_number(cfg_get_strg(cf_options,"verbose")); +- if (reboot_arg) { +- map_patch_first(cfg_get_strg(cf_options,"map") ? cfg_get_strg( +- cf_options,"map") : MAP_FILE,reboot_arg); +- exit(0); +- } +- if (argc) usage(name); +- geo_init(cfg_get_strg(cf_options,"disktab")); +- if (query) +- show_images(!cfg_get_strg(cf_options,"map") ? MAP_FILE : +- cfg_get_strg(cf_options,"map")); +- bsect_open(cfg_get_strg(cf_options,"boot"),cfg_get_strg(cf_options,"map") ? +- cfg_get_strg(cf_options,"map") : MAP_FILE,cfg_get_strg(cf_options, +- "install"),cfg_get_strg(cf_options,"delay") ? to_number(cfg_get_strg( +- cf_options,"delay")) : 0,cfg_get_strg(cf_options,"timeout") ? +- to_number(cfg_get_strg(cf_options,"timeout")) : -1); +- if (more) { +- cfg_init(cf_top); +- if (cfg_parse(cf_top)) cfg_error("Syntax error"); +- } +- if (!bsect_number()) die("No images have been defined."); +- check_fallback(); +- if (!test) +- if (cfg_get_strg(cf_options,"force-backup")) +- bsect_update(cfg_get_strg(cf_options,"force-backup"),1); +- else bsect_update(cfg_get_strg(cf_options,"backup"),0); +- else { +- bsect_cancel(); +- fprintf(stderr,"The boot sector and the map file have *NOT* been " +- "altered.\n"); ++ if (strncmp("/dev/md",cfg_get_strg(cf_options,"boot"),7) == 0) { ++ if ((md_fd=open(cfg_get_strg(cf_options,"boot"),O_NOACCESS)) < 0) ++ die("Unable to open %s",cfg_get_strg(cf_options,"boot")); ++ if (fstat(md_fd,&st) < 0) ++ die("Unable to stat %s",cfg_get_strg(cf_options,"boot")); ++ if (!S_ISBLK(st.st_mode)) ++ die("%s is not a block device",cfg_get_strg(cf_options,"boot")); ++ if (ioctl(md_fd,GET_ARRAY_INFO,&md_array_info) < 0) ++ die("Unable to get RAID info on %s",cfg_get_strg(cf_options,"boot")); ++ if ((md_array_info.major_version == 0) && (md_array_info.minor_version < 90)) ++ die("Raid versions < 0.90 are not supported"); ++ if (md_array_info.level != 1) ++ die("Only RAID1 devices are supported as boot devices"); ++ do_md_install = 1; ++ strcpy(md_boot_name,cfg_get_strg(cf_options,"boot")); ++ if (cfg_get_strg(cf_options,"map")) ++ strcpy(md_boot_map,cfg_get_strg(cf_options,"map")); ++ else ++ strcpy(md_boot_map,MAP_FILE); ++ md_disk.device = (MD_MAJOR << 8) | md_array_info.md_minor; ++ md_disk.bios = 0x80; ++ md_disk.next = disktab; ++ disktab = &md_disk; ++ } ++ while( (pass == 0) || (do_md_install && (pass < md_array_info.nr_disks)) ) { ++ if(do_md_install) { ++ GEOMETRY geo; ++ DEVICE dev; ++ int device,disk_fd; ++ char new_name[MAX_TOKEN+1]; ++ ++ if(pass > 0) { ++ close(fd); ++ cfg_init(cf_options); ++ fd = cfg_open(config_file); ++ more = cfg_parse(cf_options); ++ } ++ md_disk_info.number = pass; ++ if (ioctl(md_fd,GET_DISK_INFO,&md_disk_info) < 0) ++ die("main: GET_DISK_INFO: %s", strerror(errno)); ++ device = (md_disk_info.major << 8) | md_disk_info.minor; ++ disk_fd = dev_open(&dev,device,O_NOACCESS); ++ if (md_disk_info.state == MD_DISK_FAULTY) { ++ printf("disk %s marked as faulty, skipping\n",dev.name); ++ pass++; ++ continue; ++ } ++ geo_query_dev(&geo,device,1); ++ disk = alloc_t(DT_ENTRY); ++ disk->bios = 0x80; ++ disk->device = device & 0xfff0; ++ disk->sectors = geo.sectors; ++ disk->heads = geo.heads; ++ disk->cylinders = geo.cylinders; ++ disk->start = geo.start; ++ disk->next = disktab; ++ disktab = disk; ++ if (cfg_get_strg(cf_options,"boot")) cfg_unset(cf_options,"boot"); ++ if (cfg_get_strg(cf_options,"map")) cfg_unset(cf_options,"map"); ++ strncpy(new_name,dev.name,8); ++ new_name[8] = '\0'; ++ cfg_set(cf_options,"boot",new_name,NULL); ++ snprintf(new_name,MAX_TOKEN,"%s.%04x",md_boot_map,device); ++ cfg_set(cf_options,"map",new_name,NULL); ++ printf("boot = %s, map = %s\n", cfg_get_strg(cf_options,"boot"), ++ cfg_get_strg(cf_options,"map")); ++ md_disk.sectors = geo.sectors; ++ md_disk.heads = geo.heads; ++ md_disk.cylinders = geo.cylinders; ++ md_disk.start = geo.start; ++ } ++ ++ pass++; ++ if (uninstall) ++ bsect_uninstall(uninst_dev ? uninst_dev : cfg_get_strg(cf_options, ++ "boot"),cfg_get_strg(cf_options,"backup"),validate); ++ compact = cfg_get_flag(cf_options,"compact"); ++ linear = cfg_get_flag(cf_options,"linear"); ++ nowarn = cfg_get_flag(cf_options,"nowarn"); ++ if (cfg_get_strg(cf_options,"verbose")) ++ verbose += to_number(cfg_get_strg(cf_options,"verbose")); ++ if (reboot_arg) { ++ map_patch_first(cfg_get_strg(cf_options,"map") ? cfg_get_strg( ++ cf_options,"map") : MAP_FILE,reboot_arg); ++ exit(0); ++ } ++ if (argc) usage(name); ++ geo_init(cfg_get_strg(cf_options,"disktab")); ++ if (query) ++ show_images(!cfg_get_strg(cf_options,"map") ? MAP_FILE : ++ cfg_get_strg(cf_options,"map")); ++ bsect_open(cfg_get_strg(cf_options,"boot"),cfg_get_strg(cf_options,"map") ? ++ cfg_get_strg(cf_options,"map") : MAP_FILE,cfg_get_strg(cf_options, ++ "install"),cfg_get_strg(cf_options,"delay") ? to_number(cfg_get_strg( ++ cf_options,"delay")) : 0,cfg_get_strg(cf_options,"timeout") ? ++ to_number(cfg_get_strg(cf_options,"timeout")) : -1); ++ if (more) { ++ cfg_init(cf_top); ++ if (cfg_parse(cf_top)) cfg_error("Syntax error"); ++ } ++ if (!bsect_number()) die("No images have been defined."); ++ check_fallback(); ++ if (!test) ++ if (cfg_get_strg(cf_options,"force-backup")) ++ bsect_update(cfg_get_strg(cf_options,"force-backup"),1); ++ else bsect_update(cfg_get_strg(cf_options,"backup"),0); ++ else { ++ bsect_cancel(); ++ fprintf(stderr,"The boot sector and the map file have *NOT* been " ++ "altered.\n"); ++ } + } + return 0; + } +--- lilo.new/geometry.c.noraid Wed Sep 22 00:55:32 1999 ++++ lilo.new/geometry.c Wed Sep 22 03:13:29 1999 +@@ -35,18 +35,9 @@ + struct stat st; + } ST_BUF; + +-typedef struct _dt_entry { +- int device,bios; +- int sectors; +- int heads; /* 0 if inaccessible */ +- int cylinders; +- int start; +- struct _dt_entry *next; +-} DT_ENTRY; + +- +-static DT_ENTRY *disktab = NULL; +-static int old_disktab = 0; ++DT_ENTRY *disktab = NULL; ++int old_disktab = 0; + + + void geo_init(char *name) +@@ -260,7 +251,7 @@ + } + + +-static void geo_query_dev(GEOMETRY *geo,int device,int all) ++void geo_query_dev(GEOMETRY *geo,int device,int all) + { + DEVICE dev; + int fd,get_all; +--- lilo.new/geometry.h.noraid Wed Sep 22 00:56:06 1999 ++++ lilo.new/geometry.h Wed Sep 22 03:12:23 1999 +@@ -18,6 +18,17 @@ + int boot; /* non-zero after geo_open_boot */ + } GEOMETRY; + ++typedef struct _dt_entry { ++ int device,bios; ++ int sectors; ++ int heads; /* 0 if inaccessible */ ++ int cylinders; ++ int start; ++ struct _dt_entry *next; ++} DT_ENTRY; ++ ++extern DT_ENTRY *disktab; ++ + void geo_init(char *name); + + /* Loads the disk geometry table. */ +@@ -59,5 +70,10 @@ + + /* lseeks in the file associated with GEO for the sector at address ADDR. + Returns a non-zero integer on success, zero on failure. */ ++ ++void geo_query_dev(GEOMETRY *geo,int device,int all); ++ ++/* opens the specified device and gets the geometry information. That ++ information is then stored in *geo */ + + #endif +--- lilo.new/md-int.h.noraid Wed Sep 22 13:06:36 1999 ++++ lilo.new/md-int.h Tue Sep 21 22:57:41 1999 +@@ -0,0 +1,290 @@ ++/* ++ md.h : Multiple Devices driver for Linux ++ Copyright (C) 1994-96 Marc ZYNGIER ++ or ++ ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2, or (at your option) ++ any later version. ++ ++ You should have received a copy of the GNU General Public License ++ (for example /usr/src/linux/COPYING); if not, write to the Free ++ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++*/ ++ ++#ifndef MD_INT_H ++#define MD_INT_H ++ ++/* don't include the kernel RAID header! */ ++#define _MD_H ++ ++typedef unsigned int md_u32; ++typedef unsigned short md_u16; ++typedef unsigned char md_u8; ++ ++#include ++#include ++ ++/* ++ * Different major versions are not compatible. ++ * Different minor versions are only downward compatible. ++ * Different patchlevel versions are downward and upward compatible. ++ */ ++ ++struct md_version { ++ int major; ++ int minor; ++ int patchlevel; ++}; ++ ++/* ++ * default readahead ++ */ ++#define MD_READAHEAD (256 * 1024) ++ ++/* These are the ioctls for md versions < 0.50 */ ++#define REGISTER_MD_DEV _IO (MD_MAJOR, 1) ++#define START_MD _IO (MD_MAJOR, 2) ++#define STOP_MD _IO (MD_MAJOR, 3) ++ ++/* status */ ++#define RAID_VERSION _IOR (MD_MAJOR, 0x10, struct md_version) ++#define GET_ARRAY_INFO _IOR (MD_MAJOR, 0x11, md_array_info_t) ++#define GET_DISK_INFO _IOR (MD_MAJOR, 0x12, md_disk_info_t) ++#define PRINT_RAID_DEBUG _IO (MD_MAJOR, 0x13) ++ ++/* configuration */ ++#define CLEAR_ARRAY _IO (MD_MAJOR, 0x20) ++#define ADD_NEW_DISK _IOW (MD_MAJOR, 0x21, md_disk_info_t) ++#define HOT_REMOVE_DISK _IO (MD_MAJOR, 0x22) ++#define SET_ARRAY_INFO _IOW (MD_MAJOR, 0x23, md_array_info_t) ++#define SET_DISK_INFO _IO (MD_MAJOR, 0x24) ++#define WRITE_RAID_INFO _IO (MD_MAJOR, 0x25) ++#define UNPROTECT_ARRAY _IO (MD_MAJOR, 0x26) ++#define PROTECT_ARRAY _IO (MD_MAJOR, 0x27) ++#define HOT_ADD_DISK _IO (MD_MAJOR, 0x28) ++ ++/* usage */ ++#define RUN_ARRAY _IOW (MD_MAJOR, 0x30, struct md_param) ++#define START_ARRAY _IO (MD_MAJOR, 0x31) ++#define STOP_ARRAY _IO (MD_MAJOR, 0x32) ++#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33) ++#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34) ++ ++ ++/* for raid < 0.50 only */ ++#define MD_PERSONALITY_SHIFT 16 ++ ++#define MD_RESERVED 0UL ++#define LINEAR 1UL ++#define STRIPED 2UL ++#define RAID0 STRIPED ++#define RAID1 3UL ++#define RAID5 4UL ++#define TRANSLUCENT 5UL ++#define LVM 6UL ++#define MAX_PERSONALITY 7UL ++ ++/* ++ * MD superblock. ++ * ++ * The MD superblock maintains some statistics on each MD configuration. ++ * Each real device in the MD set contains it near the end of the device. ++ * Some of the ideas are copied from the ext2fs implementation. ++ * ++ * We currently use 4096 bytes as follows: ++ * ++ * word offset function ++ * ++ * 0 - 31 Constant generic MD device information. ++ * 32 - 63 Generic state information. ++ * 64 - 127 Personality specific information. ++ * 128 - 511 12 32-words descriptors of the disks in the raid set. ++ * 512 - 911 Reserved. ++ * 912 - 1023 Disk specific descriptor. ++ */ ++ ++/* ++ * If x is the real device size in bytes, we return an apparent size of: ++ * ++ * y = (x & ~(MD_RESERVED_BYTES - 1)) - MD_RESERVED_BYTES ++ * ++ * and place the 4kB superblock at offset y. ++ */ ++#define MD_RESERVED_BYTES (64 * 1024) ++#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512) ++#define MD_RESERVED_BLOCKS (MD_RESERVED_BYTES / BLOCK_SIZE) ++ ++#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) - MD_RESERVED_SECTORS) ++#define MD_NEW_SIZE_BLOCKS(x) ((x & ~(MD_RESERVED_BLOCKS - 1)) - MD_RESERVED_BLOCKS) ++ ++#define MD_SB_BYTES 4096 ++#define MD_SB_WORDS (MD_SB_BYTES / 4) ++#define MD_SB_BLOCKS (MD_SB_BYTES / BLOCK_SIZE) ++#define MD_SB_SECTORS (MD_SB_BYTES / 512) ++ ++/* ++ * The following are counted in 32-bit words ++ */ ++#define MD_SB_GENERIC_OFFSET 0 ++#define MD_SB_PERSONALITY_OFFSET 64 ++#define MD_SB_DISKS_OFFSET 128 ++#define MD_SB_DESCRIPTOR_OFFSET 992 ++ ++#define MD_SB_GENERIC_CONSTANT_WORDS 32 ++#define MD_SB_GENERIC_STATE_WORDS 32 ++#define MD_SB_GENERIC_WORDS (MD_SB_GENERIC_CONSTANT_WORDS + MD_SB_GENERIC_STATE_WORDS) ++#define MD_SB_PERSONALITY_WORDS 64 ++#define MD_SB_DISKS_WORDS 384 ++#define MD_SB_DESCRIPTOR_WORDS 32 ++#define MD_SB_RESERVED_WORDS (1024 - MD_SB_GENERIC_WORDS - MD_SB_PERSONALITY_WORDS - MD_SB_DISKS_WORDS - MD_SB_DESCRIPTOR_WORDS) ++#define MD_SB_EQUAL_WORDS (MD_SB_GENERIC_WORDS + MD_SB_PERSONALITY_WORDS + MD_SB_DISKS_WORDS) ++#define MD_SB_DISKS (MD_SB_DISKS_WORDS / MD_SB_DESCRIPTOR_WORDS) ++ ++/* ++ * Device "operational" state bits ++ */ ++#define MD_DISK_FAULTY 0 /* disk is faulty / operational */ ++#define MD_DISK_ACTIVE 1 /* disk is running or spare disk */ ++#define MD_DISK_SYNC 2 /* disk is in sync with the raid set */ ++ ++typedef struct md_device_descriptor_s { ++ md_u32 number; /* 0 Device number in the entire set */ ++ md_u32 major; /* 1 Device major number */ ++ md_u32 minor; /* 2 Device minor number */ ++ md_u32 raid_disk; /* 3 The role of the device in the raid set */ ++ md_u32 state; /* 4 Operational state */ ++ md_u32 reserved[MD_SB_DESCRIPTOR_WORDS - 5]; ++} md_descriptor_t; ++ ++#define MD_SB_MAGIC 0xa92b4efc ++ ++/* ++ * Superblock state bits ++ */ ++#define MD_SB_CLEAN 0 ++#define MD_SB_ERRORS 1 ++ ++typedef struct md_superblock_s { ++ /* ++ * Constant generic information ++ */ ++ md_u32 md_magic; /* 0 MD identifier */ ++ md_u32 major_version; /* 1 major version to which the set conforms */ ++ md_u32 minor_version; /* 2 minor version ... */ ++ md_u32 patch_version; /* 3 patchlevel version ... */ ++ md_u32 gvalid_words; /* 4 Number of used words in this section */ ++ md_u32 set_magic; /* 5 Raid set identifier */ ++ md_u32 ctime; /* 6 Creation time */ ++ md_u32 level; /* 7 Raid personality */ ++ md_u32 size; /* 8 Apparent size of each individual disk */ ++ md_u32 nr_disks; /* 9 total disks in the raid set */ ++ md_u32 raid_disks; /* 10 disks in a fully functional raid set */ ++ md_u32 md_minor; /* 11 preferred MD minor device number */ ++ md_u32 gstate_creserved[MD_SB_GENERIC_CONSTANT_WORDS - 12]; ++ ++ /* ++ * Generic state information ++ */ ++ md_u32 utime; /* 0 Superblock update time */ ++ md_u32 state; /* 1 State bits (clean, ...) */ ++ md_u32 active_disks; /* 2 Number of currently active disks */ ++ md_u32 working_disks; /* 3 Number of working disks */ ++ md_u32 failed_disks; /* 4 Number of failed disks */ ++ md_u32 spare_disks; /* 5 Number of spare disks */ ++ md_u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 6]; ++ ++ /* ++ * Personality information ++ */ ++ md_u32 layout; /* 0 the array's physical layout */ ++ md_u32 chunk_size; /* 1 chunk size in bytes */ ++ md_u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 2]; ++ ++ /* ++ * Disks information ++ */ ++ md_descriptor_t disks[MD_SB_DISKS]; ++ ++ /* ++ * Reserved ++ */ ++ md_u32 reserved[MD_SB_RESERVED_WORDS]; ++ ++ /* ++ * Active descriptor ++ */ ++ md_descriptor_t descriptor; ++ ++} md_superblock_t; ++ ++/* ++ * options passed in raidstart: ++ */ ++ ++#define MAX_CHUNK_SIZE (4096*1024) ++ ++struct md_param ++{ ++ int personality; /* 1,2,3,4 */ ++ int chunk_size; /* in bytes */ ++ int max_fault; /* unused for now */ ++}; ++ ++typedef struct md_array_info_s { ++ /* ++ * Generic constant information ++ */ ++ md_u32 major_version; ++ md_u32 minor_version; ++ md_u32 patch_version; ++ md_u32 ctime; ++ md_u32 level; ++ md_u32 size; ++ md_u32 nr_disks; ++ md_u32 raid_disks; ++ md_u32 md_minor; ++ md_u32 not_persistent; ++ ++ /* ++ * Generic state information ++ */ ++ md_u32 utime; /* 0 Superblock update time */ ++ md_u32 state; /* 1 State bits (clean, ...) */ ++ md_u32 active_disks; /* 2 Number of currently active disks */ ++ md_u32 working_disks; /* 3 Number of working disks */ ++ md_u32 failed_disks; /* 4 Number of failed disks */ ++ md_u32 spare_disks; /* 5 Number of spare disks */ ++ ++ /* ++ * Personality information ++ */ ++ md_u32 layout; /* 0 the array's physical layout */ ++ md_u32 chunk_size; /* 1 chunk size in bytes */ ++ ++} md_array_info_t; ++ ++typedef struct md_disk_info_s { ++ /* ++ * configuration/status of one particular disk ++ */ ++ md_u32 number; ++ md_u32 major; ++ md_u32 minor; ++ md_u32 raid_disk; ++ md_u32 state; ++ ++} md_disk_info_t; ++ ++ ++/* ++ * Supported RAID5 algorithms ++ */ ++#define RAID5_ALGORITHM_LEFT_ASYMMETRIC 0 ++#define RAID5_ALGORITHM_RIGHT_ASYMMETRIC 1 ++#define RAID5_ALGORITHM_LEFT_SYMMETRIC 2 ++#define RAID5_ALGORITHM_RIGHT_SYMMETRIC 3 ++ ++#endif _MD_H diff --git a/packages/lilo-sh/lilo-sh_21.bb b/packages/lilo-sh/lilo-sh_21.bb new file mode 100644 index 0000000000..eb4ba0cccf --- /dev/null +++ b/packages/lilo-sh/lilo-sh_21.bb @@ -0,0 +1,41 @@ +# +# Bootloader for sh4 based devices using a HDD or block translation +# layer over the flash. NOTE that this version has the 1024 cylinder +# limit, so you probably need a seperate /boot partition as the first +# partition on the disk. Tested on the NP51R (Titan) booting from the +# onboard flash +# +DESCRIPTION="LILO (LInux LOader) is a basic system program which \ +boots your Linux system. LILO loads the Linux kernel from a floppy or \ +a hard drive, boots the kernel, and passes control of the system to \ +the kernel. LILO can also boot other operating systems. LILO-sh is a \ +port of LILO to the SH processor." +SECTION="bootloader" +MAINTAINER = "Jamie Lenehan " +LICENSE = "MIT" +PR = "r0" + +SRC_URI = "http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz \ + file://lilo-0.21-include.patch;patch=1 \ + file://lilo-0.21-1.1.patch;patch=1 \ + file://lilo.patch;patch=1 \ + file://lilo.raid1;patch=1 \ + file://lilo-0.21-loopdev.patch;patch=1 \ + file://lilo-0.21-second.patch;patch=1;pnum=0 \ + file://lilo-sh-linux.patch;patch=1 \ + file://lilo-linkgear.patch;patch=1 \ + file://lilo-noconfig-h.patch;patch=1" +S = "${WORKDIR}/lilo" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +# Include /boot in the package +FILES_${PN} = "${base_sbindir} /boot" + +do_install() { + # Create the base directores + mkdir -p ${D}${sysconfdir} ${D}${sbindir} + oe_runmake ROOT=${D} install + # We don't ship this file + rm ${D}/usr/sbin/keytab-lilo.pl +} -- cgit v1.2.3 From 0634f7bc2185bf1c2caac4eee98473af8b569048 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 3 Jul 2006 03:24:05 +0000 Subject: initscripts: Store RTC in /etc/timestamp before mounting root ro, fixing part of OE bug #1055 --- packages/initscripts/initscripts-1.0/halt | 6 ------ packages/initscripts/initscripts-1.0/reboot | 6 ------ packages/initscripts/initscripts-1.0/save-rtc.sh | 16 ++++++++++++++++ packages/initscripts/initscripts_1.0.bb | 8 ++++++-- 4 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 packages/initscripts/initscripts-1.0/save-rtc.sh diff --git a/packages/initscripts/initscripts-1.0/halt b/packages/initscripts/initscripts-1.0/halt index aa1769606a..d8cab222ca 100755 --- a/packages/initscripts/initscripts-1.0/halt +++ b/packages/initscripts/initscripts-1.0/halt @@ -7,12 +7,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is already one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - # See if we need to cut the power. if test -x /etc/init.d/ups-monitor then diff --git a/packages/initscripts/initscripts-1.0/reboot b/packages/initscripts/initscripts-1.0/reboot index 7f95255bd9..56278199be 100755 --- a/packages/initscripts/initscripts-1.0/reboot +++ b/packages/initscripts/initscripts-1.0/reboot @@ -7,11 +7,5 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -# Update the timestamp, if there is one -if test -e /etc/timestamp -then - date +%2m%2d%2H%2M%Y > /etc/timestamp -fi - echo -n "Rebooting... " reboot -d -f -i diff --git a/packages/initscripts/initscripts-1.0/save-rtc.sh b/packages/initscripts/initscripts-1.0/save-rtc.sh new file mode 100644 index 0000000000..d06aa6d569 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/save-rtc.sh @@ -0,0 +1,16 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: save-rtc.sh +# Date: 03-Jul-06 + + +# Update the timestamp, if there is already one +if test -e /etc/timestamp +then + echo "Will restore RCT from /etc/timestamp on next boot" + echo "Delete that file to disable this feature." + date +%2m%2d%2H%2M%Y > /etc/timestamp +fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index eebfbca7bf..0d14403a36 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r73" +PR = "r74" SRC_URI = "file://halt \ file://ramdisk \ @@ -31,7 +31,8 @@ SRC_URI = "file://halt \ file://sysfs.sh \ file://device_table.txt \ file://populate-volatile.sh \ - file://volatiles " + file://volatiles \ + file://save-rtc.sh" SRC_URI_append_arm = " file://alignment.sh" SRC_URI_append_openzaurus = " file://checkversion" @@ -82,6 +83,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d @@ -119,6 +121,8 @@ do_install () { ln -sf ../init.d/umountfs ${D}${sysconfdir}/rc0.d/S40umountfs # udev will run at S55 if installed ln -sf ../init.d/halt ${D}${sysconfdir}/rc0.d/S90halt + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc0.d/S25save-rtc.sh + ln -sf ../init.d/save-rtc.sh ${D}${sysconfdir}/rc6.d/S25save-rtc.sh ln -sf ../init.d/banner ${D}${sysconfdir}/rcS.d/S02banner ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh # ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh -- cgit v1.2.3 From 660a0feb66e64979ec74a6e58d0b8d190bd4e5eb Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 3 Jul 2006 03:25:30 +0000 Subject: psmisc 22.2: Add 22.2 and use a common .inc file for 21.8 and 22.8. Added to fix some IPv6 related bugs. See the changelog in 22.2 source for full list. --- packages/psmisc/files/.mtn2git_empty | 0 packages/psmisc/files/libintl-link.patch | 29 +++++++++++++++++ packages/psmisc/psmisc-21.8/libintl-link.patch | 29 ----------------- packages/psmisc/psmisc.inc | 42 ++++++++++++++++++++++++ packages/psmisc/psmisc_21.8.bb | 45 ++------------------------ packages/psmisc/psmisc_22.2.bb | 2 ++ 6 files changed, 75 insertions(+), 72 deletions(-) create mode 100644 packages/psmisc/files/.mtn2git_empty create mode 100644 packages/psmisc/files/libintl-link.patch delete mode 100644 packages/psmisc/psmisc-21.8/libintl-link.patch create mode 100644 packages/psmisc/psmisc.inc create mode 100644 packages/psmisc/psmisc_22.2.bb diff --git a/packages/psmisc/files/.mtn2git_empty b/packages/psmisc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/psmisc/files/libintl-link.patch b/packages/psmisc/files/libintl-link.patch new file mode 100644 index 0000000000..d9cdd90d71 --- /dev/null +++ b/packages/psmisc/files/libintl-link.patch @@ -0,0 +1,29 @@ +uClibc needs to link against an external libintl but it doesn't do this by +default. The configure script correctly figures out if this is needed, but +doesn't actually link to the libraries it decides on. This makes it link to +them if they are needed: + +--- psmisc-22.2/src/Makefile.am 2006/06/28 00:14:07 1.1 ++++ psmisc-22.2/src/Makefile.am 2006/06/28 00:14:24 +@@ -5,15 +5,19 @@ + + oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h + ++oldfuser_LDADD = @INTLLIBS@ ++ + fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h + ++fuser_LDADD = @INTLLIBS@ ++ + killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h + +-killall_LDADD = @SELINUX_LIB@ ++killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ + + pstree_SOURCES = pstree.c comm.h i18n.h + +-pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ ++pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ + + BUILT_SOURCES = signames.h + diff --git a/packages/psmisc/psmisc-21.8/libintl-link.patch b/packages/psmisc/psmisc-21.8/libintl-link.patch deleted file mode 100644 index d9cdd90d71..0000000000 --- a/packages/psmisc/psmisc-21.8/libintl-link.patch +++ /dev/null @@ -1,29 +0,0 @@ -uClibc needs to link against an external libintl but it doesn't do this by -default. The configure script correctly figures out if this is needed, but -doesn't actually link to the libraries it decides on. This makes it link to -them if they are needed: - ---- psmisc-22.2/src/Makefile.am 2006/06/28 00:14:07 1.1 -+++ psmisc-22.2/src/Makefile.am 2006/06/28 00:14:24 -@@ -5,15 +5,19 @@ - - oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h - -+oldfuser_LDADD = @INTLLIBS@ -+ - fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h - -+fuser_LDADD = @INTLLIBS@ -+ - killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h - --killall_LDADD = @SELINUX_LIB@ -+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@ - - pstree_SOURCES = pstree.c comm.h i18n.h - --pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ -+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@ - - BUILT_SOURCES = signames.h - diff --git a/packages/psmisc/psmisc.inc b/packages/psmisc/psmisc.inc new file mode 100644 index 0000000000..31647c7b4b --- /dev/null +++ b/packages/psmisc/psmisc.inc @@ -0,0 +1,42 @@ +LICENSE = "GPL" +DESCRIPTION = "procfs tools" +SECTION = "base" +PRIORITY = "required" +MAINTAINER = "Greg Gilbert " +DEPENDS = "ncurses virtual/libintl" + +SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ + file://libintl-link.patch;patch=1" +S = "${WORKDIR}/psmisc-${PV}" + +inherit autotools gettext + +ALLOW_EMPTY = "1" + +PACKAGES = "${PN} fuser fuser-doc \ + killall killall-doc \ + pstree pstree-doc" + +FILES_${PN} = "" +RDEPENDS_${PN} = "fuser killall pstree" + +FILES_fuser = "${bindir}/fuser" +FILES_fuser-doc = "${mandir}/man1/fuser*" + +FILES_killall = "${bindir}/killall.${PN}" +FILES_killall-doc = "${mandir}/man1/killall*" + +FILES_pstree = "${bindir}/pstree" +FILES_pstree-doc = "${mandir}/man1/pstree*" + +do_install_append() { + mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN} +} + +pkg_postinst_killall() { + update-alternatives --install ${bindir}/killall killall killall.${PN} 90 +} + +pkg_postrm_killall() { + update-alternatives --remove ${bindir}/killall killall.${PN} +} diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb index f7d6828a94..085ee18a77 100644 --- a/packages/psmisc/psmisc_21.8.bb +++ b/packages/psmisc/psmisc_21.8.bb @@ -1,44 +1,3 @@ -LICENSE = "GPL" -DESCRIPTION = "procfs tools" -SECTION = "base" -PRIORITY = "required" -MAINTAINER = "Greg Gilbert " -DEPENDS = "ncurses virtual/libintl" +include psmisc.inc PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \ - file://signames-header-fix.patch;patch=1 \ - file://libintl-link.patch;patch=1" -S = "${WORKDIR}/psmisc-${PV}" - -inherit autotools gettext - -ALLOW_EMPTY = "1" - -PACKAGES = "${PN} fuser fuser-doc \ - killall killall-doc \ - pstree pstree-doc" - -FILES_${PN} = "" -RDEPENDS_${PN} = "fuser killall pstree" - -FILES_fuser = "${bindir}/fuser" -FILES_fuser-doc = "${mandir}/man1/fuser*" - -FILES_killall = "${bindir}/killall.${PN}" -FILES_killall-doc = "${mandir}/man1/killall*" - -FILES_pstree = "${bindir}/pstree" -FILES_pstree-doc = "${mandir}/man1/pstree*" - -do_install_append() { - mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN} -} - -pkg_postinst_killall() { - update-alternatives --install ${bindir}/killall killall killall.${PN} 90 -} - -pkg_postrm_killall() { - update-alternatives --remove ${bindir}/killall killall.${PN} -} +SRC_URI += "file://signames-header-fix.patch;patch=1" diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb new file mode 100644 index 0000000000..6bf1780582 --- /dev/null +++ b/packages/psmisc/psmisc_22.2.bb @@ -0,0 +1,2 @@ +include psmisc.inc +PR = "r0" -- cgit v1.2.3 From cba73f28fe0838d044c6ec71f1d7a8ebcf8aa74a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 3 Jul 2006 07:43:13 +0000 Subject: linux-jlime-arm 2.6.17: Fix the .bb to correctly parse so people don't get errors from it when running bitbake. --- packages/linux/linux-jlime-arm_2.6.17.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 0f67a7c2be..33de458f4f 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ - file://Kconfig-Keyboard-Jornada720.patch;patch=0\ - file://Kconfig-Touchscreen-Jornada720.patch;patch=0 + file://Kconfig-Keyboard-Jornada720.patch;patch=0 \ + file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ file://Makefile-Keyboard-Jornada720.patch;patch=0 \ -- cgit v1.2.3 From 21dc42547b843538c285d3293ad042425624a61a Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Mon, 3 Jul 2006 07:48:18 +0000 Subject: strace 4.5.14: Patch the sh specific syscall table to get strace into a more useable state. In particular none of the socket related calls could be traced - strace would just get in a loop. Now fixed. This change has no effect for non sh targets. --- .../strace/strace-4.5.14/sh-syscall-update.patch | 268 +++++++++++++++++++++ packages/strace/strace_4.5.14.bb | 5 +- 2 files changed, 271 insertions(+), 2 deletions(-) create mode 100644 packages/strace/strace-4.5.14/sh-syscall-update.patch diff --git a/packages/strace/strace-4.5.14/sh-syscall-update.patch b/packages/strace/strace-4.5.14/sh-syscall-update.patch new file mode 100644 index 0000000000..15102934e7 --- /dev/null +++ b/packages/strace/strace-4.5.14/sh-syscall-update.patch @@ -0,0 +1,268 @@ +--- strace/linux/sh/syscallent.h 2006/07/03 04:32:27 1.1 ++++ strace/linux/sh/syscallent.h 2006/07/03 05:29:55 +@@ -46,7 +46,7 @@ + { 1, 0, sys_time, "time" }, /* 13 */ + { 3, TF, sys_mknod, "mknod" }, /* 14 */ + { 2, TF, sys_chmod, "chmod" }, /* 15 */ +- { 3, TF, sys_chown, "lchown" }, /* 16 */ ++ { 3, TF, sys_chown, "lchown" }, /* 16 */ + { 0, 0, sys_break, "break" }, /* 17 */ + { 2, TF, sys_oldstat, "oldstat" }, /* 18 */ + { 3, TD, sys_lseek, "lseek" }, /* 19 */ +@@ -229,109 +229,157 @@ + { 2, TF, sys_stat64, "stat64" }, /* 195 */ + { 2, TF, sys_lstat64, "lstat64" }, /* 196 */ + { 2, TD, sys_fstat64, "fstat64" }, /* 197 */ +-/*TODO*/{ 3, TF, printargs, "lchown32" }, /* 198 */ +-/*TODO*/{ 0, 0, printargs, "getuid32" }, /* 199 */ ++ { 3, TF, sys_chown, "lchown32" }, /* 198 */ ++ { 0, 0, sys_getuid, "getuid32" }, /* 199 */ + +- { 0, 0, printargs, "getgid32" }, /* 200 */ +- { 0, 0, printargs, "geteuid32" }, /* 201 */ +- { 0, 0, printargs, "getegid32" }, /* 202 */ +- { 2, 0, printargs, "setreuid32" }, /* 203 */ +- { 2, 0, printargs, "setregid32" }, /* 204 */ +- { 2, 0, sys_getgroups32, "getgroups32" }, /* 205 */ +- { 2, 0, sys_setgroups32, "setgroups32" }, /* 206 */ +- { 3, 0, printargs, "fchown32" }, /* 207 */ +- { 3, 0, printargs, "setresuid32" }, /* 208 */ +- { 3, 0, printargs, "getresuid32" }, /* 209 */ +- { 3, 0, printargs, "setresgid32" }, /* 210 */ +- { 3, 0, printargs, "getsetgid32" }, /* 211 */ +- { 3, TF, printargs, "chown32" }, /* 212 */ +- { 1, 0, printargs, "setuid32" }, /* 213 */ +- { 1, 0, printargs, "setgid32" }, /* 214 */ +- { 1, 0, printargs, "setfsuid32" }, /* 215 */ +- { 1, 0, printargs, "setfsgid32" }, /* 216 */ ++ { 0, 0, sys_getgid, "getgid32" }, /* 200 */ ++ { 0, 0, sys_geteuid, "geteuid32" }, /* 201 */ ++ { 0, 0, sys_getegid, "getegid32" }, /* 202 */ ++ { 2, 0, sys_setreuid, "setreuid32" }, /* 203 */ ++ { 2, 0, sys_setregid, "setregid32" }, /* 204 */ ++ { 2, 0, sys_getgroups, "getgroups32" }, /* 205 */ ++ { 2, 0, sys_setgroups, "setgroups32" }, /* 206 */ ++ { 3, 0, sys_fchown, "fchown32" }, /* 207 */ ++ { 3, 0, sys_setresuid, "setresuid32" }, /* 208 */ ++ { 3, 0, sys_getresuid, "getresuid32" }, /* 209 */ ++ { 3, 0, sys_setresgid, "setresgid32" }, /* 210 */ ++ { 3, 0, sys_getresgid, "getsetgid32" }, /* 211 */ ++ { 3, TF, sys_chown, "chown32" }, /* 212 */ ++ { 1, 0, sys_setuid, "setuid32" }, /* 213 */ ++ { 1, 0, sys_setgid, "setgid32" }, /* 214 */ ++ { 1, 0, sys_setfsuid, "setfsuid32" }, /* 215 */ ++ { 1, 0, sys_setfsgid, "setfsgid32" }, /* 216 */ + { 2, TF, sys_pivotroot, "pivot_root" }, /* 217 */ +- { 3, 0, printargs, "mincore" }, /* 218 */ ++ { 3, 0, sys_mincore, "mincore" }, /* 218 */ + { 3, 0, sys_madvise, "madvise" }, /* 219 */ +- { 4, 0, printargs, "getdents64" }, /* 220 */ ++ { 4, 0, sys_getdents64, "getdents64" }, /* 220 */ + { 3, TD, sys_fcntl, "fcntl64" }, /* 221 */ + { 4, 0, printargs, "SYS_222" }, /* 222 */ +- { 4, 0, printargs, "SYS_223" }, /* 223 */ +- { 4, 0, printargs, "SYS_224" }, /* 224 */ +- { 5, 0, printargs, "SYS_225" }, /* 225 */ +- { 5, 0, printargs, "SYS_226" }, /* 226 */ +- { 5, 0, printargs, "SYS_227" }, /* 227 */ +- { 5, 0, printargs, "SYS_228" }, /* 228 */ +- { 5, 0, printargs, "SYS_229" }, /* 229 */ +- +- { 8, 0, printargs, "socket_subcall"}, /* 230 */ +- { 3, TN, sys_socket, "socket" }, /* 231 */ +- { 3, TN, sys_bind, "bind" }, /* 232 */ +- { 3, TN, sys_connect, "connect" }, /* 233 */ +- { 2, TN, sys_listen, "listen" }, /* 234 */ +- { 3, TN, sys_accept, "accept" }, /* 235 */ +- { 3, TN, sys_getsockname, "getsockname" }, /* 236 */ +- { 3, TN, sys_getpeername, "getpeername" }, /* 237 */ +- { 4, TN, sys_socketpair, "socketpair" }, /* 238 */ +- { 4, TN, sys_send, "send" }, /* 239 */ +- { 4, TN, sys_recv, "recv" }, /* 240 */ +- { 6, TN, sys_sendto, "sendto" }, /* 241 */ +- { 6, TN, sys_recvfrom, "recvfrom" }, /* 242 */ +- { 2, TN, sys_shutdown, "shutdown" }, /* 243 */ +- { 5, TN, sys_setsockopt, "setsockopt" }, /* 244 */ +- { 5, TN, sys_getsockopt, "getsockopt" }, /* 245 */ +- { 5, TN, sys_sendmsg, "sendmsg" }, /* 246 */ +- { 5, TN, sys_recvmsg, "recvmsg" }, /* 247 */ +- { 5, 0, printargs, "SYS_248" }, /* 248 */ +- { 5, 0, printargs, "SYS_249" }, /* 249 */ +- +- { 4, 0, printargs, "ipc_subcall" }, /* 250 */ +- { 4, TI, sys_semop, "semop" }, /* 251 */ +- { 4, TI, sys_semget, "semget" }, /* 252 */ +- { 4, TI, sys_semctl, "semctl" }, /* 253 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 254 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 255 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 256 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 257 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 258 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 259 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 260 */ +- { 4, TI, sys_msgsnd, "msgsnd" }, /* 261 */ +- { 4, TI, sys_msgrcv, "msgrcv" }, /* 262 */ +- { 4, TI, sys_msgget, "msgget" }, /* 263 */ +- { 4, TI, sys_msgctl, "msgctl" }, /* 264 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 265 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 266 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 267 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 268 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 269 */ +- { 4, 0, printargs, "ipc_subcall" }, /* 270 */ +- { 4, TI, sys_shmat, "shmat" }, /* 271 */ +- { 4, TI, sys_shmdt, "shmdt" }, /* 272 */ +- { 4, TI, sys_shmget, "shmget" }, /* 273 */ +- { 4, TI, sys_shmctl, "shmctl" }, /* 274 */ +- { 5, 0, printargs, "SYS_275" }, /* 275 */ +- { 5, 0, printargs, "SYS_276" }, /* 276 */ +- { 5, 0, printargs, "SYS_277" }, /* 277 */ +- { 5, 0, printargs, "SYS_278" }, /* 278 */ +- { 5, 0, printargs, "SYS_279" }, /* 279 */ +- +- { 8, 0, printargs, "socket_subcall"}, /* 280 */ +- { 3, TN, sys_socket, "socket" }, /* 281 */ +- { 3, TN, sys_bind, "bind" }, /* 282 */ +- { 3, TN, sys_connect, "connect" }, /* 283 */ +- { 2, TN, sys_listen, "listen" }, /* 284 */ +- { 3, TN, sys_accept, "accept" }, /* 285 */ +- { 3, TN, sys_getsockname, "getsockname" }, /* 286 */ +- { 3, TN, sys_getpeername, "getpeername" }, /* 287 */ +- { 4, TN, sys_socketpair, "socketpair" }, /* 288 */ +- { 4, TN, sys_send, "send" }, /* 289 */ +- { 4, TN, sys_recv, "recv" }, /* 290 */ +- { 6, TN, sys_sendto, "sendto" }, /* 291 */ +- { 6, TN, sys_recvfrom, "recvfrom" }, /* 292 */ +- { 2, TN, sys_shutdown, "shutdown" }, /* 293 */ +- { 5, TN, sys_setsockopt, "setsockopt" }, /* 294 */ +- { 5, TN, sys_getsockopt, "getsockopt" }, /* 295 */ +- { 5, TN, sys_sendmsg, "sendmsg" }, /* 296 */ +- { 5, TN, sys_recvmsg, "recvmsg" }, /* 297 */ ++ { 5, 0, printargs, "SYS_223" }, /* 223 */ ++ { 0, 0, printargs, "gettid" }, /* 224 */ ++ { 4, TD, sys_readahead, "readahead" }, /* 225 */ ++ { 5, TF, sys_setxattr, "setxattr" }, /* 226 */ ++ { 5, TF, sys_setxattr, "lsetxattr" }, /* 227 */ ++ { 5, TD, sys_fsetxattr, "fsetxattr" }, /* 228 */ ++ { 4, TF, sys_getxattr, "getxattr" }, /* 229 */ ++ { 4, TF, sys_getxattr, "lgetxattr" }, /* 230 */ ++ { 4, 0, sys_fgetxattr, "fgetxattr" }, /* 231 */ ++ { 3, TF, sys_listxattr, "listxattr" }, /* 232 */ ++ { 3, TF, sys_listxattr, "llistxattr" }, /* 233 */ ++ { 3, 0, sys_flistxattr, "flistxattr" }, /* 234 */ ++ { 2, TF, sys_removexattr, "removexattr" }, /* 235 */ ++ { 2, TF, sys_removexattr, "lremovexattr" }, /* 236 */ ++ { 2, 0, sys_fremovexattr, "fremovexattr" }, /* 237 */ ++ { 2, TS, sys_kill, "tkill" }, /* 238 */ ++ { 4, TF, sys_sendfile64, "sendfile64" }, /* 239 */ ++ { 5, 0, sys_futex, "futex" }, /* 240 */ ++ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 241 */ ++ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 242 */ ++ { 1, 0, printargs, "set_thread_area" }, /* 243 */ ++ { 1, 0, printargs, "get_thread_area" }, /* 244 */ ++ { 2, 0, sys_io_setup, "io_setup" }, /* 245 */ ++ { 1, 0, sys_io_destroy, "io_destroy" }, /* 246 */ ++ { 5, 0, sys_io_getevents, "io_getevents" }, /* 247 */ ++ { 3, 0, sys_io_submit, "io_submit" }, /* 248 */ ++ { 3, 0, sys_io_cancel, "io_cancel" }, /* 249 */ ++ { 5, 0, sys_fadvise64, "fadvise64" }, /* 250 */ ++ { 5, 0, printargs, "SYS_251" }, /* 251 */ ++ { 1, TP, sys_exit, "exit_group" }, /* 252 */ ++ { 4, 0, printargs, "lookup_dcookie"}, /* 253 */ ++ { 1, 0, sys_epoll_create, "epoll_create" }, /* 254 */ ++ { 4, 0, sys_epoll_ctl, "epoll_ctl" }, /* 255 */ ++ { 4, 0, sys_epoll_wait, "epoll_wait" }, /* 256 */ ++ { 5, 0, sys_remap_file_pages, "remap_file_pages"}, /* 257 */ ++ { 1, 0, printargs, "set_tid_address"}, /* 258 */ ++ { 3, 0, sys_timer_create, "timer_create" }, /* 259 */ ++ { 4, 0, sys_timer_settime, "timer_settime" }, /* 260 */ ++ { 2, 0, sys_timer_gettime, "timer_gettime" }, /* 261 */ ++ { 1, 0, sys_timer_getoverrun, "timer_getoverrun"}, /* 262 */ ++ { 1, 0, sys_timer_delete, "timer_delete" }, /* 263 */ ++ { 2, 0, sys_clock_settime, "clock_settime" }, /* 264 */ ++ { 2, 0, sys_clock_gettime, "clock_gettime" }, /* 265 */ ++ { 2, 0, sys_clock_getres, "clock_getres" }, /* 266 */ ++ { 4, 0, sys_clock_nanosleep, "clock_nanosleep"}, /* 267 */ ++ { 3, TF, sys_statfs64, "statfs64" }, /* 268 */ ++ { 3, 0, sys_fstatfs64, "fstatfs64" }, /* 269 */ ++ { 3, TS, sys_tgkill, "tgkill" }, /* 270 */ ++ { 2, TF, sys_utimes, "utimes" }, /* 271 */ ++ { 6, 0, sys_fadvise64_64, "fadvise64_64" }, /* 272 */ ++ { 5, 0, printargs, "vserver" }, /* 273 */ ++ { 5, 0, printargs, "mbind" }, /* 274 */ ++ { 5, 0, printargs, "get_mempolicy" }, /* 275 */ ++ { 5, 0, printargs, "set_mempolicy" }, /* 276 */ ++ { 4, 0, sys_mq_open, "mq_open" }, /* 277 */ ++ { 1, 0, sys_mq_unlink, "mq_unlink" }, /* 278 */ ++ { 5, 0, sys_mq_timedsend, "mq_timedsend" }, /* 279 */ ++ { 5, 0, sys_mq_timedreceive, "mq_timedreceive" }, /* 280 */ ++ { 2, 0, sys_mq_notify, "mq_notify" }, /* 281 */ ++ { 3, 0, sys_mq_getsetattr, "mq_getsetattr" }, /* 282 */ ++ { 5, 0, printargs, "sys_kexec_load"}, /* 283 */ ++ { 5, TP, sys_waitid, "waitid" }, /* 284 */ ++ { 5, 0, printargs, "add_key" }, /* 285 */ ++ { 5, 0, printargs, "request_key" }, /* 286 */ ++ { 5, 0, printargs, "keyctl" }, /* 287 */ ++ { 5, 0, printargs, "ioprio_set" }, /* 288 */ ++ { 5, 0, printargs, "ioprio_get" }, /* 289 */ ++ { 5, 0, printargs, "inotify_init" }, /* 290 */ ++ { 5, 0, printargs, "inotify_add_watch" }, /* 291 */ ++ { 5, 0, printargs, "inotify_rm_watch" }, /* 292 */ ++ { 5, 0, printargs, "SYS_293" }, /* 293 */ ++ { 5, 0, printargs, "SYS_294" }, /* 294 */ ++ { 5, 0, printargs, "SYS_295" }, /* 295 */ ++ { 5, 0, printargs, "SYS_296" }, /* 296 */ ++ { 5, 0, printargs, "SYS_297" }, /* 297 */ + { 5, 0, printargs, "SYS_298" }, /* 298 */ + { 5, 0, printargs, "SYS_299" }, /* 299 */ ++ ++#if SYS_socket_subcall != 300 ++ #error fix me ++#endif ++ { 8, 0, printargs, "socket_subcall"}, /* 300 */ ++ { 3, TN, sys_socket, "socket" }, /* 301 */ ++ { 3, TN, sys_bind, "bind" }, /* 302 */ ++ { 3, TN, sys_connect, "connect" }, /* 303 */ ++ { 2, TN, sys_listen, "listen" }, /* 304 */ ++ { 3, TN, sys_accept, "accept" }, /* 305 */ ++ { 3, TN, sys_getsockname, "getsockname" }, /* 306 */ ++ { 3, TN, sys_getpeername, "getpeername" }, /* 307 */ ++ { 4, TN, sys_socketpair, "socketpair" }, /* 308 */ ++ { 4, TN, sys_send, "send" }, /* 309 */ ++ { 4, TN, sys_recv, "recv" }, /* 310 */ ++ { 6, TN, sys_sendto, "sendto" }, /* 311 */ ++ { 6, TN, sys_recvfrom, "recvfrom" }, /* 312 */ ++ { 2, TN, sys_shutdown, "shutdown" }, /* 313 */ ++ { 5, TN, sys_setsockopt, "setsockopt" }, /* 314 */ ++ { 5, TN, sys_getsockopt, "getsockopt" }, /* 315 */ ++ { 5, TN, sys_sendmsg, "sendmsg" }, /* 316 */ ++ { 5, TN, sys_recvmsg, "recvmsg" }, /* 317 */ ++ ++#if SYS_ipc_subcall != 318 ++ #error fix me ++#endif ++ { 4, 0, printargs, "ipc_subcall" }, /* 318 */ ++ { 4, TI, sys_semop, "semop" }, /* 319 */ ++ { 4, TI, sys_semget, "semget" }, /* 320 */ ++ { 4, TI, sys_semctl, "semctl" }, /* 321 */ ++ { 5, TI, sys_semtimedop, "semtimedop" }, /* 322 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 323 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 324 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 325 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 326 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 327 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 328 */ ++ { 4, TI, sys_msgsnd, "msgsnd" }, /* 329 */ ++ { 4, TI, sys_msgrcv, "msgrcv" }, /* 330 */ ++ { 4, TI, sys_msgget, "msgget" }, /* 331 */ ++ { 4, TI, sys_msgctl, "msgctl" }, /* 332 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 333 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 334 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 335 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 336 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 337 */ ++ { 4, 0, printargs, "ipc_subcall" }, /* 338 */ ++ { 4, TI, sys_shmat, "shmat" }, /* 339 */ ++ { 4, TI, sys_shmdt, "shmdt" }, /* 340 */ ++ { 4, TI, sys_shmget, "shmget" }, /* 341 */ ++ { 4, TI, sys_shmctl, "shmctl" }, /* 342 */ diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb index 8f9bfb4d18..b35a267d14 100644 --- a/packages/strace/strace_4.5.14.bb +++ b/packages/strace/strace_4.5.14.bb @@ -1,12 +1,13 @@ LICENSE = "GPL" SECTION = "console/utils" -PR = "r1" +PR = "r2" DESCRIPTION = "strace is a system call tracing tool." SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ file://arm-eabi.patch;patch=1 \ - file://sh-arch-update.patch;patch=1" + file://sh-arch-update.patch;patch=1 \ + file://sh-syscall-update.patch;patch=1" inherit autotools -- cgit v1.2.3 From d9cd8b4dbdd069f9da9ed7fa1b7395572a77c5c1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 08:13:49 +0000 Subject: opie-datebook 1.2.2 remove bugfix that has been applied upstream --- packages/opie-datebook/files/.mtn2git_empty | 0 packages/opie-datebook/files/bug1707fix.patch | 1281 ------------------------- packages/opie-datebook/opie-datebook_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 1283 deletions(-) delete mode 100644 packages/opie-datebook/files/.mtn2git_empty delete mode 100644 packages/opie-datebook/files/bug1707fix.patch diff --git a/packages/opie-datebook/files/.mtn2git_empty b/packages/opie-datebook/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-datebook/files/bug1707fix.patch b/packages/opie-datebook/files/bug1707fix.patch deleted file mode 100644 index ce91c74e9f..0000000000 --- a/packages/opie-datebook/files/bug1707fix.patch +++ /dev/null @@ -1,1281 +0,0 @@ -Index: datebook/dateentry.ui -=================================================================== -RCS file: /cvs/opie/core/pim/datebook/dateentry.ui,v -retrieving revision 1.10 -retrieving revision 1.11 -diff -u -u -r1.10 -r1.11 ---- datebook/dateentry.ui 11 Aug 2005 10:10:40 -0000 1.10 -+++ datebook/dateentry.ui 21 Sep 2005 21:15:13 -0000 1.11 -@@ -18,7 +18,7 @@ - ** Contact info@trolltech.com if any conditions of this licensing are - ** not clear to you. - ** --** $Id: dateentry.ui,v 1.10 2005/08/11 10:10:40 llornkcor Exp $ -+** $Id: dateentry.ui,v 1.11 2005/09/21 21:15:13 llornkcor Exp $ - ** - ********************************************************************* - -@@ -32,20 +32,14 @@ - - 0 - 0 -- 286 -- 396 -+ 242 -+ 339 - - - - caption - New Event - -- -- layoutMargin -- -- -- layoutSpacing -- - - - margin -@@ -53,740 +47,500 @@ - - - spacing -- 2 -+ 0 - -+ -+ QLabel -+ -+ name -+ TextLabel2 -+ -+ -+ frameShape -+ MShape -+ -+ -+ frameShadow -+ MShadow -+ -+ -+ text -+ Location -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel2_2 -+ -+ -+ text -+ Category -+ -+ -+ buddy -+ comboPriority -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ -+ -+ -+ -+ -+ text -+ Meeting -+ -+ -+ -+ -+ text -+ Lunch -+ -+ -+ -+ -+ text -+ Dinner -+ -+ -+ -+ -+ text -+ Travel -+ -+ -+ -+ name -+ comboDescription -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ editable -+ true -+ -+ -+ currentItem -+ 0 -+ -+ -+ duplicatesEnabled -+ false -+ -+ - -- QLayoutWidget -+ QLabel -+ -+ name -+ TextLabel1 -+ -+ -+ text -+ Description -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ -+ -+ -+ -+ -+ text -+ Office -+ -+ -+ -+ -+ text -+ Home -+ -+ -+ -+ name -+ comboLocation -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ editable -+ true -+ -+ -+ currentItem -+ 0 -+ -+ -+ duplicatesEnabled -+ false -+ -+ -+ -+ CategorySelect -+ -+ name -+ comboCategory -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel3 -+ -+ -+ text -+ Start - End -+ -+ -+ -+ QPushButton -+ -+ name -+ buttonStart -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ text -+ Jan 02 00 -+ -+ -+ -+ QLineEdit -+ -+ name -+ comboStart -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ alignment -+ AlignHCenter -+ -+ -+ hAlign -+ -+ -+ -+ -+ name -+ Spacer1_2 -+ -+ -+ orientation -+ Horizontal -+ -+ -+ sizeType -+ Expanding -+ -+ -+ sizeHint -+ -+ 20 -+ 20 -+ -+ -+ -+ -+ TimePicker -+ -+ name -+ timePickerStart -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QPushButton -+ -+ name -+ buttonEnd -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ text -+ Jan 02 00 -+ -+ -+ -+ QLineEdit - - name -- Layout19 -+ comboEnd - -- -- -- margin -- 0 -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ minimumSize -+ -+ 70 -+ 0 -+ -+ -+ -+ maximumSize -+ -+ 70 -+ 32767 -+ -+ -+ -+ alignment -+ AlignHCenter -+ -+ -+ hAlign -+ -+ -+ -+ QLabel -+ -+ name -+ TimePickerLabel -+ -+ -+ text -+ Start time -+ -+ -+ -+ QCheckBox -+ -+ name -+ checkAllDay -+ -+ -+ text -+ All day -+ -+ -+ -+ QLabel -+ -+ name -+ TextLabel3_2_2 -+ -+ -+ text -+ Time zone -+ -+ -+ -+ TimeZoneSelector -+ -+ name -+ timezone -+ -+ -+ sizePolicy -+ -+ 3 -+ 1 -+ -+ -+ -+ -+ QCheckBox -+ -+ name -+ checkAlarm -+ -+ -+ enabled -+ true -+ -+ -+ autoMask -+ false -+ -+ -+ text -+ &Alarm -+ -+ -+ checked -+ false -+ -+ -+ -+ QSpinBox -+ -+ name -+ spinAlarm -+ -+ -+ enabled -+ false -+ -+ -+ suffix -+ minutes -+ -+ -+ maxValue -+ 180 -+ -+ -+ minValue -+ 0 -+ -+ -+ lineStep -+ 5 -+ -+ -+ value -+ 5 -+ -+ -+ -+ QComboBox -+ -+ -+ text -+ Silent - -- -- spacing -- 6 -+ -+ -+ -+ text -+ Loud - -- -- QLayoutWidget -- -- name -- Layout1 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel1 -- -- -- text -- Description -- -- -- -- QComboBox -- -- -- text -- -- -- -- -- -- text -- Meeting -- -- -- -- -- text -- Lunch -- -- -- -- -- text -- Dinner -- -- -- -- -- text -- Travel -- -- -- -- name -- comboDescription -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- editable -- true -- -- -- currentItem -- 0 -- -- -- duplicatesEnabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout2 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel2 -- -- -- frameShape -- MShape -- -- -- frameShadow -- MShadow -- -- -- text -- Location -- -- -- -- QComboBox -- -- -- text -- -- -- -- -- -- text -- Office -- -- -- -- -- text -- Home -- -- -- -- name -- comboLocation -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- editable -- true -- -- -- currentItem -- 0 -- -- -- duplicatesEnabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout3 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel2_2 -- -- -- text -- Category -- -- -- buddy -- comboPriority -- -- -- -- CategorySelect -- -- name -- comboCategory -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout18 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLayoutWidget -- -- name -- Layout17 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel3 -- -- -- text -- Start - End -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout4 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QPushButton -- -- name -- buttonStart -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- text -- Jan 02 00 -- -- -- -- QLineEdit -- -- name -- comboStart -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- alignment -- AlignHCenter -- -- -- hAlign -- -- -- -- -- -- -- name -- Spacer12 -- -- -- orientation -- Horizontal -- -- -- sizeType -- Expanding -- -- -- sizeHint -- -- 20 -- 20 -- -- -- -- -- QLayoutWidget -- -- name -- Layout5 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QPushButton -- -- name -- buttonEnd -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- text -- Jan 02 00 -- -- -- -- QLineEdit -- -- name -- comboEnd -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- minimumSize -- -- 70 -- 0 -- -- -- -- maximumSize -- -- 70 -- 32767 -- -- -- -- alignment -- AlignHCenter -- -- -- hAlign -- -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout7 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TimePickerLabel -- -- -- text -- Start time -- -- -- -- TimePicker -- -- name -- timePickerStart -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QCheckBox -- -- name -- checkAllDay -- -- -- text -- All day -- -- -- -- QLayoutWidget -- -- name -- Layout8 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- TextLabel3_2_2 -- -- -- text -- Time zone -- -- -- -- TimeZoneSelector -- -- name -- timezone -- -- -- sizePolicy -- -- 3 -- 1 -- -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout9 -- -- -- layoutSpacing -- -- -- -- margin -- 0 -- -- -- spacing -- 1 -- -- -- QCheckBox -- -- name -- checkAlarm -- -- -- enabled -- true -- -- -- autoMask -- false -- -- -- text -- &Alarm -- -- -- checked -- false -- -- -- -- QSpinBox -- -- name -- spinAlarm -- -- -- enabled -- false -- -- -- suffix -- -- -- -- maxValue -- 180 -- -- -- minValue -- 0 -- -- -- lineStep -- 1 -- -- -- value -- 5 -- -- -- -- QComboBox -- -- -- text -- minutes -- -- -- -- -- text -- hours -- -- -- -- -- text -- days -- -- -- -- name -- ComboInterval -- -- -- enabled -- false -- -- -- currentItem -- 0 -- -- -- -- QComboBox -- -- -- text -- Silent -- -- -- -- -- text -- Loud -- -- -- -- name -- comboSound -- -- -- enabled -- false -- -- -- -- -- -- QLayoutWidget -- -- name -- Layout11 -- -- -- -- margin -- 0 -- -- -- spacing -- 6 -- -- -- QLabel -- -- name -- lblRepeat -- -- -- text -- Repeat -- -- -- -- QToolButton -- -- name -- cmdRepeat -- -- -- sizePolicy -- -- 3 -- 0 -- -- -- -- focusPolicy -- TabFocus -- -- -- text -- No Repeat... -- -- -- -- -- -- QToolButton -- -- name -- editNote -- -- -- text -- Note... -- -- -- -+ -+ -+ name -+ comboSound -+ -+ -+ enabled -+ false -+ -+ -+ -+ QLabel -+ -+ name -+ lblRepeat -+ -+ -+ text -+ Repeat -+ -+ -+ -+ QToolButton -+ -+ name -+ cmdRepeat -+ -+ -+ sizePolicy -+ -+ 3 -+ 0 -+ -+ -+ -+ focusPolicy -+ TabFocus -+ -+ -+ text -+ No Repeat... -+ -+ -+ -+ QToolButton -+ -+ name -+ editNote -+ -+ -+ text -+ Note... -+ - - - -@@ -893,12 +647,6 @@ - comboStart - setDisabled(bool) - -- -- checkAlarm -- toggled(bool) -- ComboInterval -- setEnabled(bool) -- - endDateChanged( const QString & ) - endDateChanged( int, int, int ) - endTimeChanged( const QString & ) diff --git a/packages/opie-datebook/opie-datebook_1.2.2.bb b/packages/opie-datebook/opie-datebook_1.2.2.bb index 83493f01a3..7c2b74a550 100644 --- a/packages/opie-datebook/opie-datebook_1.2.2.bb +++ b/packages/opie-datebook/opie-datebook_1.2.2.bb @@ -2,5 +2,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/pim/datebook \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://bug1707fix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 2a42b59c6fb737e55b4f35de30d82a0a43167e24 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 08:26:53 +0000 Subject: irk 0.11.0 fix wrong dependency on virtual/libqpe, palmtop.bbclass handles this --- packages/irk/irk-targus_0.11.0.bb | 2 +- packages/irk/irk.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index d7ba4a70a8..a0508d30f5 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -1,4 +1,4 @@ -include irk.inc +require irk.inc DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" diff --git a/packages/irk/irk.inc b/packages/irk/irk.inc index c988cdafd3..654764a87d 100644 --- a/packages/irk/irk.inc +++ b/packages/irk/irk.inc @@ -3,7 +3,7 @@ SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" -DEPENDS = "virtual/libqpe lirc" +DEPENDS = "lirc" S = "${WORKDIR}/irk" -- cgit v1.2.3 From 05b2a4e780989cc4ed9a7f41e0628cb6be89d63f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 3 Jul 2006 09:03:21 +0000 Subject: fluxbox-gpe: package manpages into -doc --- packages/fluxbox/fluxbox-gpe_1.0rc.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb index 0d962ca6f5..9cf8da0217 100644 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ b/packages/fluxbox/fluxbox-gpe_1.0rc.bb @@ -13,7 +13,7 @@ RCONFLICTS = "fluxbox" ###################################################################################### -PR = "r2" +PR = "r3" S = "${WORKDIR}/fluxbox-${PV}" ###################################################################################### @@ -27,7 +27,7 @@ SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.ta ###################################################################################### -PACKAGES = "${PN} ${PN}-styles" +PACKAGES += "${PN}-styles" DESCRIPTION_${PN}-styles = "The default styles for fluxbox" -- cgit v1.2.3 From 0a5186fcb3682e80cb494ae758037a53da22a098 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 09:21:41 +0000 Subject: linux-jlime-arm: fix mismerge --- packages/linux/linux-jlime-arm_2.6.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 0f67a7c2be..5db9de0d6e 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ file://Kconfig-Keyboard-Jornada720.patch;patch=0\ - file://Kconfig-Touchscreen-Jornada720.patch;patch=0 + file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ file://Makefile-Keyboard-Jornada720.patch;patch=0 \ -- cgit v1.2.3 From 51657cd1b528d09a3d54d165ff57ed94a3d03097 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 3 Jul 2006 10:39:09 +0000 Subject: htcuniversal.conf: Remove power module (builtin now). --- conf/machine/htcuniversal.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 288f3ebaa9..b8368f32c9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -30,7 +30,7 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" module_autoload_htcuniversal_power = "htcuniversal_power" @@ -41,7 +41,6 @@ module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" module_autoload_htcuniversal-acx = "htcuniversal_acx" module_autoload_htcuniversal-bt = "htcuniversal_bt" -module_autoload_htcuniversal-power = "htcuniversal_power" #module_autoload_pxa27x_udc = "pxa27x_udc" -- cgit v1.2.3 From 7879864edcda9b69f74d1ca461f54b630b42ee25 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:14:46 +0000 Subject: mplayer_1.0pre8.bb : fix options passed to the configure script more strictly, fix depends. Also added a patch that should makes the pld instruction dependant on arm5 so should compile happilly on arm4. --- packages/mplayer/files/pld-onlyarm5.patch | 405 ++++++++++++++++++++++++++++++ packages/mplayer/mplayer_1.0pre8.bb | 120 ++++++++- 2 files changed, 520 insertions(+), 5 deletions(-) create mode 100644 packages/mplayer/files/pld-onlyarm5.patch diff --git a/packages/mplayer/files/pld-onlyarm5.patch b/packages/mplayer/files/pld-onlyarm5.patch new file mode 100644 index 0000000000..3b8c576439 --- /dev/null +++ b/packages/mplayer/files/pld-onlyarm5.patch @@ -0,0 +1,405 @@ +--- MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S.orig 2006-07-03 09:53:33.000000000 +0100 ++++ MPlayer-1.0pre8/libavcodec/armv4l/dsputil_arm_s.S 2006-07-03 10:06:58.000000000 +0100 +@@ -16,6 +16,13 @@ + @ License along with this library; if not, write to the Free Software + @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + @ ++#if defined(__ARM_ARCH_5__) || \ ++ defined(__ARM_ARCH_5T__) || \ ++ defined(__ARM_ARCH_5TE__) ++#define PLD(code...) code ++#else ++#define PLD(code...) ++#endif + + .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 + mov \Rd0, \Rn0, lsr #(\shift * 8) +@@ -74,7 +81,7 @@ + put_pixels16_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11, lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -85,7 +92,7 @@ + ldmia r1, {r4-r7} + add r1, r1, r2 + stmia r0, {r4-r7} +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + add r0, r0, r2 + bne 1b +@@ -95,7 +102,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 1, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -106,7 +113,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 2, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -117,7 +124,7 @@ + ldmia r1, {r4-r8} + add r1, r1, r2 + ADJ_ALIGN_QUADWORD_D 3, r9, r10, r11, r12, r4, r5, r6, r7, r8 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r9-r12} + add r0, r0, r2 +@@ -136,7 +143,7 @@ + put_pixels8_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r5,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -147,7 +154,7 @@ + ldmia r1, {r4-r5} + add r1, r1, r2 + subs r3, r3, #1 +- pld [r1] ++ PLD ( pld [r1] ) + stmia r0, {r4-r5} + add r0, r0, r2 + bne 1b +@@ -157,7 +164,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -168,7 +175,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -179,7 +186,7 @@ + ldmia r1, {r4-r5, r12} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r12 +- pld [r1] ++ PLD ( pld [r1] ) + subs r3, r3, #1 + stmia r0, {r4-r5} + add r0, r0, r2 +@@ -198,7 +205,7 @@ + put_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -210,7 +217,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -223,7 +230,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -236,7 +243,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -248,7 +255,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -267,7 +274,7 @@ + put_no_rnd_pixels8_x2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r10,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -279,7 +286,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -292,7 +299,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -305,7 +312,7 @@ + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 + ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 + subs r3, r3, #1 + stmia r0, {r4-r5} +@@ -317,7 +324,7 @@ + ldmia r1, {r4-r5, r10} + add r1, r1, r2 + ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r5, r10, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -338,7 +345,7 @@ + put_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -352,13 +359,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -369,18 +376,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -392,18 +399,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -415,18 +422,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -447,7 +454,7 @@ + put_no_rnd_pixels8_y2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adr r5, 5f + ands r4, r1, #3 +@@ -461,13 +468,13 @@ + add r1, r1, r2 + 6: ldmia r1, {r6-r7} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 + ldmia r1, {r4-r5} + add r1, r1, r2 + stmia r0, {r8-r9} + add r0, r0, r2 +- pld [r1] ++ PLD ( pld [r1] ) + NO_RND_AVG32 r8, r9, r6, r7, r4, r5, r12 + subs r3, r3, #1 + stmia r0, {r8-r9} +@@ -478,18 +485,18 @@ + 2: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -501,18 +508,18 @@ + 3: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -524,18 +531,18 @@ + 4: + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + 6: ldmia r1, {r7-r9} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r7, r8, r9 + NO_RND_AVG32 r10, r11, r4, r5, r7, r8, r12 + stmia r0, {r10-r11} + add r0, r0, r2 + ldmia r1, {r4-r6} + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 + subs r3, r3, #1 + NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 +@@ -562,7 +569,7 @@ + ldmia r1, {r8-r10} + .endif + add r1, r1, r2 +- pld [r1] ++ PLD ( pld [r1] ) + .if \align == 0 + ADJ_ALIGN_DOUBLEWORD_D 1, r4, r5, r6, r7, r8 + .elseif \align == 1 +@@ -624,7 +631,7 @@ + put_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 +@@ -661,7 +668,7 @@ + put_no_rnd_pixels8_xy2_arm: + @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) + @ block = word aligned, pixles = unaligned +- pld [r1] ++ PLD ( pld [r1] ) + stmfd sp!, {r4-r11,lr} @ R14 is also called LR + adrl r12, 5f + ands r4, r1, #3 diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 9c66221f57..0fdc492968 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ @@ -15,12 +15,13 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://w100-video_out.patch;patch=1 \ file://w100-mplayer.patch;patch=1 \ file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1" + file://libmpcodecs-ogg-include.patch;patch=1 \ + file://pld-onlyarm5.patch;patch=1" MAINTAINER="Graeme Gregory " RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r0" +PR = "r1" PARALLEL_MAKE = "" @@ -46,17 +47,126 @@ EXTRA_OECONF = " \ --disable-linux-devfs \ --disable-lirc \ --disable-lircc \ + --disable-joystick \ + --disable-vm \ + --disable-xf86keysym \ --disable-tv \ + --disable-tv-v4l \ + --disable-tv-v4l2 \ + --disable-tv-bsdbt848 \ --enable-rtc \ + --enable-network \ + --disable-winsock2 \ --disable-smb \ + --disable-live \ + --disable-dvdread \ + --disable-mpdvdkit \ + --disable-cdparanoia \ + --disable-freetype \ + --enable-fontconfig \ + --disable-unrarlib \ + --disable-menu \ + --enable-sortsub \ + --disable-fribidi \ + --disable-enca \ + --disable-macosx \ + --disable-macosx-finder-support \ + --disable-macosx-bundle \ + --disable-ftp \ + --disable-vstream \ + \ + --enable-gif \ + --enable-png \ + --enable-jpeg \ + --disable-libcdio \ + --enable-liblzo \ --disable-win32 \ + --disable-dshow \ + --disable-qtx \ + --disable-xanim \ + --disable-real \ + --disable-xvid \ + --disable-x264 \ + --disable-divx4linux \ + --disable-opendivx \ + \ + --disable-libavutil_so \ + --disable-libavcodec_so \ + --disable-libavformat_so \ + --disable-libpostproc_so \ + --disable-libfame \ \ --enable-tremor-low \ + \ + --disable-speex \ + --disable-theora \ + --disable-external-faad \ + --disable-faac \ + --disable-ladspa \ + --disable-libdv \ + --enable-mad \ + --disable-toolame \ + --disable-twolame \ + --disable-xmms \ --disable-mp3lib \ + --disable-libdts \ + --enable-libmpeg2 \ + --disable-musepack \ + --disable-amr_nb \ + --disable-amr_nb-fixed \ + --disable-amr_wb \ \ - --disable-x11 \ + --disable-internal-vidix \ + --disable-external-vidix \ + --disable-gl \ + --disable-dga \ + --disable-vesa \ + --disable-svga \ --enable-sdl \ - --enable-fbdev " + --disable-aa \ + --disable-caca \ + --disable-ggi \ + --disable-ggiwmh \ + --disable-directx \ + --disable-dxr2 \ + --disable-dxr3 \ + --disable-dvb \ + --disable-dvbhead \ + --disable-mga \ + --disable-xmga \ + --disable-xv \ + --disable-xvmc \ + --disable-vm \ + --disable-xinerama \ + --disable-x11 \ + --enable-fbdev \ + --disable-mlib \ + --disable-3dfx \ + --disable-tdfxfb \ + --disable-s3fb \ + --disable-directfb \ + --disable-zr \ + --disable-bl \ + --disable-tdfxvid \ + --disable-tga \ + --disable-pnm \ + --disable-md5sum \ + \ + --enable-alsa \ + --enable-ossaudio \ + --disable-arts \ + --disable-esd \ + --disable-polyp \ + --disable-jack \ + --disable-openal \ + --disable-nas \ + --disable-sgiaudio \ + --disable-sunaudio \ + --disable-win32waveout \ + --enable-select \ + \ + --disable-runtime-cpudetection \ + " EXTRA_OECONF_append_c7x0 = " --enable-w100 " -- cgit v1.2.3 From 879bf61864692b861913e124ea4f9dacd0c43200 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:31:16 +0000 Subject: mplayer_1.0pre8.bb : add more DEPENDS alsa-lib, lzo, fontconfig, thanks to hrw for spotting these. --- packages/mplayer/mplayer_1.0pre8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 0fdc492968..18b3ce1bd4 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses mplayer-common" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ -- cgit v1.2.3 From dd4fb149e32dcf1d3505d72c7887c9f8a0cc98ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 11:46:11 +0000 Subject: angstrom: misc stuff * new tasks to get smaller images * new images to take advantage of said tasks * cleanups --- packages/angstrom/angstrom-bootmanager-image.bb | 15 +++++++++++---- packages/angstrom/angstrom-bootstrap-image.bb | 14 ++++++++++++++ packages/angstrom/angstrom-gpe-image.bb | 21 +++++++++++++++++++++ packages/angstrom/task-angstrom.bb | 11 +++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 packages/angstrom/angstrom-bootstrap-image.bb create mode 100644 packages/angstrom/angstrom-gpe-image.bb diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index be281d72bf..b669d2b665 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,9 +1,16 @@ -export IMAGE_BASENAME = "Ångström Bootmanager Image" +#Angstrom bootmanager image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends angstrom-bootmanager" + +export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-bootstrap angstrom-bootmanager" +export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager" inherit image_ipk -DEPENDS += "task-bootstrap angstrom-bootmanager" -LICENSE = "MIT" + diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb new file mode 100644 index 0000000000..84a4845569 --- /dev/null +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -0,0 +1,14 @@ +#Angstrom bootstrap image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +DEPENDS = "task-angstrom" +RDEPENDS = "angstrom-base-depends" + +export IMAGE_BASENAME = "bootstrap-image" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "angstrom-base-depends" + +inherit image_ipk + diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb new file mode 100644 index 0000000000..0419ea1b9a --- /dev/null +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -0,0 +1,21 @@ +#Angstrom GPE image +LICENSE = MIT +MAINTAINER = "Koen Kooi " +PR = "r0" + +export IMAGE_BASENAME = "gpe-image" + +DEPENDS = "task-angstrom" +RDEPENDS = "${IPKG_INSTALL}" + +export IPKG_INSTALL = "\ + angstrom-base-depends \ + angstrom-X-base-depends \ + angsgrom-gpe-task-base \ + angstrom-gpe-task-settings \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + +#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " + +inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index c7323314db..d058457e98 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -3,6 +3,7 @@ PR = "r0" ALLOW_EMPTY = "1" PACKAGES = "\ + angstrom-base-depends \ angstrom-X-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ @@ -13,6 +14,16 @@ PACKAGES = "\ angstrom-task-printing \ angstrom-task-sectest" +RDEPENDS_angstrom-base-depends = "\ + base-files \ + base-passwd tinylogin \ + busybox \ + udev \ + sysvinit initscripts sysvinit-pidof \ + netbase \ + angstrom-version \ + " + RDEPENDS_angstrom-X-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From 154e2d11e0915bf835aee9dddf6de954de4c68e8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 11:52:04 +0000 Subject: irk 0.11 fix wrong dependency, make it work against multithreaded qt as well --- packages/irk/irk-belkin_0.11.bb | 4 ++-- packages/irk/irk-targus_0.11.0.bb | 1 + packages/irk/irk.inc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb index 9710e71109..b743544903 100644 --- a/packages/irk/irk-belkin_0.11.bb +++ b/packages/irk/irk-belkin_0.11.bb @@ -1,9 +1,9 @@ -include irk.inc +require irk.inc DESCRIPTION += "(version with Belkin support)" RCONFLICTS = "irk-targus" RREPLACES = "irk-targus" -PR = "r2" +PR = "r3" SRC_URI = "http://kopsisengineering.com/irk-current.tgz \ file://install-default-conf.patch;patch=1" diff --git a/packages/irk/irk-targus_0.11.0.bb b/packages/irk/irk-targus_0.11.0.bb index a0508d30f5..1b130776a8 100644 --- a/packages/irk/irk-targus_0.11.0.bb +++ b/packages/irk/irk-targus_0.11.0.bb @@ -1,4 +1,5 @@ require irk.inc +PR = "r2" DESCRIPTION += "(version with Targus support)" HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php" diff --git a/packages/irk/irk.inc b/packages/irk/irk.inc index 654764a87d..b00583c22b 100644 --- a/packages/irk/irk.inc +++ b/packages/irk/irk.inc @@ -9,7 +9,7 @@ S = "${WORKDIR}/irk" inherit palmtop -EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" +EXTRA_QMAKEVARS_POST += "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc" do_install() { install -d ${D}${sysconfdir}/ -- cgit v1.2.3 From 070b8505d9e79c3fa5b84d8603774442f73d9f5d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 3 Jul 2006 11:57:51 +0000 Subject: mplayer_1.0pre8.bb : another missed DEPEND --- packages/mplayer/mplayer_1.0pre8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mplayer/mplayer_1.0pre8.bb b/packages/mplayer/mplayer_1.0pre8.bb index 18b3ce1bd4..071b403695 100644 --- a/packages/mplayer/mplayer_1.0pre8.bb +++ b/packages/mplayer/mplayer_1.0pre8.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg libungif liba52 fontconfig alsa-lib lzo ncurses lame" RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ -- cgit v1.2.3 From 9bc60bf6699aea7a159fbbb8b4d0176830435d0f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:07:45 +0000 Subject: tslib: not much cvs activity since two years - create a fixed version --- packages/tslib/tslib_20060703.bb | 94 ++++++++++++++++++++++++++++++++++++++++ packages/tslib/tslib_cvs.bb | 94 ---------------------------------------- 2 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 packages/tslib/tslib_20060703.bb delete mode 100644 packages/tslib/tslib_cvs.bb diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb new file mode 100644 index 0000000000..89296c4796 --- /dev/null +++ b/packages/tslib/tslib_20060703.bb @@ -0,0 +1,94 @@ +DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." +HOMEPAGE = "http://cvs.arm.linux.org.uk/" +AUTHOR = "Russell King w/ plugins by Chris Larson et. al." +SECTION = "base" +LICENSE = "LGPL" + +PV = "0.1+cvs+${PV}" +PR = "r0" + +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \ + file://usec_fix.patch;patch=1 \ + file://ts.conf \ + file://ts-2.6.conf \ + file://ts.conf-h3600-2.4 \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-corgi-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh" +SRC_URI_append_mnci += " file://devfs.patch;patch=1" +SRC_URI_append_mnci += " file://event1.patch;patch=1" +S = "${WORKDIR}/tslib" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-shared" +EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " + +do_stage() { + autotools_stage_all +} + +do_install_prepend() { + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf +} + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + case ${MACHINE} in + a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-h3600-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + c7x0 | spitz | akita | tosa ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-corgi-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + + simpad ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-simpad-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + *) + ;; + esac +} + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" + +RDEPENDS_tslib-conf_h1940 = "detect-stylus" +RDEPENDS_tslib-conf_h2200 = "detect-stylus" +RDEPENDS_tslib-conf_h3600 = "detect-stylus" +RDEPENDS_tslib-conf_h3900 = "detect-stylus" +RDEPENDS_tslib-conf_h6300 = "detect-stylus" + +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" + +PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" + +RDEPENDS_libts = "tslib-conf" + +FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" +FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_libts-dev = "${FILES_tslib-dev}" +FILES_tslib-calibrate += "${bindir}/ts_calibrate" +FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb deleted file mode 100644 index bd3478191e..0000000000 --- a/packages/tslib/tslib_cvs.bb +++ /dev/null @@ -1,94 +0,0 @@ -DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library." -HOMEPAGE = "http://cvs.arm.linux.org.uk/" -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPL" - -PV = "0.0+cvs${SRCDATE}" -PR = "r39" - -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ - file://usec_fix.patch;patch=1 \ - file://ts.conf \ - file://ts-2.6.conf \ - file://ts.conf-h3600-2.4 \ - file://ts.conf-simpad-2.4 \ - file://ts.conf-corgi-2.4 \ - file://ts.conf-collie-2.4 \ - file://tslib.sh" -SRC_URI_append_mnci += " file://devfs.patch;patch=1" -SRC_URI_append_mnci += " file://event1.patch;patch=1" -S = "${WORKDIR}/tslib" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared" -EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " - -do_stage() { - autotools_stage_all -} - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ - case ${MACHINE} in - a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-h3600-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - c7x0 | spitz | akita | tosa ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-corgi-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - collie | poodle ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-collie-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - - simpad ) - install -d ${D}${datadir}/tslib - for f in ts-2.6.conf ts.conf-simpad-2.4; do - install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ - done - rm -f ${D}${sysconfdir}/ts.conf - ;; - *) - ;; - esac -} - -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" - -RDEPENDS_tslib-conf_h1940 = "detect-stylus" -RDEPENDS_tslib-conf_h2200 = "detect-stylus" -RDEPENDS_tslib-conf_h3600 = "detect-stylus" -RDEPENDS_tslib-conf_h3900 = "detect-stylus" -RDEPENDS_tslib-conf_h6300 = "detect-stylus" - -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" -PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" - -PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" - -RDEPENDS_libts = "tslib-conf" - -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_libts-dev = "${FILES_tslib-dev}" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" -- cgit v1.2.3 From def4ba6a3759bb55bd5b888cde21379b5202dede Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:23:13 +0000 Subject: zbedic 1.0 fix building against multithreaded qt --- packages/zbedic/zbedic_1.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/zbedic/zbedic_1.0.bb b/packages/zbedic/zbedic_1.0.bb index d7218a241d..4290258b61 100644 --- a/packages/zbedic/zbedic_1.0.bb +++ b/packages/zbedic/zbedic_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" DEPENDS = "libbedic" APPTYPE = "binary" APPDESKTOP = "${WORKDIR}/misc" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/zbedic_${PV}-0.tgz \ file://opie-icons.patch;patch=1 \ @@ -18,11 +18,11 @@ S = "${WORKDIR}" inherit opie export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/libbedic LIBS+=-lbedic LIBS+=-lsqlite3 TARGET=zbedic" -do_configure() { - cd ${S} && rm -rf *~ && qmake -project && qmake -makefile -spec ${QMAKESPEC} -after \ - INCLUDEPATH=${STAGING_INCDIR}/libbedic DEFINES+=QWS \ - LIBS+=-lqpe LIBS+=-lbedic LIBS+=-lsqlite3 DESTDIR=${S} TARGET=zbedic +do_configure_prepend() { + rm -f Makefile + qmake -project } do_install() { -- cgit v1.2.3 From 5cb867704ca627b7511cea9f77f17af7803ba956 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:29:20 +0000 Subject: tslib: fix cvs build, reorder metadata for -maemo variant --- packages/tslib/tslib-maemo_0.0.1-15.bb | 18 ++++++++---------- packages/tslib/tslib_20060703.bb | 5 +++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index f744833d57..e303b40841 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,25 +1,18 @@ -DEFAULT_PREFERENCE = "-1" -SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." -PR = "r2" +SECTION = "GPL" +LICENSE = "LGPL" PROVIDES = "tslib" +PR = "r3" DEFAULT_PREFERENCE = "-1" -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" - SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ file://tslib.sh" - S = "${WORKDIR}/tslib" -LICENSE = "LGPL" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" inherit autotools -PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" EXTRA_OECONF = "--enable-shared" do_stage () { @@ -36,6 +29,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" +PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" + RDEPENDS_libts-maemo = "tslib-maemo-conf" RPROVIDES_tslib-maemo-conf = "tslib-conf" diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index 89296c4796..f4ff493b57 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PV = "0.1+cvs+${PV}" +RV := "${PV}" +PV = "0.1+cvs-${RV}" PR = "r0" -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \ +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ file://ts.conf \ file://ts-2.6.conf \ -- cgit v1.2.3 From a536f91cda43bb451202269f3d86ea98f8cf3196 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:39:13 +0000 Subject: angstrom: cleanups as per Marcins suggestions --- packages/angstrom/angstrom-bootmanager-image.bb | 2 +- packages/angstrom/angstrom-bootstrap-image.bb | 2 +- packages/angstrom/angstrom-gpe-image.bb | 9 +++++---- packages/angstrom/task-angstrom.bb | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index b669d2b665..f6aaddd55e 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "angstrom-base-depends angstrom-bootmanager" +export IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index 84a4845569..b2b5565eb6 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -8,7 +8,7 @@ RDEPENDS = "angstrom-base-depends" export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "angstrom-base-depends" +export IPKG_INSTALL = "${RDEPENDS}" inherit image_ipk diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index 0419ea1b9a..df7f90987e 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -6,16 +6,17 @@ PR = "r0" export IMAGE_BASENAME = "gpe-image" DEPENDS = "task-angstrom" -RDEPENDS = "${IPKG_INSTALL}" - -export IPKG_INSTALL = "\ +RDEPENDS = "\ angstrom-base-depends \ - angstrom-X-base-depends \ + angstrom-x11-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ ${ANGSTROM_EXTRA_INSTALL}" + +export IPKG_INSTALL = "${RDEPENDS}" + #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index d058457e98..7447dc02e2 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -4,7 +4,7 @@ ALLOW_EMPTY = "1" PACKAGES = "\ angstrom-base-depends \ - angstrom-X-base-depends \ + angstrom-x11-base-depends \ angsgrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ @@ -24,7 +24,7 @@ RDEPENDS_angstrom-base-depends = "\ angstrom-version \ " -RDEPENDS_angstrom-X-base-depends := "\ +RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From a63b99505854d63a59ff9eb20041a6da90548553 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:47:36 +0000 Subject: gcc: add eabi to atexit cases gcc3-build.inc and bump pr for affected toolchains --- packages/gcc/gcc3-build.inc | 5 +++++ packages/gcc/gcc_4.1.1.bb | 2 +- packages/gcc/gcc_csl-arm-2005q3.bb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 74ad11033f..32e22e16f8 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -63,8 +63,13 @@ python __anonymous () { import bb, re if (re.match('linux-uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-uclibcgnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d) + elif (re.match('linux-gnueabi$', bb.data.getVar('TARGET_OS', d, 1)) != None): + bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) elif (re.match('linux$', bb.data.getVar('TARGET_OS', d, 1)) != None): bb.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d) + } do_configure () { diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 793aa4bb76..6e332dceca 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 62bacda147..02e984358f 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "GPL" BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" -PR = "r1" +PR = "r2" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" -- cgit v1.2.3 From b4c0b087d67f8fb9db91e6137d8e834ec11b1bc3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:48:37 +0000 Subject: libcwd: upgrade to 0.99.44 --- packages/libcwd/libcwd_0.99.40.bb | 22 ---------------------- packages/libcwd/libcwd_0.99.44.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 22 deletions(-) delete mode 100644 packages/libcwd/libcwd_0.99.40.bb create mode 100644 packages/libcwd/libcwd_0.99.44.bb diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.40.bb deleted file mode 100644 index a2650eec85..0000000000 --- a/packages/libcwd/libcwd_0.99.40.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \ -It includes ostream-based debug output with custom debug channels and devices, \ -powerful memory allocation debugging support, as well as run-time support for \ -printing source line number information and demangled type names." -SECTION = "devel/libs" -LICENSE = "QPL" -HOMEPAGE = "http://libcwd.sourceforge.net" -MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r0" - -SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz" - -inherit autotools - -PARALLEL_MAKE = "" - -PACKAGES =+ "${PN}-config ${PN}-mt" -FILES_${PN} = "${libdir}/libcwd.so*" -FILES_${PN}-mt = "${libdir}/libcwd_r.so*" -FILES_${PN}-config = "${datadir}" -RRECOMMENDS_${PN} = "${PN}-config" -RRECOMMENDS_${PN}-mt = "${PN}-config" diff --git a/packages/libcwd/libcwd_0.99.44.bb b/packages/libcwd/libcwd_0.99.44.bb new file mode 100644 index 0000000000..1288ea6e75 --- /dev/null +++ b/packages/libcwd/libcwd_0.99.44.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \ +It includes ostream-based debug output with custom debug channels and devices, \ +powerful memory allocation debugging support, as well as run-time support for \ +printing source line number information and demangled type names." +SECTION = "devel/libs" +LICENSE = "QPL" +HOMEPAGE = "http://libcwd.sourceforge.net" +MAINTAINER = "Michael 'Mickey' Lauer " +PR = "r0" + +SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz" + +inherit autotools + +do_configure() { + oe_runconf +} + +PARALLEL_MAKE = "" + +PACKAGES =+ "${PN}-config ${PN}-mt" +FILES_${PN} = "${libdir}/libcwd.so*" +FILES_${PN}-mt = "${libdir}/libcwd_r.so*" +FILES_${PN}-config = "${datadir}" +RRECOMMENDS_${PN} = "${PN}-config" +RRECOMMENDS_${PN}-mt = "${PN}-config" -- cgit v1.2.3 From 1eb690ef768680928f40ea37cf91bb21959d2d2b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 12:51:05 +0000 Subject: txdrug 0.1 regenerate Makefile, fix working against qte-mt --- packages/txdrug/txdrug_0.1.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index 7e77fb2348..fd12180ac6 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "sqlite" -PR = "r1" +PR = "r2" SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \ file://${FILESDIR}/${palmtopdir}" @@ -12,6 +12,12 @@ S = "${WORKDIR}/txdrug-tar" inherit palmtop +EXTRA_QMAKEVARS_POST += "LIBS+=-lsqlite TARGET=txdrug" + +do_configure_prepend() { + rm -f Makefile && qmake -project +} + do_install() { install -d ${D}${palmtopdir} cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/ -- cgit v1.2.3 From cd3ff97d19adc158b63d54d20e66b4fc45105ca4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 12:51:23 +0000 Subject: gcc-cross: bump pr --- packages/gcc/gcc-cross_4.1.1.bb | 2 +- packages/gcc/gcc-cross_csl-arm-2005q3.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 19e37660b2..4e3805b676 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 93c58aca53..044383cb84 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -4,7 +4,7 @@ include gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r0" +PR = "r1" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -- cgit v1.2.3 From d67f17b36bda753f625435ae7a2236a183550f1a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 13:07:50 +0000 Subject: mileage: catch up with sourceforge CVS hosting --- packages/mileage/mileage_cvs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb index 355db4d3ea..a917f76d05 100644 --- a/packages/mileage/mileage_cvs.bb +++ b/packages/mileage/mileage_cvs.bb @@ -5,9 +5,9 @@ PRIORITY = "optional" LICENSE = "GPL" #Change to form x.y.z+cvs${SRCDATE} when 4.2.0 changes in PV PV = "4.2.0-cvs-${SRCDATE}" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage" +SRC_URI = "cvs://anonymous@mileage.cvs.sourceforge.net/cvsroot/mileage;module=mileage" S = "${WORKDIR}/mileage" inherit palmtop -- cgit v1.2.3 From f6e8cf8291ee82a6ab66fbe11a03fd0af23003cb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 14:34:38 +0000 Subject: h2200, ipaq-pxa270: start seperating kernel-modules from BOOTSTRAP_foo, so people aren't forced to use the bloated task-bootstrap to get a booting image --- conf/machine/h2200.conf | 3 ++- conf/machine/ipaq-pxa270.conf | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index fab57cae38..e1baea775d 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,7 +14,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" #ship in rootfs: diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 9ed313334b..359f8296d8 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -21,7 +21,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" @@ -41,7 +42,6 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" # These modules are now compiled into the kernel: #HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ -- cgit v1.2.3 From 493a0dc716163e1f0747d86b1f0e66e64f0162bc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 14:46:29 +0000 Subject: task-angstrom: start using the new BOOTMODULES_RRECOMMENDS var --- packages/angstrom/task-angstrom.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 7447dc02e2..ec989659f1 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -24,6 +24,11 @@ RDEPENDS_angstrom-base-depends = "\ angstrom-version \ " +RRECOMMENDS_angstrom-base-depends = "\ + ${BOOTMODULES_RRECOMMENDS} \ + " + + RDEPENDS_angstrom-x11-base-depends := "\ diet-x11 \ virtual/xserver" -- cgit v1.2.3 From 5badc4267510b46619fbbe88d0a4acc56f8c4fc5 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 3 Jul 2006 15:15:58 +0000 Subject: fluxbox: Split flxubox-gpe in fluxbox and fluxbox-gpe, courtesy hrw & koen --- packages/fluxbox/fluxbox-gpe/.mtn2git_empty | 0 packages/fluxbox/fluxbox-gpe/apps.gpe.akita | 57 ---------- packages/fluxbox/fluxbox-gpe/apps.gpe.default | 7 -- packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session | 40 ------- packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session | 9 -- packages/fluxbox/fluxbox-gpe/gpe-init.patch | 121 -------------------- packages/fluxbox/fluxbox-gpe/style.gpe-default | 137 ----------------------- packages/fluxbox/fluxbox-gpe_1.0rc.bb | 77 ------------- packages/fluxbox/fluxbox/.mtn2git_empty | 0 packages/fluxbox/fluxbox/apps.gpe.akita | 57 ++++++++++ packages/fluxbox/fluxbox/apps.gpe.default | 7 ++ packages/fluxbox/fluxbox/fluxbox-gpe-session | 40 +++++++ packages/fluxbox/fluxbox/fluxbox-gpe.session | 9 ++ packages/fluxbox/fluxbox/gpe-init.patch | 121 ++++++++++++++++++++ packages/fluxbox/fluxbox/style.gpe-default | 137 +++++++++++++++++++++++ packages/fluxbox/fluxbox_0.99+1.0rc.bb | 79 +++++++++++++ 16 files changed, 450 insertions(+), 448 deletions(-) delete mode 100644 packages/fluxbox/fluxbox-gpe/.mtn2git_empty delete mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.akita delete mode 100644 packages/fluxbox/fluxbox-gpe/apps.gpe.default delete mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session delete mode 100644 packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session delete mode 100644 packages/fluxbox/fluxbox-gpe/gpe-init.patch delete mode 100644 packages/fluxbox/fluxbox-gpe/style.gpe-default delete mode 100644 packages/fluxbox/fluxbox-gpe_1.0rc.bb create mode 100644 packages/fluxbox/fluxbox/.mtn2git_empty create mode 100644 packages/fluxbox/fluxbox/apps.gpe.akita create mode 100644 packages/fluxbox/fluxbox/apps.gpe.default create mode 100644 packages/fluxbox/fluxbox/fluxbox-gpe-session create mode 100644 packages/fluxbox/fluxbox/fluxbox-gpe.session create mode 100644 packages/fluxbox/fluxbox/gpe-init.patch create mode 100644 packages/fluxbox/fluxbox/style.gpe-default create mode 100644 packages/fluxbox/fluxbox_0.99+1.0rc.bb diff --git a/packages/fluxbox/fluxbox-gpe/.mtn2git_empty b/packages/fluxbox/fluxbox-gpe/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita b/packages/fluxbox/fluxbox-gpe/apps.gpe.akita deleted file mode 100644 index 7aca442752..0000000000 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe.akita +++ /dev/null @@ -1,57 +0,0 @@ -[app] (title=Panel 0) - [Deco] {NONE} - [Sticky] {yes} -[end] -[app] (title=Panel 1) - [Deco] {NONE} -[end] -[app] (title=rxvt) - [Dimensions] {635 440} -[end] -[app] (title=x-terminal-emulator) - [Dimensions] {635 440} -[end] -[app] (abiword) - [Dimensions] {635 440} - [Sticky] {no} -[end] -[app] (gpe-filemanager) - [Dimensions] {635 440} - [Sticky] {yes} -[end] -[app] (gpe-info) - [Dimensions] {424 336} -[end] -[app] (gpe-edit) - [Dimensions] {635 440} -[end] -[app] (gpe-calculator) - [Dimensions] {266 321} -[end] -[app] (main) - [Dimensions] {635 440} -[end] -[app] (Gnumeric) - [Dimensions] {635 440} -[end] -[app] (gpdf) - [Dimensions] {635 440} -[end] -[app] (main_window) - [Dimensions] {635 440} -[end] -[app] (gaim) - [Dimensions] {635 440} -[end] -[app] (gpe-calendar) - [Dimensions] {380 343} -[end] -[app] (gpe-mini-browser) - [Dimensions] {635 440} -[end] -[app] (figment) - [Dimensions] {635 440} -[end] -[app] (gpe-sketchbook) - [Dimensions] {471 314} -[end] diff --git a/packages/fluxbox/fluxbox-gpe/apps.gpe.default b/packages/fluxbox/fluxbox-gpe/apps.gpe.default deleted file mode 100644 index d7a0a83f22..0000000000 --- a/packages/fluxbox/fluxbox-gpe/apps.gpe.default +++ /dev/null @@ -1,7 +0,0 @@ -[app] (title=Panel 0) - [Deco] {NONE} - [Sticky] {yes} -[end] -[app] (title=Panel 1) - [Deco] {NONE} -[end] diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session deleted file mode 100644 index f6e03ede7e..0000000000 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe-session +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Session script for fluxbox-gpe, heavily based on matchbox's session script -# - -# Install "apps" file with defaults for GPE usage - -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" - -case $MACHINE in -*Akita | *Spitz | *Borzoi | *Terrier) - APPS="apps.gpe.akita";; -*) - APPS="apps.gpe.default";; -esac - -if test -e /usr/share/fluxbox/$APPS -then - mkdir -p $HOME/.fluxbox - test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps -fi - - -if [ -e $HOME/.fluxbox/session ] -then -exec $HOME/.fluxbox/session -fi - -if [ -e /usr/share/fluxbox/session ] -then -exec /usr/share/fluxbox/session -fi - -# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session -# dont exist. - -matchbox-desktop & -matchbox-panel --orientation south -no-flip & -sleep 5 -exec startfluxbox $@ diff --git a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session b/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session deleted file mode 100644 index 16b7a2703a..0000000000 --- a/packages/fluxbox/fluxbox-gpe/fluxbox-gpe.session +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` - -matchbox-desktop & -matchbox-panel --orientation south --no-flip& -sleep 5 -exec startfluxbox $@ - diff --git a/packages/fluxbox/fluxbox-gpe/gpe-init.patch b/packages/fluxbox/fluxbox-gpe/gpe-init.patch deleted file mode 100644 index c9836923d8..0000000000 --- a/packages/fluxbox/fluxbox-gpe/gpe-init.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- fluxbox-1.0rc/data/init.in.orig 2006-07-02 20:45:39.119045500 +0200 -+++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200 -@@ -1,35 +1,95 @@ -+session.screen0.slit.onTop: False - session.screen0.slit.placement: BottomRight -+session.screen0.slit.alpha: 255 -+session.screen0.slit.onhead: 0 - session.screen0.slit.direction: Vertical --session.screen0.slit.onTop: False --session.screen0.slit.autoHide: False --session.screen0.tab.placement: Top -+session.screen0.slit.layer: Dock -+session.screen0.slit.maxOver: false -+session.screen0.slit.autoHide: false -+session.screen0.menu.alpha: 255 -+session.screen0.iconbar.iconTextPadding: 10l -+session.screen0.iconbar.alignment: Left -+session.screen0.iconbar.wheelMode: Screen -+session.screen0.iconbar.mode: Workspace -+session.screen0.iconbar.deiconifyMode: Follow -+session.screen0.iconbar.iconWidth: 70 -+session.screen0.iconbar.usePixmap: true -+session.screen0.window.focus.alpha: 255 -+session.screen0.window.unfocus.alpha: 255 -+session.screen0.tab.height: 16 - session.screen0.tab.alignment: Left - session.screen0.tab.rotatevertical: True --session.screen0.toolbar.onTop: False --session.screen0.toolbar.autoHide: False --session.screen0.toolbar.placement: BottomCenter --session.screen0.toolbar.widthPercent: 66 --session.screen0.workspaceNames: one,two,three,four -+session.screen0.tab.placement: TopLeft -+session.screen0.tab.width: 64 -+session.screen0.tabs.intitlebar: true -+session.screen0.titlebar.left: Stick -+session.screen0.titlebar.right: Minimize Maximize Close -+session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, clock -+session.screen0.toolbar.visible: true -+session.screen0.toolbar.layer: Top -+session.screen0.toolbar.placement: TopCenter -+session.screen0.toolbar.onhead: 0 -+session.screen0.toolbar.widthPercent: 69 -+session.screen0.toolbar.onTop: true -+session.screen0.toolbar.height: 0 -+session.screen0.toolbar.alpha: 254 -+session.screen0.toolbar.autoHide: false -+session.screen0.toolbar.maxOver: true -+session.screen0.overlay.lineWidth: 1 -+session.screen0.overlay.lineStyle: LineSolid -+session.screen0.overlay.joinStyle: JoinMiter -+session.screen0.overlay.capStyle: CapNotLast -+session.screen0.autoRaise: false - session.screen0.strftimeFormat: %k:%M --session.screen0.focusNewWindows: True --session.screen0.focusModel: ClickToFocus --session.screen0.fullMaximization: False -+session.screen0.clickRaises: true -+session.screen0.imageDither: false -+session.screen0.workspaces: 4 -+session.screen0.menuDelay: 0 -+session.screen0.focusNewWindows: true -+session.screen0.workspaceNames: one,two,three,four, - session.screen0.edgeSnapThreshold: 0 -+session.screen0.menuDelayClose: 0 -+session.screen0.windowScrollReverse: false - session.screen0.rowPlacementDirection: LeftToRight --session.screen0.workspaces: 4 --session.screen0.focusLastWindow: True -+session.screen0.followModel: Ignore -+session.screen0.windowMenu: -+session.screen0.reversewheeling: false -+session.screen0.windowScrollAction: -+session.screen0.sloppywindowgrouping: true -+session.screen0.resizeMode: Bottom - session.screen0.colPlacementDirection: TopToBottom -+session.screen0.desktopwheeling: true -+session.screen0.tabFocusModel: ClickToTabFocus -+session.screen0.antialias: false -+session.screen0.focusLastWindow: true - session.screen0.windowPlacement: RowSmartPlacement --session.screen0.tab.width: 64 --session.screen0.tab.height: 16 --session.screen0.showwindowposition: true --session.opaqueMove: False --session.autoRaiseDelay: 250 -+session.screen0.focusModel: ClickFocus -+session.screen0.opaqueMove: false -+session.screen0.workspacewarping: true -+session.screen0.menuMode: Delay -+session.screen0.decorateTransient: false -+session.screen0.showwindowposition: true -+session.screen0.rootCommand: -+session.screen0.fullMaximization: false -+session.focusTabMinWidth: 0 - session.menuFile: ~/.fluxbox/menu --session.cacheLife: 5 --session.styleFile: @default_style@ --session.keyFile: ~/.fluxbox/keys -+session.imageDither: True - session.colorsPerChannel: 4 -+session.tabPadding: 0 -+session.styleFile: /usr/share/fluxbox/styles/gpe-default -+session.cacheMax: 200l -+session.autoRaiseDelay: 250 - session.doubleClickInterval: 250 --session.cacheMax: 200 --session.imageDither: True -+session.tabsAttachArea: Window -+session.numLayers: 13 -+session.keyFile: ~/.fluxbox/keys -+session.ignoreBorder: false -+session.appsFile: ~/.fluxbox/apps -+session.tabs: false -+session.useMod1: true -+session.slitlistFile: ~/.fluxbox/slitlist -+session.forcePseudoTransparency: false -+session.opaqueMove: False -+session.groupFile: ~/.fluxbox/groups -+session.cacheLife: 5l -+session.styleOverlay: ~/.fluxbox/overlay diff --git a/packages/fluxbox/fluxbox-gpe/style.gpe-default b/packages/fluxbox/fluxbox-gpe/style.gpe-default deleted file mode 100644 index f94aaf7cdd..0000000000 --- a/packages/fluxbox/fluxbox-gpe/style.gpe-default +++ /dev/null @@ -1,137 +0,0 @@ -! meta -! (c) joel carlbark 2003 -! please dont turn on aa with this style -! make sure you have the font 'glisp' (or similar). - -toolbar: flat gradient vertical -toolbar.color: #849ec6 -toolbar.colorTo: #526d8c - -toolbar.button: parentrelative -toolbar.button.picColor: #d6d7e7 - -toolbar.button.pressed: sunken solid -toolbar.button.pressed.color: #526d8c -toolbar.button.pressed.picColor: #000000 - -! clock -toolbar.clock: parentrelative -toolbar.clock.textColor: white - -! shows workspace nr -toolbar.label: parentrelative -toolbar.label.textColor: white - -! current active window / toolbar -toolbar.windowLabel: parentrelative -toolbar.windowLabel.textColor: white - -! menu --------- -menu.title: flat gradient vertical -menu.title.color: #849ec6 -menu.title.colorTo: #526d8c -menu.title.textColor: #d6d7e7 - -menu.frame: flat gradient vertical -menu.frame.color: #efefef -menu.frame.colorTo: #c6c3c6 -menu.frame.textColor: black - -menu.hilite: flat solid -menu.hilite.color: #849ec6 -menu.hilite.textColor: white - -menu.bullet: triangle -menu.bullet.position: right - -! window -------------- -window.title.focus: flat gradient vertical -window.title.focus.color: #849ec6 -window.title.focus.colorTo: #526d8c - -window.label.focus: parentrelative -window.label.focus.textColor: white - -window.button.focus: flat gradient vertical -window.button.focus.color: #849ec6 -window.button.focus.colorTo: #526d8c -window.button.focus.picColor: #d6d7e7 - -window.button.pressed: sunken solid -window.button.pressed.color: #405060 -window.button.pressed.picColor: #000000 - -window.handle.focus: flat gradient vertical -window.handle.focus.color: #efefef -window.handle.focus.colorTo: #c6c3c6 - -window.grip.focus: flat gradient vertical -window.grip.focus.color: #efefef -window.grip.focus.colorTo: #c6c3c6 - -window.frame.focus: flat solid -window.frame.focus.color: white - -! unfocused -window.title.unfocus: flat gradient vertical -window.title.unfocus.color: #efefef -window.title.unfocus.colorTo: #c6c3c6 - -window.label.unfocus: parentrelative -window.label.unfocus.textColor: #949694 - -window.handle.unfocus: flat gradient vertical -window.handle.unfocus.color: #efefef -window.handle.unfocus.colorTo: #c6c3c6 - -window.grip.unfocus: flat gradient vertical -window.grip.unfocus.color: #efefef -window.grip.unfocus.colorTo: #c6c3c6 - -window.frame.unfocus: flat solid -window.frame.unfocus.color: white - -window.button.unfocus: flat gradient vertical -window.button.unfocus.color: #efefef -window.button.unfocus.colorTo: #c6c3c6 -window.button.unfocus.picColor: #949694 - -! tabs ------ -window.tab.justify: left - -window.tab.label.focus: flat gradient vertical -window.tab.label.focus.color: #849ec6 -window.tab.label.focus.colorTo: #526d8c -window.tab.label.focus.textColor: #d6d7e7 - -window.tab.label.unfocus: flat gradient vertical -window.tab.label.unfocus.color: #efefef -window.tab.label.unfocus.colorTo: #c6c3c6 -window.tab.label.unfocus.textColor: #949694 - -window.tab.borderWidth: 1 -window.tab.borderColor: #949694 -! ------- - -toolbar.justify: left -window.justify: center -menu.title.justify: center -menu.frame.justify: left - -borderColor: #000000 -borderWidth: 1 -bevelWidth: 1 -frameWidth: 1 -handleWidth: 4 - -background: flat -background.color: #d6d7e7 - -#*font: Vera-4 -#toolbar.font: Vera-4 - -toolbar*.font: Vera-6 -window.font: Vera-6 -menu.title.font: Vera-7 -menu.frame.font: Vera-7 - diff --git a/packages/fluxbox/fluxbox-gpe_1.0rc.bb b/packages/fluxbox/fluxbox-gpe_1.0rc.bb deleted file mode 100644 index 0d962ca6f5..0000000000 --- a/packages/fluxbox/fluxbox-gpe_1.0rc.bb +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright Matthias Hentges (c) 2006 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) -# -# Filename: fluxbox-gpe_1.0rc.bb -# Date: 01-Jul-06 - -DESCRIPTION = "The Fluxbox WindowManager for use with GPE" -MAINTAINER = "Matthias 'CoreDump' Hentges " -HOMEPAGE = "http://fluxbox.sourceforge.net" -LICENSE = "MIT" -RCONFLICTS = "fluxbox" - -###################################################################################### - -PR = "r2" -S = "${WORKDIR}/fluxbox-${PV}" - -###################################################################################### - -SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/fluxbox/fluxbox-${PV}.tar.gz \ - file://gpe-init.patch;patch=1\ - file://apps.gpe.* \ - file://style.gpe-default \ - file://fluxbox-gpe-session \ - file://fluxbox-gpe.session" - -###################################################################################### - -PACKAGES = "${PN} ${PN}-styles" - -DESCRIPTION_${PN}-styles = "The default styles for fluxbox" - -###################################################################################### - -FILES_${PN} = "/usr/bin \ - /usr/share/fluxbox/init \ - /usr/share/fluxbox/keys \ - /usr/share/fluxbox/menu \ - /usr/share/fluxbox/apps.gpe* \ - /usr/share/fluxbox/session \ - /usr/share/fluxbox/styles/gpe-default" - -FILES_${PN}-styles = "/usr/share/fluxbox/styles" - -###################################################################################### - -inherit autotools - -###################################################################################### - -EXTRA_OECONF = "--disable-xmb \ - " - -###################################################################################### - -do_install_append() { - install -d ${D}/usr/bin - install -d ${D}/usr/share/fluxbox - install -d ${D}/usr/share/fluxbox/styles - - install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox - install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session - install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default - install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin -} - -###################################################################################### - -pkg_postinst_${PN}() { - update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 -} - -pkg_postrm_${PN}() { - update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session -} - diff --git a/packages/fluxbox/fluxbox/.mtn2git_empty b/packages/fluxbox/fluxbox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fluxbox/fluxbox/apps.gpe.akita b/packages/fluxbox/fluxbox/apps.gpe.akita new file mode 100644 index 0000000000..7aca442752 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.akita @@ -0,0 +1,57 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] +[app] (title=rxvt) + [Dimensions] {635 440} +[end] +[app] (title=x-terminal-emulator) + [Dimensions] {635 440} +[end] +[app] (abiword) + [Dimensions] {635 440} + [Sticky] {no} +[end] +[app] (gpe-filemanager) + [Dimensions] {635 440} + [Sticky] {yes} +[end] +[app] (gpe-info) + [Dimensions] {424 336} +[end] +[app] (gpe-edit) + [Dimensions] {635 440} +[end] +[app] (gpe-calculator) + [Dimensions] {266 321} +[end] +[app] (main) + [Dimensions] {635 440} +[end] +[app] (Gnumeric) + [Dimensions] {635 440} +[end] +[app] (gpdf) + [Dimensions] {635 440} +[end] +[app] (main_window) + [Dimensions] {635 440} +[end] +[app] (gaim) + [Dimensions] {635 440} +[end] +[app] (gpe-calendar) + [Dimensions] {380 343} +[end] +[app] (gpe-mini-browser) + [Dimensions] {635 440} +[end] +[app] (figment) + [Dimensions] {635 440} +[end] +[app] (gpe-sketchbook) + [Dimensions] {471 314} +[end] diff --git a/packages/fluxbox/fluxbox/apps.gpe.default b/packages/fluxbox/fluxbox/apps.gpe.default new file mode 100644 index 0000000000..d7a0a83f22 --- /dev/null +++ b/packages/fluxbox/fluxbox/apps.gpe.default @@ -0,0 +1,7 @@ +[app] (title=Panel 0) + [Deco] {NONE} + [Sticky] {yes} +[end] +[app] (title=Panel 1) + [Deco] {NONE} +[end] diff --git a/packages/fluxbox/fluxbox/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session new file mode 100644 index 0000000000..f6e03ede7e --- /dev/null +++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Session script for fluxbox-gpe, heavily based on matchbox's session script +# + +# Install "apps" file with defaults for GPE usage + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`" + +case $MACHINE in +*Akita | *Spitz | *Borzoi | *Terrier) + APPS="apps.gpe.akita";; +*) + APPS="apps.gpe.default";; +esac + +if test -e /usr/share/fluxbox/$APPS +then + mkdir -p $HOME/.fluxbox + test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps +fi + + +if [ -e $HOME/.fluxbox/session ] +then +exec $HOME/.fluxbox/session +fi + +if [ -e /usr/share/fluxbox/session ] +then +exec /usr/share/fluxbox/session +fi + +# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session +# dont exist. + +matchbox-desktop & +matchbox-panel --orientation south -no-flip & +sleep 5 +exec startfluxbox $@ diff --git a/packages/fluxbox/fluxbox/fluxbox-gpe.session b/packages/fluxbox/fluxbox/fluxbox-gpe.session new file mode 100644 index 0000000000..16b7a2703a --- /dev/null +++ b/packages/fluxbox/fluxbox/fluxbox-gpe.session @@ -0,0 +1,9 @@ +#!/bin/sh + +XRES=`xdpyinfo | awk '/dimensions/ { print $2 }' | cut -dx -f1` + +matchbox-desktop & +matchbox-panel --orientation south --no-flip& +sleep 5 +exec startfluxbox $@ + diff --git a/packages/fluxbox/fluxbox/gpe-init.patch b/packages/fluxbox/fluxbox/gpe-init.patch new file mode 100644 index 0000000000..c9836923d8 --- /dev/null +++ b/packages/fluxbox/fluxbox/gpe-init.patch @@ -0,0 +1,121 @@ +--- fluxbox-1.0rc/data/init.in.orig 2006-07-02 20:45:39.119045500 +0200 ++++ fluxbox-1.0rc/data/init.in 2006-07-02 20:45:43.715332750 +0200 +@@ -1,35 +1,95 @@ ++session.screen0.slit.onTop: False + session.screen0.slit.placement: BottomRight ++session.screen0.slit.alpha: 255 ++session.screen0.slit.onhead: 0 + session.screen0.slit.direction: Vertical +-session.screen0.slit.onTop: False +-session.screen0.slit.autoHide: False +-session.screen0.tab.placement: Top ++session.screen0.slit.layer: Dock ++session.screen0.slit.maxOver: false ++session.screen0.slit.autoHide: false ++session.screen0.menu.alpha: 255 ++session.screen0.iconbar.iconTextPadding: 10l ++session.screen0.iconbar.alignment: Left ++session.screen0.iconbar.wheelMode: Screen ++session.screen0.iconbar.mode: Workspace ++session.screen0.iconbar.deiconifyMode: Follow ++session.screen0.iconbar.iconWidth: 70 ++session.screen0.iconbar.usePixmap: true ++session.screen0.window.focus.alpha: 255 ++session.screen0.window.unfocus.alpha: 255 ++session.screen0.tab.height: 16 + session.screen0.tab.alignment: Left + session.screen0.tab.rotatevertical: True +-session.screen0.toolbar.onTop: False +-session.screen0.toolbar.autoHide: False +-session.screen0.toolbar.placement: BottomCenter +-session.screen0.toolbar.widthPercent: 66 +-session.screen0.workspaceNames: one,two,three,four ++session.screen0.tab.placement: TopLeft ++session.screen0.tab.width: 64 ++session.screen0.tabs.intitlebar: true ++session.screen0.titlebar.left: Stick ++session.screen0.titlebar.right: Minimize Maximize Close ++session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, clock ++session.screen0.toolbar.visible: true ++session.screen0.toolbar.layer: Top ++session.screen0.toolbar.placement: TopCenter ++session.screen0.toolbar.onhead: 0 ++session.screen0.toolbar.widthPercent: 69 ++session.screen0.toolbar.onTop: true ++session.screen0.toolbar.height: 0 ++session.screen0.toolbar.alpha: 254 ++session.screen0.toolbar.autoHide: false ++session.screen0.toolbar.maxOver: true ++session.screen0.overlay.lineWidth: 1 ++session.screen0.overlay.lineStyle: LineSolid ++session.screen0.overlay.joinStyle: JoinMiter ++session.screen0.overlay.capStyle: CapNotLast ++session.screen0.autoRaise: false + session.screen0.strftimeFormat: %k:%M +-session.screen0.focusNewWindows: True +-session.screen0.focusModel: ClickToFocus +-session.screen0.fullMaximization: False ++session.screen0.clickRaises: true ++session.screen0.imageDither: false ++session.screen0.workspaces: 4 ++session.screen0.menuDelay: 0 ++session.screen0.focusNewWindows: true ++session.screen0.workspaceNames: one,two,three,four, + session.screen0.edgeSnapThreshold: 0 ++session.screen0.menuDelayClose: 0 ++session.screen0.windowScrollReverse: false + session.screen0.rowPlacementDirection: LeftToRight +-session.screen0.workspaces: 4 +-session.screen0.focusLastWindow: True ++session.screen0.followModel: Ignore ++session.screen0.windowMenu: ++session.screen0.reversewheeling: false ++session.screen0.windowScrollAction: ++session.screen0.sloppywindowgrouping: true ++session.screen0.resizeMode: Bottom + session.screen0.colPlacementDirection: TopToBottom ++session.screen0.desktopwheeling: true ++session.screen0.tabFocusModel: ClickToTabFocus ++session.screen0.antialias: false ++session.screen0.focusLastWindow: true + session.screen0.windowPlacement: RowSmartPlacement +-session.screen0.tab.width: 64 +-session.screen0.tab.height: 16 +-session.screen0.showwindowposition: true +-session.opaqueMove: False +-session.autoRaiseDelay: 250 ++session.screen0.focusModel: ClickFocus ++session.screen0.opaqueMove: false ++session.screen0.workspacewarping: true ++session.screen0.menuMode: Delay ++session.screen0.decorateTransient: false ++session.screen0.showwindowposition: true ++session.screen0.rootCommand: ++session.screen0.fullMaximization: false ++session.focusTabMinWidth: 0 + session.menuFile: ~/.fluxbox/menu +-session.cacheLife: 5 +-session.styleFile: @default_style@ +-session.keyFile: ~/.fluxbox/keys ++session.imageDither: True + session.colorsPerChannel: 4 ++session.tabPadding: 0 ++session.styleFile: /usr/share/fluxbox/styles/gpe-default ++session.cacheMax: 200l ++session.autoRaiseDelay: 250 + session.doubleClickInterval: 250 +-session.cacheMax: 200 +-session.imageDither: True ++session.tabsAttachArea: Window ++session.numLayers: 13 ++session.keyFile: ~/.fluxbox/keys ++session.ignoreBorder: false ++session.appsFile: ~/.fluxbox/apps ++session.tabs: false ++session.useMod1: true ++session.slitlistFile: ~/.fluxbox/slitlist ++session.forcePseudoTransparency: false ++session.opaqueMove: False ++session.groupFile: ~/.fluxbox/groups ++session.cacheLife: 5l ++session.styleOverlay: ~/.fluxbox/overlay diff --git a/packages/fluxbox/fluxbox/style.gpe-default b/packages/fluxbox/fluxbox/style.gpe-default new file mode 100644 index 0000000000..f94aaf7cdd --- /dev/null +++ b/packages/fluxbox/fluxbox/style.gpe-default @@ -0,0 +1,137 @@ +! meta +! (c) joel carlbark 2003 +! please dont turn on aa with this style +! make sure you have the font 'glisp' (or similar). + +toolbar: flat gradient vertical +toolbar.color: #849ec6 +toolbar.colorTo: #526d8c + +toolbar.button: parentrelative +toolbar.button.picColor: #d6d7e7 + +toolbar.button.pressed: sunken solid +toolbar.button.pressed.color: #526d8c +toolbar.button.pressed.picColor: #000000 + +! clock +toolbar.clock: parentrelative +toolbar.clock.textColor: white + +! shows workspace nr +toolbar.label: parentrelative +toolbar.label.textColor: white + +! current active window / toolbar +toolbar.windowLabel: parentrelative +toolbar.windowLabel.textColor: white + +! menu --------- +menu.title: flat gradient vertical +menu.title.color: #849ec6 +menu.title.colorTo: #526d8c +menu.title.textColor: #d6d7e7 + +menu.frame: flat gradient vertical +menu.frame.color: #efefef +menu.frame.colorTo: #c6c3c6 +menu.frame.textColor: black + +menu.hilite: flat solid +menu.hilite.color: #849ec6 +menu.hilite.textColor: white + +menu.bullet: triangle +menu.bullet.position: right + +! window -------------- +window.title.focus: flat gradient vertical +window.title.focus.color: #849ec6 +window.title.focus.colorTo: #526d8c + +window.label.focus: parentrelative +window.label.focus.textColor: white + +window.button.focus: flat gradient vertical +window.button.focus.color: #849ec6 +window.button.focus.colorTo: #526d8c +window.button.focus.picColor: #d6d7e7 + +window.button.pressed: sunken solid +window.button.pressed.color: #405060 +window.button.pressed.picColor: #000000 + +window.handle.focus: flat gradient vertical +window.handle.focus.color: #efefef +window.handle.focus.colorTo: #c6c3c6 + +window.grip.focus: flat gradient vertical +window.grip.focus.color: #efefef +window.grip.focus.colorTo: #c6c3c6 + +window.frame.focus: flat solid +window.frame.focus.color: white + +! unfocused +window.title.unfocus: flat gradient vertical +window.title.unfocus.color: #efefef +window.title.unfocus.colorTo: #c6c3c6 + +window.label.unfocus: parentrelative +window.label.unfocus.textColor: #949694 + +window.handle.unfocus: flat gradient vertical +window.handle.unfocus.color: #efefef +window.handle.unfocus.colorTo: #c6c3c6 + +window.grip.unfocus: flat gradient vertical +window.grip.unfocus.color: #efefef +window.grip.unfocus.colorTo: #c6c3c6 + +window.frame.unfocus: flat solid +window.frame.unfocus.color: white + +window.button.unfocus: flat gradient vertical +window.button.unfocus.color: #efefef +window.button.unfocus.colorTo: #c6c3c6 +window.button.unfocus.picColor: #949694 + +! tabs ------ +window.tab.justify: left + +window.tab.label.focus: flat gradient vertical +window.tab.label.focus.color: #849ec6 +window.tab.label.focus.colorTo: #526d8c +window.tab.label.focus.textColor: #d6d7e7 + +window.tab.label.unfocus: flat gradient vertical +window.tab.label.unfocus.color: #efefef +window.tab.label.unfocus.colorTo: #c6c3c6 +window.tab.label.unfocus.textColor: #949694 + +window.tab.borderWidth: 1 +window.tab.borderColor: #949694 +! ------- + +toolbar.justify: left +window.justify: center +menu.title.justify: center +menu.frame.justify: left + +borderColor: #000000 +borderWidth: 1 +bevelWidth: 1 +frameWidth: 1 +handleWidth: 4 + +background: flat +background.color: #d6d7e7 + +#*font: Vera-4 +#toolbar.font: Vera-4 + +toolbar*.font: Vera-6 +window.font: Vera-6 +menu.title.font: Vera-7 +menu.frame.font: Vera-7 + diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb new file mode 100644 index 0000000000..a01d02af89 --- /dev/null +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -0,0 +1,79 @@ +# +# Copyright Matthias Hentges (c) 2006 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) +# +# Filename: fluxbox-gpe_1.0rc.bb +# Date: 01-Jul-06 + +DESCRIPTION = "The Fluxbox WindowManager" +MAINTAINER = "Matthias 'CoreDump' Hentges " +HOMEPAGE = "http://fluxbox.sourceforge.net" +LICENSE = "MIT" +REALPV = "1.0rc" +PR = "r0" + +###################################################################################### + +S = "${WORKDIR}/fluxbox-${REALPV}" + +###################################################################################### + +SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \ + file://gpe-init.patch;patch=1 \ + file://apps.gpe.* \ + file://style.gpe-default \ + file://fluxbox-gpe-session \ + file://fluxbox-gpe.session" + +###################################################################################### + +PACKAGES = "${PN}-gpe ${PN}-styles ${PN}-doc ${PN}" + +DESCRIPTION_${PN}-styles = "The default styles for fluxbox" +DESCRIPTION_${PN}-gpe = "The Fluxbox WindowManager for use with GPE" +RDEPENDS_${PN}-gpe = "${PN}" + +###################################################################################### + +FILES_${PN} = "/usr/bin \ + /usr/share/fluxbox/init \ + /usr/share/fluxbox/keys \ + /usr/share/fluxbox/menu " + +FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \ + /usr/share/fluxbox/styles/gpe-default \ + /usr/share/fluxbox/session \ + /usr/bin/fluxbox-gpe-session" + +FILES_${PN}-styles = "/usr/share/fluxbox/styles" + +FILES_${PN}-doc = "/usr/share/man" + +###################################################################################### + +inherit autotools update-alternatives + +###################################################################################### + +EXTRA_OECONF = "--disable-xmb \ + " + +###################################################################################### + +do_install_append() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/fluxbox + install -d ${D}/usr/share/fluxbox/styles + + install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox + install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session + install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default + install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin +} + +###################################################################################### + +ALTERNATIVE_PATH = "${bindir}/fluxbox-gpe-session" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "15" -- cgit v1.2.3 From 71c98c82d9fe431909223d48d87b89f94012dfe8 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 3 Jul 2006 15:31:28 +0000 Subject: conf/distro/jlime-donkey.conf : Minor change to opie settings linux/linux-jlime-arm_2.6.17.bb : fix of typo --- conf/distro/jlime-donkey.conf | 4 ++-- packages/linux/linux-jlime-arm_2.6.17.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 89a10705ca..67e2aef263 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,8 +78,8 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.3" -include conf/distro/preferred-opie-versions.inc +#OPIE_VERSION = "1.2.3" // use cvsdate for now +#include conf/distro/preferred-opie-versions.inc #<> #<> We want pcmciautils, not pcmcia-cs diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb index 5db9de0d6e..194f0dc7c6 100644 --- a/packages/linux/linux-jlime-arm_2.6.17.bb +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -4,14 +4,14 @@ LICENSE = "GPL" PR = "r0" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'jornada7xx' +#COMPATIBLE_MACHINE = "jornada7xx" SRC_URI = "http://www.kernel.orgm/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://defconf_jlime \ file://AsmArm-ArchSa1100-Jornada720.patch;patch=0 \ file://Cpu-Sa1110-Jornada720.patch;patch=0 \ file://Kconfig-Arch-Jornada720.patch;patch=0 \ - file://Kconfig-Keyboard-Jornada720.patch;patch=0\ + file://Kconfig-Keyboard-Jornada720.patch;patch=0 \ file://Kconfig-Touchscreen-Jornada720.patch;patch=0 \ file://Kconfig-Video-Jornada720.patch;patch=0 \ file://Mach-Sa1100-Jornada720.patch;patch=0 \ -- cgit v1.2.3 From 1e02f2a75343878876170da0640dca72fc8cd986 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:34:16 +0000 Subject: fluxbox: hopefully fix alternate selection --- packages/fluxbox/fluxbox_0.99+1.0rc.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index a01d02af89..c222edb817 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -73,7 +73,7 @@ do_install_append() { ###################################################################################### -ALTERNATIVE_PATH = "${bindir}/fluxbox-gpe-session" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "15" +ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" +ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" +ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY_${PN}-gpe = "15" -- cgit v1.2.3 From a2d8a0ce663fda2b13d1d979d4fe66a8b22effb5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:37:40 +0000 Subject: twm: register with u-a as x-window-manager --- packages/x11-apps/twm_1.0.1.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 27dbb79eef..734e1ee7bf 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -1,2 +1,12 @@ +PR = "r1" + include app-common.inc DEPENDS = "libx11 libxt libxmu" + +ALTERNATIVE_PATH = "${bindir}/twm" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "1" + + + -- cgit v1.2.3 From 416820f43a470a43cd3efe8fd8bf878e654c3bb8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:40:46 +0000 Subject: twm: we need to inherit u-a to make the previous change actually do something --- packages/x11-apps/twm_1.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/x11-apps/twm_1.0.1.bb b/packages/x11-apps/twm_1.0.1.bb index 734e1ee7bf..e02bc4cf7b 100644 --- a/packages/x11-apps/twm_1.0.1.bb +++ b/packages/x11-apps/twm_1.0.1.bb @@ -3,6 +3,8 @@ PR = "r1" include app-common.inc DEPENDS = "libx11 libxt libxmu" +inherit update-alternatives + ALTERNATIVE_PATH = "${bindir}/twm" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" -- cgit v1.2.3 From b6b2930ebf642a880b1862f60d29608c8a19193a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Jul 2006 16:43:49 +0000 Subject: e-wm: misc fixes * use u-a to register as x-window-manager * we have an scm, so no need to emulate it with '#' --- packages/e17/e-wm_0.16.999.027.bb | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb index df78fbdcd0..5089ce23a4 100644 --- a/packages/e17/e-wm_0.16.999.027.bb +++ b/packages/e17/e-wm_0.16.999.027.bb @@ -3,20 +3,12 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" PR = "r3" -inherit e +inherit e update-alternatives SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://Xsession.d/98enlightenment" -# cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" -# file://disable-splash.patch;patch=1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ -# http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry_focus.png?rev=1.1" - - S = "${WORKDIR}/enlightenment-${PV}" PROFILE = "LOWRES_PDA" @@ -35,10 +27,6 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -# mv "${WORKDIR}/themes/default_entry.edc" "${S}/data/themes/" -# mv "${WORKDIR}/themes/images/focus.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry.png" "${S}/data/themes/images/" -# mv "${WORKDIR}/themes/images/entry_focus.png" "${S}/data/themes/images/" } do_install_append() { @@ -46,7 +34,7 @@ do_install_append() { install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d } -#pkg_postinst() { -# enlightenment_remote -menu-autoscroll-margin-set 5 -# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 -#} \ No newline at end of file +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" -- cgit v1.2.3 From 353d8c7eecf685d8e10b1ee103c0efe526d1ef3c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 17:22:29 +0000 Subject: iqnotes: remove bogus dependency --- packages/iqnotes/iqnotes.inc | 1 - packages/iqnotes/iqnotes_2.0.2.bb | 4 ++-- packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc index ec49ee2d54..e6568833cf 100644 --- a/packages/iqnotes/iqnotes.inc +++ b/packages/iqnotes/iqnotes.inc @@ -5,7 +5,6 @@ Data can be crypted by strong AES algorithm." SECTION = "opie/applications" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "virtual/libqpe" MAINTAINER = "Marcin Juszkiewicz " HOMEPAGE = "http://iqnotes.berlios.de" AUTHOR = "Peter Vrabel " diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb index fd42188079..7123f68bb2 100644 --- a/packages/iqnotes/iqnotes_2.0.2.bb +++ b/packages/iqnotes/iqnotes_2.0.2.bb @@ -1,6 +1,6 @@ -include iqnotes.inc +require iqnotes.inc -PR = "r4" +PR = "r5" SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \ file://md5.diff;patch=1 \ diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb index 6309d8ba1a..e3288505eb 100644 --- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb +++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb @@ -1,8 +1,8 @@ -include iqnotes.inc +require iqnotes.inc #upstream version UPV = "2.1.0rc1" -PR = "r1" +PR = "r2" SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ file://pro.patch;patch=1" -- cgit v1.2.3 From 0dd3fdbe060a948e8093487bc562da9c73a1b80b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 17:42:33 +0000 Subject: tximage 0.2 add patch for g++4 --- packages/tximage/tximage-0.2/gcc4.patch | 15 +++++++++++++++ packages/tximage/tximage_0.2.bb | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 packages/tximage/tximage-0.2/gcc4.patch diff --git a/packages/tximage/tximage-0.2/gcc4.patch b/packages/tximage/tximage-0.2/gcc4.patch new file mode 100644 index 0000000000..d327754d1b --- /dev/null +++ b/packages/tximage/tximage-0.2/gcc4.patch @@ -0,0 +1,15 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- tximage-0.2/imageviewer.h~gcc4 ++++ tximage-0.2/imageviewer.h +@@ -32,6 +32,7 @@ + #include "imagereader.h" + + class ImageWidget; ++class ImageViewer; + class QString; + class QImage; + class QScrollView; diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb index 892ada0c6b..37d0ea6dc6 100644 --- a/packages/tximage/tximage_0.2.bb +++ b/packages/tximage/tximage_0.2.bb @@ -4,10 +4,11 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" HOMEPAGE = "http://community.zaurus.com/projects/tximage/" -PR = "r1" +PR = "r2" SRC_URI = "http://www.openzaurus.org/mirror/tximage-${PV}.tar.gz \ - file://gcc3.patch;patch=1" + file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1" inherit palmtop -- cgit v1.2.3 From 3fd6cbd2ee79c56c94ead0f370ac1c49e033c429 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Jul 2006 23:01:15 +0000 Subject: zroadmap: add cvs version. add patch to overcome questionable handcrafted Makefiles --- packages/zroadmap/files/qt2-fixes-r1.patch | 44 ++++++++++++++++++++++++ packages/zroadmap/zroadmap_cvs.bb | 55 ++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 packages/zroadmap/files/qt2-fixes-r1.patch create mode 100644 packages/zroadmap/zroadmap_cvs.bb diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch new file mode 100644 index 0000000000..a17fefe869 --- /dev/null +++ b/packages/zroadmap/files/qt2-fixes-r1.patch @@ -0,0 +1,44 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- src/qt/qt_main.cc~qt2-fixes.patch ++++ src/qt/qt_main.cc +@@ -136,7 +136,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -145,7 +145,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -11,14 +11,9 @@ + + # --- QT-specific options ------------------------------------------------ + +-CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3 +-CFLAGS += -fno-rtti -fno-exceptions +-LIBS += -L$(QTDIR)/lib -lqt-mt +- +- + ifeq ($(DESKTOP),QPE) +- CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ CFLAGS += -I$(QTDIR)/include -DQWS ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif + diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..23bd5d15e5 --- /dev/null +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection." +SECTION = "opie/applications" +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +MAINTAINER = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +DEPENDS = "popt" +LICENSE = "GPL" +PV = "1.0.12+cvs-${SRCDATE}" +PR = "r0" + +SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ + file://qt2-fixes-r1.patch;pnum=1;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap/src" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ + CFLAGS="-DQWS -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' +PARALLEL_MAKE = "" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C qt qtroadmap qtroadgps +} + +do_install() { + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} -- cgit v1.2.3 From fab4f88c1807af93d74ee6d58a61660dc78993ee Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 00:18:39 +0000 Subject: zroadmap cvs patch fixlet --- packages/zroadmap/files/qt2-fixes-r1.patch | 20 ++++++-------------- packages/zroadmap/zroadmap_cvs.bb | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch index a17fefe869..24fe1c9bdb 100644 --- a/packages/zroadmap/files/qt2-fixes-r1.patch +++ b/packages/zroadmap/files/qt2-fixes-r1.patch @@ -3,9 +3,9 @@ # Signed off by Michael 'Mickey' Lauer # ---- src/qt/qt_main.cc~qt2-fixes.patch +--- src/qt/qt_main.cc~qt2-fixes-r1.patch +++ src/qt/qt_main.cc -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ switch (orientation[0]) { case 't': case 'T': break; @@ -14,7 +14,7 @@ case 'b': case 'B': moveDockWindow (toolBar, DockBottom); break; -@@ -145,7 +145,7 @@ +@@ -146,7 +146,7 @@ case 'r': case 'R': moveDockWindow (toolBar, DockRight); break; @@ -23,21 +23,13 @@ default: roadmap_log (ROADMAP_FATAL, "Invalid toolbar orientation %s", orientation); } ---- src/qt/Makefile~qt2-fixes.patch +--- src/qt/Makefile~qt2-fixes-r1.patch +++ src/qt/Makefile -@@ -11,14 +11,9 @@ +@@ -19,7 +19,7 @@ - # --- QT-specific options ------------------------------------------------ - --CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3 --CFLAGS += -fno-rtti -fno-exceptions --LIBS += -L$(QTDIR)/lib -lqt-mt -- -- ifeq ($(DESKTOP),QPE) -- CFLAGS += -I$(QTDIR)/include -DQWS + CFLAGS += -I$(QTDIR)/include -DQWS - LIBS += -lqte -lqpe -+ CFLAGS += -I$(QTDIR)/include -DQWS + LIBS += -lqpe INSTALLDIR=$(QTDIR) endif diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb index 23bd5d15e5..db44964bfd 100644 --- a/packages/zroadmap/zroadmap_cvs.bb +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -24,7 +24,7 @@ QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt QT_LIBRARY_append_c7x0 = " -laticore" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' PARALLEL_MAKE = "" -- cgit v1.2.3 From d1cc45abeb3a7e4997bd6dc1794f403e43c3568f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 4 Jul 2006 03:06:15 +0000 Subject: fluxbox: Use update-alternative only for fluxbox-gpe, thanks koen for pointint it out. We can't inherit update-alternative since it only works with PN, and horr ibly b0rks on PN-something. --- packages/fluxbox/fluxbox_0.99+1.0rc.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb index c222edb817..cf69b090c4 100644 --- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb +++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb @@ -10,7 +10,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " HOMEPAGE = "http://fluxbox.sourceforge.net" LICENSE = "MIT" REALPV = "1.0rc" -PR = "r0" +PR = "r1" ###################################################################################### @@ -51,7 +51,7 @@ FILES_${PN}-doc = "/usr/share/man" ###################################################################################### -inherit autotools update-alternatives +inherit autotools ###################################################################################### @@ -73,7 +73,10 @@ do_install_append() { ###################################################################################### -ALTERNATIVE_PATH_${PN}-gpe = "${bindir}/fluxbox-gpe-session" -ALTERNATIVE_NAME_${PN}-gpe = "x-window-manager" -ALTERNATIVE_LINK_${PN}-gpe = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY_${PN}-gpe = "15" +pkg_postinst_${PN}-gpe() { + update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15 +} + +pkg_postrm_${PN}-gpe() { + update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session +} -- cgit v1.2.3 From e9d6aaf75c32baf067a682a6ddb36bebfe447fd1 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 4 Jul 2006 03:19:18 +0000 Subject: scap: Replace bl toggle with bl on + bl off as bl toggle doesn't seem to work on SL-Cxx00 at least --- packages/scap/files/scap.sh | 4 ++-- packages/scap/scap_0.1.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index ba8bc7e584..ea3ff24593 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -2,7 +2,7 @@ sleep 2 if [ -x /usr/bin/bl ]; then - bl toggle + bl off fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` @@ -15,6 +15,6 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "" cat /dev/fb0) | nc www.handhelds.org 80 if [ -x /usr/bin/bl ]; then - bl toggle + bl on fi diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 7bef893e59..9ba295a7a5 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r4" +PR = "r5" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" -- cgit v1.2.3 From 32fb77d1adfb5d733794f5da446f6262fd4e0b12 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 4 Jul 2006 03:27:25 +0000 Subject: zip 2.32: Add version 2.32. Version 2.31 has been removed from the source site due to buffer overrun vulnerabilities. Closes bugs #1136, #1137. --- packages/zip/zip-native_2.32.bb | 9 +++++++++ packages/zip/zip.inc | 16 ++++++++++++++++ packages/zip/zip_2.31.bb | 19 ++----------------- packages/zip/zip_2.32.bb | 2 ++ 4 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 packages/zip/zip-native_2.32.bb create mode 100644 packages/zip/zip.inc create mode 100644 packages/zip/zip_2.32.bb diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb new file mode 100644 index 0000000000..7cd0261827 --- /dev/null +++ b/packages/zip/zip-native_2.32.bb @@ -0,0 +1,9 @@ +SECTION = "console/utils" +inherit native +include zip_${PV}.bb +S = "${WORKDIR}/zip-${PV}" + +do_stage() { + install -d ${STAGING_BINDIR} + install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} +} diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc new file mode 100644 index 0000000000..b66b4b217f --- /dev/null +++ b/packages/zip/zip.inc @@ -0,0 +1,16 @@ +SECTION = "console/utils" +SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz" +LICENSE = "Info-ZIP" +EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ + 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ + 'BINFLAGS=0755' 'INSTALL_D=install -d'" + +do_compile() { + oe_runmake -f unix/Makefile generic +} + +do_install() { + oe_runmake -f unix/Makefile prefix=${D}${prefix} \ + BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ + install +} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb index 6c588a55e5..d10bb4312e 100644 --- a/packages/zip/zip_2.31.bb +++ b/packages/zip/zip_2.31.bb @@ -1,17 +1,2 @@ -SECTION = "console/utils" -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz" -LICENSE = "Info-ZIP" -EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \ - 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \ - 'BINFLAGS=0755' 'INSTALL_D=install -d'" - -do_compile() { - oe_runmake -f unix/Makefile generic -} - -do_install() { - oe_runmake -f unix/Makefile prefix=${D}${prefix} \ - BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \ - install -} - +include zip.inc +PR="r0" diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb new file mode 100644 index 0000000000..d10bb4312e --- /dev/null +++ b/packages/zip/zip_2.32.bb @@ -0,0 +1,2 @@ +include zip.inc +PR="r0" -- cgit v1.2.3 From d1f207a2c3388bbbd8a6ff976603e679478533b2 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Tue, 4 Jul 2006 03:38:21 +0000 Subject: hping2 2.0.0rc3: Added hping2, a network testing tool. Especially useful when testing devices for their handling of various protocols (GRE, IP-IP etc) without needing to resort to an actual working application. --- packages/hping/.mtn2git_empty | 0 packages/hping/files/.mtn2git_empty | 0 packages/hping/files/hping2_configure.patch | 75 +++++++++++++ packages/hping/files/hping2_debian.patch | 168 ++++++++++++++++++++++++++++ packages/hping/hping2_1.9.9+2.0.0rc3.bb | 48 ++++++++ 5 files changed, 291 insertions(+) create mode 100644 packages/hping/.mtn2git_empty create mode 100644 packages/hping/files/.mtn2git_empty create mode 100644 packages/hping/files/hping2_configure.patch create mode 100644 packages/hping/files/hping2_debian.patch create mode 100644 packages/hping/hping2_1.9.9+2.0.0rc3.bb diff --git a/packages/hping/.mtn2git_empty b/packages/hping/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch new file mode 100644 index 0000000000..90795ab0e0 --- /dev/null +++ b/packages/hping/files/hping2_configure.patch @@ -0,0 +1,75 @@ +Allow the byteorder and target os type to be specified via +environment variables when running the configured shell script, don't +try and run the resultant binary after building it, don't set various +compiler related environment varibles - we'll let OE set those. + +diff -dur hping2-rc3-orig/configure hping2-rc3/configure +--- hping2-rc3-orig/configure 2005-12-03 19:04:44.000000000 +1100 ++++ hping2-rc3/configure 2005-12-03 19:05:58.000000000 +1100 +@@ -13,16 +13,19 @@ + exit 0 + fi + +-CC=${CC:=cc} ++if [ "x$BYTEORDER" = "x" ]; then ++ CC=${CC:=cc} + +-echo build byteorder.c... +-$CC byteorder.c -o byteorder || exit 1 ++ echo build byteorder.c... ++ $CC byteorder.c -o byteorder || exit 1 ++ ++ BYTEORDER=`./byteorder -m` ++fi + + INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:` + if [ "$INSTALL_MANPATH" = "" ]; then + INSTALL_MANPATH="/usr/local/man" + fi +-BYTEORDER=`./byteorder -m` + + echo create byteorder.h... + cat > byteorder.h < ++ ++#if __BYTE_ORDER == __LITTLE_ENDIAN + #define BYTE_ORDER_LITTLE_ENDIAN +-#elif defined(__mc68000__) \ +- || defined (__sparc__) \ +- || defined (__sparc) \ +- || defined (__PPC__) \ +- || defined (__BIG_ENDIAN__) \ +- || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) ++#elif __BYTE_ORDER == __BIG_ENDIAN + #define BYTE_ORDER_BIG_ENDIAN + #else + # error can not find the byte order for this architecture, fix bytesex.h +--- hping2-2.rc3.orig/getlhs.c ++++ hping2-2.rc3/getlhs.c +@@ -55,6 +55,12 @@ + case DLT_IEEE802_11: + linkhdr_size = 14; + break; ++ case DLT_IEEE802_11: ++ linkhdr_size = 14; ++ break; ++ case DLT_TOKEN_RING: ++ linkhdr_size = 20; ++ break; + case DLT_ATM_RFC1483: + #ifdef DLT_CIP + case DLT_CIP: +@@ -105,6 +111,15 @@ + } else if ( strstr(ifname, "wlan") ) { + linkhdr_size = WLANHDR_SIZE; + return 0; ++ } else if (strstr(ifname, "atm")) { ++ linkhdr_size = 0; ++ return 0; ++ } else if ( strstr(ifname, "wlan") ) { ++ linkhdr_size = WLANHDR_SIZE; ++ return 0; ++ } else if ( strstr(ifname, "tr") ) { ++ linkhdr_size = TRHDR_SIZE; ++ return 0; + } + else + return -1; +--- hping2-2.rc3.orig/listen.c ++++ hping2-2.rc3/listen.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + #include +--- hping2-2.rc3.orig/main.c ++++ hping2-2.rc3/main.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "hping2.h" + +--- hping2-2.rc3.orig/resolve.c ++++ hping2-2.rc3/resolve.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- hping2-2.rc3.orig/sendicmp.c ++++ hping2-2.rc3/sendicmp.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendtcp.c ++++ hping2-2.rc3/sendtcp.c +@@ -15,6 +15,8 @@ + #include + #include + #include ++#include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/sendudp.c ++++ hping2-2.rc3/sendudp.c +@@ -15,6 +15,8 @@ + #include + #include + #include ++#include ++#include + + #include "hping2.h" + #include "globals.h" +--- hping2-2.rc3.orig/statistics.c ++++ hping2-2.rc3/statistics.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + #include "hping2.h" + #include "globals.h" +@@ -33,7 +34,7 @@ + lossrate = 100; + + fprintf(stderr, "\n--- %s hping statistic ---\n", targetname); +- fprintf(stderr, "%d packets tramitted, %d packets received, " ++ fprintf(stderr, "%d packets transmitted, %d packets received, " + "%d%% packet loss\n", sent_pkt, recv_pkt, lossrate); + if (out_of_sequence_pkt) + fprintf(stderr, "%d out of sequence packets received\n", +--- hping2-2.rc3.orig/usage.c ++++ hping2-2.rc3/usage.c +@@ -12,6 +12,7 @@ + + #include + #include ++#include + + void show_usage(void) + { +--- hping2-2.rc3.orig/version.c ++++ hping2-2.rc3/version.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + #include "release.h" + #include "hping2.h" diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb new file mode 100644 index 0000000000..912f7c420e --- /dev/null +++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "hping is a command-line oriented TCP/IP packet \ +assembler/analyzer. The interface is inspired to the ping(8) \ +unix command, but hping isn't only able to send ICMP echo requests. \ +It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute \ +mode, the ability to send files between a covered channel, and many \ +other features." +HOMEPAGE = "http://www.hping.org/" +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan " +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \ + file://hping2_debian.patch;patch=1 \ + file://hping2_configure.patch;patch=1" +S="${WORKDIR}/hping2-rc3" + +# +# We've patched configure to accept byte order and ostype as env +# variables Pass those values in to stop it trying to figure it out +# by itself. +# NOTE: The configure script is not an autoconf script. +# +do_configure() { + # endianness fun.. inspired by openssl.inc + . ${CONFIG_SITE} + BYTEORDER="UNKNOWN" + if test "x$ac_cv_c_bigendian" = "xyes"; then + BYTEORDER="__BIG_ENDIAN_BITFIELD" + elif test "x$ac_cv_c_littleendian" = "xyes"; then + BYTEORDER="__LITTLE_ENDIAN_BITFIELD" + else + oefatal do_configure cannot determine endianess + fi + BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure +} + +# +# Instead of patching the install we do things manually here +# +do_install() { + install -m 0755 -d ${D}${sbindir} ${D}/${mandir} ${D}${docdir}/hping2 + install -m 0755 hping2 ${D}/${sbindir} + install -m 0644 docs/hping2.8 ${D}/${mandir} + install -m 0644 docs/HPING2-HOWTO.txt docs/HPING2-IS-OPEN \ + docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt \ + docs/AS-BACKDOOR docs/APD.txt ${D}${docdir}/hping2 +} -- cgit v1.2.3 From e5102794ef6ecf0c988b3bf62c5436aba0f686fa Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 09:32:43 +0000 Subject: gpe-conf: New cvs bb courtesy by Patrick Steiner. --- packages/gpe-conf/gpe-conf_cvs.bb | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb index 552fc7def5..a0bec2b70f 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_cvs.bb @@ -2,13 +2,11 @@ DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" PV = "0.1.29+cvs${SRCDATE}" -PR = "r1" +PR = "r2" -inherit gpe +inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN} \ - file://Makefile.dpkg_ipkg \ - file://Makefile.translation" +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" PACKAGES = "gpe-conf gpe-conf-panel" LICENSE = "GPL" @@ -25,17 +23,3 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile - mkdir build - cp ${WORKDIR}/Makefile.* build/ - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program -} - - -- cgit v1.2.3 From f95b30588c16453d5f98e17b9b800b4d1e399b66 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 09:38:28 +0000 Subject: gpe-contacts: add 0.45, drop ancient versions --- packages/gpe-contacts/gpe-contacts_0.36.bb | 12 ------------ packages/gpe-contacts/gpe-contacts_0.42.bb | 15 --------------- packages/gpe-contacts/gpe-contacts_0.45.bb | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 packages/gpe-contacts/gpe-contacts_0.36.bb delete mode 100644 packages/gpe-contacts/gpe-contacts_0.42.bb create mode 100644 packages/gpe-contacts/gpe-contacts_0.45.bb diff --git a/packages/gpe-contacts/gpe-contacts_0.36.bb b/packages/gpe-contacts/gpe-contacts_0.36.bb deleted file mode 100644 index 28e93b48b0..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.36.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -PR = "r0" - -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" - diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.42.bb deleted file mode 100644 index 32103b1867..0000000000 --- a/packages/gpe-contacts/gpe-contacts_0.42.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -MAINTAINER = "Florian Boor " -inherit gpe autotools - -PR = "r0" - -DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE contacts manager" -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - - -FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" - diff --git a/packages/gpe-contacts/gpe-contacts_0.45.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb new file mode 100644 index 0000000000..b5afbb3a3c --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_0.45.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +inherit gpe autotools + +PR = "r0" + +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE contacts manager" +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + -- cgit v1.2.3 From c58c763f7026f206b85bf7ad32035eff4b801b98 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 4 Jul 2006 10:12:53 +0000 Subject: dejavu TTF: updated to 2.7 --- packages/ttf-fonts/ttf-dejavu_2.3.bb | 20 -------------------- packages/ttf-fonts/ttf-dejavu_2.7.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 packages/ttf-fonts/ttf-dejavu_2.3.bb create mode 100644 packages/ttf-fonts/ttf-dejavu_2.7.bb diff --git a/packages/ttf-fonts/ttf-dejavu_2.3.bb b/packages/ttf-fonts/ttf-dejavu_2.3.bb deleted file mode 100644 index 304b30cfd6..0000000000 --- a/packages/ttf-fonts/ttf-dejavu_2.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "DejaVu font - TTF Edition" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -MAINTAINER = "Marcin Juszkiewicz " - - -SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}-1.tar.gz" - -include ttf.inc - -S = "${WORKDIR}/dejavu-ttf-${PV}" - -PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ - ttf-dejavu-serif ttf-dejavu-serif-condensed" - -FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" -FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" -FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" -FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" -FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" diff --git a/packages/ttf-fonts/ttf-dejavu_2.7.bb b/packages/ttf-fonts/ttf-dejavu_2.7.bb new file mode 100644 index 0000000000..304b30cfd6 --- /dev/null +++ b/packages/ttf-fonts/ttf-dejavu_2.7.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "DejaVu font - TTF Edition" +LICENSE = "Bitstream Vera" +HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" +MAINTAINER = "Marcin Juszkiewicz " + + +SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}-1.tar.gz" + +include ttf.inc + +S = "${WORKDIR}/dejavu-ttf-${PV}" + +PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ + ttf-dejavu-serif ttf-dejavu-serif-condensed" + +FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" +FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" +FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" +FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" +FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" -- cgit v1.2.3 From 50a6a67d721e2a9aadc1fa219ad875c8ad52eee4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 4 Jul 2006 10:14:36 +0000 Subject: dejavu QPF: updated to 2.7 --- packages/qpf-fonts/qpf-dejavusans_2.2.bb | 3 --- packages/qpf-fonts/qpf-dejavusans_2.7.bb | 3 +++ packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb | 3 --- packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb | 3 +++ packages/qpf-fonts/qpf-dejavusansmono_2.2.bb | 3 --- packages/qpf-fonts/qpf-dejavusansmono_2.7.bb | 3 +++ packages/qpf-fonts/qpf-dejavuserif_2.2.bb | 3 --- packages/qpf-fonts/qpf-dejavuserif_2.7.bb | 3 +++ packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb | 3 --- packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb | 3 +++ 10 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/qpf-fonts/qpf-dejavusans_2.2.bb create mode 100644 packages/qpf-fonts/qpf-dejavusans_2.7.bb delete mode 100644 packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb create mode 100644 packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb delete mode 100644 packages/qpf-fonts/qpf-dejavusansmono_2.2.bb create mode 100644 packages/qpf-fonts/qpf-dejavusansmono_2.7.bb delete mode 100644 packages/qpf-fonts/qpf-dejavuserif_2.2.bb create mode 100644 packages/qpf-fonts/qpf-dejavuserif_2.7.bb delete mode 100644 packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb create mode 100644 packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb diff --git a/packages/qpf-fonts/qpf-dejavusans_2.2.bb b/packages/qpf-fonts/qpf-dejavusans_2.2.bb deleted file mode 100644 index 3428d98a89..0000000000 --- a/packages/qpf-fonts/qpf-dejavusans_2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "DejaVu Sans font - QPF Edition" - -include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusans_2.7.bb b/packages/qpf-fonts/qpf-dejavusans_2.7.bb new file mode 100644 index 0000000000..3428d98a89 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavusans_2.7.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DejaVu Sans font - QPF Edition" + +include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb deleted file mode 100644 index 7494374023..0000000000 --- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "DejaVu Sans Condensed font - QPF Edition" - -include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb new file mode 100644 index 0000000000..7494374023 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DejaVu Sans Condensed font - QPF Edition" + +include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb deleted file mode 100644 index 51c9e1b925..0000000000 --- a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "DejaVu Sans Mono font - QPF Edition" - -include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb new file mode 100644 index 0000000000..51c9e1b925 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DejaVu Sans Mono font - QPF Edition" + +include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb b/packages/qpf-fonts/qpf-dejavuserif_2.2.bb deleted file mode 100644 index 81009e8a8c..0000000000 --- a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "DejaVu Serif font - QPF Edition" - -include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.7.bb b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb new file mode 100644 index 0000000000..81009e8a8c --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DejaVu Serif font - QPF Edition" + +include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb deleted file mode 100644 index db31216907..0000000000 --- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "DejaVu Serif Condensed font - QPF Edition" - -include qpf-dejavu.inc diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb new file mode 100644 index 0000000000..db31216907 --- /dev/null +++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb @@ -0,0 +1,3 @@ +DESCRIPTION = "DejaVu Serif Condensed font - QPF Edition" + +include qpf-dejavu.inc -- cgit v1.2.3 From 019ee89e86024935cfff9ba82de135c09cfa2650 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Tue, 4 Jul 2006 11:01:02 +0000 Subject: mainstone.conf, logicpd-pxa270.conf: include xscale instead of iwmmxt conf file - had runtime problems w/ binaries when build with iwmmxt --- conf/machine/logicpd-pxa270.conf | 5 ++++- conf/machine/mainstone.conf | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 24e23bc9a0..206958c2ce 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -7,8 +7,9 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -16,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" # EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000" +EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000" + diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index de242242a7..357e286752 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -18,6 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0" ROOT_FLASH_SIZE = "32" - - - -- cgit v1.2.3 From 0664707090a729d50f4a9358325f23a22bd9e471 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 11:11:03 +0000 Subject: libcontactsdb: Add release 0.4. --- packages/libcontactsdb/libcontactsdb_0.4.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/libcontactsdb/libcontactsdb_0.4.bb diff --git a/packages/libcontactsdb/libcontactsdb_0.4.bb b/packages/libcontactsdb/libcontactsdb_0.4.bb new file mode 100644 index 0000000000..93950a3e1c --- /dev/null +++ b/packages/libcontactsdb/libcontactsdb_0.4.bb @@ -0,0 +1,15 @@ +LICENSE = "LGPL" +DESCRIPTION = "Database access library for GPE contacts" +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "libgpewidget libgpepimc sqlite" +MAINTAINER = "Florian Boor " + +PR = "r0" +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe pkgconfig + +do_stage () { +autotools_stage_all +} -- cgit v1.2.3 From 8f263baffb8ac13d3dbe512c4a5436b193157acf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:52:22 +0000 Subject: zrev7 1.0.1 fix packaging .desktop file --- packages/qpe-games/zrev7_1.0.1.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb index 2f023c4264..5bf5f47eb6 100644 --- a/packages/qpe-games/zrev7_1.0.1.bb +++ b/packages/qpe-games/zrev7_1.0.1.bb @@ -1,22 +1,20 @@ DESCRIPTION = "Reversi" SECTION = "opie/games" PRIORITY = "optional" -MAINTAINER = "Team Opie " LICENSE = "GPL" AUTHOR = "Mario Weilguni" HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html" - +PR = "r1" SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \ file://zrev.patch;patch=1" - -PV = "1.0.1" S = "${WORKDIR}/zrev7_V${PV}" APPNAME = "zrev7" APPTYPE = "binary" +APPDESKTOP = "${S}" - +inherit opie do_compile_prepend() { oe_runmake -C images @@ -25,8 +23,4 @@ do_compile_prepend() { do_install () { install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games } - - -inherit opie -- cgit v1.2.3 From 32dd9f8aee118b72a3754045254c54ebf8bcad2f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:53:57 +0000 Subject: gemdropx 0.9 fix linking --- packages/gemdropx/gemdropx_0.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb index a50fd6b567..4f96715b79 100644 --- a/packages/gemdropx/gemdropx_0.9.bb +++ b/packages/gemdropx/gemdropx_0.9.bb @@ -18,6 +18,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=qt \ LIBS+=-lSDL_mixer \ LIBS+=-lSDL_image \ LIBS+=-lpthread \ + LIBS+=-Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT} \ DEFINES+=DATA_PREFIX=\\"\"${datadir}/gemdropx/\\"\"" do_configure_prepend() { -- cgit v1.2.3 From 58c6116d47e95bb8ebbb88d68e5345fc8b9f9333 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 4 Jul 2006 12:59:18 +0000 Subject: billiardz 0.1.4 add gcc4 patch TODO: decouple from opie, make useful also for pure SDL environments --- packages/billiardz/billiardz_0.1.4.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb index fcba6d2f30..c0477bd4fc 100644 --- a/packages/billiardz/billiardz_0.1.4.bb +++ b/packages/billiardz/billiardz_0.1.4.bb @@ -5,9 +5,10 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "libsdl-qpe libsdl-image" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz" +SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \ + file://gcc4.patch;patch=1" inherit palmtop -- cgit v1.2.3 From bf082ed365321d6a0a6afcd42aae46033192d453 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Jul 2006 13:18:01 +0000 Subject: tune-iwmmxt.conf: use -mcpu=iwmmxt instead of -mtune=iwmmxt --- conf/machine/include/tune-iwmmxt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf index e46796fede..535c914a9d 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.conf @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. IPKG_EXTRA_ARCHS += "iwmmxt" -TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" +TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt " PACKAGE_ARCH = "iwmmxt" -- cgit v1.2.3 From 36603639843714e697f9256e99bbaef66c2f4e03 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 13:40:45 +0000 Subject: gpe-timesheet: add 0.30, remove ancient releases. --- .../gpe-timesheet-0.13/.mtn2git_empty | 0 .../gpe-timesheet-makefile.patch | 22 ---------------------- packages/gpe-timesheet/gpe-timesheet_0.13.bb | 7 ------- packages/gpe-timesheet/gpe-timesheet_0.14.bb | 7 ------- packages/gpe-timesheet/gpe-timesheet_0.15.bb | 9 --------- packages/gpe-timesheet/gpe-timesheet_0.16.bb | 9 --------- packages/gpe-timesheet/gpe-timesheet_0.30.bb | 10 ++++++++++ 7 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty delete mode 100644 packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.13.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.14.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.15.bb delete mode 100644 packages/gpe-timesheet/gpe-timesheet_0.16.bb create mode 100644 packages/gpe-timesheet/gpe-timesheet_0.30.bb diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty b/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch b/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch deleted file mode 100644 index bfa5567590..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u gpe-timesheet-0.13.orig/Makefile gpe-timesheet-0.13/Makefile ---- gpe-timesheet-0.13.orig/Makefile 2003-10-10 05:56:43.000000000 +1000 -+++ gpe-timesheet-0.13/Makefile 2004-04-29 15:09:46.000000000 +1000 -@@ -21,7 +21,7 @@ - - CFLAGS += -MD -Wall $(GTKCFLAGS) - --CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" - - MEMBERS = main sql - -@@ -40,6 +40,9 @@ - $(PACKAGE): $(OBJS) - $(CC) -o $@ $^ $(LGPEWIDGET) $(GTKLDFLAGS) -lsqlite $(LDFLAGS) - -+.c.o:; -+ $(CC) $(PACKAGE_CPPFLAGS) $(CFLAGS) $(GTKCFLAGS) -c $< -o $@ -+ - install-program: all $(PACKAGE).desktop - mkdir -p $(DESTDIR)$(PREFIX)/bin - install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) diff --git a/packages/gpe-timesheet/gpe-timesheet_0.13.bb b/packages/gpe-timesheet/gpe-timesheet_0.13.bb deleted file mode 100644 index b97ed97ffc..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.13.bb +++ /dev/null @@ -1,7 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DEPENDS = "libgpewidget glib-2.0 gtk+" -SECTION = "gpe" - -SRC_URI += "file://gpe-timesheet-makefile.patch;patch=0" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.14.bb b/packages/gpe-timesheet/gpe-timesheet_0.14.bb deleted file mode 100644 index b4f580736c..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.14.bb +++ /dev/null @@ -1,7 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.15.bb b/packages/gpe-timesheet/gpe-timesheet_0.15.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.15.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.16.bb b/packages/gpe-timesheet/gpe-timesheet_0.16.bb deleted file mode 100644 index 0cd8b539f0..0000000000 --- a/packages/gpe-timesheet/gpe-timesheet_0.16.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "GPE time tracker" -DEPENDS = "libgpewidget gtk+ sqlite" -SECTION = "gpe" -RDEPENDS = "gpe-icons" - -SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb new file mode 100644 index 0000000000..c23c963446 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +inherit autotools gpe + +DESCRIPTION = "GPE time tracker" +GPE_TARBALL_SUFFIX = "bz2" +MAINTAINER = "Florian Boor " +DEPENDS = "libgpewidget gtk+ sqlite" +SECTION = "gpe" +RDEPENDS = "gpe-icons" + \ No newline at end of file -- cgit v1.2.3 From 111cc191bf82c40ae98f72d7aee3df2d5080fa0a Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 13:45:06 +0000 Subject: xserver-common: Drop old releases, add 1.10. --- packages/xserver-common/xserver-common_1.10.bb | 19 +++++++++++++++++++ packages/xserver-common/xserver-common_1.5.bb | 11 ----------- packages/xserver-common/xserver-common_1.7.bb | 11 ----------- 3 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 packages/xserver-common/xserver-common_1.10.bb delete mode 100644 packages/xserver-common/xserver-common_1.5.bb delete mode 100644 packages/xserver-common/xserver-common_1.7.bb diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb new file mode 100644 index 0000000000..de81537f99 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.10.bb @@ -0,0 +1,19 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1 \ + file://poodle-xmodmap-2.6.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb deleted file mode 100644 index f6d09ac9e1..0000000000 --- a/packages/xserver-common/xserver-common_1.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb deleted file mode 100644 index f6d09ac9e1..0000000000 --- a/packages/xserver-common/xserver-common_1.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe -- cgit v1.2.3 From 4f4f4fea790b2a35258d0320950e1cb3e3409fcb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Jul 2006 13:58:36 +0000 Subject: handhelds-sa*: set compatible machine to h3600 and simpad --- packages/linux/handhelds-sa-2.6_cvs.bb | 1 + packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb | 1 + packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb | 1 + packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb | 1 + packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb | 1 + 5 files changed, 5 insertions(+) diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index 5daabd127c..bdc2f86633 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -4,6 +4,7 @@ MAINTAINER = "Alex Lange " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb index 9089678fdc..9e53e0394c 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb @@ -6,6 +6,7 @@ PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb index b4850a24de..9dc6f5fa50 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -6,6 +6,7 @@ PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb index df160cd1ed..240e52ccc2 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -6,6 +6,7 @@ PR = "r6" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb index 3abb8719c5..a3d54d1319 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb @@ -7,6 +7,7 @@ DEFAULT_PREFERENCE = "-1" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ -- cgit v1.2.3 From bb0e56bcdd2b71e640badbfce4a8c75c777da1cc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Jul 2006 14:03:09 +0000 Subject: handhelds-pxa: set COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' --- packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb | 2 ++ packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb | 1 + packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb | 1 + packages/linux/handhelds-pxa-2.6_cvs.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb | 1 + packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb | 1 + 17 files changed, 18 insertions(+) diff --git a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb index 48d468462b..374936deea 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb @@ -4,6 +4,8 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb index 1ecc553cf9..737a7970dc 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb index 0b55dc8a53..4c7a1bba52 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" PR="r1" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb index 6c69b548d0..2c01ca91f8 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb @@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert " LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb index 03169de305..81b63d5021 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" # KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb index 35de9cff9b..58a8eff2cb 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb @@ -5,6 +5,7 @@ LICENSE = "GPL" # KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" DEFCONFIG = "defconfig-${MACHINE}_2.6.8.1-hh0" diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index bcf502d52f..1581a444b6 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -6,6 +6,7 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" PR = "r3" # COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb index 2f1a05a3bd..2d9eccfd83 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -6,6 +6,7 @@ PR = "r2" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-ipaqpxa \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb index 02575213ad..d0b2afe75d 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -6,6 +6,7 @@ PR = "r7" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb index c10d058160..034f2ca055 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb @@ -6,6 +6,7 @@ PR = "r4" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb index dce837db02..6bf75de349 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb @@ -6,6 +6,7 @@ PR = "r0" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb index 9fd7f0ba5e..7bdb445312 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb @@ -6,6 +6,7 @@ PR = "r1" KERNEL_CCSUFFIX = "-3.3.3" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb index 319324dac8..32068528aa 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb @@ -8,6 +8,7 @@ DEFAULT_PREFERENCE="-1" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ -- cgit v1.2.3 From b155f8c5b12987c372c4e18ccd15e283a07e6980 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 4 Jul 2006 14:06:25 +0000 Subject: opensimpad-kernel: set COMPATIBLE_MACHINE = 'simpad' --- packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb | 2 ++ packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb index fd5d161cc1..40cf007174 100644 --- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb @@ -8,6 +8,8 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}" JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" PR = "r22" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb index fff45f20e9..51fabecd75 100644 --- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb +++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb @@ -9,6 +9,8 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}" USBV= "usb20040610" PR = "r4" +COMPATIBLE_MACHINE = 'simpad' + FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ -- cgit v1.2.3 From 5f8e878437ede057565408f6173a90bff71983f5 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 4 Jul 2006 14:11:55 +0000 Subject: gpe-bluetooth: Add 0.54, remove old releases. --- packages/gpe-bluetooth/gpe-bluetooth_0.45.bb | 22 ---------------------- packages/gpe-bluetooth/gpe-bluetooth_0.46.bb | 14 -------------- packages/gpe-bluetooth/gpe-bluetooth_0.47.bb | 14 -------------- packages/gpe-bluetooth/gpe-bluetooth_0.48.bb | 12 ------------ packages/gpe-bluetooth/gpe-bluetooth_0.54.bb | 14 ++++++++++++++ 5 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.45.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.46.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.47.bb delete mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.48.bb create mode 100644 packages/gpe-bluetooth/gpe-bluetooth_0.54.bb diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb deleted file mode 100644 index cce7301b38..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r1" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \ - file://bluez-pin-gpe.glade" - -FILES_${PN} += '${datadir}/bluez-pin' - -do_install_append() { -install -d ${D}${datadir}/bluez-pin -install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/ - -} - diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb deleted file mode 100644 index 59b371897e..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb deleted file mode 100644 index 59b371897e..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb +++ /dev/null @@ -1,14 +0,0 @@ -LICENSE = "GPL" -inherit gpe autotools - -DESCRIPTION = "GPE bluetooth support" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" -MAINTAINER = "Phil Blundell " -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" - -FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb deleted file mode 100644 index bc79545182..0000000000 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support" -SECTION = "gpe" -PRIORITY = "optional" - -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb new file mode 100644 index 0000000000..ce28d0b347 --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +DESCRIPTION = "GPE bluetooth support user interface tool." +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Florian Boor " +PR = "r0" + +DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +RDEPENDS = "bluez-utils-dbus blueprobe" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpe autotools + +FILES_${PN} += '${datadir}/bluez-pin' -- cgit v1.2.3 From 8aba54be36f1c8ea60f376a55c4036449ad9bc99 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 4 Jul 2006 14:55:46 +0000 Subject: abiword_2.4.5.bb, abiword-plugins_2.4.5.bb : new versions. --- packages/abiword/abiword-plugins_2.4.5.bb | 26 +++++++++++++++++++ packages/abiword/abiword_2.4.5.bb | 42 +++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 packages/abiword/abiword-plugins_2.4.5.bb create mode 100644 packages/abiword/abiword_2.4.5.bb diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb new file mode 100644 index 0000000000..75861792dd --- /dev/null +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -0,0 +1,26 @@ +DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +HOMEPAGE="http://www.abiword.org"" +MAINTAINER="Koen Kooi " +LICENSE="GPLv2" + +DEPENDS = "abiword libwpd librsvg goffice poppler" +PR="r0" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" +S = "${WORKDIR}/abiword-${PV}/abiword-plugins" + +inherit autotools + +PARALLEL_MAKE="" + +EXTRA_OECONF = "--without-libwmf" + +PACKAGES_DYNAMIC = "abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d) + + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') +} + diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb new file mode 100644 index 0000000000..8b1ed52d8a --- /dev/null +++ b/packages/abiword/abiword_2.4.5.bb @@ -0,0 +1,42 @@ +DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +HOMEPAGE="http://www.abiword.org"" +MAINTAINER="Koen Kooi " +LICENSE="GPLv2" + +DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" +RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +PR="r0" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" +S = "${WORKDIR}/abiword-${PV}/abi" + +FILES_${PN} += " ${datadir}/icons/* \ +${datadir}/AbiSuite-2.4/AbiWord/glade \ +${datadir}/AbiSuite-2.4/AbiWord/scripts \ +${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \ +${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \ +#${datadir}/AbiSuite-2.4/templates/A4.awt \ +#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \ +${datadir}/AbiSuite-2.4/templates/normal.awt \ +${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \ +${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \ +${datadir}/AbiSuite-2.4/templates/Business-Report.awt \ +${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \ +${datadir}/AbiSuite-2.4/templates/Resume.awt \ +${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \ +${datadir}/AbiSuite-2.4/templates/Memo.awt \ +${datadir}/AbiSuite-2.4/templates/Press-Release.awt " + +inherit autotools + +PARALLEL_MAKE="" + +EXTRA_OECONF = "--disable-pspell --enable-enchant" + +do_install_append() { + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ +} + + -- cgit v1.2.3