diff options
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 | ||
6 | ALLOW_EMPTY = "1" | 6 | ALLOW_EMPTY = "1" |
7 | 7 | ||
8 | PR = "r1" | ||
9 | |||
8 | require packagegroup-efl-sdk.inc | 10 | require packagegroup-efl-sdk.inc |
9 | 11 | ||
10 | PACKAGES = "${PN}" | 12 | PACKAGES = "${PN}" |
11 | 13 | ||
14 | RPROVIDES_${PN} += "task-efl-sdk" | ||
15 | RREPLACES_${PN} += "task-efl-sdk" | ||
16 | RCONFLICTS_${PN} += "task-efl-sdk" | ||
12 | RDEPENDS_${PN} = "\ | 17 | RDEPENDS_${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 | ||
6 | ALLOW_EMPTY = "1" | 6 | ALLOW_EMPTY = "1" |
7 | 7 | ||
8 | PR = "r1" | ||
9 | |||
8 | require packagegroup-efl-sdk.inc | 10 | require packagegroup-efl-sdk.inc |
9 | 11 | ||
10 | PACKAGES = "${PN} ${PN}-dbg" | 12 | PACKAGES = "${PN} ${PN}-dbg" |
11 | 13 | ||
14 | RPROVIDES_${PN} += "task-efl-standalone-sdk-target" | ||
15 | RREPLACES_${PN} += "task-efl-standalone-sdk-target" | ||
16 | RCONFLICTS_${PN} += "task-efl-standalone-sdk-target" | ||
12 | RDEPENDS_${PN} = "\ | 17 | RDEPENDS_${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" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
7 | 7 | ||
8 | PR = "r9" | 8 | PR = "r10" |
9 | 9 | ||
10 | inherit packagegroup | 10 | inherit packagegroup |
11 | 11 | ||
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" | |||
23 | # | 23 | # |
24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" | 24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" |
25 | 25 | ||
26 | RPROVIDES_${PN} += "task-basic" | ||
27 | RREPLACES_${PN} += "task-basic" | ||
28 | RCONFLICTS_${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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
4 | 4 | ||
5 | PR = "r57" | 5 | PR = "r58" |
6 | 6 | ||
7 | inherit packagegroup | 7 | inherit 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 |
20 | DEPENDS = "virtual/kernel" | 20 | DEPENDS = "virtual/kernel" |
21 | 21 | ||
22 | RPROVIDES_${PN} += "task-boot" | ||
23 | RREPLACES_${PN} += "task-boot" | ||
24 | RCONFLICTS_${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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | PV = "1.0" | 6 | PV = "1.0" |
7 | PR = "r19" | 7 | PR = "r20" |
8 | 8 | ||
9 | inherit packagegroup allarch | 9 | inherit packagegroup allarch |
10 | 10 | ||
11 | PACKAGES += "${PN}-debug" | 11 | PACKAGES += "${PN}-debug" |
12 | 12 | ||
13 | RPROVIDES_${PN} += "task-cli-tools" | ||
14 | RPROVIDES_${PN}-debug += "task-cli-tools-debug" | ||
15 | RREPLACES_${PN} += "task-cli-tools" | ||
16 | RREPLACES_${PN}-debug += "task-cli-tools-debug" | ||
17 | RCONFLICTS_${PN} += "task-cli-tools" | ||
18 | RCONFLICTS_${PN}-debug += "task-cli-tools-debug" | ||
19 | |||
13 | RDEPENDS_${PN} = "\ | 20 | RDEPENDS_${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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
4 | 4 | ||
5 | PR = "r1" | ||
6 | |||
5 | inherit packagegroup allarch | 7 | inherit packagegroup allarch |
6 | 8 | ||
7 | RPROVIDES_${PN} = "packagegroup-native-sdk" | 9 | RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" |
10 | RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" | ||
11 | RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" | ||
8 | RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ | 12 | RDEPENDS_${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" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
5 | PV = "1.0" | 5 | PV = "1.0" |
6 | PR = "r1" | 6 | PR = "r2" |
7 | 7 | ||
8 | inherit packagegroup allarch | 8 | inherit packagegroup allarch |
9 | 9 | ||
@@ -12,14 +12,26 @@ PACKAGES += "\ | |||
12 | ${PN}-chinese \ | 12 | ${PN}-chinese \ |
13 | ${PN}-japanese \ | 13 | ${PN}-japanese \ |
14 | " | 14 | " |
15 | RPROVIDES_${PN} += "task-fonts-truetype" | ||
16 | RPROVIDES_${PN}-core += "task-fonts-truetype-core" | ||
17 | RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese" | ||
18 | RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese" | ||
19 | RREPLACES_${PN} += "task-fonts-truetype" | ||
20 | RREPLACES_${PN}-core += "task-fonts-truetype-core" | ||
21 | RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese" | ||
22 | RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese" | ||
23 | RCONFLICTS_${PN} += "task-fonts-truetype" | ||
24 | RCONFLICTS_${PN}-core += "task-fonts-truetype-core" | ||
25 | RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese" | ||
26 | RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese" | ||
15 | 27 | ||
16 | RRECOMMENDS_packagegroup-fonts-truetype = "\ | 28 | RRECOMMENDS_${PN} = "\ |
17 | ${PN}-core \ | 29 | ${PN}-core \ |
18 | ${PN}-chinese \ | 30 | ${PN}-chinese \ |
19 | ${PN}-japanese \ | 31 | ${PN}-japanese \ |
20 | " | 32 | " |
21 | 33 | ||
22 | RDEPENDS_packagegroup-fonts-truetype-core = "\ | 34 | RDEPENDS_${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 | ||
31 | RDEPENDS_packagegroup-fonts-truetype-chinese = "\ | 43 | RDEPENDS_${PN}-chinese = "\ |
32 | ${PN}-core \ | 44 | ${PN}-core \ |
33 | ttf-arphic-uming \ | 45 | ttf-arphic-uming \ |
34 | " | 46 | " |
35 | 47 | ||
36 | RDEPENDS_packagegroup-fonts-truetype-japanese = "\ | 48 | RDEPENDS_${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" | |||
2 | SECTION = "x11/wm" | 2 | SECTION = "x11/wm" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
5 | PR = "r2" | 5 | PR = "r3" |
6 | 6 | ||
7 | inherit packagegroup | 7 | inherit packagegroup |
8 | 8 | ||
9 | RPROVIDES_${PN} += "task-xfce-base" | ||
10 | RREPLACES_${PN} += "task-xfce-base" | ||
11 | RCONFLICTS_${PN} += "task-xfce-base" | ||
12 | |||
9 | RDEPENDS_${PN} = " \ | 13 | RDEPENDS_${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" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
5 | 5 | ||
6 | PR = "r3" | 6 | PR = "r4" |
7 | 7 | ||
8 | inherit packagegroup | 8 | inherit packagegroup |
9 | 9 | ||
10 | RPROVIDES_${PN} += "task-xfce-extended" | ||
11 | RREPLACES_${PN} += "task-xfce-extended" | ||
12 | RCONFLICTS_${PN} += "task-xfce-extended" | ||
13 | |||
10 | # mandatory | 14 | # mandatory |
11 | RDEPENDS_${PN} = " \ | 15 | RDEPENDS_${PN} = " \ |
12 | packagegroup-xfce-base \ | 16 | packagegroup-xfce-base \ |