remove references to bullseye, bookworm is now used in all configurat…

…ions Signed-off-by: Cedric Hombourger <[email protected]>
siemens · Aug 4, 2023 · 762a6c2 · 762a6c2
1 parent d488beb
commit 762a6c2
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 60 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -53,8 +53,8 @@ jobs:
         with:
           name: mtda-nanopi-images
           path: |
-            build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-bullseye-nanopi-*.wic
-            build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-bullseye-nanopi-*.wic.bmap
+            build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-*-nanopi-*.wic
+            build-nanopi/tmp/deploy/images/nanopi-*/mtda-image-mtda-*-nanopi-*.wic.bmap
       - name: Publish .deb to Gemfury
         env:
           GEMFURY_PUSH_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }}

diff --git a/docs/build.rst b/docs/build.rst
@@ -208,7 +208,7 @@ for IoT applications.
 It has two Ethernet ports, on-board Wi-Fi and Bluetooth, a micro SD card slot
 and two USB ports. It takes power from its micro USB port.
 
-Debian (bullseye) will be loaded on the microSD card and will include the MTDA
+Debian (bookworm) will be loaded on the microSD card and will include the MTDA
 agent. It will communicate with its clients over Ethernet. An electric relay
 will be controlled via USB to drive power for our Device Under Test.
 Communication with that device will be achieved via the USB OTG port where the
@@ -329,7 +329,7 @@ FriendlyARM for makers, hobbyists and fans.
 It is powered by an Allwinner H3 (Cortex A7), has a microSD slot, a microUSB
 OTG port, a USB-Host Type A port, an Ethernet port and GPIO pins.
 
-Debian (bullseye) will be loaded on the microSD card and will include the MTDA
+Debian (bookworm) will be loaded on the microSD card and will include the MTDA
 agent. It will communicate with its clients over Ethernet. An electric relay
 will be controlled via a GPIO line in order to drive power for our Device Under
 Test. Communication with that device will be achieved via the USB OTG port

diff --git a/docs/install.rst b/docs/install.rst
@@ -1,10 +1,10 @@
 Installation
 ============
 
-Using apt on Debian 11
+Using apt on Debian 12
 ----------------------
 
-Packages for Debian 11 (bullseye) may be installed as follows::
+Packages for Debian 12 (bookworm) may be installed as follows::
 
    $ echo 'deb [trusted=yes] https://apt.fury.io/mtda/ /' | \
      sudo tee /etc/apt/sources.list.d/mtda.list

diff --git a/kas/debian/bullseye-base.yml b/kas/debian/bullseye-base.yml
diff --git a/meta-isar/conf/apt/debian-bullseye-backports.conf b/meta-isar/conf/apt/debian-bullseye-backports.conf
diff --git a/meta-isar/conf/apt/debian-bullseye-backports.list b/meta-isar/conf/apt/debian-bullseye-backports.list
diff --git a/meta-isar/conf/distro/mtda-bullseye.conf b/meta-isar/conf/distro/mtda-bullseye.conf
diff --git a/meta-isar/conf/multiconfig/nanopi-neo.conf b/meta-isar/conf/multiconfig/nanopi-neo.conf
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: MIT
 # ---------------------------------------------------------------------------
 
-DISTRO = "mtda-bullseye"
+DISTRO = "mtda-bookworm"
 MACHINE = "nanopi-neo"
diff --git a/meta-isar/conf/multiconfig/nanopi-r1.conf b/meta-isar/conf/multiconfig/nanopi-r1.conf
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier: MIT
 # ---------------------------------------------------------------------------
 
-DISTRO = "mtda-bullseye"
+DISTRO = "mtda-bookworm"
 MACHINE = "nanopi-r1"
diff --git a/meta-isar/recipes-python/mtda/mtda_git.bb b/meta-isar/recipes-python/mtda/mtda_git.bb
@@ -36,7 +36,6 @@ SRC_URI += "${@' '.join(['file://' + d.getVar('LAYERDIR_mtda') + '/../' + file f
 S = "${WORKDIR}/working-repo"
 
 DEPENDS += "zerorpc-python kconfiglib py3qterm"
-DEPENDS:append:bullseye = " zstandard"
 
 do_gen_working_repo() {
 	for file in ${MTDA_FILES}; do