Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

6 files changed, 54 insertions, 167 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index e3e36d5c59..740ff31435 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -99,9 +99,8 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_armv7a		= "4.3.1" 
-
-ANGSTROM_GCC_VERSION_486sx = "4.3.2"
+ANGSTROM_GCC_VERSION_486sx      = "4.3.3"
+ANGSTROM_GCC_VERSION_armv7a     = "4.3.3" 
 
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
@@ -110,10 +109,14 @@ ANGSTROM_GCC_VERSION_486sx = "4.3.2"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION 			?= "4.2.4"
-PREFERRED_VERSION_binutils	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
+ANGSTROM_GCC_VERSION                     ?= "4.2.4"
+
+#2.19.51.0.3
+ANGSTROM_BINUTILS_VERSION                ?= "2.18.50.0.7"
+
+PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
+PREFERRED_VERSION_binutils-cross-sdk     ?= "${ANGSTROM_BINUTILS_VERSION}"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
@@ -163,6 +166,8 @@ PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_libxss                = "libxss"
 PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs            = "bluez4"
+PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
@@ -236,7 +241,9 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     avahi-daemon \
     avahi-autoipd \
     openssh-sftp-server \
-    ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)} \
     ${DEBUG_APPS} \
 "
 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+ARM_INSTRUCTION_SET_pn-uclibc = "arm"
+ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 60f2e55149..1f0fced434 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -129,158 +129,11 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t"
 #Set the right arch for the feeds
 #Alphabetically sorted
 
-FEED_ARCH ?= "${TARGET_ARCH}"
+FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
 
 #blackfin machines
 FEED_ARCH_bfin          = "blackfin"
 
