[oe-commits] org.oe.oz354x revert previous accidental commit

[justinp commit]

revert previous accidental commit

applied changes from 87c2d837ea5586793e98a4604630ceb3fa70dc7c
             through d51c990067f86309a3aab1e6b76eaaa5c65f550a

Author: justinp at openembedded.org
Branch: org.openembedded.oz354x
Revision: 83e1ef9b6f3c5ea0cab9b35c5b2283795a3b4162
ViewMTN: http://monotone.openembedded.org/revision.psp?id=83e1ef9b6f3c5ea0cab9b35c5b2283795a3b4162
Files:
1
packages/subversion/subversion_1.4.0.bb
packages/glibc/glibc-package.bbclass
packages/gpsd/gpsd.inc
packages/linux/linux-openzaurus-2.6.17/defconfig-akita
packages/linux/linux-openzaurus-2.6.17/defconfig-spitz
packages/linux/linux-openzaurus_2.6.17.bb
packages/meta/e-image.bb
packages/meta/meta-gpe.bb
packages/qemu/qemu-native_0.8.2.bb
Diffs:

#
# mt diff -r87c2d837ea5586793e98a4604630ceb3fa70dc7c -r83e1ef9b6f3c5ea0cab9b35c5b2283795a3b4162
#
# 
# 
# delete "packages/subversion/subversion_1.4.0.bb"
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [e079db15c73e766a83f95a27b1d6de0ee2de044d]
#    to [f812dc7437b2dd9f5236f289cecbec1e730cf2bf]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [fde1deb1db26848d039aafe2f644678a001da2e9]
#    to [2df3a7734f5c620b78526bf29cbfd0cf5b8440f4]
# 
# patch "packages/linux/linux-openzaurus-2.6.17/defconfig-akita"
#  from [f7588ea33883d7d38ae1d9732b0a3036c3522dac]
#    to [7f1c8b81f35bac9fa66bc78f176ec28db29e2054]
# 
# patch "packages/linux/linux-openzaurus-2.6.17/defconfig-spitz"
#  from [ac47ced57a244a2af4b0d2767e73570884c46f58]
#    to [9c7922b07085af60b28277d84ef143f1a24df1aa]
# 
# patch "packages/linux/linux-openzaurus_2.6.17.bb"
#  from [9b38742988d31326ee4d210edea05fd7f30c1cea]
#    to [687f223e339a11ac0b0ff881a7d0763de7ae5aff]
# 
# patch "packages/meta/e-image.bb"
#  from [02171a991fbabb6b2af085dfe41e5098b673eba6]
#    to [569c30e7cf80998091e787bc618437a986154f1a]
# 
# patch "packages/meta/meta-gpe.bb"
#  from [ebcdd5f38a26f0849d209c2a4403024dcfa0b340]
#    to [dfa42e18e42e3bb1aa4ffc03492b7b04eb1a2393]
# 
# patch "packages/qemu/qemu-native_0.8.2.bb"
#  from [cca5f2b03e75beafd560bb5e0e39991f8fe5a0bf]
#    to [069a2ddb5eb4b5bee411d7656d0e30f36d793bb9]
# 
============================================================
--- packages/glibc/glibc-package.bbclass	e079db15c73e766a83f95a27b1d6de0ee2de044d
+++ packages/glibc/glibc-package.bbclass	f812dc7437b2dd9f5236f289cecbec1e730cf2bf
@@ -257,7 +257,7 @@ python package_do_split_gconvs () {
 		i18npath = os.path.join(treedir, datadir, "i18n")
 
 		localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, locale)
-		cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s/%s %s/bin/localedef %s" % (path, i18npath, qemu, bb.data.getVar("STAGING_DIR", d, 1), bb.data.getVar("TARGET_SYS", d, 1), treedir, localedef_opts)
+		cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)
 		bb.note("generating locale %s (%s)" % (locale, encoding))
 		if os.system(cmd):
 			raise bb.build.FuncFailed("localedef returned an error.")
