Commit Graph

61 Commits

Author SHA1 Message Date
Wang Mingyu
b624fc1b1b diffoscope: upgrade 235 -> 236
(From OE-Core rev: f2a7a4a899dff74b88c4192f1d97a14833016029)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-03-01 21:29:31 +00:00
Alexander Kanavin
718031ba88 diffoscope: upgrade 234 -> 235
(From OE-Core rev: 53ff8e5b6163fbdf74efc32cdd55f1631a24f5c1)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-02-20 15:18:30 +00:00
Alexander Kanavin
7770bfcc80 diffoscope: upgrade 230 -> 234
(From OE-Core rev: a86d9629f95a1445740462e7466679fef6ab2f3f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-02-09 09:57:25 +00:00
Alexander Kanavin
e13854ad68 diffoscope: upgrade 224 -> 230
(From OE-Core rev: f303922e62f61a91d21f360736d073cbb46c5045)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2023-01-06 12:03:47 +00:00
Alexander Kanavin
383a0dccdc diffoscope: upgrade 221 -> 224
(From OE-Core rev: f3d5dae25aca7bc63cdb33a6202cb35e9815274a)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-11-08 22:47:16 +00:00
Richard Purdie
fa86bfd361 diffoscope: upgrade 220 -> 221
(From OE-Core rev: 09c1cac053c2892e3af3250cc6229e8da78e7a50)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-09-17 07:47:08 +01:00
Alexander Kanavin
f335acfc81 diffoscope: upgrade 218 -> 220
(From OE-Core rev: ba07e54c4bc1c1d6c79d226dfcf219ad9bca5b12)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-08-10 08:25:28 +01:00
Alexander Kanavin
e1ebf1cd25 diffoscope: upgrade 217 -> 218
(From OE-Core rev: c2cf956881c3b691691f50b00b0d6930d8abea6f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-07-23 13:55:26 +01:00
Alexander Kanavin
2e70ad86d9 diffoscope: upgrade 216 -> 217
(From OE-Core rev: cb4c865b3185db61cf85f532fabeaeb63eac461f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-07-08 00:09:42 +01:00
Alexander Kanavin
9929474868 diffoscope: upgrade 215 -> 216
(From OE-Core rev: 6c1683863302ecde281f3c10f0ca27d33965d164)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-06-22 22:40:28 +01:00
Richard Purdie
bc47a27e14 diffoscope: upgrade 212 -> 215
(From OE-Core rev: befecd6d8e0626abeee7bfca488cbbea52b9bf5c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-06-04 11:28:23 +01:00
Alexander Kanavin
aa7fd403df diffoscope: upgrade 211 -> 212
(From OE-Core rev: 47da9da7fdffd66c1d639f10f4d2925331a28ca3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-05-20 22:52:22 +01:00
Alexander Kanavin
873f5fd669 diffoscope: upgrade 208 -> 211
(From OE-Core rev: 2cf26abcc36e945417229c0bebb0861e9b343e63)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-05-05 21:17:37 +01:00
wangmy
eb2f29d6f8 diffoscope: upgrade 207 -> 208
(From OE-Core rev: 9befbe17c1ff8222c782489cead17e441a927ae1)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-29 15:59:28 +01:00
Alexander Kanavin
ce775f77f6 diffoscope: upgrade 206 -> 207
(From OE-Core rev: 7b65b733d4771497974e66885d188f9db187901a)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-20 00:02:22 +00:00
Alexander Kanavin
d662b6f152 diffoscope: upgrade 204 -> 206
(From OE-Core rev: ef6421463a2d5748474016d6ca4c299d6cf78dbe)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-09 11:46:27 +00:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Alexander Kanavin
019bf409d9 diffoscope: upgrade 202 -> 204
(From OE-Core rev: 77dcb7c0a99a210e0987f70715cfd0ceb8027d93)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-18 11:37:12 +00:00
Alexander Kanavin
8f0bd6676c diffoscope: upgrade 201 -> 202
(From OE-Core rev: 62d38e8ce8f058f3fc9b1ddea79157d8c48bd7af)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-05 17:46:05 +00:00
Alexander Kanavin
2d9be515d8 diffoscope: upgrade 200 -> 201
(From OE-Core rev: 4d056dac3b01acc5f57e958cc1debc6ef0d98810)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-01 07:31:17 +00:00
Alexander Kanavin
132d2c86fb diffoscope: upgrade 199 -> 200
(From OE-Core rev: 72a39ff2a23b8dbee32715d18afcb258f4005510)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-01-20 11:57:29 +00:00
wangmy
06bedd759d diffoscope: upgrade 196 -> 199
Changelog:
=========
* Support both variants of "odt2txt", including the one provided by unoconv.
  (Closes: reproducible-builds/diffoscope#298)

* Add external tool reference on Arch Linux for xb-tool.

(From OE-Core rev: 763c44e30c20ebcd4199d41fa76dae3d3b4ec5c3)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-01-11 15:48:10 +00:00
Alexander Kanavin
e326f0da6b diffoscope: upgrade 194 -> 196
(From OE-Core rev: 35ab4d42d557d5810b41bf2cc681d67da9213829)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-12-17 09:56:14 +00:00
Alexander Kanavin
44eeb36a1f diffoscope: upgrade 192 -> 194
(From OE-Core rev: 9cf813fe8c8bd9b3beb89242b19e9782abe3bc48)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-12-09 10:33:26 +00:00
Alexander Kanavin
437f4fae52 diffoscope: upgrade 190 -> 192
(From OE-Core rev: 69144352ecfefa596d5ec94fbc7ef3eefe9a37c1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-21 11:05:01 +00:00
wangmy
ac34f24442 diffoscope: upgrade 189 -> 190
Changelog:
[Chris Lamb]
Don't raise a traceback if we cannot de-marshal Python bytecode to support
Python 3.7 loading newer .pyc files.
(Closes: reproducible-builds/diffoscope#284)
Fix Python tests under Python 3.7 with file 5.39+.

[Vagrant Cascadian]
Skip Python bytecode testing when "file" is older than 5.39.

[Roland Clobus]
Detect whether the GNU_BUILD_ID field has been modified.

(From OE-Core rev: b9c59b5d2ac29544c1877f50ec10d2126339d814)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-10 19:27:28 +00:00
Alexander Kanavin
5d31cc3ef9 diffoscope: upgrade 188 -> 189
(From OE-Core rev: a77af2b54f96cf0b743b3e22978f9a979aaf3712)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-03 11:12:25 +00:00
Alexander Kanavin
377ebfeda7 diffoscope: upgrade 187 -> 188
(From OE-Core rev: 3d505d3eed4b7ab5c18555e8d0b5489118261d21)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-28 14:16:31 +01:00
Alexander Kanavin
5357004743 diffoscope: upgrade 182 -> 187
(From OE-Core rev: abaa36442f1617bcaa941d5b159b6e40042141f8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-23 17:42:26 +01:00
wangmy
3b4b8e5ca7 diffoscope: upgrade 181 -> 182
(From OE-Core rev: 0410d639bb1b54feddd790e7ac71fa949f7151d8)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-11 18:41:37 +01:00
Alexander Kanavin
f2f0c68aab diffoscope: upgrade 179 -> 181
(From OE-Core rev: 8052c4a0f39846b4565de0a2ba466e15e39f656b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-23 08:25:53 +01:00
Richard Purdie
5f3d28c2a2 diffoscope: Upgrade 178 -> 179
(From OE-Core rev: c889354ead36c332ee47bbeadea0dfd96d7dd5d3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-05 08:53:41 +01:00
wangmy
47f588dc36 diffoscope: upgrade 177 -> 178
(From OE-Core rev: 6cfc180c95e4275c619fc943916306ba5f5ed475)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:11 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
wangmy
e8e5b166e9 diffoscope: upgrade 175 -> 177
(From OE-Core rev: 80ab050b1d0aa1bc26321979c69117245e7755fd)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-11 23:50:58 +01:00
Richard Purdie
5e3580e1e1 diffoscope: upgrade 172 -> 175
(From OE-Core rev: 7b6ace9394aef54025744bdf187166049ac17b31)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-18 12:43:00 +01:00
Alexander Kanavin
5c2ccb059d diffoscope: add native libraries to LD_LIBRARY_PATH
Reversal of global setting in previous commit necessitates
a local fix, otherwise, this happens:

  File "/home/pokybuild/yocto-worker/reproducible-debian/build/build-st-52142/tmp/work/x86_64-linux/diffoscope-native/172-r0/recipe-sysroot-native/usr/lib/python3.9/ctypes/__init__.py", line 392, in __getitem__
    func = self._FuncPtr((name_or_ordinal, self))
AttributeError: nativepython3: undefined symbol: archive_errno

(From OE-Core rev: 87884d9938829d5ae5d250f483c749e00cd83322)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-06 08:41:26 +01:00
Richard Purdie
82d7dc9709 diffoscope: Upgrade 168 -> 172
In particular 170 includes rpm header fixes which stop the webpages
for rpm diffs breaking web browsers and are important in the context
of the autobuilder.

(From OE-Core rev: 275738c3f2116de9b812b46e00d80b4de6975d7f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-06 09:30:10 +01:00
Meh Mbeh Ida Delphine
c8075ed8f1 recipes-support: Add missing HOMEPAGE and DESCRIPTION for recipes
Fixes: [YOCTO #13471]

(From OE-Core rev: 6db24928d62aeb093a0e6da6619713eaca57a96f)

Signed-off-by: Ida Delphine <idadelm@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-02 20:39:36 +00:00
Richard Purdie
fc222345f0 diffoscope: Upgrade 167 -> 168
This includes a fix for the 'hang' on larger diffs with html output
as seen on the autobuilder.

(From OE-Core rev: cac4ed44b302a3effd0ed6729cbf65817824604e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-01 00:17:46 +00:00
Richard Purdie
1fe4a25f22 diffoscope: Ensure rpm is configured correctly
diffoscope was failing as rpm wasn't configured correctly. Fix this.

(From OE-Core rev: 93ad1ab49be03dd082a98f80464cfee9d98a3a33)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-24 12:42:49 +00:00
Joshua Watt
a809420449 diffoscope: Add python3-rpm as dependency
The python3-rpm package is required for diffoscope to diff RPM packages

(From OE-Core rev: 5331d9c63022c5434b4c70d404c7546316a6f9f1)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-24 00:19:38 +00:00
Richard Purdie
116743ecc2 diffoscope: Ensure the correct magic file is used
diffoscope uses libmagic and it was searching in file-native's sysroot
for the magic file. Wrap it and set MAGIC in the environment to
ensure the file is found correctly and avoid build failures.

(From OE-Core rev: 3488a8316891829892bd41a1caacaeeef73da7ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-23 22:35:01 +00:00
Richard Purdie
6ec9508caf diffoscope: Upgrade 166 -> 167
(From OE-Core rev: 56dd9ba4d0cd211ba4aacf565d85bda45df1ccee)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-23 22:35:00 +00:00
Anuj Mittal
6517a4dbb3 diffoscope: upgrade 164 -> 166
(From OE-Core rev: e75c13b5e7ddf52b06e2d5b89790c8571e7b4ea0)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-19 11:17:11 +00:00
Joshua Watt
e9bd99fe38 diffoscope: upgrade 163 -> 164
[ Chris Lamb ]
* Truncate jsondiff differences at 512 bytes lest they consume the
  entire page.
* Wrap our external call to cmp(1) with a profile (to match the internal
  profiling).
* Add a note regarding the specific ordering of the new
  all_tools_are_listed test.

[ Dimitrios Apostolou ]
* Performance improvements:
  - Improve speed of has_same_content by spawning cmp(1) less
    frequently.
  - Log whenever the external cmp(1) command is spawn.ed
  - Avoid invoking external diff for identical, short outputs.
* Rework handling of temporary files:
  - Clean up temporary directories as we go along, instead of at the
    end.
  - Delete FIFO files when the FIFO feeder's context manager exits.

[ Mattia Rizzolo ]
* Fix a number of potential crashes in --list-debian-substvars,
  including explicitly listing lipo and otool as external tools.
 - Remove redundant code and let object destructors clean up after
   themselves.

[ Conrad Ratschan ]
* Add a comparator for Flattened Image Trees (FIT) files, a boot image
  format used by U-Boot.

(From OE-Core rev: 65feaffe9857029fa230935cb0c3e8e6f2815776)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-16 22:39:35 +00:00
Alexander Kanavin
b24831ee76 diffoscope: upgrade 161 -> 163
(From OE-Core rev: 431c43b24d6ee85ba8d1ab89f4ed71f0ff4f79b9)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-30 14:01:06 +00:00
Alexander Kanavin
faef5ddfab diffoscope: upgrade 160 -> 161
(From OE-Core rev: 1d2d6b801d553d63db671e5f574c892f4623b753)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-03 08:21:12 +00:00
Pierre-Jean Texier
602066af70 diffoscope: upgrade 158 -> 160
This includes the following changes:

Version 159:

* Show "ordering differences only" in strings(1) output.
  (Closes: reproducible-builds/diffoscope#216)
* Don't alias output from "os.path.splitext" to variables that we do not end
  up using.
* Don't raise exceptions when cleaning up after a guestfs cleanup failure.
* Make "Command" subclass a new generic Operation class.

Version 160:

* Check that pgpdump is actually installed before attempting to run it.
  Thanks to Gianfranco Costamagna (locutusofborg). (Closes: #969753)
* Add some documentation for the EXTERNAL_TOOLS dictionary.
* Ensure we check FALLBACK_FILE_EXTENSION_SUFFIX, otherwise we run pgpdump
  against all files that are recognised by file(1) as "data".

(From OE-Core rev: 6433feb0705f969923d032cc289e7b210e11aa23)

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-14 00:14:28 +01:00
Joshua Watt
ca71b89c6c diffoscope: upgrade 156 -> 158
(From OE-Core rev: 017aff2bc127cad6c9d0f6feefc2e200a06efec2)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-02 16:00:46 +01:00