Skip to contentSkip to conversation

Package group fixes for meta-qt3

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

lore
Share & tools
lore
#0 lore raw

cover Package group fixes for meta-qt3

The following changes since commit f8475d5c5935695d4d1dfff1d7be30f49e162094:

qt-x11-free: fix build failure in do_configure (2012-04-03 15:28:39 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/metaqt3-packagegroup-fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/metaqt3-packagegroup-fixes

Paul Eggleton (2):
task-core-qt3: rename to packagegroup-core-qt3 and tidy up
core-image-lsb-qt3: fix for apps-console-core removal

 recipes-qt3/images/core-image-lsb-qt3.bb           |    8 +++----
 recipes-qt3/packagegroups/packagegroup-core-qt3.bb |   16 ++++++++++++++
 recipes-qt3/tasks/task-core-qt3.bb                 |   22 --------------------
 3 files changed, 20 insertions(+), 26 deletions(-)
 create mode 100644 recipes-qt3/packagegroups/packagegroup-core-qt3.bb
 delete mode 100644 recipes-qt3/tasks/task-core-qt3.bb
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 task-core-qt3: rename to packagegroup-core-qt3 and tidy up

Fix and clean up this recipe in line with the package group changes to OE-Core.

---
 recipes-qt3/images/core-image-lsb-qt3.bb           |    6 +++---
 recipes-qt3/packagegroups/packagegroup-core-qt3.bb |   16 ++++++++++++++
 recipes-qt3/tasks/task-core-qt3.bb                 |   22 --------------------
 3 files changed, 19 insertions(+), 25 deletions(-)
 create mode 100644 recipes-qt3/packagegroups/packagegroup-core-qt3.bb
 delete mode 100644 recipes-qt3/tasks/task-core-qt3.bb
recipes-qt3/images/core-image-lsb-qt3.bb +3 -3
index 35cd9fb..86bdf21 100644
@@ -2,9 +2,9 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
-    task-core-basic \
-    task-core-lsb \
-    task-core-qt-mt3 \
+    packagegroup-core-basic \
+    packagegroup-core-lsb \
+    packagegroup-core-qt3-libs \
     "
 
 inherit core-image
recipes-qt3/packagegroups/packagegroup-core-qt3.bb new file +16 -0
new file mode 100644
index 0000000..89c29c0
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2011 Wind River
+#
+
+SUMMARY = "Qt version 3"
+PR = "r1"
+LICENSE = "MIT"
+
+inherit packagegroup
+
+PACKAGES = "${PN}-libs"
+
+RDEPENDS_${PN}-libs = "\
+    libqt-mt3 \
+"
+
recipes-qt3/tasks/task-core-qt3.bb deleted +0 -22
deleted file mode 100644
index fa41fb5..0000000
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2011 Wind River
-#
-
-DESCRIPTION = "Create qt3 Tasks"
-PR = "r1"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PACKAGES = "\
-    task-core-qt-mt3 \
-"
-
-
-ALLOW_EMPTY = "1"
-
-
-RDEPENDS_task-core-qt-mt3 = "\
-    libqt-mt3 \
-"
-
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 core-image-lsb-qt3: fix for apps-console-core removal

In reply to Paul Eggleton
---
 recipes-qt3/images/core-image-lsb-qt3.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt3/images/core-image-lsb-qt3.bb +1 -1
index 86bdf21..8aab5ae 100644
@@ -1,4 +1,4 @@
-IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
+IMAGE_FEATURES += "splash ssh-server-openssh"
 
 IMAGE_INSTALL = "\
     ${CORE_IMAGE_BASE_INSTALL} \
Signature · 1 line
1.7.9.5
Applied
#3 lore raw
In reply to Paul Eggleton
Quoted 13 lines · Paul Eggleton

The following changes since commit f8475d5c5935695d4d1dfff1d7be30f49e162094:

   qt-x11-free: fix build failure in do_configure (2012-04-03 15:28:39 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib paule/metaqt3-packagegroup-fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/metaqt3-packagegroup-fixes

Paul Eggleton (2):
task-core-qt3: rename to packagegroup-core-qt3 and tidy up
core-image-lsb-qt3: fix for apps-console-core removal

Quoted 7 lines
  recipes-qt3/images/core-image-lsb-qt3.bb           |    8 +++----
  recipes-qt3/packagegroups/packagegroup-core-qt3.bb |   16 ++++++++++++++
  recipes-qt3/tasks/task-core-qt3.bb                 |   22 --------------------
  3 files changed, 20 insertions(+), 26 deletions(-)

create mode 100644 recipes-qt3/packagegroups/packagegroup-core-qt3.bb delete mode 100644 recipes-qt3/tasks/task-core-qt3.bb

Merged into Meta-qt3

Thanks
Sau!