[meta-opie 0/6] Fix SDK generation

All of lore.kernel.org
 help / color / mirror / Atom feed

* [meta-opie 0/6] Fix SDK generation
@ 2011-12-13 16:44 Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 1/6] uicmoc: do also provide nativesdk variant Dmitry Eremin-Solenikov
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

The following changes since commit ad8e8dc745831e2f8523757d790294906500b0ad:

  Fix LIC_FILES_CHKSUM for change to common LGPL-2.0 license file (2011-12-09 12:18:49 +0000)

are available in the git repository at:
  https://github.com/lumag/meta-opie master

Dmitry Eremin-Solenikov (6):
      uicmoc: do also provide nativesdk variant
      qmake: do also provide nativesdk variant
      task-opie, task-opie-16mb: make whole recipe a machine-only
      opie-button-settings: make whole recipe a machine-only
      libopie2: make libopie2-dev package installable
      opie: fix SDK generation

 recipes-opie/libopie/libopie2.inc                  |    6 ++-
 recipes-opie/meta/meta-toolchain-opie.bb           |   30 ++++++++++++++++---
 .../opie-button-settings/opie-button-settings.inc  |    2 +-
 recipes-opie/tasks/task-opie-16mb.bb               |    5 +--
 .../tasks/task-opie-toolchain-host-nativesdk.bb    |    8 +++++
 recipes-opie/tasks/task-opie-toolchain-target.bb   |   16 ++++++++++
 recipes-opie/tasks/task-opie.bb                    |    9 +----
 .../{qmake-native_1.07a.bb => qmake_1.07a.bb}      |    8 ++---
 .../64bit-cleanup.patch                            |    0
 .../fix-makefile.patch                             |    0
 .../gcc3_4.patch                                   |    0
 .../gcc4.patch                                     |    0
 .../gcc4_1.patch                                   |    0
 .../kernel-asm-page.patch                          |    0
 .../{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb}  |   11 +++++--
 15 files changed, 69 insertions(+), 26 deletions(-)
 create mode 100644 recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb
 create mode 100644 recipes-opie/tasks/task-opie-toolchain-target.bb
 rename recipes-qt/qmake/{qmake-native_1.07a.bb => qmake_1.07a.bb} (92%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/64bit-cleanup.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/fix-makefile.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc3_4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4_1.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/kernel-asm-page.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb} (81%)




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [meta-opie 1/6] uicmoc: do also provide nativesdk variant
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 2/6] qmake: " Dmitry Eremin-Solenikov
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

Opie SDK needs nativesdk version of uicmoc package. To achieve this, replace uicmoc-native
with uicmoc recipe, which can be built both as virtclass-native and virtclass-nativesdk.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../64bit-cleanup.patch                            |    0
 .../fix-makefile.patch                             |    0
 .../gcc3_4.patch                                   |    0
 .../gcc4.patch                                     |    0
 .../gcc4_1.patch                                   |    0
 .../kernel-asm-page.patch                          |    0
 .../{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb}  |   11 ++++++++---
 7 files changed, 8 insertions(+), 3 deletions(-)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/64bit-cleanup.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/fix-makefile.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc3_4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4_1.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/kernel-asm-page.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb} (81%)

diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
rename to recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
similarity index 81%
rename from recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
rename to recipes-qt/uicmoc/uicmoc_2.3.10.bb
index 57f61d4..e72a454 100644
--- a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
+++ b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
@@ -16,11 +16,16 @@ S = "${WORKDIR}/qt-${PV}"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=aea7d119b7f7d798464fa2b1aae005f8 \
                     file://README;beginline=1;endline=7;md5=d3e237af71522cc2a3c89dbaf48b345d"
 
-inherit native qmake_base
+inherit qmake_base
+BBCLASSEXTEND = "native nativesdk"
+UICMOCNATIVE = "uicmoc-native"
+UICMOCNATIVE_virtclass-native = ""
+DEPENDS_prepend = "${UICMOCNATIVE}"
 
 export QTDIR = "${S}"
