disapproval of revision 'b9a2e7516cc3620c51495eadf5a2d938086881a9'

6 files changed, 1 insertions, 80 deletions

diff --git a/packages/efl/ecore/remove-bad-code.patch b/packages/efl/ecore/remove-bad-code.patch
deleted file mode 100644
index 87a8d16bd6..0000000000
--- a/packages/efl/ecore/remove-bad-code.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_private.h
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_private.h
-@@ -19,8 +19,8 @@
-  #define kernel_ulong_t unsigned long 
-  #define BITS_PER_LONG 32
-  #include <linux/input.h>
-- #undef kernel_ulong_t <-added
-- #undef BITS_PER_LONG <-added
-+ #undef kernel_ulong_t
-+ #undef BITS_PER_LONG
- #else
-  #include <linux/input.h>
- #endif
-Index: ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-===================================================================
---- ecore-0.9.9.037.orig/src/lib/ecore_fb/ecore_fb_li.c
-+++ ecore-0.9.9.037/src/lib/ecore_fb/ecore_fb_li.c
-@@ -1,6 +1,6 @@
- #include "Ecore_Fb.h"
- #include "ecore_fb_private.h"
--
-+/*
- struct input_absinfo {
- 	__s32 value;
- 	__s32 minimum;
-@@ -8,7 +8,7 @@ struct input_absinfo {
- 	__s32 fuzz;
- 	__s32 flat;
- };
--
-+*/
- 
- #define EV_SYN			0x00
- #define EV_PWR			0x16
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc
index 8892f3d526..4e785d8275 100644
--- a/packages/glibc/glibc.inc
+++ b/packages/glibc/glibc.inc
@@ -3,5 +3,3 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
 SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
-
-RPROVIDES += "libc6-dev"
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index f96ad72441..e23167c80a 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -17,11 +17,6 @@ INITSCRIPT_PARAMS = "defaults 35"
 
 export LDFLAGS = "-L${STAGING_LIBDIR} -lm"
 
-do_compile_prepend() {
-    export BUILD_SYS="${BUILD_SYS}"
-    export HOST_SYS="${HOST_SYS}"
-}
-
 do_stage() {
         oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
         install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
@@ -29,11 +24,6 @@ do_stage() {
         install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
 }
 
-do_install_prepend() {
-    export BUILD_SYS="${BUILD_SYS}"
-    export HOST_SYS="${HOST_SYS}"
-}
-
 do_install_append() {
         install -d ${D}/${sysconfdir}/init.d
         install -d ${D}/dev
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 9416caa590..b448c0a9b1 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -29,35 +29,6 @@ RDEPENDS = "${PACKAGE_INSTALL}"
 
 export PACKAGE_INSTALL = "\
     ${MACHINE_TASK_PROVIDER} \
-    gpsd \
-    gpsdrive \
-    gcc \
-    gcc-symlinks \
-    binutils \
-    binutils-symlinks \
-    libtool \
-    make \
-    autoconf \
-    automake \
-    perl \
-    python-core \
-    python-stringold \
-    python-distutils \
-    python-lang \
-    libstdc++6 \
-    libstdc++-dev \
-    libc6-dev \
-    linux-libc-headers-dev \
-    cpp \
-    cpp-symlinks \
-    g++ \
-    g++-symlinks \
-    diffutils \
-    coreutils \
-    pcmcia-cs \
-    kernel-module-garmin-gps \
-    perl-module-carp-heavy \
-    ncurses-dev \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/linux/linux-rp-2.6.18/defconfig-spitz b/packages/linux/linux-rp-2.6.18/defconfig-spitz
index bda9cfbd53..f425956323 100644
--- a/packages/linux/linux-rp-2.6.18/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18/defconfig-spitz
@@ -1563,4 +1563,3 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_SHARPSL_RC=y
diff --git a/packages/linux/linux-rp_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 2f3d63dee2..7150881cad 100644
--- a/packages/linux/linux-rp_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r9"
+PR = "r7"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -49,7 +49,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://orinoco-remove-all-which-are-in-hostap-HACK.patch;patch=1;status=unmergable-hack \
            file://squashfs3.0-2.6.15.patch;patch=1;status=external \
-           http://oe.reversefold.com/sharpsl-rc/sharpsl-rc-2.6.18-r0.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \