From 495d04413c691e6782b93e12fdcbb59bddbf2596 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Dec 2014 14:48:56 +0200 Subject: No need for preferred version for gpu-viv-bin-mx6q Change-Id: I59141996d03c8600b2a4d131a987e618e5ff7f37 Reviewed-by: Eirik Aavitsland --- conf/distro/include/imx6qsabresd.conf | 3 --- conf/distro/include/nitrogen6x.conf | 3 --- 2 files changed, 6 deletions(-) diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 033ff07..200f25e 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -32,9 +32,6 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" -PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" -PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" - DISTRO_FEATURES_DEFAULT += "wayland" MACHINE_EXTRA_INSTALL = "\ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 088514e..9059b07 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -43,9 +43,6 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" -PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.1-hfp" -PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" - KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb" DISTRO_FEATURES_DEFAULT += "wayland" -- cgit v1.2.3-54-g00ecf From e5e9f7cae18db59b4d355a918bbf37fa200810db Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Dec 2014 09:37:48 +0200 Subject: gstreamer: include jpegenc gst plugin Needed for camera support. Change-Id: I6aceb232d7f4a260081e5a44a69271f535d2aec2 Reviewed-by: Gatis Paeglis --- recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index dd8b176..f9892dc 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -42,6 +42,7 @@ RDEPENDS_${PN} = "\ gst-plugins-good-video4linux2 \ gst-plugins-good-multifile \ gst-plugins-good-videocrop \ + gst-plugins-good-jpeg \ gst-plugins-ugly-rmdemux \ gst-plugins-ugly-asf \ gst-plugins-ugly-a52dec \ -- cgit v1.2.3-54-g00ecf From 44bb65f9d300b71a33ee9b47f21dcad81e1c1c54 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Dec 2014 14:44:42 +0200 Subject: adbd: upgrade to android-5.0.1_r1 Move to latest version of adbd. Enable adb listen to both usb and network sockets. Task-number: QTEE-875 Change-Id: I6439356dc036ed372c17a71168809cf639a326a3 Reviewed-by: Rainer Keller --- recipes/adbd/adbd.bb | 12 +- recipes/adbd/files/Makefile.adbd | 10 +- recipes/adbd/files/adbd.patch | 264 ++++++++++++++++++++++++++------------- 3 files changed, 185 insertions(+), 101 deletions(-) diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 74d6a8a..89aa4ce 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -24,23 +24,23 @@ DESCRIPTION = "Android Debug Bridge Daemon" HOMEPAGE = "http://developer.android.com/tools/help/adb.html" SECTION = "devel" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://NOTICE;md5=2ddb23e63b1f9c3c46aaa4195f819a6d" +LIC_FILES_CHKSUM = "file://adb/NOTICE;md5=2ddb23e63b1f9c3c46aaa4195f819a6d" -PV = "android-4.2.2_r1.2" +PV = "android-5.0.1_r1" PR = "r0" SRCREV = "${PV}" RRECOMMENDS_${PN} += "kernel-module-g-ffs" DEPENDS = "openssl" -SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \ - file://adbd.patch;striplevel=2 \ +SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https;branch=lollipop-release;name=core \ + file://adbd.patch \ file://Makefile.adbd \ file://adb-init \ file://defaults \ " -S = "${WORKDIR}/git/adb" +S = "${WORKDIR}/git" FILES_${PN} += "${bindir}/adbd" @@ -51,7 +51,7 @@ do_configure() { } do_compile() { - make -f ${WORKDIR}/Makefile.adbd + make -f ${WORKDIR}/Makefile.adbd -C adb } do_install() { diff --git a/recipes/adbd/files/Makefile.adbd b/recipes/adbd/files/Makefile.adbd index a24b670..bcbfd7a 100644 --- a/recipes/adbd/files/Makefile.adbd +++ b/recipes/adbd/files/Makefile.adbd @@ -1,6 +1,5 @@ LOCAL_SRC_FILES := \ adb.c \ - backup_service.c \ fdevent.c \ transport.c \ transport_local.c \ @@ -12,9 +11,7 @@ LOCAL_SRC_FILES := \ jdwp_service.c \ framebuffer_service.c \ remount_service.c \ - usb_linux_client.c \ - log_service.c \ - utils.c + usb_linux_client.c LOCAL_OBJ_FILES=$(LOCAL_SRC_FILES:%.c=%.o) @@ -23,8 +20,7 @@ LIBCUTILS_SRC_FILES := \ ../libcutils/socket_local_client.c \ ../libcutils/socket_local_server.c \ ../libcutils/socket_loopback_client.c \ - ../libcutils/socket_loopback_server.c \ - ../libcutils/list.c + ../libcutils/socket_loopback_server.c LIBCUTILS_OBJ_FILES=$(LIBCUTILS_SRC_FILES:%.c=%.o) @@ -35,4 +31,4 @@ adbd: $(LOCAL_OBJ_FILES) $(LIBCUTILS_OBJ_FILES) $(CC) -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC %.o: %.c - $(CC) -O2 -g -DALLOW_ADBD_ROOT -DADB_QEMU=0 -DADB_HOST=0 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC + $(CC) -O2 -g -DADB_QEMU=0 -DADB_HOST=0 -Wall -Wno-unused-parameter -D_XOPEN_SOURCE -D_GNU_SOURCE -c $^ -o $@ -isystem . -I../include/ -DHAVE_TERMIO_H -DHAVE_FORKEXEC diff --git a/recipes/adbd/files/adbd.patch b/recipes/adbd/files/adbd.patch index 110b021..479a049 100644 --- a/recipes/adbd/files/adbd.patch +++ b/recipes/adbd/files/adbd.patch @@ -1,8 +1,21 @@ diff --git a/adb/adb.c b/adb/adb.c -index 07bfbe5..c8f37ff 100644 +index 10a1e0d..99fca49 100644 --- a/adb/adb.c +++ b/adb/adb.c -@@ -141,7 +141,7 @@ void adb_trace_init(void) +@@ -35,12 +35,10 @@ + + #if !ADB_HOST + #include +-#include + #include + #include + #include + #include +-#include + #else + #include "usb_vendors.h" + #endif +@@ -147,7 +145,7 @@ void adb_trace_init(void) } } @@ -11,7 +24,7 @@ index 07bfbe5..c8f37ff 100644 /* * Implements ADB tracing inside the emulator. */ -@@ -282,6 +282,22 @@ static void send_close(unsigned local, unsigned remote, atransport *t) +@@ -288,6 +286,22 @@ static void send_close(unsigned local, unsigned remote, atransport *t) send_packet(p, t); } @@ -34,104 +47,176 @@ index 07bfbe5..c8f37ff 100644 static size_t fill_connect_data(char *buf, size_t bufsize) { #if ADB_HOST -@@ -1056,31 +1072,7 @@ static int should_drop_privileges() { - #ifndef ALLOW_ADBD_ROOT - return 1; - #else /* ALLOW_ADBD_ROOT */ -- int secure = 0; -- char value[PROPERTY_VALUE_MAX]; -- -- /* run adbd in secure mode if ro.secure is set and -- ** we are not in the emulator +@@ -1344,50 +1358,11 @@ int adb_main(int is_daemon, int server_port) + " unchanged.\n"); + } + +- /* add extra groups: +- ** AID_ADB to access the USB driver +- ** AID_LOG to read system logs (adb logcat) +- ** AID_INPUT to diagnose input issues (getevent) +- ** AID_INET to diagnose network issues (netcfg, ping) +- ** AID_GRAPHICS to access the frame buffer +- ** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump) +- ** AID_SDCARD_R to allow reading from the SD card +- ** AID_SDCARD_RW to allow writing to the SD card +- ** AID_NET_BW_STATS to read out qtaguid statistics - */ -- property_get("ro.kernel.qemu", value, ""); -- if (strcmp(value, "1") != 0) { -- property_get("ro.secure", value, "1"); -- if (strcmp(value, "1") == 0) { -- // don't run as root if ro.secure is set... -- secure = 1; +- gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS, +- AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW, +- AID_NET_BW_STATS }; +- if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) { +- exit(1); +- } - -- // ... except we allow running as root in userdebug builds if the -- // service.adb.root property has been set by the "adb root" command -- property_get("ro.debuggable", value, ""); -- if (strcmp(value, "1") == 0) { -- property_get("service.adb.root", value, ""); -- if (strcmp(value, "1") == 0) { -- secure = 0; -- } +- /* don't listen on a port (default 5037) if running in secure mode */ +- /* don't run as root if we are running in secure mode */ +- if (should_drop_privileges()) { +- drop_capabilities_bounding_set_if_needed(); + +- /* then switch user and group to "shell" */ +- if (setgid(AID_SHELL) != 0) { +- exit(1); +- } +- if (setuid(AID_SHELL) != 0) { +- exit(1); +- } +- +- D("Local port disabled\n"); +- } else { +- char local_name[30]; +- if ((root_seclabel != NULL) && (is_selinux_enabled() > 0)) { +- // b/12587913: fix setcon to allow const pointers +- if (setcon((char *)root_seclabel) < 0) { +- exit(1); - } - } -- } -- return secure; -+ return 0; - #endif /* ALLOW_ADBD_ROOT */ - } - #endif /* !ADB_HOST */ -@@ -1543,7 +1535,9 @@ int main(int argc, char **argv) +- build_local_name(local_name, sizeof(local_name), server_port); +- if(install_listener(local_name, "*smartsocket*", NULL, 0)) { +- exit(1); +- } ++ char local_name[30]; ++ build_local_name(local_name, sizeof(local_name), server_port); ++ if(install_listener(local_name, "*smartsocket*", NULL, 0)) { ++ exit(1); + } + + int usb = 0; +@@ -1408,10 +1383,9 @@ int adb_main(int is_daemon, int server_port) + printf("using port=%d\n", port); + // listen on TCP port specified by service.adb.tcp.port property + local_init(port); +- } else if (!usb) { +- // listen on default port +- local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT); + } ++ // listen on default port ++ local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT); + + D("adb_main(): pre init_jdwp()\n"); + init_jdwp(); +@@ -1695,7 +1669,6 @@ int main(int argc, char **argv) #else /* If adbd runs inside the emulator this will enable adb tracing via * adb-debug qemud service in the emulator. */ -+#if ADB_QEMU - adb_qemu_trace_init(); -+#endif - if((argc > 1) && (!strcmp(argv[1],"recovery"))) { - adb_device_banner = "recovery"; - recovery_mode = 1; -diff --git a/adb/adb.h b/adb/adb.h -index 9da8af8..ae3dd31 100644 ---- a/adb/adb.h -+++ b/adb/adb.h -@@ -363,7 +363,7 @@ typedef enum { - - #if ADB_TRACE +- adb_qemu_trace_init(); + while(1) { + int c; + int option_index = 0; +diff --git a/adb/adb_trace.h b/adb/adb_trace.h +index 8a5d9f8..01c4c06 100644 +--- a/adb/adb_trace.h ++++ b/adb/adb_trace.h +@@ -22,7 +22,7 @@ + #endif --#if !ADB_HOST -+#if !ADB_HOST && ADB_QEMU - /* - * When running inside the emulator, guest's adbd can connect to 'adb-debug' - * qemud service that can display adb trace messages (on condition that emulator + /* define ADB_TRACE to 1 to enable tracing support, or 0 to disable it */ +-#define ADB_TRACE 1 ++#define ADB_TRACE 0 + + /* IMPORTANT: if you change the following list, don't + * forget to update the corresponding 'tags' table in +diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c +index 7933858..3cbd0cd 100644 +--- a/adb/file_sync_service.c ++++ b/adb/file_sync_service.c +@@ -26,7 +26,6 @@ + + #include + #include +-#include + #include "sysdeps.h" + + #define TRACE_TAG TRACE_SYNC +@@ -73,7 +72,6 @@ static int mkdirs(char *name) + *x = '/'; + return ret; + } +- selinux_android_restorecon(name, 0); + } + *x++ = '/'; + } +@@ -251,7 +249,6 @@ static int handle_send_file(int s, char *path, uid_t uid, + if(fd >= 0) { + struct utimbuf u; + adb_close(fd); +- selinux_android_restorecon(path, 0); + u.actime = timestamp; + u.modtime = timestamp; + utime(path, &u); diff --git a/adb/remount_service.c b/adb/remount_service.c -index 4cb41e7..6cfc2c6 100644 +index 72d15a1..df64799 100644 --- a/adb/remount_service.c +++ b/adb/remount_service.c -@@ -77,12 +77,12 @@ static int remount_system() - return 0; - } +@@ -28,7 +28,7 @@ + #include "adb.h" -- dev = find_mount("/system"); -+ dev = find_mount("/"); - if (!dev) - return -1; +-static int system_ro = 1; ++static int system_ro = 0; + static int vendor_ro = 1; -- system_ro = mount(dev, "/system", "none", MS_REMOUNT, NULL); -+ system_ro = mount(dev, "/", "none", MS_REMOUNT, NULL); + /* Returns the device used to mount a directory in /proc/mounts */ +@@ -84,7 +84,7 @@ static int remount(const char* dir, int* dir_ro) + int fd; + int OFF = 0; - free(dev); +- if (dir_ro == 0) { ++ if (*dir_ro == 0) { + return 0; + } + +@@ -132,7 +132,6 @@ void remount_service(int fd, void *cookie) + else { + write_string(fd, "remount failed\n"); + } +- + adb_close(fd); + } diff --git a/adb/services.c b/adb/services.c -index 495a083..eb895ae 100644 +index e61371a..8d4e2b5 100644 --- a/adb/services.c +++ b/adb/services.c -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ # include # endif #else -# include -+# include ++# include + # include #endif - typedef struct stinfo stinfo; -@@ -182,7 +182,7 @@ void reboot_service(int fd, void *arg) - waitpid(pid, &ret, 0); +@@ -127,7 +127,7 @@ void reboot_service(int fd, void *arg) + goto cleanup; } -- ret = android_reboot(ANDROID_RB_RESTART2, 0, (char *) arg); -+ ret = reboot(LINUX_REBOOT_CMD_RESTART2, 0, (char *) arg); +- ret = property_set(ANDROID_RB_PROPERTY, property_val); ++ ret = reboot(RB_AUTOBOOT); if (ret < 0) { - snprintf(buf, sizeof(buf), "reboot failed: %s\n", strerror(errno)); + snprintf(buf, sizeof(buf), "reboot failed: %d\n", ret); writex(fd, buf, strlen(buf)); -@@ -334,7 +334,7 @@ static int create_subprocess(const char *cmd, const char *arg0, const char *arg1 +@@ -302,7 +302,7 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg #if ADB_HOST #define SHELL_COMMAND "/bin/sh" #else @@ -141,10 +226,10 @@ index 495a083..eb895ae 100644 #if !ADB_HOST diff --git a/adb/transport_local.c b/adb/transport_local.c -index 96a24ba..51c85fc 100644 +index 948cc15..d6d0a3a 100644 --- a/adb/transport_local.c +++ b/adb/transport_local.c -@@ -186,7 +186,7 @@ static void *server_socket_thread(void * arg) +@@ -189,7 +189,7 @@ static void *server_socket_thread(void * arg) } /* This is relevant only for ADB daemon running inside the emulator. */ @@ -153,7 +238,7 @@ index 96a24ba..51c85fc 100644 /* * Redefine open and write for qemu_pipe.h that contains inlined references * to those routines. We will redifine them back after qemu_pipe.h inclusion. -@@ -304,7 +304,7 @@ void local_init(int port) +@@ -307,7 +307,7 @@ void local_init(int port) if(HOST) { func = client_socket_thread; } else { @@ -162,16 +247,19 @@ index 96a24ba..51c85fc 100644 func = server_socket_thread; #else /* For the adbd daemon in the system image we need to distinguish -diff --git a/adb/transport_usb.c b/adb/transport_usb.c -index ee6b637..c5e1408 100644 ---- a/adb/transport_usb.c -+++ b/adb/transport_usb.c -@@ -18,7 +18,7 @@ - #include - #include - --#include -+#include "sysdeps.h" - - #define TRACE_TAG TRACE_TRANSPORT - #include "adb.h" +diff --git a/include/cutils/properties.h b/include/cutils/properties.h +index 798db8b..c86f312 100644 +--- a/include/cutils/properties.h ++++ b/include/cutils/properties.h +@@ -19,8 +19,9 @@ + + #include + #include +-#include +-#include ++ ++#define PROP_NAME_MAX 32 ++#define PROP_VALUE_MAX 92 + + #ifdef __cplusplus + extern "C" { -- cgit v1.2.3-54-g00ecf From b2e069ed1843413bb1b1d98045253bcbbde0ef5f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jan 2015 11:52:41 +0200 Subject: Don't remove things from environment setup script The environment setup script is helpful when compiling other than Qt apps. Task-number: QTEE-881 Change-Id: Iabfc5ef4b807ec19b13d575b4555b56024f57614 Reviewed-by: Kalle Viironen --- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 05acf09..0540596 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -28,22 +28,3 @@ TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packa TOOLCHAIN_TARGET_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-target" require recipes-core/meta/meta-toolchain.bb - -toolchain_create_sdk_env_script_append() { - sed -i -e '/export CC/d' $script - sed -i -e '/export CXX/d' $script - sed -i -e '/export CFLAGS/d' $script - sed -i -e '/export CXXFLAGS/d' $script - sed -i -e '/export LDFLAGS/d' $script - sed -i -e '/export CPPFLAGS/d' $script - sed -i -e '/export CFLAGS/d' $script - sed -i -e '/export CPP/d' $script - sed -i -e '/export AS/d' $script - sed -i -e '/export LD/d' $script - sed -i -e '/export STRIP/d' $script - sed -i -e '/export RANLIB/d' $script - sed -i -e '/export OBJCOPY/d' $script - sed -i -e '/export OBJDUMP/d' $script - sed -i -e '/export AR/d' $script - sed -i -e '/export NM/d' $script -} -- cgit v1.2.3-54-g00ecf From eccd2cb1c02145d66c780cc6d40c585db9dd9fd1 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 6 Jan 2015 09:52:13 +0100 Subject: Include OpenCV in i.MX6 images and toolchains Change-Id: I5747291fd7954030e2f4aea5ee3b415b1f82673e Reviewed-by: Samuli Piippo --- conf/distro/include/imx6qsabresd.conf | 4 ++++ conf/distro/include/nitrogen6x.conf | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 200f25e..bf1105e 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -42,6 +42,9 @@ MACHINE_EXTRA_INSTALL = "\ wayland \ weston \ weston-examples \ + libopencv-core \ + libopencv-imgproc \ + libopencv-objdetect \ " MACHINE_EXTRA_INSTALL_SDK = " \ @@ -52,6 +55,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libgles2-mx6-dev \ libwayland-egl-mx6-dev \ libxkbcommon-dev \ + opencv-dev \ " MACHINE_EXTRA_INSTALL_SDK_HOST = "\ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 9059b07..1c7624d 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -56,6 +56,9 @@ MACHINE_EXTRA_INSTALL = "\ weston \ weston-examples \ bcm4330-nvram-config \ + libopencv-core \ + libopencv-imgproc \ + libopencv-objdetect \ " MACHINE_EXTRA_INSTALL_SDK = " \ @@ -66,6 +69,7 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libgles2-mx6-dev \ libwayland-egl-mx6-dev \ libxkbcommon-dev \ + opencv-dev \ " MACHINE_EXTRA_INSTALL_SDK_HOST = "\ -- cgit v1.2.3-54-g00ecf From 654cd973dc625dadd05cd6a9378d0ba4e79c2301 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jan 2015 12:42:09 +0200 Subject: Add LinuxMint-17.1 to sanity tested distros Change-Id: I6cc4fbe6b2d7e8811c61083a262bd64381439855 Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 5d8ba73..488bf71 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -33,6 +33,7 @@ SANITY_TESTED_DISTROS += " \ Ubuntu 11.04 \n \ LinuxMint-14 \n \ LinuxMint-16 \n \ + LinuxMint-17.1 \n \ " SYSVINIT_ENABLED_GETTYS = "" -- cgit v1.2.3-54-g00ecf From 00a952345274ff3e0190fabf39984ea5dc08a44a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jan 2015 10:16:40 +0200 Subject: apalis: add dependency to u-boot-script u-boot-script-toradex needs to be built before bootfs is built, so add dependency to it. Change-Id: Ife8b86e83b48a60922fa5138c8f452726bda8cc5 Reviewed-by: Eirik Aavitsland --- conf/distro/include/apalis-imx6.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 0d69898..8aa50b7 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -28,7 +28,7 @@ BOOTFS_CONTENT = "\ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ " -BOOTFS_DEPENDS = "u-boot:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ -- cgit v1.2.3-54-g00ecf From 2504e6b4cf074d8580043ced5bce844418e5fafd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jan 2015 10:13:13 +0200 Subject: change BUILDDIR var since it's used by poky BUILDDIR is exported by the poky env script, which caused problems on our env script when setting up second build dir. Change-Id: Ieeecff6ebfc5ac185de98870dc8c4305c882684f Reviewed-by: Andy Nichols --- scripts/setup-environment.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 4fd881c..ad1405b 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -28,7 +28,7 @@ while test -n "$1"; do return 0 ;; *) - BUILDDIR=$1 + BUILDDIRECTORY=$1 ;; esac shift @@ -45,9 +45,9 @@ if [ -z "$MACHINE" ]; then return 1 fi -BUILDDIR=${BUILDDIR:-build-${MACHINE}} +BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}} -if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then +if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then case ${MACHINE} in apalis-imx6|colibri-vf) LAYERSCONF="bblayers.conf.toradex.sample" @@ -76,8 +76,8 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then ;; esac - mkdir -p ${PWD}/${BUILDDIR}/conf - cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIR}/conf/bblayers.conf + mkdir -p ${PWD}/${BUILDDIRECTORY}/conf + cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../) @@ -85,11 +85,12 @@ if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then fi export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf" -. sources/poky/oe-init-build-env ${BUILDDIR} +. sources/poky/oe-init-build-env ${BUILDDIRECTORY} # use sources from Qt SDK if that is available sed -i -e "/QT_SDK_PATH/s:\"\":\"${QT_SDK_PATH}\":" conf/local.conf +unset BUILDDIRECTORY unset QT_SDK_PATH unset TEMPLATECONF unset LAYERSCONF -- cgit v1.2.3-54-g00ecf From 3c75c9439345960ac138029ddbd44a583c0d01df Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Jan 2015 15:49:21 +0200 Subject: With '--device all' use all meta layers Change-Id: Ic1570b47511596806adf5d3feab2e4d1dccbaefd Reviewed-by: Eirik Aavitsland --- b2qt-init-build-env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 2ef61c3..686fdcf 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -82,6 +82,9 @@ get_repo() { get_groups() { case ${DEVICE} in + all) + PROJECT_GROUPS="all" + ;; apalis-imx6|colibri-vf) PROJECT_GROUPS="toradex" ;; -- cgit v1.2.3-54-g00ecf From 943121c7af2f5db831ded0feb9808f649e58e0b6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 26 Jan 2015 10:07:51 +0200 Subject: nitrogen6x: update kernel revision Latest kernel from dizzy branch, will be part of daisy at some point. Fixes support for the Nit6X_800x480 display. Change-Id: I1a886998b3e3f12750bfc93f2d06f33047aa850f Reviewed-by: Eirik Aavitsland --- meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 19c2c13..415388f 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -23,6 +23,10 @@ # kernel image files are not needed in the image RDEPENDS_kernel-base = "" +LOCALVERSION = "-1.0.2_ga+yocto" +SRCBRANCH = "boundary-imx_3.10.17_1.0.2_ga" +SRCREV = "4ed13da788a463b1c5b6b26ecc2524d500ad1e9b" + do_configure_prepend() { # fix imx-vpu break on video decoding echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig -- cgit v1.2.3-54-g00ecf From 7c2791f226df89f5b0bcffc2964e96db9dee5f0f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 29 Jan 2015 10:34:25 +0200 Subject: Start dbus session bus at boot Session address is saved to /var/run/dbus/session_bus_address, which is read in /etc/profile.d/dbus-session-address for interactive login and by adbd for applications launched from QtCreator. Change-Id: I8e1f43bdb2f7a7b0450dacf39890cf149459bbf4 Reviewed-by: Rainer Keller --- recipes/adbd/files/adb-init | 4 + recipes/dbus/dbus/dbus-session-address | 5 + recipes/dbus/dbus/dbus-session.init | 103 +++++++++++++++++++++ recipes/dbus/dbus_1.6.18.bbappend | 47 ++++++++++ .../packagegroup-b2qt-embedded-base.bb | 1 + 5 files changed, 160 insertions(+) create mode 100644 recipes/dbus/dbus/dbus-session-address create mode 100644 recipes/dbus/dbus/dbus-session.init create mode 100644 recipes/dbus/dbus_1.6.18.bbappend diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init index 92500d7..d8920b8 100755 --- a/recipes/adbd/files/adb-init +++ b/recipes/adbd/files/adb-init @@ -4,6 +4,10 @@ DAEMON=/usr/bin/adbd . /etc/default/adbd +if [ -e /var/run/dbus/session_bus_address ]; then + . /var/run/dbus/session_bus_address +fi + case "$1" in start) if [ "$USE_ETHERNET" = "no" ]; then diff --git a/recipes/dbus/dbus/dbus-session-address b/recipes/dbus/dbus/dbus-session-address new file mode 100644 index 0000000..3f85306 --- /dev/null +++ b/recipes/dbus/dbus/dbus-session-address @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ -e /var/run/dbus/session_bus_address ]; then + . /var/run/dbus/session_bus_address +fi diff --git a/recipes/dbus/dbus/dbus-session.init b/recipes/dbus/dbus/dbus-session.init new file mode 100644 index 0000000..11a6757 --- /dev/null +++ b/recipes/dbus/dbus/dbus-session.init @@ -0,0 +1,103 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: dbus +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: D-Bus session message bus +# Description: D-Bus is a simple interprocess messaging system, used +# for sending messages between applications. +### END INIT INFO +# +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +# set -e + +# Source function library. +. /etc/init.d/functions + +DAEMON=@bindir@/dbus-launch +NAME=dbus-session +ADDRESSFILE=/var/run/dbus/session_bus_address +UUIDDIR=/var/lib/dbus +DESC="session message bus" + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +if [ -e $ADDRESSFILE ]; then + . $ADDRESSFILE +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + echo -n "Starting $DESC: " + $DAEMON --auto-syntax > $ADDRESSFILE + echo "$NAME." +} + +shut_it_down() +{ + echo -n "Stopping $DESC: " + kill $DBUS_SESSION_BUS_PID + echo "$NAME." +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --session --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +status_it() +{ + if kill -0 $DBUS_SESSION_BUS_PID 2>/dev/null; then + echo "$NAME (pid $DBUS_SESSION_BUS_PID) is running..." + return 0 + else + echo "$NAME is stopped" + fi + return 3 +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + status) + status_it + exit $? + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|status|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/dbus/dbus_1.6.18.bbappend b/recipes/dbus/dbus_1.6.18.bbappend new file mode 100644 index 0000000..d824989 --- /dev/null +++ b/recipes/dbus/dbus_1.6.18.bbappend @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += " \ + file://dbus-session.init \ + file://dbus-session-address \ + " + +INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" +INITSCRIPT_NAME_${PN}-session-init = "dbus-session" +INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." + +PACKAGES =+ "${PN}-session-init" +FILES_${PN}-session-init = " \ + ${sysconfdir}/init.d/dbus-session \ + ${sysconfdir}/profile.d/dbus-session-address \ + " + +do_install_append_class-target() { + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + fi + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ +} diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index dd1ab44..f40173b 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -51,5 +51,6 @@ RDEPENDS_${PN} = "\ ttf-opensans \ ttf-dejavu-common \ ttf-dejavu-sans \ + dbus-session-init \ ${MACHINE_EXTRA_INSTALL} \ " -- cgit v1.2.3-54-g00ecf From b4f92efaeb4f9d0b60e1806153d77bd347101140 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:55:23 +0200 Subject: Don't explicitly install jpeg to image This is attempt to fix issue where, on some targets, bitbake fails with: Cannot satisfy the following dependencies for packagegroup-b2qt-embedded-base: * jpeg * jpeg will still be included in the images due to other dependencies. Change-Id: I3f6f388c10f196785eafe020d2d6256efb500643 Reviewed-by: Eirik Aavitsland --- recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index f40173b..2c986ac 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -34,7 +34,6 @@ RDEPENDS_${PN} = "\ openssl \ openssl-misc \ libpng \ - jpeg \ tiff \ libxslt \ icu \ -- cgit v1.2.3-54-g00ecf From ed50807446e0a086e92ba640cac3941599096d92 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:45:01 +0200 Subject: scripts: add option to upload all builds Change-Id: I520e834872d72e1e69519f86220b5400028d644e Reviewed-by: Eirik Aavitsland --- scripts/build-all.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/scripts/build-all.sh b/scripts/build-all.sh index 63cfc9b..6bb939e 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -21,6 +21,15 @@ ## ############################################################################# +while test -n "$1"; do + case "$1" in + "--upload") + UPLOAD=1 + ;; + esac + shift +done + echo "-------------------------------------" >> build.log for DIR in $(ls -d build-*); do ( @@ -29,7 +38,14 @@ for DIR in $(ls -d build-*); do echo "${MACHINE}:" >> ../build.log echo " start: $(date)" >> ../build.log - bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk || echo " build failed" >> ../build.log + bitbake b2qt-embedded-image meta-toolchain-b2qt-embedded-sdk + if [ $? = 0 ]; then + if [ -n "${UPLOAD}" ]; then + ../sources/meta-b2qt/scripts/upload.sh + fi + else + echo " build failed" >> ../build.log + fi echo " end: $(date)" >> ../build.log ) done -- cgit v1.2.3-54-g00ecf From 3d363df976d644aab7592be1a32bd77935ba679c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 16:40:42 +0200 Subject: dbus: rename bbappend to work with tibidabo Change-Id: Ib332c8e0019e7c34ca10aa4e09e4bfcc627ef4fe Reviewed-by: Eirik Aavitsland --- recipes/dbus/dbus_%.bbappend | 47 +++++++++++++++++++++++++++++++++++++++ recipes/dbus/dbus_1.6.18.bbappend | 47 --------------------------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 recipes/dbus/dbus_%.bbappend delete mode 100644 recipes/dbus/dbus_1.6.18.bbappend diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend new file mode 100644 index 0000000..d824989 --- /dev/null +++ b/recipes/dbus/dbus_%.bbappend @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += " \ + file://dbus-session.init \ + file://dbus-session-address \ + " + +INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" +INITSCRIPT_NAME_${PN}-session-init = "dbus-session" +INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." + +PACKAGES =+ "${PN}-session-init" +FILES_${PN}-session-init = " \ + ${sysconfdir}/init.d/dbus-session \ + ${sysconfdir}/profile.d/dbus-session-address \ + " + +do_install_append_class-target() { + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + fi + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ +} diff --git a/recipes/dbus/dbus_1.6.18.bbappend b/recipes/dbus/dbus_1.6.18.bbappend deleted file mode 100644 index d824989..0000000 --- a/recipes/dbus/dbus_1.6.18.bbappend +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI += " \ - file://dbus-session.init \ - file://dbus-session-address \ - " - -INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" -INITSCRIPT_NAME_${PN}-session-init = "dbus-session" -INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." - -PACKAGES =+ "${PN}-session-init" -FILES_${PN}-session-init = " \ - ${sysconfdir}/init.d/dbus-session \ - ${sysconfdir}/profile.d/dbus-session-address \ - " - -do_install_append_class-target() { - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh - install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session - fi - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ -} -- cgit v1.2.3-54-g00ecf From 102db5f9cee7f780f4e62b69f0116ab61f0cdb42 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 12:18:40 +0200 Subject: Update distro version Moving to dizzy (1.7) Change-Id: I5edf8a1944cd57b2bf7ebc9520b940dca8a6e797 Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 488bf71..f4771f2 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -24,7 +24,7 @@ include conf/distro/poky.conf DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" -DISTRO_VERSION = "1.6" +DISTRO_VERSION = "1.7" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "B2Qt " -- cgit v1.2.3-54-g00ecf From 4ea598eed2e49059872cbb0cdc9640dbc5bc9392 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:22:32 +0200 Subject: Syntax for kernel module autoloading was changed Change-Id: I84aa29cc7790ae57b497a7a3aad261f9fa92a455 Reviewed-by: Andy Nichols --- conf/distro/include/imx6qsabresd.conf | 2 +- conf/distro/include/raspberrypi.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index bf1105e..f3605a5 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -62,7 +62,7 @@ MACHINE_EXTRA_INSTALL_SDK_HOST = "\ wayland-nativesdk \ " -module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture" +KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" # add support for both imx6qsabresd and imx6dlsabresd KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \ diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 33f3728..141241a 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -36,8 +36,8 @@ MACHINE_EXTRA_INSTALL_SDK = " \ userland-dev \ " -module_autoload_snd-bcm2835 = "snd-bcm2835" -module_autoload_bcm2835-v4l2 = "bcm2835-v4l2" +KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2" +KERNEL_MODULE_PROBECONF += "bcm2835-v4l2" module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" # additional memory for GPU -- cgit v1.2.3-54-g00ecf From e9572e7d14dafe0d8c27d775e5a1f9a4cd7a1bce Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:23:24 +0200 Subject: toredex: add more BBMASKs to support dizzy Toradex doesn't have branch for dizzy, so more BBMASKs are needed to have it working. Change-Id: I49d4462f4f0cdb3857dea8aeddfb4e542bb59898 Reviewed-by: Eirik Aavitsland Reviewed-by: Andy Nichols --- conf/distro/include/toradex.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 616b77f..67c5c75 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -1 +1 @@ -BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear" +BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" -- cgit v1.2.3-54-g00ecf From 4a13a522a080f5c3c66948f081aecaa94fd6fc9b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:24:49 +0200 Subject: sabre: update u-boot patch Upstream was changed and already includes the I2C initialization. Change-Id: I3e57a248a49924eff086eea7694ccd5fa424f905 Reviewed-by: Andy Nichols --- ...001-Updated-kernel-arguments-for-sabre-sd.patch | 87 +++------------------- 1 file changed, 11 insertions(+), 76 deletions(-) diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch index 59a4505..d6e1e21 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch +++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch @@ -1,84 +1,19 @@ -From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001 +From ecd64c7926b7aa25b028278666abad582e7cdea8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 10:23:50 +0300 Subject: [PATCH] Updated kernel arguments for sabre sd -- Enable I2C - detect if hdmi is used and change video arguments accordingly - disable blanking and cursor blinking - --- - board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++ - include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++ - 2 files changed, 44 insertions(+) + include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) -diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c -index 12d8c56..303b774 100644 ---- a/board/freescale/mx6sabresd/mx6sabresd.c -+++ b/board/freescale/mx6sabresd/mx6sabresd.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -24,6 +25,7 @@ - #include - #include - #include -+#include - DECLARE_GLOBAL_DATA_PTR; - - #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ -@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR; - #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) - -+#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ -+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ -+ PAD_CTL_ODE | PAD_CTL_SRE_FAST) -+ -+#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL) -+ - int dram_init(void) - { - gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); -@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = { - MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), - }; - -+static struct i2c_pads_info i2c_pad_info1 = { -+ .scl = { -+ .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD, -+ .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD, -+ .gp = IMX_GPIO_NR(4, 12) -+ }, -+ .sda = { -+ .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD, -+ .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD, -+ .gp = IMX_GPIO_NR(4, 13) -+ } -+}; -+ - static void setup_spi(void) - { - imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); -@@ -477,6 +498,8 @@ int board_init(void) - setup_spi(); - #endif - -+ setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); -+ - return 0; - } - diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h -index 5ee7fa5..b83bf74 100644 +index c81e9e9..9296b9b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h -@@ -85,6 +85,13 @@ +@@ -87,6 +87,13 @@ /* Command definition */ #include @@ -92,7 +27,7 @@ index 5ee7fa5..b83bf74 100644 #define CONFIG_CMD_BMODE #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR -@@ -117,6 +124,15 @@ +@@ -119,6 +126,15 @@ #define EMMC_ENV "" #endif @@ -107,8 +42,8 @@ index 5ee7fa5..b83bf74 100644 + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ - "uimage=uImage\0" \ -@@ -144,7 +160,11 @@ + "image=zImage\0" \ +@@ -146,7 +162,11 @@ "fi; " \ "fi\0" \ EMMC_ENV \ @@ -120,8 +55,8 @@ index 5ee7fa5..b83bf74 100644 "root=${mmcroot}\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ -@@ -153,6 +173,7 @@ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +@@ -155,6 +175,7 @@ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ + "run videoargs; " \ @@ -129,5 +64,5 @@ index 5ee7fa5..b83bf74 100644 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ -- -1.8.3.2 +1.9.1 -- cgit v1.2.3-54-g00ecf From 4a8019ef9314bba9a8ecaa01a899b9602fab744b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:26:40 +0200 Subject: BBB: fix libgles-omap3 build 4.x version of libgles-omap4 did not build correctly any more, since correct compiler flags were not used. Need to use the CC instead of PLAT_CC which is modified by the makefiles. Change-Id: I23f4f757db392a65a6322be857bd47c06047f38b Reviewed-by: Andy Nichols --- meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb index 1c9824c..9265ffe 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb @@ -1,6 +1,6 @@ require recipes-graphics/libgles/libgles-omap3-no-x.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${COREBASE}/../meta-ti/recipes-graphics/libgles/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${COREBASE}/../meta-ti/recipes-graphics/libgles/${PN}:" LICENSE = "TI-TSPA" @@ -46,3 +46,10 @@ SRC_URI[sha256sum] := "${@base_contains('TUNE_FEATURES', 'callconvention-hard', S = "${WORKDIR}/Graphics_SDK_${SGXPV}" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FRONTWSEGL.so.1" + +do_configure_append() { + # PLAT_CC might not have needed arguments, so use CC instead. + for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do + sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak + done +} -- cgit v1.2.3-54-g00ecf From f56c2355a8a1bece0afd94783b0b787775781dba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:29:17 +0200 Subject: apalis-imx6: update u-boot patch to match upstream changes Change-Id: I9b53e51a6320c47d7491a87e8fa75ab756871cc8 Reviewed-by: Andy Nichols --- .../0001-Update-default-args-for-apalis-imx6.patch | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch index c7f0f9b..60c5171 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch @@ -1,4 +1,4 @@ -From 7872f8e770a202f41fbcf0372b27eb3669c433a1 Mon Sep 17 00:00:00 2001 +From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Oct 2014 14:53:25 +0200 Subject: [PATCH] Update default args for apalis imx6 @@ -6,14 +6,14 @@ Subject: [PATCH] Update default args for apalis imx6 Boot from sd card by default, disable kernel logs from tty1, and disable cursor blinking. --- - include/configs/apalis-imx6.h | 15 ++++++++------- + include/configs/apalis_imx6.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h -index 3fb17e2..728c5dd 100644 ---- a/include/configs/apalis-imx6.h -+++ b/include/configs/apalis-imx6.h -@@ -205,18 +205,19 @@ +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 5d32118..289d611 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -212,14 +212,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ @@ -32,6 +32,10 @@ index 3fb17e2..728c5dd 100644 + "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + #ifndef CONFIG_APALIS_IMX6_V1_0 +@@ -229,7 +229,8 @@ + #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" + #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ @@ -39,7 +43,7 @@ index 3fb17e2..728c5dd 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -229,7 +230,7 @@ +@@ -242,7 +243,7 @@ NFS_BOOTCMD \ SD_BOOTCMD \ "setup=setenv setupargs fec_mac=${ethaddr} " \ @@ -49,5 +53,5 @@ index 3fb17e2..728c5dd 100644 "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ -- -1.8.3.2 +1.9.1 -- cgit v1.2.3-54-g00ecf From ab21133ac95bb50eb2a0a0954d5a8003d9430251 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:39:00 +0200 Subject: wayland: updated patch to support nativesdk Change-Id: I37e305c5d592290d4dff8dd14e1bd224d72be621 Reviewed-by: Andy Nichols --- ...wayland-scanner-when-building-nativesdk-w.patch | 36 ++++++++++------------ recipes/wayland/wayland_1.%.bbappend | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch index 2a691a1..9e5fe4d 100644 --- a/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch +++ b/recipes/wayland/wayland/0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch @@ -1,27 +1,25 @@ -From a9ab89496d32ab42d9f697c43cf8bb04feaeabfa Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 26 Sep 2014 10:39:51 +0300 -Subject: [PATCH] Use native wayland-scanner when building nativesdk-wayland - The wayland-scanner built for the nativesdk cannot be run during the build, so instead use the wayland-scanner from native build. ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index b938d17..84fcdf6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -41,7 +41,7 @@ AM_CFLAGS = $(GCC_CFLAGS) -pthread - protocoldir = $(top_srcdir)/protocol +Upstream-Status: Pending + +Signed-off-by: Samuli Piippo +--- + Makefile.am | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +diff --git a/Makefile.am b/Makefile.am +index c15d8b8..45f7133 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -62,7 +62,7 @@ nodist_libwayland_client_la_SOURCES = \ + pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc if ENABLE_SCANNER --wayland_scanner = $(top_builddir)/src/wayland-scanner +-wayland_scanner = $(top_builddir)/wayland-scanner +wayland_scanner = wayland-scanner - else - wayland_scanner = wayland-scanner - endif + bin_PROGRAMS = wayland-scanner + wayland_scanner_SOURCES = src/scanner.c + wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la -- -1.8.3.2 +1.9.1 diff --git a/recipes/wayland/wayland_1.%.bbappend b/recipes/wayland/wayland_1.%.bbappend index 8df7524..f61301d 100644 --- a/recipes/wayland/wayland_1.%.bbappend +++ b/recipes/wayland/wayland_1.%.bbappend @@ -21,7 +21,7 @@ ############################################################################# FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_class-nativesdk = " file://just-scanner.patch \ +SRC_URI_append_class-nativesdk = " \ file://disable-macro-checks-not-used-for-scanner.patch \ file://0001-Use-native-wayland-scanner-when-building-nativesdk-w.patch \ " -- cgit v1.2.3-54-g00ecf From 7afea7cbc777137c16c64357b62e93280130a81d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Feb 2015 09:40:36 +0200 Subject: scripts: changes on upload script Change the upload location, eglibc was changed to glibc. Change-Id: I080b2af14981d84cdd7f3d3765e56cf33a2d2695 Reviewed-by: Andy Nichols --- scripts/upload.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/upload.sh b/scripts/upload.sh index 406f1d1..1881a1f 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -24,18 +24,18 @@ set -x set -e -RELEASE=4.x -UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto-${RELEASE}/latest +RELEASE=5.5 +UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ if [ ${MACHINE} = "nitrogen6x" ]; then scp tmp/deploy/images/nitrogen6x/b2qt-embedded-image-boot-nitrogen6x.tar.gz ${UPLOADPATH}/b2qt-embedded-image-boot-iMX6.tar.gz scp tmp/deploy/images/nitrogen6x/b2qt-embedded-image-nitrogen6x.tar.gz ${UPLOADPATH}/b2qt-embedded-image-iMX6.tar.gz - scp tmp/deploy/sdk/b2qt-eglibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-eglibc-x86_64-arm-toolchain-iMX6.sh + scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-iMX6.sh elif [ ${MACHINE} = "emulator" ]; then cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd . gzip b2qt-embedded-image-emulator.hdd -f scp b2qt-embedded-image-emulator.hdd.gz ${UPLOADPATH}/ - scp tmp/deploy/sdk/b2qt-eglibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-eglibc-x86_64-i586-toolchain-${MACHINE}.sh + scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-i586-toolchain-${MACHINE}.sh elif [ ${MACHINE} = "imx6qsabresd" ]; then cp tmp/deploy/images/imx6qsabresd/b2qt-embedded-image-boot-imx6qsabresd.tar.gz . cp tmp/deploy/images/imx6dlsabresd/u-boot.imx u-boot-imx6dlsabresd.imx @@ -45,8 +45,8 @@ elif [ ${MACHINE} = "imx6qsabresd" ]; then gzip b2qt-embedded-image-boot-imx6qsabresd.tar scp b2qt-embedded-image-boot-${MACHINE}.tar.gz ${UPLOADPATH}/ scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-${MACHINE}.tar.gz ${UPLOADPATH}/ - scp tmp/deploy/sdk/b2qt-eglibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-eglibc-x86_64-arm-toolchain-${MACHINE}.sh + scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh else scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/ - scp tmp/deploy/sdk/b2qt-eglibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-eglibc-x86_64-arm-toolchain-${MACHINE}.sh + scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh fi -- cgit v1.2.3-54-g00ecf From 4cee106aaa401bf17d8d94f3622a0a38aea80ddb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 6 Feb 2015 12:09:44 +0200 Subject: update repo manifests - manifest_dizzy.xml pulls in HEAD of all the repos - manifest.xml pulls in fixed revision that are currently in staging Change-Id: I3a5acbe91371b7e12c315d19ce2f0e2255c3a08c Reviewed-by: Andy Nichols --- scripts/manifest.xml | 14 ++++++------ scripts/manifest_daisy.xml | 53 ---------------------------------------------- scripts/manifest_dizzy.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 scripts/manifest_daisy.xml create mode 100644 scripts/manifest_dizzy.xml diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 0eb2fb9..694a7a5 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -11,31 +11,31 @@ diff --git a/scripts/manifest_daisy.xml b/scripts/manifest_daisy.xml deleted file mode 100644 index 2668398..0000000 --- a/scripts/manifest_daisy.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml new file mode 100644 index 0000000..a8d9769 --- /dev/null +++ b/scripts/manifest_dizzy.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-54-g00ecf From 48c3aade6534965f6d10677348cdf185b83a69d0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 12 Feb 2015 16:12:27 +0200 Subject: apalis: use uImage for kernel type Upstream recipes have changed default kernel type to zImage, but apalis u-boot scripts still want to use uImage. Also include the new dtb to boot package. Change-Id: I42e807359b725802a747cb69858b981b88432554 Reviewed-by: Andy Nichols --- conf/distro/include/apalis-imx6.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 8aa50b7..99289d3 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -22,9 +22,12 @@ include conf/distro/include/toradex.inc +KERNEL_IMAGETYPE = "uImage" + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ " -- cgit v1.2.3-54-g00ecf From d025004a0d1a78ed67131d30f4251e1faf2d4083 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 16 Feb 2015 12:13:59 +0200 Subject: Support MySQL and PostgreSQL Include client libs for MySQL and PostgreSQL to images and development files to SDK. Enables Qt plugins for mysql and psql to be built. Task-number: QTEE-911 Change-Id: Ia47ccf6b74014e43a243619adb5fbba39ec23c4c Reviewed-by: Rainer Keller --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb | 2 ++ recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb index f4b70bf..5424f0d 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb @@ -49,6 +49,8 @@ RDEPENDS_${PN} += "\ hunspell-dev \ libcap-dev \ wpa-supplicant-dev \ + libmysqlclient-dev \ + libpq-dev \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 2c986ac..d30573e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -51,5 +51,7 @@ RDEPENDS_${PN} = "\ ttf-dejavu-common \ ttf-dejavu-sans \ dbus-session-init \ + libmysqlclient \ + libpq \ ${MACHINE_EXTRA_INSTALL} \ " -- cgit v1.2.3-54-g00ecf From b2397a823399be9ae901d02f0073df5001b75c55 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 12 Feb 2015 14:44:25 +0200 Subject: Performance analysis tools for Linux Build perf with DWARF unwinding support. Kernels older then 3.14 need to be patched to add ARM support. Kernels for tibidabo (3.0) and imx53 (2.6) are too old and would require more patches to be backported, so they are left without unwinding support. RPi needed extra layer to modify the kernel recipe, and linux-imx recipe was renamed so that it doesn't conflict with older tibidabo kernel recipe. Change-Id: Ic8331f8feeace67b32a5ce99ffd3fda517d595d1 Reviewed-by: Andy Nichols Reviewed-by: Ulf Hermann --- conf/bblayers.conf.rpi.sample | 1 + ...RM-perf-add-support-for-perf-registers-API.diff | 128 +++++++++++++++ ...re-up-perf_regs-and-unwind-support-for-AR.patch | 163 +++++++++++++++++++ .../recipes/linux/linux-mainline_3.8.bbappend | 3 + .../recipes/linux/linux-boundary_3.10.17.bbappend | 6 + .../recipes/linux/linux-imx_3.%.bbappend | 35 ----- .../recipes/linux/linux-imx_3.10.%.bbappend | 41 +++++ meta-raspberrypi-extras/conf/layer.conf | 33 ++++ ...re-up-perf_regs-and-unwind-support-for-AR.patch | 171 ++++++++++++++++++++ .../linux/linux-raspberrypi_3.12.26.bbappend | 27 ++++ .../recipes/linux/linux-toradex-fsl_git.bbappend | 6 + ...RM-perf-add-support-for-perf-registers-API.diff | 126 +++++++++++++++ ...re-up-perf_regs-and-unwind-support-for-AR.patch | 172 +++++++++++++++++++++ .../packagegroup-b2qt-embedded-tools.bb | 1 + recipes/perf/perf.bbappend | 2 + 15 files changed, 880 insertions(+), 35 deletions(-) create mode 100644 meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff create mode 100644 meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch delete mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend create mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend create mode 100644 meta-raspberrypi-extras/conf/layer.conf create mode 100644 meta-raspberrypi-extras/recipes/linux/linux-raspberrypi/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch create mode 100644 meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend create mode 100644 recipes/linux/linux/ARM-perf-add-support-for-perf-registers-API.diff create mode 100644 recipes/linux/linux/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch create mode 100644 recipes/perf/perf.bbappend diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index d6bda2e..adc0e68 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -34,6 +34,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-b2qt \ + ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \ " BBLAYERS_NON_REMOVABLE ?= " \ ${BSPDIR}/sources/poky/meta \ diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff new file mode 100644 index 0000000..13b251a --- /dev/null +++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-add-support-for-perf-registers-API.diff @@ -0,0 +1,128 @@ +From 8221f36672b7a1336c2bf245c394f0b5453784a1 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 26 Sep 2013 12:36:35 +0100 +Subject: [PATCH] ARM: perf: add support for perf registers API + +This patch implements the functions required for the perf registers API, +allowing the perf tool to interface kernel register dumps with libunwind +in order to provide userspace backtracing. + +B2Qt: Backported for 3.8 kernel + +Cc: Jean Pihet +Signed-off-by: Will Deacon +--- + arch/arm/Kconfig | 2 ++ + arch/arm/include/uapi/asm/Kbuild | 1 + + arch/arm/include/uapi/asm/perf_regs.h | 23 +++++++++++++++++++++++ + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/perf_regs.c | 30 ++++++++++++++++++++++++++++++ + 5 files changed, 57 insertions(+) + create mode 100644 arch/arm/include/uapi/asm/perf_regs.h + create mode 100644 arch/arm/kernel/perf_regs.c + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 67874b8..6f630be 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -46,6 +46,8 @@ config ARM + select HAVE_MEMBLOCK + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select HAVE_PERF_EVENTS ++ select HAVE_PERF_REGS ++ select HAVE_PERF_USER_STACK_DUMP + select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_SYSCALL_TRACEPOINTS + select HAVE_UID16 +diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild +index 47bcb2d..570b82f 100644 +--- a/arch/arm/include/uapi/asm/Kbuild ++++ b/arch/arm/include/uapi/asm/Kbuild +@@ -8,6 +8,7 @@ header-y += hwcap.h + header-y += ioctls.h + header-y += kvm_para.h + header-y += mman.h ++header-y += perf_regs.h + header-y += posix_types.h + header-y += ptrace.h + header-y += setup.h +diff --git a/arch/arm/include/uapi/asm/perf_regs.h b/arch/arm/include/uapi/asm/perf_regs.h +new file mode 100644 +index 0000000..ce59448 +--- /dev/null ++++ b/arch/arm/include/uapi/asm/perf_regs.h +@@ -0,0 +1,23 @@ ++#ifndef _ASM_ARM_PERF_REGS_H ++#define _ASM_ARM_PERF_REGS_H ++ ++enum perf_event_arm_regs { ++ PERF_REG_ARM_R0, ++ PERF_REG_ARM_R1, ++ PERF_REG_ARM_R2, ++ PERF_REG_ARM_R3, ++ PERF_REG_ARM_R4, ++ PERF_REG_ARM_R5, ++ PERF_REG_ARM_R6, ++ PERF_REG_ARM_R7, ++ PERF_REG_ARM_R8, ++ PERF_REG_ARM_R9, ++ PERF_REG_ARM_R10, ++ PERF_REG_ARM_FP, ++ PERF_REG_ARM_IP, ++ PERF_REG_ARM_SP, ++ PERF_REG_ARM_LR, ++ PERF_REG_ARM_PC, ++ PERF_REG_ARM_MAX, ++}; ++#endif /* _ASM_ARM_PERF_REGS_H */ +diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile +index 5bbec7b..c6ab18f 100644 +--- a/arch/arm/kernel/Makefile ++++ b/arch/arm/kernel/Makefile +@@ -69,6 +69,7 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o + obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o + obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o + obj-$(CONFIG_IWMMXT) += iwmmxt.o ++obj-$(CONFIG_PERF_EVENTS) += perf_regs.o + obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o + AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt + obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o +diff --git a/arch/arm/kernel/perf_regs.c b/arch/arm/kernel/perf_regs.c +new file mode 100644 +index 0000000..6e4379c +--- /dev/null ++++ b/arch/arm/kernel/perf_regs.c +@@ -0,0 +1,30 @@ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++u64 perf_reg_value(struct pt_regs *regs, int idx) ++{ ++ if (WARN_ON_ONCE((u32)idx >= PERF_REG_ARM_MAX)) ++ return 0; ++ ++ return regs->uregs[idx]; ++} ++ ++#define REG_RESERVED (~((1ULL << PERF_REG_ARM_MAX) - 1)) ++ ++int perf_reg_validate(u64 mask) ++{ ++ if (!mask || mask & REG_RESERVED) ++ return -EINVAL; ++ ++ return 0; ++} ++ ++u64 perf_reg_abi(struct task_struct *task) ++{ ++ return PERF_SAMPLE_REGS_ABI_32; ++} +-- +1.9.1 + diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch new file mode 100644 index 0000000..e3e8d21 --- /dev/null +++ b/meta-beagleboard-extras/recipes/linux/linux-mainline/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch @@ -0,0 +1,163 @@ +From 26f603c457e0af9f5f6a0ddda66e69978c7f43b4 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 26 Sep 2013 12:36:36 +0100 +Subject: [PATCH] ARM: perf: wire up perf_regs and unwind support for ARM + +This patch hooks in the perf_regs and libunwind code for ARM. + +B2Qt: Backported for 3.8 kernel + +Cc: Jean Pihet +Signed-off-by: Will Deacon +--- + tools/perf/Makefile | 4 +++ + tools/perf/arch/arm/Makefile | 3 ++ + tools/perf/arch/arm/include/perf_regs.h | 54 +++++++++++++++++++++++++++++++++ + tools/perf/arch/arm/util/unwind.c | 48 +++++++++++++++++++++++++++++ + 4 files changed, 109 insertions(+) + create mode 100644 tools/perf/arch/arm/include/perf_regs.h + create mode 100644 tools/perf/arch/arm/util/unwind.c + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index fb1b1c4..316c575 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -84,6 +84,10 @@ ifeq ($(ARCH),x86_64) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS = -lunwind -lunwind-x86_64 + endif ++ifeq ($(ARCH),arm) ++ NO_PERF_REGS := 0 ++ LIBUNWIND_LIBS = -lunwind -lunwind-arm ++endif + + # Treat warnings as errors unless directed not to + ifneq ($(WERROR),0) +diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile +index 15130b5..fe9b61e 100644 +--- a/tools/perf/arch/arm/Makefile ++++ b/tools/perf/arch/arm/Makefile +@@ -2,3 +2,6 @@ ifndef NO_DWARF + PERF_HAVE_DWARF_REGS := 1 + LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o + endif ++ifndef NO_LIBUNWIND ++LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o ++endif +diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h +new file mode 100644 +index 0000000..2a1cfde +--- /dev/null ++++ b/tools/perf/arch/arm/include/perf_regs.h +@@ -0,0 +1,54 @@ ++#ifndef ARCH_PERF_REGS_H ++#define ARCH_PERF_REGS_H ++ ++#include ++#include "../../util/types.h" ++#include ++ ++#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1) ++#define PERF_REG_IP PERF_REG_ARM_PC ++#define PERF_REG_SP PERF_REG_ARM_SP ++ ++static inline const char *perf_reg_name(int id) ++{ ++ switch (id) { ++ case PERF_REG_ARM_R0: ++ return "r0"; ++ case PERF_REG_ARM_R1: ++ return "r1"; ++ case PERF_REG_ARM_R2: ++ return "r2"; ++ case PERF_REG_ARM_R3: ++ return "r3"; ++ case PERF_REG_ARM_R4: ++ return "r4"; ++ case PERF_REG_ARM_R5: ++ return "r5"; ++ case PERF_REG_ARM_R6: ++ return "r6"; ++ case PERF_REG_ARM_R7: ++ return "r7"; ++ case PERF_REG_ARM_R8: ++ return "r8"; ++ case PERF_REG_ARM_R9: ++ return "r9"; ++ case PERF_REG_ARM_R10: ++ return "r10"; ++ case PERF_REG_ARM_FP: ++ return "fp"; ++ case PERF_REG_ARM_IP: ++ return "ip"; ++ case PERF_REG_ARM_SP: ++ return "sp"; ++ case PERF_REG_ARM_LR: ++ return "lr"; ++ case PERF_REG_ARM_PC: ++ return "pc"; ++ default: ++ return NULL; ++ } ++ ++ return NULL; ++} ++ ++#endif /* ARCH_PERF_REGS_H */ +diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind.c +new file mode 100644 +index 0000000..da3dc95 +--- /dev/null ++++ b/tools/perf/arch/arm/util/unwind.c +@@ -0,0 +1,48 @@ ++ ++#include ++#include ++#include "perf_regs.h" ++#include "../../util/unwind.h" ++ ++int unwind__arch_reg_id(int regnum) ++{ ++ switch (regnum) { ++ case UNW_ARM_R0: ++ return PERF_REG_ARM_R0; ++ case UNW_ARM_R1: ++ return PERF_REG_ARM_R1; ++ case UNW_ARM_R2: ++ return PERF_REG_ARM_R2; ++ case UNW_ARM_R3: ++ return PERF_REG_ARM_R3; ++ case UNW_ARM_R4: ++ return PERF_REG_ARM_R4; ++ case UNW_ARM_R5: ++ return PERF_REG_ARM_R5; ++ case UNW_ARM_R6: ++ return PERF_REG_ARM_R6; ++ case UNW_ARM_R7: ++ return PERF_REG_ARM_R7; ++ case UNW_ARM_R8: ++ return PERF_REG_ARM_R8; ++ case UNW_ARM_R9: ++ return PERF_REG_ARM_R9; ++ case UNW_ARM_R10: ++ return PERF_REG_ARM_R10; ++ case UNW_ARM_R11: ++ return PERF_REG_ARM_FP; ++ case UNW_ARM_R12: ++ return PERF_REG_ARM_IP; ++ case UNW_ARM_R13: ++ return PERF_REG_ARM_SP; ++ case UNW_ARM_R14: ++ return PERF_REG_ARM_LR; ++ case UNW_ARM_R15: ++ return PERF_REG_ARM_PC; ++ default: ++ pr_err("unwind: invalid reg id %d\n", regnum); ++ return -EINVAL; ++ } ++ ++ return -EINVAL; ++} +-- +1.9.1 + diff --git a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend index f91ea8e..54ef15f 100644 --- a/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend +++ b/meta-beagleboard-extras/recipes/linux/linux-mainline_3.8.bbappend @@ -1,8 +1,11 @@ + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-AM335x-Adding-SGX-DT-node.patch \ file://0002-AM33XX-Invoke-hwmod-deassert-for-SGX-graphics-device.patch \ file://0003-video-da8xx-fb-Add-API-to-register-wait-for-vsync-ca.patch \ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ " INSANE_SKIP_${PN} = "installed-vs-shipped" diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 415388f..d267b09 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -20,6 +20,12 @@ ## ############################################################################# +FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:" +SRC_URI += "\ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ + " + # kernel image files are not needed in the image RDEPENDS_kernel-base = "" diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend deleted file mode 100644 index d01efb2..0000000 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -# kernel image files are not needed in the image -RDEPENDS_kernel-base = "" - -do_configure_prepend() { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig -} diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend new file mode 100644 index 0000000..d6c4db4 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend @@ -0,0 +1,41 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:" +SRC_URI += "\ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ + " + +# kernel image files are not needed in the image +RDEPENDS_kernel-base = "" + +do_configure_prepend() { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig +} diff --git a/meta-raspberrypi-extras/conf/layer.conf b/meta-raspberrypi-extras/conf/layer.conf new file mode 100644 index 0000000..0ac91aa --- /dev/null +++ b/meta-raspberrypi-extras/conf/layer.conf @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +# We have a conf and classes directory, append to BBPATH +BBPATH .= ":${LAYERDIR}" + +# We have a recipes directory, add to BBFILES +BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ + ${LAYERDIR}/recipes*/*/*.bbappend \ + " + +BBFILE_COLLECTIONS += "b2qt_rpi" +BBFILE_PATTERN_b2qt_rpi := "^${LAYERDIR}/" +BBFILE_PRIORITY_b2qt_rpi = "20" diff --git a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch new file mode 100644 index 0000000..4f2a45a --- /dev/null +++ b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch @@ -0,0 +1,171 @@ +From 7495f3742dda97612a77d92fa62f85cb7591ab14 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 26 Sep 2013 12:36:36 +0100 +Subject: [PATCH] ARM: perf: wire up perf_regs and unwind support for ARM + +This patch hooks in the perf_regs and libunwind code for ARM. + +Cc: Jean Pihet +Signed-off-by: Will Deacon +--- + tools/perf/arch/arm/Makefile | 3 ++ + tools/perf/arch/arm/include/perf_regs.h | 54 +++++++++++++++++++++++++++++++++ + tools/perf/arch/arm/util/unwind.c | 48 +++++++++++++++++++++++++++++ + tools/perf/config/Makefile | 7 +++-- + 4 files changed, 110 insertions(+), 2 deletions(-) + create mode 100644 tools/perf/arch/arm/include/perf_regs.h + create mode 100644 tools/perf/arch/arm/util/unwind.c + +diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile +index 15130b5..fe9b61e 100644 +--- a/tools/perf/arch/arm/Makefile ++++ b/tools/perf/arch/arm/Makefile +@@ -2,3 +2,6 @@ ifndef NO_DWARF + PERF_HAVE_DWARF_REGS := 1 + LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o + endif ++ifndef NO_LIBUNWIND ++LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o ++endif +diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h +new file mode 100644 +index 0000000..2a1cfde +--- /dev/null ++++ b/tools/perf/arch/arm/include/perf_regs.h +@@ -0,0 +1,54 @@ ++#ifndef ARCH_PERF_REGS_H ++#define ARCH_PERF_REGS_H ++ ++#include ++#include "../../util/types.h" ++#include ++ ++#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1) ++#define PERF_REG_IP PERF_REG_ARM_PC ++#define PERF_REG_SP PERF_REG_ARM_SP ++ ++static inline const char *perf_reg_name(int id) ++{ ++ switch (id) { ++ case PERF_REG_ARM_R0: ++ return "r0"; ++ case PERF_REG_ARM_R1: ++ return "r1"; ++ case PERF_REG_ARM_R2: ++ return "r2"; ++ case PERF_REG_ARM_R3: ++ return "r3"; ++ case PERF_REG_ARM_R4: ++ return "r4"; ++ case PERF_REG_ARM_R5: ++ return "r5"; ++ case PERF_REG_ARM_R6: ++ return "r6"; ++ case PERF_REG_ARM_R7: ++ return "r7"; ++ case PERF_REG_ARM_R8: ++ return "r8"; ++ case PERF_REG_ARM_R9: ++ return "r9"; ++ case PERF_REG_ARM_R10: ++ return "r10"; ++ case PERF_REG_ARM_FP: ++ return "fp"; ++ case PERF_REG_ARM_IP: ++ return "ip"; ++ case PERF_REG_ARM_SP: ++ return "sp"; ++ case PERF_REG_ARM_LR: ++ return "lr"; ++ case PERF_REG_ARM_PC: ++ return "pc"; ++ default: ++ return NULL; ++ } ++ ++ return NULL; ++} ++ ++#endif /* ARCH_PERF_REGS_H */ +diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind.c +new file mode 100644 +index 0000000..da3dc95 +--- /dev/null ++++ b/tools/perf/arch/arm/util/unwind.c +@@ -0,0 +1,48 @@ ++ ++#include ++#include ++#include "perf_regs.h" ++#include "../../util/unwind.h" ++ ++int unwind__arch_reg_id(int regnum) ++{ ++ switch (regnum) { ++ case UNW_ARM_R0: ++ return PERF_REG_ARM_R0; ++ case UNW_ARM_R1: ++ return PERF_REG_ARM_R1; ++ case UNW_ARM_R2: ++ return PERF_REG_ARM_R2; ++ case UNW_ARM_R3: ++ return PERF_REG_ARM_R3; ++ case UNW_ARM_R4: ++ return PERF_REG_ARM_R4; ++ case UNW_ARM_R5: ++ return PERF_REG_ARM_R5; ++ case UNW_ARM_R6: ++ return PERF_REG_ARM_R6; ++ case UNW_ARM_R7: ++ return PERF_REG_ARM_R7; ++ case UNW_ARM_R8: ++ return PERF_REG_ARM_R8; ++ case UNW_ARM_R9: ++ return PERF_REG_ARM_R9; ++ case UNW_ARM_R10: ++ return PERF_REG_ARM_R10; ++ case UNW_ARM_R11: ++ return PERF_REG_ARM_FP; ++ case UNW_ARM_R12: ++ return PERF_REG_ARM_IP; ++ case UNW_ARM_R13: ++ return PERF_REG_ARM_SP; ++ case UNW_ARM_R14: ++ return PERF_REG_ARM_LR; ++ case UNW_ARM_R15: ++ return PERF_REG_ARM_PC; ++ default: ++ pr_err("unwind: invalid reg id %d\n", regnum); ++ return -EINVAL; ++ } ++ ++ return -EINVAL; ++} +diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile +index 5f6f9b3..4796ce5 100644 +--- a/tools/perf/config/Makefile ++++ b/tools/perf/config/Makefile +@@ -29,6 +29,10 @@ ifeq ($(ARCH),x86_64) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS = -lunwind -lunwind-x86_64 + endif ++ifeq ($(ARCH),arm) ++ NO_PERF_REGS := 0 ++ LIBUNWIND_LIBS = -lunwind -lunwind-arm ++endif + + ifeq ($(NO_PERF_REGS),0) + CFLAGS += -DHAVE_PERF_REGS +@@ -208,8 +212,7 @@ ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) + endif # try-cc + endif # NO_LIBELF + +-# There's only x86 (both 32 and 64) support for CFI unwind so far +-ifneq ($(ARCH),x86) ++ifeq ($(LIBUNWIND_LIBS),) + NO_LIBUNWIND := 1 + endif + +-- +1.9.1 + diff --git a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend new file mode 100644 index 0000000..94b2ab1 --- /dev/null +++ b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend @@ -0,0 +1,27 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/../../../recipes/linux/linux:" +SRC_URI += "\ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ + " diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index f054071..68cdfc2 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -20,6 +20,12 @@ ## ############################################################################# +FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:" +SRC_URI += "\ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ + " + # kernel image files are not needed in the image RDEPENDS_kernel-base = "" diff --git a/recipes/linux/linux/ARM-perf-add-support-for-perf-registers-API.diff b/recipes/linux/linux/ARM-perf-add-support-for-perf-registers-API.diff new file mode 100644 index 0000000..e6f44fd --- /dev/null +++ b/recipes/linux/linux/ARM-perf-add-support-for-perf-registers-API.diff @@ -0,0 +1,126 @@ +From 49863894db3ed7bd41541b1c17733273966cea71 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 26 Sep 2013 12:36:35 +0100 +Subject: [PATCH] ARM: perf: add support for perf registers API + +This patch implements the functions required for the perf registers API, +allowing the perf tool to interface kernel register dumps with libunwind +in order to provide userspace backtracing. + +Cc: Jean Pihet +Signed-off-by: Will Deacon +--- + arch/arm/Kconfig | 2 ++ + arch/arm/include/uapi/asm/Kbuild | 1 + + arch/arm/include/uapi/asm/perf_regs.h | 23 +++++++++++++++++++++++ + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/perf_regs.c | 30 ++++++++++++++++++++++++++++++ + 5 files changed, 57 insertions(+) + create mode 100644 arch/arm/include/uapi/asm/perf_regs.h + create mode 100644 arch/arm/kernel/perf_regs.c + +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 1ad6fb6..899d0c6 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -51,6 +51,8 @@ config ARM + select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND + select HAVE_OPROFILE if (HAVE_PERF_EVENTS) + select HAVE_PERF_EVENTS ++ select HAVE_PERF_REGS ++ select HAVE_PERF_USER_STACK_DUMP + select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_SYSCALL_TRACEPOINTS + select HAVE_UID16 +diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild +index 18d76fd..70a1c9d 100644 +--- a/arch/arm/include/uapi/asm/Kbuild ++++ b/arch/arm/include/uapi/asm/Kbuild +@@ -7,6 +7,7 @@ header-y += hwcap.h + header-y += ioctls.h + header-y += kvm_para.h + header-y += mman.h ++header-y += perf_regs.h + header-y += posix_types.h + header-y += ptrace.h + header-y += setup.h +diff --git a/arch/arm/include/uapi/asm/perf_regs.h b/arch/arm/include/uapi/asm/perf_regs.h +new file mode 100644 +index 0000000..ce59448 +--- /dev/null ++++ b/arch/arm/include/uapi/asm/perf_regs.h +@@ -0,0 +1,23 @@ ++#ifndef _ASM_ARM_PERF_REGS_H ++#define _ASM_ARM_PERF_REGS_H ++ ++enum perf_event_arm_regs { ++ PERF_REG_ARM_R0, ++ PERF_REG_ARM_R1, ++ PERF_REG_ARM_R2, ++ PERF_REG_ARM_R3, ++ PERF_REG_ARM_R4, ++ PERF_REG_ARM_R5, ++ PERF_REG_ARM_R6, ++ PERF_REG_ARM_R7, ++ PERF_REG_ARM_R8, ++ PERF_REG_ARM_R9, ++ PERF_REG_ARM_R10, ++ PERF_REG_ARM_FP, ++ PERF_REG_ARM_IP, ++ PERF_REG_ARM_SP, ++ PERF_REG_ARM_LR, ++ PERF_REG_ARM_PC, ++ PERF_REG_ARM_MAX, ++}; ++#endif /* _ASM_ARM_PERF_REGS_H */ +diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile +index 5140df5f..9b818ca 100644 +--- a/arch/arm/kernel/Makefile ++++ b/arch/arm/kernel/Makefile +@@ -78,6 +78,7 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o + obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o + obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o + obj-$(CONFIG_IWMMXT) += iwmmxt.o ++obj-$(CONFIG_PERF_EVENTS) += perf_regs.o + obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o + AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt + obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o +diff --git a/arch/arm/kernel/perf_regs.c b/arch/arm/kernel/perf_regs.c +new file mode 100644 +index 0000000..6e4379c +--- /dev/null ++++ b/arch/arm/kernel/perf_regs.c +@@ -0,0 +1,30 @@ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++u64 perf_reg_value(struct pt_regs *regs, int idx) ++{ ++ if (WARN_ON_ONCE((u32)idx >= PERF_REG_ARM_MAX)) ++ return 0; ++ ++ return regs->uregs[idx]; ++} ++ ++#define REG_RESERVED (~((1ULL << PERF_REG_ARM_MAX) - 1)) ++ ++int perf_reg_validate(u64 mask) ++{ ++ if (!mask || mask & REG_RESERVED) ++ return -EINVAL; ++ ++ return 0; ++} ++ ++u64 perf_reg_abi(struct task_struct *task) ++{ ++ return PERF_SAMPLE_REGS_ABI_32; ++} +-- +1.9.1 + diff --git a/recipes/linux/linux/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch b/recipes/linux/linux/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch new file mode 100644 index 0000000..1e497c6 --- /dev/null +++ b/recipes/linux/linux/ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch @@ -0,0 +1,172 @@ +From 8abd7519c1fd2b6ae35eddbb41f93f44d3886000 Mon Sep 17 00:00:00 2001 +From: Will Deacon +Date: Thu, 26 Sep 2013 12:36:36 +0100 +Subject: [PATCH] ARM: perf: wire up perf_regs and unwind support for ARM + +This patch hooks in the perf_regs and libunwind code for ARM. + +B2Qt: Backported for 3.10 kernel + +Cc: Jean Pihet +Signed-off-by: Will Deacon +--- + tools/perf/Makefile | 6 +++- + tools/perf/arch/arm/Makefile | 3 ++ + tools/perf/arch/arm/include/perf_regs.h | 54 +++++++++++++++++++++++++++++++++ + tools/perf/arch/arm/util/unwind.c | 48 +++++++++++++++++++++++++++++ + 4 files changed, 110 insertions(+), 1 deletion(-) + create mode 100644 tools/perf/arch/arm/include/perf_regs.h + create mode 100644 tools/perf/arch/arm/util/unwind.c + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index b0f164b..f8fdad5 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -87,6 +87,10 @@ ifeq ($(ARCH),x86_64) + NO_PERF_REGS := 0 + LIBUNWIND_LIBS = -lunwind -lunwind-x86_64 + endif ++ifeq ($(ARCH),arm) ++ NO_PERF_REGS := 0 ++ LIBUNWIND_LIBS = -lunwind -lunwind-arm ++endif + + # Treat warnings as errors unless directed not to + ifneq ($(WERROR),0) +@@ -607,7 +611,7 @@ endif # SOURCE_LIBELF + endif # NO_LIBELF + + # There's only x86 (both 32 and 64) support for CFI unwind so far +-ifneq ($(ARCH),x86) ++ifeq ($(LIBUNWIND_LIBS),) + NO_LIBUNWIND := 1 + endif + +diff --git a/tools/perf/arch/arm/Makefile b/tools/perf/arch/arm/Makefile +index 15130b5..fe9b61e 100644 +--- a/tools/perf/arch/arm/Makefile ++++ b/tools/perf/arch/arm/Makefile +@@ -2,3 +2,6 @@ ifndef NO_DWARF + PERF_HAVE_DWARF_REGS := 1 + LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o + endif ++ifndef NO_LIBUNWIND ++LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind.o ++endif +diff --git a/tools/perf/arch/arm/include/perf_regs.h b/tools/perf/arch/arm/include/perf_regs.h +new file mode 100644 +index 0000000..2a1cfde +--- /dev/null ++++ b/tools/perf/arch/arm/include/perf_regs.h +@@ -0,0 +1,54 @@ ++#ifndef ARCH_PERF_REGS_H ++#define ARCH_PERF_REGS_H ++ ++#include ++#include "../../util/types.h" ++#include ++ ++#define PERF_REGS_MASK ((1ULL << PERF_REG_ARM_MAX) - 1) ++#define PERF_REG_IP PERF_REG_ARM_PC ++#define PERF_REG_SP PERF_REG_ARM_SP ++ ++static inline const char *perf_reg_name(int id) ++{ ++ switch (id) { ++ case PERF_REG_ARM_R0: ++ return "r0"; ++ case PERF_REG_ARM_R1: ++ return "r1"; ++ case PERF_REG_ARM_R2: ++ return "r2"; ++ case PERF_REG_ARM_R3: ++ return "r3"; ++ case PERF_REG_ARM_R4: ++ return "r4"; ++ case PERF_REG_ARM_R5: ++ return "r5"; ++ case PERF_REG_ARM_R6: ++ return "r6"; ++ case PERF_REG_ARM_R7: ++ return "r7"; ++ case PERF_REG_ARM_R8: ++ return "r8"; ++ case PERF_REG_ARM_R9: ++ return "r9"; ++ case PERF_REG_ARM_R10: ++ return "r10"; ++ case PERF_REG_ARM_FP: ++ return "fp"; ++ case PERF_REG_ARM_IP: ++ return "ip"; ++ case PERF_REG_ARM_SP: ++ return "sp"; ++ case PERF_REG_ARM_LR: ++ return "lr"; ++ case PERF_REG_ARM_PC: ++ return "pc"; ++ default: ++ return NULL; ++ } ++ ++ return NULL; ++} ++ ++#endif /* ARCH_PERF_REGS_H */ +diff --git a/tools/perf/arch/arm/util/unwind.c b/tools/perf/arch/arm/util/unwind.c +new file mode 100644 +index 0000000..da3dc95 +--- /dev/null ++++ b/tools/perf/arch/arm/util/unwind.c +@@ -0,0 +1,48 @@ ++ ++#include ++#include ++#include "perf_regs.h" ++#include "../../util/unwind.h" ++ ++int unwind__arch_reg_id(int regnum) ++{ ++ switch (regnum) { ++ case UNW_ARM_R0: ++ return PERF_REG_ARM_R0; ++ case UNW_ARM_R1: ++ return PERF_REG_ARM_R1; ++ case UNW_ARM_R2: ++ return PERF_REG_ARM_R2; ++ case UNW_ARM_R3: ++ return PERF_REG_ARM_R3; ++ case UNW_ARM_R4: ++ return PERF_REG_ARM_R4; ++ case UNW_ARM_R5: ++ return PERF_REG_ARM_R5; ++ case UNW_ARM_R6: ++ return PERF_REG_ARM_R6; ++ case UNW_ARM_R7: ++ return PERF_REG_ARM_R7; ++ case UNW_ARM_R8: ++ return PERF_REG_ARM_R8; ++ case UNW_ARM_R9: ++ return PERF_REG_ARM_R9; ++ case UNW_ARM_R10: ++ return PERF_REG_ARM_R10; ++ case UNW_ARM_R11: ++ return PERF_REG_ARM_FP; ++ case UNW_ARM_R12: ++ return PERF_REG_ARM_IP; ++ case UNW_ARM_R13: ++ return PERF_REG_ARM_SP; ++ case UNW_ARM_R14: ++ return PERF_REG_ARM_LR; ++ case UNW_ARM_R15: ++ return PERF_REG_ARM_PC; ++ default: ++ pr_err("unwind: invalid reg id %d\n", regnum); ++ return -EINVAL; ++ } ++ ++ return -EINVAL; ++} +-- +1.9.1 + diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index bce34ab..abd2d66 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -31,4 +31,5 @@ RDEPENDS_${PN} = "\ binutils \ binutils-symlinks \ i2c-tools \ + perf \ " diff --git a/recipes/perf/perf.bbappend b/recipes/perf/perf.bbappend new file mode 100644 index 0000000..1eec18d --- /dev/null +++ b/recipes/perf/perf.bbappend @@ -0,0 +1,2 @@ +PERF_FEATURES_ENABLE = "perf-libunwind" +EXTRA_OEMAKE_remove = "NO_DWARF=1" -- cgit v1.2.3-54-g00ecf From 06f5b8ca2be5c85ba210fc51794ed13bf30f8618 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Thu, 5 Mar 2015 15:05:48 +0100 Subject: Add htop utility to b2qt distro Because htop is better than top. Change-Id: I98843a7185a1579843e030259d6da697270b4888 Reviewed-by: Laszlo Agocs --- recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index abd2d66..85c3b6e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -32,4 +32,5 @@ RDEPENDS_${PN} = "\ binutils-symlinks \ i2c-tools \ perf \ + htop \ " -- cgit v1.2.3-54-g00ecf From a9c3de95cae581bfef2e47710ba396fdc967376d Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Fri, 20 Feb 2015 17:41:51 +0100 Subject: Add Support for Raspberry Pi 2 Change-Id: Iaead44d45172f49427c4d513e31f5fbb29287990 Reviewed-by: Laszlo Agocs --- b2qt-init-build-env | 2 +- conf/distro/include/raspberrypi2.conf | 47 +++++++++++++++++++++++++++++++++++ scripts/setup-environment.sh | 2 +- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 conf/distro/include/raspberrypi2.conf diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 686fdcf..cb40b6b 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -100,7 +100,7 @@ get_groups() { beaglebone) PROJECT_GROUPS="bbb" ;; - raspberrypi) + raspberrypi|raspberrypi2) PROJECT_GROUPS="rpi" ;; emulator) diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf new file mode 100644 index 0000000..23b457a --- /dev/null +++ b/conf/distro/include/raspberrypi2.conf @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +BOOTFS_CONTENT = "\ + bcm2835-bootfiles/*: \ + ${KERNEL_IMAGETYPE}:kernel.img \ + " +BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" + +PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics-hardfp" + +MACHINE_EXTRA_INSTALL = "\ + vc-graphics-hardfp \ + omxplayer \ + " + +MACHINE_EXTRA_INSTALL_SDK = " \ + vc-graphics-hardfp-dev \ + " + +KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2" +KERNEL_MODULE_PROBECONF += "bcm2835-v4l2" +module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" + +# additional memory for GPU +GPU_MEM = "256" +# video camera support +VIDEO_CAMERA = "1" diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index ad1405b..3439d90 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -64,7 +64,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then beaglebone) LAYERSCONF="bblayers.conf.bbb.sample" ;; - raspberrypi) + raspberrypi|raspberrypi2) LAYERSCONF="bblayers.conf.rpi.sample" ;; emulator) -- cgit v1.2.3-54-g00ecf From 38a742a4e607e0cd103e072ecef4d711c6d0c5ba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Mar 2015 12:51:43 +0200 Subject: RPi: add wildcard to kernel recipe Patch version keeps changing in upstream sources. Change-Id: I0253d2991196a684c9799888995bfd00a910bc3e Reviewed-by: Eirik Aavitsland --- .../linux/linux-raspberrypi_3.12.%.bbappend | 27 ++++++++++++++++++++++ .../linux/linux-raspberrypi_3.12.26.bbappend | 27 ---------------------- 2 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.%.bbappend delete mode 100644 meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend diff --git a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.%.bbappend b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.%.bbappend new file mode 100644 index 0000000..94b2ab1 --- /dev/null +++ b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.%.bbappend @@ -0,0 +1,27 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/../../../recipes/linux/linux:" +SRC_URI += "\ + file://ARM-perf-add-support-for-perf-registers-API.diff \ + file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ + " diff --git a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend b/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend deleted file mode 100644 index 94b2ab1..0000000 --- a/meta-raspberrypi-extras/recipes/linux/linux-raspberrypi_3.12.26.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/../../../recipes/linux/linux:" -SRC_URI += "\ - file://ARM-perf-add-support-for-perf-registers-API.diff \ - file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ - " -- cgit v1.2.3-54-g00ecf From d799779d19aa8b21e6d8cb6ef0f12a2e34d35794 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 26 Feb 2015 08:43:28 +0200 Subject: bootfs: add dependency to kernel deployment Machine configs that have kernel in BOOTFS, need to have dependency for it. Change-Id: I6c4a62a1620d16177e2dd8ac82d1b3e6daf244e3 Reviewed-by: Andy Nichols --- conf/distro/include/apalis-imx6.conf | 2 +- conf/distro/include/colibri-vf.conf | 2 +- conf/distro/include/imx53qsb.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 99289d3..9865549 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -31,7 +31,7 @@ BOOTFS_CONTENT = "\ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index df85419..b4b5358 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -26,7 +26,7 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ u-boot-${MACHINE}.imx:u-boot.imx \ " -BOOTFS_DEPENDS = "u-boot:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" SERIAL_CONSOLES = "115200;ttymxc0 \ 115200;ttymxc1" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 39c4688..7154b6f 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -24,7 +24,7 @@ BOOTFS_CONTENT = "\ u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ " -BOOTFS_DEPENDS = "u-boot:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ amd-gpu-bin-mx51 \ -- cgit v1.2.3-54-g00ecf From d9a08a8a9419a1635d4985e75c43263aaab9577d Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Thu, 19 Feb 2015 11:33:54 +0100 Subject: Update Colibri-VF recpies to use dizzy Now uses Linux kernel 3.18 Automaically loads Toradex multi-touch screen driver Fixes Serial Console and ADB Change-Id: Idbccb170ddd78992f5b340a96fe5aae5628c6c82 Reviewed-by: Samuli Piippo --- conf/distro/include/colibri-vf.conf | 5 ++-- ...le-Fusion-7-and-10-multi-touch-controller.patch | 25 ++++++++++++++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 33 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index b4b5358..483511c 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -24,13 +24,12 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ + ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" -SERIAL_CONSOLES = "115200;ttymxc0 \ - 115200;ttymxc1" - MACHINE_EXTRA_INSTALL = "\ opengldummy \ " diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch new file mode 100644 index 0000000..d92ac62 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch @@ -0,0 +1,25 @@ +From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Fri, 6 Mar 2015 10:14:13 +0100 +Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller + +--- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +index 1f43dbe..9194580 100644 +--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +@@ -214,7 +214,7 @@ + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ + &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ + >; +- status = "disabled"; ++ status = "okay"; + }; + + /* M41T0M6 real time clock on carrier board */ +-- +2.3.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend new file mode 100644 index 0000000..a723ab8 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ + " + +config_script () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${S}/.config +} -- cgit v1.2.3-54-g00ecf From 932951b726cf2eccdc481afdffa6ba7f7dd16175 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Mar 2015 12:53:29 +0200 Subject: Add gperf and bison to SDK host tools Required tools for compiling webengine, which are often not installed. Change-Id: I3e27fa7ac2cab2cce58d3b80f4db622bc21948d3 Reviewed-by: Andy Nichols --- recipes/gperf/gperf_%.bbappend | 23 ++++++++++++++++++++++ ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 recipes/gperf/gperf_%.bbappend diff --git a/recipes/gperf/gperf_%.bbappend b/recipes/gperf/gperf_%.bbappend new file mode 100644 index 0000000..2dc86e4 --- /dev/null +++ b/recipes/gperf/gperf_%.bbappend @@ -0,0 +1,23 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index a4ea74d..d5b41f7 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -31,5 +31,7 @@ RDEPENDS_${PN} = "\ python-nativesdk \ python-modules-nativesdk \ python-misc-nativesdk \ + nativesdk-bison \ + nativesdk-gperf \ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ " -- cgit v1.2.3-54-g00ecf From 53391e48381c83e4be03e21ef87cad4aa49580bb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 16 Mar 2015 10:24:33 +0200 Subject: Use dizzy branch from meta-raspberrypi Change-Id: Idc215ff8f351fc7f56af98c454d8fd8017270162 Reviewed-by: Andy Nichols --- scripts/manifest_dizzy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml index a8d9769..d4eccc0 100644 --- a/scripts/manifest_dizzy.xml +++ b/scripts/manifest_dizzy.xml @@ -30,7 +30,7 @@ groups="notdefault,ti,bbb"/> Date: Wed, 25 Mar 2015 15:46:01 +0200 Subject: sabre: follow upstream kernel revision Change-Id: I5e3852df441196315c9f8ab209ffe21ca490c0ee Reviewed-by: Andy Nichols --- meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index d267b09..3bbb690 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -29,10 +29,6 @@ SRC_URI += "\ # kernel image files are not needed in the image RDEPENDS_kernel-base = "" -LOCALVERSION = "-1.0.2_ga+yocto" -SRCBRANCH = "boundary-imx_3.10.17_1.0.2_ga" -SRCREV = "4ed13da788a463b1c5b6b26ecc2524d500ad1e9b" - do_configure_prepend() { # fix imx-vpu break on video decoding echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig -- cgit v1.2.3-54-g00ecf From fd78f0621db4bf81ea12069e12d321bf6744d8f9 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 7 Apr 2015 12:11:12 +0200 Subject: Change mirror of hunspell dictionaries Moved from Gitorious to Github Change-Id: Iaba3a7778cacf4cd14a3a9d1a07863b174f07142 Reviewed-by: Eirik Aavitsland --- recipes/hunspell/hunspell_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index 9903024..5d1b1b5 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -25,7 +25,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88" SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \ - git://gitorious.org/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \ + git://github.com/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \ " SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8" -- cgit v1.2.3-54-g00ecf From 91ead4022aef2f7ff9f1598c8452381bb1f70d22 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 10:25:16 +0300 Subject: Cleanup meta and packagegroup recipes Better inlined with upstream code, no actual functionality changes. Change-Id: I3f4e3170c925e498cfbd86c93d9265fa0bb8436f Reviewed-by: Andy Nichols --- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 8 ++-- ...dk-packagegroup-b2qt-embedded-toolchain-host.bb | 10 ++-- ...-packagegroup-b2qt-embedded-toolchain-target.bb | 56 ---------------------- .../packagegroup-b2qt-embedded-toolchain-target.bb | 55 +++++++++++++++++++++ 4 files changed, 65 insertions(+), 64 deletions(-) delete mode 100644 recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 0540596..0c0214f 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -24,7 +24,9 @@ DESCRIPTION = "B2Qt on embedded Linux SDK toolchain" PR = "r0" LICENSE = "CLOSED" -TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}" -TOOLCHAIN_TARGET_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-target" +inherit populate_sdk + +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host" +TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target" + -require recipes-core/meta/meta-toolchain.bb diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index d5b41f7..d767fcc 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -22,15 +22,15 @@ DESCRIPTION = "Host packages for B2Qt on embedded Linux SDK" PR = "r0" -ALLOW_EMPTY_${PN} = "1" LICENSE = "CLOSED" -require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +inherit nativesdk packagegroup RDEPENDS_${PN} = "\ - python-nativesdk \ - python-modules-nativesdk \ - python-misc-nativesdk \ + nativesdk-packagegroup-sdk-host \ + nativesdk-python-modules \ + nativesdk-python-misc \ + nativesdk-perl-modules \ nativesdk-bison \ nativesdk-gperf \ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb deleted file mode 100644 index 5424f0d..0000000 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb +++ /dev/null @@ -1,56 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK" -PR = "r0" -ALLOW_EMPTY_${PN} = "1" -LICENSE = "CLOSED" - -PACKAGES = "${PN}" - -MACHINE_EXTRA_INSTALL_SDK ?= "" - -RDEPENDS_${PN} += "\ - packagegroup-core-standalone-sdk-target \ - base-files \ - glib-2.0-dev \ - openssl-dev \ - libpng-dev \ - tiff-dev \ - alsa-dev \ - dbus-dev \ - freetype-dev \ - fontconfig-dev \ - gstreamer-dev \ - gst-plugins-base-dev \ - icu-dev \ - libxslt-dev \ - udev-dev \ - tslib-dev \ - hunspell-dev \ - libcap-dev \ - wpa-supplicant-dev \ - libmysqlclient-dev \ - libpq-dev \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ - ${MACHINE_EXTRA_INSTALL_SDK} \ - " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb new file mode 100644 index 0000000..ba56a5c --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK" +PR = "r0" +LICENSE = "CLOSED" + +inherit packagegroup + +MACHINE_EXTRA_INSTALL_SDK ?= "" + +RDEPENDS_${PN} += "\ + packagegroup-core-standalone-sdk-target \ + base-files \ + glib-2.0-dev \ + openssl-dev \ + libpng-dev \ + tiff-dev \ + alsa-dev \ + dbus-dev \ + freetype-dev \ + fontconfig-dev \ + gstreamer-dev \ + gst-plugins-base-dev \ + icu-dev \ + libxslt-dev \ + udev-dev \ + tslib-dev \ + hunspell-dev \ + libcap-dev \ + wpa-supplicant-dev \ + libmysqlclient-dev \ + libpq-dev \ + ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ + ${MACHINE_EXTRA_INSTALL_SDK} \ + " -- cgit v1.2.3-54-g00ecf From 23b9e8808352dfb90d70265a19d66f62cae40e28 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 1 Apr 2015 10:55:23 +0300 Subject: Move wayland related packages to packagegroups Install all wayland related packages from common packagegroups, when wayland DISTRO_FEATURES is enabled. Include DRM and GBM dev packages to toolchain, libraries are already included in the image as dependency from weston. Change-Id: I88f3ded7c2bb5ca85318a7945f4739b968b9d97b Reviewed-by: Andy Nichols --- conf/distro/include/am335x-evm.conf | 2 -- conf/distro/include/imx6qsabresd.conf | 9 --------- conf/distro/include/nitrogen6x.conf | 9 --------- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 1 + recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 + .../packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb | 3 +-- 6 files changed, 3 insertions(+), 22 deletions(-) diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 401dc64..dffbe94 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -33,10 +33,8 @@ MACHINE_EXTRA_INSTALL = "\ libgles-omap3 \ libgles-omap3-rawdemos \ lighttpd \ - wayland \ " MACHINE_EXTRA_INSTALL_SDK = "\ libgles-omap3-dev \ - wayland-dev \ " diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index f3605a5..83fc812 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -39,9 +39,6 @@ MACHINE_EXTRA_INSTALL = "\ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ - wayland \ - weston \ - weston-examples \ libopencv-core \ libopencv-imgproc \ libopencv-objdetect \ @@ -53,15 +50,9 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libegl-mx6-dev \ libgles2-mx6 \ libgles2-mx6-dev \ - libwayland-egl-mx6-dev \ - libxkbcommon-dev \ opencv-dev \ " -MACHINE_EXTRA_INSTALL_SDK_HOST = "\ - wayland-nativesdk \ - " - KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" # add support for both imx6qsabresd and imx6dlsabresd diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 1c7624d..0a9d388 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -52,9 +52,6 @@ MACHINE_EXTRA_INSTALL = "\ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ - wayland \ - weston \ - weston-examples \ bcm4330-nvram-config \ libopencv-core \ libopencv-imgproc \ @@ -67,15 +64,9 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libegl-mx6-dev \ libgles2-mx6 \ libgles2-mx6-dev \ - libwayland-egl-mx6-dev \ - libxkbcommon-dev \ opencv-dev \ " -MACHINE_EXTRA_INSTALL_SDK_HOST = "\ - wayland-nativesdk \ - " - B2QT_PLATFORM = "iMX6-eLinux" ADB_PRODUCTID = "0x0d02" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index d767fcc..971cc01 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -33,5 +33,6 @@ RDEPENDS_${PN} = "\ nativesdk-perl-modules \ nativesdk-bison \ nativesdk-gperf \ + ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index d30573e..a038b86 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -53,5 +53,6 @@ RDEPENDS_${PN} = "\ dbus-session-init \ libmysqlclient \ libpq \ + ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ ${MACHINE_EXTRA_INSTALL} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index ba56a5c..4d24c1e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -26,8 +26,6 @@ LICENSE = "CLOSED" inherit packagegroup -MACHINE_EXTRA_INSTALL_SDK ?= "" - RDEPENDS_${PN} += "\ packagegroup-core-standalone-sdk-target \ base-files \ @@ -50,6 +48,7 @@ RDEPENDS_${PN} += "\ wpa-supplicant-dev \ libmysqlclient-dev \ libpq-dev \ + ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ " -- cgit v1.2.3-54-g00ecf From 95d48b04f054e698fc548f2b907c66d13b954f83 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Mon, 13 Apr 2015 17:49:24 +0200 Subject: Install CJK fonts on eLinux image This is needed so we can enable Chinese, Korean and Japanese input method support in VKB. Task-number: QTEE-765 Change-Id: I86db44cc4ebfbaf9e72854a9a4ffa0708193c442 Reviewed-by: Samuli Piippo --- recipes/fonts/otf-noto.bb | 23 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-base.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 recipes/fonts/otf-noto.bb diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb new file mode 100644 index 0000000..8a9f942 --- /dev/null +++ b/recipes/fonts/otf-noto.bb @@ -0,0 +1,23 @@ +SUMMARY = "Noto Sans CJK" +SECTION = "fonts" +HOMEPAGE = "http://www.google.com/get/noto" +LICENSE = "Apache-2.0" +# see https://code.google.com/p/noto/issues/detail?id=331 +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +INHIBIT_DEFAULT_DEPS = "1" + +inherit allarch fontcache + +SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" + +SRC_URI[md5sum] = "fdbacee7b538c42cf1d3a6fc3dd3d106" +SRC_URI[sha256sum] = "71d32727053c9677956b7aff7b150c3c2521072f40d334a37806a577d86fa33d" + +do_install() { + install -m 0644 -d ${D}${datadir}/fonts/otf/noto + install -m 0644 ${WORKDIR}/*.otf ${D}${datadir}/fonts/otf/noto +} + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/fonts/otf/noto" diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 2c986ac..a99c76a 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -51,5 +51,6 @@ RDEPENDS_${PN} = "\ ttf-dejavu-common \ ttf-dejavu-sans \ dbus-session-init \ + otf-noto \ ${MACHINE_EXTRA_INSTALL} \ " -- cgit v1.2.3-54-g00ecf From ea6ad4728b071ee59123a959c5f9d997bacc274c Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 7 Apr 2015 12:11:12 +0200 Subject: Change mirror of hunspell dictionaries Moved from Gitorious to Github Cherry-picked from dizzy Change-Id: Ifb48c3ba178174a0b1628974efe800e6361a9776 Reviewed-by: Eirik Aavitsland --- recipes/hunspell/hunspell_1.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index 9903024..5d1b1b5 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -25,7 +25,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88" SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \ - git://gitorious.org/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \ + git://github.com/libreoffice/dictionaries.git;branch=libreoffice-4-3-2;name=dictionaries \ " SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8" -- cgit v1.2.3-54-g00ecf From 85f2d8624ba68be8817de43c88c18265c2a5d026 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 7 Apr 2015 12:12:16 +0200 Subject: colibri-vf: Fix added kernel modules config_script only worked with the freescale kernel recipes, so moving to do_configure_prepend. Why must this be different for each kernel recipe! Change-Id: I21d2d6ca5912bb57c7cfdb08e5c084ec868336ba Reviewed-by: Samuli Piippo --- meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend index a723ab8..0ceceeb 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -26,8 +26,8 @@ SRC_URI += " \ file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ " -config_script () { +do_configure_prepend () { # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${S}/.config + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig } -- cgit v1.2.3-54-g00ecf From 2b8c1028d8859d391a2c0edf08d044dfead7b3ff Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 7 May 2015 14:09:47 +0200 Subject: colibri-vf: Fix EGLNative* typedefs to have a signed type Chromium expects a signed type, and all other platforms also define a signed type, like Display*, HDC, int, ANativeWindow*, void*. This is a cherry-picked fix from qtglesstream to fix the QtWebEngine build for colibri-vf. Change-Id: I01d5a65b2e7512ebdc383501eacae1349a271039 Reviewed-by: Samuli Piippo --- recipes/opengldummy/files/headers/EGL/eglplatform.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/opengldummy/files/headers/EGL/eglplatform.h b/recipes/opengldummy/files/headers/EGL/eglplatform.h index bcbda98..572c7d5 100644 --- a/recipes/opengldummy/files/headers/EGL/eglplatform.h +++ b/recipes/opengldummy/files/headers/EGL/eglplatform.h @@ -105,9 +105,9 @@ typedef void* EGLNativeDisplayType; #if 1 /* QtGlesStream */ -typedef unsigned int EGLNativeDisplayType; -typedef unsigned int EGLNativeWindowType; -typedef unsigned int EGLNativePixmapType; +typedef intptr_t EGLNativeDisplayType; +typedef intptr_t EGLNativeWindowType; +typedef intptr_t EGLNativePixmapType; #else -- cgit v1.2.3-54-g00ecf From 58b688071999ee2f9a5a72d217351cfd97f45123 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Wed, 11 Mar 2015 12:52:33 +0100 Subject: Add support for Toradex Colibri iMX6 Uses Colibri form factor instead of Apalis. Change-Id: I7ba54323a82b151ce174f06477851523b283297b Reviewed-by: Andy Nichols --- b2qt-init-build-env | 2 +- conf/distro/include/colibri-imx6.conf | 47 ++++++++++++++++++++++ ...-iMX6-set-1280x720-16-for-HDMI-by-default.patch | 32 +++++++++++++++ .../recipes/linux/linux-toradex-fsl_git.bbappend | 6 +++ scripts/setup-environment.sh | 2 +- 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 conf/distro/include/colibri-imx6.conf create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch diff --git a/b2qt-init-build-env b/b2qt-init-build-env index cb40b6b..c61e0c6 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -85,7 +85,7 @@ get_groups() { all) PROJECT_GROUPS="all" ;; - apalis-imx6|colibri-vf) + apalis-imx6|colibri-imx6|colibri-vf) PROJECT_GROUPS="toradex" ;; imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf new file mode 100644 index 0000000..1171c5f --- /dev/null +++ b/conf/distro/include/colibri-imx6.conf @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +include conf/distro/include/toradex.inc + +KERNEL_IMAGETYPE = "uImage" + +BOOTFS_CONTENT = "\ + ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}:${KERNEL_DEVICETREE} \ + u-boot-${MACHINE}.imx:u-boot.imx \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" + +MACHINE_EXTRA_INSTALL = "\ + libgal-mx6 \ + libegl-mx6 \ + libgles2-mx6 \ + gst-fsl-plugin \ + " + +MACHINE_EXTRA_INSTALL_SDK = " \ + libgal-mx6 \ + libegl-mx6 \ + libegl-mx6-dev \ + libgles2-mx6 \ + libgles2-mx6-dev \ + " diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch new file mode 100644 index 0000000..719a38d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch @@ -0,0 +1,32 @@ +From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Mon, 13 Apr 2015 12:54:17 +0200 +Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default + +--- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +index e638266..dd8b21fc5 100644 +--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +@@ -70,12 +70,11 @@ + compatible = "fsl,mxc_sdc_fb"; + disp_dev = "hdmi"; + interface_pix_fmt = "RGB24"; +- mode_str ="1920x1080M@60"; +-/* default_bpp = <16>;*/ +- default_bpp = <24>; ++ mode_str ="1280x729M@60"; ++ default_bpp = <16>; + int_clk = <0>; + late_init = <0>; +- status = "disabled"; ++ status = "okay"; + }; + + mxcfb2: fb@1 { +-- +2.3.5 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 68cdfc2..5de3f19 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -26,6 +26,12 @@ SRC_URI += "\ file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ " +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \ + " + # kernel image files are not needed in the image RDEPENDS_kernel-base = "" diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 3439d90..26c374d 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -49,7 +49,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}} if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then case ${MACHINE} in - apalis-imx6|colibri-vf) + apalis-imx6|colibri-imx6|colibri-vf) LAYERSCONF="bblayers.conf.toradex.sample" ;; imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) -- cgit v1.2.3-54-g00ecf From 1281fc7fe024a885a7231e7c186c679ff2c7a7d3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 May 2015 12:17:41 +0300 Subject: toradex: update toradex meta layer Apalis iMX6 V1.1 needs updated kernel and u-boot, so update the meta-toradex layer to latest (Colibri_T20_LinuxImageV2.3_20150320). Change-Id: Ibfb8c48ecfe1e89c937d02da3012cd66791329b5 Reviewed-by: Andy Nichols --- conf/distro/include/apalis-imx6.conf | 3 ++- .../0001-Update-default-args-for-apalis-imx6.patch | 22 +++++++++++++--------- scripts/manifest.xml | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 8aa50b7..86ae4f5 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -25,10 +25,11 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch index c7f0f9b..3b791cf 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch @@ -1,4 +1,4 @@ -From 7872f8e770a202f41fbcf0372b27eb3669c433a1 Mon Sep 17 00:00:00 2001 +From f3525c3daff6c6956bda0bbe29f84ee5497ccf65 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Oct 2014 14:53:25 +0200 Subject: [PATCH] Update default args for apalis imx6 @@ -6,14 +6,14 @@ Subject: [PATCH] Update default args for apalis imx6 Boot from sd card by default, disable kernel logs from tty1, and disable cursor blinking. --- - include/configs/apalis-imx6.h | 15 ++++++++------- + include/configs/apalis_imx6.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/include/configs/apalis-imx6.h b/include/configs/apalis-imx6.h -index 3fb17e2..728c5dd 100644 ---- a/include/configs/apalis-imx6.h -+++ b/include/configs/apalis-imx6.h -@@ -205,18 +205,19 @@ +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 5d32118..289d611 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -212,14 +212,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ @@ -32,6 +32,10 @@ index 3fb17e2..728c5dd 100644 + "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + #ifndef CONFIG_APALIS_IMX6_V1_0 +@@ -229,7 +229,8 @@ + #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" + #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ @@ -39,7 +43,7 @@ index 3fb17e2..728c5dd 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -229,7 +230,7 @@ +@@ -242,7 +243,7 @@ NFS_BOOTCMD \ SD_BOOTCMD \ "setup=setenv setupargs fec_mac=${ethaddr} " \ @@ -49,5 +53,5 @@ index 3fb17e2..728c5dd 100644 "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ -- -1.8.3.2 +1.9.1 diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 0eb2fb9..d41f32b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -45,7 +45,7 @@ groups="notdefault,bbb"/> -- cgit v1.2.3-54-g00ecf From 8127be12eb0e119c422f635fb7b8d43b81d2e8c5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 May 2015 12:19:29 +0300 Subject: scripts: use correct upload path Change-Id: I82461ec39e48777a3d1917a477be40fa30b2be8c Reviewed-by: Eirik Aavitsland --- scripts/upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upload.sh b/scripts/upload.sh index 406f1d1..4e0937c 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -25,7 +25,7 @@ set -x set -e RELEASE=4.x -UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto-${RELEASE}/latest +UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE} if [ ${MACHINE} = "nitrogen6x" ]; then scp tmp/deploy/images/nitrogen6x/b2qt-embedded-image-boot-nitrogen6x.tar.gz ${UPLOADPATH}/b2qt-embedded-image-boot-iMX6.tar.gz -- cgit v1.2.3-54-g00ecf From 4f943fd455a37ff4663e25730c353247f2d9e49f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 May 2015 12:29:17 +0300 Subject: Remove old kernel recipes for am335x-evm and beagleboard Upstream meta-ti has removed these kernel version, so the bbappend files need to go as well. Both am335x-evm and beagleboard are not officially supported devices, so the kernel config changes needed to the new kernel will be done only if requested. Change-Id: Ic3d8e1cc7fcdf30875c3ed3667a09e96817e0e45 Reviewed-by: Andy Nichols --- .../recipes/linux/linux-am335x-psp_3.2.bbappend | 40 --------------------- .../recipes/linux/linux-mainline_3.2.bbappend | 42 ---------------------- 2 files changed, 82 deletions(-) delete mode 100644 meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend delete mode 100644 meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend diff --git a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend deleted file mode 100644 index 0b4beff..0000000 --- a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -do_configure_append() { - # FunctionFS for adb - echo "CONFIG_USB_LIBCOMPOSITE=y" >> ${S}/.config - echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config - echo "CONFIG_USB_FUNCTIONFS_ETH=n" >> ${S}/.config - echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${S}/.config - echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${S}/.config - - echo "CONFIG_DEVTMPFS=y" >> ${S}/.config - - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${S}/.config - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${S}/.config - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${S}/.config - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${S}/.config - - yes '' | oe_runmake oldconfig -} diff --git a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend deleted file mode 100644 index 502edf1..0000000 --- a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -do_configure_prepend() { - # Builtin network driver, so networking is initialized correctly during boot - echo "CONFIG_USB_NET_SMSC95XX=y" >> ${WORKDIR}/defconfig - - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS_ETH=n" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${WORKDIR}/defconfig - - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig - - # Remove beagleboard logo - if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then - rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm - fi -} -- cgit v1.2.3-54-g00ecf From 13db86c927bbaec61a889032cbdcb75bd29f085b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 16 Mar 2015 10:22:56 +0200 Subject: Use meta-qt5 layer Include the open source meta-qt5 layer to all configs. The revision in manifest.xml is the HEAD of master at the time of commit. Change-Id: I3b960750cf0bfcd19c200322d6c6605185a195e7 Reviewed-by: Andy Nichols --- conf/bblayers.conf.bbb.sample | 2 ++ conf/bblayers.conf.emulator.sample | 2 ++ conf/bblayers.conf.fsl.sample | 2 ++ conf/bblayers.conf.rpi.sample | 2 ++ conf/bblayers.conf.sample | 2 ++ conf/bblayers.conf.ti.sample | 2 ++ conf/bblayers.conf.tibidabo.sample | 1 + conf/bblayers.conf.toradex.sample | 2 ++ scripts/manifest.xml | 5 +++++ scripts/manifest_dizzy.xml | 6 ++++++ 10 files changed, 26 insertions(+) diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample index f7374a0..d4ffbc4 100644 --- a/conf/bblayers.conf.bbb.sample +++ b/conf/bblayers.conf.bbb.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ ${BSPDIR}/sources/meta-b2qt/meta-beagleboard-extras \ diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index c961b9f..43ce7d3 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample @@ -32,6 +32,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ " BBLAYERS_NON_REMOVABLE ?= " \ diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index c867cda..dd84362 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ " diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index adc0e68..0866e3e 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-raspberrypi-extras \ " diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index d01c12a..f306303 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -38,6 +38,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index df762a1..7fc2d6b 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-ti-extras \ " diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index c12cde1..734f66a 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -34,6 +34,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-tibidabo \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ ${BSPDIR}/sources/meta-b2qt/meta-architech-extras \ diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample index 00c64f7..c724636 100644 --- a/conf/bblayers.conf.toradex.sample +++ b/conf/bblayers.conf.toradex.sample @@ -35,6 +35,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-qt5 \ + ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ ${BSPDIR}/sources/meta-b2qt/meta-toradex-extras \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 694a7a5..db439f1 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -7,6 +7,7 @@ + + + + + Date: Tue, 31 Mar 2015 10:17:51 +0300 Subject: Add generic QtEnterprise license QtEnterprise license can be used as a generic license for any recipe that is available under Qt for Device Creation license Change-Id: Iebab0b98badf00de388391d3e3558daec585cf07 Reviewed-by: Andy Nichols --- conf/layer.conf | 2 + licenses/QtEnterprise | 706 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 708 insertions(+) create mode 100644 licenses/QtEnterprise diff --git a/conf/layer.conf b/conf/layer.conf index f658ce5..97eb8ae 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -31,3 +31,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ BBFILE_COLLECTIONS += "b2qt" BBFILE_PATTERN_b2qt := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt = "20" + +LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/licenses/QtEnterprise b/licenses/QtEnterprise new file mode 100644 index 0000000..29a4f47 --- /dev/null +++ b/licenses/QtEnterprise @@ -0,0 +1,706 @@ +Qt FOR DEVICE CREATION LICENSE AGREEMENT +Agreement version 1.5 + +This Qt for Device Creation License Agreement ("Agreement") is a legal agreement +between The Qt Company Ltd ("The Qt Company") with its registered office at +Valimotie 21, 00380 Helsinki, Finland, and you (either an individual or a legal +entity) ("Licensee") for the Licensed Software (as defined below). + +1. DEFINITIONS "Affiliate" of a Party shall mean an entity (i) which is directly +or indirectly controlling such Party; (ii) which is under the same direct or +indirect ownership or control as such Party; or (iii) which is directly or +indirectly owned or controlled by such Party. For these purposes, an entity +shall be treated as being controlled by another if that other entity has fifty +percent (50 %) or more of the votes in such entity, is able to direct its +affairs and/or to control the composition of its board of directors or +equivalent body. "Applications" shall mean Licensee's software products created +using the Licensed Software which may include portions of the Licensed Software. +"Customers" shall mean the third parties to whom Licensee directly or indirectly +distributes copies of the Licensed Software. "Deployment Platforms" shall mean +those operating systems in which the Licensed Software can be distributed on +according to the terms and conditions of this Agreement, especially Section 5.2. +"Designated User(s)" shall mean the employee(s) of Licensee acting within the +scope of their employment or Licensee's consultant(s) or contractor(s) acting +within the scope of their services for Licensee and on behalf of Licensee. +"Development Platforms" shall mean those operating systems in which the Licensed +Software can be used only for designing, developing and testing Applications, +but not distributed in any form or used for any other purpose. "Devices" shall +mean devices or products that 1) are manufactured, sold or distributed by +Licensee that include the Licensed Software, and 2) fulfill the definition of a +Joint Hardware and Software Distribution. "Initial Term" shall mean the period +of time one (1) year from the later of (a) the Effective Date; or (b) the date +the Licensed Software was initially delivered to Licensee by The Qt Company. If +no specific Effective Date is set forth in the Agreement, the Effective Date +shall be deemed to be the date the Licensed Software was initially delivered to +Licensee. "Intellectual Property Rights" shall mean patents (including utility +models), design patents, and designs (whether or not capable of registration), +chip topography rights and other like protection, copyright, trademark and any +other form of statutory protection of any kind and applications for any of the +foregoing as well as any trade secrets. "Joint Hardware and Software +Distribution" shall mean either: (i) distribution of a hardware device where, in +its final end user configuration, the main user interface or substantial +functionality of the device is provided by Application(s) created by Licensee or +others, using Licensed Software or Licensed Software based software product, and +depends on the Licensed Software or an open source version of Qt or any Qt based +software product; or (ii) distribution of the Licensed Software with a device +designed to facilitate the installation of the Licensed Software onto the same +device where the main user interface or substantial functionality of such device +is provided by Application(s) created by Licensee or others, using the Licensed +Software, and depends on the Licensed Software. "License Certificate" shall mean +the document accompanying the Licensed Software which specifies the modules +which are licensed under the Agreement, Development Platforms, Deployment +Platforms and Designated Users. "License Fee" shall mean the fee charged to +Licensee for (i) each copy of the Licensed Software purchased, as well as (ii) +reproduction and distribution of Licensed Software under the terms of this +Agreement. "License Packs" shall mean set of prepaid Distribution Licenses, as +defined in Section 5.2 b). "Licensed Software" shall mean the computer software, +"online" or electronic documentation, associated media and printed materials, +including the source code, example programs and the documentation delivered by +The Qt Company to Licensee in conjunction with this Agreement. Licensed Software +does not include Third Party Software (as defined in Section 7). "Modified +Software" shall mean modifications made to the Licensed Software by Licensee. +"Nokia" shall mean Nokia Corporation, a corporation incorporated under the laws +of Finland, having its registered office at PO box 226, 00045 Nokia Group, +Finland (visiting address Karakaari 7, 02610 Espoo, Finland) and registered with +the Finnish Trade Register under business ID 0112038-9 and acting on behalf of +its respective Affiliates. "Online Services" shall mean any services or access +to systems provided by The Qt Company to the Licensee over Internet in +conjunction with the Licensed Software or for the purpose of use by the Licensee +of the Licensed Software or Support. Using some of the Online Services may be +subject to additional fees. "Party or Parties" shall mean Licensee and/or The Qt +Company. "Redistributables" shall mean the portions of the Licensed Software set +forth in Appendix 1, Section 1 that may be distributed with or as part of +Applications in object code form. "Renewal Term" shall mean a time period of +twelve months calculated from the end of the Initial Term, or from end of the +previous Renewal Term. "Support" shall mean standard developer support that is +provided by The Qt Company to assist eligible Designated Users in using the +Licensed Software in accordance with its established standard support +procedures. "Updates" shall mean a release or version of the Licensed Software +containing enhancements, new features, bug fixes, error corrections and other +changes that are generally made available to users of the Licensed Software that +have contracted for maintenance and support. + +2. OWNERSHIP The Licensed Software is protected by copyright laws and +international copyright treaties, as well as other intellectual property laws +and treaties. The Licensed Software is licensed, not sold. To the extent +Licensee submits bug fixes or error corrections, including information related +thereto, Licensee hereby grants The Qt Company a sublicensable, irrevocable, +perpetual, worldwide, non-exclusive, royalty-free and fully paid-up copyright +and trade secret license to reproduce, adapt, translate, modify, and prepare +derivative works of, publicly display, publicly perform, sublicense, make +available and distribute error corrections and bug fixes, including derivative +works thereof. All The Qt Company's and/or its licensors' trademarks, service +marks, trade names, logos or other words or symbols are and shall remain the +exclusive property of The Qt Company or its licensors respectively. + +3. MODULES Some of the files in the Licensed Software have been grouped into +modules. These files contain specific notices defining the module of which they +are a part. The modules licensed to Licensee are specified in the License +Certificate accompanying the Licensed Software. The terms of the License +Certificate are considered part of the Agreement. In the event of inconsistency +or conflict between the language of this Agreement and the License Certificate, +the provisions of this Agreement shall govern. 4. VALIDITY OF THE AGREEMENT By +installing, copying, or otherwise using the Licensed Software, Licensee agrees +to be bound by the terms of this Agreement. If Licensee does not agree to the +terms of this Agreement, Licensee should not install, copy, or otherwise use the +Licensed Software. In addition, by installing, copying, or otherwise using any +Updates or other components of the Licensed Software that Licensee receives +separately as part of the Licensed Software, Licensee agrees to be bound by any +additional license terms that accompany such Updates, if any. If Licensee does +not agree to the additional license terms that accompany such Updates, Licensee +should not install, copy, or otherwise use such Updates. Upon Licensee's +acceptance of the terms and conditions of this Agreement, The Qt Company grants +Licensee the right to use the Licensed Software in the manner provided below. + +5. LICENSES 5.1 Using, Modifying and Copying The Qt Company grants to Licensee a +non-exclusive, non-transferable, perpetual license to use, modify and copy the +Licensed Software for Designated Users specified in the License Certificate for +the sole purposes of: (i) designing, developing, and testing Application(s); +(ii) modifying the Licensed Software as limited by section 8 below; and (iii) +compiling the Licensed Software and/or Modified Software source code into object +code. Licensee may install copies of the Licensed Software on an unlimited +number of computers provided that only the Designated Users use the Licensed +Software. Licensee may at any time designate another Designated User to replace +a then-current Designated User by notifying The Qt Company, provided that a) the +then-current Designated User has not been designated as a replacement during the +last six (6) months; and b) there is no more than the specified number of +Designated Users at any given time. + +5.2 Right for Redistribution a) License for creating Applications For the +purpose of creating Applications The Qt Company grants Licensee a non-exclusive, +royalty-free right to reproduce and distribute the object code form of +Redistributables (listed in Appendix 1, Section 1) for execution on the +specified Deployment Platforms, excluding the Joint Hardware and Software +Distribution. Copies of Redistributables may only be distributed with and for +the sole purpose of executing Applications permitted under this Agreement that +Licensee has created using the Licensed Software. Under no circumstances may any +copies of Redistributables be distributed separately. This Agreement does not +give Licensee any rights to distribute any of the parts of the Licensed Software +listed in Appendix 1, Section 2, neither as a whole nor as parts or snippets of +code. Licensee may not distribute, transfer, assign or otherwise dispose of +Applications and/or Redistributables, in binary/compiled form, or in any other +form, if such action is part of a Joint Software and Hardware Distribution, +except as provided in Section 5.2b) below. b) License for creating Devices For +the purpose of creating Devices The Qt Company grants to Licensee a +non-exclusive, non-transferable license to (a) install copies of the compiled +Licensed Software (in object code form only) in Devices and/or bundle or +integrate copies of the Licensed Software (in object code form only) into or +with Devices and other services; (b) distribute Licensed Software (in object +code form only) to one or more tiers of distributors as incorporated or +integrated in Devices; and (c) sublicense the Licensed Software (in object code +form only), as incorporated or integrated in Devices, to end users under +Licensee's standard terms and conditions, which must meet the requirements set +out in Appendix 2 (collectively, the "Distribution License"). This Distribution +License does not entitle Licensee to receive, or grant Licensee any rights with +respect to any source code. Should any third party that has received a product, +software and/or a sublicense from Licensee in accordance with the provisions +above, wish to use the product and sublicensed software in a manner not +warranted in Appendix 2, such third party must request a licensing agreement for +this purpose directly from The Qt Company. Licensee may also reproduce and +distribute the Licensed Software (in object code form only) under the +Distribution License independent of the Device, (i.e. the Licensed Software may +be reproduced and distributed by Licensee to others as a stand-alone or +independent product or for use independent of the Device). The Distribution +License provided under this Section 5.2b) is conditional, subject to Licensee´s +full compliance of Section 14 of this Agreement. All reproduction and +distribution of the Licensed Software or any portion thereof requires the +payment of License Fees from Licensee to The Qt Company. The licenses granted in +this Section by The Qt Company to Licensee are subject to Licensee's compliance +with Section 5.3 of this Agreement. c) For the avoidance of doubt, should the +Licensee wish to distribute Licensed Software as a part of software development +kit (SDK) for the purpose of developing Applications by Licensee´s customers +for Licensee´s products, such distribution is subject to a separate Qt SDK +distribution license agreement to be concluded with The Qt Company. 5.3 Further +Requirements It is expressly acknowledged and understood by Licensee, that +Licensee is strictly prohibited from using or licensing Licensed Software for +creation of mobile phones or tablet computers targeted for consumer end users. +The aforementioned shall not prohibit Licensee from using Licensed Software for +the purpose of creating Applications for any devices, including mobile phones +and tablet computers. Notwithstanding anything contrary to this Agreement, it is +expressly acknowledged and understood by Licensee, that Nokia shall hereby be +named as a third party beneficiary under this Agreement with respect to this +Section 5.3. Therefore, Nokia shall have the same rights as The Qt Company under +this Agreement with respect to this Section 5.3, and shall be entitled to +exercise such rights independent from The Qt Company. The licenses granted in +this Section 5 by The Qt Company to Licensee are subject to Licensee's +compliance with Section 8 of this Agreement. + +6. VERIFICATION The Qt Company or a certified auditor on The Qt Company's +behalf, may, upon its reasonable request and at its expense, audit Licensee with +respect to the use of the Licensed Software. Such audit may be conducted by +mail, electronic means or through an in-person visit to Licensee's place of +business. Any such in-person audit shall be conducted during regular business +hours at Licensee's facilities and shall not unreasonably interfere with +Licensee's business activities. The Qt Company will not remove, copy, or +redistribute any electronic material during the course of an audit. If an audit +reveals that Licensee is using the Licensed Software in a way that is in +material violation of the terms of the Agreement, then Licensee shall pay The Qt +Company's reasonable costs of conducting the audit. In the case of a material +violation, Licensee agrees to pay The Qt Company any amounts owing that are +attributable to the unauthorized use. Alternatively, The Qt Company reserves the +right, at The Qt Company's sole option, to terminate the licenses for the +Licensed Software. + +7. THIRD PARTY SOFTWARE The Licensed Software may provide links to third party +libraries or code (collectively "Third Party Software") to implement various +functions. Third Party Software does not comprise part of the Licensed Software. +In some cases, access to Third Party Software may be included along with the +Licensed Software delivery as a convenience for development and testing only. +Such source code and libraries may be listed in the ".../src/3rdparty" source +tree delivered with the Licensed Software or documented in the Licensed Software +where the Third Party Software is used, as may be amended from time to time, do +not comprise the Licensed Software. Licensee acknowledges (i) that some part of +Third Party Software may require additional licensing of copyright and patents +from the owners of such, and (ii) that distribution of any of the Licensed +Software referencing any portion of a Third Party Software may require +appropriate licensing from such third parties. + +8. CONDITIONS FOR CREATING APPLICATIONS The licenses granted in this Agreement +for Licensee to create, modify and distribute Applications is subject to all of +the following conditions: (i) all copies of the Applications Licensee creates +must bear a valid copyright notice either Licensee's own or the copyright notice +that appears on the Licensed Software; (ii) Licensee may not remove or alter any +copyright, trademark or other proprietary rights notice contained in any portion +of the Licensed Software including but not limited to the About Boxes; (iii) +Licensee will indemnify and hold The Qt Company, its Affiliates, contractors, +and its suppliers, harmless from and against any claims or liabilities arising +out of the use, reproduction or distribution of Applications; (iv) Applications +must be developed using a licensed, registered copy of the Licensed Software; +(v) Applications must add primary and substantial functionality to the Licensed +Software; (vi) Applications may not pass on functionality which in any way makes +it possible for others to create software with the Licensed Software; however +Licensee may use the Licensed Software's scripting and QML ("Qt Quick") +functionality solely in order to enable scripting, themes and styles that +augment the functionality and appearance of the Application(s) without adding +primary and substantial functionality to the Application(s); (vii) Licensee may +create Modified Software that breaks the source or binary compatibility with the +Licensed Software. This includes, but is not limited to, changing the +application programming interfaces ("API") by adding, changing or deleting any +variable, method, or class signature in the Licensed Software, the inter-process +QCop specification, and/or any inter-process protocols, services or standards in +the Licensed Software libraries. To the extent that Licensee breaks source or +binary compatibility with the Licensed Software, Licensee acknowledges that The +Qt Company's ability to provide Support may be prevented or limited and +Licensee's ability to make use of Updates may be restricted; (viii) Applications +may not compete with the Licensed Software; (ix) Licensee may not use The Qt +Company's or any of its suppliers' names, logos, or trademarks to market +Applications, except to state that Licensee's Application(s) was developed using +the Licensed Software; and (x) each Designated User creating the Application(s) +needs to have a separate license for the Licensed Software. NOTE: If Licensee, +or another third party, has, at any time, developed all (or any portions of) the +Application(s) using an open source version of Qt licensed under the terms of +the GNU Lesser General Public License, version 2.1 or later ("LGPL") or the GNU +General Public License version 2.0 or later ("GPL"), Licensee may not combine +such development work with the Licensed Software without an express written +permission from The Qt Company, and must license such Application(s) (or any +portions derived there from) under the terms of such applicable version of LGPL +(Qt only) or GPL (Qt, Qtopia and Qt Extended) . Copies of the licenses referred +to above are located at http://www.gnu.org/licenses/old-licenses/lgpl- 2.1.html, +https://www.gnu.org/licenses/lgpl.html, +http://www.fsf.org/licensing/licenses/info/GPLv2.html, and +http://www.gnu.org/copyleft/gpl.html. 9. PRE-RELEASE CODE The Licensed Software +may contain pre-release code and functionality marked or otherwise stated as +"Technology Preview", "Alpha", "Beta" or similar. Such pre-release code may be +present in order to provide experimental support for new platforms or +preliminary version of new functionality. The pre-release code is not at the +level of performance and compatibility of a final, generally available, product +offering. The pre- release parts of the Licensed Software may not operate +correctly and may be substantially modified prior to the first commercial +product release, if any. The Qt Company is under no obligation to make +pre-release code commercially available, or provide any Support or Updates +relating thereto. The pre-release code must not be used for commercial purposes +or in a live operating environment where it may be relied upon to perform in the +same manner as a commercially released product or with data that has not been +sufficiently backed up. + +10. LIMITED WARRANTY AND WARRANTY DISCLAIMER The Qt Company hereby represents +and warrants with respect to the Licensed Software that it has the power and +authority to grant the rights and licenses granted to Licensee under this +Agreement. Except as set forth above, the Licensed Software is licensed to +Licensee "as is". TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT +COMPANY ON BEHALF OF ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, +DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE +AND NON-INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES +NOT WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR +THAT IT IS WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE +UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE +RISK OF AND RESPONSIBILITY OF LICENSEE. 11. LIMITATION OF LIABILITY AND OTHER +COVENANTS 11.1 Risk Allocation If, The Qt Company's warranty disclaimer +notwithstanding, The Qt Company is held to be liable to Licensee whether in +contract, tort, or any other legal theory, based on the Licensed Software, The +Qt Company's entire liability to Licensee and Licensee's exclusive remedy shall +be, at The Qt Company's option, either (a) return of the price Licensee paid for +the Licensed Software, or (b) repair or replacement of the Licensed Software, +provided Licensee returns all copies of the Licensed Software to The Qt Company +as originally delivered to Licensee. EXCEPT FOR INJURY TO PERSONS OR IN CASES OF +INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO AMOUNTS +PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT AND TO +THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY BE LIABLE +TO THE OTHER PARTY IN CONTRACT, TORT OR OTHERWISE, WHATEVER THE CAUSE THEREOF, +FOR ANY LOSS OF PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY +INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR +EXPENSE OF ANY KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS +AGREEMENT. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LIABILITY FOR SUCH +DAMAGE SHALL BE EXCLUDED, EVEN IF THE EXCLUSIVE REMEDIES PROVIDED FOR IN THIS +AGREEMENT FAIL OF THEIR ESSENTIAL PURPOSE. EXCEPT FOR INJURY TO PERSONS OR IN +CASES OF INTENTIONAL MISCONDUCT AND IN CASE OF THE LICENSEE WITH RESPECT TO +AMOUNTS PAYABLE UNDER SECTION 14 OR LICENSEE'S MATERIAL BREACH OF THIS AGREEMENT +AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL EITHER PARTY'S +TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT EXCEED THE AGGREGATE LICENSE FEES +RECEIVED FROM LICENSEE FOR THE LICENSED SOFTWARE DURING THE PERIOD OF TWELVE +(12) MONTHS IMMEDIATELY PRECEDING THE EVENT RESULTING IN SUCH LIABILITY. THE +PROVISIONS OF THIS SECTION 11 ALLOCATE THE RISKS UNDER THIS AGREEMENT BETWEEN +THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE LIMITATIONS SET +FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT 11.2 No Third +Party Representations, Warranties or Transfers Licensee shall make no +representations or warranties concerning the Licensed Software on behalf of The +Qt Company, nor shall Licensee sell, transfer, publish, disclose, display or +otherwise make available the Licensed Software, or copies thereof, to any third +party except as specifically set forth herein or in another written agreement +with The Qt Company. Any representation or warranty Licensee makes or purports +to make on The Qt Company's behalf shall be void as to The Qt Company. 11.3 +Licensee´s Indemnification Licensee shall indemnify and hold harmless The Qt +Company and its officers, directors, employees, representative, licensors, and +suppliers from and against any claim, injury, judgment, settlement, loss or +expense, including attorneys' fees, arising as a consequence of: (a) Licensee's +breach of its warranties or any other provisions of this Agreement, including, +but not limited to, (i) the failure of Licensee to comply with the provisions of +this Section 11, (ii) any misrepresentations of Licensee in connection with The +Qt Company or the Licensed Software, and (iii) any other wrongful conduct of +Licensee, its employees, representatives, agents, or (b) the Device. 12. +SUPPORT, UPDATES AND ONLINE SERVICES Licensee will be eligible to receive +Support and Updates and to use the Online Services during the Initial Term, in +accordance with The Qt Company's then current policies and procedures, if any. +Such policies and procedures may be changed from time to time. Following the +Initial Term, The Qt Company shall no longer make the Licensed Software, +Support, Updates or Online Services available to Licensee unless Licensee +purchases additional Support, Updates and Online Services according to this +Section 12 below. Licensee shall be responsible for providing service and +support to Licensee's Customers with respect to the Licensed Software. Licensee, +as appropriate, shall inform Licensee's Customers that all requests for support +or service are to be made to Licensee, and not to The Qt Company. Updates shall +be considered to be Licensed Software and governed by this Agreement as such, +unless The Qt Company designates that a different agreement shall govern. +Licensee shall be responsible for distributing patches and fixes to Customers if +and as The Qt Company reasonable requests. Licensee may purchase additional +Support, Updates and Online Services following the Initial Term or the currently +ongoing Renewal Term subject to The Qt Company's terms and conditions applicable +at the time of renewal. 13. CONFIDENTIALITY Each party acknowledges that during +the Initial Term of this Agreement it shall have access to information about the +other party's business, business methods, business plans, customers, business +relations, technology, and other information, including the terms of this +Agreement, that is confidential and of great value to the other party, and the +value of which would be significantly reduced if disclosed to third parties +("Confidential Information"). Accordingly, when a party (the "Receiving Party") +receives Confidential Information from another party (the "Disclosing Party"), +the Receiving Party shall, and shall obligate its employees and agents and +employees and agents of its Affiliates to: (i) maintain the Confidential +Information in strict confidence; (ii) not disclose the Confidential Information +to a third party without the Disclosing Party's prior written approval; and +(iii) not, directly or indirectly, use the Confidential Information for any +purpose other than for exercising its rights and fulfilling its responsibilities +pursuant to this Agreement. Each party shall take reasonable measures to protect +the Confidential Information of the other party, which measures shall not be +less than the measures taken by such party to protect its own confidential and +proprietary information. "Confidential Information" shall not include +information that (a) is or becomes generally known to the public through no act +or omission of the Receiving Party; (b) was in the Receiving Party's lawful +possession prior to the disclosure hereunder and was not subject to limitations +on disclosure or use; (c) is developed by employees of the Receiving Party or +other persons working for the Receiving Party who have not had access to the +Confidential Information of the Disclosing Party, as proven by the written +records of the Receiving Party or by persons who have not had access to the +Confidential Information of the Disclosing Party as proven by the written +records of the Receiving Party; (d) is lawfully disclosed to the Receiving Party +without restrictions, by a third party not under an obligation of +confidentiality; or (e) the Receiving Party is legally compelled to disclose the +information, in which case the Receiving Party shall assert the privileged and +confidential nature of the information and cooperate fully with the Disclosing +Party to protect against and prevent disclosure of any Confidential Information +and to limit the scope of disclosure and the dissemination of disclosed +Confidential Information by all legally available means. The obligations of the +Receiving Party under this Section shall continue during the Initial Term and +for a period of five (5) years after expiration or termination of this +Agreement. To the extent that the terms of the Non-Disclosure Agreement between +The Qt Company and Licensee conflict with the terms of this Section 13, this +Section 13 shall be controlling over the terms of the Non-Disclosure Agreement. + +14 FEES, ORDERS, DELIVERY AND PAYMENT 14.1 DISTRIBUTION LICENSE FEES The +Distribution License provided under Section 5.2b) is conditional on the Licensee +purchasing the needed amount of Distribution Licenses separately from The Qt +Company before distributing Devices to Customers. Distribution licenses are sold +in License Packs subject to a fee. The License Fee for a Distribution License +purchased by Licensee cannot be refunded or claimed as a credit, even on the +ground that it is not distributed, by sale or otherwise, from Licensee to +Customers or for any other reason. Licensee will have an account of Distribution +Licenses that will be applied to each copy of Licensed Software that is bundled +or integrated with any of the Devices or that is distributed to Customers. +Licensee may bundle, integrate and distribute copies of the Licensed Software so +long as Licensee has Distribution Licenses paid for, but not yet used. Each time +Licensee bundles, integrates or distributes a copy of Licensed Software, then +one Distribution License is used, and Licensee's account of available +Distribution Licenses is decreased accordingly. 14.2 DISTRIBUTION LICENSES +ORDERED Licensee shall submit all purchase orders for Distribution Licenses to +The Qt Company either by fax or mail or any other method acceptable to The Qt +Company (each such order is referred to herein as a "Purchase Order"). If The Qt +Company wishes to accept the Purchase Order, The Qt Company may then confirm and +return the Purchase Order to Licensee, whereupon the Purchase Order shall become +binding between the Parties. In the event of conflict or inconsistency between +this Agreement and a Purchase Order, this Agreement shall control. 14.3 PAYMENT +TERMS The Qt Company will submit an invoice to Licensee any time after The Qt +Company receives a subsequent purchase order(s) from Licensee, and delivers the +goods or services described in the Agreement or purchase order to Licensee. +Licensee's payments for the Licensed Software and any other charges under this +Agreement shall be paid by Licensee no later than thirty (30) days from the time +The Qt Company mails its invoices to Licensee. A late payment charge of the +lower of (a) one percent per month; or (b) the highest interest rate allowed by +applicable law, shall be charged on unpaid balances that remain past due for +more than thirty (30) days. The Qt Company shall have the right to suspend, +terminate or withhold Distribution Licenses, License Certificates, deliveries +and/or services should Licensee fail to make payment in a timely fashion. +Licensee shall at all times maintain accurate and up-to-date written records of +the number of copies of the Licensed Software that Licensee installs in each +Device(s). 14.4 TAXES All amounts payable are gross amounts but exclusive of any +value added tax, use tax, sales tax or similar tax. Licensee shall be entitled +to withhold from payments any applicable withholding taxes and comply with all +applicable tax and employment legislation. Each party shall pay all taxes +(including, but not limited to, taxes based upon its income) or levies imposed +on it under applicable laws, regulations and tax treaties as a result of this +Agreement and any payments made hereunder (including those required to be +withheld or deducted from payments). Each party shall furnish evidence of such +paid taxes as is sufficient to enable the other party to obtain any credits +available to it, including original withholding tax certificates. 15 +RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS 15.1 LICENSEE'S +RECORD-KEEPING Licensee shall at all times maintain accurate and up-to-date +written records of Licensee's activities related to the Licensed Software and +Distribution Licenses, including copying and distribution. The records shall be +adequate to determine Licensee's compliance with the provisions of this +Agreement and to demonstrate the number of Distribution Licenses of the Licensed +Software distributed by Licensee. The records shall conform to good accounting +practices commonly accepted in the industry and consistently applied. Licensee +shall, within thirty (30) days from the end of each calendar quarter, deliver to +The Qt Company a report detailing the number of copies of Licensed Software +distributed by Licensee during that calendar quarter, and detailing also the +number of undistributed copies of Licensed Software made by Licensee and +remaining in its account (i.e., undistributed copies for which Distribution +Licenses have been or need to be obtained from The Qt Company). Such report +shall contain such other information as The Qt Company shall require from time +to time. 15.2. THE QT COMPANY'S INSPECTION RIGHTS The Qt Company or an +independent auditor on The Qt Company's behalf, may, upon at least five (5) +business days' prior written notice and at its expense, audit Licensee with +respect to the use of the Licensed, but not more frequently than once during +each 6-month period. Such audit may be conducted by mail, electronic means or +through an in-person visit to Licensee's place of business. Any such in-person +audit shall be conducted during regular business hours at Licensee's facilities +and shall not unreasonably interfere with Licensee's business activities. The Qt +Company or the independent auditor shall be entitled to inspect Licensee's books +and records that likely to contain information bearing on Licensee's compliance +with this Agreement or the payments due to The Qt Company under this Agreement, +including, but not limited to: assembly logs, sales records, distribution +records ("Licensee's Records") The Qt Company shall not remove, copy, or +redistribute any electronic material during the course of an audit. If an audit +reveals that Licensee is using the Licensed Software in a way that is in +material violation of the terms of the Agreement, then Licensee shall pay The Qt +Company's reasonable costs of conducting the audit. In the case of a material +violation, Licensee agrees to pay The Qt Company any amounts owing that are +attributable to the unauthorized use. In the alternative, The Qt Company +reserves the right, at The Qt Company's sole option, to terminate the licenses +for the Licensed Software. 16. GENERAL PROVISIONS 16.1 Marketing The Qt Company +may include Licensee's company name and logo in a publicly available list of The +Qt Company customers and in its public communications. + +16.2 No Assignment Licensee shall not be entitled to assign or transfer all or +any of its rights, benefits and obligations under this Agreement without the +prior written consent of The Qt Company, which shall not be unreasonably +withheld. The Qt Company shall be entitled to assign or transfer any of its +rights, benefits or obligations under this Agreement on an unrestricted basis. + +16.3 Termination 16.3.1 Termination by The Qt Company The Qt Company shall have +the right to terminate this Agreement upon thirty (30) days prior written notice +if (i) the Licensee is in breach of any material obligation under this Agreement +and the breaching Party fails to remedy such breach within such notice period; +(ii) any Third Party Software license grant to The Qt Company terminates or +expires; or (iii) Licensee or any of its Affiliates bring a suit before any +court or administrative agency or otherwise assert a claim for infringement of +Intellectual Property Rights owned or licensable by Licensee or its Affiliates +against (a) The Qt Company or any of its Affiliates; or (b) any other recipient +of a license from The Qt Company with respect to the Licensed Software; or (c) +any contractor, customer or distributor of a Party listed above in a or b; where +such suit or claim relates to the use of the Licensed Software. 16.3.2 Mutual +right to Terminate Either party shall have the right to terminate this Agreement +immediately upon written notice in the event that the other party becomes +insolvent, files for any form of bankruptcy, makes any assignment for the +benefit of creditors, has a receiver, administrative receiver or officer +appointed over the whole or a substantial part of its assets, ceases to conduct +business, or an act equivalent to any of the above occurs under the laws of the +jurisdiction of the other party. 16.3.3 Parties´ Rights and Duties upon +Termination 16.3.3.1 Licensed Software which has not been subject to +Distribution Upon termination of the Licenses, Licensee shall cease using the +Licensed Software and return to The Qt Company all copies of Licensed Software +that were supplied by The Qt Company. All other copies of Licensed Software in +the possession or control of Licensee must be erased or destroyed. An officer of +Licensee must promptly deliver to The Qt Company a written confirmation that +this has occurred. 16.3.3.2 Licensed Software which has been distributed in +connection with Licensed Products Upon termination or expiration of this +Agreement, the following rights granted hereunder, shall terminate, as follows: +a) Licensee shall, within: (i) thirty (30) days if termination is based on +Sections 16.3.1, 16.3.2, 15.2; or (ii) within six (6) months of the termination +date, if termination is based on any other reason, discontinue all copying, +embedding, production and distribution of any copies of the Licensed, and will +cause any third parties who obtained from it the right to manufacture or +distribution of copies of the Licensed Software to do likewise. b) Any +termination of this Agreement shall not affect any rights of an end-user to use +the Licensed Software. c) Licensee shall cease using the Licensed Software as +provided for above, including without limitation all source code, master +diskettes and tapes, user manuals for the Licensed Software and Documentation, +and deliver such to The Qt Company and/or permanently destroy all copies of the +Licensed Software and all materials relating to the Licensed Software, except +that Licensee may retain and exploit only such copies of the Licensed Software +as it may reasonably require in providing continued support to its end-user +customers, and will certify that that is the case upon the request of the The Qt +Company. 16.4 Surviving Sections Any terms and conditions that by their nature +or otherwise reasonably should survive a cancellation or termination of this +Agreement shall also be deemed to survive. The following Sections and +Subsections of this Agreement shall survive its termination: 3, 10, 11, 13, 15, +16.3, 16.9, but none of the licenses or rights granted to Licensee shall +survive. Any obligation to make payment (including, without limitation, any +obligation to pay License Fees, interest, and taxes) shall also survive +termination of this Agreement and be paid in accordance with this Agreement. +16.5 Entire Agreement This Agreement constitutes the complete agreement between +the parties and supersedes all prior or contemporaneous discussions, +representations, and proposals, written or oral, with respect to the subject +matters discussed herein, with the exception of the non-disclosure agreement +executed by the parties in connection with this Agreement ("Non-Disclosure +Agreement"), if any, shall be subject to Section 13. No modification of this +Agreement shall be effective unless contained in a writing executed by an +authorized representative of each party. No term or condition contained in +Licensee's purchase order shall apply unless expressly accepted by The Qt +Company in writing. If any provision of the Agreement is found void or +unenforceable, the remainder shall remain valid and enforceable according to its +terms. If any remedy provided is determined to have failed for its essential +purpose, all limitations of liability and exclusions of damages set forth in +this Agreement shall remain in effect. + +16.6 Force Majeure Neither party shall be liable to the other for any delay or +non-performance of its obligations hereunder other than the obligation of paying +the license fees in the event and to the extent that such delay or non- +performance is due to an event of Force Majeure (as defined below). If any event +of Force Majeure results in a delay or non-performance of a party for a period +of three (3) months or longer, then either party shall have the right to +terminate this Agreement with immediate effect without any liability (except for +the obligations of payment arising prior to the event of Force Majeure) towards +the other party. A "Force Majeure" event shall mean an act of God, terrorist +attack or other catastrophic event of nature that prevents either party for +fulfilling its obligations under this Agreement. + +16.7 Notices Any notice given by one party to the other shall be deemed properly +given and deemed received if specifically acknowledged by the receiving party in +writing or when successfully delivered to the recipient by hand, fax, or special +courier during normal business hours on a business day to the addresses +specified below. Each communication and document made or delivered by one party +to the other party pursuant to this Agreement shall be in the English language +or accompanied by a translation thereof. Notices to The Qt Company shall be +given to: The Qt Company Ltd Attn: Legal Valimotie 21 FI-00380 Helsinki Finland +Fax: +358 10 313 3700 16.8 Export Control Licensee acknowledges that the +Licensed Software may be subject to export control restrictions of various +countries. Licensee shall fully comply with all applicable export license +restrictions and requirements as well as with all laws and regulations relating +to the importation of the Licensed Software and/or Modified Software and/or +Applications and shall procure all necessary governmental authorizations, +including without limitation, all necessary licenses, approvals, permissions or +consents, where necessary for the re- exportation of the Licensed Software, +Modified Software or Applications. + +16.9 Governing Law and Legal Venue This Agreement shall be construed and +interpreted in accordance with the laws of Finland, excluding its choice of law +provisions. Any disputes, controversy or claim arising out of or relating to +this Agreement, or the breach, termination or validity thereof shall be shall be +finally settled by arbitration in accordance with the Arbitration Rules of the +Central Chamber of Commerce of Finland. The arbitration tribunal shall consist +of one (1), or if either Party so requires, of three (3), arbitrators. The award +shall be final and binding and enforceable in any court of competent +jurisdiction. The arbitration shall be held in Helsinki, Finland and the process +shall be conducted in the English language. + +16.10 No Implied License There are no implied licenses or other implied rights +granted under this Agreement, and all rights, save for those expressly granted +hereunder, shall remain with The Qt Company and its licensors. In addition, no +licenses or immunities are granted to the combination of the Licensed Software +and/or Modified Software, as applicable, with any other software or hardware not +delivered by The Qt Company under this Agreement. + +Appendix 1: Licensed Software + +1. Parts of the Licensed Software that are permitted for distribution +("Redistributables") - The Licensed Software's essential and add-on libraries as +listed in the License Certificate in object code form - The Licensed Software's +configuration tool ("qtconfig") - The Licensed Software's help tool in object +code/executable form ("Qt Assistant") - The Licensed Software's +internationalization tools in object code/executable form ("Qt Linguist", +"lupdate", "lrelease") - The Licensed Software's designer tool ("Qt Designer") +- The Licensed Software's IDE tool ("Qt Creator"), excluding any parts or +plug-ins which are delivered to Licensee only in object code - The Licensed +Software's QML ("Qt Quick") launcher tool ("qmlscene" and "qmlviewer") in object +code/executable form - The Licensed Software's installer framework + +2. Parts of the Licensed Software that are not permitted for distribution +without a separate SDK distribution license agreement include, but are not +limited to - The Licensed Software's source code and header files - The Licensed +Software's documentation - The Licensed Software's documentation generation tool +("qdoc") - The Licensed Software's tool for writing makefiles ("qmake") - The +Licensed Software's Meta Object Compiler ("moc") - The Licensed Software's User +Interface Compiler ("uic" or in the case of Qt Jambi: "juic") - The Licensed +Software's Resource Compiler ("rcc") - The Licensed Software's generator (only +in the case of Qt Jambi if applicable) - The Licensed Software's parts of the +IDE tool ("Qt Creator") that are delivered to Licensee only in object code - The +Licensed Software's Emulator - Build scripts, recipes and other material for +creating the configuration of Licensed Software and/or 3rd party components, +including the reference operating system configuration delivered in conjunction +with the Licensed Software + +Appendix 2: Distribution Licensing + +I - Definitions The terms used in this Appendix 3 shall have the same meaning as +defined in the main part of the Agreement. "Sublicensed Software" shall mean the +Licensed Software, which is sublicensed to end-users (Sublicensees) in +accordance with Section 5.2 of the Agreement. "Sublicensee" shall mean the +end-user to which the Sublicensed Software is licensed. "Sublicense" shall mean +the license given by Licensee to Sublicensee in accordance with Section 5.2 of +the Agreement and this Appendix 3. II - Sublicensing The sublicensing referred +to in Section 5.2 of the Agreement must satisfy the criteria set forth under +sections 1 - 11 below: 1. Source code. Only the object code of the Sublicensed +Software may be sublicensed. Unless authorized in a separate agreement with The +Qt Company, the source code may not be sublicensed. 2. End-User Documentation. +Sublicensee may be given the right to use the end-user Documentation, provided +that such rights are limited to use in connection with the Sublicensed Software. +Whenever the context reasonably permits, any reference in this Appendix to +Sublicensed Software shall also apply to the end-user Documentation. 3. +Limitations on Numbers of Computers and Processors. The Sublicensee's right to +use the Sublicensed Software must be limited so that each Sublicense can only be +used on a single computer or processor within the possession and control of the +Sublicensee. Each Sublicense may not withstanding the foregoing also cover +additional computers or processors, but in such case, each additional computer +or processor covered by the Sublicense shall require Licensee's purchase of one +additional Distribution license from The Qt Company. 4. Limits on Use, +Distribution and Derivative Works. The Sublicense and Sublicensee's rights must +be limited to Sublicensee's internal use purposes only and must not include any +license, right or authorization to distribute or disclose any copy or portion of +the Sublicensed Software to any other person. Sublicensee must not be given the +right to modify or create derivative works based on the Sublicensed Software, +and it must be stated explicitly in the Sublicense that such modification or +creation is prohibited. + +5. Copies. Sublicensee may be given the right to make copies of the Sublicensed +Software, provided that any such copy: (a) is created as an essential step in +the utilization of Sublicensed Software in accordance with the Sublicense, or +(b) is only for archival purposes to back-up the licensed use of Sublicensed +Software. Sublicensee may also be given the right to make copies of Sublicensed +Software to the extent reasonably needed to exercise rights under the +Sublicense. Sublicensee must be obliged under the Sublicense to make sure that +all The Qt Company trademark, copyright and intellectual property notices are +faithfully reproduced and included on copies made by Sublicensee. Sublicensee +may be given the right to make copies of the Documentation, but only as +reasonably needed to facilitate the use of Sublicensed Software. Sublicensee may +not be given the right to make any other copies of Licensed Software or +Documentation unless and except as permitted by The Qt Company in a separate, +written agreement. 6. Other Versions and Updates. If Licensee is entitled to +Updates in accordance with Section 12of the Agreement, such Updates may also be +sublicensed, subject to the terms and conditions found in this Appendix 3. 7. +Protection of Sublicensed Software. Except as expressly permitted in this +Appendix 3 (or in another written agreement with The Qt Company), Sublicensee +must not be given any rights to modify or create derivative works based on +Sublicensed Software, or reproduce Sublicensed Software, or distribute any +copies of Sublicensed Software, or disclose any Sublicensed Software to any +third party, or decompile, disassemble or otherwise reverse engineer Sublicensed +Software, or use any Sublicensed Software or information learned therefrom. +Sublicensee must as part of the contractual terms in the Sublicense acknowledge +that The Qt Company and its licensors own the copyrights and other intellectual +property in and to the Sublicensed Software. 8. Disclaimers Of Warranties. +Licensee may not give any warranties regarding the Sublicensed Software to +Sublicensee on behalf of The Qt Company. 9. Responsibility of Sublicensee. +Sublicensee shall, as part of the Sublicense, be made responsible for decisions +made and actions taken based on Sublicensed Software. Sublicensee shall as part +of the contractual terms of the Sublicense be made aware that the Sublicensed +Software is not designed, intended or licensed for use in or with systems, +devices or products intended for surgical implant into the body or other +applications intended to support or sustain life or for any aviation or nuclear +reactor application or any other application in which the software or its +failure, malfunction or inadequacy could directly or indirectly cause or +contribute to personal injury or death or significant property damage. It shall +further be stated in the Sublicense that it is Sublicensee's responsibility to +ascertain the suitability of Sublicensed Software for any situation or +application. It shall also be stated that the Sublicense defines a mutually +agreed-upon allocation of risk and the Sublicense fees reflect such allocation +of risk. 10. Termination. Licensee shall, as part of the terms of the +Sublicense, be entitled to terminate the Sublicense granted to Sublicensee if +Sublicensee breaches terms and conditions set to comply with this Appendix 3. +The Qt Company may instruct Licensee to terminate the Sublicense without undue +delay if termination is warranted in accordance with the foregoing. Upon +termination of the Sublicense, Sublicensee shall be obliged to immediately cease +all use of Sublicensed Software and to destroy all copies of Sublicensed +Software within the possession or control of Sublicensee. 11. Mandatory law. The +requirements above shall not apply to the extent they contravene mandatory +provisions of the law governing the Sublicense, but in such case, The Qt Company +shall be notified about the changes. + -- cgit v1.2.3-54-g00ecf From ae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 11:01:04 +0300 Subject: Build Qt5 and all addons Use meta-qt5 layer to build Qt5, commercial addons and b2qt addons. Create new image and toolchain recipes with Qt5 content, so that the existing image and toolchain remain as-is without Qt5. Currently support only for imx6 targets. Change-Id: I398750dd1a62c6ff8ea216cfe364da273d8e9a77 Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 3 + conf/distro/include/am335x-evm.conf | 3 + conf/distro/include/beagleboard.conf | 3 + conf/distro/include/beaglebone.conf | 3 + conf/distro/include/colibri-vf.conf | 3 + conf/distro/include/raspberrypi2.conf | 6 +- conf/layer.conf | 1 + meta-fsl-extras/recipes/qt5/qtbase_%.bbappend | 38 ++++++++++++ .../recipes/qt5/qtbase_%.bbappend | 42 +++++++++++++ meta-ti-extras/recipes/qt5/qtbase_%.bbappend | 33 +++++++++++ recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 51 ++++++++++++++++ .../b2qt-appcontroller/appcontroller.conf | 5 ++ .../colibri-vf/appcontroller.conf | 7 +++ .../b2qt-appcontroller/mx6/appcontroller.conf | 7 +++ .../b2qt-appcontroller/rpi/appcontroller.conf | 5 ++ recipes-qt/b2qt-addons/b2qt-demos.bb | 68 ++++++++++++++++++++++ recipes-qt/b2qt-addons/b2qt-launcher.bb | 51 ++++++++++++++++ .../b2qt-addons/b2qt-launcher/b2qt-startup.sh | 42 +++++++++++++ recipes-qt/b2qt-addons/b2qt-utils.bb | 48 +++++++++++++++ recipes-qt/images/b2qt-embedded-qt5-image.bb | 45 ++++++++++++++ .../meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 31 ++++++++++ ...ackagegroup-b2qt-embedded-qt5-toolchain-host.bb | 34 +++++++++++ ...up-b2qt-embedded-qt5-addons-toolchain-target.bb | 36 ++++++++++++ .../packagegroup-b2qt-embedded-qt5-addons.bb | 40 +++++++++++++ ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 55 +++++++++++++++++ .../packagegroup-b2qt-embedded-qt5.bb | 47 +++++++++++++++ recipes-qt/qt5-addons/qtcharts_2.0.bb | 47 +++++++++++++++ recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 43 ++++++++++++++ recipes-qt/qt5-addons/qtquick2drenderer.bb | 38 ++++++++++++ .../qt5-addons/qtquickenterprisecontrols_1.3.bb | 65 +++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 46 +++++++++++++++ recipes-qt/qt5/qtbase_%.bbappend | 54 +++++++++++++++++ recipes-qt/qt5/qtconnectivity_%.bbappend | 23 ++++++++ recipes-qt/qt5/qtlocation_%.bbappend | 23 ++++++++ recipes-qt/qt5/qtmultimedia_%.bbappend | 23 ++++++++ 35 files changed, 1065 insertions(+), 4 deletions(-) create mode 100644 meta-fsl-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 meta-raspberrypi-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 meta-ti-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller.bb create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf create mode 100644 recipes-qt/b2qt-addons/b2qt-demos.bb create mode 100644 recipes-qt/b2qt-addons/b2qt-launcher.bb create mode 100755 recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh create mode 100644 recipes-qt/b2qt-addons/b2qt-utils.bb create mode 100644 recipes-qt/images/b2qt-embedded-qt5-image.bb create mode 100644 recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb create mode 100644 recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb create mode 100644 recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb create mode 100644 recipes-qt/qt5-addons/qtcharts_2.0.bb create mode 100644 recipes-qt/qt5-addons/qtdatavisualization_1.2.bb create mode 100644 recipes-qt/qt5-addons/qtquick2drenderer.bb create mode 100644 recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb create mode 100644 recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb create mode 100644 recipes-qt/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/qt5/qtconnectivity_%.bbappend create mode 100644 recipes-qt/qt5/qtlocation_%.bbappend create mode 100644 recipes-qt/qt5/qtmultimedia_%.bbappend diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index f4771f2..08bebd4 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -57,4 +57,7 @@ IMAGE_FSTYPES = "tar.gz" LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" +QT5_VERSION = "5.4.1" +include conf/distro/include/qt5-versions.inc + include conf/distro/include/${MACHINE}.conf diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index dffbe94..3c32f49 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_VERSION_libgles-omap3 = "5.01.01.01" PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.01" diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 87c986c..b597481 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 96662d6..dea5330 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -27,6 +27,9 @@ EXTRA_IMAGEDEPENDS += "u-boot-uenv-script" PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01" +PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" +PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" + PREFERRED_PROVIDER_u-boot = "u-boot" EXTRA_IMAGEDEPENDS_remove = "u-boot-denx" UBOOT_MACHINE = "am335x_boneblack_config" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 483511c..715bd62 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -30,6 +30,9 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" +PREFERRED_PROVIDER_virtual/egl = "opengldummy" +PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" + MACHINE_EXTRA_INSTALL = "\ opengldummy \ " diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf index 23b457a..28989aa 100644 --- a/conf/distro/include/raspberrypi2.conf +++ b/conf/distro/include/raspberrypi2.conf @@ -26,15 +26,13 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" -PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics-hardfp" - MACHINE_EXTRA_INSTALL = "\ - vc-graphics-hardfp \ + userland \ omxplayer \ " MACHINE_EXTRA_INSTALL_SDK = " \ - vc-graphics-hardfp-dev \ + userland \ " KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2" diff --git a/conf/layer.conf b/conf/layer.conf index 97eb8ae..ea30841 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -33,3 +33,4 @@ BBFILE_PATTERN_b2qt := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt = "20" LICENSE_PATH += "${LAYERDIR}/licenses" +QT_LICENCE = "${LAYERDIR}/licenses/QtEnterprise" diff --git a/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend b/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..11fbab1 --- /dev/null +++ b/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend @@ -0,0 +1,38 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +do_configure_prepend_mx6() { + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${WORKDIR}/appcontroller.conf +} + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ +} + +FILES_${PN} += "${sysconfdir}/appcontroller.conf" diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf new file mode 100644 index 0000000..cefd3a9 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf @@ -0,0 +1,5 @@ +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=0 +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf new file mode 100644 index 0000000..ff4d0da --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf @@ -0,0 +1,7 @@ +env=QMLSCENE_DEVICE=softwarecontext +env=QT_QPA_PLATFORM=linuxfb +env=QSG_RENDER_LOOP=basic +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf new file mode 100644 index 0000000..8960985 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf @@ -0,0 +1,7 @@ +env=FB_MULTI_BUFFER=2 +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 +env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=mfw_v4lsrc,v4l2src +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf new file mode 100644 index 0000000..bc143da --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf @@ -0,0 +1,5 @@ +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=1 +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb new file mode 100644 index 0000000..d031b0a --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -0,0 +1,68 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Demos" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" + +inherit qmake5 + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ + git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ + " +QT_BRANCH = "dev" +SRCREV_demos = "d6979299a7809e5b832738c4cf39bba2c9a185eb" +SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" +GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" + + +S = "${WORKDIR}/git/basicsuite" + +DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine" + +do_install_append() { + # we only need plugins from the demos + rm -rf ${D}/data/user/camera + rm -rf ${D}/data/user/sensorexplorer + + cp -r ${S}/* ${D}/data/user/qt/ + cp -r ${S}/../images ${D}/data/ + cp -r ${S}/../videos ${D}/data/ + + cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/ + + # we can't have several top-level windows in b2qt, replace Window -> Rectangle + sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml + sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml +} + +FILES_${PN} += " \ + /data/images/ \ + /data/videos/ \ + /data/user \ + " + +FILES_${PN}-dbg += " \ + /data/user/*/.debug/ \ + /data/user/qt/*/*/.debug/ \ + " diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb new file mode 100644 index 0000000..9e9c94b --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Demo Launcher" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" + +inherit qmake5 + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \ + file://b2qt-startup.sh \ + " + +SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4" +QT_BRANCH = "dev" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative qtwebengine" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ +} + +FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h" + +INITSCRIPT_NAME = "b2qt-startup.sh" +INITSCRIPT_PARAMS = "defaults 30" + +inherit update-rc.d diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh new file mode 100755 index 0000000..3acbd65 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh @@ -0,0 +1,42 @@ +#!/bin/sh +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +case "$1" in +start) + if [ -x /data/user/b2qt ]; then + APP="/data/user/b2qt" + elif [ -x /usr/bin/b2qt ]; then + APP="/usr/bin/b2qt" + else + APP="/usr/bin/qtlauncher --applications-root /data/user/qt" + fi + /usr/bin/appcontroller ${APP} & + ;; +stop) + /usr/bin/appcontroller --stop + ;; +*) + echo "Usage: $0 {start|stop}" + exit 1 +esac +exit 0 diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb new file mode 100644 index 0000000..e25c1ae --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -0,0 +1,48 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Boot to Qt Utils module" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f" +QT_BRANCH = "dev" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative wpa-supplicant" + +FILES_${PN}-examples-dbg = " \ + /data/user/qt/.debug/* \ + /data/user/qt/wifi-cpp/.debug/* \ + " + +FILES_${PN}-examples = " \ + /data/user/qt/wifi-cpp/wifi-cpp \ + /data/user/qt/wifi-qml \ + " diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb new file mode 100644 index 0000000..4631a58 --- /dev/null +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -0,0 +1,45 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "B2Qt embedded Qt5 image" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" +PR = "r0" + +IMAGE_FEATURES += "\ + package-management \ + ssh-server-dropbear \ + tools-debug \ + debug-tweaks \ + hwcodecs \ + " + +inherit core-image +inherit bootfs-image + +IMAGE_INSTALL += "\ + packagegroup-b2qt-embedded-base \ + packagegroup-b2qt-embedded-tools \ + packagegroup-b2qt-embedded-gstreamer \ + packagegroup-b2qt-embedded-qt5 \ + packagegroup-b2qt-embedded-qt5-addons \ + " diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb new file mode 100644 index 0000000..1199da9 --- /dev/null +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -0,0 +1,31 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain" +PR = "r0" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9" + +inherit populate_sdk populate_sdk_qt5 + +TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target" diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb new file mode 100644 index 0000000..1979879 --- /dev/null +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -0,0 +1,34 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit nativesdk packagegroup + +RDEPENDS_${PN} += "\ + nativesdk-packagegroup-b2qt-embedded-toolchain-host \ + nativesdk-qttools \ + nativesdk-qtbase-tools \ + nativesdk-qtbase-tools-staticdev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb new file mode 100644 index 0000000..66e7457 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb @@ -0,0 +1,36 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 addons toolchain packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization-dev \ + qtenterprisecontrols-dev \ + qtcharts-dev \ + qtvirtualkeyboard-dev \ + b2qt-utils-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb new file mode 100644 index 0000000..3ba3f83 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 addons packages" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtdatavisualization \ + qtquickenterprisecontrols \ + qtquickenterprisecontrols-fonts \ + qtcharts \ + qtvirtualkeyboard \ + b2qt-appcontroller \ + b2qt-utils \ + b2qt-launcher \ + b2qt-demos \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb new file mode 100644 index 0000000..d740991 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Target packages for B2Qt embedded Qt5 SDK" +LICENSE = "QtEnterprise" +PR = "r0" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + packagegroup-b2qt-embedded-toolchain-target \ + qt3d-dev \ + qtbase-dev \ + qtbase-staticdev \ + qtconnectivity-dev \ + qtdeclarative-dev \ + qtdeclarative-staticdev \ + qtgraphicaleffects-dev \ + qtimageformats-dev \ + qtlocation-dev \ + qtmultimedia-dev \ + qtsensors-dev \ + qtserialport-dev \ + qtsvg-dev \ + qtsystems-dev \ + qttools-dev \ + qttools-staticdev \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ + qtwebsockets-dev \ + qtwebchannel-dev \ + qtxmlpatterns-dev \ + qtquickcontrols-dev \ + qtwebengine-dev \ + " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb new file mode 100644 index 0000000..970da82 --- /dev/null +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt5 modules" +LICENSE = "QtEnterprise" + +inherit packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RDEPENDS_${PN} += " \ + qtbase \ + qtbase-fonts \ + qtconnectivity \ + qtdeclarative \ + qtdeclarative-tools \ + qtgraphicaleffects \ + qtimageformats \ + qtlocation \ + qtmultimedia \ + qtsensors \ + qtserialport \ + qtsvg \ + qtwebsockets \ + qtxmlpatterns \ + qtquickcontrols \ + qtwebengine \ + " diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb new file mode 100644 index 0000000..4b350de --- /dev/null +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -0,0 +1,47 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Charts" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative qtmultimedia" + +PACKAGES =+ "${PN}-designer" +DEBIAN_NOAUTONAME_${PN}-designer = "1" + +FILES_${PN}-designer = " \ + ${OE_QMAKE_PATH_QML}/QtCharts/designer \ + " + +RRECOMMENDS_${PN}-dev += "${PN}-designer" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb new file mode 100644 index 0000000..759bb44 --- /dev/null +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Data Visualization" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_p.h;md5=b6f0a53c44e6ba165a7d2dbd58832be5;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ + " + +# v1.2.0 +SRCREV = "62f90e25eec23cfac83985993f355feeac5b9f2c" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS += "qtbase qtdeclarative qtmultimedia" + +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ + " diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb new file mode 100644 index 0000000..59fd2fe --- /dev/null +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -0,0 +1,38 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick 2D Rendender" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=d90663d6d3096fe0989549d52fec6554;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb new file mode 100644 index 0000000..7736d9b --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb @@ -0,0 +1,65 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick Enterprise Controls" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/controls/Styles/Base/DialStyle.qml;md5=caa6d9db463140360114e567721eb580;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "ed6f7049e06717113d5f500595c5a1f2074fb13d" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +PACKAGES += "${PN}-fonts" + +RRECOMMENDS_${PN} = "${PN}-fonts" + +DEPENDS += "qtbase qtdeclarative qtgraphicaleffects" + +FILES_${PN}-fonts += " \ + /usr/lib/qt5/qml/QtQuick/Controls/Styles/Flat/fonts \ + " +FILES_${PN} += " \ + /opt/dashboard/bin/dashboard \ + /opt/gallery/bin/gallery \ + " +FILES_${PN}-dbg += " \ + /opt/dashboard/bin/.debug \ + /opt/gallery/bin/.debug \ + " +FILES_${PN}-qmlplugins += " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*.qml \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/designer/* \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*/* \ + " +FILES_${PN}-examples += " \ + /opt/flat/bin/flat \ + " +FILES_${PN}-examples-dbg += " \ + /opt/flat/bin/.debug \ + " diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb new file mode 100644 index 0000000..40669e1 --- /dev/null +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -0,0 +1,46 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Virtual Keyboard" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17" + +inherit qt5-module + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ + " + +SRCREV = "fa1aae525f94e9a870d0fcc0fb1be50648b76739" +QT_BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative hunspell" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-xcb" + +FILES_${PN}-qmlplugins-dbg = " \ + ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ + " diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..27b476b --- /dev/null +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -0,0 +1,54 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +PACKAGECONFIG_GL = "gles2" +PACKAGECONFIG += " \ + accessibility \ + alsa \ + cups \ + fontconfig \ + glib \ + iconv \ + icu \ + linuxfb \ + sql-sqlite \ + tslib \ + " + +do_configure_prepend() { + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf < Date: Wed, 29 Apr 2015 14:10:09 +0300 Subject: Enable Qt Quick Compiler Build Qt Quick Compiler and use it for VKB and QtCharts. Use BBCLASSEXTEND to build all 3 version (target, native and nativesdk) of Qt Quick Compiler. Change-Id: I611fe7762b8d9124b146b7fe976f09130d5912fa Reviewed-by: Andy Nichols --- classes/qtquickcompiler.bbclass | 13 +++++++ ...ackagegroup-b2qt-embedded-qt5-toolchain-host.bb | 1 + ...up-b2qt-embedded-qt5-addons-toolchain-target.bb | 1 + recipes-qt/qt5-addons/qtcharts_2.0.bb | 2 +- recipes-qt/qt5-addons/qtquickcompiler_2.0.bb | 44 ++++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 6 +-- recipes-qt/qt5/nativesdk-qtbase_%.bbappend | 24 ++++++++++++ 7 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 classes/qtquickcompiler.bbclass create mode 100644 recipes-qt/qt5-addons/qtquickcompiler_2.0.bb create mode 100644 recipes-qt/qt5/nativesdk-qtbase_%.bbappend diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass new file mode 100644 index 0000000..202d592 --- /dev/null +++ b/classes/qtquickcompiler.bbclass @@ -0,0 +1,13 @@ +EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend" + +DEPENDS_prepend = "qtquickcompiler qtquickcompiler-native " + +#python __anonymous() { +# do the magic: +# if QT_SDK path is set, +# add dependency to qtquickcompiler-sdk-native package that +# copies the needed files (binary and mkspec files) from the SDK +# else +# add dependency to qtquickcompiler-native package that +# builds it from internal repos +#} diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 1979879..b424fb7 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -31,4 +31,5 @@ RDEPENDS_${PN} += "\ nativesdk-qttools \ nativesdk-qtbase-tools \ nativesdk-qtbase-tools-staticdev \ + nativesdk-qtquickcompiler-tools \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb index 66e7457..f009340 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons-toolchain-target.bb @@ -32,5 +32,6 @@ RDEPENDS_${PN} += " \ qtenterprisecontrols-dev \ qtcharts-dev \ qtvirtualkeyboard-dev \ + qtquickcompiler-dev \ b2qt-utils-dev \ " diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 4b350de..77fe3c3 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -24,7 +24,7 @@ DESCRIPTION = "Qt Charts" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" -inherit qt5-module +inherit qt5-module qtquickcompiler SRC_URI = " \ git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb new file mode 100644 index 0000000..fd7e8be --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick Compiler" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${QT_BRANCH};protocol=ssh;name=compiler;destsuffix=git \ + git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${QT_BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ + " + +SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e" +QT_BRANCH_compiler = "2.0" + +SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" +QT_BRANCH_sdk = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 40669e1..25441aa 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -24,7 +24,7 @@ DESCRIPTION = "Qt Virtual Keyboard" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17" -inherit qt5-module +inherit qt5-module qtquickcompiler FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -32,14 +32,14 @@ SRC_URI = " \ git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ " -SRCREV = "fa1aae525f94e9a870d0fcc0fb1be50648b76739" +SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97" QT_BRANCH = "master" S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative hunspell" -EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-xcb" +EXTRA_QMAKEVARS_PRE += "CONFIG+=disable-desktop" FILES_${PN}-qmlplugins-dbg = " \ ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/VirtualKeyboard/Styles/.debug/* \ diff --git a/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/recipes-qt/qt5/nativesdk-qtbase_%.bbappend new file mode 100644 index 0000000..e6651e5 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_%.bbappend @@ -0,0 +1,24 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Needed by qtxmlpatterns +EXTRA_QTLIB = "Network Sql" -- cgit v1.2.3-54-g00ecf From d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 May 2015 16:26:33 +0300 Subject: qt5: make qtwebengine a distro feature Some devices won't have qtwebengine, so make it a DISTRO_FEATURE that can be removed in device configs. Change-Id: I751b1cdcc1eea48effec3980ed2da4799f88af9e Reviewed-by: Eirik Aavitsland --- conf/distro/b2qt.conf | 2 +- conf/distro/include/colibri-vf.conf | 2 ++ conf/distro/include/emulator.conf | 2 ++ conf/distro/include/raspberrypi.conf | 2 ++ recipes-qt/b2qt-addons/b2qt-demos.bb | 3 ++- recipes-qt/b2qt-addons/b2qt-launcher.bb | 3 ++- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 3 ++- 8 files changed, 14 insertions(+), 5 deletions(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 08bebd4..86aab7d 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -38,7 +38,7 @@ SANITY_TESTED_DISTROS += " \ SYSVINIT_ENABLED_GETTYS = "" -DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" +DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine" POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 715bd62..c6c818a 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -33,6 +33,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ opengldummy \ " diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 3888cc5..5453742 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -31,6 +31,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ mount-vboxsf \ " diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 141241a..ec57b19 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -28,6 +28,8 @@ BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" PREFERRED_PROVIDER_virtual/libgles1 = "userland" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ userland \ " diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index d031b0a..42758fe 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -38,7 +38,8 @@ GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" S = "${WORKDIR}/git/basicsuite" -DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine" +DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { # we only need plugins from the demos diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 9e9c94b..b2de029 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -36,7 +36,8 @@ QT_BRANCH = "dev" S = "${WORKDIR}/git" -DEPENDS = "qtbase qtdeclarative qtwebengine" +DEPENDS = "qtbase qtdeclarative \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { install -m 0755 -d ${D}${sysconfdir}/init.d diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index d740991..bbc8e44 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -51,5 +51,5 @@ RDEPENDS_${PN} += " \ qtwebchannel-dev \ qtxmlpatterns-dev \ qtquickcontrols-dev \ - qtwebengine-dev \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index 970da82..c09d245 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -40,8 +40,9 @@ RDEPENDS_${PN} += " \ qtsensors \ qtserialport \ qtsvg \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtwebsockets \ qtxmlpatterns \ qtquickcontrols \ - qtwebengine \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ " -- cgit v1.2.3-54-g00ecf From 06a8c81b3a0ae818b129638a1d8d4f9b327d8eb2 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Wed, 18 Feb 2015 14:34:17 +0100 Subject: Fix Linux Kernel 3.18 build with Colibri-VF The Linux Kernel blacklists GCC 4.8.0 - 4.8.2 because of a bug. The GCC 4.8.2 provided by Poky has already been patched for this bug so it is safe to renabled building with GCC 4.8. GCC Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 Change-Id: If3ea442b1dfbef8991c39f8d1326643cf418b1ec Reviewed-by: Samuli Piippo --- .../0001-Allow-builds-with-GCC-4.8.patch | 27 ++++++++++++++++++++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 26 +++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch new file mode 100644 index 0000000..43edec3 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch @@ -0,0 +1,27 @@ +From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Wed, 18 Feb 2015 14:28:14 +0100 +Subject: [PATCH] Allow builds with GCC 4.8 + +--- + arch/arm/kernel/asm-offsets.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c +index 2d2d608..6f8e79c 100644 +--- a/arch/arm/kernel/asm-offsets.c ++++ b/arch/arm/kernel/asm-offsets.c +@@ -49,10 +49,6 @@ + #error Your compiler is too buggy; it is known to miscompile kernels. + #error Known good compilers: 3.3, 4.x + #endif +-#if GCC_VERSION >= 40800 && GCC_VERSION < 40803 +-#error Your compiler is too buggy; it is known to miscompile kernels +-#error and result in filesystem corruption and oopses. +-#endif + #endif + + int main(void) +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend new file mode 100644 index 0000000..4f05386 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Allow-builds-with-GCC-4.8.patch \ + " -- cgit v1.2.3-54-g00ecf From bfbad49ac1d55ec3864ddff6d8c7b4b38fbaf907 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Thu, 19 Feb 2015 11:33:54 +0100 Subject: Update Colibri-VF recpies to use latest meta-toradex (V2.3) Now uses Linux kernel 3.18 Automaically loads Toradex multi-touch screen driver Fixes Serial Console and ADB Cherry-picked from dizzy (d9a08a8a, 85f2d862) Change-Id: Ie468b441be899b1f07cb998477a36a38cfe5e494 Reviewed-by: Eirik Aavitsland --- conf/distro/include/colibri-vf.conf | 7 +++--- ...le-Fusion-7-and-10-multi-touch-controller.patch | 25 ++++++++++++++++++++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 7 ++++++ 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index df85419..483511c 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -24,12 +24,11 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ + ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ " -BOOTFS_DEPENDS = "u-boot:do_deploy" - -SERIAL_CONSOLES = "115200;ttymxc0 \ - 115200;ttymxc1" +BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ opengldummy \ diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch new file mode 100644 index 0000000..d92ac62 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch @@ -0,0 +1,25 @@ +From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Fri, 6 Mar 2015 10:14:13 +0100 +Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller + +--- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +index 1f43dbe..9194580 100644 +--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +@@ -214,7 +214,7 @@ + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ + &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ + >; +- status = "disabled"; ++ status = "okay"; + }; + + /* M41T0M6 real time clock on carrier board */ +-- +2.3.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend index 4f05386..479be80 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -23,4 +23,11 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Allow-builds-with-GCC-4.8.patch \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ " + +do_configure_prepend () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig +} -- cgit v1.2.3-54-g00ecf From 190108b9bea85ecc5b9d471d2a7c594b853cbae9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 May 2015 10:21:19 +0300 Subject: emulator: Qt5 support for emulator Emulator has special handling for OpenGL support: QtGlesStream provides the runtime opengl support but since it depends on qtbase, we need to use qtglesstream-dummy-client when building qt. Also since both recipes provide same files, we must disable do_populate_sysroot from qtglesstream so that libs from dummy-client remain there. Change-Id: Ifde698e7d46863dbb82c6f3ad791412775e111ea Reviewed-by: Eirik Aavitsland --- conf/distro/include/emulator.conf | 12 ++++- .../b2qt-appcontroller/emulator/appcontroller.conf | 7 +++ recipes-qt/images/b2qt-embedded-qt5-image.bb | 3 ++ ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 3 ++ recipes-qt/qt5-addons/qtglesstream.bb | 58 ++++++++++++++++++++++ recipes/opengldummy/opengldummy.bb | 10 ++-- recipes/opengldummy/opengldummy.inc | 3 -- recipes/opengldummy/qtglesstream-dummy-client.bb | 10 +++- .../virtualbox-guest-additions_4.2.14.bb | 4 -- 9 files changed, 95 insertions(+), 15 deletions(-) create mode 100644 recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf create mode 100644 recipes-qt/qt5-addons/qtglesstream.bb diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 5453742..d7afc52 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -29,14 +29,22 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel-module-snd-intel8x0 \ " -kernel_autoload_snd-intel8x0 = "snd-intel8x0" +PREFERRED_PROVIDER_virtual/egl = "qtglesstream-dummy-client" +PREFERRED_PROVIDER_virtual/libgles2 = "qtglesstream-dummy-client" + +KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest" DISTRO_FEATURES_remove = "webengine" MACHINE_EXTRA_INSTALL = "\ mount-vboxsf \ " - MACHINE_EXTRA_INSTALL_SDK = "\ qtglesstream-dummy-client-dev \ " +MACHINE_EXTRA_INSTALL_QT = "\ + qtglesstream \ + " +MACHINE_EXTRA_INSTALL_QT_SDK = "\ + qtglesstream-dev \ + " diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf new file mode 100644 index 0000000..e3b35f0 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf @@ -0,0 +1,7 @@ +env=QT_QPA_GENERIC_PLUGINS=simulator +env=QT_QPA_EGLFS_HIDECURSOR=1 +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_IM_MODULE=qtvirtualkeyboard +env=QTGLESSTREAM_DISPLAY=192.168.56.1 +env=QT_QUICK_CONTROLS_STYLE=Flat +base=linux diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb index 4631a58..daaa6e4 100644 --- a/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -36,7 +36,10 @@ IMAGE_FEATURES += "\ inherit core-image inherit bootfs-image +MACHINE_EXTRA_INSTALL_QT ?= "" + IMAGE_INSTALL += "\ + ${MACHINE_EXTRA_INSTALL_QT} \ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ packagegroup-b2qt-embedded-gstreamer \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index bbc8e44..a4fc1fa 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -28,7 +28,10 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" +MACHINE_EXTRA_INSTALL_QT_SDK ?= "" + RDEPENDS_${PN} += " \ + ${MACHINE_EXTRA_INSTALL_QT_SDK} \ packagegroup-b2qt-embedded-toolchain-target \ qt3d-dev \ qtbase-dev \ diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb new file mode 100644 index 0000000..96ab1f7 --- /dev/null +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -0,0 +1,58 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "QtGlesStream" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.it.local/QtRD-15810/qtglesstream.git;branch=${QT_BRANCH};protocol=ssh \ + " + +PV = "1.0.0" +SRCREV = "137d476b0e39eaaa6f35296b6bd962175e6ea5d6" +QT_BRANCH = "dev" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase" +RREPLACES_${PN} = "qtglesstream-dummy-client" +RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev" + +do_install_append() { + install -m 0755 -d ${D}${includedir}/EGL + install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL + + install -m 0755 -d ${D}${includedir}/GLES2 + install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 + + install -m 0755 -d ${D}${includedir}/GLES3 + install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 + + install -m 0755 -d ${D}${includedir}/KHR + install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR +} + +# no not overwrite files from qtglesstream-dummy-client +do_populate_sysroot[noexec] = "1" diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb index b33e060..680e8cc 100644 --- a/recipes/opengldummy/opengldummy.bb +++ b/recipes/opengldummy/opengldummy.bb @@ -29,12 +29,14 @@ PV = "1.0.0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -I${WORKDIR}/headers -o libEGL.so ${WORKDIR}/egl.cpp - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -I${WORKDIR}/headers -o libGLESv2.so ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp } do_install_append() { install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libEGL.so ${D}${libdir} - install -m 0755 ${S}/libGLESv2.so ${D}${libdir} + install -m 0755 ${S}/libEGL.so.1 ${D}${libdir} + ln -s libEGL.so.1 ${D}${libdir}/libEGL.so + install -m 0755 ${S}/libGLESv2.so.2 ${D}${libdir} + ln -s libGLESv2.so.2 ${D}${libdir}/libGLESv2.so } diff --git a/recipes/opengldummy/opengldummy.inc b/recipes/opengldummy/opengldummy.inc index 23af5df..2119da0 100644 --- a/recipes/opengldummy/opengldummy.inc +++ b/recipes/opengldummy/opengldummy.inc @@ -27,9 +27,6 @@ SRC_URI = "file://headers \ file://gles2.cpp \ " -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir}/" - do_install() { install -m 0755 -d ${D}${includedir}/EGL install -m 0755 ${WORKDIR}/headers/EGL/* ${D}${includedir}/EGL diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb index 4c8c86a..c2e936e 100644 --- a/recipes/opengldummy/qtglesstream-dummy-client.bb +++ b/recipes/opengldummy/qtglesstream-dummy-client.bb @@ -25,14 +25,20 @@ SECTION = "devel" LICENSE = "CLOSED" PV = "1.0.0" +SOLIBMAJOR = "1" +SOLIBMINOR = "0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -I${WORKDIR}/headers -o libQtGlesStreamClient.so ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \ + -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp } do_install_append() { install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libQtGlesStreamClient.so ${D}${libdir} + install -m 0755 ${S}/libQtGlesStreamClient.so.${PV} ${D}${libdir} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR}.${SOLIBMINOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so } diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index ace4eea..587695c 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -51,7 +51,3 @@ do_install() { } PKG_${PN} = "kernel-module-vbox" - -module_autoload_vboxsf = "vboxsf" -module_autoload_vboxvideo = "vboxvideo" -module_autoload_vboxguest = "vboxguest" -- cgit v1.2.3-54-g00ecf From 10c6c4ef744ca122f976be1d4f68713cafc01730 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 27 May 2015 09:55:17 +0300 Subject: Change qt-gerrit addresses to correct ci.local domain Change-Id: I140a5bd0b84f9faf00055ac64820c031c0ea28c0 Reviewed-by: Eirik Aavitsland --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 2 +- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 2 +- recipes-qt/qt5-addons/qtcharts_2.0.bb | 2 +- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 2 +- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb | 2 +- recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 2 +- scripts/manifest_dizzy.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index 05287d1..26d631c 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginli inherit qmake5 SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/b2qt-appcontroller;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-appcontroller;branch=${QT_BRANCH};protocol=ssh \ file://appcontroller.conf \ " diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 42758fe..8cc8116 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db9 inherit qmake5 SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ " QT_BRANCH = "dev" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index b2de029..7e89289 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beg inherit qmake5 SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \ file://b2qt-startup.sh \ " diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index e25c1ae..e694b5a 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7f inherit qt5-module SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \ " SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f" diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 77fe3c3..83d6905 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e inherit qt5-module qtquickcompiler SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ " SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index 759bb44..76df896 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_ inherit qt5-module SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ " # v1.2.0 diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 96ab1f7..475b869 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/qtglesstream.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtglesstream.git;branch=${QT_BRANCH};protocol=ssh \ " PV = "1.0.0" diff --git a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb index 7736d9b..67c3efd 100644 --- a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb +++ b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/controls/Styles/Base/DialStyle.qml;md5=caa6d9db46 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ " SRCREV = "ed6f7049e06717113d5f500595c5a1f2074fb13d" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 25441aa..571792c 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -29,7 +29,7 @@ inherit qt5-module qtquickcompiler FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI = " \ - git://qt-gerrit.it.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ " SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97" diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml index 83dca5f..15a2cd8 100644 --- a/scripts/manifest_dizzy.xml +++ b/scripts/manifest_dizzy.xml @@ -9,7 +9,7 @@ - + Date: Wed, 27 May 2015 10:43:16 +0300 Subject: toradex: add support for u-boot update on colibri vf Include flash scripts to boot partition, which can update u-boot to NAND. Remove kernel and dtb files from boot partition, as they are read from second partition. u-boot env changed to boot from MMC by default and kernel messages removed from tty1. apalis flash scripts updated to latest version from toradex and to use both flash_mmc and flash_blk. Change-Id: I1a58badafa01e2023b9ae058b833eb108c097594 Reviewed-by: Eirik Aavitsland --- conf/distro/include/apalis-imx6.conf | 1 + conf/distro/include/colibri-vf.conf | 9 ++--- .../recipes/u-boot/u-boot-script-toradex.bb | 18 ++++++--- .../u-boot/u-boot-script-toradex/flash_mmc.scr | 2 - .../u-boot/u-boot-script-toradex/mx6/flash_blk.scr | 6 +++ .../u-boot/u-boot-script-toradex/mx6/flash_mmc.scr | 6 +++ .../u-boot/u-boot-script-toradex/vf/flash_blk.scr | 2 + .../u-boot/u-boot-script-toradex/vf/flash_mmc.scr | 3 ++ .../0001-colibri-vf-enable-sdboot-by-default.patch | 45 ++++++++++++++++++++++ .../recipes/u-boot/u-boot-toradex-fsl_git.bbappend | 3 ++ 10 files changed, 83 insertions(+), 12 deletions(-) delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 86ae4f5..f04fbd0 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -28,6 +28,7 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ + flash_blk-${MACHINE}.img:flash_blk.img \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 483511c..cb673bd 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -23,12 +23,11 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ - ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ + u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \ + flash_mmc-${MACHINE}.img:flash_mmc.img \ + flash_blk-${MACHINE}.img:flash_blk.img \ " -BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ opengldummy \ diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb index b83e6a0..92ea3bd 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb @@ -25,16 +25,21 @@ DEPENDS = "u-boot-mkimage-native" PV = "v2.3" -SRC_URI = "file://flash_mmc.scr" +SRC_URI = " \ + file://flash_mmc.scr \ + file://flash_blk.scr \ + " inherit deploy -UPDATESCRIPT = "${WORKDIR}/flash_mmc.scr" - do_mkimage () { uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "update script" -d ${UPDATESCRIPT} \ + -n "update script" -d ${WORKDIR}/flash_mmc.scr \ flash_mmc.img + + uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ + -n "update script" -d ${WORKDIR}/flash_blk.scr \ + flash_blk.img } addtask mkimage after do_compile before do_install @@ -42,10 +47,13 @@ addtask mkimage after do_compile before do_install do_deploy () { install -d ${DEPLOYDIR} install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img + install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img cd ${DEPLOYDIR} rm -f flash_mmc-${MACHINE}.img ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img + rm -f flash_blk-${MACHINE}.img + ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img } addtask deploy after do_install before do_build @@ -55,4 +63,4 @@ do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(apalis-imx6)" +COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf)" diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr deleted file mode 100644 index 5b7dc80..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr +++ /dev/null @@ -1,2 +0,0 @@ -setenv update_uboot 'fatload mmc ${drive}:1 ${loadaddr} u-boot.imx && setexpr blkcnt $filesize + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200 && mmc dev 0 && mmc write ${loadaddr} 2 ${blkcnt}' -echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr new file mode 100644 index 0000000..ee87e85 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr @@ -0,0 +1,6 @@ +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr new file mode 100644 index 0000000..207c7db --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr @@ -0,0 +1,6 @@ +#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img +source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr new file mode 100644 index 0000000..5e31380 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr @@ -0,0 +1,2 @@ +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr new file mode 100644 index 0000000..e0770a0 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr @@ -0,0 +1,3 @@ +setenv interface mmc +fatload ${interface} 0:1 ${loadaddr} flash_blk.img +source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch new file mode 100644 index 0000000..2e72ff6 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch @@ -0,0 +1,45 @@ +From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 28 May 2015 09:06:54 +0300 +Subject: [PATCH] colibri vf: enable sdboot by default + +Run sdboot first, update dtb file location to /boot/ and +remove console message from tty1 +--- + include/configs/colibri_vf.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h +index feea159..b080510 100644 +--- a/include/configs/colibri_vf.h ++++ b/include/configs/colibri_vf.h +@@ -135,7 +135,7 @@ + "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ + "run sddtbload; bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "sddtbload=setenv dtbparam; load mmc 0:2 ${fdt_addr_r} " \ +- "${soc}-colibri-${fdt_board}.dtb && " \ ++ "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" + + #define NFS_BOOTCMD \ +@@ -160,7 +160,7 @@ + "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" + +-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" + + #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" + +@@ -173,7 +173,7 @@ + "defargs=\0" \ + "console=ttyLP0\0" \ + "setup=setenv setupargs fec_mac=${ethaddr} consoleblank=0 " \ +- "console=tty1 console=${console},${baudrate}n8 ${memargs}\0" \ ++ "console=${console},${baudrate}n8 ${memargs}\0" \ + "setsdupdate=mmc rescan && set interface mmc && " \ + "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend index d1675de..1c2e561 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend @@ -24,3 +24,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_apalis-imx6 = " \ file://0001-Update-default-args-for-apalis-imx6.patch \ " +SRC_URI_append_colibri-vf = " \ + file://0001-colibri-vf-enable-sdboot-by-default.patch \ + " -- cgit v1.2.3-54-g00ecf From e8067960ac419c9a47824fa996283d31faa9c309 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Wed, 13 May 2015 15:44:02 +0200 Subject: Toolchain: add static device mkspec, suitable for Qt Creator The linux-oe-g++ mkspec used by meta-qt5 depends on the user sourcing the toolchain environment-setup script, which modifies the PATH and sets a long range of environment variables. That is not a "best practice" way of use Qt, and does not allow smooth integration of the toolchain into Qt Creator. Here, we instead create a static mkspec for the toolchain: devices/linux-oe-generic-g++. The toolchain recipe will will the qdevice.pri file with the required compiler flags etc. for the target. Additionally, we introduce an extra .pri file for device-specific settings, so they can be shared between the two mkspecs. Change-Id: Ie5a019524ba6cdddffb71b0c7c28861ddba17fbd Reviewed-by: Samuli Piippo --- meta-fsl-extras/recipes/qt5/qtbase_%.bbappend | 38 ------- .../recipes/qt5/qtbase_%.bbappend | 42 -------- meta-ti-extras/recipes/qt5/qtbase_%.bbappend | 33 ------ .../meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 39 ++++++- .../qmake.conf | 14 +++ .../qplatformdefs.h | 2 + recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri | 2 + recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri | 8 ++ recipes-qt/qt5/qtbase/oe-device-extra.pri | 1 + recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri | 10 ++ recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri | 3 + recipes-qt/qt5/qtbase_%.bbappend | 16 +-- scripts/configure-qtcreator.sh | 118 +++++++++++++++++++++ 13 files changed, 204 insertions(+), 122 deletions(-) delete mode 100644 meta-fsl-extras/recipes/qt5/qtbase_%.bbappend delete mode 100644 meta-raspberrypi-extras/recipes/qt5/qtbase_%.bbappend delete mode 100644 meta-ti-extras/recipes/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf create mode 100644 recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h create mode 100644 recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri create mode 100644 recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri create mode 100644 recipes-qt/qt5/qtbase/oe-device-extra.pri create mode 100644 recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri create mode 100644 recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri create mode 100755 scripts/configure-qtcreator.sh diff --git a/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend b/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend deleted file mode 100644 index 11fbab1..0000000 --- a/meta-fsl-extras/recipes/qt5/qtbase_%.bbappend +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -do_configure_prepend_mx6() { - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf < ${SDK_DEVICE_PRI} + echo "CROSS_COMPILE = ${SDKPATHNATIVE}${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cflags}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${static_cxxflags}" >> ${SDK_DEVICE_PRI} + echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI} + + # Setup qt.conf to point at the device mkspec by default + qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf + echo 'HostSpec = linux-g++' >> $qtconf + echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf +} + +SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" $native_sysroot/mkspecs/qdevice.pri ;" diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf new file mode 100644 index 0000000..dadea00 --- /dev/null +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qmake.conf @@ -0,0 +1,14 @@ +# +# qmake configuration for using yocto-built b2qt toolchain +# + +include(../common/linux_device_pre.conf) + +QMAKE_PLATFORM += boot2qt + +# Load device-specific qmake.conf part, if any +exists(../../oe-device-extra.pri):include(../../oe-device-extra.pri) + +include(../common/linux_device_post.conf) + +load(qt_config) diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h new file mode 100644 index 0000000..e10ebcf --- /dev/null +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk/qplatformdefs.h @@ -0,0 +1,2 @@ + +#include "../../linux-g++/qplatformdefs.h" diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri new file mode 100644 index 0000000..3c0971c --- /dev/null +++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri @@ -0,0 +1,2 @@ +QMAKE_LIBS_EGL = -lQtGlesStreamClient +QMAKE_LIBS_OPENGL_ES2 = -lQtGlesStreamClient diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri new file mode 100644 index 0000000..cf89ae6 --- /dev/null +++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri @@ -0,0 +1,8 @@ +IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 +QMAKE_LIBS_EGL += -lEGL +QMAKE_LIBS_OPENGL_ES2 += -lGLESv2 -lEGL -lGAL +QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL +QMAKE_CFLAGS += $$IMX6_CFLAGS +QMAKE_CXXFLAGS += $$IMX6_CFLAGS + +EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-imx6-g++/qeglfshooks_imx6.cpp diff --git a/recipes-qt/qt5/qtbase/oe-device-extra.pri b/recipes-qt/qt5/qtbase/oe-device-extra.pri new file mode 100644 index 0000000..6c4bdd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/oe-device-extra.pri @@ -0,0 +1 @@ +# This file contains device-specific qmake.conf settings diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri new file mode 100644 index 0000000..bddd245 --- /dev/null +++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri @@ -0,0 +1,10 @@ +QMAKE_INCDIR_EGL = $$[QT_SYSROOT]/usr/include/interface/vcos/pthreads \ + $$[QT_SYSROOT]/usr/include/interface/vmcs_host/linux +QMAKE_INCDIR_OPENGL_ES2 = $${QMAKE_INCDIR_EGL} + +QMAKE_LIBS_EGL = -lEGL -lGLESv2 +QMAKE_CFLAGS += $$RPI_CFLAGS +QMAKE_CXXFLAGS += $$RPI_CFLAGS + +EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host diff --git a/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri new file mode 100644 index 0000000..6a5edd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/ti33x/oe-device-extra.pri @@ -0,0 +1,3 @@ +QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um +QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 $${QMAKE_LIBS_EGL} +QMAKE_LIBS_OPENVG = -lOpenVG $${QMAKE_LIBS_EGL} diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 27b476b..340d308 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -34,20 +34,20 @@ PACKAGECONFIG += " \ tslib \ " +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://oe-device-extra.pri \ + " + do_configure_prepend() { + install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf < [--remove]" +} + +while test -n "$1"; do + case "$1" in + "--help" | "-h") + printUsage + exit 0 + shift + ;; + "--remove") + REMOVEONLY=1 + shift + ;; + *) + CONFIG=$1 + shift + ;; + esac +done + +if [ ! -f "$CONFIG" ]; then + printUsage + exit 1 +fi + +if [ -z "${SDKTOOL}" ]; then + SDKTOOL="${HOME}/Qt/Tools/QtCreator/bin/sdktool" +fi +if [ ! -x ${SDKTOOL} ]; then + echo "Cannot find 'sdktool'" + exit 1 +fi + +source $CONFIG + +if [ ! -d "${OECORE_NATIVE_SYSROOT}/mkspecs/${MKSPEC}" ]; then + echo Error: $CONFIG is invalid. + exit 1 +fi + +MACHINE=$(grep '^MACHINE' ${OECORE_NATIVE_SYSROOT}/mkspecs/qdevice.pri | cut -d'=' -f2 | tr -d ' ') + +RELEASE=$(qmake -query QT_VERSION) + +BASEID="byos.${RELEASE}.${MACHINE}" + +BASENAME="Custom Qt Embedded" +TOOLCHAINNAME="GCC (${BASENAME} ${RELEASE} ${MACHINE})" +QTNAME="${BASENAME} ${RELEASE} ${MACHINE}" +KITNAME="${BASENAME} ${RELEASE} ${MACHINE} Kit" + +${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true +${SDKTOOL} rmQt --id ${BASEID}.qt || true +${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.tc || true + +if [ -n "${REMOVEONLY}" ]; then + echo "Kit removed: ${KITNAME}" + exit 0 +fi + +${SDKTOOL} addTC \ + --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.tc" \ + --name "${TOOLCHAINNAME}" \ + --path "$(type -p ${OE_QMAKE_CXX})" \ + --abi "${ABI}" + +${SDKTOOL} addQt \ + --id "${BASEID}.qt" \ + --name "${QTNAME}" \ + --type "Boot2Qt.QtVersionType" \ + --qmake "$(type -p qmake)" + +${SDKTOOL} addKit \ + --id "${BASEID}.kit" \ + --name "${KITNAME}" \ + --qt "${BASEID}.qt" \ + --debuggerengine "1" \ + --debugger "$(type -p ${GDB})" \ + --sysroot "${SDKTARGETSYSROOT}" \ + --devicetype "Boot2Qt.HwDevice" \ + --toolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.tc" \ + --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ + --mkspec "${MKSPEC}" + +echo "Configured Qt Creator with new kit:" +echo " ${KITNAME}" -- cgit v1.2.3-54-g00ecf From 72fe27b30229a451975fb01fbdcd7b82ff2f8649 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 May 2015 14:57:31 +0300 Subject: RPi2: use fido branch to get raspberrypi2 support Dizzy branch does not have support for RPI2. Change-Id: I900554d3c5510c3dd6cce6e5eb4f5aff85fa26da Reviewed-by: Eirik Aavitsland --- scripts/manifest_dizzy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml index 15a2cd8..ac9098f 100644 --- a/scripts/manifest_dizzy.xml +++ b/scripts/manifest_dizzy.xml @@ -36,7 +36,7 @@ groups="notdefault,ti,bbb"/> Date: Fri, 29 May 2015 09:55:39 +0200 Subject: Update checksum for Noto fonts release 1.002 Change-Id: I23f95aa33fffbd4692644bf0d16ab7b0a9b3db9d Reviewed-by: Samuli Piippo --- recipes/fonts/otf-noto.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index 8a9f942..266010c 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -11,8 +11,8 @@ inherit allarch fontcache SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" -SRC_URI[md5sum] = "fdbacee7b538c42cf1d3a6fc3dd3d106" -SRC_URI[sha256sum] = "71d32727053c9677956b7aff7b150c3c2521072f40d334a37806a577d86fa33d" +SRC_URI[md5sum] = "9c59b0a684b03d3220dc05c6f7d4a097" +SRC_URI[sha256sum] = "c815b154a57877bfc3c9baa9650f22217e509bddc73f5433f640d875ae6f35e0" do_install() { install -m 0644 -d ${D}${datadir}/fonts/otf/noto -- cgit v1.2.3-54-g00ecf From 4f2523addd2a4decbe82bb5dd66e5ba55d77626c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 2 Jun 2015 12:22:50 +0300 Subject: nitrogen6x: add u-boot to image Image already has 6x_upgrade script that can update u-boot to the device, but u-boot binary was missing. Change-Id: I9d8d652951c243c1ca57591025ff99f657086b8b Reviewed-by: Eirik Aavitsland --- conf/distro/include/nitrogen6x.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 0a9d388..af1f869 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -30,6 +30,7 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ 6x_bootscript-${MACHINE}:6x_bootscript \ 6x_upgrade-${MACHINE}:6x_upgrade \ + u-boot-${MACHINE}.imx:u-boot.imx \ ${KERNEL_IMAGETYPE}:update/${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:update/imx6q-${MACHINE}.dtb \ ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ -- cgit v1.2.3-54-g00ecf From 623fe39f70996687f07888d6cea1f706c300986a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 1 Jun 2015 17:58:41 +0300 Subject: Add QtSimulator support QtSimulator is added as dependency to Qt modules that support it, and some helper components are installed to emulator target. Change-Id: I878ffcfc6a8d9a579cb4a5a4e823fa7f0fa5a3cd Reviewed-by: Rainer Keller --- conf/distro/include/emulator.conf | 2 + recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 49 ++++++++++++++++++++++ .../b2qt-emulator-proxy/emulatorproxyd.sh | 42 +++++++++++++++++++ recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 40 ++++++++++++++++++ recipes-qt/qt5-addons/qtsimulator_1.0.bb | 39 +++++++++++++++++ recipes-qt/qt5/qtlocation_%.bbappend | 3 ++ recipes-qt/qt5/qtsensors_%.bbappend | 24 +++++++++++ recipes-qt/qt5/qtsystems_%.bbappend | 24 +++++++++++ 8 files changed, 223 insertions(+) create mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb create mode 100755 recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh create mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb create mode 100644 recipes-qt/qt5-addons/qtsimulator_1.0.bb create mode 100644 recipes-qt/qt5/qtsensors_%.bbappend create mode 100644 recipes-qt/qt5/qtsystems_%.bbappend diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index d7afc52..79ebd07 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -44,6 +44,8 @@ MACHINE_EXTRA_INSTALL_SDK = "\ " MACHINE_EXTRA_INSTALL_QT = "\ qtglesstream \ + b2qt-emulator-proxy \ + b2qt-emulator-vinput \ " MACHINE_EXTRA_INSTALL_QT_SDK = "\ qtglesstream-dev \ diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb new file mode 100644 index 0000000..da6d7bd --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -0,0 +1,49 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Proxy daemon for QtSimulator" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \ + file://emulatorproxyd.sh \ + " + +SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +BRANCH = "master" + +S = "${WORKDIR}/git/src/helperlibs/proxy" + +DEPENDS = "qtbase qtsimulator" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ +} + +INITSCRIPT_NAME = "emulatorproxyd.sh" +INITSCRIPT_PARAMS = "defaults 97 10" + +inherit update-rc.d diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh new file mode 100755 index 0000000..48177fa --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh @@ -0,0 +1,42 @@ +#!/bin/sh +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DAEMON=/usr/bin/emulatorproxyd + +case "$1" in +start) + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +stop) + start-stop-daemon --stop --quiet --exec $DAEMON + ;; +restart) + start-stop-daemon --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac +exit 0 diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb new file mode 100644 index 0000000..b344395 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Virtual input plugin for QtSimulator" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://qvinput.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \ + " + +SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +BRANCH = "master" + +EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent" + +S = "${WORKDIR}/git/src/helperlibs/vinput" + +DEPENDS = "qtbase qtsimulator" diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb new file mode 100644 index 0000000..5f0c761 --- /dev/null +++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb @@ -0,0 +1,39 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "QtSimulator" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-qtsimulator.git;branch=${BRANCH};protocol=ssh \ + " + +# v1.0.8 +SRCREV = "faf8ea5cee8a4105b97c3f2ba4a4c828f03a70ab" +BRANCH = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase" diff --git a/recipes-qt/qt5/qtlocation_%.bbappend b/recipes-qt/qt5/qtlocation_%.bbappend index c068600..facd006 100644 --- a/recipes-qt/qt5/qtlocation_%.bbappend +++ b/recipes-qt/qt5/qtlocation_%.bbappend @@ -21,3 +21,6 @@ ############################################################################# PACKAGECONFIG += "gypsy" + +EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" +DEPENDS_emulator += "qtsimulator" diff --git a/recipes-qt/qt5/qtsensors_%.bbappend b/recipes-qt/qt5/qtsensors_%.bbappend new file mode 100644 index 0000000..a388c6f --- /dev/null +++ b/recipes-qt/qt5/qtsensors_%.bbappend @@ -0,0 +1,24 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" +DEPENDS_emulator += "qtsimulator" diff --git a/recipes-qt/qt5/qtsystems_%.bbappend b/recipes-qt/qt5/qtsystems_%.bbappend new file mode 100644 index 0000000..af270e5 --- /dev/null +++ b/recipes-qt/qt5/qtsystems_%.bbappend @@ -0,0 +1,24 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" +DEPENDS_emulator += "qtsimulator" -- cgit v1.2.3-54-g00ecf From 9e3e29858a70cbfdeff4ab94e9a1e999c28bb7cd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 4 Jun 2015 09:54:16 +0300 Subject: Update default manifest Use meta-qt5 layer from internal gerrit and update all layer to latest HEAD. Change-Id: Icae7b0f6c808b61c530af4d122e88fcec7b12561 Reviewed-by: Eirik Aavitsland --- scripts/manifest.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index db439f1..4f9e414 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -9,38 +9,39 @@ + - -- cgit v1.2.3-54-g00ecf From 6169682e3706a203538ce7d6d781d87a40b05dfb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 4 Jun 2015 14:19:20 +0300 Subject: fix typo in manifest Change-Id: I327aed22b2b60389d6d1cc6433aad2d133027cc6 Reviewed-by: Eirik Aavitsland --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4f9e414..714a84d 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -51,7 +51,7 @@ groups="notdefault,bbb"/> -- cgit v1.2.3-54-g00ecf From 583341f6ea2439f58ffcbf4e06070aeb9472ec08 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 4 Jun 2015 12:19:57 +0300 Subject: Get rid of some of the host tools in toolchain pkg-config got installed to toolchain, which made qtwebengine build fail, as it tries to use it for host libs. perl and bison are not working correctly from toolchain, they have problems with sdk relocation. Change-Id: I7755f4599ad7c87b60d5bfc66e0a2cf13fec9330 Reviewed-by: Eirik Aavitsland --- recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb | 2 +- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb index 0c0214f..3f13aef 100644 --- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb +++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb @@ -26,7 +26,7 @@ LICENSE = "CLOSED" inherit populate_sdk -TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-toolchain-host" +TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}" TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target" diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 971cc01..f64c0ac 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -27,11 +27,8 @@ LICENSE = "CLOSED" inherit nativesdk packagegroup RDEPENDS_${PN} = "\ - nativesdk-packagegroup-sdk-host \ nativesdk-python-modules \ nativesdk-python-misc \ - nativesdk-perl-modules \ - nativesdk-bison \ nativesdk-gperf \ ${@base_contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK_HOST} \ -- cgit v1.2.3-54-g00ecf From 25bc77f0949f8d46975c77ce354afd30ffc3799c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 8 Jun 2015 14:18:24 +0300 Subject: adbd: add dependency to libcap Change-Id: Ia368861d27325da72eb5e9f02e831ba896eb59df Reviewed-by: Eirik Aavitsland --- recipes/adbd/adbd.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb index 89aa4ce..f933515 100644 --- a/recipes/adbd/adbd.bb +++ b/recipes/adbd/adbd.bb @@ -31,7 +31,7 @@ PR = "r0" SRCREV = "${PV}" RRECOMMENDS_${PN} += "kernel-module-g-ffs" -DEPENDS = "openssl" +DEPENDS = "openssl libcap" SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https;branch=lollipop-release;name=core \ file://adbd.patch \ -- cgit v1.2.3-54-g00ecf From 9a52dfdf5988a422d1831eba1081ef383b5244ca Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 8 Jun 2015 14:54:30 +0300 Subject: No renaming for nitrogen6x anymore Change-Id: I55cad9b2a0a418bd034e2c56d575164a5ccf4922 Reviewed-by: Eirik Aavitsland --- scripts/upload.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/upload.sh b/scripts/upload.sh index 1881a1f..f3124ee 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -27,11 +27,7 @@ set -e RELEASE=5.5 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ -if [ ${MACHINE} = "nitrogen6x" ]; then - scp tmp/deploy/images/nitrogen6x/b2qt-embedded-image-boot-nitrogen6x.tar.gz ${UPLOADPATH}/b2qt-embedded-image-boot-iMX6.tar.gz - scp tmp/deploy/images/nitrogen6x/b2qt-embedded-image-nitrogen6x.tar.gz ${UPLOADPATH}/b2qt-embedded-image-iMX6.tar.gz - scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-iMX6.sh -elif [ ${MACHINE} = "emulator" ]; then +if [ ${MACHINE} = "emulator" ]; then cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd . gzip b2qt-embedded-image-emulator.hdd -f scp b2qt-embedded-image-emulator.hdd.gz ${UPLOADPATH}/ -- cgit v1.2.3-54-g00ecf From af74eaeda04ab4cbca42abc4bb4818a9b3df465e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Jun 2015 13:29:16 +0300 Subject: tibidabo: use latest version poky for tibidabo Instead of using old patched version of poky for the meta-tibidabo layer, use the same version of all the meta layer as for the other devices. This requires the old u-boot, kernel, gpu driver and imx-lib recipes to be copied from meta-fsl-arm. Change-Id: I2e804fbe895370c23f8ae89cff4fe283302dabe1 Reviewed-by: Eirik Aavitsland --- b2qt-init-build-env | 17 +- conf/bblayers.conf.tibidabo.sample | 1 + conf/distro/include/tibidabo.conf | 6 +- .../recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 246 +++++++++++++++++++ .../0001-change-header-path-to-HAL.patch | 30 +++ .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc | 12 + .../fix-conflicting-TLS-definition.patch | 31 +++ .../gc_hal_eglplatform-remove-xlib-undefs.patch | 34 +++ .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc | 10 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc | 12 + .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc | 12 + .../gpu-viv-bin-mx6q/glesv2_x11.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc | 12 + .../gpu-viv-bin-mx6q/wayland-egl.pc | 10 + .../gpu-viv-bin-mx6q/wayland-viv.pc | 10 + .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb | 9 + .../recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb | 10 + ...Fix-getrusage-related-build-failure-on-gl.patch | 43 ++++ ...fix-memset-related-crashes-caused-by-rece.patch | 259 +++++++++++++++++++++ .../0003-ARM-7670-1-fix-the-memset-fix.patch | 87 +++++++ ...6-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch | 43 ++++ ...0005-ENGR00271359-Add-Multi-touch-support.patch | 98 ++++++++ .../0006-Add-support-for-DVI-monitors.patch | 227 ++++++++++++++++++ ...6-board-mx6q_sabresd-Register-SDHC3-first.patch | 38 +++ ...m-vivante-Add-00-sufix-in-returned-bus-Id.patch | 31 +++ ...-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch | 143 ++++++++++++ .../recipes/linux/linux-imx_3.0.35.bb | 35 +++ .../recipes/u-boot/u-boot-fslc_2013.10.bb | 25 ++ scripts/manifest.xml | 10 +- scripts/manifest_dizzy.xml | 10 +- scripts/manifest_tibidabo.xml | 31 --- 34 files changed, 1536 insertions(+), 54 deletions(-) create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc create mode 100644 meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb create mode 100644 meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch create mode 100644 meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb create mode 100644 meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb delete mode 100644 scripts/manifest_tibidabo.xml diff --git a/b2qt-init-build-env b/b2qt-init-build-env index c61e0c6..83776eb 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -130,20 +130,6 @@ mirror() { ${REPO} sync } -patch_poky() { - cd sources/poky - found=$(git rev-list --grep="bitbake: cooker: add support for using % as a wildcard in bbappend filename" HEAD) - if [ -z "$found" ]; then - git cherry-pick 381d5920188398bc53b2454843054c8690bca243 > /dev/null - fi - - found=$(git rev-list --grep="bitbake: cooker: Fix support for wildcards in bbappend filenames" HEAD) - if [ -z "$found" ]; then - git cherry-pick f91a3f46a1ee586e330be0868e8fbc4d2e78d361 > /dev/null - fi - cd - -} - init() { if [ -z "${DEVICE}" ]; then echo "device not defined" @@ -153,6 +139,7 @@ init() { get_groups mkdir -p .repo/manifests + rm -f .repo/manifests/manifest*.xml cp ${DIR}/scripts/manifest*.xml .repo/manifests if [ -f .repo/manifests/manifest_${DEVICE}.xml ]; then MANIFEST="manifest_${DEVICE}.xml" @@ -162,8 +149,6 @@ init() { ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} ${REPO} sync - patch_poky - if [ ! -e "sources/meta-b2qt" ]; then ln -s ${DIR} sources/meta-b2qt fi diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index 734f66a..20d049d 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -32,6 +32,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-fsl-arm \ + ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-tibidabo \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-qt5 \ diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf index 1e5e7e0..abe47cb 100644 --- a/conf/distro/include/tibidabo.conf +++ b/conf/distro/include/tibidabo.conf @@ -20,6 +20,8 @@ ## ############################################################################# +KERNEL_IMAGETYPE = "uImage" + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ bootscript:bootscript \ @@ -41,6 +43,4 @@ MACHINE_EXTRA_INSTALL_SDK = " \ libgles2-mx6-dev \ " -module_autoload_mxc_v4l2_capture = "mxc_v4l2_capture" - -BBMASK += "|meta-fsl-extras/recipes/u-boot|meta-fsl-extras/recipes/linux/linux-boundary|meta-fsl-extras/recipes/broadcom-nvram-config" +KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc new file mode 100644 index 0000000..f661539 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -0,0 +1,246 @@ +# Copyright (C) 2012-2013 Freescale Semiconductor +# Copyright (C) 2012-2013 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "GPU driver and apps for imx6" +SECTION = "libs" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}" +PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg" + +PE = "1" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ + file://egl.pc \ + file://egl_x11.pc \ + file://glesv1_cm.pc \ + file://glesv1_cm_x11.pc \ + file://glesv2.pc \ + file://glesv2_x11.pc \ + file://vg.pc \ + file://vg_x11.pc \ + file://gc_wayland_protocol.pc \ + file://wayland-egl.pc \ + file://wayland-viv.pc \ + " + +PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ + libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ + libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ + libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ + libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ + libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ + libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ + libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ + libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ + libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ + libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ + libvivante-dri-mx6 \ + libvivante-dfb-mx6 \ + libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ + libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ + libwayland-egl-mx6-dev \ +" + +# Skip package if it does not match the machine float-point type in use +python __anonymous () { + is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d) + is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp" + + if is_package_hardfp != is_machine_hardfp: + PN = d.getVar("PN", True) + PV = d.getVar("PV", True) + bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV)) + raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine") +} + +USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" +USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}" +USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" + +# Inhibit warnings about files being stripped. +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# FIXME: The provided binary doesn't provide soname. If in future BSP +# release the libraries are fixed, we can drop this hack. +REALSOLIBS := "${SOLIBS}" +SOLIBS = "${SOLIBSDEV}" + +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mx6 suffix). +# +# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have +# the source we cannot fix it. Disable the insane check for now. +python __anonymous() { + packages = d.getVar('PACKAGES', True).split() + for p in packages: + d.appendVar("INSANE_SKIP_%s" % p, " ldflags") + + for p in (("libegl", "libegl1"), ("libgl", "libgl1"), + ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), + ("libgles3",)): + fullp = p[0] + "-mx6" + pkgs = " ".join(p) + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "-dev" + pkgs = p[0] + "-dev" + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) +} + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + + cp -a ${S}/usr/lib/*.so* ${D}${libdir} + cp -axr ${S}/usr/include/* ${D}${includedir} + cp -axr ${S}/opt ${D} + + install -d ${D}${libdir}/pkgconfig + + # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb + if [ "${USE_X11}" = "yes" ]; then + cp -r ${S}/usr/lib/dri ${D}${libdir} + backend=x11 + + install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc + #FIXME: WL & X11 is not currently functional + #if [ "${USE_WL}" = "yes" ]; then + # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc + # install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc + # install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + #fi + elif [ "${USE_WL}" = "yes" ]; then + backend=wl + + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc + install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc + install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc + install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + else + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc + + if [ "${USE_DFB}" = "yes" ]; then + cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir} + backend=dfb + else + # Regular framebuffer + backend=fb + fi + fi + + # We'll only have one backend here so we rename it to generic name + # and avoid rework in other packages, when possible + mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0 + ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2 + ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so + mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0 + ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1 + ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so + mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so + mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so + + for backend in wl x11 fb dfb; do + find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';' + done + + find ${D}${libdir} -type f -exec chmod 644 {} \; + find ${D}${includedir} -type f -exec chmod 644 {} \; +} + +S = "${WORKDIR}/${PN}-${PV}" + +FILES_${PN} += "/opt" +FILES_${PN}-dev = "${includedir}" +FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug" + +FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}" +FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" +FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}" + +# libEGL.so is used by some demo apps from Freescale +INSANE_SKIP_libegl-mx6 += "dev-so" +FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " +FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" +FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" + +FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}" +FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}" +FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}" + +FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}" +FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}" +FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}" +RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev" + +# libEGL needs to open libGLESv1.so +INSANE_SKIP_libgles-mx6 += "dev-so" +FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}" +FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" +FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}" + +# libEGL needs to open libGLESv2.so +INSANE_SKIP_libgles2-mx6 += "dev-so" +FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" +FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" +FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" +RDEPENDS_libgles2-mx6 = "libglslc-mx6" + +FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}" +FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" +FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}" + +FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}" +FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" +FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}" +RDEPENDS_libopencl-mx6 = "libclc-mx6" + +FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}" +FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" +FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}" + +FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}" +FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}" +FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}" + +FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}" +FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}" +FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}" + +FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" + +FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so" + +INSANE_SKIP_libwayland-viv-mx6 += "dev-so" +FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" +FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" +FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}" + +INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so" +FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" +FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc" +FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}" + +FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" + +COMPATIBLE_MACHINE = "(mx6)" diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch new file mode 100644 index 0000000..dc91d7c --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch @@ -0,0 +1,30 @@ +From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001 +From: Jeremy Stashluk +Date: Wed, 30 Jan 2013 13:16:53 -0500 +Subject: [PATCH] change header path to HAL + +The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL +directory under the system. I think this is a problem in the LTIB release as +well. + +Upstream-Status: Pending + +Signed-off-by: Jeremy Stashluk + +--- + usr/include/gc_vdk_types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +@@ -39,7 +39,7 @@ extern "C" { + #endif + + #include +-#include "gc_hal_eglplatform_type.h" ++#include + + + /******************************************************************************* diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc new file mode 100644 index 0000000..a21922d --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Vivante EGL library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} -DLINUX diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc new file mode 100644 index 0000000..5921583 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Vivante EGL library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} -DLINUX diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch new file mode 100644 index 0000000..3eac116 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch @@ -0,0 +1,31 @@ +Avoid conflicting types with Xorg newer code + +Upstream-Status: Pending +Signed-off-by: Otavio Salvador + +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +@@ -101,7 +101,7 @@ extern gcsPLS gcPLS; + typedef struct _gcsTLS * gcsTLS_PTR; + + typedef void (* gctTLS_DESTRUCTOR) ( +- gcsTLS_PTR TLS ++ gcsTLS_PTR pTLS + ); + + typedef struct _gcsTLS +@@ -648,10 +648,10 @@ gcoOS_SetPLSValue( + /* Get access to the thread local storage. */ + gceSTATUS + gcoOS_GetTLS( +- OUT gcsTLS_PTR * TLS ++ OUT gcsTLS_PTR * pTLS + ); + +- /* Copy the TLS from a source thread. */ ++ /* Copy the pTLS from a source thread. */ + gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source); + + /* Destroy the objects associated with the current thread. */ diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch new file mode 100644 index 0000000..732a073 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch @@ -0,0 +1,34 @@ +From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001 +From: Adrian Alonso +Date: Sat, 26 Jan 2013 17:52:04 -0600 +Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs + +* Remove header undefs for Always and Status definitions + +Signed-off-by: Adrian Alonso +--- + usr/include/HAL/gc_hal_eglplatform.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h +index a968fe7..e80c65a 100644 +--- a/usr/include/HAL/gc_hal_eglplatform.h ++++ b/usr/include/HAL/gc_hal_eglplatform.h +@@ -341,14 +341,11 @@ typedef Pixmap HALNativePixmapType; + /* Rename some badly named X defines. */ + #ifdef Status + # define XStatus int +-# undef Status + #endif + #ifdef Always + # define XAlways 2 +-# undef Always + #endif + #ifdef CurrentTime +-# undef CurrentTime + # define XCurrentTime 0 + #endif + +-- +1.8.1 + diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc new file mode 100644 index 0000000..f4610ea --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: gc_wayland_protocol +Description: Vivante Wayland Protocol Extension Library +Version: 0.1 +Cflags: -I${includedir} +Libs: -L${libdir} -lgc_wayland_protocol diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc new file mode 100644 index 0000000..d97b067 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Vivante OpenGL ES 1.1 CM library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc new file mode 100644 index 0000000..e801633 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Vivante OpenGL ES 1.1 CM library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs.private: -lm -lpthread -ldl +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc new file mode 100644 index 0000000..9be46f2 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Vivante OpenGL ES 2.0 library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc new file mode 100644 index 0000000..57ad807 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Vivante OpenGL ES 2.0 library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc new file mode 100644 index 0000000..7c00def --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: vg +Description: Vivante OpenVG 1.1 library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lOpenVG -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc new file mode 100644 index 0000000..94fb91e --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: vg +Description: Vivante OpenVG 1.1 library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lOpenVG -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc new file mode 100644 index 0000000..ba1b898 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: wayland-egl +Description: Bind the driver EGL to the Wayland API +Version: 1.0.0 +Libs: -L${libdir} -lEGL +Cflags: -I${includedir} diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc new file mode 100644 index 0000000..3fdedd0 --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Wayland Vivante Lib +Description: Wayland server side library for Vivante's EGL driver +Version: 0.1 +Cflags: -I${includedir}/wayland-viv +Libs: -L${libdir} -lwayland-viv diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb new file mode 100644 index 0000000..56610fb --- /dev/null +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb @@ -0,0 +1,9 @@ +# Copyright (C) 2013 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +require gpu-viv-bin-mx6q.inc + +SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e" +SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003" + +PACKAGE_FP_TYPE = "hardfp" diff --git a/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb new file mode 100644 index 0000000..f2a736a --- /dev/null +++ b/meta-architech-extras/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013 Freescale Semiconductor + +require recipes-bsp/imx-lib/imx-lib.inc + +SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2" +SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8" + +PE = "1" + +COMPATIBLE_MACHINE = "(mx6)" diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch new file mode 100644 index 0000000..abc02c9 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch @@ -0,0 +1,43 @@ +From 503daf4789dd23e4dc1e16c256de0c163fc2bf87 Mon Sep 17 00:00:00 2001 +From: Markus Trippelsdorf +Date: Wed, 4 Apr 2012 10:45:27 +0200 +Subject: [PATCH] perf tools: Fix getrusage() related build failure on glibc + trunk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Organization: O.S. Systems Software LTDA. + +On a system running glibc trunk perf doesn't build: + + CC builtin-sched.o +builtin-sched.c: In function ‘get_cpu_usage_nsec_parent’: builtin-sched.c:399:16: error: storage size of ‘ru’ isn’t known builtin-sched.c:403:2: error: implicit declaration of function ‘getrusage’ [-Werror=implicit-function-declaration] + [...] + +Fix it by including sys/resource.h. + +Upstream-Status: Pending + +Signed-off-by: Markus Trippelsdorf +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20120404084527.GA294@x4 +Signed-off-by: Ingo Molnar +--- + tools/perf/builtin-sched.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c +index dcfe887..3632c2f 100644 +--- a/tools/perf/builtin-sched.c ++++ b/tools/perf/builtin-sched.c +@@ -14,6 +14,7 @@ + #include "util/debug.h" + + #include ++#include + + #include + #include +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch new file mode 100644 index 0000000..4c31e74 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch @@ -0,0 +1,259 @@ +From 2235b85f1c76d98b5f1e160cbd0a61a84c15e125 Mon Sep 17 00:00:00 2001 +From: Ivan Djelic +Date: Wed, 6 Mar 2013 20:09:27 +0100 +Subject: [PATCH] ARM: 7668/1: fix memset-related crashes caused by recent GCC + (4.7.2) optimizations +Organization: O.S. Systems Software LTDA. + +Recent GCC versions (e.g. GCC-4.7.2) perform optimizations based on +assumptions about the implementation of memset and similar functions. +The current ARM optimized memset code does not return the value of +its first argument, as is usually expected from standard implementations. + +For instance in the following function: + +void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter) +{ + memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter)); + waiter->magic = waiter; + INIT_LIST_HEAD(&waiter->list); +} + +compiled as: + +800554d0 : +800554d0: e92d4008 push {r3, lr} +800554d4: e1a00001 mov r0, r1 +800554d8: e3a02010 mov r2, #16 ; 0x10 +800554dc: e3a01011 mov r1, #17 ; 0x11 +800554e0: eb04426e bl 80165ea0 +800554e4: e1a03000 mov r3, r0 +800554e8: e583000c str r0, [r3, #12] +800554ec: e5830000 str r0, [r3] +800554f0: e5830004 str r0, [r3, #4] +800554f4: e8bd8008 pop {r3, pc} + +GCC assumes memset returns the value of pointer 'waiter' in register r0; causing +register/memory corruptions. + +This patch fixes the return value of the assembly version of memset. +It adds a 'mov' instruction and merges an additional load+store into +existing load/store instructions. +For ease of review, here is a breakdown of the patch into 4 simple steps: + +Step 1 +====== +Perform the following substitutions: +ip -> r8, then +r0 -> ip, +and insert 'mov ip, r0' as the first statement of the function. +At this point, we have a memset() implementation returning the proper result, +but corrupting r8 on some paths (the ones that were using ip). + +Step 2 +====== +Make sure r8 is saved and restored when (! CALGN(1)+0) == 1: + +save r8: +- str lr, [sp, #-4]! ++ stmfd sp!, {r8, lr} + +and restore r8 on both exit paths: +- ldmeqfd sp!, {pc} @ Now <64 bytes to go. ++ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. +(...) + tst r2, #16 + stmneia ip!, {r1, r3, r8, lr} +- ldr lr, [sp], #4 ++ ldmfd sp!, {r8, lr} + +Step 3 +====== +Make sure r8 is saved and restored when (! CALGN(1)+0) == 0: + +save r8: +- stmfd sp!, {r4-r7, lr} ++ stmfd sp!, {r4-r8, lr} + +and restore r8 on both exit paths: + bgt 3b +- ldmeqfd sp!, {r4-r7, pc} ++ ldmeqfd sp!, {r4-r8, pc} +(...) + tst r2, #16 + stmneia ip!, {r4-r7} +- ldmfd sp!, {r4-r7, lr} ++ ldmfd sp!, {r4-r8, lr} + +Step 4 +====== +Rewrite register list "r4-r7, r8" as "r4-r8". + +Upstream-Status: Pending + +Signed-off-by: Ivan Djelic +Reviewed-by: Nicolas Pitre +Signed-off-by: Dirk Behme +Signed-off-by: Russell King +(cherry picked from commit 455bd4c430b0c0a361f38e8658a0d6cb469942b5) +--- + arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++------------------------- + 1 file changed, 44 insertions(+), 41 deletions(-) + +diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S +index 650d592..d912e73 100644 +--- a/arch/arm/lib/memset.S ++++ b/arch/arm/lib/memset.S +@@ -19,9 +19,9 @@ + 1: subs r2, r2, #4 @ 1 do we have enough + blt 5f @ 1 bytes to align with? + cmp r3, #2 @ 1 +- strltb r1, [r0], #1 @ 1 +- strleb r1, [r0], #1 @ 1 +- strb r1, [r0], #1 @ 1 ++ strltb r1, [ip], #1 @ 1 ++ strleb r1, [ip], #1 @ 1 ++ strb r1, [ip], #1 @ 1 + add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) + /* + * The pointer is now aligned and the length is adjusted. Try doing the +@@ -29,10 +29,14 @@ + */ + + ENTRY(memset) +- ands r3, r0, #3 @ 1 unaligned? ++/* ++ * Preserve the contents of r0 for the return value. ++ */ ++ mov ip, r0 ++ ands r3, ip, #3 @ 1 unaligned? + bne 1b @ 1 + /* +- * we know that the pointer in r0 is aligned to a word boundary. ++ * we know that the pointer in ip is aligned to a word boundary. + */ + orr r1, r1, r1, lsl #8 + orr r1, r1, r1, lsl #16 +@@ -43,29 +47,28 @@ ENTRY(memset) + #if ! CALGN(1)+0 + + /* +- * We need an extra register for this loop - save the return address and +- * use the LR ++ * We need 2 extra registers for this loop - use r8 and the LR + */ +- str lr, [sp, #-4]! +- mov ip, r1 ++ stmfd sp!, {r8, lr} ++ mov r8, r1 + mov lr, r1 + + 2: subs r2, r2, #64 +- stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time. +- stmgeia r0!, {r1, r3, ip, lr} +- stmgeia r0!, {r1, r3, ip, lr} +- stmgeia r0!, {r1, r3, ip, lr} ++ stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time. ++ stmgeia ip!, {r1, r3, r8, lr} ++ stmgeia ip!, {r1, r3, r8, lr} ++ stmgeia ip!, {r1, r3, r8, lr} + bgt 2b +- ldmeqfd sp!, {pc} @ Now <64 bytes to go. ++ ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. + /* + * No need to correct the count; we're only testing bits from now on + */ + tst r2, #32 +- stmneia r0!, {r1, r3, ip, lr} +- stmneia r0!, {r1, r3, ip, lr} ++ stmneia ip!, {r1, r3, r8, lr} ++ stmneia ip!, {r1, r3, r8, lr} + tst r2, #16 +- stmneia r0!, {r1, r3, ip, lr} +- ldr lr, [sp], #4 ++ stmneia ip!, {r1, r3, r8, lr} ++ ldmfd sp!, {r8, lr} + + #else + +@@ -74,54 +77,54 @@ ENTRY(memset) + * whole cache lines at once. + */ + +- stmfd sp!, {r4-r7, lr} ++ stmfd sp!, {r4-r8, lr} + mov r4, r1 + mov r5, r1 + mov r6, r1 + mov r7, r1 +- mov ip, r1 ++ mov r8, r1 + mov lr, r1 + + cmp r2, #96 +- tstgt r0, #31 ++ tstgt ip, #31 + ble 3f + +- and ip, r0, #31 +- rsb ip, ip, #32 +- sub r2, r2, ip +- movs ip, ip, lsl #(32 - 4) +- stmcsia r0!, {r4, r5, r6, r7} +- stmmiia r0!, {r4, r5} +- tst ip, #(1 << 30) +- mov ip, r1 +- strne r1, [r0], #4 ++ and r8, ip, #31 ++ rsb r8, r8, #32 ++ sub r2, r2, r8 ++ movs r8, r8, lsl #(32 - 4) ++ stmcsia ip!, {r4, r5, r6, r7} ++ stmmiia ip!, {r4, r5} ++ tst r8, #(1 << 30) ++ mov r8, r1 ++ strne r1, [ip], #4 + + 3: subs r2, r2, #64 +- stmgeia r0!, {r1, r3-r7, ip, lr} +- stmgeia r0!, {r1, r3-r7, ip, lr} ++ stmgeia ip!, {r1, r3-r8, lr} ++ stmgeia ip!, {r1, r3-r8, lr} + bgt 3b +- ldmeqfd sp!, {r4-r7, pc} ++ ldmeqfd sp!, {r4-r8, pc} + + tst r2, #32 +- stmneia r0!, {r1, r3-r7, ip, lr} ++ stmneia ip!, {r1, r3-r8, lr} + tst r2, #16 +- stmneia r0!, {r4-r7} +- ldmfd sp!, {r4-r7, lr} ++ stmneia ip!, {r4-r7} ++ ldmfd sp!, {r4-r8, lr} + + #endif + + 4: tst r2, #8 +- stmneia r0!, {r1, r3} ++ stmneia ip!, {r1, r3} + tst r2, #4 +- strne r1, [r0], #4 ++ strne r1, [ip], #4 + /* + * When we get here, we've got less than 4 bytes to zero. We + * may have an unaligned pointer as well. + */ + 5: tst r2, #2 +- strneb r1, [r0], #1 +- strneb r1, [r0], #1 ++ strneb r1, [ip], #1 ++ strneb r1, [ip], #1 + tst r2, #1 +- strneb r1, [r0], #1 ++ strneb r1, [ip], #1 + mov pc, lr + ENDPROC(memset) +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch new file mode 100644 index 0000000..b8d6f53 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0003-ARM-7670-1-fix-the-memset-fix.patch @@ -0,0 +1,87 @@ +From 2ba23fa6c4128febaaf57fe184420a7111caa237 Mon Sep 17 00:00:00 2001 +From: Nicolas Pitre +Date: Tue, 12 Mar 2013 13:00:42 +0100 +Subject: [PATCH] ARM: 7670/1: fix the memset fix +Organization: O.S. Systems Software LTDA. + +Commit 455bd4c430b0 ("ARM: 7668/1: fix memset-related crashes caused by +recent GCC (4.7.2) optimizations") attempted to fix a compliance issue +with the memset return value. However the memset itself became broken +by that patch for misaligned pointers. + +This fixes the above by branching over the entry code from the +misaligned fixup code to avoid reloading the original pointer. + +Also, because the function entry alignment is wrong in the Thumb mode +compilation, that fixup code is moved to the end. + +While at it, the entry instructions are slightly reworked to help dual +issue pipelines. + +Upstream-Status: Pending + +Signed-off-by: Nicolas Pitre +Tested-by: Alexander Holler +Signed-off-by: Russell King +(cherry picked from commit 418df63adac56841ef6b0f1fcf435bc64d4ed177) +--- + arch/arm/lib/memset.S | 33 +++++++++++++-------------------- + 1 file changed, 13 insertions(+), 20 deletions(-) + +diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S +index d912e73..94b0650 100644 +--- a/arch/arm/lib/memset.S ++++ b/arch/arm/lib/memset.S +@@ -14,31 +14,15 @@ + + .text + .align 5 +- .word 0 +- +-1: subs r2, r2, #4 @ 1 do we have enough +- blt 5f @ 1 bytes to align with? +- cmp r3, #2 @ 1 +- strltb r1, [ip], #1 @ 1 +- strleb r1, [ip], #1 @ 1 +- strb r1, [ip], #1 @ 1 +- add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) +-/* +- * The pointer is now aligned and the length is adjusted. Try doing the +- * memset again. +- */ + + ENTRY(memset) +-/* +- * Preserve the contents of r0 for the return value. +- */ +- mov ip, r0 +- ands r3, ip, #3 @ 1 unaligned? +- bne 1b @ 1 ++ ands r3, r0, #3 @ 1 unaligned? ++ mov ip, r0 @ preserve r0 as return value ++ bne 6f @ 1 + /* + * we know that the pointer in ip is aligned to a word boundary. + */ +- orr r1, r1, r1, lsl #8 ++1: orr r1, r1, r1, lsl #8 + orr r1, r1, r1, lsl #16 + mov r3, r1 + cmp r2, #16 +@@ -127,4 +111,13 @@ ENTRY(memset) + tst r2, #1 + strneb r1, [ip], #1 + mov pc, lr ++ ++6: subs r2, r2, #4 @ 1 do we have enough ++ blt 5b @ 1 bytes to align with? ++ cmp r3, #2 @ 1 ++ strltb r1, [ip], #1 @ 1 ++ strleb r1, [ip], #1 @ 1 ++ strb r1, [ip], #1 @ 1 ++ add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) ++ b 1b + ENDPROC(memset) +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch new file mode 100644 index 0000000..7316351 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch @@ -0,0 +1,43 @@ +From d8601292ae25e0af47aa4486055221ab44113f0e Mon Sep 17 00:00:00 2001 +From: Mahesh Mahadevan +Date: Mon, 15 Jul 2013 15:34:54 -0500 +Subject: [PATCH] ENGR00271136 Fix build break when CONFIG_CLK_DEBUG is + disabled +Organization: O.S. Systems Software LTDA. + +clk structure member name is defined only when CONFIG_CLK_DEBUG is enabled. +Hence need to encapsulate the code with this config. + +Patch received from imx community: +https://community.freescale.com/thread/308482 + +Upstream-Status: Pending + +Signed-off-by: xiongweihuang +Signed-off-by: Mahesh Mahadevan +--- + arch/arm/plat-mxc/clock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c +index 93347eb..1aa2664 100755 +--- a/arch/arm/plat-mxc/clock.c ++++ b/arch/arm/plat-mxc/clock.c +@@ -58,12 +58,12 @@ static void __clk_disable(struct clk *clk) + { + if (clk == NULL || IS_ERR(clk)) + return; +- ++#ifdef CONFIG_CLK_DEBUG + if (!clk->usecount) { + WARN(1, "clock enable/disable mismatch! clk %s\n", clk->name); + return; + } +- ++#endif + if (!(--clk->usecount)) { + if (clk->disable) + clk->disable(clk); +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch new file mode 100644 index 0000000..cb20198 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0005-ENGR00271359-Add-Multi-touch-support.patch @@ -0,0 +1,98 @@ +From 538f4bb2f7a51f267395550a5be9f0ab2e426712 Mon Sep 17 00:00:00 2001 +From: Erik Boto +Date: Tue, 16 Jul 2013 12:06:05 -0500 +Subject: [PATCH] ENGR00271359 Add Multi-touch support +Organization: O.S. Systems Software LTDA. + +The previous behavior of the driver did not work properly with Qt5 +QtQuick multi touch-point gestures, due to how touch-points are +reported when removing a touch-point. My interpretation of the +available documentation [1] was that the driver should report all +touch-points between SYN_REPORTs, but it is not explicitly stated so. +I've found another mail-thread [2] where the creator of the protocol +states: + +"The protocol defines a generic way of sending a variable amount of +contacts. The contact count is obtained by counting the number of +non-empty finger packets between SYN_REPORT events."-Henrik Rydberg + +I think this verifies my assumption that all touch-points should be +reported between SYN_REPORTs, otherwise it can not be used to obtain +the count. + +[1] https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt +[2] http://lists.x.org/archives/xorg-devel/2010-March/006466.html + +Upstream-Status: Pending + +Signed-off-by: Erik Boto +Signed-off-by: Mahesh Mahadevan +(cherry picked from commit 7cba001c5a502680f6dbf902821726779a9c9287) +--- + drivers/input/touchscreen/egalax_ts.c | 36 +++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c +index 0b6cde7..271f820 100644 +--- a/drivers/input/touchscreen/egalax_ts.c ++++ b/drivers/input/touchscreen/egalax_ts.c +@@ -133,7 +133,6 @@ retry: + } + + if (down) { +- /* should also report old pointers */ + events[id].valid = valid; + events[id].status = down; + events[id].x = x; +@@ -144,23 +143,6 @@ retry: + input_report_abs(input_dev, ABS_Y, y); + input_event(data->input_dev, EV_KEY, BTN_TOUCH, 1); + input_report_abs(input_dev, ABS_PRESSURE, 1); +-#else +- for (i = 0; i < MAX_SUPPORT_POINTS; i++) { +- if (!events[i].valid) +- continue; +- dev_dbg(&client->dev, "report id:%d valid:%d x:%d y:%d", +- i, valid, x, y); +- +- input_report_abs(input_dev, +- ABS_MT_TRACKING_ID, i); +- input_report_abs(input_dev, +- ABS_MT_TOUCH_MAJOR, 1); +- input_report_abs(input_dev, +- ABS_MT_POSITION_X, events[i].x); +- input_report_abs(input_dev, +- ABS_MT_POSITION_Y, events[i].y); +- input_mt_sync(input_dev); +- } + #endif + } else { + dev_dbg(&client->dev, "release id:%d\n", id); +@@ -176,6 +158,24 @@ retry: + #endif + } + ++#ifndef CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH ++ /* report all pointers */ ++ for (i = 0; i < MAX_SUPPORT_POINTS; i++) { ++ if (!events[i].valid) ++ continue; ++ dev_dbg(&client->dev, "report id:%d valid:%d x:%d y:%d", ++ i, valid, x, y); ++ input_report_abs(input_dev, ++ ABS_MT_TRACKING_ID, i); ++ input_report_abs(input_dev, ++ ABS_MT_TOUCH_MAJOR, 1); ++ input_report_abs(input_dev, ++ ABS_MT_POSITION_X, events[i].x); ++ input_report_abs(input_dev, ++ ABS_MT_POSITION_Y, events[i].y); ++ input_mt_sync(input_dev); ++ } ++#endif + input_sync(input_dev); + return IRQ_HANDLED; + } +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch new file mode 100644 index 0000000..00a6b5c --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0006-Add-support-for-DVI-monitors.patch @@ -0,0 +1,227 @@ +From 3e6441d113f72b412081a2c87f39011e4c253a35 Mon Sep 17 00:00:00 2001 +From: Robert Winkler +Date: Fri, 19 Jul 2013 19:00:41 -0700 +Subject: [PATCH] Add support for DVI monitors +Organization: O.S. Systems Software LTDA. + +Upstream-Status: Pending + +Signed-off-by: Robert Winkler +--- + arch/arm/plat-mxc/include/mach/mxc_hdmi.h | 7 +++ + drivers/video/mxc_hdmi.c | 98 +++++++++++++------------------ + 2 files changed, 49 insertions(+), 56 deletions(-) + +diff --git a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h +index 94f7638..af59c62 100644 +--- a/arch/arm/plat-mxc/include/mach/mxc_hdmi.h ++++ b/arch/arm/plat-mxc/include/mach/mxc_hdmi.h +@@ -605,6 +605,10 @@ enum { + HDMI_IH_MUTE_PHY_STAT0_TX_PHY_LOCK = 0x2, + HDMI_IH_MUTE_PHY_STAT0_HPD = 0x1, + ++/* IH and IH_MUTE convenience macro RX_SENSE | HPD*/ ++ HDMI_DVI_IH_STAT = 0x3D, ++ ++ + /* IH_AHBDMAAUD_STAT0 field values */ + HDMI_IH_AHBDMAAUD_STAT0_ERROR = 0x20, + HDMI_IH_AHBDMAAUD_STAT0_LOST = 0x10, +@@ -903,6 +907,9 @@ enum { + HDMI_PHY_HPD = 0x02, + HDMI_PHY_TX_PHY_LOCK = 0x01, + ++/* HDMI STAT convenience RX_SENSE | HPD */ ++ HDMI_DVI_STAT = 0xF2, ++ + /* PHY_I2CM_SLAVE_ADDR field values */ + HDMI_PHY_I2CM_SLAVE_ADDR_PHY_GEN2 = 0x69, + HDMI_PHY_I2CM_SLAVE_ADDR_HEAC_PHY = 0x49, +diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c +index c5069aa..544f352 100644 +--- a/drivers/video/mxc_hdmi.c ++++ b/drivers/video/mxc_hdmi.c +@@ -180,7 +180,6 @@ struct mxc_hdmi { + bool dft_mode_set; + char *dft_mode_str; + int default_bpp; +- u8 latest_intr_stat; + bool irq_enabled; + spinlock_t irq_lock; + bool phy_enabled; +@@ -1996,58 +1995,48 @@ static void hotplug_worker(struct work_struct *work) + struct delayed_work *delay_work = to_delayed_work(work); + struct mxc_hdmi *hdmi = + container_of(delay_work, struct mxc_hdmi, hotplug_work); +- u32 phy_int_stat, phy_int_pol, phy_int_mask; +- u8 val; ++ u32 hdmi_phy_stat0, hdmi_phy_pol0, hdmi_phy_mask0; + unsigned long flags; + char event_string[32]; + char *envp[] = { event_string, NULL }; + +- phy_int_stat = hdmi->latest_intr_stat; +- phy_int_pol = hdmi_readb(HDMI_PHY_POL0); + +- dev_dbg(&hdmi->pdev->dev, "phy_int_stat=0x%x, phy_int_pol=0x%x\n", +- phy_int_stat, phy_int_pol); ++ hdmi_phy_stat0 = hdmi_readb(HDMI_PHY_STAT0); ++ hdmi_phy_pol0 = hdmi_readb(HDMI_PHY_POL0); ++ ++ dev_dbg(&hdmi->pdev->dev, "hdmi_phy_stat0=0x%x, hdmi_phy_pol0=0x%x\n", ++ hdmi_phy_stat0, hdmi_phy_pol0); ++ ++ /* Make HPD intr active low to capture unplug event or ++ * active high to capture plugin event */ ++ hdmi_writeb((HDMI_DVI_STAT & ~hdmi_phy_stat0), HDMI_PHY_POL0); + + /* check cable status */ +- if (phy_int_stat & HDMI_IH_PHY_STAT0_HPD) { +- /* cable connection changes */ +- if (phy_int_pol & HDMI_PHY_HPD) { +- /* Plugin event */ +- dev_dbg(&hdmi->pdev->dev, "EVENT=plugin\n"); +- mxc_hdmi_cable_connected(hdmi); +- +- /* Make HPD intr active low to capture unplug event */ +- val = hdmi_readb(HDMI_PHY_POL0); +- val &= ~HDMI_PHY_HPD; +- hdmi_writeb(val, HDMI_PHY_POL0); +- +- sprintf(event_string, "EVENT=plugin"); +- kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp); ++ if (hdmi_phy_stat0 & HDMI_DVI_STAT) { ++ /* Plugin event */ ++ dev_dbg(&hdmi->pdev->dev, "EVENT=plugin\n"); ++ mxc_hdmi_cable_connected(hdmi); ++ ++ sprintf(event_string, "EVENT=plugin"); ++ kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp); + #ifdef CONFIG_MXC_HDMI_CEC +- mxc_hdmi_cec_handle(0x80); ++ mxc_hdmi_cec_handle(0x80); + #endif +- hdmi_set_cable_state(1); +- +- } else if (!(phy_int_pol & HDMI_PHY_HPD)) { +- /* Plugout event */ +- dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n"); +- hdmi_set_cable_state(0); +- mxc_hdmi_abort_stream(); +- mxc_hdmi_cable_disconnected(hdmi); ++ hdmi_set_cable_state(1); + +- /* Make HPD intr active high to capture plugin event */ +- val = hdmi_readb(HDMI_PHY_POL0); +- val |= HDMI_PHY_HPD; +- hdmi_writeb(val, HDMI_PHY_POL0); ++ } else { ++ /* Plugout event */ ++ dev_dbg(&hdmi->pdev->dev, "EVENT=plugout\n"); ++ hdmi_set_cable_state(0); ++ mxc_hdmi_abort_stream(); ++ mxc_hdmi_cable_disconnected(hdmi); + +- sprintf(event_string, "EVENT=plugout"); +- kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp); ++ sprintf(event_string, "EVENT=plugout"); ++ kobject_uevent_env(&hdmi->pdev->dev.kobj, KOBJ_CHANGE, envp); + #ifdef CONFIG_MXC_HDMI_CEC +- mxc_hdmi_cec_handle(0x100); ++ mxc_hdmi_cec_handle(0x100); + #endif + +- } else +- dev_dbg(&hdmi->pdev->dev, "EVENT=none?\n"); + } + + /* Lock here to ensure full powerdown sequence +@@ -2055,12 +2044,12 @@ static void hotplug_worker(struct work_struct *work) + spin_lock_irqsave(&hdmi->irq_lock, flags); + + /* Re-enable HPD interrupts */ +- phy_int_mask = hdmi_readb(HDMI_PHY_MASK0); +- phy_int_mask &= ~HDMI_PHY_HPD; +- hdmi_writeb(phy_int_mask, HDMI_PHY_MASK0); ++ hdmi_phy_mask0 = hdmi_readb(HDMI_PHY_MASK0); ++ hdmi_phy_mask0 &= ~HDMI_DVI_STAT; ++ hdmi_writeb(hdmi_phy_mask0, HDMI_PHY_MASK0); + + /* Unmute interrupts */ +- hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0); ++ hdmi_writeb(~HDMI_DVI_IH_STAT, HDMI_IH_MUTE_PHY_STAT0); + + if (hdmi_readb(HDMI_IH_FC_STAT2) & HDMI_IH_FC_STAT2_OVERFLOW_MASK) + mxc_hdmi_clear_overflow(); +@@ -2086,7 +2075,7 @@ static void hdcp_hdp_worker(struct work_struct *work) + static irqreturn_t mxc_hdmi_hotplug(int irq, void *data) + { + struct mxc_hdmi *hdmi = data; +- u8 val, intr_stat; ++ u8 val; + unsigned long flags; + + spin_lock_irqsave(&hdmi->irq_lock, flags); +@@ -2108,25 +2097,22 @@ static irqreturn_t mxc_hdmi_hotplug(int irq, void *data) + * HDMI registers. + */ + /* Capture status - used in hotplug_worker ISR */ +- intr_stat = hdmi_readb(HDMI_IH_PHY_STAT0); +- +- if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { ++ if (hdmi_readb(HDMI_IH_PHY_STAT0) & HDMI_DVI_IH_STAT) { + + dev_dbg(&hdmi->pdev->dev, "Hotplug interrupt received\n"); +- hdmi->latest_intr_stat = intr_stat; + + /* Mute interrupts until handled */ + + val = hdmi_readb(HDMI_IH_MUTE_PHY_STAT0); +- val |= HDMI_IH_MUTE_PHY_STAT0_HPD; ++ val |= HDMI_DVI_IH_STAT; + hdmi_writeb(val, HDMI_IH_MUTE_PHY_STAT0); + + val = hdmi_readb(HDMI_PHY_MASK0); +- val |= HDMI_PHY_HPD; ++ val |= HDMI_DVI_STAT; + hdmi_writeb(val, HDMI_PHY_MASK0); + + /* Clear Hotplug interrupts */ +- hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0); ++ hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0); + + schedule_delayed_work(&(hdmi->hotplug_work), msecs_to_jiffies(20)); + } +@@ -2282,13 +2268,13 @@ static void mxc_hdmi_fb_registered(struct mxc_hdmi *hdmi) + HDMI_PHY_I2CM_CTLINT_ADDR); + + /* enable cable hot plug irq */ +- hdmi_writeb((u8)~HDMI_PHY_HPD, HDMI_PHY_MASK0); ++ hdmi_writeb((u8)~HDMI_DVI_STAT, HDMI_PHY_MASK0); + + /* Clear Hotplug interrupts */ +- hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0); ++ hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0); + + /* Unmute interrupts */ +- hdmi_writeb(~HDMI_IH_MUTE_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0); ++ hdmi_writeb(~HDMI_DVI_IH_STAT, HDMI_IH_MUTE_PHY_STAT0); + + hdmi->fb_reg = true; + +@@ -2522,10 +2508,10 @@ static int mxc_hdmi_disp_init(struct mxc_dispdrv_handle *disp, + + /* Configure registers related to HDMI interrupt + * generation before registering IRQ. */ +- hdmi_writeb(HDMI_PHY_HPD, HDMI_PHY_POL0); ++ hdmi_writeb(HDMI_DVI_STAT, HDMI_PHY_POL0); + + /* Clear Hotplug interrupts */ +- hdmi_writeb(HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0); ++ hdmi_writeb(HDMI_DVI_IH_STAT, HDMI_IH_PHY_STAT0); + + hdmi->nb.notifier_call = mxc_hdmi_fb_event; + ret = fb_register_client(&hdmi->nb); +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch new file mode 100644 index 0000000..d02aa40 --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch @@ -0,0 +1,38 @@ +From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Sat, 28 Sep 2013 18:46:18 -0300 +Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first +Organization: O.S. Systems Software LTDA. + +On sabresd boards we boot from SDHC3, so let's register it as mmc0. + +Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present). + +Registering SDHC3 is safer as we can always find the rootfs. + +Signed-off-by: Fabio Estevam +--- + arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c +index 3f9a845..4e6b323 100644 +--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c ++++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c +@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void) + + imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data); + +- /* Move sd4 to first because sd4 connect to emmc. +- Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1. +- */ ++ imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data); + imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data); + imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data); +- imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data); + imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata); + imx6q_sabresd_init_usb(); + /* SATA is not supported by MX6DL/Solo */ +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch new file mode 100644 index 0000000..815d02c --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/drm-vivante-Add-00-sufix-in-returned-bus-Id.patch @@ -0,0 +1,31 @@ +From b37a944f55a5010bd08297a63db0275540922f32 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Thu, 22 Aug 2013 16:31:29 -0300 +Subject: [PATCH] drm/vivante: Add ":00" sufix in returned bus Id + +This makes the 3.0.35 compatible with a Xorg driver build for 3.5.7 or +newer kernels. + +Upstream-Status: Inapropriate [embedded specific] + +Signed-off-by: Otavio Salvador +--- + drivers/gpu/drm/vivante/vivante_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/vivante/vivante_drv.c b/drivers/gpu/drm/vivante/vivante_drv.c +index 4224608..cea360d 100644 +--- a/drivers/gpu/drm/vivante/vivante_drv.c ++++ b/drivers/gpu/drm/vivante/vivante_drv.c +@@ -55,7 +55,7 @@ + + #include "drm_pciids.h" + +-static char platformdevicename[] = "Vivante GCCore"; ++static char platformdevicename[] = "Vivante GCCore:00"; + static struct platform_device *pplatformdev; + + static struct drm_driver driver = { +-- +1.8.4.rc1 + diff --git a/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch new file mode 100644 index 0000000..0a20b3f --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx-3.0.35/epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch @@ -0,0 +1,143 @@ +From 149545df26169d257b144ff78934ce9cb5b6818b Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Sat, 19 Oct 2013 10:55:11 -0300 +Subject: [PATCH] epdc: Rename mxcfb_epdc_kernel.h to mxc_epdc.h +Organization: O.S. Systems Software LTDA. + +This allow for forward compatibility with imx-test >= 3.10.9-1.0.0. + +Signed-off-by: Otavio Salvador +--- + drivers/video/mxc/mxc_epdc_fb.c | 2 +- + include/linux/mxcfb_epdc.h | 49 +++++++++++++++++++++++++++++++++++++++ + include/linux/mxcfb_epdc_kernel.h | 49 --------------------------------------- + 3 files changed, 50 insertions(+), 50 deletions(-) + create mode 100644 include/linux/mxcfb_epdc.h + delete mode 100644 include/linux/mxcfb_epdc_kernel.h + +diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c +index 4103498..b3ef8ea 100644 +--- a/drivers/video/mxc/mxc_epdc_fb.c ++++ b/drivers/video/mxc/mxc_epdc_fb.c +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff --git a/include/linux/mxcfb_epdc.h b/include/linux/mxcfb_epdc.h +new file mode 100644 +index 0000000..06fea6f +--- /dev/null ++++ b/include/linux/mxcfb_epdc.h +@@ -0,0 +1,49 @@ ++/* ++ * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ */ ++#ifndef _MXCFB_EPDC_KERNEL ++#define _MXCFB_EPDC_KERNEL ++ ++void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes, ++ struct fb_info *info); ++int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info); ++int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info); ++int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data, ++ struct fb_info *info); ++int mxc_epdc_fb_wait_update_complete( ++ struct mxcfb_update_marker_data *marker_data, ++ struct fb_info *info); ++int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay, ++ struct fb_info *info); ++int mxc_epdc_get_pwrdown_delay(struct fb_info *info); ++int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info); ++ ++void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes, ++ struct fb_info *info); ++int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info); ++int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info); ++int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data, ++ struct fb_info *info); ++int mxc_spdc_fb_wait_update_complete( ++ struct mxcfb_update_marker_data *marker_data, ++ struct fb_info *info); ++int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay, ++ struct fb_info *info); ++int mxc_spdc_get_pwrdown_delay(struct fb_info *info); ++int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info); ++#endif +diff --git a/include/linux/mxcfb_epdc_kernel.h b/include/linux/mxcfb_epdc_kernel.h +deleted file mode 100644 +index 06fea6f..0000000 +--- a/include/linux/mxcfb_epdc_kernel.h ++++ /dev/null +@@ -1,49 +0,0 @@ +-/* +- * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved. +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- * +- */ +-#ifndef _MXCFB_EPDC_KERNEL +-#define _MXCFB_EPDC_KERNEL +- +-void mxc_epdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes, +- struct fb_info *info); +-int mxc_epdc_fb_set_temperature(int temperature, struct fb_info *info); +-int mxc_epdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info); +-int mxc_epdc_fb_send_update(struct mxcfb_update_data *upd_data, +- struct fb_info *info); +-int mxc_epdc_fb_wait_update_complete( +- struct mxcfb_update_marker_data *marker_data, +- struct fb_info *info); +-int mxc_epdc_fb_set_pwrdown_delay(u32 pwrdown_delay, +- struct fb_info *info); +-int mxc_epdc_get_pwrdown_delay(struct fb_info *info); +-int mxc_epdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info); +- +-void mxc_spdc_fb_set_waveform_modes(struct mxcfb_waveform_modes *modes, +- struct fb_info *info); +-int mxc_spdc_fb_set_temperature(int temperature, struct fb_info *info); +-int mxc_spdc_fb_set_auto_update(u32 auto_mode, struct fb_info *info); +-int mxc_spdc_fb_send_update(struct mxcfb_update_data *upd_data, +- struct fb_info *info); +-int mxc_spdc_fb_wait_update_complete( +- struct mxcfb_update_marker_data *marker_data, +- struct fb_info *info); +-int mxc_spdc_fb_set_pwrdown_delay(u32 pwrdown_delay, +- struct fb_info *info); +-int mxc_spdc_get_pwrdown_delay(struct fb_info *info); +-int mxc_spdc_fb_set_upd_scheme(u32 upd_scheme, struct fb_info *info); +-#endif +-- +1.8.4.rc3 + diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb new file mode 100644 index 0000000..8b80a6e --- /dev/null +++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb @@ -0,0 +1,35 @@ +# Copyright (C) 2011-2013 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +require recipes-kernel/linux/linux-imx.inc + +COMPATIBLE_MACHINE = "(mx6)" + +# Revision of 4.1.0 branch +SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a" +LOCALVERSION = "-4.1.0+yocto" + +# Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch +SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ + file://epdc-Rename-mxcfb_epdc_kernel.h-to-mxc_epdc.h.patch \ + file://0001-perf-tools-Fix-getrusage-related-build-failure-on-gl.patch \ + file://0002-ARM-7668-1-fix-memset-related-crashes-caused-by-rece.patch \ + file://0003-ARM-7670-1-fix-the-memset-fix.patch \ + file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \ + file://0005-ENGR00271359-Add-Multi-touch-support.patch \ + file://0006-Add-support-for-DVI-monitors.patch \ + file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch" + +# kernel image files are not needed in the image +RDEPENDS_kernel-base = "" + +do_configure_prepend() { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig +} diff --git a/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb new file mode 100644 index 0000000..73d4371 --- /dev/null +++ b/meta-architech-extras/recipes/u-boot/u-boot-fslc_2013.10.bb @@ -0,0 +1,25 @@ +require recipes-bsp/u-boot/u-boot.inc + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb" +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)" + +DEPENDS_mxs += "elftosb-native openssl-native" + +PROVIDES += "u-boot" + +PV = "v2013.10" + +SRCREV = "079e214888279518ce061c71238a74a0c3db2c28" +SRC_URI = "git://github.com/Freescale/u-boot-imx.git" + +S = "${WORKDIR}/git" + +# FIXME: Allow linking of 'tools' binaries with native libraries +# used for generating the boot logo and other tools used +# during the build process. +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \ + HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \ + HOSTSTRIP=true' + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 714a84d..2a39879 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -9,6 +9,7 @@ + + groups="notdefault,fsl,toradex,architech"/> + groups="notdefault,fsl,toradex,architech"/> + diff --git a/scripts/manifest_dizzy.xml b/scripts/manifest_dizzy.xml index ac9098f..956ff74 100644 --- a/scripts/manifest_dizzy.xml +++ b/scripts/manifest_dizzy.xml @@ -9,6 +9,7 @@ + + groups="notdefault,fsl,toradex,architech"/> + groups="notdefault,fsl,toradex,architech"/> + diff --git a/scripts/manifest_tibidabo.xml b/scripts/manifest_tibidabo.xml deleted file mode 100644 index 97c18dd..0000000 --- a/scripts/manifest_tibidabo.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - -- cgit v1.2.3-54-g00ecf From bbca6de3d2aff5f407031f76977e538b2e04790b Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Thu, 11 Jun 2015 14:33:58 +0200 Subject: Use automatic parallelism options in local.conf. Since all targets now use current poky version, we can get rid of the workaround for dora which needed hardcoded values. Change-Id: Ia720c1da3f75f66a78e3ea09bb86c1182b72fb6d Reviewed-by: Samuli Piippo --- conf/local.conf.sample | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 474db68..595aaae 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -39,18 +39,14 @@ # These two options control how much parallelism BitBake should use. The first # option determines how many tasks bitbake should run in parallel: # -BB_NUMBER_THREADS ?= "4" -# # Default to setting automatically based on cpu count -#BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" +BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}" # # The second option controls how many processes make should run in parallel when # running compile tasks: # -PARALLEL_MAKE ?= "-j 4" -# # Default to setting automatically based on cpu count -#PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" +PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}" # # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would # be appropriate for example. -- cgit v1.2.3-54-g00ecf From 3618c618c88eb1e95c3394c03bec691cea3796a7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 11 Jun 2015 15:26:16 +0300 Subject: qt5: no need to specify qt version the include file was removed from upstream meta-qt5 Change-Id: I81d3e70bff8550e186057ff473ff0fb394373128 Reviewed-by: Eirik Aavitsland --- conf/distro/b2qt.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 86aab7d..1cfcac2 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -57,7 +57,4 @@ IMAGE_FSTYPES = "tar.gz" LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" -QT5_VERSION = "5.4.1" -include conf/distro/include/qt5-versions.inc - include conf/distro/include/${MACHINE}.conf -- cgit v1.2.3-54-g00ecf From 5b366a1bbf220a0fb5774f30b0bcf9d9ac30d992 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Jun 2015 13:28:51 +0300 Subject: fonts: update checksums for otf-noto Google has updated the noto fonts to 1.003 Change-Id: I8eaa0e97c1606f104c09f67cb2b5da8f3ddfcb0d Reviewed-by: Eirik Aavitsland --- recipes/fonts/otf-noto.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index 266010c..f30858e 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -9,10 +9,11 @@ INHIBIT_DEFAULT_DEPS = "1" inherit allarch fontcache +PV = "1.003" SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" -SRC_URI[md5sum] = "9c59b0a684b03d3220dc05c6f7d4a097" -SRC_URI[sha256sum] = "c815b154a57877bfc3c9baa9650f22217e509bddc73f5433f640d875ae6f35e0" +SRC_URI[md5sum] = "88234bce857b885e14878e90c3b39b6e" +SRC_URI[sha256sum] = "c43825352ce901f3ae638f3f20b0ac5995529caf2f4e3ac54148bd20a567179e" do_install() { install -m 0644 -d ${D}${datadir}/fonts/otf/noto -- cgit v1.2.3-54-g00ecf From 1bbd0fb4808f1ba64678c807d60717dc4127b993 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Jun 2015 10:40:56 +0300 Subject: Change how meta-qt5 repo is used with init script The manifest.xml and manifest_dizzy.xml no longer checkouts the meta-qt5 repo, but the init script expects it to exists next to the meta-b2qt repo. This will then work with BYOS where both meta layer are available. For internal use, add manifest_qt5.xml, which checkouts the meta-qt5 repo from internal playground server. Change-Id: Id00f18de80ca11ee4813248bc2a84861df265b6f Reviewed-by: Eirik Aavitsland --- b2qt-init-build-env | 4 ++++ scripts/manifest.xml | 8 +------- scripts/manifest_dizzy.xml | 8 +------- scripts/manifest_qt5.xml | 13 +++++++++++++ 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 scripts/manifest_qt5.xml diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 83776eb..2dfed01 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -153,6 +153,10 @@ init() { ln -s ${DIR} sources/meta-b2qt fi + if [ ! -e "sources/meta-qt5" ] && [ -e "${DIR}/../meta-qt5" ]; then + ln -s $(readlink -f ${DIR}/../meta-qt5) sources/meta-qt5 + fi + cp ${DIR}/scripts/setup-environment.sh . } diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 2a39879..4a88a1b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -1,16 +1,14 @@ - + - - - - + - - - + + + + + + + + + -- cgit v1.2.3-54-g00ecf From 3962b0d28716af53e6d0343f85bccaec22187d2c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Jun 2015 12:02:43 +0300 Subject: Include Qt recipes only when meta-qt5 layer is used If the meta-qt5 layer is not included in the BBLAYERS, then do not include our additional qt recipes from recipes-qt. This way meta-b2qt can be used with meta-qt5 just to build the base images/toolchain. By default, all bblayers.conf templates include meta-qt5, so it needs to be remove first to use this feature. Change-Id: I73b8f0e65a6f4f950498097a4801ba5f5325cd7d Reviewed-by: Eirik Aavitsland --- conf/layer.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index ea30841..404957f 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -24,9 +24,10 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ - ${LAYERDIR}/recipes*/*/*.bbappend \ +BBFILES += "${LAYERDIR}/recipes/*/*.bb \ + ${LAYERDIR}/recipes/*/*.bbappend \ " +BBFILES += "${@bb.utils.contains("BBFILE_COLLECTIONS", "qt5-layer", "${LAYERDIR}/recipes-qt/*/*.bb ${LAYERDIR}/recipes-qt/*/*.bbappend" , "", d)}" BBFILE_COLLECTIONS += "b2qt" BBFILE_PATTERN_b2qt := "^${LAYERDIR}/" -- cgit v1.2.3-54-g00ecf From 455e002444b5c293fbdc4e6ba2a20d7c26d0e995 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2015 09:34:12 +0300 Subject: Handle missing meta-qt5 layer If meta-qt5 layer is not available, remove it from bblayer.conf as well. When using --device qt5, use the pinned revisions of other meta layer repos. Change-Id: I42f12d9725f3871a49b81b711b5f97037c4febd0 Reviewed-by: Eirik Aavitsland --- scripts/manifest_qt5.xml | 2 +- scripts/setup-environment.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index fce17e0..fbd5069 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml @@ -1,7 +1,7 @@ - + diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 26c374d..686a65c 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -79,6 +79,10 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then mkdir -p ${PWD}/${BUILDDIRECTORY}/conf cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf + if [ ! -d ${PWD}/sources/meta-qt5 ]; then + sed -i -e '/meta-qt5/d' ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf + fi + if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../) fi -- cgit v1.2.3-54-g00ecf From b4af4fa985035f6f530ea78a2b9530347692150e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Jun 2015 13:53:58 +0300 Subject: Update to using Qt 5.5 Changes required to support Qt 5.5. - eglfs hooks are now plugins - disable Qt .bbappends from meta-fsl-extra - include qt3d and qtcanvas3d to image - remove QtQuickEnterpriseControls - use Qt Quick Compiler 3.0 - update Qt VKB sha1 - use 5.5 branch from meta-qt5 (playground repo) Change-Id: I6fe830ee1edf6937c40ddedba06fdf1694f9dacc Reviewed-by: Eirik Aavitsland --- conf/distro/include/apalis-imx6.conf | 1 + conf/distro/include/colibri-imx6.conf | 1 + conf/distro/include/imx53qsb.conf | 2 + conf/distro/include/imx6.inc | 2 + conf/distro/include/imx6qsabresd.conf | 2 + conf/distro/include/nitrogen6x.conf | 2 + conf/distro/include/toradex.inc | 3 +- .../packagegroup-b2qt-embedded-qt5-addons.bb | 2 - ...kagegroup-b2qt-embedded-qt5-toolchain-target.bb | 3 +- .../packagegroup-b2qt-embedded-qt5.bb | 4 +- recipes-qt/qt5-addons/qtquickcompiler_2.0.bb | 44 ---------------------- recipes-qt/qt5-addons/qtquickcompiler_3.0.bb | 44 ++++++++++++++++++++++ recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 2 +- recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri | 2 +- recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri | 3 +- scripts/manifest_qt5.xml | 2 +- 16 files changed, 65 insertions(+), 54 deletions(-) create mode 100644 conf/distro/include/imx6.inc delete mode 100644 recipes-qt/qt5-addons/qtquickcompiler_2.0.bb create mode 100644 recipes-qt/qt5-addons/qtquickcompiler_3.0.bb diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index ee811be..c1e9c1b 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -21,6 +21,7 @@ ############################################################################# include conf/distro/include/toradex.inc +include conf/distro/include/imx6.inc KERNEL_IMAGETYPE = "uImage" diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 1171c5f..8a048b1 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -21,6 +21,7 @@ ############################################################################# include conf/distro/include/toradex.inc +include conf/distro/include/imx6.inc KERNEL_IMAGETYPE = "uImage" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 7154b6f..457f168 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc new file mode 100644 index 0000000..5cb3814 --- /dev/null +++ b/conf/distro/include/imx6.inc @@ -0,0 +1,2 @@ +BBMASK ?= " " +BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 83fc812..74b22d3 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index af1f869..d9a11ab 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 67c5c75..5256eb4 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -1 +1,2 @@ -BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" +BBMASK ?= " " +BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb index 3ba3f83..76c4430 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-addons.bb @@ -29,8 +29,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ qtdatavisualization \ - qtquickenterprisecontrols \ - qtquickenterprisecontrols-fonts \ qtcharts \ qtvirtualkeyboard \ b2qt-appcontroller \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index a4fc1fa..0fb16ef 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -36,6 +36,7 @@ RDEPENDS_${PN} += " \ qt3d-dev \ qtbase-dev \ qtbase-staticdev \ + qtcanvas3d \ qtconnectivity-dev \ qtdeclarative-dev \ qtdeclarative-staticdev \ @@ -50,9 +51,9 @@ RDEPENDS_${PN} += " \ qttools-dev \ qttools-staticdev \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ qtwebsockets-dev \ qtwebchannel-dev \ qtxmlpatterns-dev \ qtquickcontrols-dev \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index c09d245..93785a0 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -28,8 +28,10 @@ inherit packagegroup PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ + qt3d \ qtbase \ qtbase-fonts \ + qtcanvas3d \ qtconnectivity \ qtdeclarative \ qtdeclarative-tools \ @@ -41,8 +43,8 @@ RDEPENDS_${PN} += " \ qtserialport \ qtsvg \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ qtwebsockets \ qtxmlpatterns \ qtquickcontrols \ - ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ " diff --git a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb deleted file mode 100644 index fd7e8be..0000000 --- a/recipes-qt/qt5-addons/qtquickcompiler_2.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Qt Quick Compiler" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6" - -inherit qt5-module - -SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${QT_BRANCH};protocol=ssh;name=compiler;destsuffix=git \ - git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${QT_BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ - " - -SRCREV_compiler = "60c13275dec85d8224ea5826ae5533d87c65e76e" -QT_BRANCH_compiler = "2.0" - -SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" -QT_BRANCH_sdk = "master" - -S = "${WORKDIR}/git" - -DEPENDS = "qtbase qtdeclarative" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb new file mode 100644 index 0000000..6f9fa30 --- /dev/null +++ b/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Qt Quick Compiler" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://compiler/qtquickcompiler.h;md5=553f8ee8d120874969caca3193ae686c;beginline=1;endline=6" + +inherit qt5-module + +SRC_URI = " \ + git://qt-gerrit.ci.local/QtRD-15810/qmlcompiler.git;branch=${BRANCH};protocol=ssh;name=compiler;destsuffix=git \ + git://qt-gerrit.ci.local/QtRD-15810/qtsdk-enterprise.git;branch=${BRANCH};protocol=ssh;name=sdk;destsuffix=git/compiler/license-checker \ + " + +SRCREV_compiler = "cc3b348065e84242d772d53b5f9dcad88b0da33e" +BRANCH_compiler = "3.0" + +SRCREV_sdk = "60cb1a7763b670108b17c7e1345394e424153bea" +BRANCH_sdk = "master" + +S = "${WORKDIR}/git" + +DEPENDS = "qtbase qtdeclarative" + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 571792c..e66373d 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -32,7 +32,7 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ " -SRCREV = "b5f0a28522f2fcb916966bd0da0b86f2d93d2b97" +SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" QT_BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri index cf89ae6..f365169 100644 --- a/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/mx6/oe-device-extra.pri @@ -5,4 +5,4 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL QMAKE_CFLAGS += $$IMX6_CFLAGS QMAKE_CXXFLAGS += $$IMX6_CFLAGS -EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-imx6-g++/qeglfshooks_imx6.cpp +EGLFS_DEVICE_INTEGRATION = eglfs_viv diff --git a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri index bddd245..84488cb 100644 --- a/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/rpi/oe-device-extra.pri @@ -6,5 +6,4 @@ QMAKE_LIBS_EGL = -lEGL -lGLESv2 QMAKE_CFLAGS += $$RPI_CFLAGS QMAKE_CXXFLAGS += $$RPI_CFLAGS -EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp -EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host +EGLFS_DEVICE_INTEGRATION = eglfs_brcm diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index fbd5069..1a50a10 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml @@ -7,7 +7,7 @@ -- cgit v1.2.3-54-g00ecf From 254c36c96a261e2bd47c3b77f02c5fcef01002ae Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Jun 2015 09:58:12 +0300 Subject: Remove webengine from lesser machines QtWebEngine does not build on these machines at the moment. Change-Id: Ide7865df10e2af5218b703856ac2b67f0668c1c4 Reviewed-by: Eirik Aavitsland --- conf/distro/include/am335x-evm.conf | 2 ++ conf/distro/include/beaglebone.conf | 2 ++ conf/distro/include/imx53qsb.conf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 3c32f49..d8ae042 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -26,6 +26,8 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +DISTRO_FEATURES_remove = "webengine" + PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index dea5330..93cd569 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -24,6 +24,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" EXTRA_IMAGEDEPENDS += "u-boot-uenv-script" +DISTRO_FEATURES_remove = "webengine" + PREFERRED_VERSION_libgles-omap3 = "4.10.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01" diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 457f168..13eb70e 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf @@ -28,6 +28,8 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ amd-gpu-bin-mx51 \ " -- cgit v1.2.3-54-g00ecf From 0a103d9d54a53f0c6410f093857fd06f7755446b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Jun 2015 16:27:06 +0300 Subject: tibidabo: add needed imx6 BBMASK Change-Id: I7e7027e2d8aa301933dd4ef0e1a4ee3049b370e4 Reviewed-by: Eirik Aavitsland --- conf/distro/include/tibidabo.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf index abe47cb..cb8e019 100644 --- a/conf/distro/include/tibidabo.conf +++ b/conf/distro/include/tibidabo.conf @@ -20,6 +20,8 @@ ## ############################################################################# +include conf/distro/include/imx6.inc + KERNEL_IMAGETYPE = "uImage" BOOTFS_CONTENT = "\ -- cgit v1.2.3-54-g00ecf From 6d7941b077af9c2fd9ecefa67bc1bcab8f50a343 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2015 13:51:48 +0300 Subject: b2qt-demos: include qtcanvas3d planets demo Change-Id: I86701ec160bcb0f90bb9d7ed22ec683ed7e261aa Reviewed-by: Eirik Aavitsland --- recipes-qt/b2qt-addons/b2qt-demos.bb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 8cc8116..6a05ca3 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -27,18 +27,20 @@ LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db9 inherit qmake5 SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos \ git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ + git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \ " -QT_BRANCH = "dev" -SRCREV_demos = "d6979299a7809e5b832738c4cf39bba2c9a185eb" +BRANCH = "dev" +QT_BRANCH = "5.5.0" +SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702" SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" -GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" +SRCREV_qtcanvas3d = "0f5e0a235e942e5b274fca7158ac179141014c0a" S = "${WORKDIR}/git/basicsuite" -DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia \ +DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtcanvas3d \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { @@ -55,6 +57,18 @@ do_install_append() { # we can't have several top-level windows in b2qt, replace Window -> Rectangle sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml + + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.qml ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/*.js ${D}/data/user/qt/canvas3d-planets + cp -r ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/planets/images ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/threejs/controls/ControlEventSource.qml ${D}/data/user/qt/canvas3d-planets + cp ${WORKDIR}/qtcanvas3d/examples/canvas3d/canvas3d/3rdparty/*.js ${D}/data/user/qt/canvas3d-planets + + # get rid of qrc:/ prefixes and the custom slider + sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.qml + sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.js + sed -i 's/StyledSlider/Slider/g' ${D}/data/user/qt/canvas3d-planets/planets.qml + sed -i '39 i import QtQuick.Controls 1.2' ${D}/data/user/qt/canvas3d-planets/planets.qml } FILES_${PN} += " \ -- cgit v1.2.3-54-g00ecf From e11d78a554a184767383758185a3902e4d6c986d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Jun 2015 15:43:26 +0300 Subject: Support BYOS for enterprise only addons When QT_SDK_PATH has been set, use sources for all enterprise addons from the SDK installation path. This allows customers to build enterprise only addos and b2qt addons without access to qt-gerrit. Change-Id: I66ad8a2ff81628333ba7dd6042659c3fa220be8c Reviewed-by: Eirik Aavitsland --- classes/local-sources.bbclass | 81 --------------------- classes/sdk-sources.bbclass | 90 ++++++++++++++++++++++++ recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 8 +-- recipes-qt/b2qt-addons/b2qt-demos.bb | 13 ++-- recipes-qt/b2qt-addons/b2qt-launcher.bb | 6 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 6 +- recipes-qt/qt5-addons/qtcharts_2.0.bb | 7 +- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 6 +- recipes-qt/qt5-addons/qtglesstream.bb | 4 +- recipes-qt/qt5-addons/qtquick2drenderer.bb | 7 +- recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 9 ++- 11 files changed, 126 insertions(+), 111 deletions(-) delete mode 100644 classes/local-sources.bbclass create mode 100644 classes/sdk-sources.bbclass diff --git a/classes/local-sources.bbclass b/classes/local-sources.bbclass deleted file mode 100644 index b7c68fb..0000000 --- a/classes/local-sources.bbclass +++ /dev/null @@ -1,81 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -python do_fetch () { - src_uri = (d.getVar('SRC_URI', True) or "").split() - if len(src_uri) == 0: - return - - sdk_path = d.getVar('QT_SDK_PATH', True) or "" - if len(sdk_path) != 0: - uris = list(src_uri); - for url in uris: - ud = list(bb.fetch2.decodeurl(url)) - if ("local-uri" in ud[5]): - src_uri.remove(url) - - try: - fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.download() - except bb.fetch2.BBFetchException as e: - raise bb.build.FuncFailed(e) -} - -python do_unpack () { - src_uri = (d.getVar('SRC_URI', True) or "").split() - if len(src_uri) == 0: - return - - rootdir = d.getVar('WORKDIR', True) - - sdk_path = d.getVar('QT_SDK_PATH', True) or "" - if len(sdk_path) != 0: - uris = list(src_uri); - for url in uris: - ud = list(bb.fetch2.decodeurl(url)) - if ("local-uri" in ud[5]): - unpack_local_uri(ud, d) - src_uri.remove(url) - - try: - fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) - except bb.fetch2.BBFetchException as e: - raise bb.build.FuncFailed(e) -} - -def unpack_local_uri(ud, d): - import subprocess - rootdir = d.getVar('WORKDIR', True) - sdk_path = d.getVar('QT_SDK_PATH', True) - - destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) - srcdir = os.path.join(sdk_path, ud[5].get("local-uri")) - cmd = "cp -vrf %s %s" % (srcdir, destdir) - - if os.path.exists(destdir): - bb.utils.prunedir(destdir) - - ret = subprocess.call(cmd, shell=True) - - if ret != 0: - raise bb.fetch.UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud) diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass new file mode 100644 index 0000000..1c3629b --- /dev/null +++ b/classes/sdk-sources.bbclass @@ -0,0 +1,90 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +python do_fetch () { + src_uri = (d.getVar('SRC_URI', True) or "").split() + if len(src_uri) == 0: + return + + sdk_path = d.getVar('QT_SDK_PATH', True) or "" + if len(sdk_path) != 0: + uris = list(src_uri); + for url in uris: + ud = list(bb.fetch2.decodeurl(url)) + if ("sdk-uri" in ud[5]): + src_uri.remove(url) + + + if len(src_uri) == 0: + return + + try: + fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher.download() + except bb.fetch2.BBFetchException as e: + raise bb.build.FuncFailed(e) +} + +python do_unpack () { + src_uri = (d.getVar('SRC_URI', True) or "").split() + if len(src_uri) == 0: + return + + rootdir = d.getVar('WORKDIR', True) + + sdk_path = d.getVar('QT_SDK_PATH', True) or "" + if len(sdk_path) != 0: + uris = list(src_uri); + for url in uris: + ud = list(bb.fetch2.decodeurl(url)) + if ("sdk-uri" in ud[5]): + unpack_local_uri(ud, d) + src_uri.remove(url) + + if len(src_uri) == 0: + return + + try: + fetcher = bb.fetch2.Fetch(src_uri, d) + fetcher.unpack(rootdir) + except bb.fetch2.BBFetchException as e: + raise bb.build.FuncFailed(e) +} + +def unpack_local_uri(ud, d): + import subprocess + rootdir = d.getVar('WORKDIR', True) + sdk_path = d.getVar('QT_SDK_PATH', True) + + destdir = os.path.join(rootdir, ud[5].get("destsuffix", "git")) + srcdir = os.path.join(sdk_path, ud[5].get("sdk-uri")) + cmd = "cp -vrf %s %s" % (srcdir, destdir) + + bb.note("Unpacking SDK sources %s to %s" % (srcdir, destdir)) + + if os.path.exists(destdir): + bb.utils.prunedir(destdir) + + ret = subprocess.call(cmd, shell=True) + + if ret != 0: + raise bb.fetch.UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index 26d631c..1c0ab2f 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -24,15 +24,15 @@ DESCRIPTION = "Boot to Qt Appcontroller" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" -inherit qmake5 +inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-appcontroller;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-appcontroller/ \ file://appcontroller.conf \ " -SRCREV = "cac8839211fc5bb53592d3d04c344834c4c054df" -QT_BRANCH = "stable" +SRCREV = "45d549fe274cd8f16578b2ff9a34af40fd9b98a9" +BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 6a05ca3..c262b65 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -24,13 +24,14 @@ DESCRIPTION = "Boot to Qt Demos" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" -inherit qmake5 +inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \ git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \ " + BRANCH = "dev" QT_BRANCH = "5.5.0" SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702" @@ -49,8 +50,12 @@ do_install_append() { rm -rf ${D}/data/user/sensorexplorer cp -r ${S}/* ${D}/data/user/qt/ - cp -r ${S}/../images ${D}/data/ - cp -r ${S}/../videos ${D}/data/ + if [ -d ${S}/../images ]; then + cp -r ${S}/../images ${D}/data/ + fi + if [ -d ${S}/../videos ]; then + cp -r ${S}/../videos ${D}/data/ + fi cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/ diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 7e89289..c9a1743 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -24,15 +24,15 @@ DESCRIPTION = "Boot to Qt Demo Launcher" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" -inherit qmake5 +inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-launcher \ file://b2qt-startup.sh \ " SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4" -QT_BRANCH = "dev" +BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index e694b5a..b9e20b9 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -24,14 +24,14 @@ DESCRIPTION = "Boot to Qt Utils module" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" -inherit qt5-module +inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/b2qt-utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ " SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f" -QT_BRANCH = "dev" +BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 83d6905..805c8fc 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -24,14 +24,15 @@ DESCRIPTION = "Qt Charts" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" -inherit qt5-module qtquickcompiler +inherit qt5-module qtquickcompiler sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/charts.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/charts.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/Charts/2.0/Src \ " +# v2.0.0 SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" -QT_BRANCH = "master" +BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index 76df896..d7edbb5 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -24,15 +24,15 @@ DESCRIPTION = "Qt Data Visualization" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_p.h;md5=b6f0a53c44e6ba165a7d2dbd58832be5;beginline=1;endline=17" -inherit qt5-module +inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtdatavis3d.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtdatavis3d.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtDataVisualization/1.2/Src \ " # v1.2.0 SRCREV = "62f90e25eec23cfac83985993f355feeac5b9f2c" -QT_BRANCH = "master" +BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 475b869..c1922af 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -27,12 +27,12 @@ LIC_FILES_CHKSUM = "file://qtglesstream.pro;md5=e95d9351d26ed899188e02d44133cae0 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtglesstream.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtglesstream.git;branch=${BRANCH};protocol=ssh \ " PV = "1.0.0" SRCREV = "137d476b0e39eaaa6f35296b6bd962175e6ea5d6" -QT_BRANCH = "dev" +BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtquick2drenderer.bb b/recipes-qt/qt5-addons/qtquick2drenderer.bb index 59fd2fe..24aff5c 100644 --- a/recipes-qt/qt5-addons/qtquick2drenderer.bb +++ b/recipes-qt/qt5-addons/qtquick2drenderer.bb @@ -24,14 +24,15 @@ DESCRIPTION = "Qt Quick 2D Rendender" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer.cpp;md5=d90663d6d3096fe0989549d52fec6554;beginline=1;endline=17" -inherit qt5-module +inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/scenegraph-raster.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtQuick2DRenderer/1.1/Src \ " +# v1.1 SRCREV = "97c310f3a18a5aaebf8c102ceaba1f6a093faf6b" -QT_BRANCH = "master" +BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index e66373d..17dd871 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -24,16 +24,15 @@ DESCRIPTION = "Qt Virtual Keyboard" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd857aa1538823b6;beginline=1;endline=17" -inherit qt5-module qtquickcompiler - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +inherit qt5-module qtquickcompiler sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${QT_BRANCH};protocol=ssh \ + git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ " +# v1.3.0 SRCREV = "ad517b66fc4aadb2807951f182552a1b161d9c95" -QT_BRANCH = "master" +BRANCH = "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 0005cccfa7fb937028a59ef757eb7b26926f968c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 17 Jun 2015 11:58:37 +0300 Subject: Remove recipe for QtQuick Enteprise Controls No longer needed as it was merged to QtQuick Controls Change-Id: Iee7f43f75aa5e202ec9842ed3a16cc49602e3d18 Reviewed-by: Eirik Aavitsland --- .../qt5-addons/qtquickenterprisecontrols_1.3.bb | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb diff --git a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb b/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb deleted file mode 100644 index 67c3efd..0000000 --- a/recipes-qt/qt5-addons/qtquickenterprisecontrols_1.3.bb +++ /dev/null @@ -1,65 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Qt Quick Enterprise Controls" -LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/controls/Styles/Base/DialStyle.qml;md5=caa6d9db463140360114e567721eb580;beginline=1;endline=17" - -inherit qt5-module - -SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtquick-extras.git;branch=${QT_BRANCH};protocol=ssh \ - " - -SRCREV = "ed6f7049e06717113d5f500595c5a1f2074fb13d" -QT_BRANCH = "master" - -S = "${WORKDIR}/git" - -PACKAGES += "${PN}-fonts" - -RRECOMMENDS_${PN} = "${PN}-fonts" - -DEPENDS += "qtbase qtdeclarative qtgraphicaleffects" - -FILES_${PN}-fonts += " \ - /usr/lib/qt5/qml/QtQuick/Controls/Styles/Flat/fonts \ - " -FILES_${PN} += " \ - /opt/dashboard/bin/dashboard \ - /opt/gallery/bin/gallery \ - " -FILES_${PN}-dbg += " \ - /opt/dashboard/bin/.debug \ - /opt/gallery/bin/.debug \ - " -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*.qml \ - ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/designer/* \ - ${OE_QMAKE_PATH_QML}/QtQuick/Enterprise/Controls/Styles/*/*/* \ - " -FILES_${PN}-examples += " \ - /opt/flat/bin/flat \ - " -FILES_${PN}-examples-dbg += " \ - /opt/flat/bin/.debug \ - " -- cgit v1.2.3-54-g00ecf From 0cf281fdd678ea57b34bd9c7e5c48dc421d290ae Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Jun 2015 15:57:53 +0300 Subject: qtquickcompiler: disable for BYOS QtQuickCompiler sources are not distributed, so for BYOS builds we need to disable. For now, only print note that it's not supported. Next step is to try to use the precompiled version from SDK. Change-Id: I8185e66fd2bc6471218ee3ea8520fa40c2c08592 Reviewed-by: Eirik Aavitsland --- classes/qtquickcompiler.bbclass | 45 ++++++++++++++++------ ...ackagegroup-b2qt-embedded-qt5-toolchain-host.bb | 3 +- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index 202d592..1478741 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -1,13 +1,34 @@ -EXTRA_QMAKEVARS_PRE += "CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend" +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# -DEPENDS_prepend = "qtquickcompiler qtquickcompiler-native " - -#python __anonymous() { -# do the magic: -# if QT_SDK path is set, -# add dependency to qtquickcompiler-sdk-native package that -# copies the needed files (binary and mkspec files) from the SDK -# else -# add dependency to qtquickcompiler-native package that -# builds it from internal repos -#} +python __anonymous() { + sdk_path = d.getVar('QT_SDK_PATH', True) or "" + if len(sdk_path) != 0: + bb.note("TODO: QtQuickCompiler not yet available for external builds") + else: + pn = d.getVar("PN", True) + if pn.startswith("nativesdk-"): + d.appendVar('RDEPENDS_' + pn, " nativesdk-qtquickcompiler-tools") + else: + d.appendVar('DEPENDS', " qtquickcompiler qtquickcompiler-native") + d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") +} diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index b424fb7..0437c42 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -24,12 +24,11 @@ DESCRIPTION = "Host packages for B2Qt embedded Qt5 SDK" LICENSE = "QtEnterprise" PR = "r0" -inherit nativesdk packagegroup +inherit nativesdk packagegroup qtquickcompiler RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qttools \ nativesdk-qtbase-tools \ nativesdk-qtbase-tools-staticdev \ - nativesdk-qtquickcompiler-tools \ " -- cgit v1.2.3-54-g00ecf From eb2eb7ce5d43d623d7d4ff1bd7a584feafc38fe8 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Wed, 10 Jun 2015 16:29:42 +0200 Subject: Increase CMA reserved size on nitrogen6x. Increased from 256MB (the default) to 384MB. Without this, HW-accelerated video decoding cannot work for high resolution videos. The same might have to be done on other iMX devices. Change-Id: I202ee246d59ded0343a93b6bdf221bd69fcd22c5 Reviewed-by: Laszlo Agocs --- ...itrogen6x-disable-console-cursor-blinking.patch | 25 -------------------- .../0001-nitrogen6x-update-bootargs.patch | 27 ++++++++++++++++++++++ .../u-boot/u-boot-script-boundary_git.bbappend | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) delete mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch deleted file mode 100644 index d97921c..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 10 Jan 2014 12:37:20 +0200 -Subject: [PATCH] nitrogen6x: disable console cursor blinking - ---- - board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -index d933fa0..2d7c575 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt -@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do - done - - setenv bootargs $bootargs $fbmem --setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait" -+setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait" - - if itest.s x$bootpart == x ; then - bootpart=1 --- -1.7.10.4 - diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch new file mode 100644 index 0000000..f42b213 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-update-bootargs.patch @@ -0,0 +1,27 @@ +From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001 +From: Yoann Lopes +Date: Wed, 10 Jun 2015 16:36:10 +0100 +Subject: [PATCH] nitrogen6x: update bootargs. + +- disable console cursor blinking +- set CMA reserved size to 384MB +--- + board/boundary/nitrogen6x/6x_bootscript-yocto.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +index d933fa0..2d7c575 100644 +--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt ++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt +@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do + done + + setenv bootargs $bootargs $fbmem +-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait" ++setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 cma=384M rootwait" + + if itest.s x$bootpart == x ; then + bootpart=1 +-- +1.7.10.4 + diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend index 1a0fe52..abbc222 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -22,6 +22,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ - file://0001-nitrogen6x-disable-console-cursor-blinking.patch \ + file://0001-nitrogen6x-update-bootargs.patch \ file://0002-nitrogen6x-update.patch \ " -- cgit v1.2.3-54-g00ecf From 6bff46162db6cc701efa7fe8255fea81076b6b03 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 18 Jun 2015 14:59:49 +0300 Subject: b2qt-demos: add QtQuick Controls demos Change-Id: I2d8768fe42da8bbc5c6b730676b70f56232826ca Reviewed-by: Laszlo Agocs --- recipes-qt/b2qt-addons/b2qt-demos.bb | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index c262b65..f051485 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -30,13 +30,15 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \ git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \ + git://code.qt.io/qt/qtquickcontrols.git;branch=${QT_BRANCH};protocol=git;name=qtquickcontrols;destsuffix=qtquickcontrols \ " BRANCH = "dev" QT_BRANCH = "5.5.0" -SRCREV_demos = "dcc6470466f8237cc46ac1ac39e865ec2568d702" +SRCREV_demos = "de50ff5dbf2f789786e25540ba0b0efc8c68e0f9" SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" -SRCREV_qtcanvas3d = "0f5e0a235e942e5b274fca7158ac179141014c0a" +SRCREV_qtcanvas3d = "debe68a85b571b70e2fe0824e5ed40484a72c216" +SRCREV_qtquickcontrols = "b4dc4a98d5deffbbb30f7011f6c0d3d10f430b98" S = "${WORKDIR}/git/basicsuite" @@ -74,6 +76,28 @@ do_install_append() { sed -i 's/qrc:\(\/\)\?//g' ${D}/data/user/qt/canvas3d-planets/*.js sed -i 's/StyledSlider/Slider/g' ${D}/data/user/qt/canvas3d-planets/planets.qml sed -i '39 i import QtQuick.Controls 1.2' ${D}/data/user/qt/canvas3d-planets/planets.qml + + # Qt Quick Extras + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/dashboard/qml ${D}/data/user/qt/enterprise-dashboard/ + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/dashboard/images ${D}/data/user/qt/enterprise-dashboard/ + + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/qml ${D}/data/user/qt/enterprise-gallery/ + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/images ${D}/data/user/qt/enterprise-gallery/ + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/gallery/fonts ${D}/data/user/qt/enterprise-gallery/ + + cp -r ${WORKDIR}/qtquickcontrols/examples/quick/extras/flat/images ${D}/data/user/qt/enterprise-flat-controls/ + cp ${WORKDIR}/qtquickcontrols/examples/quick/extras/flat/*.qml ${D}/data/user/qt/enterprise-flat-controls/ + + sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/enterprise-dashboard/qml/dashboard.qml ${D}/data/user/qt/enterprise-gallery/qml/gallery.qml + sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/enterprise-dashboard/qml/dashboard.qml ${D}/data/user/qt/enterprise-gallery/qml/gallery.qml + sed -i 's/ApplicationWindow /Rectangle /1' ${D}/data/user/qt/enterprise-flat-controls/main.qml + sed -i '/title: "Qt Quick Extras Demo"/c\' ${D}/data/user/qt/enterprise-dashboard/qml/dashboard.qml ${D}/data/user/qt/enterprise-gallery/qml/gallery.qml + sed -i '/title: "Flat Example"/c\' ${D}/data/user/qt/enterprise-flat-controls/main.qml + sed -i 's/"Light Flat UI Demo"/"Qt Quick Controls"/1' ${D}/data/user/qt/enterprise-flat-controls/main.qml + sed -i '/{ name: "Exit", action: null }/c\' ${D}/data/user/qt/enterprise-flat-controls/main.qml + + sed -i -e 's/qrc:/../g' ${D}/data/user/qt/enterprise-dashboard/qml/* ${D}/data/user/qt/enterprise-gallery/qml/* + sed -i 's/qrc:\///g' ${D}/data/user/qt/enterprise-flat-controls/Content.qml } FILES_${PN} += " \ -- cgit v1.2.3-54-g00ecf From 43c3f03b7e9e1daf7ba408c704062a16c632a7da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Mar 2015 10:15:32 +0300 Subject: gstreamer: make gstreamer version a DISTRO_FEATURE GStreamer version can now be changed using a DISTRO_FEATURE: 'gstreamer010' for GStreamer 0.10 and 'gstreamer' for GStreamer 1.0 This can also be used to remove all gstreamer packages from image and toolchain. Default version is still the old 0.10 Change-Id: I54b19962ccd0dfd2f71bb44e231bf5af43ccfab9 Reviewed-by: Eirik Aavitsland --- conf/distro/b2qt.conf | 6 +-- conf/distro/include/apalis-imx6.conf | 3 +- conf/distro/include/colibri-imx6.conf | 2 + conf/distro/include/imx6qsabresd.conf | 3 +- conf/distro/include/nitrogen6x.conf | 3 +- conf/distro/include/tibidabo.conf | 3 +- recipes-qt/images/b2qt-embedded-qt5-image.bb | 3 +- recipes-qt/qt5/qtmultimedia_%.bbappend | 2 +- .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 1 + .../gstreamer/gstreamer1.0-plugins-ugly_%.bbappend | 1 + recipes/images/b2qt-embedded-image.bb | 3 +- .../packagegroup-b2qt-embedded-gstreamer.bb | 32 +++--------- .../packagegroup-b2qt-embedded-gstreamer010.bb | 59 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-toolchain-target.bb | 4 +- 14 files changed, 89 insertions(+), 36 deletions(-) create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend create mode 100644 recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend create mode 100644 recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 1cfcac2..ac635d8 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -42,12 +42,12 @@ DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" +# use GStreamer 0.10, optionally change to "gstreamer" to use GStreamer 1.0 +DISTRO_FEATURES += "gstreamer010" + PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" -COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" -COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" - MACHINE_EXTRA_INSTALL ?= "" MACHINE_EXTRA_INSTALL_SDK ?= "" MACHINE_EXTRA_INSTALL_SDK_HOST ?= "" diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index c1e9c1b..2ceb4fe 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -39,7 +39,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 8a048b1..f0b6179 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -37,6 +37,8 @@ MACHINE_EXTRA_INSTALL = "\ libegl-mx6 \ libgles2-mx6 \ gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 74b22d3..c677500 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -40,7 +40,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ libopencv-core \ libopencv-imgproc \ libopencv-objdetect \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index d9a11ab..819960d 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -54,7 +54,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ bcm4330-nvram-config \ libopencv-core \ libopencv-imgproc \ diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf index cb8e019..cec9fd5 100644 --- a/conf/distro/include/tibidabo.conf +++ b/conf/distro/include/tibidabo.conf @@ -34,7 +34,8 @@ MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ - gst-fsl-plugin \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb index daaa6e4..924ba61 100644 --- a/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb @@ -42,7 +42,8 @@ IMAGE_INSTALL += "\ ${MACHINE_EXTRA_INSTALL_QT} \ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - packagegroup-b2qt-embedded-gstreamer \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ packagegroup-b2qt-embedded-qt5 \ packagegroup-b2qt-embedded-qt5-addons \ " diff --git a/recipes-qt/qt5/qtmultimedia_%.bbappend b/recipes-qt/qt5/qtmultimedia_%.bbappend index cb1dc53..0c2560a 100644 --- a/recipes-qt/qt5/qtmultimedia_%.bbappend +++ b/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -20,4 +20,4 @@ ## ############################################################################# -PACKAGECONFIG += "gstreamer010" +PACKAGECONFIG += "${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer010", "gstreamer", d)}" diff --git a/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend new file mode 100644 index 0000000..1c5cc7c --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " faad" diff --git a/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend new file mode 100644 index 0000000..eee313b --- /dev/null +++ b/recipes/gstreamer/gstreamer1.0-plugins-ugly_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " x264" diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 9b452c6..d8e55ef 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb @@ -38,5 +38,6 @@ inherit bootfs-image IMAGE_INSTALL += "\ packagegroup-b2qt-embedded-base \ packagegroup-b2qt-embedded-tools \ - packagegroup-b2qt-embedded-gstreamer \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index f9892dc..b76304e 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -27,28 +27,12 @@ PR = "r0" inherit packagegroup RDEPENDS_${PN} = "\ - gst-meta-video \ - gst-meta-audio \ - gst-plugins-good \ - gst-plugins-base-app \ - gst-plugins-base-audiorate \ - gst-plugins-base-videorate \ - gst-plugins-base-encodebin \ - gst-plugins-good-videofilter \ - gst-plugins-good-id3demux \ - gst-plugins-good-auparse \ - gst-plugins-good-isomp4 \ - gst-plugins-good-icydemux \ - gst-plugins-good-video4linux2 \ - gst-plugins-good-multifile \ - gst-plugins-good-videocrop \ - gst-plugins-good-jpeg \ - gst-plugins-ugly-rmdemux \ - gst-plugins-ugly-asf \ - gst-plugins-ugly-a52dec \ - gst-plugins-bad-mpegdemux \ - gst-plugins-bad-faad \ - gst-plugins-bad-camerabin2 \ - gst-plugins-bad-jpegformat \ - gst-ffmpeg \ + gstreamer1.0-meta-base \ + gstreamer1.0-meta-video \ + gstreamer1.0-meta-audio \ + gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-ugly-meta \ + gstreamer1.0-plugins-bad-meta \ + gstreamer1.0-libav \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb new file mode 100644 index 0000000..5567303 --- /dev/null +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer010.bb @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Additional gstreamer packagegroup for B2Qt embedded Linux image" +LICENSE = "CLOSED" +PR = "r0" + +inherit packagegroup + +RDEPENDS_${PN} = "\ + gst-meta-video \ + gst-meta-audio \ + gst-plugins-good \ + gst-plugins-base-app \ + gst-plugins-base-audiorate \ + gst-plugins-base-videorate \ + gst-plugins-base-encodebin \ + gst-plugins-good-videofilter \ + gst-plugins-good-id3demux \ + gst-plugins-good-auparse \ + gst-plugins-good-isomp4 \ + gst-plugins-good-icydemux \ + gst-plugins-good-video4linux2 \ + gst-plugins-good-multifile \ + gst-plugins-good-videocrop \ + gst-plugins-good-jpeg \ + gst-plugins-ugly-rmdemux \ + gst-plugins-ugly-asf \ + gst-plugins-ugly-a52dec \ + gst-plugins-bad-mpegdemux \ + gst-plugins-bad-faad \ + gst-plugins-bad-camerabin2 \ + gst-plugins-bad-jpegformat \ + gst-plugins-ugly-mad \ + gst-plugins-ugly-mpegaudioparse \ + gst-plugins-ugly-mpeg2dec \ + gst-plugins-ugly-mpegstream \ + gst-plugins-bad-mpegvideoparse \ + gst-ffmpeg \ + " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index 4d24c1e..b0b35d0 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -37,8 +37,8 @@ RDEPENDS_${PN} += "\ dbus-dev \ freetype-dev \ fontconfig-dev \ - gstreamer-dev \ - gst-plugins-base-dev \ + ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer-dev gst-plugins-base-dev", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-dev gstreamer1.0-plugins-base-dev", "", d)} \ icu-dev \ libxslt-dev \ udev-dev \ -- cgit v1.2.3-54-g00ecf From e217d621eb017ca8d5806aa730a5264b550ea6d7 Mon Sep 17 00:00:00 2001 From: Pasi Petäjäjärvi Date: Thu, 25 Jun 2015 13:54:23 +0300 Subject: fonts: update checksums for otf-noto Google has updated the noto fonts to 1.004 Change-Id: I2c0c5a842cec9f99d030402ac3b67056c69a9680 Reviewed-by: Eirik Aavitsland --- recipes/fonts/otf-noto.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/fonts/otf-noto.bb b/recipes/fonts/otf-noto.bb index f30858e..c207535 100644 --- a/recipes/fonts/otf-noto.bb +++ b/recipes/fonts/otf-noto.bb @@ -9,11 +9,11 @@ INHIBIT_DEFAULT_DEPS = "1" inherit allarch fontcache -PV = "1.003" +PV = "1.004" SRC_URI = "http://www.google.com/get/noto/pkgs/NotoSansCJKSC-hinted.zip" -SRC_URI[md5sum] = "88234bce857b885e14878e90c3b39b6e" -SRC_URI[sha256sum] = "c43825352ce901f3ae638f3f20b0ac5995529caf2f4e3ac54148bd20a567179e" +SRC_URI[md5sum] = "dc40e8af0b0178451ccc301f1d41e726" +SRC_URI[sha256sum] = "25143bb803ebb20fd17ffd1299012ee2f3a929182ff0700ab656c181872413a4" do_install() { install -m 0644 -d ${D}${datadir}/fonts/otf/noto -- cgit v1.2.3-54-g00ecf From c1a4551545d679cdef869dc6c63cceebc4a551d8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 1 Jul 2015 10:13:25 +0300 Subject: Use correct path for QT_SDK_PATH For BYOS builds, we need to have to the root folder of SDK in local.conf Change-Id: I91497a0eb215e57d8db92f5f4390478d688fc95f Reviewed-by: Kalle Viironen --- scripts/setup-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 686a65c..ce593c6 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -84,7 +84,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then fi if [ ! -d ${PWD}/sources/meta-b2qt/.git ]; then - QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../) + QT_SDK_PATH=$(readlink -f ${PWD}/sources/meta-b2qt/../../../../) fi fi -- cgit v1.2.3-54-g00ecf From c0c8f2ae255ba1f1884492b24f5906834d8b8ff8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 2 Jul 2015 13:59:00 +0300 Subject: Use correct versions for addons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtCharts and QtDataVisualization had an patch release with 5.5.0, which changed copyright headers. b2qt-utils updated to same sha1 as was used in b2qt-build-scripts. Change-Id: I51a6ac26e57e7fc71b0af7876a9d8005e4ce4b8d Reviewed-by: Pasi Petäjäjärvi Reviewed-by: Gatis Paeglis --- recipes-qt/b2qt-addons/b2qt-utils.bb | 2 +- recipes-qt/qt5-addons/qtcharts_2.0.bb | 6 +++--- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index b9e20b9..5521fa9 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -30,7 +30,7 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/b2qt-utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ " -SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f" +SRCREV = "602034c3a71c53d050e67101e070185cbcf7ccee" BRANCH = "dev" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 805c8fc..27fcf1d 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -22,7 +22,7 @@ DESCRIPTION = "Qt Charts" LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=735b3be820c0a733e328a4d2e1e430de;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=6e3e95df24951a6ec145dc5614d29cac;beginline=1;endline=17" inherit qt5-module qtquickcompiler sdk-sources @@ -30,8 +30,8 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/charts.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/Charts/2.0/Src \ " -# v2.0.0 -SRCREV = "f818972d3617493c74d694184aa877f606e1a5a0" +# v2.0.1 +SRCREV = "c6eddd6a7ac5a67f77f52eae3a074c85fbf525a9" BRANCH = "master" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index d7edbb5..a4e523c 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -22,7 +22,7 @@ DESCRIPTION = "Qt Data Visualization" LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_p.h;md5=b6f0a53c44e6ba165a7d2dbd58832be5;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_p.h;md5=5c8619ca9925b150dec6288f86c56471;beginline=1;endline=17" inherit qt5-module sdk-sources @@ -30,8 +30,8 @@ SRC_URI = " \ git://qt-gerrit.ci.local/QtRD-15810/qtdatavis3d.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtDataVisualization/1.2/Src \ " -# v1.2.0 -SRCREV = "62f90e25eec23cfac83985993f355feeac5b9f2c" +# v1.2.1 +SRCREV = "5ba7f70d0d94de720d49b37b2d257b51b9afd026" BRANCH = "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 7724ee2b238d9e27893769575b60ee1d9076cd86 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 3 Jul 2015 12:03:28 +0300 Subject: Some projects were moved from internal gerrit to codereview Change-Id: I4e5ae263930bdd22f1934eab1f98a718838f722e Reviewed-by: Louai Al-Khanji --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 2 +- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 2 +- recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 2 +- recipes-qt/b2qt-addons/b2qt-launcher.bb | 2 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 2 +- recipes-qt/qt5-addons/qtcharts_2.0.bb | 2 +- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 2 +- recipes-qt/qt5-addons/qtsimulator_1.0.bb | 2 +- recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index 1c0ab2f..dfea182 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginli inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-appcontroller/ \ + git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-appcontroller/ \ file://appcontroller.conf \ " diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index f051485..a809f7c 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db9 inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-demos;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \ + git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.5/Boot2Qt/sources/b2qt-demos \ git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \ git://code.qt.io/qt/qtcanvas3d.git;branch=${QT_BRANCH};protocol=git;name=qtcanvas3d;destsuffix=qtcanvas3d \ git://code.qt.io/qt/qtquickcontrols.git;branch=${QT_BRANCH};protocol=git;name=qtquickcontrols;destsuffix=qtquickcontrols \ diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb index da6d7bd..6d17a58 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginlin inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ file://emulatorproxyd.sh \ " diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb index b344395..dd5637f 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://qvinput.h;md5=ba04e32af7257890758a149b0c14d11a;beginl inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ " SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index c9a1743..4c55008 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beg inherit qmake5 sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-launcher \ + git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-launcher \ file://b2qt-startup.sh \ " diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index 5521fa9..e438587 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7f inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ + git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.5/Boot2Qt/sources/b2qt-utils \ " SRCREV = "602034c3a71c53d050e67101e070185cbcf7ccee" diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 27fcf1d..216268a 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.cpp;md5=6e3e95df24951a6ec145dc5614d inherit qt5-module qtquickcompiler sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/charts.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/Charts/2.0/Src \ + git://codereview.qt-project.org/qt/tqtc-qtcharts;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/Charts/2.0/Src \ " # v2.0.1 diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index a4e523c..f3d0935 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/datavisualization/global/datavisualizationglobal_ inherit qt5-module sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtdatavis3d.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtDataVisualization/1.2/Src \ + git://codereview.qt-project.org/qt/tqtc-qtdatavis3d;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtDataVisualization/1.2/Src \ " # v1.2.1 diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb index 5f0c761..095b9bc 100644 --- a/recipes-qt/qt5-addons/qtsimulator_1.0.bb +++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0 inherit qt5-module SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/b2qt-qtsimulator.git;branch=${BRANCH};protocol=ssh \ + git://codereview.qt-project.org/tqtc-boot2qt/qtsimulator;branch=${BRANCH};protocol=ssh \ " # v1.0.8 diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb index 17dd871..036a938 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb +++ b/recipes-qt/qt5-addons/qtvirtualkeyboard_1.3.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=9e7c3707428a49f2fd inherit qt5-module qtquickcompiler sdk-sources SRC_URI = " \ - git://qt-gerrit.ci.local/QtRD-15810/qtvirtualkeyboard.git;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ + git://codereview.qt-project.org/qt/tqtc-qtvirtualkeyboard;branch=${BRANCH};protocol=ssh;sdk-uri=EnterpriseAddOns/QtVirtualKeyboard/1.3/Src \ " # v1.3.0 -- cgit v1.2.3-54-g00ecf From 6783e66644cb9f9f6f909ab7e16cc45684e71418 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jul 2015 11:35:38 +0300 Subject: qt5: add declarative tools and host libs to sdk libQt5QmlDevTools.a is required by QtQuickCompiler. Change-Id: Ic465855af3e4acfcdb8e6674a18fee17e42c6d5b Reviewed-by: aavit --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 0437c42..b1456ed 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -31,4 +31,6 @@ RDEPENDS_${PN} += "\ nativesdk-qttools \ nativesdk-qtbase-tools \ nativesdk-qtbase-tools-staticdev \ + nativesdk-qtdeclarative-tools \ + nativesdk-qtdeclarative-staticdev \ " -- cgit v1.2.3-54-g00ecf From bcc532e5142c40d15e9bb2c7f10e02c37a45d507 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 15 Jun 2015 14:10:05 +0300 Subject: Include tzdata and ntp tools to image Including cities from americas, asia and europe. Change-Id: I7cedb056d450d9aae36543fce5510822ab731694 Task-number: QTEE-921 Reviewed-by: aavit --- conf/bblayers.conf.bbb.sample | 2 ++ conf/bblayers.conf.emulator.sample | 2 ++ conf/bblayers.conf.fsl.sample | 2 ++ conf/bblayers.conf.rpi.sample | 2 ++ conf/bblayers.conf.ti.sample | 2 ++ conf/bblayers.conf.tibidabo.sample | 2 ++ conf/bblayers.conf.toradex.sample | 2 ++ recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 4 ++++ recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 + 9 files changed, 19 insertions(+) diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample index d4ffbc4..e2d95d3 100644 --- a/conf/bblayers.conf.bbb.sample +++ b/conf/bblayers.conf.bbb.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index 43ce7d3..1e65b47 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample @@ -32,6 +32,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index dd84362..71c3a2f 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -34,6 +34,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index 0866e3e..2cee63a 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index 7fc2d6b..be4d670 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -33,6 +33,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta-yocto \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index 20d049d..e827ae3 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -35,6 +35,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-tibidabo \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-b2qt \ ${BSPDIR}/sources/meta-b2qt/meta-fsl-extras \ diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample index c724636..e0a77f6 100644 --- a/conf/bblayers.conf.toradex.sample +++ b/conf/bblayers.conf.toradex.sample @@ -35,6 +35,8 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ + ${BSPDIR}/sources/meta-openembedded/meta-python \ + ${BSPDIR}/sources/meta-openembedded/meta-networking \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-openembedded/meta-ruby \ ${BSPDIR}/sources/meta-b2qt \ diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index c5078c2..3dfc1a5 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -54,6 +54,10 @@ RDEPENDS_${PN} = "\ otf-noto \ libmysqlclient \ libpq \ + tzdata \ + tzdata-americas \ + tzdata-asia \ + tzdata-europe \ ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ ${MACHINE_EXTRA_INSTALL} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index 85c3b6e..351a752 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -33,4 +33,5 @@ RDEPENDS_${PN} = "\ i2c-tools \ perf \ htop \ + ntp \ " -- cgit v1.2.3-54-g00ecf From 7b7b6b9f369a2b707e8ed9334e0d81cdb588e2b1 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 16 Jul 2015 10:33:14 +0200 Subject: Add Emulator sdcardmountd Change-Id: Ib760d0c25c645b1c44216081c42714f8e9a8ca32 Reviewed-by: Samuli Piippo --- conf/distro/include/emulator.conf | 1 + .../b2qt-addons/b2qt-emulator-sdcardmountd.bb | 49 ++++++++++++++++++++++ .../b2qt-emulator-sdcardmountd/sdcardmountd.sh | 42 +++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb create mode 100755 recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 79ebd07..0457756 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -46,6 +46,7 @@ MACHINE_EXTRA_INSTALL_QT = "\ qtglesstream \ b2qt-emulator-proxy \ b2qt-emulator-vinput \ + b2qt-emulator-sdcardmountd \ " MACHINE_EXTRA_INSTALL_QT_SDK = "\ qtglesstream-dev \ diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb new file mode 100644 index 0000000..cb0b2ce --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb @@ -0,0 +1,49 @@ +############################################################################# +## +## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "SD-Card mount daemon for Emulator" +LICENSE = "QtEnterprise" +LIC_FILES_CHKSUM = "file://sdcardmountd.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17" + +inherit qt5-module + +SRC_URI = " \ + git://codereview.qt-project.org/tqtc-boot2qt/emulator;branch=${BRANCH};protocol=ssh \ + file://sdcardmountd.sh \ + " + +SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda" +BRANCH = "master" + +S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" + +DEPENDS = "qtbase qtsimulator" + +do_install_append() { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ +} + +INITSCRIPT_NAME = "sdcardmountd.sh" +INITSCRIPT_PARAMS = "defaults 97 10" + +inherit update-rc.d diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh new file mode 100755 index 0000000..565d9b5 --- /dev/null +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd/sdcardmountd.sh @@ -0,0 +1,42 @@ +#!/bin/sh +############################################################################# +## +## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DAEMON=/usr/bin/sdcardmountd + +case "$1" in +start) + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +stop) + start-stop-daemon --stop --quiet --exec $DAEMON + ;; +restart) + start-stop-daemon --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --exec $DAEMON & + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac +exit 0 -- cgit v1.2.3-54-g00ecf From 96550b28fc28fd3b59f8bf1ac92686dea1ace3ce Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 11 Aug 2015 08:37:50 +0300 Subject: boundary: include uvcvideo kernel module Add support for webcams for Boundary Devices imx6 Change-Id: I8ea1b056c5eab7120c4269a98710de322fb304e0 Reviewed-by: Karim Pinter Reviewed-by: aavit --- meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 3bbb690..9a2bebb 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -41,4 +41,8 @@ do_configure_prepend() { # include LEDS_GPIO for Nitrogen6_Lite echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig + + # enable uvcvideo module + echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig } -- cgit v1.2.3-54-g00ecf From 7a77eb1760eb242a6a4b37bec71c2311a0a806d6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 11 Aug 2015 09:08:26 +0300 Subject: Change all tab characters to spaces Gerrit Sanity Bot does not like tabs, so remove them from recipes. Change-Id: Ic0bede29c9a4a01a2bd816e6771fafd76b2323e2 Reviewed-by: aavit --- classes/bootfs-image.bbclass | 26 +++++++++---------- classes/image-hdd.bbclass | 6 ++--- .../recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 30 +++++++++++----------- .../recipes/linux/linux-imx_3.0.35.bb | 14 +++++----- .../recipes/linux/linux-boundary_3.10.17.bbappend | 22 ++++++++-------- .../recipes/linux/linux-imx_3.10.%.bbappend | 14 +++++----- .../libgles/libgles-omap3_4.09.00.01.bbappend | 2 +- .../recipes/libgles/libgles-omap3_4.10.00.01.bb | 8 +++--- .../recipes/linux/linux-toradex-fsl_git.bbappend | 4 +-- .../recipes/linux/linux-toradex-vf_3.18.bbappend | 6 ++--- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 8 +++--- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 4 +-- .../b2qt-addons/b2qt-emulator-sdcardmountd.bb | 4 +-- recipes-qt/b2qt-addons/b2qt-launcher.bb | 4 +-- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 2 +- recipes-qt/qt5-addons/qtglesstream.bb | 16 ++++++------ recipes-qt/qt5/qtbase_%.bbappend | 6 ++--- recipes/adbd/adbd.bb | 20 +++++++-------- recipes/base-files/base-files_3.0.14.bbappend | 8 +++--- recipes/busybox/busybox_1.%.bbappend | 6 ++--- recipes/dbus/dbus_%.bbappend | 14 +++++----- recipes/hunspell/hunspell_1.3.2.bb | 10 ++++---- recipes/init-ifupdown/init-ifupdown_1.0.bbappend | 4 +-- recipes/initscripts/initscripts_1.0.bbappend | 2 +- recipes/opengldummy/opengldummy.bb | 14 +++++----- recipes/opengldummy/opengldummy.inc | 16 ++++++------ recipes/opengldummy/qtglesstream-dummy-client.bb | 14 +++++----- recipes/openssl/openssl_1.%.bbappend | 4 +-- recipes/virtualbox/mount-vboxsf_4.2.14.bb | 10 ++++---- .../virtualbox-guest-additions_4.2.14.bb | 8 +++--- recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend | 22 ++++++++-------- 31 files changed, 164 insertions(+), 164 deletions(-) diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 7203b01..ccc995f 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass @@ -26,24 +26,24 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" BOOTFS_DEPENDS ?= "" fakeroot do_bootfs () { - if [ -z "${BOOTFS_CONTENT}" ]; then - exit 0 - fi + if [ -z "${BOOTFS_CONTENT}" ]; then + exit 0 + fi - mkdir -p ${S}/bootfs + mkdir -p ${S}/bootfs - for item in ${BOOTFS_CONTENT}; do - src=`echo $item | awk -F':' '{ print $1 }'` - dst=`echo $item | awk -F':' '{ print $2 }'` + for item in ${BOOTFS_CONTENT}; do + src=`echo $item | awk -F':' '{ print $1 }'` + dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst - done + install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst + done - cd ${S}/bootfs - rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + cd ${S}/bootfs + rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz - tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . - ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . + ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz } addtask bootfs before do_rootfs diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index e6a0cb5..482be06 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -34,9 +34,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types boot-directdisk create_hdd_image () { - cd ${DEPLOY_DIR_IMAGE} - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd - ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + cd ${DEPLOY_DIR_IMAGE} + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { diff --git a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc index f661539..6b0cd3c 100644 --- a/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc +++ b/meta-architech-extras/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc @@ -28,21 +28,21 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ " PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ - libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ - libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ - libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ - libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ - libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ - libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ - libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ - libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ - libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ - libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ - libvivante-dri-mx6 \ - libvivante-dfb-mx6 \ - libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ - libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ - libwayland-egl-mx6-dev \ + libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ + libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ + libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ + libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ + libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ + libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ + libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ + libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ + libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ + libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ + libvivante-dri-mx6 \ + libvivante-dfb-mx6 \ + libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ + libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ + libwayland-egl-mx6-dev \ " # Skip package if it does not match the machine float-point type in use diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb index 8b80a6e..948382f 100644 --- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb +++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb @@ -24,12 +24,12 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ RDEPENDS_kernel-base = "" do_configure_prepend() { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 9a2bebb..1d7f942 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -30,19 +30,19 @@ SRC_URI += "\ RDEPENDS_kernel-base = "" do_configure_prepend() { - # fix imx-vpu break on video decoding - echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig + # fix imx-vpu break on video decoding + echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig - # include H4 UART for Broadcom BT on Nitrogen6_Lite - echo "CONFIG_BT_HCIUART_H4=y" >> ${WORKDIR}/defconfig + # include H4 UART for Broadcom BT on Nitrogen6_Lite + echo "CONFIG_BT_HCIUART_H4=y" >> ${WORKDIR}/defconfig - # include Broadcom WiFi for Nitrogen6_Lite - echo "CONFIG_BRCMFMAC=m" >> ${WORKDIR}/defconfig + # include Broadcom WiFi for Nitrogen6_Lite + echo "CONFIG_BRCMFMAC=m" >> ${WORKDIR}/defconfig - # include LEDS_GPIO for Nitrogen6_Lite - echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig + # include LEDS_GPIO for Nitrogen6_Lite + echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig - # enable uvcvideo module - echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig + # enable uvcvideo module + echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend index d6c4db4..6861aff 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend @@ -30,12 +30,12 @@ SRC_URI += "\ RDEPENDS_kernel-base = "" do_configure_prepend() { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig } diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 3cad977..452f8a2 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -25,7 +25,7 @@ BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" do_install_append() { - echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini + echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini } # Inhibit warnings about files being stripped. diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb index 9265ffe..1b1bf22 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb @@ -48,8 +48,8 @@ S = "${WORKDIR}/Graphics_SDK_${SGXPV}" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FRONTWSEGL.so.1" do_configure_append() { - # PLAT_CC might not have needed arguments, so use CC instead. - for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do - sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak - done + # PLAT_CC might not have needed arguments, so use CC instead. + for mak in $(find ${S} -name "*.mak" -o -name Makefile) ; do + sed -i -e s:\$\(PLAT_CC\):\$\(CC\):g $mak + done } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 5de3f19..10997ee 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -36,6 +36,6 @@ SRC_URI += " \ RDEPENDS_kernel-base = "" config_script () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend index 0ceceeb..76bf87d 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -27,7 +27,7 @@ SRC_URI += " \ " do_configure_prepend () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig } diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index dfea182..6766978 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -39,13 +39,13 @@ S = "${WORKDIR}/git" DEPENDS = "qtbase" do_configure_append() { - sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf - echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf + sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf + echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf } do_install_append() { - install -m 0755 -d ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ + install -m 0755 -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/ } FILES_${PN} += "${sysconfdir}/appcontroller.conf" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb index 6d17a58..e082735 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb @@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/proxy" DEPENDS = "qtbase qtsimulator" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "emulatorproxyd.sh" diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb index cb0b2ce..d59ba2c 100644 --- a/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb +++ b/recipes-qt/b2qt-addons/b2qt-emulator-sdcardmountd.bb @@ -39,8 +39,8 @@ S = "${WORKDIR}/git/src/helperlibs/sdcarddaemon" DEPENDS = "qtbase qtsimulator" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/sdcardmountd.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "sdcardmountd.sh" diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 4c55008..7781031 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -40,8 +40,8 @@ DEPENDS = "qtbase qtdeclarative \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/ } FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index f3d0935..1a06675 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -39,5 +39,5 @@ S = "${WORKDIR}/git" DEPENDS += "qtbase qtdeclarative qtmultimedia" FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ + ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ " diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index c1922af..06cec02 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -41,17 +41,17 @@ RREPLACES_${PN} = "qtglesstream-dummy-client" RREPLACES_${PN}-dev = "qtglesstream-dummy-client-dev" do_install_append() { - install -m 0755 -d ${D}${includedir}/EGL - install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL + install -m 0755 -d ${D}${includedir}/EGL + install -m 0755 ${S}/headers/EGL/* ${D}${includedir}/EGL - install -m 0755 -d ${D}${includedir}/GLES2 - install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 + install -m 0755 -d ${D}${includedir}/GLES2 + install -m 0755 ${S}/headers/GLES2/* ${D}${includedir}/GLES2 - install -m 0755 -d ${D}${includedir}/GLES3 - install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 + install -m 0755 -d ${D}${includedir}/GLES3 + install -m 0755 ${S}/headers/GLES3/* ${D}${includedir}/GLES3 - install -m 0755 -d ${D}${includedir}/KHR - install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR + install -m 0755 -d ${D}${includedir}/KHR + install -m 0755 ${S}/headers/KHR/* ${D}${includedir}/KHR } # no not overwrite files from qtglesstream-dummy-client diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 340d308..658e068 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -41,9 +41,9 @@ SRC_URI += " \ " do_configure_prepend() { - install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf < ${D}${sysconfdir}/hostname + ln -s /home/root ${D}/root + echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname - install -m 0755 -d ${D}${sysconfdir}/modprobe.d - install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d + install -m 0755 -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d } diff --git a/recipes/busybox/busybox_1.%.bbappend b/recipes/busybox/busybox_1.%.bbappend index e6a7205..7a519c6 100644 --- a/recipes/busybox/busybox_1.%.bbappend +++ b/recipes/busybox/busybox_1.%.bbappend @@ -39,8 +39,8 @@ INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" RRECOMMENDS_${PN} += "${PN}-ifplugd" do_install_append () { - install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/ifplugd - install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ + install -d ${D}${sysconfdir}/ifplugd + install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ } diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend index d824989..4eab3aa 100644 --- a/recipes/dbus/dbus_%.bbappend +++ b/recipes/dbus/dbus_%.bbappend @@ -37,11 +37,11 @@ FILES_${PN}-session-init = " \ " do_install_append_class-target() { - if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh - install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session - fi - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh + install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + fi + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ } diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb index 5d1b1b5..6adb48c 100644 --- a/recipes/hunspell/hunspell_1.3.2.bb +++ b/recipes/hunspell/hunspell_1.3.2.bb @@ -42,11 +42,11 @@ RRECOMMENDS_${PN} += "${PN}-dicts" FILES_${PN}-dicts = "${datadir}/hunspell" do_install_append() { - install -m 0755 -d ${D}${datadir}/hunspell + install -m 0755 -d ${D}${datadir}/hunspell - install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic - install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff + install -m 0755 ${WORKDIR}/git/ar/ar.dic ${D}${datadir}/hunspell/ar_EG.dic + install -m 0755 ${WORKDIR}/git/ar/ar.aff ${D}${datadir}/hunspell/ar_EG.aff - install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell - install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell + install -m 0755 ${WORKDIR}/git/en/en_GB.dic ${D}${datadir}/hunspell + install -m 0755 ${WORKDIR}/git/en/en_GB.aff ${D}${datadir}/hunspell } diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend index b7da585..38ea659 100644 --- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend @@ -25,6 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_beagleboard = " file://fixed_mac_address" do_install_append_beagleboard() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/fixed_mac_address ${D}${sysconfdir}/network/if-pre-up.d/ + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/fixed_mac_address ${D}${sysconfdir}/network/if-pre-up.d/ } diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend index 09efe29..f8cdf55 100644 --- a/recipes/initscripts/initscripts_1.0.bbappend +++ b/recipes/initscripts/initscripts_1.0.bbappend @@ -21,5 +21,5 @@ ############################################################################# do_configure_append() { - sed -i -e "/echo/d" ${WORKDIR}/banner.sh + sed -i -e "/echo/d" ${WORKDIR}/banner.sh } diff --git a/recipes/opengldummy/opengldummy.bb b/recipes/opengldummy/opengldummy.bb index 680e8cc..bfd8870 100644 --- a/recipes/opengldummy/opengldummy.bb +++ b/recipes/opengldummy/opengldummy.bb @@ -29,14 +29,14 @@ PV = "1.0.0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libEGL.so.1 -I${WORKDIR}/headers -o libEGL.so.1 ${WORKDIR}/egl.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libGLESv2.so.2 -I${WORKDIR}/headers -o libGLESv2.so.2 ${WORKDIR}/gles2.cpp } do_install_append() { - install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libEGL.so.1 ${D}${libdir} - ln -s libEGL.so.1 ${D}${libdir}/libEGL.so - install -m 0755 ${S}/libGLESv2.so.2 ${D}${libdir} - ln -s libGLESv2.so.2 ${D}${libdir}/libGLESv2.so + install -m 0755 -d ${D}${libdir} + install -m 0755 ${S}/libEGL.so.1 ${D}${libdir} + ln -s libEGL.so.1 ${D}${libdir}/libEGL.so + install -m 0755 ${S}/libGLESv2.so.2 ${D}${libdir} + ln -s libGLESv2.so.2 ${D}${libdir}/libGLESv2.so } diff --git a/recipes/opengldummy/opengldummy.inc b/recipes/opengldummy/opengldummy.inc index 2119da0..7719f0c 100644 --- a/recipes/opengldummy/opengldummy.inc +++ b/recipes/opengldummy/opengldummy.inc @@ -28,15 +28,15 @@ SRC_URI = "file://headers \ " do_install() { - install -m 0755 -d ${D}${includedir}/EGL - install -m 0755 ${WORKDIR}/headers/EGL/* ${D}${includedir}/EGL + install -m 0755 -d ${D}${includedir}/EGL + install -m 0755 ${WORKDIR}/headers/EGL/* ${D}${includedir}/EGL - install -m 0755 -d ${D}${includedir}/GLES2 - install -m 0755 ${WORKDIR}/headers/GLES2/* ${D}${includedir}/GLES2 + install -m 0755 -d ${D}${includedir}/GLES2 + install -m 0755 ${WORKDIR}/headers/GLES2/* ${D}${includedir}/GLES2 - install -m 0755 -d ${D}${includedir}/GLES3 - install -m 0755 ${WORKDIR}/headers/GLES3/* ${D}${includedir}/GLES3 + install -m 0755 -d ${D}${includedir}/GLES3 + install -m 0755 ${WORKDIR}/headers/GLES3/* ${D}${includedir}/GLES3 - install -m 0755 -d ${D}${includedir}/KHR - install -m 0755 ${WORKDIR}/headers/KHR/* ${D}${includedir}/KHR + install -m 0755 -d ${D}${includedir}/KHR + install -m 0755 ${WORKDIR}/headers/KHR/* ${D}${includedir}/KHR } diff --git a/recipes/opengldummy/qtglesstream-dummy-client.bb b/recipes/opengldummy/qtglesstream-dummy-client.bb index c2e936e..2b21d51 100644 --- a/recipes/opengldummy/qtglesstream-dummy-client.bb +++ b/recipes/opengldummy/qtglesstream-dummy-client.bb @@ -31,14 +31,14 @@ SOLIBMINOR = "0" require opengldummy.inc do_compile() { - ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \ - -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp + ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Wl,-soname,libQtGlesStreamClient.so.${SOLIBMAJOR} \ + -I${WORKDIR}/headers -o libQtGlesStreamClient.so.${PV} ${WORKDIR}/egl.cpp ${WORKDIR}/gles2.cpp } do_install_append() { - install -m 0755 -d ${D}${libdir} - install -m 0755 ${S}/libQtGlesStreamClient.so.${PV} ${D}${libdir} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR}.${SOLIBMINOR} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR} - ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so + install -m 0755 -d ${D}${libdir} + install -m 0755 ${S}/libQtGlesStreamClient.so.${PV} ${D}${libdir} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR}.${SOLIBMINOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so.${SOLIBMAJOR} + ln -s libQtGlesStreamClient.so.${PV} ${D}${libdir}/libQtGlesStreamClient.so } diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend index 792ad2f..461cb45 100644 --- a/recipes/openssl/openssl_1.%.bbappend +++ b/recipes/openssl/openssl_1.%.bbappend @@ -23,6 +23,6 @@ PACKAGECONFIG += "perl" do_install_append () { - rmdir ${D}${libdir}/ssl/certs - ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ + rmdir ${D}${libdir}/ssl/certs + ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ } diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb index 63d61f6..82fd0cc 100644 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb @@ -34,15 +34,15 @@ SRC_URI[sha256sum] = "f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd58 S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" do_compile() { - ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf + ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf } do_install() { - install -m 0755 -d ${D}${bindir}/ - install -m 0755 mount.vboxsf ${D}${bindir}/ + install -m 0755 -d ${D}${bindir}/ + install -m 0755 mount.vboxsf ${D}${bindir}/ - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ } INITSCRIPT_NAME = "mount-vboxsf.sh" diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index 587695c..04fffec 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -41,13 +41,13 @@ export KBUILD_VERBOSE="1" export BUILD_TARGET_ARCH="${ARCH}" do_compile_prepend() { - ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz - tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox + ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz + tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox } do_install() { - install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox } PKG_${PN} = "kernel-module-vbox" diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend index 9a200b2..708a616 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend +++ b/recipes/wpa-supplicant/wpa-supplicant_2.%.bbappend @@ -1,17 +1,17 @@ do_install_append () { - install -d ${D}${includedir}/wpa-supplicant + install -d ${D}${includedir}/wpa-supplicant - install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ } FILES_${PN}-dev += "${includedir}/wpa-supplicant/*" -- cgit v1.2.3-54-g00ecf From d8dd8b3358c592eb2a0d0094cc27a10cdea95ef2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 11 Aug 2015 12:02:44 +0300 Subject: qt5: use 5.5 branch The release 5.5.0 branches were removed, so need to use 5.5 instead. Change-Id: I4478c3e05d9d4937fafd3a3b75832608da5d4b40 Reviewed-by: aavit --- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index a809f7c..9ceab8c 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -34,7 +34,7 @@ SRC_URI = " \ " BRANCH = "dev" -QT_BRANCH = "5.5.0" +QT_BRANCH = "5.5" SRCREV_demos = "de50ff5dbf2f789786e25540ba0b0efc8c68e0f9" SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e" SRCREV_qtcanvas3d = "debe68a85b571b70e2fe0824e5ed40484a72c216" -- cgit v1.2.3-54-g00ecf From 299aa675369abe4f1eae062bd4f468a006449033 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Aug 2015 12:02:34 +0300 Subject: toradex: move to V2.4 branch V2.4 is based on dizzy branch. Change-Id: Ibcc2501f1c53d2b24bbde417ecd17f5e31e9e8ed Reviewed-by: aavit --- conf/distro/include/colibri-imx6.conf | 3 +- ...-iMX6-set-1280x720-16-for-HDMI-by-default.patch | 32 ------------------ .../recipes/linux/linux-toradex-fsl_git.bbappend | 6 ---- .../recipes/linux/linux-toradex-vf_3.18.bbappend | 33 ------------------- .../recipes/linux/linux-toradex-vf_4.%.bbappend | 33 +++++++++++++++++++ .../0001-Update-default-args-for-apalis-imx6.patch | 30 ++++++++--------- .../0001-colibri-vf-enable-sdboot-by-default.patch | 38 ++++++++-------------- scripts/manifest.xml | 2 +- scripts/manifest_dizzy.xml | 2 +- 9 files changed, 66 insertions(+), 113 deletions(-) delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index f0b6179..fcf716a 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -27,7 +27,8 @@ KERNEL_IMAGETYPE = "uImage" BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-${KERNEL_DEVICETREE}:${KERNEL_DEVICETREE} \ + ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ " BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch deleted file mode 100644 index 719a38d..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001 -From: Andy Nichols -Date: Mon, 13 Apr 2015 12:54:17 +0200 -Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default - ---- - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -index e638266..dd8b21fc5 100644 ---- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -@@ -70,12 +70,11 @@ - compatible = "fsl,mxc_sdc_fb"; - disp_dev = "hdmi"; - interface_pix_fmt = "RGB24"; -- mode_str ="1920x1080M@60"; --/* default_bpp = <16>;*/ -- default_bpp = <24>; -+ mode_str ="1280x729M@60"; -+ default_bpp = <16>; - int_clk = <0>; - late_init = <0>; -- status = "disabled"; -+ status = "okay"; - }; - - mxcfb2: fb@1 { --- -2.3.5 - diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 10997ee..d8d2812 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -26,12 +26,6 @@ SRC_URI += "\ file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ " -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \ - " - # kernel image files are not needed in the image RDEPENDS_kernel-base = "" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend deleted file mode 100644 index 76bf87d..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ - " - -do_configure_prepend () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig -} diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend new file mode 100644 index 0000000..76bf87d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ + " + +do_configure_prepend () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig +} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch index 60c5171..174f3b0 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch @@ -1,4 +1,4 @@ -From 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 +From 1d5baa56ff177d7858727d1c4428096781e3817c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Oct 2014 14:53:25 +0200 Subject: [PATCH] Update default args for apalis imx6 @@ -10,30 +10,30 @@ disable cursor blinking. 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 5d32118..289d611 100644 +index 162be2e..f659384 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -212,14 +212,14 @@ +@@ -246,14 +246,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ - "rootwait\0" \ + "drive=2\0" \ - "sdboot=" "run setup; " \ + "sdboot=run setup; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ + "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8bit slot...; " \ -- "run sddtbload; fatload mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; fatload mmc ${drive}:1 ${kernel_addr_r} " \ +- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ ++ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; fatload mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ +- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - #ifndef CONFIG_APALIS_IMX6_V1_0 -@@ -229,7 +229,8 @@ + #define USB_BOOTCMD \ +@@ -273,7 +273,8 @@ #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -43,15 +43,15 @@ index 5d32118..289d611 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -242,7 +243,7 @@ - NFS_BOOTCMD \ - SD_BOOTCMD \ +@@ -292,7 +293,7 @@ + "|| setenv drive 2; load ${interface} ${drive}:1 " \ + "${kernel_addr_r} flash_blk.img\0" \ "setup=setenv setupargs fec_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ "console=${console},${baudrate}n8\0 " \ - "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ - "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ + " source ${kernel_addr_r}\0" \ -- 1.9.1 diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch index 2e72ff6..bae71d5 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch @@ -1,45 +1,35 @@ -From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001 +From 878f506e43f40c2667e9e5ae82741d32fc653cac Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 May 2015 09:06:54 +0300 Subject: [PATCH] colibri vf: enable sdboot by default -Run sdboot first, update dtb file location to /boot/ and -remove console message from tty1 +Run sdboot first and remove console message from tty1 --- - include/configs/colibri_vf.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + include/configs/colibri_vf.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h -index feea159..b080510 100644 +index 06caabd..fb9fe41 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h -@@ -135,7 +135,7 @@ - "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ - "run sddtbload; bootz ${kernel_addr_r} - ${dtbparam}\0" \ - "sddtbload=setenv dtbparam; load mmc 0:2 ${fdt_addr_r} " \ -- "${soc}-colibri-${fdt_board}.dtb && " \ -+ "/boot/${soc}-colibri-${fdt_board}.dtb && " \ - "setenv dtbparam ${fdt_addr_r}\0" - - #define NFS_BOOTCMD \ -@@ -160,7 +160,7 @@ - "/boot/${soc}-colibri-${fdt_board}.dtb && " \ - "setenv dtbparam ${fdt_addr_r}\0" +@@ -174,7 +174,7 @@ + "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" +#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" -@@ -173,7 +173,7 @@ +@@ -187,7 +187,7 @@ "defargs=\0" \ "console=ttyLP0\0" \ - "setup=setenv setupargs fec_mac=${ethaddr} consoleblank=0 " \ -- "console=tty1 console=${console},${baudrate}n8 ${memargs}\0" \ -+ "console=${console},${baudrate}n8 ${memargs}\0" \ - "setsdupdate=mmc rescan && set interface mmc && " \ + "setup=setenv setupargs " \ +- "console=tty1 console=${console}" \ ++ "console=${console}" \ + ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + "setsdupdate=mmc rescan && setenv interface mmc && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ - "source ${loadaddr}\0" \ -- 1.9.1 diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 4a88a1b..ca71c1c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -46,7 +46,7 @@ groups="notdefault,bbb"/> Date: Wed, 15 Jul 2015 14:19:58 +0200 Subject: Check if VirtualBox kernel modules do exist The Makefile is broken. It will report success even if the modules could not be compiled due to gcc errors. Yocto will then continue with the modules missing from the package. Change-Id: I0efcdc736c158cb857549eb64ebd6bc86a26b7e6 Reviewed-by: Samuli Piippo --- recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb index 04fffec..4f52478 100644 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb @@ -47,7 +47,9 @@ do_compile_prepend() { do_install() { install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxsf.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxguest.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxvideo.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox } PKG_${PN} = "kernel-module-vbox" -- cgit v1.2.3-54-g00ecf From 0fe5a62bd4c557e245128d4671b1f5af7dd6b4b1 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 15 Jul 2015 14:30:51 +0200 Subject: Update VirtualBox kernel modules Modules needed to be updated in order to build with newer kernels. Change-Id: I113b0831aebfeac3818837ed557ae5ae2bf072e1 Reviewed-by: Samuli Piippo --- recipes/virtualbox/mount-vboxsf_4.2.14.bb | 51 -------------------- recipes/virtualbox/mount-vboxsf_4.3.30.bb | 51 ++++++++++++++++++++ .../virtualbox-guest-additions_4.2.14.bb | 55 ---------------------- .../virtualbox-guest-additions_4.3.30.bb | 55 ++++++++++++++++++++++ 4 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 recipes/virtualbox/mount-vboxsf_4.2.14.bb create mode 100644 recipes/virtualbox/mount-vboxsf_4.3.30.bb delete mode 100644 recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb create mode 100644 recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb deleted file mode 100644 index 82fd0cc..0000000 --- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "VirtualBox Guest Additions for Linux: mount" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2 \ - file://mount-vboxsf.sh \ - " - -SRC_URI[md5sum] = "be834de415adaf2f696f7a499f88b4e6" -SRC_URI[sha256sum] = "f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d" - -S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" - -do_compile() { - ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf -} - -do_install() { - install -m 0755 -d ${D}${bindir}/ - install -m 0755 mount.vboxsf ${D}${bindir}/ - - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ -} - -INITSCRIPT_NAME = "mount-vboxsf.sh" -INITSCRIPT_PARAMS = "defaults 33" - -inherit update-rc.d diff --git a/recipes/virtualbox/mount-vboxsf_4.3.30.bb b/recipes/virtualbox/mount-vboxsf_4.3.30.bb new file mode 100644 index 0000000..171ba7e --- /dev/null +++ b/recipes/virtualbox/mount-vboxsf_4.3.30.bb @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "VirtualBox Guest Additions for Linux: mount" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2 \ + file://mount-vboxsf.sh \ + " + +SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd" +SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36" + +S = "${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/sharedfolders" + +do_compile() { + ${CC} mount.vboxsf.c vbsfmount.c -o mount.vboxsf +} + +do_install() { + install -m 0755 -d ${D}${bindir}/ + install -m 0755 mount.vboxsf ${D}${bindir}/ + + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/mount-vboxsf.sh ${D}${sysconfdir}/init.d/ +} + +INITSCRIPT_NAME = "mount-vboxsf.sh" +INITSCRIPT_PARAMS = "defaults 33" + +inherit update-rc.d diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb deleted file mode 100644 index 4f52478..0000000 --- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################# -## -## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -## -## This file is part of the Qt Enterprise Embedded Scripts of the Qt -## framework. -## -## $QT_BEGIN_LICENSE$ -## Commercial License Usage Only -## Licensees holding valid commercial Qt license agreements with Digia -## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, -## may use this file in accordance with the terms contained in said license -## agreement. -## -## For further information use the contact form at -## http://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -inherit module - -MACHINE_KERNEL_PR_append = "a" -PR = "${MACHINE_KERNEL_PR}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" - -SRC_URI[md5sum] = "be834de415adaf2f696f7a499f88b4e6" -SRC_URI[sha256sum] = "f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d" - -S = "${WORKDIR}/vbox" - -export KERN_DIR="${STAGING_KERNEL_DIR}" -export KBUILD_VERBOSE="1" -export BUILD_TARGET_ARCH="${ARCH}" - -do_compile_prepend() { - ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz - tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox -} - -do_install() { - install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxsf.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxguest.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox - install -m 0644 vboxvideo.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox -} - -PKG_${PN} = "kernel-module-vbox" diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb b/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb new file mode 100644 index 0000000..43af064 --- /dev/null +++ b/recipes/virtualbox/virtualbox-guest-additions_4.3.30.bb @@ -0,0 +1,55 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +DESCRIPTION = "Kernel drivers for the VirtualBox guest additions" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/VirtualBox-${PV}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +inherit module + +MACHINE_KERNEL_PR_append = "a" +PR = "${MACHINE_KERNEL_PR}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/VirtualBox-${PV}.tar.bz2" + +SRC_URI[md5sum] = "cc053340f88922a11ad9d4fab56557bd" +SRC_URI[sha256sum] = "ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36" + +S = "${WORKDIR}/vbox" + +export KERN_DIR="${STAGING_KERNEL_DIR}" +export KBUILD_VERBOSE="1" +export BUILD_TARGET_ARCH="${ARCH}" + +do_compile_prepend() { + ${WORKDIR}/VirtualBox-${PV}/src/VBox/Additions/linux/export_modules ${WORKDIR}/vbox.tar.gz + tar xf ${WORKDIR}/vbox.tar.gz -C ${WORKDIR}/vbox +} + +do_install() { + install -m 0755 -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxsf.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxguest.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox + install -m 0644 vboxvideo.ko ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/vbox +} + +PKG_${PN} = "kernel-module-vbox" -- cgit v1.2.3-54-g00ecf