-EXTRA_OEMAKE = 'SYSCONF_CXX="${CXX}" SYSCONF_LINK="${CXX}"'
-CXXFLAGS += " -DQWS"
+SYSUICMOC = 'SYSCONF_MOC="${STAGING_BINDIR_NATIVE}/moc2" SYSCONF_UIC="${STAGING_BINDIR_NATIVE}/uic2"'
+SYSUICMOC_virtclass-native = ""
+EXTRA_OEMAKE = 'SYSCONF_CC="${CC}" SYSCONF_CXX="${CXX}" SYSCONF_CFLAGS="${CFLAGS}" SYSCONF_CXXFLAGS="${CXXFLAGS} -DQWS" SYSCONF_LINK="${CXX}" ${SYSUICMOC}'
 
 QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \
                    -qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-opie 2/6] qmake: do also provide nativesdk variant
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 1/6] uicmoc: do also provide nativesdk variant Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 3/6] task-opie, task-opie-16mb: make whole recipe a machine-only Dmitry Eremin-Solenikov
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

Opie SDK needs nativesdk version of qmake package. To achieve this, replace qmake-native
with qmake recipe, which can be built both as virtclass-native and virtclass-nativesdk.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../{qmake-native_1.07a.bb => qmake_1.07a.bb}      |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
 rename recipes-qt/qmake/{qmake-native_1.07a.bb => qmake_1.07a.bb} (92%)

diff --git a/recipes-qt/qmake/qmake-native_1.07a.bb b/recipes-qt/qmake/qmake_1.07a.bb
similarity index 92%
rename from recipes-qt/qmake/qmake-native_1.07a.bb
rename to recipes-qt/qmake/qmake_1.07a.bb
index e4f0cd5..8bd57b2 100644
--- a/recipes-qt/qmake/qmake-native_1.07a.bb
+++ b/recipes-qt/qmake/qmake_1.07a.bb
@@ -13,10 +13,11 @@ S = "${WORKDIR}/${QTEVER}"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
                     file://README;beginline=1;endline=7;md5=a85582a7befb26735438461afd8559af"
 
-inherit autotools native
+inherit qmake_base
+BBCLASSEXTEND = "native nativesdk"
 
 export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
+EXTRA_OECONF += "-platform ${HOST_OS}-oe-g++"
 
 do_configure() {
 	# Install the OE build templates
@@ -26,9 +27,6 @@ do_configure() {
 		install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
 		ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
 	done
-	QMAKESPEC=
-	PLATFORM=${HOST_OS}-oe-g++
-	export PLATFORM
 	bbnote ./configure ${EXTRA_OECONF}
 	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
 }
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-opie 3/6] task-opie, task-opie-16mb: make whole recipe a machine-only
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 1/6] uicmoc: do also provide nativesdk variant Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 2/6] qmake: " Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 4/6] opie-button-settings: " Dmitry Eremin-Solenikov
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

Currently bitbake spills warnings on task-opie and task-opie-16mb
recipes containing machine packages, while being non-machine ones.
Disable this warning by replacing all PACKAGE_ARCH_xxx stuff with a
single PACKAGE_ARCH = "${MACHINE_ARCH}"

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/tasks/task-opie-16mb.bb |    5 ++---
 recipes-opie/tasks/task-opie.bb      |    9 ++-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/recipes-opie/tasks/task-opie-16mb.bb b/recipes-opie/tasks/task-opie-16mb.bb
index 42ed6a4..33eb19a 100644
--- a/recipes-opie/tasks/task-opie-16mb.bb
+++ b/recipes-opie/tasks/task-opie-16mb.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Tasks for small OPIE image"
 SECTION = "opie/base"
 LICENSE = "MIT"
-PR = "r3"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r4"
 
 inherit task
 
@@ -34,8 +35,6 @@ RDEPENDS_task-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opie-suspen
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
-PACKAGE_ARCH_task-opie-16mb-applets = "${MACHINE_ARCH}"
-
 #
 # clamshell models can benefit from the autorotate applet
 #
diff --git a/recipes-opie/tasks/task-opie.bb b/recipes-opie/tasks/task-opie.bb
index 5e3a113..64e6492 100644
--- a/recipes-opie/tasks/task-opie.bb
+++ b/recipes-opie/tasks/task-opie.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Tasks for OPIE stuff"
 SECTION = "opie/base"
 LICENSE = "MIT"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r15"
