Add support for loongarch64

.circleci/config.yml

@@ -18,7 +18,7 @@ jobs:
 
   build-windows:
     docker:
-      - image: fedora:39
+      - image: fedora:38
     steps:
       - checkout
       - run:

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
         fuzz-seconds: 150
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
@@ -43,4 +43,4 @@ jobs:
         ninja
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/pull-request-reviews.yml

@@ -23,20 +23,6 @@ jobs:
           source venv/bin/activate
           sed -i "/no-commit-to-branch/,+1d" .pre-commit-config.yaml
           pre-commit run --hook-stage commit --all-files
-  abi:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Refresh dependencies
-        run: sudo apt update
-      - name: Install dependencies
-        run: |
-          sudo ./contrib/ci/fwupd_setup_helpers.py install-dependencies -o ubuntu --yes
-          sudo ./contrib/ci/fwupd_setup_helpers.py test-meson
-      - name: Check ABI
-        run: ./contrib/ci/check-abi $(git describe --abbrev=0 --tags) $(git rev-parse HEAD)
 
   snap:
     uses: ./.github/workflows/snap.yml

.github/workflows/snap.yml

@@ -29,7 +29,7 @@ jobs:
         ln -s ../contrib/snap/snapcraft.yaml snap/snapcraft.yaml
     - uses: snapcore/action-build@v1
       id: snapcraft
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: snap
         path: ${{ steps.snapcraft.outputs.snap }}
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ inputs.deploy }}
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download
       with:
         name: snap

RELEASE

@@ -2,9 +2,9 @@ fwupd Release Notes
 
 Forking stable branch:
 
-When forking main into a stable 1_9_X, be sure to disable the following CI jobs:
- * publish-docs
- * publish-stable
+When forking main into a stable 2_1_X, be sure to disable the following CI jobs:
+ * publish-docs (`.circleci/config.yml`)
+ * deploy-store (`snap.yaml`)
 
 Also update `SECURITY.md`, removing the oldest branch and add the new branch at the top.
 To make sure it's done right, you can reference commit 433e809318c68c9ab6d4ae50ee9c4312503185d8
