* [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core
@ 2012-09-04 13:44 Martin Jansa
2012-09-04 13:44 ` [meta-oe][PATCH 2/2] packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path Martin Jansa
2012-09-04 15:35 ` [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
0 siblings, 2 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-04 13:44 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta-efl/recipes-core/meta/meta-toolchain-efl.bb | 2 +-
.../task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} | 4 ++--
.../packagegroup-efl-sdk.inc} | 0
.../packagegroup-efl-standalone-sdk-target.bb} | 4 ++--
.../packagegroup-x11-illume.bb} | 6 +++---
meta-oe/conf/layer.conf | 2 +-
.../task-basic.bb => packagegroups/packagegroup-basic.bb} | 6 +++---
.../{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} | 2 +-
.../packagegroup-cli-tools.bb} | 2 +-
.../packagegroup-x11-server_1.0.bb} | 4 ++--
.../task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} | 2 +-
.../packagegroup-sdk-target.bb} | 4 ++--
.../packagegroup-fonts-truetype.bb} | 10 +++++-----
.../packagegroup-qte-toolchain-target.bbappend} | 0
.../packagegroup-basic.bbappend} | 0
.../packagegroup-xfce-base.bb} | 2 +-
.../packagegroup-xfce-extended.bb} | 4 ++--
17 files changed, 27 insertions(+), 27 deletions(-)
rename meta-efl/recipes-efl/{tasks/task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} (84%)
rename meta-efl/recipes-efl/{tasks/task-efl-sdk.inc => packagegroups/packagegroup-efl-sdk.inc} (100%)
rename meta-efl/recipes-efl/{tasks/task-efl-standalone-sdk-target.bb => packagegroups/packagegroup-efl-standalone-sdk-target.bb} (81%)
rename meta-efl/recipes-efl/{tasks/task-x11-illume.bb => packagegroups/packagegroup-x11-illume.bb} (85%)
rename meta-oe/recipes-core/{tasks/task-basic.bb => packagegroups/packagegroup-basic.bb} (89%)
rename meta-oe/recipes-core/{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} (97%)
rename meta-oe/recipes-core/{tasks/task-cli-tools.bb => packagegroups/packagegroup-cli-tools.bb} (96%)
rename meta-oe/recipes-core/{tasks/task-x11-server_1.0.bb => packagegroups/packagegroup-x11-server_1.0.bb} (86%)
rename meta-oe/recipes-core/{tasks/task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} (95%)
rename meta-oe/recipes-devtools/{tasks/task-sdk-target.bb => packagegroups/packagegroup-sdk-target.bb} (91%)
rename meta-oe/recipes-graphics/{tasks/task-fonts-truetype.bb => packagegroups/packagegroup-fonts-truetype.bb} (72%)
rename meta-oe/recipes-qt/{tasks/task-qte-toolchain-target.bbappend => packagegroups/packagegroup-qte-toolchain-target.bbappend} (100%)
rename meta-systemd/meta-oe/recipes-core/{tasks/task-basic.bbappend => packagegroups/packagegroup-basic.bbappend} (100%)
rename meta-xfce/recipes-xfce/{tasks/task-xfce-base.bb => packagegroups/packagegroup-xfce-base.bb} (97%)
rename meta-xfce/recipes-xfce/{tasks/task-xfce-extended.bb => packagegroups/packagegroup-xfce-extended.bb} (95%)
diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
index 875d8f8..b7b7fca 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/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
similarity index 84%
rename from meta-efl/recipes-efl/tasks/task-efl-sdk.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index 5c1a13a..bfaf5d4 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
ALLOW_EMPTY = "1"
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
PACKAGES = "${PN}"
RDEPENDS_${PN} = "\
- task-core-sdk \
+ packagegroup-core-sdk \
${SDK-EFL} \
${SDK-EXTRAS}"
diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
similarity index 100%
rename from meta-efl/recipes-efl/tasks/task-efl-sdk.inc
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
similarity index 81%
rename from meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
index 95a66b9..21d1540 100644
--- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
ALLOW_EMPTY = "1"
-require task-efl-sdk.inc
+require packagegroup-efl-sdk.inc
PACKAGES = "${PN} ${PN}-dbg"
RDEPENDS_${PN} = "\
- task-core-standalone-sdk-target \
+ packagegroup-core-standalone-sdk-target \
${SDK-EFL} \
${SDK-EXTRAS}"
diff --git a/meta-efl/recipes-efl/tasks/task-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
similarity index 85%
rename from meta-efl/recipes-efl/tasks/task-x11-illume.bb
rename to meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
index 20cf2b8..30cb090 100644
--- a/meta-efl/recipes-efl/tasks/task-x11-illume.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
@@ -7,15 +7,15 @@ PR = "r2"
# WORK IN PROGRESS
-inherit task allarch
+inherit packagegroup allarch
# Default theme and config
ETHEME ?= "e-wm-theme-default"
ECONFIG ?= "e-wm-config-illume2"
RDEPENDS_${PN} = "\
- task-x11-server \
- task-x11-utils \
+ packagegroup-x11-server \
+ packagegroup-x11-utils \
\
e-wm \
${ECONFIG} \
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index dcacb32..8a529c8 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -26,7 +26,7 @@ BBFILE_PRIORITY_openembedded-layer = "6"
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
pointercal-xinput \
mplayer-common \
- task-x11-server \
+ packagegroup-x11-server \
fbset-modes \
gpsd-machine-conf \
"
diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
similarity index 89%
rename from meta-oe/recipes-core/tasks/task-basic.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 47b09de..e46afc2 100644
--- a/meta-oe/recipes-core/tasks/task-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -1,4 +1,4 @@
-# This recipe is intended as a 'simpler' replacement for task-base.
+# 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"
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r9"
-inherit task
+inherit packagegroup
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
@@ -24,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
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
+# 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.
diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
similarity index 97%
rename from meta-oe/recipes-core/tasks/task-boot.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index 6c27ffe..ac31118 100644
--- a/meta-oe/recipes-core/tasks/task-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r57"
-inherit task
+inherit packagegroup
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
similarity index 96%
rename from meta-oe/recipes-core/tasks/task-cli-tools.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index a849978..0ab3703 100644
--- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
PV = "1.0"
PR = "r19"
-inherit task allarch
+inherit packagegroup allarch
PACKAGES += "${PN}-debug"
diff --git a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
similarity index 86%
rename from meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
index 7e43d55..def5d43 100644
--- a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PR = "r9"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-xserver"
+RPROVIDES_${PN} += "packagegroup-xserver"
XSERVER ?= "xserver-xorg \
xf86-input-evdev \
diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
similarity index 95%
rename from meta-oe/recipes-core/tasks/task-x11_1.0.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
index 326e09f..93eab95 100644
--- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r11"
-inherit task allarch
+inherit packagegroup allarch
PACKAGES += "${PN}-utils"
diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
similarity index 91%
rename from meta-oe/recipes-devtools/tasks/task-sdk-target.bb
rename to meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 03141f2..3ad9b55 100644
--- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-inherit task allarch
+inherit packagegroup allarch
-RPROVIDES_${PN} = "task-native-sdk"
+RPROVIDES_${PN} = "packagegroup-native-sdk"
RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
binutils-symlinks \
perl-modules \
diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
similarity index 72%
rename from meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
rename to meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 112e8cb..816a67f 100644
--- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
PV = "1.0"
PR = "r1"
-inherit task allarch
+inherit packagegroup allarch
PACKAGES += "\
${PN}-core \
@@ -13,13 +13,13 @@ PACKAGES += "\
${PN}-japanese \
"
-RRECOMMENDS_task-fonts-truetype = "\
+RRECOMMENDS_packagegroup-fonts-truetype = "\
${PN}-core \
${PN}-chinese \
${PN}-japanese \
"
-RDEPENDS_task-fonts-truetype-core = "\
+RDEPENDS_packagegroup-fonts-truetype-core = "\
fontconfig-utils \
\
ttf-dejavu-common \
@@ -28,12 +28,12 @@ RDEPENDS_task-fonts-truetype-core = "\
"
# ttf-dejavu-serif \
-RDEPENDS_task-fonts-truetype-chinese = "\
+RDEPENDS_packagegroup-fonts-truetype-chinese = "\
${PN}-core \
ttf-arphic-uming \
"
-RDEPENDS_task-fonts-truetype-japanese = "\
+RDEPENDS_packagegroup-fonts-truetype-japanese = "\
${PN}-core \
ttf-sazanami-gothic \
ttf-sazanami-mincho \
diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
similarity index 100%
rename from meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
rename to meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
rename to meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
similarity index 97%
rename from meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index d9fcc30..7627576 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
PR = "r2"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
xfwm4 \
diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
similarity index 95%
rename from meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index 0c13a64..469a2b7 100644
--- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r3"
-inherit task
+inherit packagegroup
# mandatory
RDEPENDS_${PN} = " \
- task-xfce-base \
+ packagegroup-xfce-base \
"
# nice to have
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/2] packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path
2012-09-04 13:44 [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
@ 2012-09-04 13:44 ` Martin Jansa
2012-09-04 15:35 ` [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-04 13:44 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../packagegroups/packagegroup-efl-sdk.bb | 5 +++++
.../packagegroup-efl-standalone-sdk-target.bb | 5 +++++
.../packagegroups/packagegroup-x11-illume.bb | 5 ++++-
.../packagegroups/packagegroup-basic.bb | 5 ++++-
.../packagegroups/packagegroup-boot.bb | 6 +++++-
.../packagegroups/packagegroup-cli-tools.bb | 9 ++++++++-
.../packagegroups/packagegroup-x11-server_1.0.bb | 6 ++++--
.../packagegroups/packagegroup-x11_1.0.bb | 9 ++++++++-
.../packagegroups/packagegroup-sdk-target.bb | 6 +++++-
.../packagegroups/packagegroup-fonts-truetype.bb | 22 +++++++++++++++++-----
.../packagegroups/packagegroup-xfce-base.bb | 6 +++++-
.../packagegroups/packagegroup-xfce-extended.bb | 6 +++++-
12 files changed, 75 insertions(+), 15 deletions(-)
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index bfaf5d4..0906ef5 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
ALLOW_EMPTY = "1"
+PR = "r1"
+
require packagegroup-efl-sdk.inc
PACKAGES = "${PN}"
+RPROVIDES_${PN} += "task-efl-sdk"
+RREPLACES_${PN} += "task-efl-sdk"
+RCONFLICTS_${PN} += "task-efl-sdk"
RDEPENDS_${PN} = "\
packagegroup-core-sdk \
${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 21d1540..ea4b751 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
ALLOW_EMPTY = "1"
+PR = "r1"
+
require packagegroup-efl-sdk.inc
PACKAGES = "${PN} ${PN}-dbg"
+RPROVIDES_${PN} += "task-efl-standalone-sdk-target"
+RREPLACES_${PN} += "task-efl-standalone-sdk-target"
+RCONFLICTS_${PN} += "task-efl-standalone-sdk-target"
RDEPENDS_${PN} = "\
packagegroup-core-standalone-sdk-target \
${SDK-EFL} \
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
index 30cb090..d5cb48c 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
@@ -3,7 +3,7 @@ SECTION = "x11/wm"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-openembedded/meta-efl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r2"
+PR = "r3"
# WORK IN PROGRESS
@@ -13,6 +13,9 @@ inherit packagegroup allarch
ETHEME ?= "e-wm-theme-default"
ECONFIG ?= "e-wm-config-illume2"
+RPROVIDES_${PN} += "task-x11-illume"
+RREPLACES_${PN} += "task-x11-illume"
+RCONFLICTS_${PN} += "task-x11-illume"
RDEPENDS_${PN} = "\
packagegroup-x11-server \
packagegroup-x11-utils \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index e46afc2..493ef5e 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r9"
+PR = "r10"
inherit packagegroup
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
#
TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
+RPROVIDES_${PN} += "task-basic"
+RREPLACES_${PN} += "task-basic"
+RCONFLICTS_${PN} += "task-basic"
#
# 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.
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index ac31118..1d6ae9e 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r57"
+PR = "r58"
inherit packagegroup
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
# Make sure we build the kernel
DEPENDS = "virtual/kernel"
+RPROVIDES_${PN} += "task-boot"
+RREPLACES_${PN} += "task-boot"
+RCONFLICTS_${PN} += "task-boot"
+
#
# minimal set of packages - needed to boot
#
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index 0ab3703..07fb056 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r19"
+PR = "r20"
inherit packagegroup allarch
PACKAGES += "${PN}-debug"
+RPROVIDES_${PN} += "task-cli-tools"
+RPROVIDES_${PN}-debug += "task-cli-tools-debug"
+RREPLACES_${PN} += "task-cli-tools"
+RREPLACES_${PN}-debug += "task-cli-tools-debug"
+RCONFLICTS_${PN} += "task-cli-tools"
+RCONFLICTS_${PN}-debug += "task-cli-tools-debug"
+
RDEPENDS_${PN} = "\
dbus-daemon-proxy \
dosfstools \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
index def5d43..6ad755c 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
@@ -1,12 +1,14 @@
DESCRIPTION = "Task for an image with Xserver"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r9"
+PR = "r10"
inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "packagegroup-xserver"
+RPROVIDES_${PN} += "packagegroup-xserver task-x11-server task-xserver"
+RREPLACES_${PN} += "packagegroup-xserver task-x11-server task-xserver"
+RCONFLICTS_${PN} += "packagegroup-xserver task-x11-server task-xserver"
XSERVER ?= "xserver-xorg \
xf86-input-evdev \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
index 93eab95..50ae968 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
SECTION = "x11/server"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r11"
+PR = "r12"
inherit packagegroup allarch
@@ -19,6 +19,13 @@ VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
# elsa or xserver-nodm-init(-systemd)
VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+RPROVIDES_${PN} += "task-x11"
+RPROVIDES_${PN}-utils += "task-x11-utils"
+RREPLACES_${PN} += "task-x11"
+RREPLACES_${PN}-utils += "task-x11-utils"
+RCONFLICTS_${PN} += "task-x11"
+RCONFLICTS_${PN}-utils += "task-x11-utils"
+
RDEPENDS_${PN}-utils = "\
${VIRTUAL-RUNTIME_xserver_common} \
${VIRTUAL-RUNTIME_graphical_init_manager} \
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 3ad9b55..b9e5a29 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+PR = "r1"
+
inherit packagegroup allarch
-RPROVIDES_${PN} = "packagegroup-native-sdk"
+RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
+RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
+RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
binutils-symlinks \
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 816a67f..76126fc 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r1"
+PR = "r2"
inherit packagegroup allarch
@@ -12,14 +12,26 @@ PACKAGES += "\
${PN}-chinese \
${PN}-japanese \
"
+RPROVIDES_${PN} += "task-fonts-truetype"
+RPROVIDES_${PN}-core += "task-fonts-truetype-core"
+RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese"
+RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese"
+RREPLACES_${PN} += "task-fonts-truetype"
+RREPLACES_${PN}-core += "task-fonts-truetype-core"
+RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese"
+RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese"
+RCONFLICTS_${PN} += "task-fonts-truetype"
+RCONFLICTS_${PN}-core += "task-fonts-truetype-core"
+RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese"
+RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese"
-RRECOMMENDS_packagegroup-fonts-truetype = "\
+RRECOMMENDS_${PN} = "\
${PN}-core \
${PN}-chinese \
${PN}-japanese \
"
-RDEPENDS_packagegroup-fonts-truetype-core = "\
+RDEPENDS_${PN}-core = "\
fontconfig-utils \
\
ttf-dejavu-common \
@@ -28,12 +40,12 @@ RDEPENDS_packagegroup-fonts-truetype-core = "\
"
# ttf-dejavu-serif \
-RDEPENDS_packagegroup-fonts-truetype-chinese = "\
+RDEPENDS_${PN}-chinese = "\
${PN}-core \
ttf-arphic-uming \
"
-RDEPENDS_packagegroup-fonts-truetype-japanese = "\
+RDEPENDS_${PN}-japanese = "\
${PN}-core \
ttf-sazanami-gothic \
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 7627576..41e1d4a 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"
SECTION = "x11/wm"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r2"
+PR = "r3"
inherit packagegroup
+RPROVIDES_${PN} += "task-xfce-base"
+RREPLACES_${PN} += "task-xfce-base"
+RCONFLICTS_${PN} += "task-xfce-base"
+
RDEPENDS_${PN} = " \
xfwm4 \
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 469a2b7..ebe2dc7 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"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r3"
+PR = "r4"
inherit packagegroup
+RPROVIDES_${PN} += "task-xfce-extended"
+RREPLACES_${PN} += "task-xfce-extended"
+RCONFLICTS_${PN} += "task-xfce-extended"
+
# mandatory
RDEPENDS_${PN} = " \
packagegroup-xfce-base \
--
1.7.12
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core
2012-09-04 13:44 [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
2012-09-04 13:44 ` [meta-oe][PATCH 2/2] packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path Martin Jansa
@ 2012-09-04 15:35 ` Martin Jansa
2012-09-04 16:31 ` Martin Jansa
1 sibling, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2012-09-04 15:35 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 16386 bytes --]
On Tue, Sep 04, 2012 at 03:44:57PM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta-efl/recipes-core/meta/meta-toolchain-efl.bb | 2 +-
> .../task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} | 4 ++--
> .../packagegroup-efl-sdk.inc} | 0
> .../packagegroup-efl-standalone-sdk-target.bb} | 4 ++--
> .../packagegroup-x11-illume.bb} | 6 +++---
> meta-oe/conf/layer.conf | 2 +-
> .../task-basic.bb => packagegroups/packagegroup-basic.bb} | 6 +++---
> .../{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} | 2 +-
> .../packagegroup-cli-tools.bb} | 2 +-
> .../packagegroup-x11-server_1.0.bb} | 4 ++--
> .../task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} | 2 +-
Wait with this one (and the following one) so that maybe we'll be able
to use packagegroup-core-x11-* from oe-core
> .../packagegroup-sdk-target.bb} | 4 ++--
> .../packagegroup-fonts-truetype.bb} | 10 +++++-----
> .../packagegroup-qte-toolchain-target.bbappend} | 0
> .../packagegroup-basic.bbappend} | 0
> .../packagegroup-xfce-base.bb} | 2 +-
> .../packagegroup-xfce-extended.bb} | 4 ++--
> 17 files changed, 27 insertions(+), 27 deletions(-)
> rename meta-efl/recipes-efl/{tasks/task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} (84%)
> rename meta-efl/recipes-efl/{tasks/task-efl-sdk.inc => packagegroups/packagegroup-efl-sdk.inc} (100%)
> rename meta-efl/recipes-efl/{tasks/task-efl-standalone-sdk-target.bb => packagegroups/packagegroup-efl-standalone-sdk-target.bb} (81%)
> rename meta-efl/recipes-efl/{tasks/task-x11-illume.bb => packagegroups/packagegroup-x11-illume.bb} (85%)
> rename meta-oe/recipes-core/{tasks/task-basic.bb => packagegroups/packagegroup-basic.bb} (89%)
> rename meta-oe/recipes-core/{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} (97%)
> rename meta-oe/recipes-core/{tasks/task-cli-tools.bb => packagegroups/packagegroup-cli-tools.bb} (96%)
> rename meta-oe/recipes-core/{tasks/task-x11-server_1.0.bb => packagegroups/packagegroup-x11-server_1.0.bb} (86%)
> rename meta-oe/recipes-core/{tasks/task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} (95%)
> rename meta-oe/recipes-devtools/{tasks/task-sdk-target.bb => packagegroups/packagegroup-sdk-target.bb} (91%)
> rename meta-oe/recipes-graphics/{tasks/task-fonts-truetype.bb => packagegroups/packagegroup-fonts-truetype.bb} (72%)
> rename meta-oe/recipes-qt/{tasks/task-qte-toolchain-target.bbappend => packagegroups/packagegroup-qte-toolchain-target.bbappend} (100%)
> rename meta-systemd/meta-oe/recipes-core/{tasks/task-basic.bbappend => packagegroups/packagegroup-basic.bbappend} (100%)
> rename meta-xfce/recipes-xfce/{tasks/task-xfce-base.bb => packagegroups/packagegroup-xfce-base.bb} (97%)
> rename meta-xfce/recipes-xfce/{tasks/task-xfce-extended.bb => packagegroups/packagegroup-xfce-extended.bb} (95%)
>
> diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
> index 875d8f8..b7b7fca 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/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> similarity index 84%
> rename from meta-efl/recipes-efl/tasks/task-efl-sdk.bb
> rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> index 5c1a13a..bfaf5d4 100644
> --- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb
> +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
> ALLOW_EMPTY = "1"
>
> -require task-efl-sdk.inc
> +require packagegroup-efl-sdk.inc
>
> PACKAGES = "${PN}"
>
> RDEPENDS_${PN} = "\
> - task-core-sdk \
> + packagegroup-core-sdk \
> ${SDK-EFL} \
> ${SDK-EXTRAS}"
> diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
> similarity index 100%
> rename from meta-efl/recipes-efl/tasks/task-efl-sdk.inc
> rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
> diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> similarity index 81%
> rename from meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
> rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> index 95a66b9..21d1540 100644
> --- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
> +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
> ALLOW_EMPTY = "1"
>
> -require task-efl-sdk.inc
> +require packagegroup-efl-sdk.inc
>
> PACKAGES = "${PN} ${PN}-dbg"
>
> RDEPENDS_${PN} = "\
> - task-core-standalone-sdk-target \
> + packagegroup-core-standalone-sdk-target \
> ${SDK-EFL} \
> ${SDK-EXTRAS}"
> diff --git a/meta-efl/recipes-efl/tasks/task-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> similarity index 85%
> rename from meta-efl/recipes-efl/tasks/task-x11-illume.bb
> rename to meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> index 20cf2b8..30cb090 100644
> --- a/meta-efl/recipes-efl/tasks/task-x11-illume.bb
> +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> @@ -7,15 +7,15 @@ PR = "r2"
>
> # WORK IN PROGRESS
>
> -inherit task allarch
> +inherit packagegroup allarch
>
> # Default theme and config
> ETHEME ?= "e-wm-theme-default"
> ECONFIG ?= "e-wm-config-illume2"
>
> RDEPENDS_${PN} = "\
> - task-x11-server \
> - task-x11-utils \
> + packagegroup-x11-server \
> + packagegroup-x11-utils \
> \
> e-wm \
> ${ECONFIG} \
> diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> index dcacb32..8a529c8 100644
> --- a/meta-oe/conf/layer.conf
> +++ b/meta-oe/conf/layer.conf
> @@ -26,7 +26,7 @@ BBFILE_PRIORITY_openembedded-layer = "6"
> SIGGEN_EXCLUDERECIPES_ABISAFE += " \
> pointercal-xinput \
> mplayer-common \
> - task-x11-server \
> + packagegroup-x11-server \
> fbset-modes \
> gpsd-machine-conf \
> "
> diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> similarity index 89%
> rename from meta-oe/recipes-core/tasks/task-basic.bb
> rename to meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> index 47b09de..e46afc2 100644
> --- a/meta-oe/recipes-core/tasks/task-basic.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> @@ -1,4 +1,4 @@
> -# This recipe is intended as a 'simpler' replacement for task-base.
> +# 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"
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
> PR = "r9"
>
> -inherit task
> +inherit packagegroup
>
> # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
> #
> @@ -24,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
> 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
> +# 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.
> diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> similarity index 97%
> rename from meta-oe/recipes-core/tasks/task-boot.bb
> rename to meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> index 6c27ffe..ac31118 100644
> --- a/meta-oe/recipes-core/tasks/task-boot.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
> PR = "r57"
>
> -inherit task
> +inherit packagegroup
>
> # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
> #
> diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> similarity index 96%
> rename from meta-oe/recipes-core/tasks/task-cli-tools.bb
> rename to meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> index a849978..0ab3703 100644
> --- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
> PV = "1.0"
> PR = "r19"
>
> -inherit task allarch
> +inherit packagegroup allarch
>
> PACKAGES += "${PN}-debug"
>
> diff --git a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> similarity index 86%
> rename from meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
> rename to meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> index 7e43d55..def5d43 100644
> --- a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> @@ -3,10 +3,10 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> PR = "r9"
>
> -inherit task
> +inherit packagegroup
>
> # for backwards compatibility
> -RPROVIDES_${PN} += "task-xserver"
> +RPROVIDES_${PN} += "packagegroup-xserver"
>
> XSERVER ?= "xserver-xorg \
> xf86-input-evdev \
> diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> similarity index 95%
> rename from meta-oe/recipes-core/tasks/task-x11_1.0.bb
> rename to meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> index 326e09f..93eab95 100644
> --- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> @@ -4,7 +4,7 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> PR = "r11"
>
> -inherit task allarch
> +inherit packagegroup allarch
>
> PACKAGES += "${PN}-utils"
>
> diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> similarity index 91%
> rename from meta-oe/recipes-devtools/tasks/task-sdk-target.bb
> rename to meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> index 03141f2..3ad9b55 100644
> --- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb
> +++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> @@ -2,9 +2,9 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
>
> -inherit task allarch
> +inherit packagegroup allarch
>
> -RPROVIDES_${PN} = "task-native-sdk"
> +RPROVIDES_${PN} = "packagegroup-native-sdk"
> RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
> binutils-symlinks \
> perl-modules \
> diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> similarity index 72%
> rename from meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
> rename to meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> index 112e8cb..816a67f 100644
> --- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
> +++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
> PV = "1.0"
> PR = "r1"
>
> -inherit task allarch
> +inherit packagegroup allarch
>
> PACKAGES += "\
> ${PN}-core \
> @@ -13,13 +13,13 @@ PACKAGES += "\
> ${PN}-japanese \
> "
>
> -RRECOMMENDS_task-fonts-truetype = "\
> +RRECOMMENDS_packagegroup-fonts-truetype = "\
> ${PN}-core \
> ${PN}-chinese \
> ${PN}-japanese \
> "
>
> -RDEPENDS_task-fonts-truetype-core = "\
> +RDEPENDS_packagegroup-fonts-truetype-core = "\
> fontconfig-utils \
> \
> ttf-dejavu-common \
> @@ -28,12 +28,12 @@ RDEPENDS_task-fonts-truetype-core = "\
> "
> # ttf-dejavu-serif \
>
> -RDEPENDS_task-fonts-truetype-chinese = "\
> +RDEPENDS_packagegroup-fonts-truetype-chinese = "\
> ${PN}-core \
> ttf-arphic-uming \
> "
>
> -RDEPENDS_task-fonts-truetype-japanese = "\
> +RDEPENDS_packagegroup-fonts-truetype-japanese = "\
> ${PN}-core \
> ttf-sazanami-gothic \
> ttf-sazanami-mincho \
> diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
> similarity index 100%
> rename from meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
> rename to meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
> diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
> similarity index 100%
> rename from meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
> rename to meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
> diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> similarity index 97%
> rename from meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
> rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> index d9fcc30..7627576 100644
> --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> @@ -4,7 +4,7 @@ LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> PR = "r2"
>
> -inherit task
> +inherit packagegroup
>
> RDEPENDS_${PN} = " \
> xfwm4 \
> diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> similarity index 95%
> rename from meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
> rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> index 0c13a64..469a2b7 100644
> --- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
>
> PR = "r3"
>
> -inherit task
> +inherit packagegroup
>
> # mandatory
> RDEPENDS_${PN} = " \
> - task-xfce-base \
> + packagegroup-xfce-base \
> "
>
> # nice to have
> --
> 1.7.12
>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core
2012-09-04 15:35 ` [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
@ 2012-09-04 16:31 ` Martin Jansa
0 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2012-09-04 16:31 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 17517 bytes --]
On Tue, Sep 04, 2012 at 05:35:44PM +0200, Martin Jansa wrote:
> On Tue, Sep 04, 2012 at 03:44:57PM +0200, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta-efl/recipes-core/meta/meta-toolchain-efl.bb | 2 +-
> > .../task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} | 4 ++--
> > .../packagegroup-efl-sdk.inc} | 0
> > .../packagegroup-efl-standalone-sdk-target.bb} | 4 ++--
> > .../packagegroup-x11-illume.bb} | 6 +++---
> > meta-oe/conf/layer.conf | 2 +-
> > .../task-basic.bb => packagegroups/packagegroup-basic.bb} | 6 +++---
> > .../{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} | 2 +-
> > .../packagegroup-cli-tools.bb} | 2 +-
> > .../packagegroup-x11-server_1.0.bb} | 4 ++--
> > .../task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} | 2 +-
>
> Wait with this one (and the following one) so that maybe we'll be able
> to use packagegroup-core-x11-* from oe-core
There are 4 patches in contrib/jansa/packagegroup now,
task-x11-* changes separate from the rest, so if someone needs to parse
meta-oe today, then use first 2 patches.
Waiting for packagegroup-core-x11 changes in oe-core to drop task-x11
recipes and update task-x11-illume.
Cheers,
>
> > .../packagegroup-sdk-target.bb} | 4 ++--
> > .../packagegroup-fonts-truetype.bb} | 10 +++++-----
> > .../packagegroup-qte-toolchain-target.bbappend} | 0
> > .../packagegroup-basic.bbappend} | 0
> > .../packagegroup-xfce-base.bb} | 2 +-
> > .../packagegroup-xfce-extended.bb} | 4 ++--
> > 17 files changed, 27 insertions(+), 27 deletions(-)
> > rename meta-efl/recipes-efl/{tasks/task-efl-sdk.bb => packagegroups/packagegroup-efl-sdk.bb} (84%)
> > rename meta-efl/recipes-efl/{tasks/task-efl-sdk.inc => packagegroups/packagegroup-efl-sdk.inc} (100%)
> > rename meta-efl/recipes-efl/{tasks/task-efl-standalone-sdk-target.bb => packagegroups/packagegroup-efl-standalone-sdk-target.bb} (81%)
> > rename meta-efl/recipes-efl/{tasks/task-x11-illume.bb => packagegroups/packagegroup-x11-illume.bb} (85%)
> > rename meta-oe/recipes-core/{tasks/task-basic.bb => packagegroups/packagegroup-basic.bb} (89%)
> > rename meta-oe/recipes-core/{tasks/task-boot.bb => packagegroups/packagegroup-boot.bb} (97%)
> > rename meta-oe/recipes-core/{tasks/task-cli-tools.bb => packagegroups/packagegroup-cli-tools.bb} (96%)
> > rename meta-oe/recipes-core/{tasks/task-x11-server_1.0.bb => packagegroups/packagegroup-x11-server_1.0.bb} (86%)
> > rename meta-oe/recipes-core/{tasks/task-x11_1.0.bb => packagegroups/packagegroup-x11_1.0.bb} (95%)
> > rename meta-oe/recipes-devtools/{tasks/task-sdk-target.bb => packagegroups/packagegroup-sdk-target.bb} (91%)
> > rename meta-oe/recipes-graphics/{tasks/task-fonts-truetype.bb => packagegroups/packagegroup-fonts-truetype.bb} (72%)
> > rename meta-oe/recipes-qt/{tasks/task-qte-toolchain-target.bbappend => packagegroups/packagegroup-qte-toolchain-target.bbappend} (100%)
> > rename meta-systemd/meta-oe/recipes-core/{tasks/task-basic.bbappend => packagegroups/packagegroup-basic.bbappend} (100%)
> > rename meta-xfce/recipes-xfce/{tasks/task-xfce-base.bb => packagegroups/packagegroup-xfce-base.bb} (97%)
> > rename meta-xfce/recipes-xfce/{tasks/task-xfce-extended.bb => packagegroups/packagegroup-xfce-extended.bb} (95%)
> >
> > diff --git a/meta-efl/recipes-core/meta/meta-toolchain-efl.bb b/meta-efl/recipes-core/meta/meta-toolchain-efl.bb
> > index 875d8f8..b7b7fca 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/tasks/task-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> > similarity index 84%
> > rename from meta-efl/recipes-efl/tasks/task-efl-sdk.bb
> > rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> > index 5c1a13a..bfaf5d4 100644
> > --- a/meta-efl/recipes-efl/tasks/task-efl-sdk.bb
> > +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
> > @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
> >
> > ALLOW_EMPTY = "1"
> >
> > -require task-efl-sdk.inc
> > +require packagegroup-efl-sdk.inc
> >
> > PACKAGES = "${PN}"
> >
> > RDEPENDS_${PN} = "\
> > - task-core-sdk \
> > + packagegroup-core-sdk \
> > ${SDK-EFL} \
> > ${SDK-EXTRAS}"
> > diff --git a/meta-efl/recipes-efl/tasks/task-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
> > similarity index 100%
> > rename from meta-efl/recipes-efl/tasks/task-efl-sdk.inc
> > rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc
> > diff --git a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> > similarity index 81%
> > rename from meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
> > rename to meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> > index 95a66b9..21d1540 100644
> > --- a/meta-efl/recipes-efl/tasks/task-efl-standalone-sdk-target.bb
> > +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
> > @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
> >
> > ALLOW_EMPTY = "1"
> >
> > -require task-efl-sdk.inc
> > +require packagegroup-efl-sdk.inc
> >
> > PACKAGES = "${PN} ${PN}-dbg"
> >
> > RDEPENDS_${PN} = "\
> > - task-core-standalone-sdk-target \
> > + packagegroup-core-standalone-sdk-target \
> > ${SDK-EFL} \
> > ${SDK-EXTRAS}"
> > diff --git a/meta-efl/recipes-efl/tasks/task-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> > similarity index 85%
> > rename from meta-efl/recipes-efl/tasks/task-x11-illume.bb
> > rename to meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> > index 20cf2b8..30cb090 100644
> > --- a/meta-efl/recipes-efl/tasks/task-x11-illume.bb
> > +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
> > @@ -7,15 +7,15 @@ PR = "r2"
> >
> > # WORK IN PROGRESS
> >
> > -inherit task allarch
> > +inherit packagegroup allarch
> >
> > # Default theme and config
> > ETHEME ?= "e-wm-theme-default"
> > ECONFIG ?= "e-wm-config-illume2"
> >
> > RDEPENDS_${PN} = "\
> > - task-x11-server \
> > - task-x11-utils \
> > + packagegroup-x11-server \
> > + packagegroup-x11-utils \
> > \
> > e-wm \
> > ${ECONFIG} \
> > diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
> > index dcacb32..8a529c8 100644
> > --- a/meta-oe/conf/layer.conf
> > +++ b/meta-oe/conf/layer.conf
> > @@ -26,7 +26,7 @@ BBFILE_PRIORITY_openembedded-layer = "6"
> > SIGGEN_EXCLUDERECIPES_ABISAFE += " \
> > pointercal-xinput \
> > mplayer-common \
> > - task-x11-server \
> > + packagegroup-x11-server \
> > fbset-modes \
> > gpsd-machine-conf \
> > "
> > diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> > similarity index 89%
> > rename from meta-oe/recipes-core/tasks/task-basic.bb
> > rename to meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> > index 47b09de..e46afc2 100644
> > --- a/meta-oe/recipes-core/tasks/task-basic.bb
> > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
> > @@ -1,4 +1,4 @@
> > -# This recipe is intended as a 'simpler' replacement for task-base.
> > +# 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"
> > @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
> >
> > PR = "r9"
> >
> > -inherit task
> > +inherit packagegroup
> >
> > # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
> > #
> > @@ -24,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
> > 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
> > +# 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.
> > diff --git a/meta-oe/recipes-core/tasks/task-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> > similarity index 97%
> > rename from meta-oe/recipes-core/tasks/task-boot.bb
> > rename to meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> > index 6c27ffe..ac31118 100644
> > --- a/meta-oe/recipes-core/tasks/task-boot.bb
> > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
> > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
> >
> > PR = "r57"
> >
> > -inherit task
> > +inherit packagegroup
> >
> > # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
> > #
> > diff --git a/meta-oe/recipes-core/tasks/task-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> > similarity index 96%
> > rename from meta-oe/recipes-core/tasks/task-cli-tools.bb
> > rename to meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> > index a849978..0ab3703 100644
> > --- a/meta-oe/recipes-core/tasks/task-cli-tools.bb
> > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
> > @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
> > PV = "1.0"
> > PR = "r19"
> >
> > -inherit task allarch
> > +inherit packagegroup allarch
> >
> > PACKAGES += "${PN}-debug"
> >
> > diff --git a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> > similarity index 86%
> > rename from meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
> > rename to meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> > index 7e43d55..def5d43 100644
> > --- a/meta-oe/recipes-core/tasks/task-x11-server_1.0.bb
> > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11-server_1.0.bb
> > @@ -3,10 +3,10 @@ LICENSE = "MIT"
> > LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> > PR = "r9"
> >
> > -inherit task
> > +inherit packagegroup
> >
> > # for backwards compatibility
> > -RPROVIDES_${PN} += "task-xserver"
> > +RPROVIDES_${PN} += "packagegroup-xserver"
> >
> > XSERVER ?= "xserver-xorg \
> > xf86-input-evdev \
> > diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> > similarity index 95%
> > rename from meta-oe/recipes-core/tasks/task-x11_1.0.bb
> > rename to meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> > index 326e09f..93eab95 100644
> > --- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
> > +++ b/meta-oe/recipes-core/packagegroups/packagegroup-x11_1.0.bb
> > @@ -4,7 +4,7 @@ LICENSE = "MIT"
> > LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> > PR = "r11"
> >
> > -inherit task allarch
> > +inherit packagegroup allarch
> >
> > PACKAGES += "${PN}-utils"
> >
> > diff --git a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> > similarity index 91%
> > rename from meta-oe/recipes-devtools/tasks/task-sdk-target.bb
> > rename to meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> > index 03141f2..3ad9b55 100644
> > --- a/meta-oe/recipes-devtools/tasks/task-sdk-target.bb
> > +++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
> > @@ -2,9 +2,9 @@ DESCRIPTION = "Packages required for a target (on-device) SDK"
> > LICENSE = "MIT"
> > LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> >
> > -inherit task allarch
> > +inherit packagegroup allarch
> >
> > -RPROVIDES_${PN} = "task-native-sdk"
> > +RPROVIDES_${PN} = "packagegroup-native-sdk"
> > RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
> > binutils-symlinks \
> > perl-modules \
> > diff --git a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> > similarity index 72%
> > rename from meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
> > rename to meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> > index 112e8cb..816a67f 100644
> > --- a/meta-oe/recipes-graphics/tasks/task-fonts-truetype.bb
> > +++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
> > @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
> > PV = "1.0"
> > PR = "r1"
> >
> > -inherit task allarch
> > +inherit packagegroup allarch
> >
> > PACKAGES += "\
> > ${PN}-core \
> > @@ -13,13 +13,13 @@ PACKAGES += "\
> > ${PN}-japanese \
> > "
> >
> > -RRECOMMENDS_task-fonts-truetype = "\
> > +RRECOMMENDS_packagegroup-fonts-truetype = "\
> > ${PN}-core \
> > ${PN}-chinese \
> > ${PN}-japanese \
> > "
> >
> > -RDEPENDS_task-fonts-truetype-core = "\
> > +RDEPENDS_packagegroup-fonts-truetype-core = "\
> > fontconfig-utils \
> > \
> > ttf-dejavu-common \
> > @@ -28,12 +28,12 @@ RDEPENDS_task-fonts-truetype-core = "\
> > "
> > # ttf-dejavu-serif \
> >
> > -RDEPENDS_task-fonts-truetype-chinese = "\
> > +RDEPENDS_packagegroup-fonts-truetype-chinese = "\
> > ${PN}-core \
> > ttf-arphic-uming \
> > "
> >
> > -RDEPENDS_task-fonts-truetype-japanese = "\
> > +RDEPENDS_packagegroup-fonts-truetype-japanese = "\
> > ${PN}-core \
> > ttf-sazanami-gothic \
> > ttf-sazanami-mincho \
> > diff --git a/meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend b/meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
> > similarity index 100%
> > rename from meta-oe/recipes-qt/tasks/task-qte-toolchain-target.bbappend
> > rename to meta-oe/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bbappend
> > diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
> > similarity index 100%
> > rename from meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
> > rename to meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
> > diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> > similarity index 97%
> > rename from meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
> > rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> > index d9fcc30..7627576 100644
> > --- a/meta-xfce/recipes-xfce/tasks/task-xfce-base.bb
> > +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
> > @@ -4,7 +4,7 @@ LICENSE = "MIT"
> > LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
> > PR = "r2"
> >
> > -inherit task
> > +inherit packagegroup
> >
> > RDEPENDS_${PN} = " \
> > xfwm4 \
> > diff --git a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> > similarity index 95%
> > rename from meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
> > rename to meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> > index 0c13a64..469a2b7 100644
> > --- a/meta-xfce/recipes-xfce/tasks/task-xfce-extended.bb
> > +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> > @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
> >
> > PR = "r3"
> >
> > -inherit task
> > +inherit packagegroup
> >
> > # mandatory
> > RDEPENDS_${PN} = " \
> > - task-xfce-base \
> > + packagegroup-xfce-base \
> > "
> >
> > # nice to have
> > --
> > 1.7.12
> >
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-04 16:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04 13:44 [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
2012-09-04 13:44 ` [meta-oe][PATCH 2/2] packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path Martin Jansa
2012-09-04 15:35 ` [meta-oe][PATCH 1/2] task*: rename to packagegroup to match oe-core Martin Jansa
2012-09-04 16:31 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.