-#armv4t machines
-
-FEED_ARCH_acern30 	= "armv4t"
-FEED_ARCH_amsdelta 	= "armv4t"
-FEED_ARCH_ep93xx 	= "armv4t"
-FEED_ARCH_eteng500 	= "armv4t"
-FEED_ARCH_om-gta01 	= "armv4t"
-FEED_ARCH_om-gta02 	= "armv4t"
-FEED_ARCH_h1940 	= "armv4t"
-FEED_ARCH_h6300 	= "armv4t"
-FEED_ARCH_kb9202 	= "armv4t"
-FEED_ARCH_ks8695 	= "armv4t"
-FEED_ARCH_rx1950 	= "armv4t"
-FEED_ARCH_rx3000 	= "armv4t"
-FEED_ARCH_sarge-at91 	= "armv4t"
-FEED_ARCH_smdk2440 	= "armv4t"
-FEED_ARCH_smdk2443 	= "armv4t"
-
-#armv5t machines
-
-FEED_ARCH_a1200 	= "armv5te"
-FEED_ARCH_a780 		= "armv5te"
-FEED_ARCH_akita 	= "armv5te"
-FEED_ARCH_asus620 	= "armv5te"
-FEED_ARCH_asus730 	= "armv5te"
-FEED_ARCH_at91sam9263ek = "armv5te"
-FEED_ARCH_aximx50 	= "armv5te"
-FEED_ARCH_aximx50v 	= "armv5te"
-FEED_ARCH_c7x0 		= "armv5te"
-FEED_ARCH_compulab-pxa270 = "armv5te"
-FEED_ARCH_davinci-dvevm = "armv5te"
-FEED_ARCH_devkitidp-pxa255 = "armv5te"
-FEED_ARCH_e680 		= "armv5te"
-FEED_ARCH_er0100 	= "armv5te"
-FEED_ARCH_gumstix 	= "armv5te"
-FEED_ARCH_gumstix-verdex = "armv5te"
-FEED_ARCH_gumstix-connex = "armv5te"
-FEED_ARCH_h1910 	= "armv5te"
-FEED_ARCH_h2200 	= "armv5te"
-FEED_ARCH_h3900 	= "armv5te"
-FEED_ARCH_h4000 	= "armv5te"
-FEED_ARCH_h5000 	= "armv5te"
-FEED_ARCH_htcalpine 	= "armv5te"
-FEED_ARCH_htcapache 	= "armv5te"
-FEED_ARCH_htcblueangel 	= "armv5te"
-FEED_ARCH_htchimalaya 	= "armv5te"
-FEED_ARCH_htcsable 	= "armv5te"
-FEED_ARCH_htctornado 	= "armv5te"
-FEED_ARCH_htcuniversal 	= "armv5te"
-FEED_ARCH_hx2000 	= "armv5te"
-FEED_ARCH_hx4700 	= "armv5te"
-FEED_ARCH_ixp4xxle 	= "armv5te"
-FEED_ARCH_logicpd-pxa270 = "armv5te"
-FEED_ARCH_looxc550 	= "armv5te"
-FEED_ARCH_lsarm 	= "armv5te"
-FEED_ARCH_magician 	= "armv5te"
-FEED_ARCH_mainstone 	= "armv5te"
-FEED_ARCH_mnci 		= "armv5te"
-FEED_ARCH_mtx-3 	= "armv5te"
-FEED_ARCH_mx21ads 	= "armv5te"
-FEED_ARCH_n2100 	= "armv5te"
-FEED_ARCH_navman-icn330 = "armv5te"
-FEED_ARCH_netbook-pro 	= "armv5te"
-FEED_ARCH_nokia770 	= "armv5te"
-FEED_ARCH_rokre2 	= "armv5te"
-FEED_ARCH_nslu2le 	= "armv5te"
-FEED_ARCH_omap1510inn 	= "armv5te"
-FEED_ARCH_omap1610h2 	= "armv5te"
-FEED_ARCH_omap1710h3 	= "armv5te"
-FEED_ARCH_omap5912osk 	= "armv5te"
-FEED_ARCH_palmld 	= "armv5te"
-FEED_ARCH_palmt650 	= "armv5te"
-FEED_ARCH_palmt680 	= "armv5te"
-FEED_ARCH_palmtc 	= "armv5te"
-FEED_ARCH_palmtt 	= "armv5te"
-FEED_ARCH_palmtt3 	= "armv5te"
-FEED_ARCH_palmtt5 	= "armv5te"
-FEED_ARCH_palmtx 	= "armv5te"
-FEED_ARCH_palmz31 	= "armv5te"
-FEED_ARCH_palmz71 	= "armv5te"
-FEED_ARCH_palmz72 	= "armv5te"
-FEED_ARCH_poodle 	= "armv5te"
-FEED_ARCH_qemuarm 	= "armv5te"
-FEED_ARCH_spitz 	= "armv5te"
-FEED_ARCH_tosa 		= "armv5te"
-FEED_ARCH_triton 	= "armv5te"
-
-FEED_ARCH_ixp4xxbe 	= "armv5teb"
-FEED_ARCH_nslu2be 	= "armv5teb"
-
-# armv6
-
-FEED_ARCH_mx31ads 	= "armv6"
-FEED_ARCH_mx31moboard	= "armv6"
-FEED_ARCH_nokia800	= "armv6"  
-FEED_ARCH_omap2420h4	= "armv6"
-FEED_ARCH_omap2430sdp   = "armv6"
-
-#i486 machines
-FEED_ARCH_geodegx 	= "i486"
-FEED_ARCH_geodelx 	= "i486"
-FEED_ARCH_netvista 	= "i486"
-FEED_ARCH_wrap 		= "i486"
-FEED_ARCH_x86 		= "i486"
-
-#i586 machines
-FEED_ARCH_epia 		= "i586"
-FEED_ARCH_i586-generic 	= "i586"
-FEED_ARCH_qemux86 	= "i586"
-
-#i686 machines
-
-FEED_ARCH_alix 		= "i686"
-FEED_ARCH_colinux	= "i686"
-FEED_ARCH_guinness 	= "i686"
-FEED_ARCH_i686-generic 	= "i686"
-FEED_ARCH_progear 	= "i686"
-
-#powerpc machines
-
-FEED_ARCH_dht-walnut 	= "ppc405"
-FEED_ARCH_magicbox 	= "ppc405"
-FEED_ARCH_xilinx-ml403 	= "ppc405"
-FEED_ARCH_xilinx-ml410 	= "ppc405"
-FEED_ARCH_sequoia 	= "ppc440e"
-FEED_ARCH_efika 	= "ppc603e"
-FEED_ARCH_lite5200 	= "ppc603e"
-FEED_ARCH_lsppchd 	= "ppc603e"
-FEED_ARCH_lsppchg 	= "ppc603e"
-FEED_ARCH_storcenter 	= "ppc603e"
-FEED_ARCH_turbostation 	= "ppc603e"
-FEED_ARCH_mpc8313e-rdb 	= "ppce300c3"
-FEED_ARCH_mpc8323e-rdb 	= "ppce300c2"
-
-
-#strongarm machines, no EABI
-
-FEED_ARCH_collie 	= "arm-oabi"
-FEED_ARCH_h3600 	= "arm-oabi"
-FEED_ARCH_h3800 	= "arm-oabi"
-FEED_ARCH_htcwallaby 	= "arm-oabi"
-FEED_ARCH_jornada56x 	= "arm-oabi"
-FEED_ARCH_jornada7xx 	= "arm-oabi"
-FEED_ARCH_shark 	= "arm-oabi"
-FEED_ARCH_simpad 	= "arm-oabi"
-
-
 #Tweak packaging for strongarm machines since they can't use EABI
 
 PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index d0b3a77d08..8ceb233f2f 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -6,6 +6,7 @@ SRCREV_pn-fsod = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-monitord = "${AUTOREV}"
