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 --- meta-efl/recipes-core/meta/meta-toolchain-efl.bb | 2 +- .../packagegroups/packagegroup-efl-sdk.bb | 15 ++++++ .../packagegroups/packagegroup-efl-sdk.inc | 17 +++++++ .../packagegroup-efl-standalone-sdk-target.bb | 15 ++++++ meta-efl/recipes-efl/tasks/task-efl-sdk.bb | 15 ------ meta-efl/recipes-efl/tasks/task-efl-sdk.inc | 17 ------- .../tasks/task-efl-standalone-sdk-target.bb | 15 ------ .../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 ------------------- .../packagegroups/packagegroup-sdk-target.bb | 24 +++++++++ meta-oe/recipes-devtools/tasks/task-sdk-target.bb | 24 --------- .../packagegroups/packagegroup-fonts-truetype.bb | 40 +++++++++++++++ .../recipes-graphics/tasks/task-fonts-truetype.bb | 40 --------------- .../packagegroup-qte-toolchain-target.bbappend | 3 ++ .../tasks/task-qte-toolchain-target.bbappend | 3 -- .../packagegroups/packagegroup-basic.bbappend | 6 +++ .../meta-oe/recipes-core/tasks/task-basic.bbappend | 6 --- .../packagegroups/packagegroup-xfce-base.bb | 37 ++++++++++++++ .../packagegroups/packagegroup-xfce-extended.bb | 47 ++++++++++++++++++ meta-xfce/recipes-xfce/tasks/task-xfce-base.bb | 37 -------------- meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb | 47 ------------------ 25 files changed, 350 insertions(+), 350 deletions(-) create mode 100644 meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb create mode 100644 meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc create mode 100644 meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb delete mode 100644 meta-efl/recipes-efl/tasks/task-efl-sdk.bb delete mode 100644 meta-efl/recipes-efl/tasks/task-efl-sdk.inc delete mode 100644 meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb 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 create mode 100644 meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb delete mode 100644 meta-oe/recipes-devtools/tasks/task-sdk-target.bb create mode 100644 meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb delete mode 100644 meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb create mode 100644 meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend delete mode 100644 meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend create mode 100644 meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend delete mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend create mode 100644 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb create mode 100644 meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb delete mode 100644 meta-xfce/recipes-xfce/tasks/task-xfce-base.bb delete mode 100644 meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb index 875d8f8445..b7b7fca895 100644 --- a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb +++ b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb @@ -1,4 +1,4 @@ -TOOLCHAIN_TARGET_EFLTASK ?= "task-efl-standalone-sdk-target task-efl-standalone-sdk-target-dbg" +TOOLCHAIN_TARGET_EFLTASK ?= "packagegroup-efl-standalone-sdk-target packagegroup-efl-standalone-sdk-target-dbg" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_EFLTASK}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-efl-${DISTRO_VERSION}" require recipes-core/meta/meta-toolchain.bb diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb new file mode 100644 index 0000000000..bfaf5d4fd5 --- /dev/null +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Efl Software Development Kit" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +ALLOW_EMPTY = "1" + +require packagegroup-efl-sdk.inc + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + packagegroup-core-sdk \ + ${SDK-EFL} \ + ${SDK-EXTRAS}" diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc new file mode 100644 index 0000000000..8f012677ed --- /dev/null +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc @@ -0,0 +1,17 @@ +SDK-EFL = " \ + eina-dev \ + eet-dev \ + evas-dev \ + embryo-dev \ + ecore-dev \ + edbus-dev \ + lua5.1-dev \ + edje-dev \ + elementary-dev \ + " + +SDK-EXTRAS ?= "" +SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" +SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" +SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" +SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb new file mode 100644 index 0000000000..21d1540732 --- /dev/null +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Efl Software Development Kit" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +ALLOW_EMPTY = "1" + +require packagegroup-efl-sdk.inc + +PACKAGES = "${PN} ${PN}-dbg" + +RDEPENDS_${PN} = "\ + packagegroup-core-standalone-sdk-target \ + ${SDK-EFL} \ + ${SDK-EXTRAS}" diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/tasks/task-efl-sdk.bb deleted file mode 100644 index 5c1a13a66a..0000000000 --- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Efl Software Development Kit" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -ALLOW_EMPTY = "1" - -require task-efl-sdk.inc - -PACKAGES = "${PN}" - -RDEPENDS_${PN} = "\ - task-core-sdk \ - ${SDK-EFL} \ - ${SDK-EXTRAS}" diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/tasks/task-efl-sdk.inc deleted file mode 100644 index 8f012677ed..0000000000 --- a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc +++ /dev/null @@ -1,17 +0,0 @@ -SDK-EFL = " \ - eina-dev \ - eet-dev \ - evas-dev \ - embryo-dev \ - ecore-dev \ - edbus-dev \ - lua5.1-dev \ - edje-dev \ - elementary-dev \ - " - -SDK-EXTRAS ?= "" -SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" -SDK-EXTRAS_qemux86-64 ?= " lttng-ust-dev" -SDK-EXTRAS_qemuppc ?= " lttng-ust-dev" -SDK-EXTRAS_qemuarm ?= " lttng-ust-dev" diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb deleted file mode 100644 index 95a66b99f3..0000000000 --- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Efl Software Development Kit" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -ALLOW_EMPTY = "1" - -require task-efl-sdk.inc - -PACKAGES = "${PN} ${PN}-dbg" - -RDEPENDS_${PN} = "\ - task-core-standalone-sdk-target \ - ${SDK-EFL} \ - ${SDK-EXTRAS}" 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 \ -" diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb new file mode 100644 index 0000000000..3ad9b55577 --- /dev/null +++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Packages required for a target (on-device) SDK" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +inherit packagegroup allarch + +RPROVIDES_${PN} = "packagegroup-native-sdk" +RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ + binutils-symlinks \ + perl-modules \ + flex flex-dev \ + bison \ + gawk \ + sed \ + grep \ + autoconf automake \ + make \ + patch diffstat diffutils \ + libstdc++-dev \ + libtool libtool-dev libltdl-dev \ + pkgconfig" + +# usefull, but not in oe-core/meta-oe yet: patchutils +RRECOMMENDS_${PN} = " g77-symlinks gfortran-symlinks" diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/tasks/task-sdk-target.bb deleted file mode 100644 index 03141f2d1f..0000000000 --- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Packages required for a target (on-device) SDK" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -inherit task allarch - -RPROVIDES_${PN} = "task-native-sdk" -RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ - binutils-symlinks \ - perl-modules \ - flex flex-dev \ - bison \ - gawk \ - sed \ - grep \ - autoconf automake \ - make \ - patch diffstat diffutils \ - libstdc++-dev \ - libtool libtool-dev libltdl-dev \ - pkgconfig" - -# usefull, but not in oe-core/meta-oe yet: patchutils -RRECOMMENDS_${PN} = " g77-symlinks gfortran-symlinks" diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb new file mode 100644 index 0000000000..816a67f593 --- /dev/null +++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Install one of these tasks to get support for truetype fonts." +SECTION = "fonts" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PV = "1.0" +PR = "r1" + +inherit packagegroup allarch + +PACKAGES += "\ + ${PN}-core \ + ${PN}-chinese \ + ${PN}-japanese \ +" + +RRECOMMENDS_packagegroup-fonts-truetype = "\ + ${PN}-core \ + ${PN}-chinese \ + ${PN}-japanese \ +" + +RDEPENDS_packagegroup-fonts-truetype-core = "\ + fontconfig-utils \ + \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ +" +# ttf-dejavu-serif \ + +RDEPENDS_packagegroup-fonts-truetype-chinese = "\ + ${PN}-core \ + ttf-arphic-uming \ +" + +RDEPENDS_packagegroup-fonts-truetype-japanese = "\ + ${PN}-core \ + ttf-sazanami-gothic \ + ttf-sazanami-mincho \ +" diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb deleted file mode 100644 index 112e8cbc12..0000000000 --- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Install one of these tasks to get support for truetype fonts." -SECTION = "fonts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PV = "1.0" -PR = "r1" - -inherit task allarch - -PACKAGES += "\ - ${PN}-core \ - ${PN}-chinese \ - ${PN}-japanese \ -" - -RRECOMMENDS_task-fonts-truetype = "\ - ${PN}-core \ - ${PN}-chinese \ - ${PN}-japanese \ -" - -RDEPENDS_task-fonts-truetype-core = "\ - fontconfig-utils \ - \ - ttf-dejavu-common \ - ttf-dejavu-sans \ - ttf-dejavu-sans-mono \ -" -# ttf-dejavu-serif \ - -RDEPENDS_task-fonts-truetype-chinese = "\ - ${PN}-core \ - ttf-arphic-uming \ -" - -RDEPENDS_task-fonts-truetype-japanese = "\ - ${PN}-core \ - ttf-sazanami-gothic \ - ttf-sazanami-mincho \ -" diff --git a/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend new file mode 100644 index 0000000000..7ca6c592b6 --- /dev/null +++ b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend @@ -0,0 +1,3 @@ +RDEPENDS_${PN} += "qwt-e-dev" + +PRINC = "1" diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend deleted file mode 100644 index 7ca6c592b6..0000000000 --- a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -RDEPENDS_${PN} += "qwt-e-dev" - -PRINC = "1" diff --git a/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend new file mode 100644 index 0000000000..358c9cbe4a --- /dev/null +++ b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend @@ -0,0 +1,6 @@ +PRINC := "${@int(PRINC) + 1}" + +RDEPENDS_${PN} += "\ + systemd-compat-units \ + avahi-systemd \ +" diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend deleted file mode 100644 index 358c9cbe4a..0000000000 --- a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -PRINC := "${@int(PRINC) + 1}" - -RDEPENDS_${PN} += "\ - systemd-compat-units \ - avahi-systemd \ -" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb new file mode 100644 index 0000000000..7627576599 --- /dev/null +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "All packages required for a base installation of XFCE" +SECTION = "x11/wm" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PR = "r2" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + xfwm4 \ + xfwm4-theme-default \ + xfce4-session \ + xfconf \ + xfdesktop \ + xfce4-panel \ + \ + gtk-xfce-engine \ + \ + xfce-utils \ + xfce4-panel-plugin-actions \ + xfce4-panel-plugin-applicationsmenu \ + xfce4-panel-plugin-clock \ + xfce4-panel-plugin-directorymenu \ + xfce4-panel-plugin-launcher \ + xfce4-panel-plugin-pager \ + xfce4-panel-plugin-separator \ + xfce4-panel-plugin-showdesktop \ + xfce4-panel-plugin-systray \ + xfce4-panel-plugin-tasklist \ + xfce4-panel-plugin-windowmenu \ + xfce4-settings \ + \ + xfce4-notifyd \ + xfce-terminal \ + thunar \ + thunar-volman \ +" diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb new file mode 100644 index 0000000000..469a2b7a5a --- /dev/null +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "All packages for full XFCE installation" +SECTION = "x11/wm" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r3" + +inherit packagegroup + +# mandatory +RDEPENDS_${PN} = " \ + packagegroup-xfce-base \ +" + +# nice to have +RRECOMMENDS_${PN} = " \ + xfwm4-theme-daloa \ + xfwm4-theme-kokodi \ + xfwm4-theme-moheli \ + xfwm4-theme-sassandra \ + xfwm4-theme-stoneage \ + xfwm4-theme-therapy \ + xfwm4-theme-tyrex \ + xfwm4-theme-wallis \ + \ + xfce4-cpufreq-plugin \ + xfce4-cpugraph-plugin \ + xfce4-datetime-plugin \ + xfce4-eyes-plugin \ + xfce4-clipman-plugin \ + xfce4-diskperf-plugin \ + xfce4-netload-plugin \ + xfce4-genmon-plugin \ + xfce4-xkb-plugin \ + xfce4-wavelan-plugin \ + xfce4-places-plugin \ + xfce4-systemload-plugin \ + xfce4-time-out-plugin \ + xfce4-embed-plugin \ + xfce4-weather-plugin \ + \ + xfce4-appfinder \ + xfce4-screenshooter \ + xfce4-power-manager \ + xfce4-mixer \ + ristretto \ +" diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb deleted file mode 100644 index d9fcc30e0f..0000000000 --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "All packages required for a base installation of XFCE" -SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r2" - -inherit task - -RDEPENDS_${PN} = " \ - xfwm4 \ - xfwm4-theme-default \ - xfce4-session \ - xfconf \ - xfdesktop \ - xfce4-panel \ - \ - gtk-xfce-engine \ - \ - xfce-utils \ - xfce4-panel-plugin-actions \ - xfce4-panel-plugin-applicationsmenu \ - xfce4-panel-plugin-clock \ - xfce4-panel-plugin-directorymenu \ - xfce4-panel-plugin-launcher \ - xfce4-panel-plugin-pager \ - xfce4-panel-plugin-separator \ - xfce4-panel-plugin-showdesktop \ - xfce4-panel-plugin-systray \ - xfce4-panel-plugin-tasklist \ - xfce4-panel-plugin-windowmenu \ - xfce4-settings \ - \ - xfce4-notifyd \ - xfce-terminal \ - thunar \ - thunar-volman \ -" diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb deleted file mode 100644 index 0c13a64e88..0000000000 --- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "All packages for full XFCE installation" -SECTION = "x11/wm" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -PR = "r3" - -inherit task - -# mandatory -RDEPENDS_${PN} = " \ - task-xfce-base \ -" - -# nice to have -RRECOMMENDS_${PN} = " \ - xfwm4-theme-daloa \ - xfwm4-theme-kokodi \ - xfwm4-theme-moheli \ - xfwm4-theme-sassandra \ - xfwm4-theme-stoneage \ - xfwm4-theme-therapy \ - xfwm4-theme-tyrex \ - xfwm4-theme-wallis \ - \ - xfce4-cpufreq-plugin \ - xfce4-cpugraph-plugin \ - xfce4-datetime-plugin \ - xfce4-eyes-plugin \ - xfce4-clipman-plugin \ - xfce4-diskperf-plugin \ - xfce4-netload-plugin \ - xfce4-genmon-plugin \ - xfce4-xkb-plugin \ - xfce4-wavelan-plugin \ - xfce4-places-plugin \ - xfce4-systemload-plugin \ - xfce4-time-out-plugin \ - xfce4-embed-plugin \ - xfce4-weather-plugin \ - \ - xfce4-appfinder \ - xfce4-screenshooter \ - xfce4-power-manager \ - xfce4-mixer \ - ristretto \ -" -- cgit v1.2.3-54-g00ecf