diff options
-rw-r--r-- | conf/distro/include/beagleboard.conf | 11 | ||||
-rw-r--r-- | conf/distro/include/emulator.conf | 13 | ||||
-rw-r--r-- | conf/distro/include/imx53qsb.conf | 13 | ||||
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 16 | ||||
-rw-r--r-- | conf/distro/include/raspberrypi.conf | 8 | ||||
-rw-r--r-- | recipes/adbd/adbd.bb | 8 | ||||
-rw-r--r-- | recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend | 2 | ||||
-rw-r--r-- | recipes/images/b2qt-embedded-image.bb | 30 | ||||
-rw-r--r-- | recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 31 |
9 files changed, 68 insertions, 64 deletions
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 4932436..728a3ea 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf | |||
@@ -11,3 +11,14 @@ UBOOT_SUFFIX = "img" | |||
11 | PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" | 11 | PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" |
12 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" | 12 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" |
13 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" | 13 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" |
14 | |||
15 | MACHINE_EXTRA_INSTALL = "\ | ||
16 | libgles-omap3 \ | ||
17 | libgles-omap3-rawdemos \ | ||
18 | " | ||
19 | |||
20 | MACHINE_EXTRA_INSTALL_SDK = "\ | ||
21 | libgles-omap3-dev \ | ||
22 | " | ||
23 | |||
24 | ADB_PRODUCTID = "0x9018" | ||
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index fdef2f3..dfbda91 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf | |||
@@ -2,3 +2,16 @@ IMAGE_CLASSES += "image-hdd" | |||
2 | IMAGE_ROOTFS_ALIGNMENT = "1048576" | 2 | IMAGE_ROOTFS_ALIGNMENT = "1048576" |
3 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | 3 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" |
4 | IMAGE_FSTYPES = "ext3" | 4 | IMAGE_FSTYPES = "ext3" |
5 | |||
6 | MACHINE_EXTRA_INSTALL = "\ | ||
7 | llvm3.2 \ | ||
8 | libegl-mesa \ | ||
9 | libegl-gallium \ | ||
10 | libgles2-mesa \ | ||
11 | mount-vboxsf \ | ||
12 | " | ||
13 | |||
14 | MACHINE_EXTRA_INSTALL_SDK = "\ | ||
15 | libegl-mesa-dev \ | ||
16 | libgles2-mesa-dev \ | ||
17 | " | ||
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf new file mode 100644 index 0000000..0d96d9a --- /dev/null +++ b/conf/distro/include/imx53qsb.conf | |||
@@ -0,0 +1,13 @@ | |||
1 | IMAGE_FSTYPES = "tar.gz" | ||
2 | |||
3 | PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51" | ||
4 | |||
5 | MACHINE_EXTRA_INSTALL = "\ | ||
6 | amd-gpu-x11-bin-mx51 \ | ||
7 | " | ||
8 | |||
9 | MACHINE_EXTRA_INSTALL_SDK = " \ | ||
10 | libgsl-fsl-mx51-dev \ | ||
11 | libegl-mx51-dev \ | ||
12 | libgles2-mx51-dev \ | ||
13 | " | ||
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index e232667..cf99d11 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -3,3 +3,19 @@ IMAGE_FSTYPES = "tar.gz ext3 sdcard" | |||
3 | 3 | ||
4 | BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript" | 4 | BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript" |
5 | 5 | ||
6 | MACHINE_EXTRA_INSTALL = "\ | ||
7 | libgal-mx6 \ | ||
8 | libegl-mx6 \ | ||
9 | libgles2-mx6 \ | ||
10 | gst-fsl-plugin \ | ||
11 | " | ||
12 | |||
13 | MACHINE_EXTRA_INSTALL_SDK = " \ | ||
14 | libgal-mx6 \ | ||
15 | libegl-mx6 \ | ||
16 | libegl-mx6-dev \ | ||
17 | libgles2-mx6 \ | ||
18 | libgles2-mx6-dev \ | ||
19 | " | ||
20 | |||
21 | ADB_PRODUCTID = "0x0d02" | ||
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 5045c13..8eada21 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf | |||
@@ -2,3 +2,11 @@ IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg" | |||
2 | 2 | ||
3 | PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics" | 3 | PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics" |
4 | PREFERRED_PROVIDER_virtual/libgl = "vc-graphics" | 4 | PREFERRED_PROVIDER_virtual/libgl = "vc-graphics" |
5 | |||
6 | MACHINE_EXTRA_INSTALL = "\ | ||
7 | vc-graphics \ | ||
8 | " | ||
9 | |||
10 | MACHINE_EXTRA_INSTALL_SDK = " \ | ||
11 | vc-graphics-dev \ | ||
12 | " | ||
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 88a3cfb..aa8f5e9 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb | |||
@@ -20,13 +20,9 @@ S = "${WORKDIR}/git/adb" | |||
20 | 20 | ||
21 | FILES_${PN} += "${bindir}/adbd" | 21 | FILES_${PN} += "${bindir}/adbd" |
22 | 22 | ||
23 | PRODUCTID_beagleboard = "0x9018" | ||
24 | PRODUCTID_mx6 = "0x0d02" | ||
25 | PRODUCTID_raspberrypi = "0xabcd" | ||
26 | |||
27 | do_configure() { | 23 | do_configure() { |
28 | if [ -n "${PRODUCTID}" ]; then | 24 | if [ -n "${ADB_PRODUCTID}" ]; then |
29 | sed -i -e 's/PRODUCT=.*/PRODUCT=${PRODUCTID}/' ${WORKDIR}/adb-init | 25 | sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/adb-init |
30 | fi | 26 | fi |
31 | } | 27 | } |
32 | 28 | ||
diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend index 45366bd..53a4b1a 100644 --- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend +++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend | |||
@@ -1,2 +1,4 @@ | |||
1 | # dependency to x11 only when distro features have it | 1 | # dependency to x11 only when distro features have it |
2 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" | 2 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" |
3 | |||
4 | PROVIDES += "virtual/libgl" | ||
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index cc5a124..6dc4f1f 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb | |||
@@ -14,35 +14,7 @@ inherit core-image | |||
14 | 14 | ||
15 | EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary" | 15 | EXTRA_IMAGEDEPENDS_mx6 += "u-boot-script-boundary" |
16 | 16 | ||
17 | MACHINE_EXTRA_INSTALL = "" | 17 | MACHINE_EXTRA_INSTALL ?= "" |
18 | |||
19 | MACHINE_EXTRA_INSTALL_raspberrypi += "\ | ||
20 | vc-graphics \ | ||
21 | " | ||
22 | |||
23 | MACHINE_EXTRA_INSTALL_mx5 += "\ | ||
24 | amd-gpu-x11-bin-mx51 \ | ||
25 | " | ||
26 | |||
27 | MACHINE_EXTRA_INSTALL_mx6 += "\ | ||
28 | libgal-mx6 \ | ||
29 | libegl-mx6 \ | ||
30 | libgles2-mx6 \ | ||
31 | gst-fsl-plugin \ | ||
32 | " | ||
33 | |||
34 | MACHINE_EXTRA_INSTALL_beagleboard += "\ | ||
35 | libgles-omap3 \ | ||
36 | libgles-omap3-rawdemos \ | ||
37 | " | ||
38 | |||
39 | MACHINE_EXTRA_INSTALL_emulator = "\ | ||
40 | llvm3.2 \ | ||
41 | libegl-mesa \ | ||
42 | libegl-gallium \ | ||
43 | libgles2-mesa \ | ||
44 | mount-vboxsf \ | ||
45 | " | ||
46 | 18 | ||
47 | GSTREAMER_EXTRA_INSTALL = "\ | 19 | GSTREAMER_EXTRA_INSTALL = "\ |
48 | gst-meta-video \ | 20 | gst-meta-video \ |
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index 58f9a7f..4ff29d0 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | |||
@@ -5,34 +5,7 @@ LICENSE = "CLOSED" | |||
5 | 5 | ||
6 | PACKAGES = "${PN}" | 6 | PACKAGES = "${PN}" |
7 | 7 | ||
8 | MACHINE_EXTRA_INSTALL = "" | 8 | MACHINE_EXTRA_INSTALL_SDK ?= "" |
9 | |||
10 | MACHINE_EXTRA_INSTALL_raspberrypi = " \ | ||
11 | vc-graphics-dev \ | ||
12 | " | ||
13 | |||
14 | MACHINE_EXTRA_INSTALL_mx6 = " \ | ||
15 | libgal-mx6 \ | ||
16 | libegl-mx6 \ | ||
17 | libegl-mx6-dev \ | ||
18 | libgles2-mx6 \ | ||
19 | libgles2-mx6-dev \ | ||
20 | " | ||
21 | |||
22 | MACHINE_EXTRA_INSTALL_mx5 = " \ | ||
23 | libgsl-fsl-mx51-dev \ | ||
24 | libegl-mx51-dev \ | ||
25 | libgles2-mx51-dev \ | ||
26 | " | ||
27 | |||
28 | MACHINE_EXTRA_INSTALL_beagleboard = "\ | ||
29 | libgles-omap3-dev \ | ||
30 | " | ||
31 | |||
32 | MACHINE_EXTRA_INSTALL_emulator = "\ | ||
33 | libegl-mesa-dev \ | ||
34 | libgles2-mesa-dev \ | ||
35 | " | ||
36 | 9 | ||
37 | RDEPENDS_${PN} += "\ | 10 | RDEPENDS_${PN} += "\ |
38 | task-core-standalone-sdk-target \ | 11 | task-core-standalone-sdk-target \ |
@@ -51,5 +24,5 @@ RDEPENDS_${PN} += "\ | |||
51 | libxslt-dev \ | 24 | libxslt-dev \ |
52 | libudev-dev \ | 25 | libudev-dev \ |
53 | tslib-dev \ | 26 | tslib-dev \ |
54 | ${MACHINE_EXTRA_INSTALL} \ | 27 | ${MACHINE_EXTRA_INSTALL_SDK} \ |
55 | " | 28 | " |