merge of 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df

     and c579a3af7687e512137c2653f94a4b14ce3b4d4f

4 files changed, 117 insertions, 20 deletions

diff --git a/classes/gpe.bbclass b/classes/gpe.bbclass
index 88c2314fe7..8cd9e4fc5d 100644
--- a/classes/gpe.bbclass
+++ b/classes/gpe.bbclass
@@ -1,6 +1,6 @@
 DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native "
-GPE_SRC_COMPRESSION ?= "gz"
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_SRC_COMPRESSION}"
+GPE_TARBALL_SUFFIX ?= "gz"
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}"
 FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"
 
 inherit gettext
diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass
new file mode 100644
index 0000000000..ee022c99d2
--- /dev/null
+++ b/classes/sourcepkg.bbclass
@@ -0,0 +1,111 @@
+DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source"
+EXCLUDE_FROM ?= ".pc"
+
+# used as part of a path. make sure it's set
+DISTRO ?= "openembedded"
+
+def get_src_tree(d):
+	import bb
+	import os, os.path
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	if not workdir:
+		bb.error("WORKDIR not defined, unable to find source tree.")
+		return
+
+	s = bb.data.getVar('S', d, 0)
+	if not s:
+		bb.error("S not defined, unable to find source tree.")
+		return
+
+	s_tree_raw = s.split('/')[1]
+	s_tree = bb.data.expand(s_tree_raw, d)
+
+	src_tree_path = os.path.join(workdir, s_tree)
+	try:
+		os.listdir(src_tree_path)
+	except OSError:
+		bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
+	bb.debug("Assuming source tree is '%s'" % src_tree_path)
+
+	return s_tree
+
+sourcepkg_do_create_orig_tgz(){
+
+	mkdir -p ${DEPLOY_DIR_SRC}
+	cd ${WORKDIR}
+	for i in ${EXCLUDE_FROM}; do
+		echo $i >> temp/exclude-from-file
+	done
+
+	src_tree=${@get_src_tree(d)}
+	
+	echo $src_tree
+	oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
+	tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz  $src_tree --exclude-from temp/exclude-from-file
+	cp -a $src_tree $src_tree.orig
+}
+
+sourcepkg_do_archive_bb() {
+
+	src_tree=${@get_src_tree(d)}
+	dest=${WORKDIR}/$src_tree/${DISTRO}
+	mkdir -p $dest
+
+	cp ${FILE} $dest
+}
+
+python sourcepkg_do_dumpdata() {
+	import os
+	import os.path
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	distro = bb.data.getVar('DISTRO', d, 1)
+	s_tree = get_src_tree(d)
+	openembeddeddir = os.path.join(workdir, s_tree, distro)
+	dumpfile = os.path.join(openembeddeddir, bb.data.expand("${P}-${PR}.showdata.dump",d))
+	
+	try:
+		os.mkdir(openembeddeddir)
+	except OSError:
+		# dir exists
+		pass
+
+	bb.note("Dumping metadata into '%s'" % dumpfile)
+	f = open(dumpfile, "w")
+	# emit variables and shell functions
+        bb.data.emit_env(f, d, True)
+	# emit the metadata which isnt valid shell
+	for e in d.keys():
+		if bb.data.getVarFlag(e, 'python', d):
+			f.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+	f.close()
+}
+
+sourcepkg_do_create_diff_gz(){
+
+	cd ${WORKDIR}
+	for i in ${EXCLUDE_FROM}; do
+		echo $i >> temp/exclude-from-file
+	done
+
+
+	src_tree=${@get_src_tree(d)}
+
+	for i in `find . -maxdepth 1 -type f`; do
+		mkdir -p $src_tree/${DISTRO}/files
+		cp $i $src_tree/${DISTRO}/files
+	done
+	
+	oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz"
+	LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz
+	rm -rf $src_tree.orig
+}
+
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+
+addtask create_orig_tgz after do_unpack before do_patch
+addtask archive_bb after do_patch before do_dumpdata
+addtask dumpdata after archive_bb before do_create_diff_gz
+addtask create_diff_gz after do_dump_data before do_configure
+
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 168b7dec4e..290166bb03 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -42,16 +42,9 @@ def tinder_send_http(da, header, log):
     import httplib, urllib
     cont = "\n%s\n%s" % ( header, log)
     headers = {"Content-type": "multipart/form-data" }
-    print cont
 
     conn = httplib.HTTPConnection(data.getVar('TINDER_HOST',da, True))
     conn.request("POST", data.getVar('TINDER_URL',da,True), cont, headers)
-
-    resp = conn.getresponse()
-    print resp.status, resp.reason
-    data = resp.read()
-    print data
-
     conn.close() 
 
 
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index 10098da8ea..793348597f 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -4,13 +4,10 @@
 
 # Global class to make it easier to maintain XFCE packages
 
-HOMEPAGE="http://www.xfce.org"
-LICENSE="LGPL-2"
+HOMEPAGE = "http://www.xfce.org"
+LICENSE = "LGPL-2"
 
-SRC_URI="http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
-
-# Most, but not *all* packages use pkgconfig, so we can't include it here
-# too
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
 
 inherit autotools
 
@@ -18,9 +15,5 @@ EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
 
 # FIXME:  Put icons in their own package too?
 
-PACKAGES += "${PN}-mcs-plugins ${PN}-plugins"
-
 FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
-FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
-FILES_${PN}-doc += " ${datadir}/xfce4/doc"
-FILES_${PN}-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"
+FILES_${PN}-doc += "${datadir}/xfce4/doc"