From 53608e94eb26eb27e306262c2e5ebf513728b49c Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 20 Aug 2005 10:45:36 +0000 Subject: Add Xsession entry for e-wm Add initscript setup to entrance Add chkhinge, e-modules, e-utils, and evidence to task-enlightenment-x11 --- packages/e17/e-wm/Xsession.d/.mtn2git_empty | 0 packages/e17/e-wm/Xsession.d/98enlightenment | 3 +++ packages/e17/e-wm_20050810.bb | 10 ++++++++-- packages/e17/entrance_20050810.bb | 5 ++++- packages/meta/e-image.bb | 18 ++++++++++++++++++ packages/meta/meta-e-x11.bb | 10 +++++----- packages/nonworking/meta/.mtn2git_empty | 0 packages/nonworking/meta/e-image.bb | 18 ------------------ 8 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 packages/e17/e-wm/Xsession.d/.mtn2git_empty create mode 100644 packages/e17/e-wm/Xsession.d/98enlightenment create mode 100644 packages/meta/e-image.bb delete mode 100644 packages/nonworking/meta/.mtn2git_empty delete mode 100644 packages/nonworking/meta/e-image.bb diff --git a/packages/e17/e-wm/Xsession.d/.mtn2git_empty b/packages/e17/e-wm/Xsession.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment new file mode 100644 index 0000000000..65f46284a9 --- /dev/null +++ b/packages/e17/e-wm/Xsession.d/98enlightenment @@ -0,0 +1,3 @@ +#!/bin/sh + +exec enlightenment \ No newline at end of file diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index 7929f1a807..ea93bfc3e2 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -4,9 +4,10 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin " CVSDATE = "${PV}" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ + file://Xsession.d/98enlightenment \ file://fix-configure.patch;patch=1 \ file://add-menu-autoscroll-options.patch;patch=1" S = "${WORKDIR}/e" @@ -24,4 +25,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR}" -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} \ No newline at end of file diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index cc316c568e..d032eeacf3 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -20,7 +20,10 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/ S = "${WORKDIR}/entrance" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "entrance" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ --with-xsession=/etc/X11/Xsession" diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb new file mode 100644 index 0000000000..d58215d3a7 --- /dev/null +++ b/packages/meta/e-image.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" +LICENSE = "MIT" +PR = "r1" + +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" + +export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev" + +inherit image_ipk diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index b4f3558e93..45e3d67384 100644 --- 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 = "r2" +PR = "r4" FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ e##http://openzaurus.org/official/unstable/3.5.2/feed/e" @@ -12,13 +12,13 @@ ALLOW_EMPTY = 1 # X # DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera bash" + ttf-bitstream-vera bash chkhinge" RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera" + ttf-bitstream-vera chkhinge" # # E # -DEPENDS += "entrance e-wm entice eclair examine " -RDEPENDS += "entrance e-wm entice eclair examine " +DEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils" +RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils" diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/meta/e-image.bb b/packages/nonworking/meta/e-image.bb deleted file mode 100644 index d58215d3a7..0000000000 --- a/packages/nonworking/meta/e-image.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -LICENSE = "MIT" -PR = "r1" - -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" - -export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev" - -inherit image_ipk -- cgit v1.2.3