Package group fixes

PATCH Applied Paul Eggleton 2 participants 4 messages Sep 4, 2012

lore

Share & tools

lore

Paul Eggleton

author

2012-09-04 16:55 UTC #0 lore raw

cover Package group fixes

Fix a couple of things missed in the package group changes.

The following changes since commit 92f8605b81d373b66224b15355226f93ac5b3a46:

udev: Remove files moved to udev-extraconf (2012-09-04 15:41:01 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/packagegroup-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/packagegroup-fixes

Paul Eggleton (2):
packagegroup-core-standalone-gmae-sdk-target: allow dbg package packagegroup-*: add RREPLACES/RCONFLICTS

 .../packagegroups/packagegroup-core-boot.bb        |    4 +++-
 .../packagegroups/packagegroup-core-nfs.bb         |    4 +++-
 .../packagegroups/packagegroup-core-sdk.bb         |    4 +++-
 .../packagegroup-core-ssh-dropbear.bb              |    4 +++-
 .../packagegroups/packagegroup-core-ssh-openssh.bb |    4 +++-
 .../packagegroup-core-standalone-sdk-target.bb     |    6 +++++-
 .../packagegroups/packagegroup-core-tools-debug.bb |    4 +++-
 .../packagegroup-core-tools-profile.bb             |    4 ++++
 .../packagegroup-core-tools-testapps.bb            |    4 ++++
 .../packagegroup-core-device-devel.bb              |    3 +++
 .../packagegroups/packagegroup-core-sdk-gmae.bb    |    4 +++-
 ...packagegroup-core-standalone-gmae-sdk-target.bb |    6 +++---
 .../packagegroups/packagegroup-core-clutter.bb     |    4 +++-
 .../packagegroup-core-gtk-directfb.bb              |    4 +++-
 .../packagegroups/packagegroup-core-x11-base.bb    |    4 +++-
 .../packagegroups/packagegroup-core-qt.bb          |    4 +++-
 .../packagegroups/packagegroup-core-qt4e.bb        |    4 +++-
 .../packagegroups/packagegroup-core-x11-sato.bb    |    4 +++-
 18 files changed, 58 insertions(+), 17 deletions(-)

Signature · 1 line

1.7.9.5

Paul Eggleton

author

2012-09-04 16:55 UTC #1 lore raw

PATCH 1/2 packagegroup-core-standalone-gmae-sdk-target: allow dbg package

meta-toolchain-gmae is still referring to the dbg package so we still need to create this.

Signed-off-by Paul Eggleton <[email protected]>

---
 ...packagegroup-core-standalone-gmae-sdk-target.bb |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb +1 -3

index 69c5340..3f322a0 100644
@@ -4,14 +4,12 @@
 
 SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
 LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
 
 inherit packagegroup
 
 require packagegroup-sdk-gmae.inc
 
-PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
-
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"

Signature · 1 line

1.7.9.5

Paul Eggleton

author

2012-09-04 16:55 UTC #2 lore raw

PATCH 2/2 packagegroup-*: add RREPLACES/RCONFLICTS

In reply to Paul Eggleton

These are needed to support upgrading from task-* to packagegroup-* within existing target images at runtime.

Note: these settings will very likely be moved out to a separate inc file at some point in the future.

Signed-off-by Paul Eggleton <[email protected]>

---
 .../packagegroups/packagegroup-core-boot.bb        |    4 +++-
 .../packagegroups/packagegroup-core-nfs.bb         |    4 +++-
 .../packagegroups/packagegroup-core-sdk.bb         |    4 +++-
 .../packagegroup-core-ssh-dropbear.bb              |    4 +++-
 .../packagegroups/packagegroup-core-ssh-openssh.bb |    4 +++-
 .../packagegroup-core-standalone-sdk-target.bb     |    6 +++++-
 .../packagegroups/packagegroup-core-tools-debug.bb |    4 +++-
 .../packagegroup-core-tools-profile.bb             |    4 ++++
 .../packagegroup-core-tools-testapps.bb            |    4 ++++
 .../packagegroup-core-device-devel.bb              |    3 +++
 .../packagegroups/packagegroup-core-sdk-gmae.bb    |    4 +++-
 ...packagegroup-core-standalone-gmae-sdk-target.bb |    4 +++-
 .../packagegroups/packagegroup-core-clutter.bb     |    4 +++-
 .../packagegroup-core-gtk-directfb.bb              |    4 +++-
 .../packagegroups/packagegroup-core-x11-base.bb    |    4 +++-
 .../packagegroups/packagegroup-core-qt.bb          |    4 +++-
 .../packagegroups/packagegroup-core-qt4e.bb        |    4 +++-
 .../packagegroups/packagegroup-core-x11-sato.bb    |    4 +++-
 18 files changed, 58 insertions(+), 15 deletions(-)

meta/recipes-core/packagegroups/packagegroup-core-boot.bb +3 -1

index d29dc2b..16ad4e3 100644
@@ -6,7 +6,7 @@ SUMMARY = "Minimal boot requirements"
 DESCRIPTION = "The minimal set of packages required to boot the system"
 LICENSE = "MIT"
 DEPENDS = "virtual/kernel"
-PR = "r9"
+PR = "r10"
 
 inherit packagegroup

@@ -20,6 +20,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-boot"
+RREPLACES_${PN} = "task-core-boot"
+RCONFLICTS_${PN} = "task-core-boot"
 
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_dev_manager ?= "udev"

meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +3 -1

index 03f9c12..531eceb 100644
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "NFS package groups"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 inherit packagegroup

@@ -12,6 +12,8 @@ PACKAGES = "${PN}-server"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-server = "task-core-nfs-server"
+RREPLACES_${PN}-server = "task-core-nfs-server"
+RCONFLICTS_${PN}-server = "task-core-nfs-server"
 
 SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\

meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +3 -1

index f05e099..b00bf07 100644
@@ -4,7 +4,7 @@
 
 SUMMARY = "Software development tools"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 inherit packagegroup

@@ -12,6 +12,8 @@ inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
+RREPLACES_packagegroup-core-sdk = "task-core-sdk"
+RCONFLICTS_packagegroup-core-sdk = "task-core-sdk"
 
 RDEPENDS_packagegroup-core-sdk = "\
     autoconf \

meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +3 -1

index 7fa06e9..458d8fa 100644
@@ -1,10 +1,12 @@
 SUMMARY = "Dropbear SSH client/server"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-ssh-dropbear"
+RREPLACES_${PN} = "task-core-ssh-dropbear"
+RCONFLICTS_${PN} = "task-core-ssh-dropbear"
 
 RDEPENDS_${PN} = "dropbear"

meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +3 -1

index 3221e8b..df70962 100644
@@ -1,10 +1,12 @@
 SUMMARY = "OpenSSH SSH client/server"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-ssh-openssh"
+RREPLACES_${PN} = "task-core-ssh-openssh"
+RCONFLICTS_${PN} = "task-core-ssh-openssh"
 
 RDEPENDS_${PN} = "openssh"

meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +5 -1

index 6af2995..c8b5623 100644
@@ -1,12 +1,16 @@
 DESCRIPTION = "Target packages for the standalone SDK"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-standalone-sdk-target"
+RREPLACES_${PN} = "task-core-standalone-sdk-target"
+RCONFLICTS_${PN} = "task-core-standalone-sdk-target"
 RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
+RREPLACES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
+RCONFLICTS_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
 
 RDEPENDS_${PN} = "\
     libgcc \

meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +3 -1

index 6687b32..d49f224 100644
@@ -7,12 +7,14 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-debug"
+RREPLACES_${PN} = "task-core-tools-debug"
+RCONFLICTS_${PN} = "task-core-tools-debug"
 
 MTRACE = ""
 MTRACE_libc-glibc = "libc-mtrace"

meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +4 -0

index 931984e..1035036 100644
@@ -5,12 +5,16 @@
 SUMMARY = "Profiling tools"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-profile"
+RREPLACES_${PN} = "task-core-tools-profile"
+RCONFLICTS_${PN} = "task-core-tools-profile"
 
 RRECOMMENDS_${PN} = "\
     perf \

meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +4 -0

index 9720e5a..514e4ec 100644
@@ -5,12 +5,16 @@
 SUMMARY = "Testing tools/applications"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-testapps"
+RREPLACES_${PN} = "task-core-tools-testapps"
+RCONFLICTS_${PN} = "task-core-tools-testapps"
 
 # kexec-tools doesn't work on Mips
 KEXECTOOLS ?= "kexec"

meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb +3 -0

index e55eed5..e831860 100644
@@ -1,10 +1,13 @@
 SUMMARY = "Provides a small set of tools for development on the device"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 RPROVIDES_${PN} = "qemu-config"
 RREPLACES_${PN} = "qemu-config"
+RCONFLICTS_${PN} = "qemu-config"
 
 RDEPENDS_${PN} = "\
     distcc-config \

meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb +3 -1

index e959c5b..d42ea7e 100644
@@ -4,7 +4,7 @@
 
 SUMMARY = "GNOME Mobile And Embedded SDK (host tools)"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 
 inherit packagegroup

@@ -14,6 +14,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-sdk-gmae"
+RREPLACES_${PN} = "task-core-sdk-gmae"
+RCONFLICTS_${PN} = "task-core-sdk-gmae"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-sdk \

meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb +3 -1

index 3f322a0..e3b8484 100644
@@ -4,7 +4,7 @@
 
 SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
 LICENSE = "MIT"
-PR = "r15"
+PR = "r16"
 
 inherit packagegroup

@@ -12,6 +12,8 @@ require packagegroup-sdk-gmae.inc
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
+RREPLACES_${PN} = "task-core-standalone-gmae-sdk-target"
+RCONFLICTS_${PN} = "task-core-standalone-gmae-sdk-target"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-standalone-sdk-target \

meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +3 -1

index 37e9a87..7b1cedc 100644
@@ -5,7 +5,7 @@
 SUMMARY = "Clutter package groups"
 LICENSE = "MIT"
 
-PR = "r4"
+PR = "r5"
 
 inherit packagegroup

@@ -15,6 +15,8 @@ PACKAGES = "\
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-core = "task-core-clutter-core"
+RREPLACES_${PN}-core = "task-core-clutter-core"
+RCONFLICTS_${PN}-core = "task-core-clutter-core"
 
 SUMMARY_${PN}-core = "Clutter graphics library"
 RDEPENDS_${PN}-core = "\

meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb +3 -1

index d6c2985..55b0b9d 100644
@@ -1,11 +1,13 @@
 SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-gtk-directfb-base"
+RREPLACES_${PN} = "task-core-gtk-directfb-base"
+RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
 
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'

meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +3 -1

index ebae741..a5d02ed 100644
@@ -1,12 +1,14 @@
 SUMMARY = "Basic X11 session"
 DESCRIPTION = "Packages required to set up a basic working X11 session"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
+RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
+RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-x11-xserver \

meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +3 -1

index ed13354..315df33 100644
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "Qt package groups"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit packagegroup

@@ -12,6 +12,8 @@ PACKAGES = "${PN}-demoapps"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
+RREPLACES_${PN}-demoapps = "task-core-qt-demos"
+RCONFLICTS_${PN}-demoapps = "task-core-qt-demos"
 
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"

meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +3 -1

index 042efb8..9263828 100644
@@ -1,11 +1,13 @@
 SUMMARY = "Qt for Embedded Linux (Qt without X11)"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-qt4e-base"
+RREPLACES_${PN} = "task-qt4e-base"
+RCONFLICTS_${PN} = "task-qt4e-base"
 
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'

meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +3 -1

index 53e15d3..f2997a7 100644
@@ -4,7 +4,7 @@
 
 SUMMARY = "Sato desktop"
 LICENSE = "MIT"
-PR = "r32"
+PR = "r33"
 
 inherit packagegroup

@@ -14,6 +14,8 @@ PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-x11-sato"
+RREPLACES_${PN} = "task-core-x11-sato"
+RCONFLICTS_${PN} = "task-core-x11-sato"
 
 RDEPENDS_${PN} = "\
     ${PN}-base \

Signature · 1 line

1.7.9.5

Saul Wold

Applied

2012-09-04 21:49 UTC #3 lore raw

In reply to Paul Eggleton

Quoted 27 lines · Paul Eggleton

Fix a couple of things missed in the package group changes.
The following changes since commit 92f8605b81d373b66224b15355226f93ac5b3a46:
   udev: Remove files moved to udev-extraconf (2012-09-04 15:41:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/packagegroup-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/packagegroup-fixes
Paul Eggleton (2):
packagegroup-core-standalone-gmae-sdk-target: allow dbg package packagegroup-*: add RREPLACES/RCONFLICTS
  .../packagegroups/packagegroup-core-boot.bb        |    4 +++-
  .../packagegroups/packagegroup-core-nfs.bb         |    4 +++-
  .../packagegroups/packagegroup-core-sdk.bb         |    4 +++-
  .../packagegroup-core-ssh-dropbear.bb              |    4 +++-
  .../packagegroups/packagegroup-core-ssh-openssh.bb |    4 +++-
  .../packagegroup-core-standalone-sdk-target.bb     |    6 +++++-
  .../packagegroups/packagegroup-core-tools-debug.bb |    4 +++-
  .../packagegroup-core-tools-profile.bb             |    4 ++++
  .../packagegroup-core-tools-testapps.bb            |    4 ++++
  .../packagegroup-core-device-devel.bb              |    3 +++
  .../packagegroups/packagegroup-core-sdk-gmae.bb    |    4 +++-

Quoted 9 lines

  ...packagegroup-core-standalone-gmae-sdk-target.bb |    6 +++---
  .../packagegroups/packagegroup-core-clutter.bb     |    4 +++-
  .../packagegroup-core-gtk-directfb.bb              |    4 +++-
  .../packagegroups/packagegroup-core-x11-base.bb    |    4 +++-
  .../packagegroups/packagegroup-core-qt.bb          |    4 +++-
  .../packagegroups/packagegroup-core-qt4e.bb        |    4 +++-
  .../packagegroups/packagegroup-core-x11-sato.bb    |    4 +++-
  18 files changed, 58 insertions(+), 17 deletions(-)

Merged into OE-Core

Thanks
Sau!