From 21a4be0e36bb1ee6c3c469c83a623c5d9a45257a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 4 Sep 2012 14:11:58 +0200 Subject: task*: rename to packagegroup to match oe-core Signed-off-by: Martin Jansa --- .../packagegroups/packagegroup-basic.bb | 58 ++++++++++++++++++++++ .../packagegroups/packagegroup-boot.bb | 37 ++++++++++++++ .../packagegroups/packagegroup-cli-tools.bb | 50 +++++++++++++++++++ meta-oe/recipes-core/tasks/task-basic.bb | 58 ---------------------- meta-oe/recipes-core/tasks/task-boot.bb | 37 -------------- meta-oe/recipes-core/tasks/task-cli-tools.bb | 50 ------------------- 6 files changed, 145 insertions(+), 145 deletions(-) create mode 100644 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb create mode 100644 meta-oe/recipes-core/packagegroups/packagegroup-boot.bb create mode 100644 meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb delete mode 100644 meta-oe/recipes-core/tasks/task-basic.bb delete mode 100644 meta-oe/recipes-core/tasks/task-boot.bb delete mode 100644 meta-oe/recipes-core/tasks/task-cli-tools.bb (limited to 'meta-oe/recipes-core') diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb new file mode 100644 index 0000000000..e46afc2788 --- /dev/null +++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb @@ -0,0 +1,58 @@ +# This recipe is intended as a 'simpler' replacement for packagegroup-base. +# Please communicate your use cases and suggestions to the mailinglist(s) + +DESCRIPTION = "Basic task to get a device online" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r9" + +inherit packagegroup + +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# Poke extra recomendations into the list using your machine.conf +# +MACHINE_EXTRA_RRECOMMENDS ?= "" + +# +# Select between dropbear and openssh +# Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) +# +TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" + +# +# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom +# when writing image recipes. +# It also avoids the choice between connman/networkmanager/ifupdown since that is an image feature, not a +# distro feature. +# +# Util-linux (u)mount is included because the busybox one can't handle /etc/mtab being symlinked to /proc/mounts +# +RDEPENDS_${PN} = "\ + ${TASK_BASIC_SSHDAEMON} \ + avahi-daemon avahi-utils \ + " + +# +# The following section is split in 3: +# 1) Machine features: kernel modules and userspace helpers for those +# 2) Distro features: packages associated with those +# 3) Nice to have: packages that are nice to have, but aren't strictly needed +# +RRECOMMENDS_${PN} = "\ + ${MACHINE_EXTRA_RRECOMMENDS} \ + ${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ + \ + ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ + \ + tzdata \ + \ + cpufrequtils \ + htop \ + " diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb new file mode 100644 index 0000000000..ac31118346 --- /dev/null +++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "Basic task to get a device booting" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r57" + +inherit packagegroup + +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# +# those ones can be set in machine config to supply packages needed to get machine booting +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +# Make sure we build the kernel +DEPENDS = "virtual/kernel" + +# +# minimal set of packages - needed to boot +# +RDEPENDS_${PN} = "\ + base-files \ + base-passwd \ + busybox \ + netbase \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + " + +RRECOMMENDS_${PN} = "\ + kernel \ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ + " diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb new file mode 100644 index 0000000000..0ab3703bd9 --- /dev/null +++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "A set of useful command line tools" +DESCRIPTION_${PN}-debug = "A set of command line tools useful for debugging" +SECTION = "console" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PV = "1.0" +PR = "r19" + +inherit packagegroup allarch + +PACKAGES += "${PN}-debug" + +RDEPENDS_${PN} = "\ + dbus-daemon-proxy \ + dosfstools \ + htop \ + iptables \ + lsof \ + mbuffer \ + mdbus2 \ + mtd-utils \ + mterm2 \ + nano \ + nfs-utils-client \ + nmon \ + powertop \ + screen \ + socat \ + sysstat \ +" + +RDEPENDS_${PN}-debug = "\ + evtest \ + devmem2 \ + i2c-tools \ + gdb \ + mkdump \ + mioctl \ + procps \ + pxaregs \ + s3c24xx-gpio \ + s3c64xx-gpio \ + serial-forward \ + strace \ + tcpdump \ +" + +RRECOMMENDS_${PN}-debug = "\ + ltrace \ +" diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb deleted file mode 100644 index 47b09de0e3..0000000000 --- a/meta-oe/recipes-core/tasks/task-basic.bb +++ /dev/null @@ -1,58 +0,0 @@ -# This recipe is intended as a 'simpler' replacement for task-base. -# Please communicate your use cases and suggestions to the mailinglist(s) - -DESCRIPTION = "Basic task to get a device online" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -PR = "r9" - -inherit task - -# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH -# -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# Poke extra recomendations into the list using your machine.conf -# -MACHINE_EXTRA_RRECOMMENDS ?= "" - -# -# Select between dropbear and openssh -# Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d) -# -TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" - -# -# The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom -# when writing image recipes. -# It also avoids the choice between connman/networkmanager/ifupdown since that is an image feature, not a -# distro feature. -# -# Util-linux (u)mount is included because the busybox one can't handle /etc/mtab being symlinked to /proc/mounts -# -RDEPENDS_${PN} = "\ - ${TASK_BASIC_SSHDAEMON} \ - avahi-daemon avahi-utils \ - " - -# -# The following section is split in 3: -# 1) Machine features: kernel modules and userspace helpers for those -# 2) Distro features: packages associated with those -# 3) Nice to have: packages that are nice to have, but aren't strictly needed -# -RRECOMMENDS_${PN} = "\ - ${MACHINE_EXTRA_RRECOMMENDS} \ - ${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ - \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ - \ - tzdata \ - \ - cpufrequtils \ - htop \ - " diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/tasks/task-boot.bb deleted file mode 100644 index 6c27ffe445..0000000000 --- a/meta-oe/recipes-core/tasks/task-boot.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Basic task to get a device booting" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -PR = "r57" - -inherit task - -# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH -# -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# -# those ones can be set in machine config to supply packages needed to get machine booting -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -# Make sure we build the kernel -DEPENDS = "virtual/kernel" - -# -# minimal set of packages - needed to boot -# -RDEPENDS_${PN} = "\ - base-files \ - base-passwd \ - busybox \ - netbase \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ - " - -RRECOMMENDS_${PN} = "\ - kernel \ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ - " diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/tasks/task-cli-tools.bb deleted file mode 100644 index a849978b44..0000000000 --- a/meta-oe/recipes-core/tasks/task-cli-tools.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "A set of useful command line tools" -DESCRIPTION_${PN}-debug = "A set of command line tools useful for debugging" -SECTION = "console" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PV = "1.0" -PR = "r19" - -inherit task allarch - -PACKAGES += "${PN}-debug" - -RDEPENDS_${PN} = "\ - dbus-daemon-proxy \ - dosfstools \ - htop \ - iptables \ - lsof \ - mbuffer \ - mdbus2 \ - mtd-utils \ - mterm2 \ - nano \ - nfs-utils-client \ - nmon \ - powertop \ - screen \ - socat \ - sysstat \ -" - -RDEPENDS_${PN}-debug = "\ - evtest \ - devmem2 \ - i2c-tools \ - gdb \ - mkdump \ - mioctl \ - procps \ - pxaregs \ - s3c24xx-gpio \ - s3c64xx-gpio \ - serial-forward \ - strace \ - tcpdump \ -" - -RRECOMMENDS_${PN}-debug = "\ - ltrace \ -" -- cgit 1.2.3-korg