Merge ~stanley31/checkbox-iiotg/+git/checkbox-iiotg-classic:230331_add-ce-oem-provider into ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic:master

Proposed by StanleyHuang
Status: Merged
Approved by: StanleyHuang
Approved revision: 95067ee28ae03b777069b769b569fb82bffb495b
Merged at revision: 1c538ee5b29a628e2162057f0e78b562eab71357
Proposed branch: ~stanley31/checkbox-iiotg/+git/checkbox-iiotg-classic:230331_add-ce-oem-provider
Merge into: ~checkbox-dev/checkbox-iiotg/+git/checkbox-iiotg-classic:master
Diff against target: 52 lines (+15/-3)
2 files modified
launchers/wrapper_local (+4/-2)
snap/snapcraft.yaml (+11/-1)
Reviewer Review Type Date Requested Status
Vic Liu Approve
Doug Jacobs Pending
PeiYao Chang Pending
Review via email: mp+440119@code.launchpad.net

Commit message

Add: include the ce-oem provider

    For include the ce-oem-generic provider as a content provider in
    checkbox-iiotg snap, I have made following changes
    1. add lib path into LD_LIBRARY_PATH to access those libraries in
       ce-oem-generic provider, it is for cold-reboot-stress-by-pdu tests
    2. add bin path into PATH to access those binaries in ce-oem-generic
        provider.
    3. add checkbox-ce-oem into PROVIDER_PATH
    4. use dump plugin to build checkbox snap

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

build test snap and upload to
https://drive.google.com/drive/folders/1l4FL-w4QqccgTLAPAw1NkREhQo7KBBPk

we will test it during alpha test

Revision history for this message
Vic Liu (zongminl) wrote (last edit ):

+1, thank you, if everything works fine with austin-charlotte let's merge this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launchers/wrapper_local b/launchers/wrapper_local
2index 5bfa765..7a59da0 100755
3--- a/launchers/wrapper_local
4+++ b/launchers/wrapper_local
5@@ -31,13 +31,15 @@ export LC_ALL=C.UTF-8
6 PERL_VERSION=$(perl -e '$^V=~/^v(\d+\.\d+)/;print $1')
7 export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/$ARCH/perl5/$PERL_VERSION:$SNAP/usr/share/perl/$PERL_VERSION:$SNAP/usr/share/perl5"
8 export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
9-export PATH="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH"
10+export PATH="$SNAP/usr/sbin:$SNAP/sbin:$SNAP/usr/bin:$SNAP/bin:/snap/bin:$PATH:/snap/checkbox-ce-oem/current/usr/bin/:/snap/checkbox-ce-oem/current/usr/sbin"
11 export ALSA_CONFIG_PATH=$SNAP/usr/share/alsa/alsa.conf:$SNAP/usr/share/alsa/pcm/default.conf
12 export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
13-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/bin:$SNAP/usr/lib:$SNAP/usr/lib/$ARCH"
14+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/bin:$SNAP/usr/lib:$SNAP/usr/lib/$ARCH:/snap/checkbox-ce-oem/current/usr/lib/aarch64-linux-gnu"
15
16 if [ -e $RUNTIME/wrapper_common_classic ]; then
17 . $RUNTIME/wrapper_common_classic
18+ # Append ce-oem provider
19+ export PROVIDERPATH="$PROVIDERPATH:/snap/checkbox-ce-oem/current/providers/checkbox-provider-ce-oem"
20 else
21 echo "ERROR: no $RUNTIME/wrapper_common_classic found"
22 exit 0
23diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
24index 1292301..ef259db 100644
25--- a/snap/snapcraft.yaml
26+++ b/snap/snapcraft.yaml
27@@ -49,7 +49,7 @@ passthrough:
28
29 parts:
30 checkbox-provider-intliotg:
31- plugin: checkbox-provider
32+ plugin: dump
33 source: https://git.launchpad.net/~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg
34 source-type: git
35 stage-packages:
36@@ -62,6 +62,16 @@ parts:
37 - va-driver-all
38 - vainfo
39 build-attributes: [no-patchelf]
40+ build-snaps:
41+ - checkbox22
42+ override-build: |
43+ export PYTHONPATH=/snap/checkbox22/current/lib/python3.10/site-packages/
44+ for path in $(find "/snap/checkbox22/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done
45+ python3 manage.py validate
46+ python3 manage.py build
47+ python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-intliotg --root="$SNAPCRAFT_PART_INSTALL"
48+ build-packages:
49+ - python3-jinja2
50 parts-meta-info:
51 plugin: nil
52 build-attributes: [no-patchelf]

Subscribers

People subscribed via source and target branches