From d301f0cc4e467bdd7d2988056820fafbe3c6cfbf Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 10 May 2018 10:04:23 +0100 Subject: Do not parse firmware files Firmware should now be distributed using the LVFS and consumed by fwupd. --- data/tests/firmware/2_0_0/firmware.bin | 1 - data/tests/firmware/2_0_0/firmware.inf | 22 --------------- data/tests/firmware/2_0_1/firmware.bin | 1 - data/tests/firmware/2_0_1/firmware.inf | 21 --------------- data/tests/firmware/2_0_1/firmware.metainfo.xml | 33 ----------------------- data/tests/firmware/2_0_2/firmware.bin | 1 - data/tests/firmware/2_0_2/firmware.inf | 21 --------------- data/tests/firmware/2_0_2/firmware.metainfo.xml | 36 ------------------------- data/tests/meson.build | 29 -------------------- 9 files changed, 165 deletions(-) delete mode 100644 data/tests/firmware/2_0_0/firmware.bin delete mode 100644 data/tests/firmware/2_0_0/firmware.inf delete mode 100644 data/tests/firmware/2_0_1/firmware.bin delete mode 100644 data/tests/firmware/2_0_1/firmware.inf delete mode 100644 data/tests/firmware/2_0_1/firmware.metainfo.xml delete mode 100644 data/tests/firmware/2_0_2/firmware.bin delete mode 100644 data/tests/firmware/2_0_2/firmware.inf delete mode 100644 data/tests/firmware/2_0_2/firmware.metainfo.xml (limited to 'data') diff --git a/data/tests/firmware/2_0_0/firmware.bin b/data/tests/firmware/2_0_0/firmware.bin deleted file mode 100644 index d07b709..0000000 --- a/data/tests/firmware/2_0_0/firmware.bin +++ /dev/null @@ -1 +0,0 @@ -a binary file diff --git a/data/tests/firmware/2_0_0/firmware.inf b/data/tests/firmware/2_0_0/firmware.inf deleted file mode 100644 index bf64f8b..0000000 --- a/data/tests/firmware/2_0_0/firmware.inf +++ /dev/null @@ -1,22 +0,0 @@ -; Copyright (C) 2015 Hughski Limited - -[Version] -Class=Firmware -ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52} -DriverVer=03/01/2015,2.0.0 -Provider=%Provider% -AppstreamId=com.hughski.ColorHug2.firmware - -[Firmware_CopyFiles] -firmware.bin - -[Firmware_AddReg] -HKR,,FirmwareId,,{84f40464-9272-4ef7-9399-cd95f12da696} -HKR,,FirmwareVersion,%REG_DWORD%,0x2000000 -HKR,,FirmwareFilename,,firmware.bin - -[Strings] -Provider = "Hughski Limited" -FirmwareDesc = "ColorHug Firmware" -DiskName = "Firmware for the ColorHug Colorimeter" -REG_DWORD = 0x00010001 diff --git a/data/tests/firmware/2_0_1/firmware.bin b/data/tests/firmware/2_0_1/firmware.bin deleted file mode 100644 index d07b709..0000000 --- a/data/tests/firmware/2_0_1/firmware.bin +++ /dev/null @@ -1 +0,0 @@ -a binary file diff --git a/data/tests/firmware/2_0_1/firmware.inf b/data/tests/firmware/2_0_1/firmware.inf deleted file mode 100644 index 83b181d..0000000 --- a/data/tests/firmware/2_0_1/firmware.inf +++ /dev/null @@ -1,21 +0,0 @@ -; Copyright (C) 2015 Hughski Limited - -[Version] -Class=Firmware -ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52} -DriverVer=03/03/2015,2.0.1 -Provider=%Provider% - -[Firmware_CopyFiles] -firmware.bin - -[Firmware_AddReg] -HKR,,FirmwareId,,{84f40464-9272-4ef7-9399-cd95f12da696} -HKR,,FirmwareVersion,%REG_DWORD%,0x2000001 -HKR,,FirmwareFilename,,firmware.bin - -[Strings] -Provider = "Hughski Limited" -FirmwareDesc = "ColorHug Firmware" -DiskName = "Firmware for the ColorHug Colorimeter" -REG_DWORD = 0x00010001 diff --git a/data/tests/firmware/2_0_1/firmware.metainfo.xml b/data/tests/firmware/2_0_1/firmware.metainfo.xml deleted file mode 100644 index c92852d..0000000 --- a/data/tests/firmware/2_0_1/firmware.metainfo.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - com.hughski.ColorHug2.firmware - ColorHug Firmware - Firmware for the ColorHug Colorimeter - -

