Include libi2c0 dependency in .deb packages

Merge branch 'master' into nxp
Add libi2c-dev to native builds
2025-09-20 16:56:17 +00:00 · 2024-12-22 22:28:35 -06:00 · 2024-12-22 21:26:31 -06:00 · 2024-12-22 21:25:48 -06:00 · 2024-12-22 21:20:36 -06:00
8 changed files with 10 additions and 10 deletions
--- a/.github/workflows/build_native.yml
+++ b/.github/workflows/build_native.yml
@ -14,7 +14,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
      - name: Checkout code
        uses: actions/checkout@v4
--- a/.github/workflows/build_raspbian.yml
+++ b/.github/workflows/build_raspbian.yml
@ -14,7 +14,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
      - name: Checkout code
        uses: actions/checkout@v4
--- a/.github/workflows/build_raspbian_armv7l.yml
+++ b/.github/workflows/build_raspbian_armv7l.yml
@ -14,7 +14,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
      - name: Checkout code
        uses: actions/checkout@v4
--- a/.github/workflows/package_amd64.yml
+++ b/.github/workflows/package_amd64.yml
@ -79,7 +79,7 @@ jobs:
          maintainer: Jonathan Bennett
          version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
          arch: amd64
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
          desc: Native Linux Meshtastic binary.
      - uses: actions/upload-artifact@v4
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@ -79,7 +79,7 @@ jobs:
          maintainer: Jonathan Bennett
          version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
          arch: arm64
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
          desc: Native Linux Meshtastic binary.
      - uses: actions/upload-artifact@v4
--- a/.github/workflows/package_raspbian_armv7l.yml
+++ b/.github/workflows/package_raspbian_armv7l.yml
@ -79,7 +79,7 @@ jobs:
          maintainer: Jonathan Bennett
          version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
          arch: armhf
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
          desc: Native Linux Meshtastic binary.
      - uses: actions/upload-artifact@v4
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@ -39,4 +39,5 @@ build_flags =
  -lbluetooth
  -lgpiod
  -lyaml-cpp
  -li2c
  -std=c++17
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@ -6,7 +6,6 @@ build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
  -I /usr/include
  !pkg-config --libs libulfius --silence-errors || :
  !pkg-config --libs openssl --silence-errors || :
  -li2c
 board = cross_platform
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
Author	SHA1	Message	Date
Jonathan Bennett	ef9540569f	Include libi2c0 dependency in .deb packages	2024-12-22 22:28:35 -06:00
Jonathan Bennett	0c6d1c9106	Merge branch 'master' into nxp	2024-12-22 21:26:31 -06:00
Jonathan Bennett	6a2a4ffa2a	Add libi2c-dev to native builds	2024-12-22 21:25:48 -06:00
Jonathan Bennett	3ec30a171e	Put the flag in the right place	2024-12-22 21:20:36 -06:00