@@ -28,7 +28,7 @@ git add ../po/*.po
 2. Commit changes to git:
 
 # MAKE SURE THIS IS CORRECT
-export release_ver="1.9.10"
+export release_ver="2.0.0"
 
 git commit -a -m "Release fwupd ${release_ver}" --no-verify
 git tag -s -f -m "Release fwupd ${release_ver}" "${release_ver}"

SECURITY.md

@@ -5,16 +5,17 @@ If you have any concerns please let us know.
 
 ## Supported Versions
 
-The `main`, and `1.8.x`, branches are fully supported by the upstream authors
+The `main`, and `1.9.x`, branches are fully supported by the upstream authors
 with all unstable code belonging in `wip` branches.
-Additionally, the `1.6.x` and `1.7.x` branches are supported for security fixes.
+Additionally, the `1.7.x` and `1.8.x` branches are supported for security fixes.
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 2.0.x   | :heavy_check_mark: |
 | 1.9.x   | :heavy_check_mark: |
-| 1.8.x   | :heavy_check_mark: |
+| 1.8.x   | :white_check_mark: |
 | 1.7.x   | :white_check_mark: |
-| 1.6.x   | :white_check_mark: |
+| 1.6.x   | :x: EOL 2024-01-01 |
 | 1.5.x   | :x: EOL 2022-01-01 |
 | 1.4.x   | :x: EOL 2021-05-01 |
 | 1.3.x   | :x: EOL 2020-07-01 |

contrib/ci/dependencies.xml

@@ -1520,45 +1520,12 @@
       <package variant="aarch64">valgrind-devel</package>
     </distro>
     <distro id="debian">
-      <control>
-        <exclusive>ia64</exclusive>
-        <exclusive>riscv64</exclusive>
-        <exclusive>x32</exclusive>
-        <exclusive>mips</exclusive>
-        <exclusive>sparc64</exclusive>
-        <exclusive>sh4</exclusive>
-        <exclusive>ppc64</exclusive>
-        <exclusive>powerpcspe</exclusive>
-        <exclusive>hppa</exclusive>
-        <exclusive>alpha</exclusive>
-        <exclusive>mips64el</exclusive>
-        <exclusive>armhf</exclusive>
-        <exclusive>armel</exclusive>
-        <exclusive>mipsel</exclusive>
-        <exclusive>m68k</exclusive>
-      </control>
-      <package variant="x86_64" />
-      <package variant="i386" />
+      <package variant="x86_64">valgrind-if-available</package>
+      <package variant="i386">valgrind-if-available</package>
     </distro>
     <distro id="ubuntu">
-      <control>
-        <exclusive>ia64</exclusive>
-        <exclusive>riscv64</exclusive>
-        <exclusive>x32</exclusive>
-        <exclusive>mips</exclusive>
-        <exclusive>sparc64</exclusive>
-        <exclusive>sh4</exclusive>
-        <exclusive>ppc64</exclusive>
-        <exclusive>powerpcspe</exclusive>
-        <exclusive>hppa</exclusive>
-        <exclusive>alpha</exclusive>
-        <exclusive>mips64el</exclusive>
-        <exclusive>armhf</exclusive>
-        <exclusive>armel</exclusive>
-        <exclusive>mipsel</exclusive>
-        <exclusive>m68k</exclusive>
-      </control>
-      <package variant="x86_64" />
+      <package variant="x86_64">valgrind-if-available</package>
+      <package variant="i386">valgrind-if-available</package>
     </distro>
   </dependency>
   <dependency id="wget">

contrib/debian/control.in

@@ -13,7 +13,7 @@ Homepage: https://github.com/fwupd/fwupd
 Vcs-Git: https://salsa.debian.org/efi-team/fwupd.git
 Vcs-Browser: https://salsa.debian.org/efi-team/fwupd
 
-Package: libfwupd2
+Package: libfwupd3
 Section: libs
 Architecture: linux-any
 Depends: ${misc:Depends},
@@ -107,7 +107,7 @@ Description: Firmware update daemon documentation (HTML format)
 Package: libfwupd-dev
 Architecture: linux-any
 Multi-Arch: same
-Depends: libfwupd2 (= ${binary:Version}),
+Depends: libfwupd3 (= ${binary:Version}),
          gir1.2-fwupd-2.0 (= ${binary:Version}),
          libcurl4-gnutls-dev,
          libglib2.0-dev (>= 2.45.8),

contrib/debian/fwupd.install

@@ -13,7 +13,6 @@ usr/share/metainfo/*
 usr/libexec/fwupd/*
 usr/lib/sysusers.d/*
 usr/share/man/*
-lib/udev/rules.d/*
 data/fwupd.conf etc/fwupd
 debian/fwupd.pkla /var/lib/polkit-1/localauthority/10-vendor.d
 usr/lib/*/fwupd-*/*.so

contrib/debian/fwupd.maintscript

@@ -4,3 +4,8 @@ rm_conffile /etc/fwupd/remotes.d/fwupd.conf 1.2.7~
 rm_conffile /etc/dbus-1/system.d/org.freedesktop.fwupd.conf 1.3.2~
 rm_conffile /etc/modules-load.d/fwupd-msr.conf 1.5.3~
 rm_conffile /etc/modules-load.d/fwupd-platform-integrity.conf 1.5.3~
+rm_conffile /etc/fwupd/ata.conf 1.5.5~
+mv_conffile /etc/fwupd/uefi.conf /etc/fwupd/uefi_capsule.conf 1.5.5~
+rm_conffile /etc/pki/fwupd/GPG-KEY-Hughski-Limited 1.9.10~
+rm_conffile /etc/fwupd/upower.conf 1.9.10~
+rm_conffile /etc/fwupd/remotes.d/dell-esrt.conf 1.9.11~

contrib/debian/fwupd.postinst

@@ -3,52 +3,6 @@ set -e
 
 #DEBHELPER#
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd.conf 1.0.0~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/remotes.d/fwupd.conf 1.2.7~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/dbus-1/system.d/org.freedesktop.fwupd.conf 1.3.2~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/ata.conf 1.5.5~ -- "$@"
-fi
-
-#Perform transition from /etc/fwupd/uefi.conf to /etc/fwupd/uefi_capsule.conf
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-	ORIGINAL=/etc/fwupd/uefi.conf
-	NEW=/etc/fwupd/uefi_capsule.conf
-	#If already upgraded this file won't exist
-	#If in the middle of an upgrade:
-	# -> If unmodified then preinst would have renamed to /etc/fwupd/uefi.conf.dpkg-remove
-	# -> If modified, we need to do an in-place upgrade with sed
-	if [ -f $ORIGINAL ]; then
-		sed "s,\[uefi\],\[uefi_capsule\]," -i $ORIGINAL
-	fi
-	dpkg-maintscript-helper mv_conffile $ORIGINAL $NEW 1.5.5~ -- "$@"
-fi
-
-# Clean up from fwupdate->fwupd transition
-# This can be removed after bullseye and focal are released
-EFIDIR=$(awk '/^ID=/ {gsub(/"/,""); split($0,a,"="); print tolower(a[2])}' /etc/os-release)
-if [ "${DPKG_MAINTSCRIPT_ARCH}" = "amd64" ]; then
-	EFI_NAME=x64
-elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "i386" ]; then
-	EFI_NAME=ia32
-elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "arm64" ]; then
-	EFI_NAME=aa64
-elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "armhf" ]; then
-	EFI_NAME=arm
-fi
-rm -f /boot/efi/EFI/$EFIDIR/fwup$EFI_NAME.efi
-rm -f /var/lib/fwupdate/done
-rm -f /var/cache/fwupdate/done
-for dir in /var/cache/fwupdate /var/lib/fwupdate; do
-	if [ -d $dir ]; then
-	        rmdir --ignore-fail-on-non-empty $dir || true
-	fi
-done
-
 if [ -d /run/systemd/system ]; then
     deb-systemd-invoke reload dbus || true
 fi

contrib/debian/fwupd.postrm

@@ -4,24 +4,6 @@ set -e
 #DEBHELPER#
 
 if [ "$1" = purge ]; then
-	rm -rf /var/lib/fwupd/gnupg
+	rm -rf /var/lib/fwupd /var/cache/fwupd /var/cache/fwupdmgr
 	rm -f /var/cache/app-info/xmls/fwupd.xml
 fi
-
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd.conf 1.0.0~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/remotes.d/fwupd.conf 1.2.7~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/dbus-1/system.d/org.freedesktop.fwupd.conf 1.3.2~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/ata.conf 1.5.5~ -- "$@"
-fi
-
-#Perform transition from /etc/fwupd/uefi.conf to /etc/fwupd/uefi_capsule.conf
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-	ORIGINAL=/etc/fwupd/uefi.conf
-	NEW=/etc/fwupd/uefi_capsule.conf
-	dpkg-maintscript-helper mv_conffile $ORIGINAL $NEW 1.5.5~ -- "$@"
-fi

contrib/debian/fwupd.preinst

@@ -3,24 +3,6 @@ set -e
 
 #DEBHELPER#
 
-if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd.conf 1.0.0~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/remotes.d/fwupd.conf 1.2.7~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/dbus-1/system.d/org.freedesktop.fwupd.conf 1.3.2~ -- "$@"
-	dpkg-maintscript-helper rm_conffile \
-		/etc/fwupd/ata.conf 1.5.5~ -- "$@"
-fi
-
-#Perform transition from /etc/fwupd/uefi.conf to /etc/fwupd/uefi_capsule.conf
-if dpkg-maintscript-helper supports mv_conffile 2>/dev/null; then
-	ORIGINAL=/etc/fwupd/uefi.conf
-	NEW=/etc/fwupd/uefi_capsule.conf
-	dpkg-maintscript-helper mv_conffile $ORIGINAL $NEW 1.5.5~ -- "$@"
-fi
-
 # 1.3.2 had fwupd-refresh.service and fwupd.service both claiming
 # this directory, but fwupd-refresh.service used DynamicUser directive
 # meaning no other unit could access it.

contrib/debian/libfwupd-dev.install

@@ -1,5 +1,5 @@
-usr/include/fwupd-1/fwupd.h
-usr/include/fwupd-1/libfwupd
+usr/include/fwupd-*/fwupd.h
+usr/include/fwupd-*/libfwupd
 usr/lib/*/libfwupd.so
 usr/lib/*/pkgconfig/fwupd.pc
 usr/share/gir-1.0/Fwupd-*.gir

