From 676122557aadf45c3e6d1b314b00df1e03edd8aa Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 10 Sep 2021 16:18:26 +0100 Subject: [PATCH 1/2] Show which files are being compared --- differences/file.groovy | 1 + differences/json.groovy | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/differences/file.groovy b/differences/file.groovy index aa4814a..ee1b8b3 100644 --- a/differences/file.groovy +++ b/differences/file.groovy @@ -1,4 +1,5 @@ def comparefiles(importedfile, currentfile, boolean ignorewhitespace = true) { + echo "Comparing file: ${importedfile} with: ${currentfile} option: ${ignorewhitespace}" def wsparameter = "-w" if (!ignorewhitespace) { wsparameter = "" diff --git a/differences/json.groovy b/differences/json.groovy index 0556188..dbf47b8 100644 --- a/differences/json.groovy +++ b/differences/json.groovy @@ -1,5 +1,5 @@ def comparefiles(importedjsonfile, currentjsonfile) { - echo "Comparing file: ${importedjsonfile} with: ${currentjsonfile}" + echo "Comparing json file: ${importedjsonfile} with: ${currentjsonfile}" if (isUnix()) { sh """ which jq From 13b84aa6d36c8097c5e70b94206c5e1434caf3f0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 11 Oct 2021 21:33:50 +0100 Subject: [PATCH 2/2] Import bootloader binaries into app package --- packaging/debian.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 65d3731..c0a4dbb 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -20,6 +20,7 @@ class DebRootDefinition { String GIS_OPT_KERNEL String GIS_OPT_LOGIC String GIS_OPT_PRINTHEAD + String GIS_OPT_BOOT String USR_BIN String USR_LIB_ARCH @@ -49,6 +50,7 @@ class DebRootDefinition { GIS_OPT_KERNEL = "${DEBPATH}/opt/gis/kernel" + inpackagepathsuffix GIS_OPT_LOGIC = "${DEBPATH}/opt/gis/logic" + inpackagepathsuffix GIS_OPT_PRINTHEAD = "${DEBPATH}/opt/gis/printhead" + inpackagepathsuffix + GIS_OPT_BOOT = "${DEBPATH}/opt/gis/boot" + inpackagepathsuffix USR_BIN = "${DEBPATH}/usr/bin" + inpackagepathsuffix USR_LIB_ARCH = "${DEBPATH}/usr/lib/arm-linux-gnueabihf" + inpackagepathsuffix