@@ -20,4 +21,6 @@ SRCREV_pn-libgsm0710mux = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-vala-native = "${AUTOREV}"
+SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index e1ac69bf8e..12e3cf467d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1326,7 +1326,7 @@ PREFERRED_VERSION_net-snmp ?= "5.4.1"
 PREFERRED_VERSION_net-tools ?= "1.60"
 PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
 PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
-PREFERRED_VERSION_nfs-utils ?= "1.0.6"
+PREFERRED_VERSION_nfs-utils ?= "1.1.2"
 PREFERRED_VERSION_ngrep ?= "1.42"
 PREFERRED_VERSION_nis-all ?= "1.0"
 PREFERRED_VERSION_nkf ?= "2.07"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1f7a5fdf5b..82d216ace5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "60"
+SRCREV_pn-essential-dialer ?= "111"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -57,10 +57,11 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "1b57e0a6bab423f4f74c0107b4bb9bd83733ee42"
 SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f"
+SRCREV_pn-fso-abyss ?= "0c713f42f078ae4aa3138ea487f044b9cd9d525b"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
+SRCREV_pn-fso-term ?= "2cd15459c689d56e3ddde761129f4b00beab68ef"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-gsm0710muxd ?= "af1b80c7ded08b697730c3191d110dfd6dd872d3"
 SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
@@ -87,15 +88,15 @@ SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181b
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
-SRCREV_pn-libeflvala ?= "788101c237133747ee330142b4900774dd282a7c"
-SRCREV_pn-libefso ?= "60"
+SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
+SRCREV_pn-libefso ?= "111"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsm0710 ?= "6fdfbc2bb50c6ce49d644b92cd371a1df5942e1d"
-SRCREV_pn-libgsm0710mux ?= "a97b263f939f9a09d0a38c3346807215c72a6197"
+SRCREV_pn-libgsm0710 ?= "50079c58e6f4a21edd6ab33ef2365abb1f5441d2"
+SRCREV_pn-libgsm0710mux ?= "114044266a094c61a2c25ee5a823635ae50a4e89"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana ?= "713"
@@ -110,6 +111,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
+SRCREV_pn-linux-bug ?= "8918"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
@@ -118,6 +120,7 @@ SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
+SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
@@ -152,7 +155,7 @@ SRCREV_pn-osb-browser ?= "125"
 SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191"
+SRCREV_pn-openezx-kernel ?= "b53ea978de2a628f61f8e24e584c11dc90df3d39"
 SRCREV_pn-openmoko-agpsui ?= "7"
 SRCREV_pn-openmoko-alsa-scenarios ?= "4732"
 SRCREV_pn-openmoko-appearance ?= "3262"
@@ -200,7 +203,7 @@ SRCREV_pn-opkg-sdk ?= "209"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
-SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
+SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
@@ -242,6 +245,7 @@ SRCREV_pn-uclibc ?= "25712"
 SRCREV_pn-uclibc-initial ?= "25712"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
+SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
 SRCREV_pn-webkit-gtk ?= "42127"
@@ -256,7 +260,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39886"
+EFL_SRCREV ?= "40247"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -308,6 +312,7 @@ SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
 SRCREV_pn-examine ?= "${EFL_SRCREV}"
diff --git a/conf/distro/iphone-compat.conf b/conf/distro/iphone-compat.conf
new file mode 100644
index 0000000000..74edc0fb53
--- /dev/null
+++ b/conf/distro/iphone-compat.conf
@@ -0,0 +1,19 @@
+require conf/distro/angstrom-2008.1.conf
+
+DISTRO_NAME = "iphone-compat"
+
+TARGET_OS = "darwin9"
+TARGET_VENDOR = "-apple"
+
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} -Wl,-L${STAGING_DIR_TARGET}${layout_libdir}"
+
+# Compiler selection
+PREFERRED_PROVIDER_linux-libc-headers                       = "iphone-sdks"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc     = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/libc                             = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/libiconv                         = "iphone-rootfs"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils         = "odcctools-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial      = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc              = "gcc-iphone-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++              = "gcc-iphone-cross"