Skip to content

Commit

Permalink
Adjust for otter
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Martinz <[email protected]>
  • Loading branch information
amartinz committed May 21, 2024
1 parent 47b08ba commit 95fd0ce
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/create-cab-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name : Upload artifacts
uses: actions/upload-artifact@master
with:
name: axolotl-cab-files
name: otter-cab-files
path: |
${{ github.workspace }}/output/*.cab
${{ github.workspace }}/output/*.xml
Expand All @@ -36,6 +36,6 @@ jobs:
uses: softprops/action-gh-release@v1
with:
files: |
${{ github.workspace }}/axolotl-cab-files/*.cab
${{ github.workspace }}/axolotl-cab-files/*.xml
${{ github.workspace }}/otter-cab-files/*.cab
${{ github.workspace }}/otter-cab-files/*.xml
fail_on_unmatched_files: true
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SHIFT6mq LVFS firmware packaging
# LVFS firmware packaging for SHIFTphone 8 (otter)

Packaging the SHIFT6mq bootloader firmware for [fwupd](https://fwupd.org) and [LVFS](https://fwupd.org/lvfs) as CAB files.<br>
Packaging the SHIFTphone 8 (otter) bootloader firmware for [fwupd](https://fwupd.org) and [LVFS](https://fwupd.org/lvfs) as CAB files.<br>
These CAB files are uploaded to LVFS by SHIFT for distribution.<br>
Users can install the latest bootloader through fwupd.

Expand All @@ -27,4 +27,4 @@ bash generate-cab-files.sh
See [LICENSE](./LICENSE).

Copyright (c) Dylan Van Assche (2021-2022)<br>
Copyright (c) SHIFT GmbH (2022)
Copyright (c) SHIFT GmbH (2022-2024)
12 changes: 6 additions & 6 deletions generate-cab-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ OUTPUT_DIRECTORY="output"

###############################
# Image information (edit this)
IMAGE_TARGET="otter"
IMAGE_URGENCY="high"
IMAGE_DATE="2022-12-24"
IMAGE_URL="https://gitlab.shift-gmbh.com/ShiftOSS/android_proprietary_vendor_firmware/-/raw/1bb90b71d9658c74c6643429008480da12a850a8/axolotl/radio/abl.img"
IMAGE_VERSION="5.0.20221224"
IMAGE_DATE="2024-05-21"
IMAGE_URL="https://gitlab.shift-gmbh.com/ShiftOSS/android_proprietary_vendor_firmware_otter/-/raw/70832c0939a25169d814e2d81c0a296a80d5c91a/radio/abl.img"
IMAGE_VERSION="6.0.20240521"
IMAGE_DESCRIPTION=$(cat << EOF
<p>This release brings the following fixes and improvements:</p>
<ul>
<li>Disable parallel download flash operations</li>
<li>Fix slot switching issues for vendor_boot partitions</li>
<li>Initial release</li>
</ul>
EOF
)
Expand All @@ -29,7 +29,7 @@ echo "${IMAGE_DESCRIPTION}"
echo "##########################"
echo ""

IMAGE_NAME="abl_${IMAGE_VERSION}"
IMAGE_NAME="${IMAGE_TARGET}_abl_${IMAGE_VERSION}"
METAINFO_FILE="${IMAGE_NAME}.${METAINFO_TEMPLATE}"

OUTPUT_GCAB_FILE="${IMAGE_NAME}.cab"
Expand Down
18 changes: 10 additions & 8 deletions metainfo.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2021-2022 Dylan Van Assche <[email protected]> -->
<!-- Copyright 2024 Alexander Martinz <[email protected]> -->
<component type="firmware">
<id>eco.shift.axolotl.abl.firmware</id>
<name>6mq</name>
<id>eco.shift.otter.abl.firmware</id>
<name>phone 8</name>
<name_variant_suffix>Bootloader</name_variant_suffix>
<summary>Firmware for SHIFT 6mq's bootloader</summary>
<summary>Firmware for SHIFT phone 8's bootloader</summary>
<description>
<p>
Updating your bootloader may bring new features, security fixes, and other improvements. Upgrading at your own risk!
Expand All @@ -15,11 +16,11 @@
<category>X-System</category>
</categories>
<provides>
<!-- Match axolotl's partitions -->
<!-- Match otter's partitions -->
<!-- ABL A -->
<firmware type="flashed">a1ea18c7-9f12-5ff0-8887-7d81f92ec261</firmware>
<firmware type="flashed">67c7794d-af25-565d-b5ce-9a42da0e93e8</firmware>
<!-- ABL B -->
<firmware type="flashed">9adc34d6-c729-51de-98ca-9066fcf85630</firmware>
<firmware type="flashed">f6017f0c-945c-5b06-8bf1-0c0b044adb7f</firmware>
</provides>
<url type="homepage">https://shift.eco/</url>
<metadata_license>CC0-1.0</metadata_license>
Expand Down Expand Up @@ -49,9 +50,10 @@ SCRIPT_MARKER_DESCRIPTION
<!-- Search keywords -->
<keywords>
<keyword>shiftphones</keyword>
<keyword>shift6mq</keyword>
<keyword>shiftphone8</keyword>
<keyword>SP8</keyword>
<keyword>bootloader</keyword>
<keyword>axolotl</keyword>
<keyword>otter</keyword>
<keyword>abl</keyword>
</keywords>
</component>

0 comments on commit 95fd0ce

Please sign in to comment.