From 9cb14015c6fb87732da5bb5f35b45fb1a0774a3f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 26 Mar 2008 13:59:50 +0000 Subject: [PATCH] fic-gta0? : renamed fic-gta0? to om-gta0? to reflect true name of device --- MAINTAINERS | 2 +- conf/distro/include/angstrom.inc | 4 +-- conf/distro/openmoko.conf | 28 +++++++++--------- .../machine/{fic-gta01.conf => om-gta01.conf} | 0 .../machine/{fic-gta02.conf => om-gta02.conf} | 0 contrib/angstrom/build-feeds.sh | 2 +- contrib/angstrom/build-release.sh | 4 +-- contrib/feed-browser/includes/config.inc | 2 +- contrib/qa/bugzilla.py | 4 +-- packages/alsa/alsa-state.bb | 4 +-- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/asound.state | 0 .../capturehandset.state | 0 .../captureheadset.state | 0 .../gsmbluetooth.state | 0 .../{fic-gta01 => om-gta01}/gsmhandset.state | 0 .../{fic-gta01 => om-gta01}/gsmheadset.state | 0 .../gsmspeakerout.state | 0 .../{fic-gta01 => om-gta01}/stereoout.state | 0 .../voip-handset.state | 0 .../voip-headset.state | 0 .../{fic-gta02 => om-gta02}/.mtn2git_empty | 0 .../{fic-gta02 => om-gta02}/asound.state | 0 .../{fic-gta02 => om-gta02}/gsmhandset.state | 0 .../{fic-gta02 => om-gta02}/stereoout.state | 0 .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../base-files/{fic-gta01 => om-gta01}/fstab | 0 .../{fic-gta02 => om-gta02}/.mtn2git_empty | 0 .../base-files/{fic-gta02 => om-gta02}/fstab | 0 packages/bluez/bluez-utils3.inc | 2 +- packages/bluez/bluez-utils_3.11.bb | 2 +- packages/bluez/bluez-utils_3.12.bb | 2 +- packages/bluez/bluez-utils_3.13.bb | 2 +- packages/bluez/bluez-utils_3.14.bb | 2 +- packages/bluez/bluez-utils_3.15.bb | 2 +- packages/bluez/bluez-utils_3.16.bb | 2 +- packages/bluez/bluez-utils_3.17.bb | 2 +- packages/fbreader/fbreader_0.8.2a.bb | 2 +- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/fb.modes | 0 .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/hotkeys.conf | 0 .../{fic-gta01 => om-gta01}/softkeys.conf | 0 packages/gpephone/gpe-applauncher_0.10.bb | 2 +- packages/gpephone/gpe-applauncher_0.11.bb | 2 +- packages/gpephone/gpe-applauncher_svn.bb | 2 +- packages/gpephone/phoneserver_1.0.bb | 2 +- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/gps-hardware | 0 .../{fic-gta01 => om-gta01}/gpsd-default | 0 .../{fic-gta01 => om-gta01}/restart_gllin.sh | 0 packages/gpsd/gpsd.inc | 4 +-- packages/gtkhtml/gtkhtml-3.8_3.18.0.bb | 12 ++++++++ .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/inittab | 0 packages/linux/linux-openmoko-devel_git.bb | 2 +- packages/linux/linux-openmoko_2.6.22.5.bb | 2 +- packages/linux/linux-openmoko_2.6.24.bb | 10 +++---- .../matchbox-keyboard-inputmethod_svn.bb | 4 +-- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/interfaces | 0 .../{fic-gta02 => om-gta02}/.mtn2git_empty | 0 .../{fic-gta02 => om-gta02}/interfaces | 0 packages/openmoko2/neod_svn.bb | 4 +-- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../kernel-2.6.24.patch | 0 .../{fic-gta02 => om-gta02}/.mtn2git_empty | 0 .../kernel-2.6.24.patch | 0 packages/openmoko2/openmoko-dialer2_svn.bb | 4 +-- .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../files/{fic-gta01 => om-gta01}/pointercal | 0 .../{fic-gta02 => om-gta02}/.mtn2git_empty | 0 .../files/{fic-gta02 => om-gta02}/pointercal | Bin .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/openmoko-scummvm | 0 .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../tslib/{fic-gta01 => om-gta01}/ts.conf | 0 .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/fw_env.config | 0 .../{fic-gta01 => om-gta01}/.mtn2git_empty | 0 .../{fic-gta01 => om-gta01}/uClibc.machine | 0 81 files changed, 65 insertions(+), 53 deletions(-) rename conf/machine/{fic-gta01.conf => om-gta01.conf} (100%) rename conf/machine/{fic-gta02.conf => om-gta02.conf} (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/asound.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/capturehandset.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/captureheadset.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/gsmbluetooth.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/gsmhandset.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/gsmheadset.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/gsmspeakerout.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/stereoout.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/voip-handset.state (100%) rename packages/alsa/alsa-state/{fic-gta01 => om-gta01}/voip-headset.state (100%) rename packages/alsa/alsa-state/{fic-gta02 => om-gta02}/.mtn2git_empty (100%) rename packages/alsa/alsa-state/{fic-gta02 => om-gta02}/asound.state (100%) rename packages/alsa/alsa-state/{fic-gta02 => om-gta02}/gsmhandset.state (100%) rename packages/alsa/alsa-state/{fic-gta02 => om-gta02}/stereoout.state (100%) rename packages/base-files/base-files/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/base-files/base-files/{fic-gta01 => om-gta01}/fstab (100%) rename packages/base-files/base-files/{fic-gta02 => om-gta02}/.mtn2git_empty (100%) rename packages/base-files/base-files/{fic-gta02 => om-gta02}/fstab (100%) rename packages/fbset/fbset-modes/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/fbset/fbset-modes/{fic-gta01 => om-gta01}/fb.modes (100%) rename packages/gpephone/gpe-applauncher/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/gpephone/gpe-applauncher/{fic-gta01 => om-gta01}/hotkeys.conf (100%) rename packages/gpephone/gpe-applauncher/{fic-gta01 => om-gta01}/softkeys.conf (100%) rename packages/gpsd/files/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/gpsd/files/{fic-gta01 => om-gta01}/gps-hardware (100%) rename packages/gpsd/files/{fic-gta01 => om-gta01}/gpsd-default (100%) rename packages/gpsd/files/{fic-gta01 => om-gta01}/restart_gllin.sh (100%) create mode 100644 packages/gtkhtml/gtkhtml-3.8_3.18.0.bb rename packages/initscripts/initscripts-1.0/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/initscripts/initscripts-1.0/{fic-gta01 => om-gta01}/inittab (100%) rename packages/netbase/netbase/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/netbase/netbase/{fic-gta01 => om-gta01}/interfaces (100%) rename packages/netbase/netbase/{fic-gta02 => om-gta02}/.mtn2git_empty (100%) rename packages/netbase/netbase/{fic-gta02 => om-gta02}/interfaces (100%) rename packages/openmoko2/openmoko-dialer2/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/openmoko2/openmoko-dialer2/{fic-gta01 => om-gta01}/kernel-2.6.24.patch (100%) rename packages/openmoko2/openmoko-dialer2/{fic-gta02 => om-gta02}/.mtn2git_empty (100%) rename packages/openmoko2/openmoko-dialer2/{fic-gta02 => om-gta02}/kernel-2.6.24.patch (100%) rename packages/pointercal/files/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/pointercal/files/{fic-gta01 => om-gta01}/pointercal (100%) rename packages/pointercal/files/{fic-gta02 => om-gta02}/.mtn2git_empty (100%) rename packages/pointercal/files/{fic-gta02 => om-gta02}/pointercal (100%) rename packages/scummvm/files/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/scummvm/files/{fic-gta01 => om-gta01}/openmoko-scummvm (100%) rename packages/tslib/tslib/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/tslib/tslib/{fic-gta01 => om-gta01}/ts.conf (100%) rename packages/u-boot/u-boot-1.2.0/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/u-boot/u-boot-1.2.0/{fic-gta01 => om-gta01}/fw_env.config (100%) rename packages/uclibc/uclibc-0.9.29/{fic-gta01 => om-gta01}/.mtn2git_empty (100%) rename packages/uclibc/uclibc-0.9.29/{fic-gta01 => om-gta01}/uClibc.machine (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 37655b663e..e1482f4107 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -166,7 +166,7 @@ Recipes: altboot, webcam-server Person: Michael 'Mickey' Lauer Mail: mlauer@vanille-media.de Distros: OpenMoko, Ångström, Generic -Machines: fic-gta01, fic-gta02, nokia810, x86, qemuarm, qemux86 +Machines: om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86 Interests: Core OE infrastructure, everything Python, EFL, E17, Qt4 Recipes: *python*, efl/*, e17* diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8699dc183c..bb1d65dec3 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -92,8 +92,8 @@ FEED_ARCH_acern30 = "armv4t" FEED_ARCH_amsdelta = "armv4t" FEED_ARCH_ep93xx = "armv4t" FEED_ARCH_eteng500 = "armv4t" -FEED_ARCH_fic-gta01 = "armv4t" -FEED_ARCH_fic-gta02 = "armv4t" +FEED_ARCH_om-gta01 = "armv4t" +FEED_ARCH_om-gta02 = "armv4t" FEED_ARCH_h1940 = "armv4t" FEED_ARCH_h6300 = "armv4t" FEED_ARCH_kb9202 = "armv4t" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 2b7aea03b9..434469dc74 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -27,12 +27,12 @@ FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ - snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ + snapshot-om-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/om-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ - updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " + updates-om-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/om-gta01 " # 2.18 seems to break badly on 64-bit systems PREFERRED_VERSION_binutils ?= "2.17.50.0.12" @@ -49,20 +49,20 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # Same kernel runs on both these machines # Currently not used but left here in case someone wants to switch on # quickly -#PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" -#PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" -#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}" -#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "${MACHINE_CLASS}" # Same kernel so same usb -PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "${MACHINE_CLASS}" # same kernel so same keymaps -PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_om-gta02 = "${MACHINE_CLASS}" # neod knows about both machines -PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" @@ -74,5 +74,5 @@ PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" # deploy gta01 and gta02 in ${MACHINE_CLASS} directory -DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" -DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/om-gta01.conf similarity index 100% rename from conf/machine/fic-gta01.conf rename to conf/machine/om-gta01.conf diff --git a/conf/machine/fic-gta02.conf b/conf/machine/om-gta02.conf similarity index 100% rename from conf/machine/fic-gta02.conf rename to conf/machine/om-gta02.conf diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 600352ec6e..12f74a81c0 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -38,7 +38,7 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 +for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index cf5af3073e..bb903b236a 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -78,7 +78,7 @@ do done # graphics, flash storage -for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad +for machine in om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine @@ -96,7 +96,7 @@ do done #phones -for machine in fic-gta01 a780 +for machine in om-gta01 a780 do BUILD_MACHINE=$machine BUILD_TARGETS="minimal-openmoko-image openmoko-image" diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index c2414b8013..195363df3c 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -251,7 +251,7 @@ $feeds = array( ), array( 'name'=>'FIC gta01/Neo1973 phone', - 'url'=>'armv4t/machine/fic-gta01', + 'url'=>'armv4t/machine/om-gta01', ), array( diff --git a/contrib/qa/bugzilla.py b/contrib/qa/bugzilla.py index 17849552b0..019b546a96 100644 --- a/contrib/qa/bugzilla.py +++ b/contrib/qa/bugzilla.py @@ -5126,7 +5126,7 @@ bugs_openmoko = """ FIXE - defconfig-fic-gta01 could use updating + defconfig-om-gta01 could use updating @@ -5798,7 +5798,7 @@ bugs_openmoko = """ FIXE - Please enable CONFIG_TUN as a module in defconfig-fic-gta01 + Please enable CONFIG_TUN as a module in defconfig-om-gta01 diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 7a95b55f34..1d31bd765e 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://asound.state \ file://alsa-state " -SRC_URI_append_fic-gta01 = " \ +SRC_URI_append_om-gta01 = " \ file://capturehandset.state \ file://captureheadset.state \ file://gsmbluetooth.state \ @@ -26,7 +26,7 @@ SRC_URI_append_fic-gta01 = " \ file://voip-handset.state \ file://voip-headset.state" -SRC_URI_append_fic-gta02 = "\ +SRC_URI_append_om-gta02 = "\ file://stereoout.state \ file://gsmhandset.state \ " diff --git a/packages/alsa/alsa-state/fic-gta01/.mtn2git_empty b/packages/alsa/alsa-state/om-gta01/.mtn2git_empty similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/.mtn2git_empty rename to packages/alsa/alsa-state/om-gta01/.mtn2git_empty diff --git a/packages/alsa/alsa-state/fic-gta01/asound.state b/packages/alsa/alsa-state/om-gta01/asound.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/asound.state rename to packages/alsa/alsa-state/om-gta01/asound.state diff --git a/packages/alsa/alsa-state/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/om-gta01/capturehandset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/capturehandset.state rename to packages/alsa/alsa-state/om-gta01/capturehandset.state diff --git a/packages/alsa/alsa-state/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/om-gta01/captureheadset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/captureheadset.state rename to packages/alsa/alsa-state/om-gta01/captureheadset.state diff --git a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/om-gta01/gsmbluetooth.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state rename to packages/alsa/alsa-state/om-gta01/gsmbluetooth.state diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/om-gta01/gsmhandset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/gsmhandset.state rename to packages/alsa/alsa-state/om-gta01/gsmhandset.state diff --git a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/om-gta01/gsmheadset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/gsmheadset.state rename to packages/alsa/alsa-state/om-gta01/gsmheadset.state diff --git a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state b/packages/alsa/alsa-state/om-gta01/gsmspeakerout.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state rename to packages/alsa/alsa-state/om-gta01/gsmspeakerout.state diff --git a/packages/alsa/alsa-state/fic-gta01/stereoout.state b/packages/alsa/alsa-state/om-gta01/stereoout.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/stereoout.state rename to packages/alsa/alsa-state/om-gta01/stereoout.state diff --git a/packages/alsa/alsa-state/fic-gta01/voip-handset.state b/packages/alsa/alsa-state/om-gta01/voip-handset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/voip-handset.state rename to packages/alsa/alsa-state/om-gta01/voip-handset.state diff --git a/packages/alsa/alsa-state/fic-gta01/voip-headset.state b/packages/alsa/alsa-state/om-gta01/voip-headset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta01/voip-headset.state rename to packages/alsa/alsa-state/om-gta01/voip-headset.state diff --git a/packages/alsa/alsa-state/fic-gta02/.mtn2git_empty b/packages/alsa/alsa-state/om-gta02/.mtn2git_empty similarity index 100% rename from packages/alsa/alsa-state/fic-gta02/.mtn2git_empty rename to packages/alsa/alsa-state/om-gta02/.mtn2git_empty diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/om-gta02/asound.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta02/asound.state rename to packages/alsa/alsa-state/om-gta02/asound.state diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/om-gta02/gsmhandset.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta02/gsmhandset.state rename to packages/alsa/alsa-state/om-gta02/gsmhandset.state diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/om-gta02/stereoout.state similarity index 100% rename from packages/alsa/alsa-state/fic-gta02/stereoout.state rename to packages/alsa/alsa-state/om-gta02/stereoout.state diff --git a/packages/base-files/base-files/fic-gta01/.mtn2git_empty b/packages/base-files/base-files/om-gta01/.mtn2git_empty similarity index 100% rename from packages/base-files/base-files/fic-gta01/.mtn2git_empty rename to packages/base-files/base-files/om-gta01/.mtn2git_empty diff --git a/packages/base-files/base-files/fic-gta01/fstab b/packages/base-files/base-files/om-gta01/fstab similarity index 100% rename from packages/base-files/base-files/fic-gta01/fstab rename to packages/base-files/base-files/om-gta01/fstab diff --git a/packages/base-files/base-files/fic-gta02/.mtn2git_empty b/packages/base-files/base-files/om-gta02/.mtn2git_empty similarity index 100% rename from packages/base-files/base-files/fic-gta02/.mtn2git_empty rename to packages/base-files/base-files/om-gta02/.mtn2git_empty diff --git a/packages/base-files/base-files/fic-gta02/fstab b/packages/base-files/base-files/om-gta02/fstab similarity index 100% rename from packages/base-files/base-files/fic-gta02/fstab rename to packages/base-files/base-files/om-gta02/fstab diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index 3932d722ee..e9edfe1b95 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -40,7 +40,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb index 6cadfc1a53..25fda9dcff 100644 --- a/packages/bluez/bluez-utils_3.11.bb +++ b/packages/bluez/bluez-utils_3.11.bb @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb index 754097acce..98a79af901 100644 --- a/packages/bluez/bluez-utils_3.12.bb +++ b/packages/bluez/bluez-utils_3.12.bb @@ -27,7 +27,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb index 5ea1429641..0a2a062338 100644 --- a/packages/bluez/bluez-utils_3.13.bb +++ b/packages/bluez/bluez-utils_3.13.bb @@ -27,7 +27,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.14.bb b/packages/bluez/bluez-utils_3.14.bb index 237a1aff0d..5d0c3cf15b 100644 --- a/packages/bluez/bluez-utils_3.14.bb +++ b/packages/bluez/bluez-utils_3.14.bb @@ -28,7 +28,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.15.bb b/packages/bluez/bluez-utils_3.15.bb index b8dbfbca7c..a7d1dce192 100644 --- a/packages/bluez/bluez-utils_3.15.bb +++ b/packages/bluez/bluez-utils_3.15.bb @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.16.bb b/packages/bluez/bluez-utils_3.16.bb index b8dbfbca7c..a7d1dce192 100644 --- a/packages/bluez/bluez-utils_3.16.bb +++ b/packages/bluez/bluez-utils_3.16.bb @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/bluez/bluez-utils_3.17.bb b/packages/bluez/bluez-utils_3.17.bb index b8dbfbca7c..a7d1dce192 100644 --- a/packages/bluez/bluez-utils_3.17.bb +++ b/packages/bluez/bluez-utils_3.17.bb @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ # The config options are explained below: # --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1 +# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 # --enable-cups install CUPS backend support # --enable-bccmd install BCCMD interface utility # --enable-avctrl install Audio/Video control utility diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index fa982040f9..52e8439a88 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -30,7 +30,7 @@ READER_GUI = "gpe" READER_STATUS = "release" # Set device specific overrides -READER_RESOLUTION_fic-gta01 = "480x640" +READER_RESOLUTION_om-gta01 = "480x640" READER_RESOLUTION_spitz = "640x480" READER_RESOLUTION_akita = "640x480" READER_RESOLUTION_htcuniversal = "640x480" diff --git a/packages/fbset/fbset-modes/fic-gta01/.mtn2git_empty b/packages/fbset/fbset-modes/om-gta01/.mtn2git_empty similarity index 100% rename from packages/fbset/fbset-modes/fic-gta01/.mtn2git_empty rename to packages/fbset/fbset-modes/om-gta01/.mtn2git_empty diff --git a/packages/fbset/fbset-modes/fic-gta01/fb.modes b/packages/fbset/fbset-modes/om-gta01/fb.modes similarity index 100% rename from packages/fbset/fbset-modes/fic-gta01/fb.modes rename to packages/fbset/fbset-modes/om-gta01/fb.modes diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/.mtn2git_empty b/packages/gpephone/gpe-applauncher/om-gta01/.mtn2git_empty similarity index 100% rename from packages/gpephone/gpe-applauncher/fic-gta01/.mtn2git_empty rename to packages/gpephone/gpe-applauncher/om-gta01/.mtn2git_empty diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf b/packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf similarity index 100% rename from packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf rename to packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf diff --git a/packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf b/packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf similarity index 100% rename from packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf rename to packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf diff --git a/packages/gpephone/gpe-applauncher_0.10.bb b/packages/gpephone/gpe-applauncher_0.10.bb index 94f26c5589..7167b42071 100644 --- a/packages/gpephone/gpe-applauncher_0.10.bb +++ b/packages/gpephone/gpe-applauncher_0.10.bb @@ -7,7 +7,7 @@ PR = "r1" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGES += "gpe-applauncher-config" -PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" +PACKAGE_ARCH_gpe-applauncher-config_om-gta01 = "${MACHINE_ARCH}" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" RDEPENDS_${PN} += "gpe-applauncher-config" diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb index 204f7828f9..4934cdeaf2 100644 --- a/packages/gpephone/gpe-applauncher_0.11.bb +++ b/packages/gpephone/gpe-applauncher_0.11.bb @@ -7,7 +7,7 @@ PR = "r2" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGES += "gpe-applauncher-config" -PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" +PACKAGE_ARCH_gpe-applauncher-config_om-gta01 = "${MACHINE_ARCH}" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" RDEPENDS_${PN} += "gpe-applauncher-config" diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb index 9360c6f6d3..3087088ab8 100644 --- a/packages/gpephone/gpe-applauncher_svn.bb +++ b/packages/gpephone/gpe-applauncher_svn.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/${PN}" PACKAGES += "gpe-applauncher-config" -PACKAGE_ARCH_gpe-applauncher-config_fic-gta01 = "${MACHINE_ARCH}" +PACKAGE_ARCH_gpe-applauncher-config_om-gta01 = "${MACHINE_ARCH}" DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings libxsettings-client" RDEPENDS_${PN} += "gpe-applauncher-config" diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb index 1415951473..ebd8a3c7cb 100644 --- a/packages/gpephone/phoneserver_1.0.bb +++ b/packages/gpephone/phoneserver_1.0.bb @@ -12,5 +12,5 @@ GPE_TARBALL_SUFFIX= "bz2" inherit gpephone autotools SRC_URI_append_x86 = " file://changeport.patch;patch=1;pnum=0" -SRC_URI_append_fic-gta01 = " file://phoneserver-gta01.patch;patch=1" +SRC_URI_append_om-gta01 = " file://phoneserver-gta01.patch;patch=1" diff --git a/packages/gpsd/files/fic-gta01/.mtn2git_empty b/packages/gpsd/files/om-gta01/.mtn2git_empty similarity index 100% rename from packages/gpsd/files/fic-gta01/.mtn2git_empty rename to packages/gpsd/files/om-gta01/.mtn2git_empty diff --git a/packages/gpsd/files/fic-gta01/gps-hardware b/packages/gpsd/files/om-gta01/gps-hardware similarity index 100% rename from packages/gpsd/files/fic-gta01/gps-hardware rename to packages/gpsd/files/om-gta01/gps-hardware diff --git a/packages/gpsd/files/fic-gta01/gpsd-default b/packages/gpsd/files/om-gta01/gpsd-default similarity index 100% rename from packages/gpsd/files/fic-gta01/gpsd-default rename to packages/gpsd/files/om-gta01/gpsd-default diff --git a/packages/gpsd/files/fic-gta01/restart_gllin.sh b/packages/gpsd/files/om-gta01/restart_gllin.sh similarity index 100% rename from packages/gpsd/files/fic-gta01/restart_gllin.sh rename to packages/gpsd/files/om-gta01/restart_gllin.sh diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index f7952e0297..06be2fe2eb 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -15,7 +15,7 @@ SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ file://gps-hardware \ file://gpsd" -SRC_URI_append_fic-gta01 = " \ +SRC_URI_append_om-gta01 = " \ file://restart_gllin.sh \ " @@ -52,7 +52,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default } -do_install_append_fic-gta01() { +do_install_append_om-gta01() { install -d ${D}/${sysconfdir}/apm/resume.d install -m 755 ${WORKDIR}/restart_gllin.sh ${D}/${sysconfdir}/apm/resume.d } diff --git a/packages/gtkhtml/gtkhtml-3.8_3.18.0.bb b/packages/gtkhtml/gtkhtml-3.8_3.18.0.bb new file mode 100644 index 0000000000..e678bc3134 --- /dev/null +++ b/packages/gtkhtml/gtkhtml-3.8_3.18.0.bb @@ -0,0 +1,12 @@ +require gtkhtml.inc + +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" + +SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.18/gtkhtml-${PV}.tar.bz2" +FILES_${PN} += "${datadir}/gtkhtml-3.8" + +do_stage() { + mv src/libgtkhtml.pc src/libgtkhtml-3.8.pc || true + gnome_stage_includes + oe_libinstall -C src -so libgtkhtml-3.8 ${STAGING_LIBDIR} +} diff --git a/packages/initscripts/initscripts-1.0/fic-gta01/.mtn2git_empty b/packages/initscripts/initscripts-1.0/om-gta01/.mtn2git_empty similarity index 100% rename from packages/initscripts/initscripts-1.0/fic-gta01/.mtn2git_empty rename to packages/initscripts/initscripts-1.0/om-gta01/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/fic-gta01/inittab b/packages/initscripts/initscripts-1.0/om-gta01/inittab similarity index 100% rename from packages/initscripts/initscripts-1.0/fic-gta01/inittab rename to packages/initscripts/initscripts-1.0/om-gta01/inittab diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index b727478c76..6b563a012a 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -24,7 +24,7 @@ FILES_kernel-image = "" ALLOW_EMPTY = "1" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' +COMPATIBLE_MACHINE = 'om-gta01|om-gta02' CMDLINE = "unused -- bootloader passes ATAG list" diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index fe46c59a58..126221ad6d 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -39,7 +39,7 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}" ALLOW_EMPTY = "1" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' +COMPATIBLE_MACHINE = 'om-gta01|om-gta02' CMDLINE = "unused -- bootloader passes ATAG list" diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb index b60a43efe4..f87e6b68d8 100644 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -11,8 +11,8 @@ KERNEL_VERSION = "${KERNEL_RELEASE}" # re-enabled this when feature is fully implemented in OE #SRCREV_FORMAT = "patches-rconfig" SRCREV_FORMAT = "patches" -CONFIG_REV_fic-gta01 = "4251" -CONFIG_REV_fic-gta02 = "4251" +CONFIG_REV_om-gta01 = "4251" +CONFIG_REV_om-gta02 = "4251" PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}" PR = "r5" @@ -35,7 +35,7 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}" ALLOW_EMPTY = "1" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' +COMPATIBLE_MACHINE = 'om-gta01|om-gta02' CMDLINE = "unused -- bootloader passes ATAG list" @@ -55,8 +55,8 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss" # sd/mmc module_autoload_s3cmci = "s3cmci" -CONFIG_NAME_fic-gta01 = "gta01" -CONFIG_NAME_fic-gta02 = "gta02" +CONFIG_NAME_om-gta01 = "gta01" +CONFIG_NAME_om-gta02 = "gta02" do_prepatch() { mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 4384b6db7d..03123d9b8b 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -16,8 +16,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;pr file://6-Add-layout-switch-key-to-all-layouts.patch;patch=1 \ file://80matchboxkeyboard" -SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" -SRC_URI_append_fic-gta02 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_om-gta01 = " file://fic-gta01-font-size.patch;patch=1" +SRC_URI_append_om-gta02 = " file://fic-gta01-font-size.patch;patch=1" S = "${WORKDIR}/matchbox-keyboard" diff --git a/packages/netbase/netbase/fic-gta01/.mtn2git_empty b/packages/netbase/netbase/om-gta01/.mtn2git_empty similarity index 100% rename from packages/netbase/netbase/fic-gta01/.mtn2git_empty rename to packages/netbase/netbase/om-gta01/.mtn2git_empty diff --git a/packages/netbase/netbase/fic-gta01/interfaces b/packages/netbase/netbase/om-gta01/interfaces similarity index 100% rename from packages/netbase/netbase/fic-gta01/interfaces rename to packages/netbase/netbase/om-gta01/interfaces diff --git a/packages/netbase/netbase/fic-gta02/.mtn2git_empty b/packages/netbase/netbase/om-gta02/.mtn2git_empty similarity index 100% rename from packages/netbase/netbase/fic-gta02/.mtn2git_empty rename to packages/netbase/netbase/om-gta02/.mtn2git_empty diff --git a/packages/netbase/netbase/fic-gta02/interfaces b/packages/netbase/netbase/om-gta02/interfaces similarity index 100% rename from packages/netbase/netbase/fic-gta02/interfaces rename to packages/netbase/netbase/om-gta02/interfaces diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index e627e60bd2..9dbe35c790 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -10,8 +10,8 @@ inherit openmoko2 gconf SRC_URI += "file://htc.patch;patch=1;maxrev=3348 \ file://ipaq.patch;patch=1;maxrev=3348" -EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973" -EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973" +EXTRA_OECONF_om-gta01 = "--with-platform=neo1973" +EXTRA_OECONF_om-gta02 = "--with-platform=neo1973" EXTRA_OECONF_a780 = "--with-platform=ezx" EXTRA_OECONF_a1200 = "--with-platform=ezx" EXTRA_OECONF_e680 = "--with-platform=ezx" diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/om-gta01/.mtn2git_empty similarity index 100% rename from packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty rename to packages/openmoko2/openmoko-dialer2/om-gta01/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch similarity index 100% rename from packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch rename to packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/om-gta02/.mtn2git_empty similarity index 100% rename from packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty rename to packages/openmoko2/openmoko-dialer2/om-gta02/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch similarity index 100% rename from packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch rename to packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 4f15ac07dc..7ef548bc15 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -7,8 +7,8 @@ PE = "1" inherit openmoko2 -SRC_URI_append_fic-gta01 = " file://kernel-2.6.24.patch;patch=1" -SRC_URI_append_fic-gta02 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1" EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" diff --git a/packages/pointercal/files/fic-gta01/.mtn2git_empty b/packages/pointercal/files/om-gta01/.mtn2git_empty similarity index 100% rename from packages/pointercal/files/fic-gta01/.mtn2git_empty rename to packages/pointercal/files/om-gta01/.mtn2git_empty diff --git a/packages/pointercal/files/fic-gta01/pointercal b/packages/pointercal/files/om-gta01/pointercal similarity index 100% rename from packages/pointercal/files/fic-gta01/pointercal rename to packages/pointercal/files/om-gta01/pointercal diff --git a/packages/pointercal/files/fic-gta02/.mtn2git_empty b/packages/pointercal/files/om-gta02/.mtn2git_empty similarity index 100% rename from packages/pointercal/files/fic-gta02/.mtn2git_empty rename to packages/pointercal/files/om-gta02/.mtn2git_empty diff --git a/packages/pointercal/files/fic-gta02/pointercal b/packages/pointercal/files/om-gta02/pointercal similarity index 100% rename from packages/pointercal/files/fic-gta02/pointercal rename to packages/pointercal/files/om-gta02/pointercal diff --git a/packages/scummvm/files/fic-gta01/.mtn2git_empty b/packages/scummvm/files/om-gta01/.mtn2git_empty similarity index 100% rename from packages/scummvm/files/fic-gta01/.mtn2git_empty rename to packages/scummvm/files/om-gta01/.mtn2git_empty diff --git a/packages/scummvm/files/fic-gta01/openmoko-scummvm b/packages/scummvm/files/om-gta01/openmoko-scummvm similarity index 100% rename from packages/scummvm/files/fic-gta01/openmoko-scummvm rename to packages/scummvm/files/om-gta01/openmoko-scummvm diff --git a/packages/tslib/tslib/fic-gta01/.mtn2git_empty b/packages/tslib/tslib/om-gta01/.mtn2git_empty similarity index 100% rename from packages/tslib/tslib/fic-gta01/.mtn2git_empty rename to packages/tslib/tslib/om-gta01/.mtn2git_empty diff --git a/packages/tslib/tslib/fic-gta01/ts.conf b/packages/tslib/tslib/om-gta01/ts.conf similarity index 100% rename from packages/tslib/tslib/fic-gta01/ts.conf rename to packages/tslib/tslib/om-gta01/ts.conf diff --git a/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/om-gta01/.mtn2git_empty similarity index 100% rename from packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty rename to packages/u-boot/u-boot-1.2.0/om-gta01/.mtn2git_empty diff --git a/packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config b/packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config similarity index 100% rename from packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config rename to packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config diff --git a/packages/uclibc/uclibc-0.9.29/fic-gta01/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/om-gta01/.mtn2git_empty similarity index 100% rename from packages/uclibc/uclibc-0.9.29/fic-gta01/.mtn2git_empty rename to packages/uclibc/uclibc-0.9.29/om-gta01/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine b/packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine similarity index 100% rename from packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine rename to packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine -- 2.39.5