Skip to content

Commit 66e2b08

Browse files
committed
No longer require libudev
1 parent aab2ad4 commit 66e2b08

File tree

6 files changed

+8
-56
lines changed

6 files changed

+8
-56
lines changed

.github/actions/setup-target/action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,14 @@ runs:
5050
git \
5151
"libc6:${{ inputs.arch }}" \
5252
"libgcc-s1:${{ inputs.arch }}" \
53-
libudev-dev \
54-
"libudev-dev:${{ inputs.arch }}" \
55-
"libudev1:${{ inputs.arch }}" \
5653
musl-tools \
5754
pkg-config
5855
5956
- name: Install dependencies (x86_64 linux)
6057
if: inputs.target == 'x86_64-unknown-linux-gnu' || inputs.target == 'x86_64-unknown-linux-musl'
6158
shell: bash
6259
run: |
63-
sudo apt-get update && sudo apt-get -y install musl-tools libudev-dev pkg-config
60+
sudo apt-get update && sudo apt-get -y install musl-tools pkg-config
6461
6562
- name: Set environment variables
6663
if: inputs.arch != 'x86_64'

.github/workflows/release.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
arch: "x86_64"
4242
runs-on: ${{ matrix.platform.os }}
4343
steps:
44-
4544
- uses: actions/checkout@v4
4645

4746
- uses: ./.github/actions/package
@@ -51,12 +50,10 @@ jobs:
5150
target: ${{ matrix.platform.target }}
5251
runs_on: ${{ matrix.platform.os }}
5352

54-
5553
publish-cratesio:
5654
name: Publish to Crates.io
5755
runs-on: ubuntu-20.04
5856
steps:
59-
6057
- uses: actions/checkout@v4
6158

6259
- name: Install Rust toolchain
@@ -68,7 +65,7 @@ jobs:
6865
uses: Swatinem/rust-cache@v2
6966

7067
- name: Install dependencies
71-
run: sudo apt-get update && sudo apt-get install musl-tools libudev-dev
68+
run: sudo apt-get update && sudo apt-get install musl-tools
7269

7370
- name: Publish espflash
7471
run: |

Cargo.lock

Lines changed: 2 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cargo-espflash/README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES
2525

2626
## Installation
2727

28-
If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.76.0` installed on your system.
29-
30-
If you are running **Linux** then [libudev] must also be installed; this is available via most popular package managers. If you are running **Windows** or **macOS** you can ignore this step.
31-
32-
```bash
33-
# Debian/Ubuntu/etc.
34-
apt-get install libudev-dev
35-
# Fedora
36-
dnf install systemd-devel
37-
```
28+
If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.
3829

3930
To install:
4031

@@ -54,7 +45,6 @@ By default, in Unix systems, we use the [`vendored-openssl` Cargo feature] which
5445
OPENSSL_NO_VENDOR=1 cargo install cargo-espflash
5546
```
5647

57-
[libudev]: https://www.freedesktop.org/software/systemd/man/latest/libudev.html
5848
[cargo-binstall]: https://github.com/cargo-bins/cargo-binstall
5949
[releases]: https://github.com/esp-rs/espflash/releases
6050
[`vendored-openssl` Cargo feature]: https://github.com/rust-lang/cargo#compiling-from-source

espflash/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ miette = "7.4.0"
4747
parse_int = { version = "0.6.0", optional = true }
4848
regex = { version = "1.11.1", optional = true }
4949
serde = { version = "1.0.217", features = ["derive"] }
50-
serialport = { version = "4.6.1", default-features = false, optional = true }
50+
serialport = { version = "4.7.0", default-features = false, optional = true }
5151
sha2 = "0.10.8"
5252
slip-codec = { version = "0.4.0", optional = true }
5353
strum = { version = "0.26.3", features = ["derive"] }
@@ -60,8 +60,7 @@ xmas-elf = "0.9.1"
6060
libc = "0.2.169"
6161

6262
[features]
63-
default = ["cli", "libudev"]
64-
libudev = ["serialport?/libudev"]
63+
default = ["cli"]
6564
cli = [
6665
"dep:addr2line",
6766
"dep:clap",

espflash/README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES
2727

2828
## Installation
2929

30-
If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.76.0` installed on your system.
31-
32-
If you are running **Linux** then [libudev] must also be installed; this is available via most popular package managers. If you are running **Windows** or **macOS** you can ignore this step.
33-
34-
```bash
35-
# Debian/Ubuntu/etc.
36-
apt-get install libudev-dev
37-
# Fedora
38-
dnf install systemd-devel
39-
```
30+
If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.
4031

4132
To install:
4233

@@ -50,7 +41,6 @@ Alternatively, you can use [cargo-binstall] to download pre-compiled artifacts f
5041
cargo binstall espflash
5142
```
5243

53-
[libudev]: https://www.freedesktop.org/software/systemd/man/latest/libudev.html
5444
[cargo-binstall]: https://github.com/cargo-bins/cargo-binstall
5545
[releases]: https://github.com/esp-rs/espflash/releases
5646

0 commit comments

Comments
 (0)