tasks: updated tasks and images to reflect distro lsb requirments

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

6 files changed, 191 insertions, 270 deletions

diff --git a/meta-lsb/packages/images/poky-image-basic.bb b/meta-lsb/packages/images/poky-image-basic.bb
index 5dae327019..537a6e4122 100644
--- a/meta-lsb/packages/images/poky-image-basic.bb
+++ b/meta-lsb/packages/images/poky-image-basic.bb
@@ -2,22 +2,7 @@ IMAGE_FEATURES += "apps-console-core "
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-small \
-    task-poky-basic-libs \
-    task-poky-basic-libs-dbg \
-    task-poky-basic-libs-dev \
-    task-poky-basic-utils \
-    task-poky-basic-utils-dbg \
-    task-poky-basic-utils-dev \
-    task-poky-minimal-extras \
-    task-poky-minimal-extras-dbg \
-    task-poky-minimal-extras-dev \
-    task-poky-pkg-managment-opkg \
-    task-poky-pkg-managment-opkg-dbg \
-    task-poky-pkg-managment-opkg-dev \
-    task-poky-network-services \
-    task-poky-network-services-dbg \
-    task-poky-network-services-dev \
+    task-poky-basic \
     "
 
 inherit poky-image
diff --git a/meta-lsb/packages/images/poky-image-lsb.bb b/meta-lsb/packages/images/poky-image-lsb.bb
index af97894f80..8424d91bb4 100644
--- a/meta-lsb/packages/images/poky-image-lsb.bb
+++ b/meta-lsb/packages/images/poky-image-lsb.bb
@@ -2,12 +2,8 @@ IMAGE_FEATURES += "apps-console-core "
 
 IMAGE_INSTALL = "\
     ${POKY_BASE_INSTALL} \
-    task-poky-small-utils \
-    task-poky-basic-libs \
-    task-poky-basic-utils \
-    task-poky-extended-libs \
-    task-poky-extended-utils \
-    task-poky-network-services \
+    task-poky-basic \
+    task-poky-lsb \
     "
 
 inherit poky-image
diff --git a/meta-lsb/packages/images/poky-image-small.bb b/meta-lsb/packages/images/poky-image-small.bb
deleted file mode 100644
index 33248c3e5a..0000000000
--- a/meta-lsb/packages/images/poky-image-small.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAGE_FEATURES += "apps-console-core "
-
-IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
-    task-poky-small-utils"
-
-inherit poky-image
diff --git a/meta-lsb/packages/tasks/task-poky-basic.bb b/meta-lsb/packages/tasks/task-poky-basic.bb
index fa86096153..04039a3ae3 100644
--- a/meta-lsb/packages/tasks/task-poky-basic.bb
+++ b/meta-lsb/packages/tasks/task-poky-basic.bb
@@ -2,149 +2,157 @@
 # Copyright (C) 2010 Intel Corporation
 #
 
-DESCRIPTION = "Create Small Image Tasks"
-PR = "r0"
+DESCRIPTION = "Create Basic Image Tasks"
+PR = "r1"
 
 PACKAGES = "\
-    task-poky-small \
+    task-poky-basic \
+    task-poky-base-utils \
+    task-poky-base-utils-dbg \
+    task-poky-base-utils-dev \
     task-poky-basic-libs \
     task-poky-basic-libs-dbg \
     task-poky-basic-libs-dev \
     task-poky-basic-utils \
     task-poky-basic-utils-dbg \
     task-poky-basic-utils-dev \
-    task-poky-minimal-extras \
-    task-poky-minimal-extras-dbg \
-    task-poky-minimal-extras-dev \
-    task-poky-pkg-managment-opkg \
-    task-poky-pkg-managment-opkg-dbg \
-    task-poky-pkg-managment-opkg-dev \
-    task-poky-network-services \
-    task-poky-network-services-dbg \
-    task-poky-network-services-dev \
+    task-poky-basic-extended \
+    task-poky-basic-extended-dbg \
+    task-poky-basic-extended-dev \
+    task-poky-dev-utils \
+    task-poky-dev-utils-dbg \
+    task-poky-dev-utils-dev \
+    task-poky-multiuser \
+    task-poky-multiuser-dbg \
+    task-poky-multiuser-dev \
+    task-poky-initscripts \
+    task-poky-initscripts-dbg \
+    task-poky-initscripts-dev \
+    task-poky-rpm \
+    task-poky-rpm-dbg \
+    task-poky-rpm-dev \
+    task-poky-sys-services \
+    task-poky-sys-services-dbg \
+    task-poky-sys-services-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-minimal-extras = "\
-     makedevs \
-     ncurses \
-     zlib \
-     udev \
-     udev-extraconf \
-     expat \
-     "
-
-RDEPENDS_task-poky-pkg-managment-opkg = "\
-     curl \
-     gnutls \
-     gpgme \
-     libgcrypt \
-     libgpg-error \
-     lzo \
-     opkg-config-base \
-     opkg-collateral \
-     opkg \
-     pth \
-     "
-
-RDEPENDS_task-poky-network-services = "\
-#    iproute \
-#    iputils \
-#    iptables \
-    nfs-utils \
+RDEPENDS_task-poky-basic = "\
+    task-poky-base-utils \
+    task-poky-basic-libs \
+    task-poky-basic-utils \
+    task-poky-basic-extended \
+    task-poky-dev-utils \
+    task-poky-multiuser \
+    task-poky-initscripts \
+    task-poky-rpm \
+    task-poky-sys-services \
     "
 
