(multiple): remove last traces of om-3d7k; this machine has been cancelled and will...

the light of day

diff --git a/recipes/linux/linux-openmoko-devel_git.bb b/recipes/linux/linux-openmoko-devel_git.bb
index 5a87f5b..ba2e9c4 100644 (file)
--- a/recipes/linux/linux-openmoko-devel_git.bb
+++ b/recipes/linux/linux-openmoko-devel_git.bb
@@ -9,7 +9,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 SRCREV = "a15608f241a40b41fed5bffe511355c2067c4e88"
 OEV = "oe1"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
@@ -18,7 +18,6 @@ S = "${WORKDIR}/git"
 
 CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
 CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
-CONFIG_NAME_om-3d7k  = "om_3d7k_defconfig"
 
 do_configure_prepend() {
        install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe

diff --git a/recipes/obsolete/shr/alsa-scenarii-shr_git.bb b/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
index 0e27115..cb21e2a 100644 (file)
--- a/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
+++ b/recipes/obsolete/shr/alsa-scenarii-shr_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko"
 SECTION = "openmoko/base"
 SRCREV = "8e89c8dbae569a08cac246a3805fca20988c0ad1"
 PV = "1.0+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
-COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k|htcdream)"
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02|htcdream)"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 

diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb
index 94dc1f7..181bde3 100644 (file)
--- a/recipes/shr/frameworkd-config-shr_git.bb
+++ b/recipes/shr/frameworkd-config-shr_git.bb
@@ -10,7 +10,7 @@ SRCREV_pn-frameworkd-config-shr_SHR_REV ?= "cdf5b5f3d8f37d6d91e1eb8d9cf07d034291
 
 SRCREV_FORMAT = "FSO_REV-SHR_REV"
 PV = "0.9.5.9+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \
            git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master;name=SHR_REV"
@@ -70,7 +70,6 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
 # - recommend MUXer on platforms that require one
 RDEPENDS_${PN}_append_om-gta01 = " fso-abyss"
 RDEPENDS_${PN}_append_om-gta02 = " fso-abyss"
-RDEPENDS_${PN}_append_om-3d7k  = " fso-abyss"
 # - add wmiconfig for wireless configuration
 RDEPENDS_${PN}_append_om-gta02 = " wmiconfig"