- Updating the firmware on your ColorHug device improves performance and - adds new features. -

-
- - 84f40464-9272-4ef7-9399-cd95f12da696 - - http://www.hughski.com/ - CC0-1.0 - GPL-2.0+ - richard_at_hughsie.com - Hughski Limited - - - http://www.hughski.com/downloads/colorhug2/firmware/colorhug-2.0.1.cab - -

This unstable release adds the following features:

-
    -
  • Use TakeReadings() to do a quick non-adaptive measurement
  • -
  • Scale XYZ measurement with a constant factor to make the CCMX more sane
  • -
-
-
-
-
diff --git a/data/tests/firmware/2_0_2/firmware.bin b/data/tests/firmware/2_0_2/firmware.bin deleted file mode 100644 index d07b709..0000000 --- a/data/tests/firmware/2_0_2/firmware.bin +++ /dev/null @@ -1 +0,0 @@ -a binary file diff --git a/data/tests/firmware/2_0_2/firmware.inf b/data/tests/firmware/2_0_2/firmware.inf deleted file mode 100644 index e5807ce..0000000 --- a/data/tests/firmware/2_0_2/firmware.inf +++ /dev/null @@ -1,21 +0,0 @@ -; Copyright (C) 2015 Hughski Limited - -[Version] -Class=Firmware -ClassGuid={f2e7dd72-6468-4e36-b6f1-6488f42c1b52} -DriverVer=03/03/2015,2.0.2 -Provider=%Provider% - -[Firmware_CopyFiles] -firmware.bin - -[Firmware_AddReg] -HKR,,FirmwareId,,{84f40464-9272-4ef7-9399-cd95f12da696} -HKR,,FirmwareVersion,%REG_DWORD%,0x02000002 -HKR,,FirmwareFilename,,firmware.bin - -[Strings] -Provider = "Hughski Limited" -FirmwareDesc = "ColorHug Firmware" -DiskName = "Firmware for the ColorHug Colorimeter" -REG_DWORD = 0x00010001 diff --git a/data/tests/firmware/2_0_2/firmware.metainfo.xml b/data/tests/firmware/2_0_2/firmware.metainfo.xml deleted file mode 100644 index 11028c9..0000000 --- a/data/tests/firmware/2_0_2/firmware.metainfo.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - com.hughski.ColorHug2.firmware - ColorHug Firmware - Firmware for the ColorHug Colorimeter - -

- Updating the firmware on your ColorHug device improves performance and - adds new features. -

-
- - 84f40464-9272-4ef7-9399-cd95f12da696 - - http://www.hughski.com/ - CC0-1.0 - GPL-2.0+ - richard_at_hughsie.com - Hughski Limited - - - http://www.hughski.com/downloads/colorhug2/firmware/colorhug-2.0.2.cab - -

This unstable release adds the following features:

-
    -
  • Add TakeReadingArray to enable panel latency measurements
  • -
  • - Speed up the auto-scaled measurements considerably, using 256ms - as the smallest sample duration -
  • -
-
-
-
-
diff --git a/data/tests/meson.build b/data/tests/meson.build index 2803c34..8b13789 100644 --- a/data/tests/meson.build +++ b/data/tests/meson.build @@ -1,30 +1 @@ -if get_option('builder') - firmware200 = custom_target('firmware-2.0.0', - output : 'colorhug-als-2.0.0.cab', - input : [ - 'firmware/2_0_0/firmware.inf', - 'firmware/2_0_0/firmware.bin' - ], - command : [gcab, '--create', '--nopath', '@OUTPUT@', '@INPUT@'], - ) - firmware201 = custom_target('firmware-2.0.1', - output : 'colorhug-als-2.0.1.cab', - input : [ - 'firmware/2_0_1/firmware.inf', - 'firmware/2_0_1/firmware.bin', - 'firmware/2_0_1/firmware.metainfo.xml' - ], - command : [gcab, '--create', '--nopath', '@OUTPUT@', '@INPUT@'], - ) - - firmware202 = custom_target('firmware-2.0.2', - output : 'colorhug-als-2.0.2.cab', - input : [ - 'firmware/2_0_2/firmware.inf', - 'firmware/2_0_2/firmware.bin', - 'firmware/2_0_2/firmware.metainfo.xml' - ], - command : [gcab, '--create', '--nopath', '@OUTPUT@', '@INPUT@'], - ) -endif -- cgit v1.2.1