Update edition, deps, toolchain

pop-os / system76-firmware

System76 Firmware Tool and Daemon

GNU General Public License v3.0

74 stars 28 forks source link

Update edition, deps, toolchain #92

Closed crawfxrd closed 11 months ago

crawfxrd commented 2 years ago

Update:

toolchain: 1.61.0 -> 1.70.0
edition: 2018 -> 2021
buildchain: 0.4.12 -> 0.5.0
sha2: 0.9.9 -> 0.10.8
tempdir: Replaced with tempfile 3.8.0
uuid: 0.8.2 -> 1.4.1

Fix:

clippy::into_iter_on_ref
clippy::needless_borrow
clippy::op_ref
clippy::or_fun_call
clippy::redundant_clone
clippy::redundant_field_names
clippy::redundant_static_lifetimes
clippy::search_is_some
clippy::single_component_path_imports
clippy::useless_format

Ignore:

clippy::single_match

crawfxrd commented 1 year ago

It looks like https://github.com/alexcrichton/tar-rs/commit/d90a02f582c03dfa0fd11c78d608d0974625ae5d is what broke it.

The problem seems to be we're specifying a path (firmware) that isn't in the archive.

Timestamps on the archive are completely broken as well, which might be causing an error.

$ tar xvf V45RXGBL5NOF2SSO2HQI5GEBMP3X3CXSCJ2E35MP2JWI3LJXZ5WKYSTYP3N5GEEFKZOO3MV622ACU
./
./boot.efi
tar: ./boot.efi: implausibly old time stamp -9223372036854775808
./res/
./res/firmware.nsh
tar: ./res/firmware.nsh: implausibly old time stamp -9223372036854775808
./res/shell.efi
tar: ./res/shell.efi: implausibly old time stamp -9223372036854775808
./res/splash.bmp
tar: ./res/splash.bmp: implausibly old time stamp -9223372036854775808
tar: ./res: implausibly old time stamp -9223372036854775808
tar: .: implausibly old time stamp -9223372036854775808

$ ls -l res/
total 1352
-r-------- 1 tcrawford tcrawford   5787 Dec 13  1901 firmware.nsh
-r-------- 1 tcrawford tcrawford 916896 Dec 13  1901 shell.efi
-r-------- 1 tcrawford tcrawford 455038 Dec 13  1901 splash.bmp

crawfxrd commented 1 year ago

Archive timestamp issue fixed in system76/firmware#476
Issue with newer versions of tar fixed
Replaced deprecated tempdir with tempfile

For a followup PR: I don't think it's necessary to extract each file ourselves just to print it. We should use unpack() and let tar handle it.

crawfxrd commented 1 year ago

This appears to break the firmware application in Ubuntu Focal.

Does it fail to start or does it not work in some way?

leviport commented 1 year ago

The window appears, but the window is blank and I can't interact with it, then the "force quit" prompt appears.

crawfxrd commented 1 year ago

I'm going to do the tar changes separately, since I think that is what is breaking it.

leviport commented 1 year ago

Yep, looks like that fixed it on Ubuntu Focal. I'm going to do some quick tests on Pop, but I'll probably be approving this very soon.