Meta: Recipe Reogranization

This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.

A number of recipes were modified since dependencies need to be
corrected.

Signed-off-by: Saul Wold <Saul.Wold@intel.com>

8 files changed, 8 insertions, 157 deletions

diff --git a/meta/recipes-extended/devicekit/devicekit-power_014.bb b/meta/recipes-extended/devicekit/devicekit-power_014.bb
deleted file mode 100644
index f69a060ef2..0000000000
--- a/meta/recipes-extended/devicekit/devicekit-power_014.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Devicekit power"
-LICENSE = "GPLv2"
-DEPENDS = "devicekit glib-2.0 dbus-glib polkit"
-
-SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz"
-S = "${WORKDIR}/DeviceKit-power-${PV}"
-
-inherit autotools pkgconfig
-
-do_configure_prepend() {
-	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
-}	
-
-EXTRA_OECONF = "--with-backend=linux"
-
-FILES_${PN} += "${datadir}/dbus-1/ \
-                ${datadir}/PolicyKit \
-                ${base_libdir}/udev/* \
-               "
-
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
diff --git a/meta/recipes-extended/devicekit/devicekit/volatile b/meta/recipes-extended/devicekit/devicekit/volatile
deleted file mode 100644
index 1e399642e0..0000000000
--- a/meta/recipes-extended/devicekit/devicekit/volatile
+++ /dev/null
@@ -1 +0,0 @@
-d root root 0700 /var/run/devkit none
diff --git a/meta/recipes-extended/devicekit/devicekit_003.bb b/meta/recipes-extended/devicekit/devicekit_003.bb
deleted file mode 100644
index af812935cd..0000000000
--- a/meta/recipes-extended/devicekit/devicekit_003.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "DeviceKit is a simple system service that a) can enumerate devices; b) emits signals when devices are added removed; c) provides a way to merge device information / quirks onto devices."
-LICENSE = "GPLv2"
-DEPENDS = "udev dbus-glib glib-2.0"
-
-PR = "r1"
-
-SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-${PV}.tar.gz"
-S = "${WORKDIR}/DeviceKit-${PV}"
-
-do_configure_prepend() {
-	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
-}	
-
-inherit autotools
-
-FILES_${PN} += "${datadir}/dbus-1/"
diff --git a/meta/recipes-extended/devicekit/devicekit_git.bb b/meta/recipes-extended/devicekit/devicekit_git.bb
deleted file mode 100644
index 9845a34d56..0000000000
--- a/meta/recipes-extended/devicekit/devicekit_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-LICENSE = "GPL"
-DEPENDS = "dbus-glib"
-
-SRC_URI = "git://anongit.freedesktop.org/DeviceKit/DeviceKit;protocol=git \
-        file://volatile"
-
-PV = "002+git${SRCREV}"
-PR = "r2"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = "--disable-man-pages"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/volatile ${D}/etc/default/volatiles/devicekit
-}
-
-pkg_postinst_devicekit () {
-	# can't do this offline
-	if [ "x$D" != "x" ]; then
-		exit 1
-	fi
-
-	DBUSPID=`pidof dbus-daemon`
-
-	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 reload
-	fi
-}
-
-FILES_${PN} += "${datadir}/dbus-1/"
diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index 5e2a35e787..08eddb6bb2 100644
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -75,6 +75,7 @@ RDEPENDS_task-poky-basic-utils = "\
     gmp \
     grep \
     makedevs \
+    mc \
     mktemp \
     ncurses \
     net-tools \
diff --git a/meta/recipes-extended/tasks/task-poky-lsb.bb b/meta/recipes-extended/tasks/task-poky-lsb.bb
index 3004ec2dae..82933e89f6 100644
--- a/meta/recipes-extended/tasks/task-poky-lsb.bb
+++ b/meta/recipes-extended/tasks/task-poky-lsb.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Create Small Image Tasks"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 PACKAGES = "\
@@ -43,6 +43,7 @@ RDEPENDS_task-poky-lsb = "\
 # GPLv2 Should List
 RDEPENDS_task-poky-sys-extended = "\
     curl \
+    dhcp-client \
     diffutils \
     gamin \
     hdparm \
@@ -50,6 +51,7 @@ RDEPENDS_task-poky-sys-extended = "\
     libxml2 \
     lrzsz \
     lzo \
+    mc \
     mdadm \
     minicom \
     neon \
@@ -62,6 +64,7 @@ RDEPENDS_task-poky-sys-extended = "\
     unzip \
     watchdog \
     which \
+    xinetd \
     zip \
     "
 
@@ -95,9 +98,11 @@ RDEPENDS_task-poky-tcl = "\
 RDEPENDS_task-poky-misc = "\
     elfutils \
     gettext \
