summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/qmake5_paths.bbclass52
-rw-r--r--conf/bblayers.conf.bbb.sample2
-rw-r--r--conf/bblayers.conf.emulator.sample2
-rw-r--r--conf/bblayers.conf.fsl.sample2
-rw-r--r--conf/bblayers.conf.nuc.sample2
-rw-r--r--conf/bblayers.conf.nvidia-logan.sample2
-rw-r--r--conf/bblayers.conf.rpi.sample2
-rw-r--r--conf/bblayers.conf.sample2
-rw-r--r--conf/bblayers.conf.ti.sample2
-rw-r--r--conf/bblayers.conf.tibidabo.sample2
-rw-r--r--conf/bblayers.conf.toradex.sample2
-rw-r--r--conf/distro/b2qt.conf2
12 files changed, 62 insertions, 12 deletions
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass
new file mode 100644
index 0000000..32c7716
--- /dev/null
+++ b/classes/qmake5_paths.bbclass
@@ -0,0 +1,52 @@
1# If your distribution supports only qt5, or you don't care
2# about conflicts with qt4, then you can add qmake5_paths.bbclass
3# to your distro layer and flatten all QT_DIR_NAME directories
4
5QT_DIR_NAME ?= ""
6
7# This is useful for target recipes to reference native mkspecs
8QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
9QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}"
10
11QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
12QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
13QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
14
15OE_QMAKE_PATH_PREFIX = "${prefix}"
16OE_QMAKE_PATH_HEADERS = "${includedir}/qt5"
17OE_QMAKE_PATH_LIBS = "${libdir}"
18OE_QMAKE_PATH_ARCHDATA = "${libdir}"
19OE_QMAKE_PATH_DATA = "${datadir}"
20OE_QMAKE_PATH_BINS = "${bindir}"
21OE_QMAKE_PATH_LIBEXECS = "${libdir}/libexec"
22OE_QMAKE_PATH_PLUGINS = "${libdir}/plugins"
23OE_QMAKE_PATH_IMPORTS = "${libdir}/imports"
24OE_QMAKE_PATH_QML = "${libdir}/qml"
25OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
26OE_QMAKE_PATH_DOCS = "${docdir}"
27OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
28OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
29OE_QMAKE_PATH_TESTS = "${datadir}/tests"
30OE_QMAKE_PATH_HOST_PREFIX = ""
31OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}"
32OE_QMAKE_PATH_HOST_BINS = "${bindir}"
33OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
34OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
35OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}"
36
37# for qt5 components we're using QT_DIR_NAME subdirectory in more
38# variables, because we don't want conflicts with qt4
39# This block is useful for components which install their
40# own files without QT_DIR_NAME but need to reference paths e.g.
41# with QT headers
42OE_QMAKE_PATH_QT_HEADERS = "${includedir}/qt5"
43OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}"
44OE_QMAKE_PATH_QT_DATA = "${datadir}"
45OE_QMAKE_PATH_QT_BINS = "${bindir}"
46OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}/translations"
47OE_QMAKE_PATH_QT_DOCS = "${docdir}"
48OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}"
49OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}/examples"
50OE_QMAKE_PATH_QT_TESTS = "${datadir}/tests"
51
52OE_QMAKE_PATH_QT_FONTS = "${OE_QMAKE_PATH_LIBS}/fonts"
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 65ed121..617e039 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -37,12 +37,12 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
44 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \ 43 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
45 ${BSPDIR}/sources/meta-mingw \ 44 ${BSPDIR}/sources/meta-mingw \
45 ${BSPDIR}/sources/meta-qt5 \
46 " 46 "
47BBLAYERS_NON_REMOVABLE ?= " \ 47BBLAYERS_NON_REMOVABLE ?= " \
48 ${BSPDIR}/sources/poky/meta \ 48 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 975776e..4703b10 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -34,10 +34,10 @@ BBLAYERS ?= " \
34 ${BSPDIR}/sources/meta-openembedded/meta-python \ 34 ${BSPDIR}/sources/meta-openembedded/meta-python \
35 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 35 ${BSPDIR}/sources/meta-openembedded/meta-networking \
36 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 36 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
37 ${BSPDIR}/sources/meta-qt5 \
38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 37 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
39 ${BSPDIR}/sources/meta-b2qt \ 38 ${BSPDIR}/sources/meta-b2qt \
40 ${BSPDIR}/sources/meta-mingw \ 39 ${BSPDIR}/sources/meta-mingw \
40 ${BSPDIR}/sources/meta-qt5 \
41 " 41 "
42BBLAYERS_NON_REMOVABLE ?= " \ 42BBLAYERS_NON_REMOVABLE ?= " \
43 ${BSPDIR}/sources/poky/meta \ 43 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 50ebdc4..b05310d 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.nuc.sample b/conf/bblayers.conf.nuc.sample
index 57ff3cc..fe8fe20 100644
--- a/conf/bblayers.conf.nuc.sample
+++ b/conf/bblayers.conf.nuc.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-nuc-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index b447bcc..0c8fb99 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -35,11 +35,11 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-python \ 35 ${BSPDIR}/sources/meta-openembedded/meta-python \
36 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 36 ${BSPDIR}/sources/meta-openembedded/meta-networking \
37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 39 ${BSPDIR}/sources/meta-b2qt \
41 ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \ 40 ${BSPDIR}/sources/meta-b2qt/meta-nvidia-logan-extras \
42 ${BSPDIR}/sources/meta-mingw \ 41 ${BSPDIR}/sources/meta-mingw \
42 ${BSPDIR}/sources/meta-qt5 \
43 " 43 "
44 44
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index a8d401c..6b12ac5 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -35,10 +35,10 @@ BBLAYERS ?= " \
35 ${BSPDIR}/sources/meta-openembedded/meta-python \ 35 ${BSPDIR}/sources/meta-openembedded/meta-python \
36 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 36 ${BSPDIR}/sources/meta-openembedded/meta-networking \
37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 37 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
38 ${BSPDIR}/sources/meta-qt5 \
39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 38 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
40 ${BSPDIR}/sources/meta-b2qt \ 39 ${BSPDIR}/sources/meta-b2qt \
41 ${BSPDIR}/sources/meta-mingw \ 40 ${BSPDIR}/sources/meta-mingw \
41 ${BSPDIR}/sources/meta-qt5 \
42 " 42 "
43BBLAYERS_NON_REMOVABLE ?= " \ 43BBLAYERS_NON_REMOVABLE ?= " \
44 ${BSPDIR}/sources/poky/meta \ 44 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 8ea7ff3..db9ac22 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -37,7 +37,6 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-raspberrypi \ 37 ${BSPDIR}/sources/meta-raspberrypi \
38 ${BSPDIR}/sources/meta-toradex \ 38 ${BSPDIR}/sources/meta-toradex \
39 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 39 ${BSPDIR}/sources/meta-openembedded/meta-oe \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
@@ -45,6 +44,7 @@ BBLAYERS ?= " \
45 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \ 44 ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \
46 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \ 45 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
47 ${BSPDIR}/sources/meta-mingw \ 46 ${BSPDIR}/sources/meta-mingw \
47 ${BSPDIR}/sources/meta-qt5 \
48 " 48 "
49BBLAYERS_NON_REMOVABLE ?= " \ 49BBLAYERS_NON_REMOVABLE ?= " \
50 ${BSPDIR}/sources/poky/meta \ 50 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 35bbef2..20addb8 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -36,11 +36,11 @@ BBLAYERS ?= " \
36 ${BSPDIR}/sources/meta-openembedded/meta-python \ 36 ${BSPDIR}/sources/meta-openembedded/meta-python \
37 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 37 ${BSPDIR}/sources/meta-openembedded/meta-networking \
38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 38 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
39 ${BSPDIR}/sources/meta-qt5 \
40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 39 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \
43 ${BSPDIR}/sources/meta-mingw \ 42 ${BSPDIR}/sources/meta-mingw \
43 ${BSPDIR}/sources/meta-qt5 \
44 " 44 "
45BBLAYERS_NON_REMOVABLE ?= " \ 45BBLAYERS_NON_REMOVABLE ?= " \
46 ${BSPDIR}/sources/poky/meta \ 46 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 14bfb06..21d53e9 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -37,11 +37,11 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-b2qt \ 40 ${BSPDIR}/sources/meta-b2qt \
42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 41 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
43 ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \
44 ${BSPDIR}/sources/meta-mingw \ 43 ${BSPDIR}/sources/meta-mingw \
44 ${BSPDIR}/sources/meta-qt5 \
45 " 45 "
46BBLAYERS_NON_REMOVABLE ?= " \ 46BBLAYERS_NON_REMOVABLE ?= " \
47 ${BSPDIR}/sources/poky/meta \ 47 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 411cde3..6cb549f 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -37,12 +37,12 @@ BBLAYERS ?= " \
37 ${BSPDIR}/sources/meta-openembedded/meta-python \ 37 ${BSPDIR}/sources/meta-openembedded/meta-python \
38 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 38 ${BSPDIR}/sources/meta-openembedded/meta-networking \
39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ 39 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
40 ${BSPDIR}/sources/meta-qt5 \
41 ${BSPDIR}/sources/meta-openembedded/meta-ruby \ 40 ${BSPDIR}/sources/meta-openembedded/meta-ruby \
42 ${BSPDIR}/sources/meta-b2qt \ 41 ${BSPDIR}/sources/meta-b2qt \
43 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ 42 ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \
44 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \ 43 ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \
45 ${BSPDIR}/sources/meta-mingw \ 44 ${BSPDIR}/sources/meta-mingw \
45 ${BSPDIR}/sources/meta-qt5 \
46 " 46 "
47BBLAYERS_NON_REMOVABLE ?= " \ 47BBLAYERS_NON_REMOVABLE ?= " \
48 ${BSPDIR}/sources/poky/meta \ 48 ${BSPDIR}/sources/poky/meta \
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 1c605d2..af7fcb3 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -69,6 +69,4 @@ IMAGE_CLASSES += "image_types_sdcard deploy-conf"
69LICENSE_CREATE_PACKAGE = "1" 69LICENSE_CREATE_PACKAGE = "1"
70COPY_LIC_MANIFEST = "1" 70COPY_LIC_MANIFEST = "1"
71 71
72QT_DIR_NAME = ""
73
74include conf/distro/include/${MACHINE}.conf 72include conf/distro/include/${MACHINE}.conf
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 08:47:21 +0000