Merge ~sylvain-pineau/checkbox-limerick/+git/checkbox-provider-limerick:firmware-deb into ~checkbox-dev/checkbox-limerick/+git/checkbox-provider-limerick:master

[Sylvain Pineau]

Use the firmware deb to load the DTB

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/bin/component_test.py b/bin/component_test.py
index 4f4c4ba..eb296aa 100755
--- a/bin/component_test.py
+++ b/bin/component_test.py
@@ -20,15 +20,13 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 import codecs
-import glob
 import os
 import re
 import subprocess
 import sys
 
-p = glob.glob('/usr/lib/firmware/*/device-tree/{}'.format(
-    codecs.decode("kvyvak", "rot-13")))[0]
-dtb = os.path.join(p, '{}.dtb'.format(sys.argv[1]))
+p = '/usr/share/{}'.format(codecs.decode("kyak-svezjner", "rot-13"))
+dtb = os.path.join(p, sys.argv[1], '{}_system.dtb'.format(sys.argv[1]))
 dt_lookup_list = []
 exit_status = 0
 
diff --git a/units/components/jobs.pxu b/units/components/jobs.pxu
index 524bcd6..2968ef1 100644
--- a/units/components/jobs.pxu
+++ b/units/components/jobs.pxu
@@ -2,7 +2,7 @@ unit: template
 template-resource: limerick_sku
 id: dtb/components_{name}
 _summary: Check all DTB compatible properties are loaded in /proc/device-tree
-command: component_test.py {name}
+command: component_test.py {short_name}
 plugin: shell
 category_id: dtb_components
 estimated_duration: 1m
diff --git a/units/device/jobs.pxu b/units/device/jobs.pxu
index 3a9fde5..19b36d1 100644
--- a/units/device/jobs.pxu
+++ b/units/device/jobs.pxu
@@ -20,6 +20,7 @@ plugin: resource
 _summary: Detect which Limerick SKU the tool is running on
 command:
  perl -ne 's/ /-/g;s/(.*?)([A-Z]?)\W+$/\L$1\U$2/; print "name: $_\n"' /proc/device-tree/model
+ perl -ne 's/.*?\s(\S+).*/$1/i; print "short_name: \L$_\n\n"' /proc/device-tree/model
 estimated_duration: 1s
 
 id: device-connections-tp