Merge ~sylvain-pineau/checkbox-core-snap:tpm2-tools-stage-package into checkbox-core-snap:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: d8439e71f420e6854d928a238b09f8e3e09b8bd4
Merged at revision: d6ce82c6205d9c06d2e96aade4830bbc9cd96548
Proposed branch: ~sylvain-pineau/checkbox-core-snap:tpm2-tools-stage-package
Merge into: checkbox-core-snap:master
Diff against target: 79 lines (+3/-51)
1 file modified
snap/snapcraft.yaml (+3/-51)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+382589@code.launchpad.net

Description of the change

checkbox20 tpm2 updates. series18 will need its specific patches updated to still build the 3.0.4 version when rebasing from master.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index c070994..a3f00b4 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -257,6 +257,8 @@ parts:
6 source-depth: 1
7 plugin: plainbox-provider
8 source: git://git.launchpad.net/plainbox-provider-tpm2
9+ stage-packages:
10+ - tpm2-tools
11 after: [plainbox-provider-docker]
12 ################################################################################
13 plainbox-provider-sru:
14@@ -264,7 +266,7 @@ parts:
15 source-depth: 1
16 plugin: plainbox-provider
17 source: git://git.launchpad.net/plainbox-provider-sru
18- after: [plainbox-provider-tpm2, tpm2-tools-3]
19+ after: [plainbox-provider-tpm2]
20 ################################################################################
21 plainbox-provider-engineering-tests:
22 source-tag: "7"
23@@ -332,56 +334,6 @@ parts:
24 gcc lk-boot-env.c -I/usr/include/ -Iapp/aboot -o ${SNAPCRAFT_PART_INSTALL}/bin/lk-boot-env
25 fi
26 ################################################################################
27- tpm2-tss:
28- plugin: autotools
29- source: https://github.com/tpm2-software/tpm2-tss
30- source-type: git
31- source-tag: "1.4.0"
32- configflags:
33- - --enable-unit
34- build-packages:
35- - autoconf
36- - autoconf-archive
37- - libtool
38- - gcc
39- - g++
40- - libc6-dev
41- prime:
42- - -include
43- # Keep this, fwts builds are somehow affected by staged libs if not built
44- # first hence the after clause in tpm2-tss-1.4.
45- after: [fwts]
46-################################################################################
47- tpm2-tools-3:
48- plugin: autotools
49- source: https://github.com/tpm2-software/tpm2-tools
50- source-type: git
51- source-tag: "3.0.4"
52- configflags:
53- - --enable-unit
54- - --with-tcti-device
55- build-packages:
56- - autoconf
57- - autoconf-archive
58- - automake
59- - pkg-config
60- - libcmocka-dev
61- - libcurl4-openssl-dev
62- - libssl-dev
63- - libtool
64- - python-yaml
65- stage-packages:
66- - try: [libcurl4]
67- - else: [libcurl3]
68- prime:
69- - -include
70- after: [tpm2-tss]
71- override-pull: |
72- snapcraftctl pull
73- # https://github.com/tpm2-software/tpm2-tools/issues/908
74- sed -i 's|LIBMARSHAL_CFLAGS = \\|LIBMARSHAL_CFLAGS = |g' Makefile.am
75- sed -i 's|-DALG_ECMQV=1||g' Makefile.am
76-################################################################################
77 parts-meta-info:
78 plugin: nil
79 override-build: |

Subscribers

People subscribed via source and target branches