Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/actions/setup-target/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,14 @@ runs:
git \
"libc6:${{ inputs.arch }}" \
"libgcc-s1:${{ inputs.arch }}" \
libudev-dev \
"libudev-dev:${{ inputs.arch }}" \
"libudev1:${{ inputs.arch }}" \
musl-tools \
pkg-config

- name: Install dependencies (x86_64 linux)
if: inputs.target == 'x86_64-unknown-linux-gnu' || inputs.target == 'x86_64-unknown-linux-musl'
shell: bash
run: |
sudo apt-get update && sudo apt-get -y install musl-tools libudev-dev pkg-config
sudo apt-get update && sudo apt-get -y install musl-tools pkg-config

- name: Set environment variables
if: inputs.arch != 'x86_64'
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
arch: "x86_64"
runs-on: ${{ matrix.platform.os }}
steps:

- uses: actions/checkout@v4

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


publish-cratesio:
name: Publish to Crates.io
runs-on: ubuntu-20.04
steps:

- uses: actions/checkout@v4

- name: Install Rust toolchain
Expand All @@ -68,7 +65,7 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install musl-tools libudev-dev
run: sudo apt-get update && sudo apt-get install musl-tools

- name: Publish espflash
run: |
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

### Fixed

- Update the app image SHA in the correct location for padded images (#715)
- Fix `-s` argument collision (#731)

### Removed

- Removed the `libudev` feature (#742)

## [3.3.0] - 2025-01-13

### Added
Expand Down
25 changes: 2 additions & 23 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 1 addition & 11 deletions cargo-espflash/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES

## Installation

If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.76.0` installed on your system.

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.

```bash
# Debian/Ubuntu/etc.
apt-get install libudev-dev
# Fedora
dnf install systemd-devel
```
If you are installing `cargo-espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.

To install:

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

[libudev]: https://www.freedesktop.org/software/systemd/man/latest/libudev.html
[cargo-binstall]: https://github.com/cargo-bins/cargo-binstall
[releases]: https://github.com/esp-rs/espflash/releases
[`vendored-openssl` Cargo feature]: https://github.com/rust-lang/cargo#compiling-from-source
Expand Down
5 changes: 2 additions & 3 deletions espflash/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ miette = "7.4.0"
parse_int = { version = "0.6.0", optional = true }
regex = { version = "1.11.1", optional = true }
serde = { version = "1.0.217", features = ["derive"] }
serialport = { version = "4.6.1", default-features = false, optional = true }
serialport = { version = "4.7.0", default-features = false, optional = true }
sha2 = "0.10.8"
slip-codec = { version = "0.4.0", optional = true }
strum = { version = "0.26.3", features = ["derive"] }
Expand All @@ -60,8 +60,7 @@ xmas-elf = "0.9.1"
libc = "0.2.169"

[features]
default = ["cli", "libudev"]
libudev = ["serialport?/libudev"]
default = ["cli"]
cli = [
"dep:addr2line",
"dep:clap",
Expand Down
12 changes: 1 addition & 11 deletions espflash/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,7 @@ Supports the **ESP32**, **ESP32-C2/C3/C6**, **ESP32-H2**, **ESP32-P4**, and **ES

## Installation

If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.76.0` installed on your system.

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.

```bash
# Debian/Ubuntu/etc.
apt-get install libudev-dev
# Fedora
dnf install systemd-devel
```
If you are installing `espflash` from source (ie. using `cargo install`) then you must have `rustc>=1.82.0` installed on your system.

To install:

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

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

Expand Down
Loading