Package group fixes
cover Package group fixes
This patch on top of the changes submitted for OE-Core fixes up meta-yocto after the rename of task to packagegroup.
The following changes since commit 9789b60fb0668eb978de64f032a23048f780c78a:
packagegroup-*: add RPROVIDES for backwards compatibility (2012-09-03 11:27:23 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/task-rework
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/task-rework
Paul Eggleton (1):
meta-yocto: fix for task rename
meta-yocto/conf/distro/include/distro_alias.inc | 60 ++++++++++----------
meta-yocto/conf/distro/include/maintainers.inc | 36 ++++++------
meta-yocto/conf/distro/include/recipe_color.inc | 12 ++--
.../conf/distro/include/upstream_tracking.inc | 2 +-
meta-yocto/conf/distro/poky-tiny.conf | 6 +-
meta-yocto/conf/distro/poky.conf | 2 +-
.../packagegroup-core-tools-profile.bbappend | 2 +
.../tasks/task-core-tools-profile.bbappend | 2 -
.../packagegroup-core-sdk-gmae.bbappend} | 0
...group-core-standalone-gmae-sdk-target.bbappend} | 0
.../packagegroup-core-tools-profile.bbappend | 2 +
.../tasks/task-core-tools-profile.bbappend | 2 -
12 files changed, 63 insertions(+), 63 deletions(-)
create mode 100644 meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 meta-yocto/recipes-core/tasks/task-core-tools-profile.bbappend
rename meta-yocto/recipes-gnome/{tasks/task-core-sdk-gmae.bbappend => packagegroups/packagegroup-core-sdk-gmae.bbappend} (100%)
rename meta-yocto/recipes-gnome/{tasks/task-core-standalone-gmae-sdk-target.bbappend => packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend} (100%)
create mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/tasks/task-core-tools-profile.bbappendSignature · 1 line
1.7.9.5
PATCH 1/1 meta-yocto: fix for task rename
Signed-off-by Paul Eggleton <[email protected]>
---
meta-yocto/conf/distro/include/distro_alias.inc | 60 ++++++++++----------
meta-yocto/conf/distro/include/maintainers.inc | 36 ++++++------
meta-yocto/conf/distro/include/recipe_color.inc | 12 ++--
.../conf/distro/include/upstream_tracking.inc | 2 +-
meta-yocto/conf/distro/poky-tiny.conf | 6 +-
meta-yocto/conf/distro/poky.conf | 2 +-
.../packagegroup-core-tools-profile.bbappend | 2 +
.../tasks/task-core-tools-profile.bbappend | 2 -
.../packagegroup-core-sdk-gmae.bbappend} | 0
...group-core-standalone-gmae-sdk-target.bbappend} | 0
.../packagegroup-core-tools-profile.bbappend | 2 +
.../tasks/task-core-tools-profile.bbappend | 2 -
12 files changed, 63 insertions(+), 63 deletions(-)
create mode 100644 meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 meta-yocto/recipes-core/tasks/task-core-tools-profile.bbappend
rename meta-yocto/recipes-gnome/{tasks/task-core-sdk-gmae.bbappend => packagegroups/packagegroup-core-sdk-gmae.bbappend} (100%)
rename meta-yocto/recipes-gnome/{tasks/task-core-standalone-gmae-sdk-target.bbappend => packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend} (100%)
create mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/tasks/task-core-tools-profile.bbappendmeta-yocto/conf/distro/include/distro_alias.inc +30 -30
@@ -313,36 +313,36 @@ DISTRO_PN_ALIAS_pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap" DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core" DISTRO_PN_ALIAS_pn-table = "Intel" DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core" -DISTRO_PN_ALIAS_pn-task-base = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-boot = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-console = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-gtk-directfb = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-lsb = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-nfs = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-qt = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-sdk = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-ssh-dropbear = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-ssh-openssh = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-tools-debug = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-tools = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-tools-profile = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-tools-testapps = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-x11-mini = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-x11 = "OE-Core" -DISTRO_PN_ALIAS_pn-task-core-x11-sato = "OE-Core" -DISTRO_PN_ALIAS_pn-task-cross-canadian-i586 = "OE-Core" -DISTRO_PN_ALIAS_pn-task-qt4e = "OE-Core" -DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core" -DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "OE-Core" -DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel" -DISTRO_PN_ALIAS_pn-task-sdk-host = "OE-Core" -DISTRO_PN_ALIAS_pn-task-self-hosted = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-basic = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-console = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-gtk-directfb = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-sdk-gmae = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-standalone-gmae-sdk-target = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-standalone-sdk-target = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-tools-debug = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-tools = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-tools-profile = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-tools-testapps = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-x11-mini = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-x11 = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-core-x11-sato = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host-nativesdk = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host-natives = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel" +DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" +DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" DISTRO_PN_ALIAS_pn-tinylogin = "Debian=busybox Ubuntu=busybox Mandriva=busybox" DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd"
meta-yocto/conf/distro/include/maintainers.inc +18 -18
@@ -603,24 +603,24 @@ RECIPE_MAINTAINER_pn-systemtap-uprobes = "Tom Zanussi <[email protected]>" RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold <[email protected]>" RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <[email protected]>" RECIPE_MAINTAINER_pn-tar = "Scott Garman <[email protected]>" -RECIPE_MAINTAINER_pn-task-base = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-console = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-lsb = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-nfs = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-qt = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-sdk = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-sdk-gmae = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-standalone-gmae-sdk-target = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-standalone-sdk-target = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-tools-profile = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-tools-profile = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold <[email protected]>" -RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-base = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-basic = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-boot = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-clutter = "Ross Burton <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-console = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-qt = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-sdk-gmae = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-standalone-gmae-sdk-target = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-standalone-sdk-target = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-tools-profile = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-tools-profile = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-tools-testapps = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-x11 = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Saul Wold <[email protected]>" +RECIPE_MAINTAINER_pn-packagegroup-sdk-host = "Saul Wold <[email protected]>" RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <[email protected]>" RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <[email protected]>" RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan <[email protected]>"
meta-yocto/conf/distro/include/recipe_color.inc +6 -6
@@ -379,12 +379,12 @@ RECIPE_COLOR_pn-sysprof = "red" RECIPE_COLOR_pn-sysvinit = "yellow" RECIPE_COLOR_pn-table = "red" RECIPE_COLOR_pn-tar = "yellow" -RECIPE_COLOR_pn-task-base = "red" -RECIPE_COLOR_pn-task-core-sdk = "red" -RECIPE_COLOR_pn-task-core-sdk-gmae = "red" -RECIPE_COLOR_pn-task-core-standalone-gmae-sdk-target = "red" -RECIPE_COLOR_pn-task-core-standalone-sdk-target = "red" -RECIPE_COLOR_pn-task-sdk-host = "red" +RECIPE_COLOR_pn-packagegroup-base = "red" +RECIPE_COLOR_pn-packagegroup-core-sdk = "red" +RECIPE_COLOR_pn-packagegroup-core-sdk-gmae = "red" +RECIPE_COLOR_pn-packagegroup-core-standalone-gmae-sdk-target = "red" +RECIPE_COLOR_pn-packagegroup-core-standalone-sdk-target = "red" +RECIPE_COLOR_pn-packagegroup-sdk-host = "red" RECIPE_COLOR_pn-tcf-agent = "yellow" RECIPE_COLOR_pn-tcp-wrappers = "yellow" RECIPE_COLOR_pn-telepathy-farsight = "red"
meta-yocto/conf/distro/include/upstream_tracking.inc +1 -1
@@ -916,7 +916,7 @@ RECIPE_UPSTREAM_VERSION_pn-talloc = "2.0.5" RECIPE_UPSTREAM_VERSION_pn-tar = "1.26" RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011" CHECK_DATE_pn-tar = "Nov 14, 2011" -RECIPE_UPSTREAM_DATE_pn-task-base="n/a" +RECIPE_UPSTREAM_DATE_pn-packagegroup-base="n/a" RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011" RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11" RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011"
meta-yocto/conf/distro/poky-tiny.conf +3 -3
@@ -39,8 +39,8 @@ DISTRO = "poky-tiny" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" PREFERRED_VERSION_linux-yocto-tiny = "3.2%" -# We can use task-core-boot, but in the future we may need a new task-core-tiny -#POKY_DEFAULT_EXTRA_RDEPENDS += "task-core-boot" +# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny +#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" # Drop kernel-module-af-packet from RRECOMMENDS POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
@@ -99,7 +99,7 @@ VIRTUAL-RUNTIME_init_manager = "tiny-init" VIRTUAL-RUNTIME_keymaps = "" # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in -# task-core-base to select modutils-initscripts or not. Similar with "net" and +# packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and # netbase. # By default we only support ext2 and initramfs. We don't build live as that
meta-yocto/conf/distro/poky.conf +1 -1
@@ -25,7 +25,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" EXTRAOPKGCONFIG = "poky-feed-config-opkg" # Override these in poky based distros to modify DISTRO_EXTRA_R* -POKY_DEFAULT_EXTRA_RDEPENDS = "task-core-boot" +POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new file +2 -0
@@ -0,0 +1,2 @@ +RDEPENDS_${PN}_append_atom-pc = " lttng-ust systemtap" +
meta-yocto/recipes-core/tasks/task-core-tools-profile.bbappend deleted +0 -2
@@ -1,2 +0,0 @@ -RDEPENDS_task-core-tools-profile_append_atom-pc = " lttng-ust systemtap" -
meta-yocto/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend renamed from meta-yocto/recipes-gnome/tasks/task-core-sdk-gmae.bbappend +0 -0
meta-yocto/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend renamed from meta-yocto/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bbappend +0 -0
scripts/lib/bsp/substrate/target/arch/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new file +2 -0
@@ -0,0 +1,2 @@ +RRECOMMENDS_packagegroup-core-tools-profile_append_{{=machine}} = " systemtap" +
scripts/lib/bsp/substrate/target/arch/common/recipes-core/tasks/task-core-tools-profile.bbappend deleted +0 -2
@@ -1,2 +0,0 @@ -RRECOMMENDS_task-core-tools-profile_append_{{=machine}} = " systemtap" -
Signature · 1 line
1.7.9.5
Richard Purdie
AppliedRe: [meta-yocto][PATCH 1/1] meta-yocto: fix for task rename
Quoted 13 lines · Paul Eggleton
Signed-off-by Paul Eggleton <[email protected]>--- meta-yocto/conf/distro/include/distro_alias.inc | 60 ++++++++++---------- meta-yocto/conf/distro/include/maintainers.inc | 36 ++++++------ meta-yocto/conf/distro/include/recipe_color.inc | 12 ++-- .../conf/distro/include/upstream_tracking.inc | 2 +- meta-yocto/conf/distro/poky-tiny.conf | 6 +- meta-yocto/conf/distro/poky.conf | 2 +- .../packagegroup-core-tools-profile.bbappend | 2 + .../tasks/task-core-tools-profile.bbappend | 2 - .../packagegroup-core-sdk-gmae.bbappend} | 0 ...group-core-standalone-gmae-sdk-target.bbappend} | 0 .../packagegroup-core-tools-profile.bbappend | 2 +
Quoted 8 lines
.../tasks/task-core-tools-profile.bbappend | 2 -
12 files changed, 63 insertions(+), 63 deletions(-)
create mode 100644 meta-yocto/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 meta-yocto/recipes-core/tasks/task-core-tools-profile.bbappend
rename meta-yocto/recipes-gnome/{tasks/task-core-sdk-gmae.bbappend => packagegroups/packagegroup-core-sdk-gmae.bbappend} (100%)
rename meta-yocto/recipes-gnome/{tasks/task-core-standalone-gmae-sdk-target.bbappend => packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend} (100%)
create mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
delete mode 100644 scripts/lib/bsp/substrate/target/arch/common/recipes-core/tasks/task-core-tools-profile.bbappendMerged to master, thanks.
Richard