+PR = "r16"
 
 inherit task
 
@@ -37,8 +38,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320"
 RRECOMMENDS_task-opie-base = "opie-taskbar-images-${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
                               opie-taskbar-images-${MACHINE_DISPLAY_HEIGHT_PIXELS}x${MACHINE_DISPLAY_WIDTH_PIXELS}"
 
-PACKAGE_ARCH_task-opie-base = "${MACHINE_ARCH}"
-
 #
 # things for reasonable bootstrap image
 #
@@ -51,8 +50,6 @@ RDEPENDS_task-opie-base-applets = "opie-aboutapplet opie-clockapplet opie-suspen
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
 
-PACKAGE_ARCH_task-opie-base-applets = "${MACHINE_ARCH}"
-
 #
 # clamshell models can benefit from the autorotate applet
 #
@@ -78,8 +75,6 @@ RDEPENDS_task-opie-extra-settings = "opie-language opie-doctab opie-mediummount
     ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
 			    "
 
-PACKAGE_ARCH_task-opie-extra-settings = "${MACHINE_ARCH}"
-
 RDEPENDS_task-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"
 
 RDEPENDS_task-opie-base-styles = "opie-style-flat opie-style-fresh opie-style-web opie-style-phase"
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-opie 4/6] opie-button-settings: make whole recipe a machine-only
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
                   ` (2 preceding siblings ...)
  2011-12-13 16:44 ` [meta-opie 3/6] task-opie, task-opie-16mb: make whole recipe a machine-only Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 5/6] libopie2: make libopie2-dev package installable Dmitry Eremin-Solenikov
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

Currently bitbake spills warnings on opie-button-settings
recipe containing machine packages, while being non-machine one.
Disable this warning by replacing all PACKAGE_ARCH_xxx stuff with a
single PACKAGE_ARCH = "${MACHINE_ARCH}"

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 .../opie-button-settings/opie-button-settings.inc  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes-opie/opie-button-settings/opie-button-settings.inc b/recipes-opie/opie-button-settings/opie-button-settings.inc
index 4cc0908..15b46ee 100644
--- a/recipes-opie/opie-button-settings/opie-button-settings.inc
+++ b/recipes-opie/opie-button-settings/opie-button-settings.inc
@@ -18,7 +18,7 @@ do_install() {
 }
 
 PACKAGES_prepend = "opie-button-settings-pics "
