Migration os

.github/workflows/build.yml

@@ -33,9 +33,9 @@ jobs:
         then
           flavors='{"flavor":"alpha 2Q"}'
         else
-          flavors='{"flavor":"2Q"},{"flavor":"2R"}'
+          flavors='{"flavor":"migrationOS"}'
         fi
-        echo "::set-output name=matrix::{\"include\":[$flavors]}"
+        echo "matrix={\"include\":[$flavors]}" >> $GITHUB_OUTPUT
 
   build:
     needs: set_matrix
@@ -83,14 +83,14 @@ jobs:
         END
 
     - name: Checkout CustomPiOS
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: 'mrbeam/CustomPiOS'
         path: CustomPiOS
         ref: 'test_devpi_josef'
 
     - name: Checkout Project Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         submodules: recursive
         path: repository
@@ -115,11 +115,40 @@ jobs:
       run: |
         echo "OCTOPI_APTMIRROR=http://mirror.us.leaseweb.net/raspbian/raspbian" > repository/src/config.local
 
+    - name: Download the Beam OS 2 Image
+      uses: actions-hub/gcloud@master
+      env:
+        PROJECT_ID: devpi-310008
+        APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS_DOWNLOAD }}
+      with:
+        args: cp "${{ vars.BEAMOS2_IMAGE }}" repository/src/image/
+        cli: gsutil
+
+    - name: Extract the Beam OS 2 Image
+      id: extract_the_image
+      run: |
+        # Set the image file
+        the_image=$(basename "${{ vars.BEAMOS2_IMAGE }}")
+        source_dir="repository/src/image"
+        echo "The Beam OS 2 Image: ${the_image}"
+        target_dir="repository/src/modules/beamos/filesystem/migration/home/pi/image"
+        target_name="beamos2.wic"
+        # Extract bz2 file into target_dir
+        tar -xjf ${source_dir}/${the_image} -C $target_dir
+        # Rename the extracted image to beamos2.wic[bz2, bmap] and remove other files
+        mv ${target_dir}/mrbeam-image-*.wic.bz2 ${target_dir}/${target_name}.bz2
+        mv ${target_dir}/mrbeam-image-*.wic.bmap ${target_dir}/${target_name}.bmap
+        rm ${target_dir}/mrbeam-*
+        echo "Placed the image in ${target_dir}/${target_name}.bz2 with bmap file"
+
     - name: Build Image (MrBeam Variant)
+      env:
+        PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
       run: |
         sudo modprobe loop
         cd repository/src
         echo "export EXTRA_SSH_KEY='${{ secrets.SSH_BEAMOS01_RSA }}'" >> config
+        echo "export PERSONAL_ACCESS_TOKEN='${{ secrets.PERSONAL_ACCESS_TOKEN }}'" >> config
         sudo bash -x ./build_dist $VARIANT ${{ matrix.flavor }}
 
     - name: Copy output
