Move e core dependencies to task-enlightenment-x11-core

Add e-image-core to allow for a smaller image
  e-image should still work as expected, but I haven't tested it yet
  e-image-core currently doe snot work as you can't login to entrance (keyboard doesn't work). This is propably a missing RDEPENDS

diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb
new file mode 100644 (file)
index 0000000..c7a7630
--- /dev/null
+++ b/packages/meta/e-image-core.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager"
+LICENSE = "MIT"
+PR = "r0"
+
+export IMAGE_BASENAME = "e-image-core"
+export IMAGE_LINGUAS = ""
+
+DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+
+export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11-core xserver-kdrive-fbdev"
+
+inherit image_ipk

diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index d58215d..2183674 100644 (file)
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,18 +1,7 @@
 DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
-export IMAGE_BASENAME = "e-image"
-export IMAGE_LINGUAS = ""
-
-DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/evas = "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
-PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+include e-image-core.bb
 
-export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
-
-inherit image_ipk
+export IMAGE_BASENAME = "e-image"
+export IPKG_INSTALL += "task-enlightenment-x11"
\ No newline at end of file

diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 4ff955e..47bec68 100644 (file)
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta-package for Enlightenment/X11"
 LICENSE = "MIT"
-PACKAGES = "task-enlightenment-x11"
-PR = "r4"
+PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core"
+PR = "r5"
 
 FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
               e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,14 +11,20 @@ ALLOW_EMPTY = 1
 #
 # X
 #
-DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
-             ttf-bitstream-vera bash chkhinge"
-RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
-             ttf-bitstream-vera chkhinge"
+DEPENDS_task-enlightenment-x11-core  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+                                         ttf-bitstream-vera chkhinge"
+RDEPENDS_task-enlightenment-x11-core += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
+                                         ttf-bitstream-vera chkhinge"
+
+#
+# E-core
+#
+DEPENDS_task-enlightenment-x11-core  += "entrance e-wm"
+RDEPENDS_task-enlightenment-x11-core += "entrance e-wm"
 
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
-RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS_task-enlightenment-x11 +=  "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"