-PACKAGE_ARCH_opie-button-settings-pics = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 FILES_opie-button-settings-pics = "${palmtopdir}/pics/devicebuttons/z*" 
 FILES_opie-button-settings-pics_h1910 = "${palmtopdir}/pics/devicebuttons/ipaq*"
 FILES_opie-button-settings-pics_h1940 = "${palmtopdir}/pics/devicebuttons/ipaq*"
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-opie 5/6] libopie2: make libopie2-dev package installable
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
                   ` (3 preceding siblings ...)
  2011-12-13 16:44 ` [meta-opie 4/6] opie-button-settings: " Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 16:44 ` [meta-opie 6/6] opie: fix SDK generation Dmitry Eremin-Solenikov
  2011-12-13 22:58 ` [meta-opie 0/6] Fix " Paul Eggleton
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

For now libopie2-dev package depends on libopie2 package which doesn't
exist: libraries are split into the individual packages. Fix that by
making libopie2-dev depend on all generated library packages.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/libopie/libopie2.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes-opie/libopie/libopie2.inc b/recipes-opie/libopie/libopie2.inc
index fbe2fd6..af4385f 100644
--- a/recipes-opie/libopie/libopie2.inc
+++ b/recipes-opie/libopie/libopie2.inc
@@ -8,7 +8,7 @@ I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
 DEPENDS = "libqpe-opie libpcap sqlite3 bluez4"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
 
-INC_PR = "r16"
+INC_PR = "r17"
 
 S = "${WORKDIR}/libopie2"
 
@@ -98,7 +98,9 @@ do_install() {
 
 FILES_${PN}-dev += "${palmtopdir}/include.pro"
 
-PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
+OPIE_LIBS = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 "
+PACKAGES_prepend = "${OPIE_LIBS}"
+RDEPENDS_${PN}-dev = "${OPIE_LIBS}"
 
 DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library"
 FILES_libopiecore2 = "${libdir}/libopiecore2.so.*"
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [meta-opie 6/6] opie: fix SDK generation
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
                   ` (4 preceding siblings ...)
  2011-12-13 16:44 ` [meta-opie 5/6] libopie2: make libopie2-dev package installable Dmitry Eremin-Solenikov
@ 2011-12-13 16:44 ` Dmitry Eremin-Solenikov
  2011-12-13 22:58 ` [meta-opie 0/6] Fix " Paul Eggleton
  6 siblings, 0 replies; 9+ messages in thread
From: Dmitry Eremin-Solenikov @ 2011-12-13 16:44 UTC (permalink / raw)
  To: openembedded-devel

Fix SDK generation. Include correct version of tools, set up environment
for the linux-oe-g++ qmake spec. qmake still has some room for
improvement to add automatic handling of (e.g.) thread/non-threaded
config, opie-related defines, etc.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/meta/meta-toolchain-opie.bb           |   30 ++++++++++++++++---
 .../tasks/task-opie-toolchain-host-nativesdk.bb    |    8 +++++
 recipes-opie/tasks/task-opie-toolchain-target.bb   |   16 ++++++++++
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb
 create mode 100644 recipes-opie/tasks/task-opie-toolchain-target.bb

diff --git a/recipes-opie/meta/meta-toolchain-opie.bb b/recipes-opie/meta/meta-toolchain-opie.bb
index 6a941c3..3238b37 100644
--- a/recipes-opie/meta/meta-toolchain-opie.bb
+++ b/recipes-opie/meta/meta-toolchain-opie.bb
@@ -1,8 +1,28 @@
-PR = "r1"
-TOOLCHAIN_TARGET_TASK = "\
-    task-sdk-base \
-    task-sdk-opie"
+PR = "r3"
+TOOLCHAIN_HOST_TASK = "task-opie-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_TARGET_TASK = "task-opie-toolchain-target"
+TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-opie-${DISTRO_VERSION}"
 
 require recipes-core/meta/meta-toolchain.bb
 
-SDK_SUFFIX = "toolchain-opie"
+QT_TOOLS_PREFIX = "${SDKPATHNATIVE}${bindir_nativesdk}"
+
+toolchain_create_sdk_env_script_append() {
+
+    echo 'export OE_QMAKE_CC=${TARGET_PREFIX}gcc' >> $script
+    echo 'export OE_QMAKE_CFLAGS="-DQWS $CFLAGS"' >> $script
+    echo 'export OE_QMAKE_CXX=${TARGET_PREFIX}g++' >> $script
+    echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
+    echo 'export OE_QMAKE_AR=${TARGET_PREFIX}ar' >> $script
+    echo 'export OE_QMAKE_STRIP="echo"' >> $script
+    echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic2' >> $script
+    echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc2' >> $script
+    echo 'export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti -DQWS $CXXFLAGS"' >> $script
+    echo 'export OE_QMAKE_LINK="${TARGET_PREFIX}g++"' >> $script
+    echo 'export OE_QMAKE_INCDIR_QT="${SDKTARGETSYSROOT}${includedir}/qte"' >> $script
+    echo 'export OE_QMAKE_LIBDIR_QT="${SDKTARGETSYSROOT}${libdir}"' >> $script
+    echo 'export OE_QMAKE_LIBS_QT="qte"' >> $script
+    echo 'export OE_QMAKE_LIBS_X11=""' >> $script
+
+    echo 'export QMAKESPEC=${SDKPATHNATIVE}${datadir}/qmake/linux-oe-g++' >> $script
+}
diff --git a/recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb b/recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb
new file mode 100644
index 0000000..5ca80e6
--- /dev/null
+++ b/recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb
@@ -0,0 +1,8 @@
+require recipes-core/tasks/task-sdk-host-nativesdk.bb
+
+DESCRIPTION = "Host packages for Opie SDK"
+PR = "r2"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} += "qmake-nativesdk uicmoc-nativesdk"
diff --git a/recipes-opie/tasks/task-opie-toolchain-target.bb b/recipes-opie/tasks/task-opie-toolchain-target.bb
new file mode 100644
index 0000000..b9ea713
--- /dev/null
+++ b/recipes-opie/tasks/task-opie-toolchain-target.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Target packages for Opie SDK"
+PR = "r7"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+RDEPENDS_${PN} = "\
+    task-core-standalone-sdk-target \
+    libopie2-dev \
+    libqpe-opie-dev \
+    ${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}-dev \
+    libqtaux2-dev \
+    libmailwrapper-dev"
-- 
1.7.7.3




^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [meta-opie 0/6] Fix SDK generation
  2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
                   ` (5 preceding siblings ...)
  2011-12-13 16:44 ` [meta-opie 6/6] opie: fix SDK generation Dmitry Eremin-Solenikov
@ 2011-12-13 22:58 ` Paul Eggleton
  2011-12-15  8:30   ` Koen Kooi
  6 siblings, 1 reply; 9+ messages in thread
From: Paul Eggleton @ 2011-12-13 22:58 UTC (permalink / raw)
  To: Dmitry Eremin-Solenikov; +Cc: openembedded-devel

On Tuesday 13 December 2011 20:44:37 Dmitry Eremin-Solenikov wrote:
> The following changes since commit ad8e8dc745831e2f8523757d790294906500b0ad:
> 
>   Fix LIC_FILES_CHKSUM for change to common LGPL-2.0 license file
> (2011-12-09 12:18:49 +0000)
> 
> are available in the git repository at:
>   https://github.com/lumag/meta-opie master
> 
> Dmitry Eremin-Solenikov (6):
>       uicmoc: do also provide nativesdk variant
>       qmake: do also provide nativesdk variant
>       task-opie, task-opie-16mb: make whole recipe a machine-only
>       opie-button-settings: make whole recipe a machine-only
>       libopie2: make libopie2-dev package installable
>       opie: fix SDK generation
> 
>  recipes-opie/libopie/libopie2.inc                  |    6 ++-
>  recipes-opie/meta/meta-toolchain-opie.bb           |   30
> ++++++++++++++++--- .../opie-button-settings/opie-button-settings.inc  |   
> 2 +-
>  recipes-opie/tasks/task-opie-16mb.bb               |    5 +--
>  .../tasks/task-opie-toolchain-host-nativesdk.bb    |    8 +++++
>  recipes-opie/tasks/task-opie-toolchain-target.bb   |   16 ++++++++++
>  recipes-opie/tasks/task-opie.bb                    |    9 +----
>  .../{qmake-native_1.07a.bb => qmake_1.07a.bb}      |    8 ++---
>  .../64bit-cleanup.patch                            |    0
>  .../fix-makefile.patch                             |    0
>  .../gcc3_4.patch                                   |    0
>  .../gcc4.patch                                     |    0
>  .../gcc4_1.patch                                   |    0
>  .../kernel-asm-page.patch                          |    0
>  .../{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb}  |   11 +++++--
>  15 files changed, 69 insertions(+), 26 deletions(-)
>  create mode 100644 recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb
> create mode 100644 recipes-opie/tasks/task-opie-toolchain-target.bb rename
> recipes-qt/qmake/{qmake-native_1.07a.bb => qmake_1.07a.bb} (92%) rename
> recipes-qt/uicmoc/{uicmoc-native-2.3.10 =>
> uicmoc-2.3.10}/64bit-cleanup.patch (100%) rename
> recipes-qt/uicmoc/{uicmoc-native-2.3.10 =>
> uicmoc-2.3.10}/fix-makefile.patch (100%) rename
> recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc3_4.patch
> (100%) rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 =>
> uicmoc-2.3.10}/gcc4.patch (100%) rename
> recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4_1.patch
> (100%) rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 =>
> uicmoc-2.3.10}/kernel-asm-page.patch (100%) rename
> recipes-qt/uicmoc/{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb} (81%)

Merged to meta-opie, thanks!

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre



^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [meta-opie 0/6] Fix SDK generation
  2011-12-13 22:58 ` [meta-opie 0/6] Fix " Paul Eggleton