contrib/fwupd.spec.in

@@ -377,7 +377,7 @@ systemctl --no-reload preset fwupd-refresh.timer &>/dev/null || :
 %if 0%{?have_uefi}
 %config(noreplace)%{_sysconfdir}/grub.d/35_fwupd
 %endif
-%{_libdir}/libfwupd.so.2*
+%{_libdir}/libfwupd.so.3*
 %{_libdir}/girepository-1.0/Fwupd-2.0.typelib
 /usr/lib/udev/rules.d/*.rules
 /usr/lib/systemd/system-shutdown/fwupd.shutdown
@@ -405,7 +405,7 @@ systemctl --no-reload preset fwupd-refresh.timer &>/dev/null || :
 %{_datadir}/doc/libfwupdplugin
 %{_datadir}/doc/libfwupd
 %{_datadir}/vala/vapi
-%{_includedir}/fwupd-1
+%{_includedir}/fwupd-3
 %{_libdir}/libfwupd*.so
 %{_libdir}/pkgconfig/fwupd.pc
 

contrib/migrate.py

@@ -71,8 +71,7 @@
             "fu_common_bytes_compare(": "fu_bytes_compare(",
             "fu_common_set_contents_bytes": "fu_bytes_set_contents",
             "fu_common_get_contents_bytes": "fu_bytes_get_contents",
-            "fu_common_get_contents_stream": "fu_bytes_get_contents_stream",
-            "fu_common_get_contents_fd": "fu_bytes_get_contents_fd",
+            "fu_common_get_contents_stream": "fu_input_stream_read_bytes",
             "fu_common_read_uint8_safe": "fu_memread_uint8_safe",
             "fu_common_read_uint16_safe": "fu_memread_uint16_safe",
             "fu_common_read_uint32_safe": "fu_memread_uint32_safe",

contrib/qubes/test/fwupd_logs.py

@@ -273,7 +273,6 @@
       "Name" : "Intel(R) Core™ i7-7700HQ CPU @ 2.80GHz",
       "DeviceId" : "4bde70ba4e39b28f9eab1628f9dd6e6244c03027",
       "Guid" : [
-        "b9a2dd81-159e-5537-a7db-e7101d164d3f",
         "30249f37-d140-5d3e-9319-186b1bd5cac3",
         "809a0b93-8a12-5338-a571-ad5583acf896",
         "d0f754d5-1395-5573-bc83-85ba955da70a"
@@ -441,9 +440,6 @@
         {
             "Name" : "Intel(R) Core™ i5-8400 CPU @ 2.80GHz",
             "DeviceId" : "4bde70ba4e39b28f9eab1628f9dd6e6244c03027",
-            "Guid" : [
-                "b9a2dd81-159e-5537-a7db-e7101d164d3f"
-            ],
             "Plugin" : "cpu",
             "Flags" : [
                 "internal",
@@ -752,9 +748,6 @@
         {
             "Name" : "Intel(R) Core™ i5-8400 CPU @ 2.80GHz",
             "DeviceId" : "4bde70ba4e39b28f9eab1628f9dd6e6244c03027",
-            "Guid" : [
-                "b9a2dd81-159e-5537-a7db-e7101d164d3f"
-            ],
             "Plugin" : "cpu",
             "Flags" : [
                 "internal",

contrib/vscode/launch.json

@@ -5,7 +5,7 @@
       "name": "gdbserver (fwupdtool)",
       "type": "cppdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/dist/libexec/fwupd/fwupdtool",
+      "program": "${workspaceFolder}/dist/bin/fwupdtool",
       "args": [],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}",

contrib/vscode/launcher.sh

@@ -3,7 +3,7 @@ gcc=$(gcc -dumpmachine)
 export ROOT=#ROOT#
 export FWUPD_LOCALSTATEDIR=${ROOT}/dist
 export FWUPD_SYSCONFDIR=${ROOT}/dist/etc
-export LD_LIBRARY_PATH=${ROOT}/dist/lib/${gcc}
+export LD_LIBRARY_PATH=${ROOT}/dist/lib/${gcc}:${ROOT}/dist/lib64
 if [ -n "${DEBUG}" ]; then
         DEBUG="gdbserver localhost:9091"
 fi