-RDEPENDS_task-poky-shells = "\
-    bash \
-    mktemp \
-    
-
-RDEPENDS_task-poky-misc = "\
-    strace \
-    lsof \
-    elfutils \
-    usbutils \
-    zlib \
-    libusb \
-    libstdcxx \
-    bluez4 \
+RDEPENDS_task-poky-base-utils = "\
+    busybox \
+    dropbear \
     "
 
 RDEPENDS_task-poky-basic-libs = "\
-#    libssh2 \
-    dbus-glib \
-#    nfs-utils-lib \
+    glib-2.0 \
     "
 
 RDEPENDS_task-poky-basic-utils = "\
+    bash \
+#    acl \
+    attr \
+    bc \
+    coreutils \
+#    cpio \
+    e2fsprogs \
+    ed \
+    file \
+    findutils \
+#    gawk \
+    gmp \
+#    grep \
+    makedevs \
+#    mktemp \
+    ncurses \
+#    net-tools \
+#    pax \
+    popt \
+    procps \
+    psmisc \
+    sed \
+    tar \
+    time \
+    udev \
+    util-linux \
+    zlib \
+    "
+
+RDEPENDS_task-poky-basic-extended = "\
+#    iproute \
+#    iputils \
+    iptables \
+    module-init-tools \
 #    openssh \
     openssl \
-    pam \
+    "
+
+RDEPENDS_task-poky-dev-utils = "\
+    byacc \
+    diffutils \
+    m4 \
+    make \
+    patch \
+    binutils \
+    "
+
+RDEPENDS_task-poky-initscripts = "\
+    initscripts \
+    sysvinit \
+#    ethtool \
+#    mingetty \
+#    sysklogd \
+    "
+
+RDEPENDS_task-poky-multiuser = "\
+#    cracklib \
+    gzip \
+#    libuser \
+    libpam \
+#    passwd \
+    shadow \
     sudo \
+    "
+
+RDEPENDS_task-poky-rpm = "\
     beecrypt \
-    curl \
-    elfutils \
-    neon \
-#    mktemp \
     rpm \
+    "
+
+RDEPENDS_task-poky-sys-services = "\
+    at \
     bzip2 \
+#    cronie \
 #    crontabs \
     dbus \
+    dbus-glib \
     python-dbus \
-    e2fsprogs \
-    gdbm \
+    elfutils \
+    gzip \
     hal \
     less \
-    popt \
-    portmap \
-    readline \
-#    cron \
-#    yaffs2 \
-    "
-
-RDEPENDS_task-poky-extended-libs = "\
-#    cracklib \
-    glib-2.0 \
     libcap \
     libevent \
-    "
-
-RDEPENDS_task-poky-extended-utils = "\
-#    acl \
-    at \
-    attr \
-#    bc \
-    binutils \
-#    cpio \
-#    cracklib \
 #    logrotate \
-#    pax \
-#    shadow \
-    sqlite3 \
-#    syslog \
-#    ed \
-#    lsb \
-#    mailx \
-#    man \
-#    sendmail \
-    tar \
-    tcl \
-    "   
-
-RDEPENDS_task-poky-python = "\
-    gdbm \
-    perl \
-    zlib \
+    nfs-utils \
+    pciutils \
+    libpcre \
+#    perl-XML-Parser \
+    portmap \
+#    rpcbind \
+    sysfsutils \
+    tcp-wrappers \
+    tzdata \
     "
 
-RDEPENDS_task-poky-python = "\
-    expat \
-    gdbm \
-    gmp \
-    ncurses \
-    openssl \
-    python \
-    readline \
-    zlib \
-    "
diff --git a/meta-lsb/packages/tasks/task-poky-lsb.bb b/meta-lsb/packages/tasks/task-poky-lsb.bb
index 034a5ca4c4..61db75150b 100644
--- a/meta-lsb/packages/tasks/task-poky-lsb.bb
+++ b/meta-lsb/packages/tasks/task-poky-lsb.bb
@@ -3,118 +3,79 @@
 #
 
 DESCRIPTION = "Create Small Image Tasks"