@ 2011-12-15  8:30   ` Koen Kooi
  0 siblings, 0 replies; 9+ messages in thread
From: Koen Kooi @ 2011-12-15  8:30 UTC (permalink / raw)
  To: openembedded-devel

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-12-11 23:58, Paul Eggleton schreef:
> On Tuesday 13 December 2011 20:44:37 Dmitry Eremin-Solenikov wrote:
>> The following changes since commit
>> ad8e8dc745831e2f8523757d790294906500b0ad:
>> 
>> Fix LIC_FILES_CHKSUM for change to common LGPL-2.0 license file 
>> (2011-12-09 12:18:49 +0000)
>> 
>> are available in the git repository at: 
>> https://github.com/lumag/meta-opie master
>> 
>> Dmitry Eremin-Solenikov (6): uicmoc: do also provide nativesdk variant 
>> qmake: do also provide nativesdk variant task-opie, task-opie-16mb:
>> make whole recipe a machine-only opie-button-settings: make whole
>> recipe a machine-only libopie2: make libopie2-dev package installable 
>> opie: fix SDK generation
>> 
>> recipes-opie/libopie/libopie2.inc                  |    6 ++- 
>> recipes-opie/meta/meta-toolchain-opie.bb           |   30 
>> ++++++++++++++++--- .../opie-button-settings/opie-button-settings.inc
>> | 2 +- recipes-opie/tasks/task-opie-16mb.bb               |    5 +-- 
>> .../tasks/task-opie-toolchain-host-nativesdk.bb    |    8 +++++ 
>> recipes-opie/tasks/task-opie-toolchain-target.bb   |   16 ++++++++++ 
>> recipes-opie/tasks/task-opie.bb                    |    9 +---- 
>> .../{qmake-native_1.07a.bb => qmake_1.07a.bb}      |    8 ++--- 
>> .../64bit-cleanup.patch                            |    0 
>> .../fix-makefile.patch                             |    0 
>> .../gcc3_4.patch                                   |    0 
>> .../gcc4.patch                                     |    0 
>> .../gcc4_1.patch                                   |    0 
>> .../kernel-asm-page.patch                          |    0 
>> .../{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb}  |   11 +++++-- 15
>> files changed, 69 insertions(+), 26 deletions(-) create mode 100644
>> recipes-opie/tasks/task-opie-toolchain-host-nativesdk.bb create mode
>> 100644 recipes-opie/tasks/task-opie-toolchain-target.bb rename 
>> recipes-qt/qmake/{qmake-native_1.07a.bb => qmake_1.07a.bb} (92%)
>> rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => 
>> uicmoc-2.3.10}/64bit-cleanup.patch (100%) rename 
>> recipes-qt/uicmoc/{uicmoc-native-2.3.10 => 
>> uicmoc-2.3.10}/fix-makefile.patch (100%) rename 
>> recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc3_4.patch 
>> (100%) rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => 
>> uicmoc-2.3.10}/gcc4.patch (100%) rename 
>> recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4_1.patch 
>> (100%) rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => 
>> uicmoc-2.3.10}/kernel-asm-page.patch (100%) rename 
>> recipes-qt/uicmoc/{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb} (81%)
> 
> Merged to meta-opie, thanks!

Please update patchwork as well
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7psAsACgkQMkyGM64RGpG6tgCfQ3U30t28AoikM/rGKNoSbleO
sq0AnjDcZm7cpjBncK3XUel93PYXWsYB
=Ef7a
-----END PGP SIGNATURE-----




^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-12-15  8:42 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-13 16:44 [meta-opie 0/6] Fix SDK generation Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 1/6] uicmoc: do also provide nativesdk variant Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 2/6] qmake: " Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 3/6] task-opie, task-opie-16mb: make whole recipe a machine-only Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 4/6] opie-button-settings: " Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 5/6] libopie2: make libopie2-dev package installable Dmitry Eremin-Solenikov
2011-12-13 16:44 ` [meta-opie 6/6] opie: fix SDK generation Dmitry Eremin-Solenikov
2011-12-13 22:58 ` [meta-opie 0/6] Fix " Paul Eggleton
2011-12-15  8:30   ` Koen Kooi

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.