summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb5
-rw-r--r--meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb5
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-basic.bb5
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-boot.bb6
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb9
-rw-r--r--meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb6
-rw-r--r--meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb22
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb6
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb6
9 files changed, 59 insertions, 11 deletions
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index bfaf5d4fd..0906ef567 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -5,10 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
5 5
6ALLOW_EMPTY = "1" 6ALLOW_EMPTY = "1"
7 7
8PR = "r1"
9
8require packagegroup-efl-sdk.inc 10require packagegroup-efl-sdk.inc
9 11
10PACKAGES = "${PN}" 12PACKAGES = "${PN}"
11 13
14RPROVIDES_${PN} += "task-efl-sdk"
15RREPLACES_${PN} += "task-efl-sdk"
16RCONFLICTS_${PN} += "task-efl-sdk"
12RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
13 packagegroup-core-sdk \ 18 packagegroup-core-sdk \
14 ${SDK-EFL} \ 19 ${SDK-EFL} \
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
index 21d154073..ea4b75168 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -5,10 +5,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
5 5
6ALLOW_EMPTY = "1" 6ALLOW_EMPTY = "1"
7 7
8PR = "r1"
9
8require packagegroup-efl-sdk.inc 10require packagegroup-efl-sdk.inc
9 11
10PACKAGES = "${PN} ${PN}-dbg" 12PACKAGES = "${PN} ${PN}-dbg"
11 13
14RPROVIDES_${PN} += "task-efl-standalone-sdk-target"
15RREPLACES_${PN} += "task-efl-standalone-sdk-target"
16RCONFLICTS_${PN} += "task-efl-standalone-sdk-target"
12RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
13 packagegroup-core-standalone-sdk-target \ 18 packagegroup-core-standalone-sdk-target \
14 ${SDK-EFL} \ 19 ${SDK-EFL} \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index e46afc278..493ef5e33 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
7 7
8PR = "r9" 8PR = "r10"
9 9
10inherit packagegroup 10inherit packagegroup
11 11
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
23# 23#
24TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" 24TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
25 25
26RPROVIDES_${PN} += "task-basic"
27RREPLACES_${PN} += "task-basic"
28RCONFLICTS_${PN} += "task-basic"
26# 29#
27# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom 30# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom
28# when writing image recipes. 31# when writing image recipes.
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index ac3111834..1d6ae9eda 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic task to get a device booting"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
4 4
5PR = "r57" 5PR = "r58"
6 6
7inherit packagegroup 7inherit packagegroup
8 8
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
19# Make sure we build the kernel 19# Make sure we build the kernel
20DEPENDS = "virtual/kernel" 20DEPENDS = "virtual/kernel"
21 21
22RPROVIDES_${PN} += "task-boot"
23RREPLACES_${PN} += "task-boot"
24RCONFLICTS_${PN} += "task-boot"
25
22# 26#
23# minimal set of packages - needed to boot 27# minimal set of packages - needed to boot
24# 28#
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index 0ab3703bd..07fb056f6 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -4,12 +4,19 @@ SECTION = "console"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6PV = "1.0" 6PV = "1.0"
7PR = "r19" 7PR = "r20"
8 8
9inherit packagegroup allarch 9inherit packagegroup allarch
10 10
11PACKAGES += "${PN}-debug" 11PACKAGES += "${PN}-debug"
12 12
13RPROVIDES_${PN} += "task-cli-tools"
14RPROVIDES_${PN}-debug += "task-cli-tools-debug"
15RREPLACES_${PN} += "task-cli-tools"
16RREPLACES_${PN}-debug += "task-cli-tools-debug"
17RCONFLICTS_${PN} += "task-cli-tools"
18RCONFLICTS_${PN}-debug += "task-cli-tools-debug"
19
13RDEPENDS_${PN} = "\ 20RDEPENDS_${PN} = "\
14 dbus-daemon-proxy \ 21 dbus-daemon-proxy \
15 dosfstools \ 22 dosfstools \
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 3ad9b5557..b9e5a296c 100644
--- a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
4 4
5PR = "r1"
6
5inherit packagegroup allarch 7inherit packagegroup allarch
6 8
7RPROVIDES_${PN} = "packagegroup-native-sdk" 9RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
10RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
11RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
8RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ 12RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
9 binutils-symlinks \ 13 binutils-symlinks \
10 perl-modules \ 14 perl-modules \
diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 816a67f59..76126fc81 100644
--- a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -3,7 +3,7 @@ SECTION = "fonts"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PV = "1.0" 5PV = "1.0"
6PR = "r1" 6PR = "r2"
7 7
8inherit packagegroup allarch 8inherit packagegroup allarch
9 9
@@ -12,14 +12,26 @@ PACKAGES += "\
12 ${PN}-chinese \ 12 ${PN}-chinese \
13 ${PN}-japanese \ 13 ${PN}-japanese \
14" 14"
15RPROVIDES_${PN} += "task-fonts-truetype"
16RPROVIDES_${PN}-core += "task-fonts-truetype-core"
17RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese"
18RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese"
19RREPLACES_${PN} += "task-fonts-truetype"
20RREPLACES_${PN}-core += "task-fonts-truetype-core"
21RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese"
22RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese"
23RCONFLICTS_${PN} += "task-fonts-truetype"
24RCONFLICTS_${PN}-core += "task-fonts-truetype-core"
25RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese"
26RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese"
15 27
16RRECOMMENDS_packagegroup-fonts-truetype = "\ 28RRECOMMENDS_${PN} = "\
17 ${PN}-core \ 29 ${PN}-core \
18 ${PN}-chinese \ 30 ${PN}-chinese \
19 ${PN}-japanese \ 31 ${PN}-japanese \
20" 32"
21 33
22RDEPENDS_packagegroup-fonts-truetype-core = "\ 34RDEPENDS_${PN}-core = "\
23 fontconfig-utils \ 35 fontconfig-utils \
24 \ 36 \
25 ttf-dejavu-common \ 37 ttf-dejavu-common \
@@ -28,12 +40,12 @@ RDEPENDS_packagegroup-fonts-truetype-core = "\
28" 40"
29# ttf-dejavu-serif \ 41# ttf-dejavu-serif \
30 42
31RDEPENDS_packagegroup-fonts-truetype-chinese = "\ 43RDEPENDS_${PN}-chinese = "\
32 ${PN}-core \ 44 ${PN}-core \
33 ttf-arphic-uming \ 45 ttf-arphic-uming \
34" 46"
35 47
36RDEPENDS_packagegroup-fonts-truetype-japanese = "\ 48RDEPENDS_${PN}-japanese = "\
37 ${PN}-core \ 49 ${PN}-core \
38 ttf-sazanami-gothic \ 50 ttf-sazanami-gothic \
39 ttf-sazanami-mincho \ 51 ttf-sazanami-mincho \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index 762757659..41e1d4a5a 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -2,10 +2,14 @@ DESCRIPTION = "All packages required for a base installation of XFCE"
2SECTION = "x11/wm" 2SECTION = "x11/wm"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5PR = "r2" 5PR = "r3"
6 6
7inherit packagegroup 7inherit packagegroup
8 8
9RPROVIDES_${PN} += "task-xfce-base"
10RREPLACES_${PN} += "task-xfce-base"
11RCONFLICTS_${PN} += "task-xfce-base"
12
9RDEPENDS_${PN} = " \ 13RDEPENDS_${PN} = " \
10 xfwm4 \ 14 xfwm4 \
11 xfwm4-theme-default \ 15 xfwm4-theme-default \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 469a2b7a5..ebe2dc7bb 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -3,10 +3,14 @@ SECTION = "x11/wm"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
5 5
6PR = "r3" 6PR = "r4"
7 7
8inherit packagegroup 8inherit packagegroup
9 9
10RPROVIDES_${PN} += "task-xfce-extended"
11RREPLACES_${PN} += "task-xfce-extended"
12RCONFLICTS_${PN} += "task-xfce-extended"
13
10# mandatory 14# mandatory
11RDEPENDS_${PN} = " \ 15RDEPENDS_${PN} = " \
12 packagegroup-xfce-base \ 16 packagegroup-xfce-base \