tasks/packagegroups: Rename tasks dir to packagegroup

Matches OE-Cores terminology Use PN override in ALOW_EMPTY needed now in OE-Core blkid comes from util-linux now Update modules is gone fsck is moved from e2fsprogs-fsck to e2fsprogs Signed-off-by: Khem Raj <raj.khem@gmail.com>
kraj · Jun 17, 2013 · 83bacc4 · 83bacc4
1 parent eeb6a2d
commit 83bacc4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/recipes-core/tasks/task-slugos-extd.bb → ...es-core/packagegroups/task-slugos-extd.bb b/recipes-core/tasks/task-slugos-extd.bb → ...es-core/packagegroups/task-slugos-extd.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task packages for the SlugOS Extended image"
 PR = "r2"
 LICENSE = "MIT"
 
-inherit task
+inherit packagegroup
 
 RNG_TOOLS_PACKAGE = "rng-tools"
 RNG_TOOLS_PACKAGE_libc-uclibc = ""

diff --git a/...-core/tasks/task-slugos-toolchain-host.bb → ...ckagegroups/task-slugos-toolchain-host.bb b/...-core/tasks/task-slugos-toolchain-host.bb → ...ckagegroups/task-slugos-toolchain-host.bb
@@ -1,7 +1,7 @@
-require recipes-core/tasks/task-sdk-host-nativesdk.bb
+require recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
 PR = "r1"
 DESCRIPTION = "Packages for a standalone SlugOS external toolchain"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 
 PACKAGES = "${PN}"
 

diff --git a/...ore/tasks/task-slugos-toolchain-target.bb → ...agegroups/task-slugos-toolchain-target.bb b/...ore/tasks/task-slugos-toolchain-target.bb → ...agegroups/task-slugos-toolchain-target.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Packages for a standalone SDK or external toolchain"
 LICENSE = "MIT"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 
 PR = "r3.2"
 

diff --git a/recipes-core/tasks/task-slugos.bb → recipes-core/packagegroups/task-slugos.bb b/recipes-core/tasks/task-slugos.bb → recipes-core/packagegroups/task-slugos.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
 PR = "r30"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug|qemuarm)"
-ALLOW_EMPTY = "1"
+ALLOW_EMPTY_${PN} = "1"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
@@ -29,10 +29,10 @@ SLUGOS_MACHINE_RRECOMMENDS = ""
 # file system.
 SLUGOS_STANDARD_RRECOMMENDS += "\
 e2fsprogs-mke2fs \
-e2fsprogs-fsck \
+e2fsprogs \
 e2fsprogs-e2fsck \
 e2fsprogs-badblocks \
-e2fsprogs-blkid \
+util-linux-blkid \
 "
 
 # Filesystem selection.  Adding entries here adds the module to the
@@ -132,7 +132,7 @@ DISTRO_EXTRA_RDEPENDS ?= ""
 RDEPENDS_${PN} += "\
 	base-files base-passwd netbase \
         busybox initscripts slugos-init \
-        sysvinit update-modules \
+        sysvinit \
 	module-init-tools modutils-initscripts \
 	libgcc \
 	beep \