From 536e17549fab51e334cc24042b119709054ccb97 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Jan 2013 19:53:46 +0100 Subject: [PATCH] meta-digi-del: rename tasks to packagegroups For Yocto 1.3 'Danny' migration. Signed-off-by: Javier Viguera --- meta-digi-del/classes/del-image.bbclass | 10 +++++----- meta-digi-del/conf/distro/del.conf | 2 +- .../packagegroup-del-network.bb} | 14 ++++++-------- .../packagegroup-del-wireless.bb} | 14 ++++++-------- .../recipes-core/images/del-image-minimal-dev.bb | 2 +- .../recipes-core/images/del-image-minimal.bb | 2 +- .../packagegroup-del-core.bb} | 14 ++++++-------- .../packagegroup-del-debug.bb} | 16 +++++++--------- .../packagegroup-del-audio.bb} | 14 ++++++-------- .../packagegroup-del-gstreamer.bb} | 12 ++++++------ 10 files changed, 45 insertions(+), 55 deletions(-) rename meta-digi-del/recipes-connectivity/{tasks/task-del-network.bb => packagegroups/packagegroup-del-network.bb} (84%) rename meta-digi-del/recipes-connectivity/{tasks/task-del-wireless.bb => packagegroups/packagegroup-del-wireless.bb} (73%) rename meta-digi-del/recipes-core/{tasks/task-del-core.bb => packagegroups/packagegroup-del-core.bb} (88%) rename meta-digi-del/recipes-core/{tasks/task-del-debug.bb => packagegroups/packagegroup-del-debug.bb} (69%) rename meta-digi-del/recipes-multimedia/{tasks/task-del-audio.bb => packagegroups/packagegroup-del-audio.bb} (66%) rename meta-digi-del/recipes-multimedia/{tasks/task-del-gstreamer.bb => packagegroups/packagegroup-del-gstreamer.bb} (96%) diff --git a/meta-digi-del/classes/del-image.bbclass b/meta-digi-del/classes/del-image.bbclass index 39cb3285c..9c2869a49 100644 --- a/meta-digi-del/classes/del-image.bbclass +++ b/meta-digi-del/classes/del-image.bbclass @@ -2,11 +2,11 @@ # # Copyright (C) 2012 Digi International. -PACKAGE_GROUP_del-audio = "task-del-audio" -PACKAGE_GROUP_del-gstreamer = "task-del-gstreamer" -PACKAGE_GROUP_del-network = "task-del-network" -PACKAGE_GROUP_del-wireless = "task-del-wireless" -PACKAGE_GROUP_del-debug = "task-del-debug" +PACKAGE_GROUP_del-audio = "packagegroup-del-audio" +PACKAGE_GROUP_del-gstreamer = "packagegroup-del-gstreamer" +PACKAGE_GROUP_del-network = "packagegroup-del-network" +PACKAGE_GROUP_del-wireless = "packagegroup-del-wireless" +PACKAGE_GROUP_del-debug = "packagegroup-del-debug" ## DEL rootfs final tuning del_rootfs_tuning() { diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index a4008df2a..c69997d51 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -37,7 +37,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" EXTRAOPKGCONFIG = "poky-feed-config-opkg" # Override these in poky based distros to modify DISTRO_EXTRA_R* -POKY_DEFAULT_EXTRA_RDEPENDS = "task-del-core" +POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-del-core" POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" diff --git a/meta-digi-del/recipes-connectivity/tasks/task-del-network.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb similarity index 84% rename from meta-digi-del/recipes-connectivity/tasks/task-del-network.bb rename to meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb index 6ff8f7bc7..633cc3667 100644 --- a/meta-digi-del/recipes-connectivity/tasks/task-del-network.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Network applications task for DEL image" +DESCRIPTION = "Network applications packagegroup for DEL image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -29,12 +29,12 @@ VIRTUAL-RUNTIME_snmp-manager ?= "" #VIRTUAL-RUNTIME_snmp-manager ?= "net-snmp-server" PACKAGES = "\ - task-del-network \ - task-del-network-dbg \ - task-del-network-dev \ + packagegroup-del-network \ + packagegroup-del-network-dbg \ + packagegroup-del-network-dev \ " -RDEPENDS_task-del-network = "\ +RDEPENDS_${PN} = "\ bridge-utils \ ppp \ iproute2 \ @@ -44,7 +44,5 @@ RDEPENDS_task-del-network = "\ ${VIRTUAL-RUNTIME_snmp-manager} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-network = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - - diff --git a/meta-digi-del/recipes-connectivity/tasks/task-del-wireless.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb similarity index 73% rename from meta-digi-del/recipes-connectivity/tasks/task-del-wireless.bb rename to meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb index 9dd90d066..1b5d95dad 100644 --- a/meta-digi-del/recipes-connectivity/tasks/task-del-wireless.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-wireless.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Wireless task for DEL image" +DESCRIPTION = "Wireless packagegroup for DEL image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -15,19 +15,17 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" PACKAGES = "\ - task-del-wireless \ - task-del-wireless-dbg \ - task-del-wireless-dev \ + packagegroup-del-wireless \ + packagegroup-del-wireless-dbg \ + packagegroup-del-wireless-dev \ " -RDEPENDS_task-del-wireless = "\ +RDEPENDS_${PN} = "\ wpa-supplicant \ wireless-tools \ crda \ iw \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-wireless = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - - diff --git a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb index 750198a07..dea710c99 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal-dev.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "DEL busybox based image (non graphical) suitable for development work." -IMAGE_INSTALL = "task-del-core ${ROOTFS_PKGMANAGE} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_LINGUAS = " " diff --git a/meta-digi-del/recipes-core/images/del-image-minimal.bb b/meta-digi-del/recipes-core/images/del-image-minimal.bb index 29057462b..eb8463801 100644 --- a/meta-digi-del/recipes-core/images/del-image-minimal.bb +++ b/meta-digi-del/recipes-core/images/del-image-minimal.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "DEL busybox based image (non graphical)." -IMAGE_INSTALL = "task-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-del-core ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_LINGUAS = " " diff --git a/meta-digi-del/recipes-core/tasks/task-del-core.bb b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb similarity index 88% rename from meta-digi-del/recipes-core/tasks/task-del-core.bb rename to meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb index eceea4248..be597732c 100644 --- a/meta-digi-del/recipes-core/tasks/task-del-core.bb +++ b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-core.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Core task for DEL image" +DESCRIPTION = "Core packagegroup for DEL image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -24,12 +24,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" PACKAGES = "\ - task-del-core \ - task-del-core-dbg \ - task-del-core-dev \ + packagegroup-del-core \ + packagegroup-del-core-dbg \ + packagegroup-del-core-dev \ " -RDEPENDS_task-del-core = "\ +RDEPENDS_${PN} = "\ base-files \ base-passwd \ busybox \ @@ -47,7 +47,5 @@ RDEPENDS_task-del-core = "\ usbutils \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-core = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - - diff --git a/meta-digi-del/recipes-core/tasks/task-del-debug.bb b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb similarity index 69% rename from meta-digi-del/recipes-core/tasks/task-del-debug.bb rename to meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb index 354c6c132..dfb04f28a 100644 --- a/meta-digi-del/recipes-core/tasks/task-del-debug.bb +++ b/meta-digi-del/recipes-core/packagegroups/packagegroup-del-debug.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Debug applications task for DEL image" +DESCRIPTION = "Debug applications packagegroup for DEL image" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -15,18 +15,16 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" PACKAGES = "\ - task-del-debug \ - task-del-debug-dbg \ - task-del-debug-dev \ + packagegroup-del-debug \ + packagegroup-del-debug-dbg \ + packagegroup-del-debug-dev \ " -RDEPENDS_task-del-debug = "\ - task-core-tools-debug \ +RDEPENDS_${PN} = "\ + packagegroup-core-tools-debug \ memwatch \ fbtest \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-debug = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - - diff --git a/meta-digi-del/recipes-multimedia/tasks/task-del-audio.bb b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb similarity index 66% rename from meta-digi-del/recipes-multimedia/tasks/task-del-audio.bb rename to meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb index 2de683669..6ae1c83e9 100644 --- a/meta-digi-del/recipes-multimedia/tasks/task-del-audio.bb +++ b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-audio.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Audio task for DEL image" +DESCRIPTION = "Audio packagegroup for DEL image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -9,17 +9,15 @@ ALLOW_EMPTY = "1" PR = "r0" PACKAGES = "\ - task-del-audio \ - task-del-audio-dbg \ - task-del-audio-dev \ + packagegroup-del-audio \ + packagegroup-del-audio-dbg \ + packagegroup-del-audio-dev \ " -RDEPENDS_task-del-audio = "\ +RDEPENDS_${PN} = "\ alsa-lib \ alsa-utils \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-audio = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" - - diff --git a/meta-digi-del/recipes-multimedia/tasks/task-del-gstreamer.bb b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb similarity index 96% rename from meta-digi-del/recipes-multimedia/tasks/task-del-gstreamer.bb rename to meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb index 113dda857..673917343 100644 --- a/meta-digi-del/recipes-multimedia/tasks/task-del-gstreamer.bb +++ b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb @@ -1,7 +1,7 @@ # # Copyright (C) 2012 Digi International. # -DESCRIPTION = "Gstreamer framework task for DEL image" +DESCRIPTION = "Gstreamer framework packagegroup for DEL image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -9,9 +9,9 @@ ALLOW_EMPTY = "1" PR = "r0" PACKAGES = "\ - task-del-gstreamer \ - task-del-gstreamer-dbg \ - task-del-gstreamer-dev \ + packagegroup-del-gstreamer \ + packagegroup-del-gstreamer-dbg \ + packagegroup-del-gstreamer-dev \ " VIRTUAL_RUNTIME_gst-fsl-plugin = "\ @@ -199,7 +199,7 @@ VIRTUAL_RUNTIME_gst-plugins-ugly = "\ ${PACKAGE_gst-plugins-ugly-video} \ " -RDEPENDS_task-del-gstreamer = "\ +RDEPENDS_${PN} = "\ fsl-mm-codeclib \ fsl-mm-flv-codeclib \ fsl-mm-mp3enc-codeclib \ @@ -214,5 +214,5 @@ RDEPENDS_task-del-gstreamer = "\ gst-ffmpeg \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-del-gstreamer = "\ +RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"