Checkbox IIoTG

Merge ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:align_with_classic into ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg:master

  1. Git
  2. lp:~liaou3/checkbox-iiotg/+git/checkbox-iiotg
  3. align_with_classic
  4. Merge into master
Proposed by Vincent Liao
Status: Merged
Approved by: Vincent Liao
Approved revision: 9c846763d00aaf3ef19c937d4ffaf27bfd28d004
Merged at revision: dc31578553dc587ad1d76e9939b6d920e409c12b
Proposed branch: ~liaou3/checkbox-iiotg/+git/checkbox-iiotg:align_with_classic
Merge into: ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg:master
Diff against target: 36 lines (+17/-0)
2 files modified
config/config_vars (+4/-0)
snap/snapcraft.yaml (+13/-0)
Reviewer Review Type Date Requested Status
Patrick Liu (community) Approve
StanleyHuang Approve
PeiYao Chang Pending
Rick Wu Pending
Vic Liu Pending
Review via email: mp+452073@code.launchpad.net

Commit message

Add tsn-tools and tsn server config to align with classic image

Description of the change

This MR is to align with the classic snap. Here's how we do for the snapcraft.yaml[1] and config_vars[2] in classic snap.

[1] https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic/tree/snap/snapcraft.yaml
[2] https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic/tree/config/config_vars

To post a comment you must log in.
Revision history for this message
StanleyHuang (stanley31) wrote :

LGTM

review: Approve
Revision history for this message
Patrick Liu (patliu) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config/config_vars b/config/config_vars
2index 1bef9e3..9ed75b1 100644
3--- a/config/config_vars
4+++ b/config/config_vars
5@@ -42,3 +42,7 @@ MODEL_GRADE=signed
6 WATCHDOG_TYPE=wdat_wdt
7 WATCHDOG_IDENTITY=wdat_wdt
8 CYCLICTEST_DURATION=86400
9+TSN_SERVER_IP=10.102.88.87
10+TSN_SERVER_USER=u
11+TSN_SERVER_PWD=u
12+TSN_SERVER_INTERFACE=enp2s0
13diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
14index 782133e..92707a4 100644
15--- a/snap/snapcraft.yaml
16+++ b/snap/snapcraft.yaml
17@@ -113,6 +113,19 @@ parts:
18 python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-intliotg --root="$SNAPCRAFT_PART_INSTALL"
19 build-packages:
20 - python3-jinja2
21+ tsn-tools:
22+ plugin: nil
23+ build-packages:
24+ - gcc
25+ - libc6-dev
26+ override-build: |
27+ mkdir -p ${SNAPCRAFT_PART_INSTALL}/usr/bin
28+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker
29+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-talker ${SNAPCRAFT_PART_INSTALL}/usr/bin/
30+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener
31+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/tsn-listener ${SNAPCRAFT_PART_INSTALL}/usr/bin/
32+ gcc ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai.c -o ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai -lpthread
33+ cp -v ${SNAPCRAFT_PROJECT_DIR}/parts/checkbox-provider-intliotg/src/src/udp_tai ${SNAPCRAFT_PART_INSTALL}/usr/bin/
34 parts-meta-info:
35 plugin: nil
36 build-attributes: [no-patchelf]

Subscribers

People subscribed via source and target branches