Merge ~alfonsosanchezbeato/ondras-snaps/+git/linux-kernel:cross-compile into ~ondrak/ondras-snaps/+git/linux-kernel:ubuntu-focal-imx

[Alfonso Sanchez-Beato]

Some changes to allow cross-compiling the snap

Some changes to allow cross-compiling the snap

Unmerged commits

fc1fe79... by Alfonso Sanchez-Beato on 2021-06-03

Specify the kernel-run-on field for the kernel plugin

Specify the kernel-run-on field for the (custom) kernel plugin so it
will cross-compile.

37a184e... by Alfonso Sanchez-Beato on 2021-06-03

Clean-up architectures field

fc09f28... by Alfonso Sanchez-Beato on 2021-06-02

Make test-keys pullable for all

741d862... by Alfonso Sanchez-Beato on 2021-06-02

Pull libjson directly instead of from build-packages

Otherwise cross-compilation will not work unless we run
"dpkg --add-architecture arm64", which can be problematic.

d2d9eb2... by Alfonso Sanchez-Beato on 2021-06-02

Add script to stage debian packages

Add script to stage debian packages from a part, written originally by
Oliver Grawert.

c7e6aec... by Ondrej Kubik on 2021-05-19

UBUNTU: SAUCE: snap: parts: kernel: use edge-splash initrd flavour

Signed-off-by: Ondrej Kubik <email address hidden>

d3b3292... by Ondrej Kubik on 2021-05-19

UBUNTU: SAUCE: config: arm64: snappy_defconfig: disable default Linux logo

Signed-off-by: Ondrej Kubik <email address hidden>

85a9c0a... by Ondrej Kubik on 2021-04-20

UBUNTU: SAUCE: config: arm64: snappy_defconfig: add fde related config options

Signed-off-by: Ondrej Kubik <email address hidden>

b1bbb91... by Ondrej Kubik on 2021-04-20

UBUNTU: SAUCE: snap: parts: add test signing keys

Signed-off-by: Ondrej Kubik <email address hidden>

bdf7044... by Ondrej Kubik on 2021-04-20

UBUNTU: SAUCE: snap: parts: add fit image creation

Signed-off-by: Ondrej Kubik <email address hidden>

diff --git a/snap-tools/get-packages.sh b/snap-tools/get-packages.sh
new file mode 100755
index 0000000..7c38f86
--- /dev/null
+++ b/snap-tools/get-packages.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+
+# dowloads and unpacks .deb packages for defined arch
+# this needs coreutils, dctrl-tools and wget added to
+# build-packages when used via snapcraft.yaml
+
+ARCH=arm64
+SERIES=focal
+
+PKGLIST="$*"
+echo "$(basename "$0"): obtaining packages for $ARCH: $PKGLIST"
+
+case $ARCH in
+    armhf|arm64)
+        SERVER="http://ports.ubuntu.com"
+        ;;
+    *)
+        SERVER="http://archive.ubuntu.com/ubuntu"
+        ;;
+esac
+
+for pkg in $PKGLIST; do
+    PKGPATH=""
+    for POCKET in universe main; do
+        PACKAGES="$SERVER/dists/$SERIES/$POCKET/binary-$ARCH/Packages.gz"
+        UPACKAGES="$SERVER/dists/$SERIES-updates/$POCKET/binary-$ARCH/Packages.gz"
+        if wget -q -O- $UPACKAGES | zcat | grep-dctrl -P "${pkg}" |
+                grep Filename | grep -q "/${pkg}_"; then
+            PKGPATH="$(wget -q -O- $UPACKAGES | zcat | grep-dctrl -P "${pkg}" |
+                grep Filename | grep "${pkg}_" | sed 's/^Filename: //')"
+        elif wget -q -O- $PACKAGES | zcat | grep-dctrl -P "${pkg}" |
+                grep Filename | grep -q "/${pkg}_"; then
+            PKGPATH="$(wget -q -O- $PACKAGES | zcat | grep-dctrl -P "${pkg}" |
+                grep Filename | grep "${pkg}_" | sed 's/^Filename: //')"
+        else
+            PKGPATH=""
+        fi
+        if [ -n "$PKGPATH" ]; then
+            echo "unpacking $pkg from $SERVER/$PKGPATH"
+            wget -q -O- $SERVER/$PKGPATH | dpkg -x - .
+        fi
+    done
+done
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f061384..9bbe800 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -11,10 +11,6 @@ build-base: core18
 
 architectures:
   - build-on: amd64
-    run-on: armhf, arm64
-  - build-on: armhf
-    run-on: armhf
-  - build-on: arm64
     run-on: arm64
 
 # environment to run fde-setup hook
@@ -40,6 +36,7 @@ parts:
         kernel-initrd-core-base: core20
         kernel-initrd-flavour: edge-splash
         kernel-initrd-compression: gz
+        kernel-run-on: arm64
         kernel-initrd-addons:
             - usr/bin/fde-reveal-key
             - usr/lib/libteec.so*
@@ -222,12 +219,19 @@ parts:
                 echo "Cross building for arm64"
                 export CROSS_COMPILE="aarch64-linux-gnu-"
             fi
+            $SNAPCRAFT_PROJECT_DIR/snap-tools/get-packages.sh libjson-c4 libjson-c-dev
             export ARCH="arm64"
             export TA_DEV_KIT_DIR="${SNAPCRAFT_STAGE}/export-ta_arm64"
             export CFG_TEE_CLIENT_LOG_LEVEL="1"
             export OPTEE_CLIENT_EXPORT="${SNAPCRAFT_STAGE}/usr"
             export DESTDIR=${SNAPCRAFT_PART_INSTALL}
             export O="${SNAPCRAFT_PART_BUILD}/out"
+            inc_d1=-I"$SNAPCRAFT_STAGE"/usr/include/
+            inc_d2=-I"$SNAPCRAFT_STAGE"/export-ta_arm64/host_include/
+            inc_d3=-I"$PWD"/ta/fde_key_handler/include/
+            inc_d4=-I"$PWD"/usr/include/
+            export CFLAGS="$inc_d1 $inc_d2 $inc_d3 $inc_d4"
+            export LDFLAGS="-L$PWD/usr/lib/aarch64-linux-gnu/"
             make -j$(nproc)
             make install
         organize:
@@ -240,7 +244,7 @@ parts:
 
     test-keys:
         plugin: dump
-        source: git+ssh://[e-mail]/~ondrak/+git/dev-keys
+        source: https://git.launchpad.net/~ondrak/+git/dev-keys
         source-type: git
         source-branch: master
         organize:
@@ -267,4 +271,3 @@ build-packages:
     - bison
     - initramfs-tools-core
     - wget
-    - libjson-c-dev:arm64