-PR = "r0"
+PR = "r1"
 
 PACKAGES = "\
-    task-poky-small \
-    task-poky-basic-libs \
-    task-poky-basic-libs-dbg \
-    task-poky-basic-libs-dev \
-    task-poky-basic-utils \
-    task-poky-basic-utils-dbg \
-    task-poky-basic-utils-dev \
-    task-poky-extended-libs \
-    task-poky-extended-libs-dbg \
-    task-poky-extended-libs-dev \
-    task-poky-extended-utils \
-    task-poky-extended-utils-dbg \
-    task-poky-extended-utils-dev \
-    task-poky-network-services \
-    task-poky-network-services-dbg \
-    task-poky-network-services-dev \
+    task-poky-lsb \
+    task-poky-sys-extended \
+    task-poky-sys-extended-dbg \
+    task-poky-sys-extended-dev \
+    task-poky-db \
+    task-poky-db-dbg \
+    task-poky-db-dev \
+    task-poky-misc \
+    task-poky-misc-dbg \
+    task-poky-misc-dev \
+    task-poky-perl \
+    task-poky-perl-dbg \
+    task-poky-perl-dev \
+    task-poky-python \
+    task-poky-python-dbg \
+    task-poky-python-dev \
+    task-poky-tcl \
+    task-poky-tcl-dbg \
+    task-poky-tcl-dev \
     "
 
 ALLOW_EMPTY = "1"
 
-RDEPENDS_task-poky-network-services = "\
-#    iproute \
-#    iputils \
-#    iptables \
-    nfs-utils \
+RDEPENDS_task-poky-lsb = "\
+    task-poky-sys-extended \
+    task-poky-db \
+    task-poky-misc \
+    task-poky-perl \
+    task-poky-python \
+    task-poky-tcl \
     "
 
-RDEPENDS_task-poky-shells = "\
-    bash \
-    mktemp \
-    
-
-RDEPENDS_task-poky-misc = "\
-    strace \
-    lsof \
-    elfutils \
-    usbutils \
-    zlib \
-    libusb \
-    libstdcxx \
-    bluez4 \
-    "
-
-RDEPENDS_task-poky-basic-libs = "\
-#    libssh2 \
-    dbus-glib \
-#    nfs-utils-lib \
-    "
-
-RDEPENDS_task-poky-basic-utils = "\
-#    openssh \
-    openssl \
-    pam \
-    sudo \
-    beecrypt \
+#
+# GPLv2 Should List
+RDEPENDS_task-poky-sys-extended = "\
     curl \
-    elfutils \
+    diffutils \
+    gamin \
+    hdparm \
+#    libaio \
+    libxml2 \
+    lrzsz \
+    lzo \
+#    mdadm \
+    minicom \
     neon \
-#    mktemp \
-    rpm \
-    bzip2 \
-#    crontabs \
-    dbus \
-    python-dbus \
-    e2fsprogs \
-    gdbm \
-    hal \
-    less \
-    popt \
-    portmap \
-    readline \
-#    cron \
-#    yaffs2 \
+    parted \
+    pth \
+    quota \
+#    screen \
+    setserial \
+#    sysstat \
+    unzip \
+#    watchdog \
+    which \
+    zip \
     "
 
-RDEPENDS_task-poky-extended-libs = "\
-#    cracklib \
-    glib-2.0 \
-    libcap \
-    libevent \
-    "
-
-RDEPENDS_task-poky-extended-utils = "\
-#    acl \
-#    at \
-    attr \
-#    bc \
-    binutils \
-#    cpio \
-#    cracklib \
-#    logrotate \
-#    pax \
-#    shadow \
+RDEPENDS_task-poky-db = "\
+    db \
     sqlite3 \
-#    syslog \
-#    ed \
-#    lsb \
-#    mailx \
-#    man \
-#    sendmail \
-    tcl \
-    "   
+    "
 
-RDEPENDS_task-poky-python = "\
+RDEPENDS_task-poky-perl = "\
     gdbm \
     perl \
     zlib \
     "
 
+
 RDEPENDS_task-poky-python = "\
     expat \
     gdbm \
@@ -123,5 +84,21 @@ RDEPENDS_task-poky-python = "\
     openssl \
     python \
     readline \
+    zip \
+    "
+
+RDEPENDS_task-poky-tcl = "\
+    tcl \
+    "
+
+RDEPENDS_task-poky-misc = "\
+    elfutils \
+    gettext \
+    lsof \
+    ncurses \
+    strace \
+#    libstdcxx \
+    libusb1 \
+    usbutils \
     zlib \
     "
diff --git a/meta-lsb/packages/tasks/task-poky-small.bb b/meta-lsb/packages/tasks/task-poky-small.bb
deleted file mode 100644
index b966dc72cc..0000000000
--- a/meta-lsb/packages/tasks/task-poky-small.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2010 Intel Corporation
-#
-
-DESCRIPTION = "Create Small Image Tasks"
-PR = "r0"
-
-PACKAGES = "\
-    task-poky-small-utils \
-    task-poky-small-utils-dbg \
-    task-poky-small-utils-dev \
-    "
-
-ALLOW_EMPTY = "1"
-
-RDEPENDS_task-poky-small-utils = "\
-    bash \
-    coreutils \
-    file \
-    findutils \
-    ncurses \
-    psmisc \
-    sed \
-    time \
-    zlib \
-    udev \
-    udev-extraconf \
-#    gawk \
-#    grep \
-#    gzip \
-#    makedev \
-#    mktemp \
-#    net-tools \
-#    procps \
-#    passwd \
-#    tar \
-#    util-linux \
-    "