From 81a6fb6ad7b5d8e755acbf3443eaff6a90395c52 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 24 Mar 2008 15:48:20 +0000
Subject: e.bbclass merge with Mamona

---
 classes/e.bbclass | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'classes')

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 84d85f5542..3fb2355bc9 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,6 +1,7 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${PN}-${PV}.tar.gz"
+SRC_URI = "${E_CVS};module=e17/apps/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
 
 inherit autotools pkgconfig binconfig
 
@@ -9,27 +10,10 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
-export CURL_CONFIG		= "${STAGING_BINDIR_CROSS}/curl-config"
-export EDB_CONFIG		= "${STAGING_BINDIR_CROSS}/edb-config"
-export EET_CONFIG		= "${STAGING_BINDIR_CROSS}/eet-config"
-export EVAS_CONFIG		= "${STAGING_BINDIR_CROSS}/evas-config"
-export ECORE_CONFIG		= "${STAGING_BINDIR_CROSS}/ecore-config"
-export EMBRYO_CONFIG		= "${STAGING_BINDIR_CROSS}/embryo-config"
-export ENGRAVE_CONFIG		= "${STAGING_BINDIR_CROSS}/engrave-config"
-export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR_CROSS}/enlightenment-config"
-export EPSILON_CONFIG		= "${STAGING_BINDIR_CROSS}/epsilon-config"
-export EPEG_CONFIG		= "${STAGING_BINDIR_CROSS}/epeg-config"
-export ESMART_CONFIG		= "${STAGING_BINDIR_CROSS}/esmart-config"
-export FREETYPE_CONFIG		= "${STAGING_BINDIR_CROSS}/freetype-config"
-export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
-#do_compile_prepend() {
-#	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-#	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-#}
-
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
-FILES_${PN} += "${libdir}/lib*.so.*"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
 FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
-
-- 
cgit v1.2.3


From 5dda83dacf8bbd0afc9a5161caaed58c42420097 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Mar 2008 00:49:41 +0000
Subject: rootfs_ipk.bbclass: Emergency addition to fix image generation where
 ipkg is still the package manager included in the image.

---
 classes/rootfs_ipk.bbclass | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'classes')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index c8e068f739..6f74ac2b0a 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -60,6 +60,9 @@ fakeroot rootfs_ipk_do_rootfs () {
 
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 	
+	# Keep this line until package manager selection is implemented
+	ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+	
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
 	log_check rootfs 	
-- 
cgit v1.2.3


From 944b7d1e45e88431d81d9aede85d66b5d03dee39 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Mar 2008 04:00:02 +0000
Subject: rootfs_ipk.bbclass: symlink /usr/lib/opkg to /usr/lib/ipkg too

---
 classes/rootfs_ipk.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 6f74ac2b0a..02c5e691fc 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -60,8 +60,9 @@ fakeroot rootfs_ipk_do_rootfs () {
 
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 	
-	# Keep this line until package manager selection is implemented
+	# Keep these lines until package manager selection is implemented
 	ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+	ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg
 	
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
-- 
cgit v1.2.3