diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-15 09:58:16 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-15 13:34:28 +0300 |
commit | 7faffd0a1f4800c50547c1aefddeb5db006b267f (patch) | |
tree | 6a08a1941ba85a6c1e870a30a291bcf669cb6b09 /recipes | |
parent | cf56c7b6c15597c0d04a33204ba25ec37c4667f3 (diff) | |
parent | b54b20eb868b68379c792efab0baf8a15cd8a283 (diff) | |
download | meta-boot2qt-7faffd0a1f4800c50547c1aefddeb5db006b267f.tar.gz |
Merge remote-tracking branch 'origin/dizzy' into dev
openssl/c_rehash patch updated to apply again.
* origin/dizzy:
Fix c_rehash run during image creation
Include CDC-ACM kernel module
Use mirror from github to clone git-repo tool
Add libevent to toolchain and image
Use correct path for mkspecs
qt5: remove separate designer packages
qt5: use 5.5-next branch for meta-qt5
qt5: patch qdevice.conf from correct location
Change-Id: I6998da6dc050c17aa1cbf20d50bcf0d14fc4ee8e
Diffstat (limited to 'recipes')
4 files changed, 101 insertions, 0 deletions
diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch new file mode 100644 index 0000000..9aa9648 --- /dev/null +++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@theqtcompany.com> | ||
3 | Date: Wed, 9 Sep 2015 13:37:28 +0300 | ||
4 | Subject: [PATCH] Support SYSROOT in c_rehash | ||
5 | |||
6 | update-ca-certificates is ran during image creation, which in turn runs | ||
7 | c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute | ||
8 | location, c_rehash does not find the actual files. Add support for SYSROOT | ||
9 | environment variable and use it to locate the actual files during image | ||
10 | creation. | ||
11 | |||
12 | Upstream-status: Pending | ||
13 | --- | ||
14 | tools/c_rehash.in | 30 +++++++++++++++++------------- | ||
15 | 1 file changed, 17 insertions(+), 13 deletions(-) | ||
16 | |||
17 | diff --git a/tools/c_rehash.in b/tools/c_rehash.in | ||
18 | index 92cb503..f3d2703 100644 | ||
19 | --- a/tools/c_rehash.in | ||
20 | +++ b/tools/c_rehash.in | ||
21 | @@ -7,6 +7,7 @@ my $dir; | ||
22 | my $prefix; | ||
23 | |||
24 | my $openssl = $ENV{OPENSSL} || "openssl"; | ||
25 | +my $sysroot = $ENV{SYSROOT} || ""; | ||
26 | my $pwd; | ||
27 | my $verbose = 0; | ||
28 | my $symlink_exists=eval {symlink("",""); 1}; | ||
29 | @@ -101,16 +102,17 @@ sub hash_dir { | ||
30 | } | ||
31 | } | ||
32 | FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) { | ||
33 | + $fullname = $sysroot . readlink($fname); | ||
34 | # Check to see if certificates and/or CRLs present. | ||
35 | - my ($cert, $crl) = check_file($fname); | ||
36 | + my ($cert, $crl) = check_file($fullname); | ||
37 | if(!$cert && !$crl) { | ||
38 | print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; | ||
39 | next; | ||
40 | } | ||
41 | - link_hash_cert($fname) if($cert); | ||
42 | - link_hash_cert_old($fname) if($cert); | ||
43 | - link_hash_crl($fname) if($crl); | ||
44 | - link_hash_crl_old($fname) if($crl); | ||
45 | + link_hash_cert($fname, $fullname) if($cert); | ||
46 | + link_hash_cert_old($fname, $fullname) if($cert); | ||
47 | + link_hash_crl($fname, $fullname) if($crl); | ||
48 | + link_hash_crl_old($fname, $fullname) if($crl); | ||
49 | } | ||
50 | } | ||
51 | |||
52 | @@ -143,9 +145,10 @@ sub check_file { | ||
53 | |||
54 | sub link_hash_cert { | ||
55 | my $fname = $_[0]; | ||
56 | - my $x509hash = $_[1] || '-subject_hash'; | ||
57 | - $fname =~ s/'/'\\''/g; | ||
58 | - my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`; | ||
59 | + my $fullname = $_[1]; | ||
60 | + my $x509hash = $_[2] || '-subject_hash'; | ||
61 | + $fullname =~ s/'/'\\''/g; | ||
62 | + my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`; | ||
63 | chomp $hash; | ||
64 | chomp $fprint; | ||
65 | $fprint =~ s/^.*=//; | ||
66 | @@ -176,11 +179,11 @@ sub link_hash_cert { | ||
67 | } | ||
68 | |||
69 | sub link_hash_cert_old { | ||
70 | - link_hash_cert($_[0], '-subject_hash_old'); | ||
71 | + link_hash_cert($_[0], $_[1], '-subject_hash_old'); | ||
72 | } | ||
73 | |||
74 | sub link_hash_crl_old { | ||
75 | - link_hash_crl($_[0], '-hash_old'); | ||
76 | + link_hash_crl($_[0], $_[1], '-hash_old'); | ||
77 | } | ||
78 | |||
79 | |||
80 | @@ -188,9 +191,10 @@ sub link_hash_crl_old { | ||
81 | |||
82 | sub link_hash_crl { | ||
83 | my $fname = $_[0]; | ||
84 | - my $crlhash = $_[1] || "-hash"; | ||
85 | - $fname =~ s/'/'\\''/g; | ||
86 | - my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`; | ||
87 | + my $fullname = $_[1]; | ||
88 | + my $crlhash = $_[2] || "-hash"; | ||
89 | + $fullname =~ s/'/'\\''/g; | ||
90 | + my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`; | ||
91 | chomp $hash; | ||
92 | chomp $fprint; | ||
93 | $fprint =~ s/^.*=//; | ||
94 | -- | ||
95 | 1.9.1 | ||
96 | |||
diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend index 461cb45..ce68b59 100644 --- a/recipes/openssl/openssl_1.%.bbappend +++ b/recipes/openssl/openssl_1.%.bbappend | |||
@@ -20,6 +20,9 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
24 | SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch" | ||
25 | |||
23 | PACKAGECONFIG += "perl" | 26 | PACKAGECONFIG += "perl" |
24 | 27 | ||
25 | do_install_append () { | 28 | do_install_append () { |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 34a53c9..82e801b 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | |||
@@ -59,6 +59,7 @@ RDEPENDS_${PN} = "\ | |||
59 | tzdata-asia \ | 59 | tzdata-asia \ |
60 | tzdata-europe \ | 60 | tzdata-europe \ |
61 | atk \ | 61 | atk \ |
62 | libevent \ | ||
62 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ | 63 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ |
63 | ${MACHINE_EXTRA_INSTALL} \ | 64 | ${MACHINE_EXTRA_INSTALL} \ |
64 | " | 65 | " |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index f567f4e..b31ea3f 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb | |||
@@ -49,6 +49,7 @@ RDEPENDS_${PN} += "\ | |||
49 | libmysqlclient-dev \ | 49 | libmysqlclient-dev \ |
50 | libpq-dev \ | 50 | libpq-dev \ |
51 | atk-dev \ | 51 | atk-dev \ |
52 | libevent-dev \ | ||
52 | ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ | 53 | ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ |
53 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ | 54 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ |
54 | ${MACHINE_EXTRA_INSTALL_SDK} \ | 55 | ${MACHINE_EXTRA_INSTALL_SDK} \ |