============================================================
--- packages/gpsd/gpsd.inc	fde1deb1db26848d039aafe2f644678a001da2e9
+++ packages/gpsd/gpsd.inc	2df3a7734f5c620b78526bf29cbfd0cf5b8440f4
@@ -21,22 +21,12 @@ 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
         install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
 }
 
-do_compile_prepend() {
-    export BUILD_SYS=${BUILD_SYS}
-    export HOST_SYS=${HOST_SYS}
-}
-
 PACKAGES =+ "libgps"
 
 FILES_${PN} += "${sysconfdir}"
============================================================
--- packages/linux/linux-openzaurus-2.6.17/defconfig-akita	f7588ea33883d7d38ae1d9732b0a3036c3522dac
+++ packages/linux/linux-openzaurus-2.6.17/defconfig-akita	7f1c8b81f35bac9fa66bc78f176ec28db29e2054
@@ -1563,4 +1563,3 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
-CONFIG_SHARPSL_RC=m
============================================================
--- packages/linux/linux-openzaurus-2.6.17/defconfig-spitz	ac47ced57a244a2af4b0d2767e73570884c46f58
+++ packages/linux/linux-openzaurus-2.6.17/defconfig-spitz	9c7922b07085af60b28277d84ef143f1a24df1aa
@@ -1594,4 +1594,3 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_SHARPSL_RC=m
============================================================
--- packages/linux/linux-openzaurus_2.6.17.bb	9b38742988d31326ee4d210edea05fd7f30c1cea
+++ packages/linux/linux-openzaurus_2.6.17.bb	687f223e339a11ac0b0ff881a7d0763de7ae5aff
@@ -62,7 +62,6 @@ SRC_URI = "http://www.kernel.org/pub/lin
            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 \
-file://sharpsl-rc.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
============================================================
--- packages/meta/e-image.bb	02171a991fbabb6b2af085dfe41e5098b673eba6
+++ packages/meta/e-image.bb	569c30e7cf80998091e787bc618437a986154f1a
@@ -14,6 +14,7 @@ export IPKG_INSTALL += "task-e-x11-core 
                         gpe-soundserver \
                         gpe-confd \
                         xauth \
+                        e17-gpe-menu-convert \
                         pango-module-basic-fc \
                         gdk-pixbuf-loader-bmp \
                         gdk-pixbuf-loader-gif \
@@ -31,6 +32,6 @@ export IPKG_INSTALL += "task-e-x11-core 
 #                        gaim \
 #                        sylpheed \
 
-DEPENDS += "task-e-x11-core meta-gpe figment xhost gpe-soundserver gpe-confd xauth"
+DEPENDS += "task-e-x11-core meta-gpe e17-gpe-menu-convert figment xhost gpe-soundserver gpe-confd xauth"
 
 RDEPENDS = "${IPKG_INSTALL}"
============================================================
--- packages/meta/meta-gpe.bb	ebcdd5f38a26f0849d209c2a4403024dcfa0b340
+++ packages/meta/meta-gpe.bb	dfa42e18e42e3bb1aa4ffc03492b7b04eb1a2393
@@ -1,5 +1,4 @@ PACKAGES = "gpe-base-depends gpe-task-ba
 PACKAGES = "gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity"
-PROVIDES = "${PACKAGES}"
 DESCRIPTION = "Meta-package for GPE Palmtop Environment"
 MAINTAINER = "Phil Blundell <pb at handhelds.org>"
 PACKAGE_ARCH = "all"
============================================================
--- packages/qemu/qemu-native_0.8.2.bb	cca5f2b03e75beafd560bb5e0e39991f8fe5a0bf
+++ packages/qemu/qemu-native_0.8.2.bb	069a2ddb5eb4b5bee411d7656d0e30f36d793bb9
@@ -1,8 +1,7 @@ require qemu-gcc-check.inc
 require qemu_${PV}.bb
 require qemu-gcc-check.inc
 
-SRC_URI += "file://2.6.17-linux-libc-headers-fix.patch;patch=1 \
-  file://debug.patch;patch=1"
+SRC_URI += "file://2.6.17-linux-libc-headers-fix.patch;patch=1"
 
 inherit native