@@ -142,7 +171,7 @@ jobs:
           cp repository/src/workspace/*.img $IMAGE.img
         fi
 
-        echo "::set-output name=image::$IMAGE"
+        echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # # artifact upload will take care of zipping for us
     # - uses: actions/upload-artifact@v1
@@ -158,7 +187,7 @@ jobs:
     - name: Create env variable for upload folder in gcloud bucket
       run: |
         # Use the last letter of the flavor for the directory name
-        echo "DIR=$(echo ${{ matrix.flavor }} | rev | cut -c 1)" >> $GITHUB_ENV
+        echo "DIR=$(echo ${{ matrix.flavor }})" >> $GITHUB_ENV
     - uses: actions-hub/gcloud@master
       env:
         PROJECT_ID: devpi-310008

src/modules/beamos/config

@@ -14,7 +14,7 @@ TRUE_USER=pi
 ## Dependencies
 [ -n "$BEAMOS_IOBEAM_REPO_BRANCH" ] || BEAMOS_IOBEAM_REPO_BRANCH=v1.3.1
 [ -n "$BEAMOS_MRBHWINFO_REPO_BRANCH" ] || BEAMOS_MRBHWINFO_REPO_BRANCH=v1.0.0
-[ -n "$BEAMOS_MRBEAMLED_REPO_BRANCH" ] || BEAMOS_MRBEAMLED_REPO_BRANCH=v1.0.0
+[ -n "$BEAMOS_MRBEAMLED_REPO_BRANCH" ] || BEAMOS_MRBEAMLED_REPO_BRANCH=v2.1.0a0
 [ -n "$BEAMOS_NETCONNECTD_REPO_BRANCH" ] || BEAMOS_NETCONNECTD_REPO_BRANCH=v1.0.0
 [ -n "$BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BRANCH" ] || BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BRANCH=v1.1.0
 ## BeamOS-dependencies
@@ -25,7 +25,7 @@ TRUE_USER=pi
 [ -n "$BEAMOS_NETCONNECTD_WIFI_REPO_BRANCH" ] || BEAMOS_NETCONNECTD_WIFI_REPO_BRANCH=master
 
 # MrBeamPlugin
-[ -n "$BEAMOS_INCLUDE_MRBEAMPLUGIN" ] || BEAMOS_INCLUDE_MRBEAMPLUGIN=yes
+[ -n "$BEAMOS_INCLUDE_MRBEAMPLUGIN" ] || BEAMOS_INCLUDE_MRBEAMPLUGIN=no
 # This uses the latest release as an archive
 # [ -n "$BEAMOS_MRBEAMPLUGIN_ARCHIVE" ] || export BEAMOS_MRBEAMPLUGIN_ARCHIVE=$(wget -q -O - https://api.github.com/repos/mrbeam/MrBeamPlugin/releases/latest | grep "zipball_url" | cut -d : -f 2,3 | tr -d \" | tr -d ,)
 [ -n "$BEAMOS_MRBEAMPLUGIN_ARCHIVE" ] || BEAMOS_MRBEAMPLUGIN_ARCHIVE=https://github.com/mrbeam/MrBeamPlugin/archive/$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH.zip
@@ -38,13 +38,13 @@ TRUE_USER=pi
 [ -n "$BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BUILD" ] || BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BUILD=https://github.com/mrbeam/MrBeamDoc.git
 
 # OctoPrint-Camera
-[ -n "$BEAMOS_INCLUDE_CAMERA" ] || BEAMOS_INCLUDE_CAMERA=yes
+[ -n "$BEAMOS_INCLUDE_CAMERA" ] || BEAMOS_INCLUDE_CAMERA=no
 [ -n "$BEAMOS_CAMERA_ARCHIVE" ] || BEAMOS_CAMERA_ARCHIVE=https://github.com/mrbeam/OctoPrint-Camera/archive/$BEAMOS_CAMERA_REPO_BRANCH.zip
 [ -n "$BEAMOS_CAMERA_REPO_BUILD" ] || BEAMOS_CAMERA_REPO_BUILD=https://github.com/mrbeam/OctoPrint-Camera.git
 [ -n "$BEAMOS_CAMERA_REPO_SHIP" ] || BEAMOS_CAMERA_REPO_SHIP=https://github.com/mrbeam/OctoPrint-Camera.git
 
 # IOBeam
-[ -n "$BEAMOS_INCLUDE_IOBEAM" ] || BEAMOS_INCLUDE_IOBEAM=yes
+[ -n "$BEAMOS_INCLUDE_IOBEAM" ] || BEAMOS_INCLUDE_IOBEAM=no
 [ -n "$BEAMOS_IOBEAM_ARCHIVE" ] || BEAMOS_IOBEAM_ARCHIVE=git+ssh://[email protected]/mrbeam/iobeam.git@$BEAMOS_IOBEAM_REPO_BRANCH
 [ -n "$BEAMOS_IOBEAM_REPO_BUILD" ] || BEAMOS_IOBEAM_REPO_BUILD=git+ssh://[email protected]/mrbeam/iobeam.git
 [ -n "$BEAMOS_IOBEAM_REPO_SHIP" ] || BEAMOS_IOBEAM_REPO_SHIP=git+ssh://[email protected]/mrbeam/iobeam.git
@@ -53,13 +53,13 @@ TRUE_USER=pi
 [ -n "$BEAMOS_MRBHWINFO_REPO_SHIP" ] || BEAMOS_MRBHWINFO_REPO_SHIP=git+ssh://[email protected]/mrbeam/mrb_hw_info.git
 
 [ -n "$BEAMOS_INCLUDE_MRBEAMLED" ] || BEAMOS_INCLUDE_MRBEAMLED=yes
-[ -n "$BEAMOS_MRBEAMLED_ARCHIVE" ] || BEAMOS_MRBEAMLED_ARCHIVE=https://github.com/mrbeam/MrBeamLedStrips/archive/$BEAMOS_MRBEAMLED_REPO_BRANCH.zip
-[ -n "$BEAMOS_MRBEAMLED_REPO_BUILD" ] || BEAMOS_MRBEAMLED_REPO_BUILD=https://github.com/mrbeam/MrBeamLedStrips.git
-[ -n "$BEAMOS_MRBEAMLED_REPO_SHIP" ] || BEAMOS_MRBEAMLED_REPO_SHIP=https://github.com/mrbeam/MrBeamLedStrips.git
+[ -n "$BEAMOS_MRBEAMLED_ARCHIVE" ] || BEAMOS_MRBEAMLED_ARCHIVE=git+https://${PERSONAL_ACCESS_TOKEN}@github.com/mrbeam/mrb3-led-strips.git@$BEAMOS_MRBEAMLED_REPO_BRANCH
+[ -n "$BEAMOS_MRBEAMLED_REPO_BUILD" ] || BEAMOS_MRBEAMLED_REPO_BUILD=https://github.com/mrbeam/mrb3-led-strips.git
+[ -n "$BEAMOS_MRBEAMLED_REPO_SHIP" ] || BEAMOS_MRBEAMLED_REPO_SHIP=https://github.com/mrbeam/mrb3-led-strips.git
 [ -n "$BEAMOS_RPI_WS281X_ARCHIVE" ] || BEAMOS_RPI_WS281X_ARCHIVE=rpi-ws281x
 
 # Netconnectd and Netconnectd plugin
-[ -n "$BEAMOS_INCLUDE_NETCONNECTD" ] || BEAMOS_INCLUDE_NETCONNECTD=yes
+[ -n "$BEAMOS_INCLUDE_NETCONNECTD" ] || BEAMOS_INCLUDE_NETCONNECTD=no
 #   Wifi package for netconnectd
 [ -n "$BEAMOS_NETCONNECTD_WIFI_ARCHIVE" ] || BEAMOS_NETCONNECTD_WIFI_ARCHIVE=https://github.com/mrbeam/wifi/archive/$BEAMOS_NETCONNECTD_WIFI_REPO_BRANCH.zip
 [ -n "$BEAMOS_NETCONNECTD_ARCHIVE" ] || BEAMOS_NETCONNECTD_ARCHIVE=https://github.com/mrbeam/netconnectd_mrbeam/archive/$BEAMOS_NETCONNECTD_REPO_BRANCH.zip
@@ -71,27 +71,27 @@ TRUE_USER=pi
 [ -n "$BEAMOS_NETCONNECTD_PLUGIN_REPO_BUILD" ] || BEAMOS_NETCONNECTD_PLUGIN_REPO_BUILD=https://github.com/mrbeam/OctoPrint-Netconnectd.git
 [ -n "$BEAMOS_NETCONNECTD_PLUGIN_REPO_SHIP" ] || BEAMOS_NETCONNECTD_PLUGIN_REPO_SHIP=https://github.com/mrbeam/OctoPrint-Netconnectd.git
 
-[ -n "$BEAMOS_INCLUDE_FINDMYMRBEAM" ] || BEAMOS_INCLUDE_FINDMYMRBEAM=yes
+[ -n "$BEAMOS_INCLUDE_FINDMYMRBEAM" ] || BEAMOS_INCLUDE_FINDMYMRBEAM=no
 [ -n "$BEAMOS_FINDMYMRBEAM_ARCHIVE" ] || BEAMOS_FINDMYMRBEAM_ARCHIVE=https://github.com/mrbeam/OctoPrint-FindMyMrBeam/archive/$BEAMOS_FINDMYMRBEAM_REPO_BRANCH.zip
 [ -n "$BEAMOS_FINDMYMRBEAM_REPO_BUILD" ] || BEAMOS_FINDMYMRBEAM_REPO_BUILD=https://github.com/mrbeam/OctoPrint-FindMyMrBeam.git
 [ -n "$BEAMOS_FINDMYMRBEAM_REPO_SHIP" ] || BEAMOS_FINDMYMRBEAM_REPO_SHIP=https://github.com/mrbeam/OctoPrint-FindMyMrBeam.git
 
-[ -n "$BEAMOS_INCLUDE_SHIELDFLASHER" ] || BEAMOS_INCLUDE_SHIELDFLASHER=yes
+[ -n "$BEAMOS_INCLUDE_SHIELDFLASHER" ] || BEAMOS_INCLUDE_SHIELDFLASHER=no
 [ -n "$BEAMOS_SHIELDFLASHER_ARCHIVE" ] || BEAMOS_SHIELDFLASHER_ARCHIVE=https://github.com/mrbeam/shield_flasher/archive/$BEAMOS_SHIELDFLASHER_REPO_BRANCH.zip
 [ -n "$BEAMOS_SHIELDFLASHER_REPO_BUILD" ] || BEAMOS_SHIELDFLASHER_REPO_BUILD=https://github.com/mrbeam/shield_flasher.git
 [ -n "$BEAMOS_SHIELDFLASHER_REPO_SHIP" ] || BEAMOS_SHIELDFLASHER_REPO_SHIP=https://github.com/mrbeam/shield_flasher.git
 
-[ -n "$BEAMOS_INCLUDE_MOUNTMANAGER" ] || BEAMOS_INCLUDE_MOUNTMANAGER=yes
+[ -n "$BEAMOS_INCLUDE_MOUNTMANAGER" ] || BEAMOS_INCLUDE_MOUNTMANAGER=no
 [ -n "$BEAMOS_MOUNTMANAGER_ARCHIVE" ] || BEAMOS_MOUNTMANAGER_ARCHIVE=https://github.com/mrbeam/usb_mount_manager/archive/$BEAMOS_MOUNTMANAGER_REPO_BRANCH.zip
 [ -n "$BEAMOS_MOUNTMANAGER_REPO_BUILD" ] || BEAMOS_MOUNTMANAGER_REPO_BUILD=git+ssh://[email protected]/mrbeam/usb_mount_manager.git
 [ -n "$BEAMOS_MOUNTMANAGER_REPO_SHIP" ] || BEAMOS_MOUNTMANAGER_REPO_SHIP=git+ssh://[email protected]/mrbeam/usb_mount_manager.git
 
-[ -n "$BEAMOS_INCLUDE_CHECK" ] || BEAMOS_INCLUDE_CHECK=yes
+[ -n "$BEAMOS_INCLUDE_CHECK" ] || BEAMOS_INCLUDE_CHECK=no
 [ -n "$BEAMOS_CHECK_ARCHIVE" ] || BEAMOS_CHECK_ARCHIVE=https://github.com/mrbeam/mrb_check/archive/$BEAMOS_CHECK_REPO_BRANCH.zip
 [ -n "$BEAMOS_CHECK_REPO_BUILD" ] || BEAMOS_CHECK_REPO_BUILD=git+ssh://[email protected]:mrbeam/mrb_check.git
 [ -n "$BEAMOS_CHECK_REPO_SHIP" ] || BEAMOS_CHECK_REPO_SHIP=git+ssh://[email protected]:mrbeam/mrb_check.git
 ### Misc
 
-[ -n "$BEAMOS_DEV" ] || BEAMOS_DEV=yes
+[ -n "$BEAMOS_DEV" ] || BEAMOS_DEV=no
 [ -n "$BEAMOS_I2C_BAUDRATE" ] || BEAMOS_I2C_BAUDRATE=64000
 [ -n "$BEAMOS_MODEL" ] || BEAMOS_MODEL=MRBEAM2_DC_S