+    groff \
     lsb \
     lsof \
-#    man-pages \
+    man \
+    man-pages \
     ncurses \
     strace \
     libusb1 \
diff --git a/meta/recipes-extended/zile/files/for_build.patch b/meta/recipes-extended/zile/files/for_build.patch
deleted file mode 100644
index 96380fa220..0000000000
--- a/meta/recipes-extended/zile/files/for_build.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: zile-2.0beta6/acinclude.m4
-===================================================================
---- zile-2.0beta6.orig/acinclude.m4	2004-12-20 19:13:07.000000000 -0500
-+++ zile-2.0beta6/acinclude.m4	2005-01-21 20:38:28.982166344 -0500
-@@ -35,3 +35,29 @@
- t}
- fi
- AC_SUBST(EXEEXT_FOR_BUILD)])dnl
-+
-+dnl Get a default for CFLAGS_FOR_BUILD to put into Makefile.
-+AC_DEFUN([BFD_CFLAGS_FOR_BUILD],
-+[ac_test_CFLAGS=${CFLAGS+set}
-+# Put a plausible default for CFLAGS_FOR_BUILD in Makefile.
-+if test -z "$CFLAGS_FOR_BUILD"; then
-+  if test "x$cross_compiling" = "xyes"; then
-+    CFLAGS_FOR_BUILD="-O2"
-+  else
-+    CFLAGS_FOR_BUILD='$(CFLAGS)'
-+  fi
-+fi
-+AC_SUBST(CFLAGS_FOR_BUILD)])dnl
-+
-+dnl Get a default for LDFLAGS_FOR_BUILD to put into Makefile.
-+AC_DEFUN([BFD_LDFLAGS_FOR_BUILD],
-+[ac_test_LDFLAGS=${LDFLAGS+set}
-+# Put a plausible default for LDFLAGS_FOR_BUILD in Makefile.
-+if test -z "$LDFLAGS_FOR_BUILD"; then
-+  if test "x$cross_compiling" = "xyes"; then
-+    LDFLAGS_FOR_BUILD=""
-+  else
-+    LDFLAGS_FOR_BUILD='$(LDFLAGS)'
-+  fi
-+fi
-+AC_SUBST(LDFLAGS_FOR_BUILD)])dnl
-Index: zile-2.0beta6/configure.ac
-===================================================================
---- zile-2.0beta6.orig/configure.ac	2005-01-12 07:56:19.000000000 -0500
-+++ zile-2.0beta6/configure.ac	2005-01-21 20:26:58.178184512 -0500
-@@ -19,6 +19,8 @@
- 
- AC_PROG_CC
- BFD_CC_FOR_BUILD
-+BFD_CFLAGS_FOR_BUILD
-+BFD_LDFLAGS_FOR_BUILD
- AC_C_INLINE
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-Index: zile-2.0beta6/doc/Makefile.am
-===================================================================
---- zile-2.0beta6.orig/doc/Makefile.am	2005-01-03 06:11:32.000000000 -0500
-+++ zile-2.0beta6/doc/Makefile.am	2005-01-21 20:27:17.271281920 -0500
-@@ -27,10 +27,10 @@
- AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/src
- 
- mkdoc$(EXEEXT_FOR_BUILD): mkdoc.o config.h
--	$(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ mkdoc.o
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mkdoc.o
- 
- mkdoc.o: mkdoc.c
--	$(CC_FOR_BUILD) -c -I$(top_srcdir)/doc -I$(top_srcdir) -I$(top_srcdir)/src $(CFLAGS) $(srcdir)/mkdoc.c
-+	$(CC_FOR_BUILD) -c -I$(top_srcdir)/doc -I$(top_srcdir) -I$(top_srcdir)/src $(CFLAGS_FOR_BUILD) $(srcdir)/mkdoc.c
- 
- AUTODOC: $(AUTODOCSRCS) mkdoc
- 	./mkdoc $(AUTODOCSRCS) >AUTODOC
diff --git a/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb b/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
deleted file mode 100644
index 74d832eef3..0000000000
--- a/meta/recipes-extended/zile/zile_1.7+2.0beta6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Zile is a very small emacs-like editor."
-HOMEPAGE = "http://zile.sourceforge.net/"
-LICENSE = "GPL"
-DEPENDS = "ncurses"
-PRIORITY = "optional"
-SECTION = "console/editors"
-PR = "r1"
-
-UV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/zile/zile-${UV}.tar.gz \
-	   file://for_build.patch;patch=1"
-S = "${WORKDIR}/zile-${UV}"
-
-inherit autotools
-
-export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -DHAVE_VASPRINTF"
-export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"