diff options
author | Rod Whitby <rod@whitby.id.au> | 2006-02-06 00:46:35 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 00:46:35 +0000 |
commit | 9b188ea2600bce6ed35559b21677bd8b7223f5a8 (patch) | |
tree | 40e9328ce853279c0eae8ecc851d514ef01c26d1 /packages/meta | |
parent | 76107d774ec7a96b7788d2f2b98b5621a04cfe71 (diff) | |
parent | 1be31761f3449cd4f92508fd2c2c41968039c918 (diff) |
merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
and 59438d13db19ded8e22646fb8cddf849804f3a90
Diffstat (limited to 'packages/meta')
-rw-r--r-- | packages/meta/e-image.bb | 20 | ||||
-rw-r--r-- | packages/meta/meta-e-x11-core.bb | 28 | ||||
-rw-r--r-- | packages/meta/meta-e-x11.bb | 17 | ||||
-rw-r--r-- | packages/meta/meta-e.bb | 15 | ||||
-rw-r--r-- | packages/meta/slugos-packages.bb | 2 | ||||
-rw-r--r-- | packages/meta/task-e-x11.bb | 26 | ||||
-rw-r--r-- | packages/meta/task-gpe.bb | 1 |
7 files changed, 59 insertions, 50 deletions
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index a523ff0243..fffcfb1be2 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,8 +1,22 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r3" +PR = "r4" include e-image-core.bb export IMAGE_BASENAME = "e-image" -export IPKG_INSTALL += "task-e-x11" -DEPENDS += "task-e-x11"
\ No newline at end of file +export IPKG_INSTALL += "task-e-x11-core \ + gpe-task-pim \ + gpe-task-settings \ + gpe-task-apps \ + gpe-task-connectivity \ + gpe-task-games \ + gpe-task-apps-extra \ + figment \ + xhost \ + gpe-soundserver \ + gpe-confd \ + xauth" + +DEPENDS += "task-e-x11-core task-gpe" + +RDEPENDS = "${IPKG_INSTALL}" diff --git a/packages/meta/meta-e-x11-core.bb b/packages/meta/meta-e-x11-core.bb index efd7430529..fdd3d195b2 100644 --- a/packages/meta/meta-e-x11-core.bb +++ b/packages/meta/meta-e-x11-core.bb @@ -1,22 +1,10 @@ -DESCRIPTION = "Meta-package for Enlightenment/X11 Core" -PACKAGES = "task-e-x11-core" -PROVIDES = "task-e-x11-core" -PR = "r6" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - -PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" - +DESCRIPTION = "Meta-package for Enlightenment/X11" +SECTION = "x11/base" ALLOW_EMPTY = 1 +PR = "r1" +PACKAGE_ARCH = "all" +LICENSE = "MIT" +BUILD_ALL_DEPS=1 -# -# X -# -RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ - ttf-bitstream-vera chkhinge" - -# -# E-core -# -RDEPENDS_task-e-x11-core += "entrance e-wm" +DEPENDS = "task-e-x11-core" +RDEPENDS = "task-e-x11-core" diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index 82a6055089..3f9459c7d4 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -1,13 +1,10 @@ DESCRIPTION = "Meta-package for Enlightenment/X11" -PACKAGES = "task-e-x11" -PROVIDES = "task-e-x11" -PR = "r6" - -FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ - e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - +SECTION = "x11/base" ALLOW_EMPTY = 1 +PR = "r1" +PACKAGE_ARCH = "all" +LICENSE = "MIT" +BUILD_ALL_DEPS=1 -RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules" -# e-utils elitaire - +DEPENDS = "task-e-x11" +RDEPENDS = "task-e-x11" diff --git a/packages/meta/meta-e.bb b/packages/meta/meta-e.bb deleted file mode 100644 index e933cc7415..0000000000 --- a/packages/meta/meta-e.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Meta-package for the Enlightenment Palmtop Environment (Codename: EpiCenter)" -PACKAGES = "e e-libs e-base" - -FEED_URIS += "e##http://openzaurus.org/official/unstable/3.5.2/feed/e" - -ALLOW_EMPTY = 1 - -task-e-libs = "evas edb ecore eet embryo edje etox ewl" -task-e-base = "" - -RDEPENDS_e-libs = "${task-e-libs}" - -RDEPENDS_e-base = "${task-e-base}" - -LICENSE = MIT diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 19fde31186..cb525ce2b2 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -162,7 +162,6 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ - groff \ icecast \ irssi \ pvrusb2-mci \ @@ -195,6 +194,7 @@ SLUGOS_PACKAGES_append_linux = "\ ctrlproxy \ dsniff \ iperf \ + groff \ man man-pages \ psmisc \ screen \ diff --git a/packages/meta/task-e-x11.bb b/packages/meta/task-e-x11.bb new file mode 100644 index 0000000000..00b233e81c --- /dev/null +++ b/packages/meta/task-e-x11.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Tasks for Enlightenment/X11" +PACKAGES = "task-e-x11-core task-e-x11" +PROVIDES = "task-e-x11-core task-e-x11" +PR = "r7" + +FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \ + e##http://openzaurus.org/official/unstable/3.5.2/feed/e" + +PREFERRED_PROVIDER_virtual/imlib2 = "imlib-x11" + +ALLOW_EMPTY = 1 + +# +# X +# +RDEPENDS_task-e-x11-core = "rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera chkhinge" + +# +# E-core +# +RDEPENDS_task-e-x11-core += "entrance e-wm" + + +#RDEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" +#DEPENDS_task-e-x11 = "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire" diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb index 49a456161c..7ee14f9733 100644 --- a/packages/meta/task-gpe.bb +++ b/packages/meta/task-gpe.bb @@ -12,7 +12,6 @@ PACKAGES = "\ gpe-task-games \ gpe-task-connectivity \ gpe-task-apps-extra \ - gpe-task-games \ gpe-task-web \ gpe-task-desktopapps \ gpe-task-sectest" |