Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqmi for openSUSE:Factory checked
in at 2022-02-17 00:29:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqmi (Old)
and /work/SRC/openSUSE:Factory/.libqmi.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqmi"
Thu Feb 17 00:29:54 2022 rev:41 rq:954464 version:1.30.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqmi/libqmi.changes 2021-12-22
20:18:04.275847181 +0100
+++ /work/SRC/openSUSE:Factory/.libqmi.new.1956/libqmi.changes 2022-02-17
00:29:58.409439061 +0100
@@ -1,0 +2,20 @@
+Mon Feb 14 23:17:26 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 1.30.4:
+ ** meson: switch to use the new python module in meson.
+ ** meson: added a new boolean 'man' option in the meson setup to explicitly
+ enable or disable building the man pages.
+ ** meson: removed the option to detect if rmnet is supported.
+ ** meson: multiple updates to use newer meson features like install_dir(),
+ install_mode() or summary().
+ ** meson: options 'mbim_qmux' and 'qrtr' are enabled by default and must be
+ explicitly disabled if they're not needed, there is no attempt to
+ autodetect whether they can be enabled or not.
+ * qmi-proxy:
+ ** Remove assert when attempting to close ghost device.
+ * qmi-firmware-update:
+ ** Use defaults if FLASH variables not reported, enabling support to flash
+ the new Sierra Wireless EM9190 and EM9191 modules.
+ * Several other minor improvements and fixes.
+
+-------------------------------------------------------------------
Old:
----
libqmi-1.30.2.tar.xz
libqmi-1.30.2.tar.xz.asc
New:
----
libqmi-1.30.4.tar.xz
libqmi-1.30.4.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqmi.spec ++++++
--- /var/tmp/diff_new_pack.MCGFzD/_old 2022-02-17 00:29:59.225438920 +0100
+++ /var/tmp/diff_new_pack.MCGFzD/_new 2022-02-17 00:29:59.229438919 +0100
@@ -19,7 +19,7 @@
%define _soname libqmi-glib5
Name: libqmi
-Version: 1.30.2
+Version: 1.30.4
Release: 0
# NOTE: The file headers state LESSER GPL, which is a mistake. The upstream
intended license is LIBRARY GPL 2.0+
Summary: Library to control QMI devices
++++++ libqmi-1.30.2.tar.xz -> libqmi-1.30.4.tar.xz ++++++
++++ 4575 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/INSTALL new/libqmi-1.30.4/INSTALL
--- old/libqmi-1.30.2/INSTALL 2021-09-06 11:10:12.000000000 +0200
+++ new/libqmi-1.30.4/INSTALL 2022-02-11 10:58:59.000000000 +0100
@@ -1,8 +1,8 @@
Installation Instructions
*************************
- Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
-Foundation, Inc.
+ Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -225,7 +225,7 @@
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
- HP-UX 'make' updates targets which have the same time stamps as their
+ HP-UX 'make' updates targets which have the same timestamps as their
prerequisites, which makes it generally unusable when shipped generated
files such as 'configure' are involved. Use GNU 'make' instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/NEWS new/libqmi-1.30.4/NEWS
--- old/libqmi-1.30.2/NEWS 2021-09-06 11:05:36.000000000 +0200
+++ new/libqmi-1.30.4/NEWS 2022-02-11 10:56:57.000000000 +0100
@@ -1,4 +1,28 @@
+Overview of changes in libqmi 1.30.4
+----------------------------------------
+
+ * Build:
+ ** meson: switch to use the new python module in meson.
+ ** meson: added a new boolean 'man' option in the meson setup to explicitly
+ enable or disable building the man pages.
+ ** meson: removed the option to detect if rmnet is supported.
+ ** meson: multiple updates to use newer meson features like install_dir(),
+ install_mode() or summary().
+ ** meson: options 'mbim_qmux' and 'qrtr' are enabled by default and must be
+ explicitly disabled if they're not needed, there is no attempt to
+ autodetect whether they can be enabled or not.
+
+ * qmi-proxy:
+ ** Remove assert when attempting to close ghost device.
+
+ * qmi-firmware-update:
+ ** Use defaults if FLASH variables not reported, enabling support to flash
+ the new Sierra Wireless EM9190 and EM9191 modules.
+
+ * Several other minor improvements and fixes.
+
+
Overview of changes in libqmi 1.30.2
----------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/compile new/libqmi-1.30.4/compile
--- old/libqmi-1.30.2/compile 2021-09-06 11:10:12.000000000 +0200
+++ new/libqmi-1.30.4/compile 2022-02-11 10:58:59.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/configure.ac new/libqmi-1.30.4/configure.ac
--- old/libqmi-1.30.2/configure.ac 2021-09-06 11:05:50.000000000 +0200
+++ new/libqmi-1.30.4/configure.ac 2022-02-11 10:57:20.000000000 +0100
@@ -4,7 +4,7 @@
dnl The QMI version number
m4_define([qmi_major_version], [1])
m4_define([qmi_minor_version], [30])
-m4_define([qmi_micro_version], [2])
+m4_define([qmi_micro_version], [4])
m4_define([qmi_version],
[qmi_major_version.qmi_minor_version.qmi_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/man/qmi-firmware-update.1
new/libqmi-1.30.4/docs/man/qmi-firmware-update.1
--- old/libqmi-1.30.2/docs/man/qmi-firmware-update.1 2021-09-06
11:12:57.000000000 +0200
+++ new/libqmi-1.30.4/docs/man/qmi-firmware-update.1 2022-02-11
11:01:52.000000000 +0100
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3.
-.TH QMI-FIRMWARE-UPDATE "1" "September 2021" "qmi-firmware-update " "User
Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5.
+.TH QMI-FIRMWARE-UPDATE "1" "February 2022" "qmi-firmware-update " "User
Commands"
.SH NAME
qmi-firmware-update \- Update firmware in QMI devices
.SH DESCRIPTION
@@ -103,7 +103,7 @@
.IP
libqmi\-de...@lists.freedesktop.org
.PP
-qmi\-firmware\-update 1.30.2
+qmi\-firmware\-update 1.30.4
.IP
Copyright (C) 2016\-2021 Aleksander Morgado
Copyright (C) 2016\-2019 Bj?rn Mork
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/man/qmi-network.1
new/libqmi-1.30.4/docs/man/qmi-network.1
--- old/libqmi-1.30.2/docs/man/qmi-network.1 2021-09-06 11:12:57.000000000
+0200
+++ new/libqmi-1.30.4/docs/man/qmi-network.1 2022-02-11 11:01:52.000000000
+0100
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3.
-.TH QMI-NETWORK "1" "September 2021" "qmi-network 1.30.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5.
+.TH QMI-NETWORK "1" "February 2022" "qmi-network 1.30.4" "User Commands"
.SH NAME
qmi-network \- Simple network management of QMI devices
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/man/qmicli.1 new/libqmi-1.30.4/docs/man/qmicli.1
--- old/libqmi-1.30.2/docs/man/qmicli.1 2021-09-06 11:12:57.000000000 +0200
+++ new/libqmi-1.30.4/docs/man/qmicli.1 2022-02-11 11:01:52.000000000 +0100
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3.
-.TH QMICLI "1" "September 2021" "qmicli 1.30.2" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5.
+.TH QMICLI "1" "February 2022" "qmicli 1.30.4" "User Commands"
.SH NAME
qmicli \- Control QMI devices
.SH DESCRIPTION
@@ -384,7 +384,7 @@
Bind data port to controller device to be used with
`\-\-client\-no\-release\-cid'
.TP
\fB\-\-wds\-bind\-mux\-data\-port\fR=\fI\,[\/\fR"key=value,..."]
-Bind qmux data port to controller device (allowed keys: mux\-id, ep\-type
(undefined|hsusb|pcie|embedded), ep\-iface\-number) to be used with
`\-\-client\-no\-release\-cid'
+Bind qmux data port to controller device (allowed keys: mux\-id, ep\-type
(undefined|hsusb|pcie|embedded|bam\-dmux), ep\-iface\-number) to be used with
`\-\-client\-no\-release\-cid'
.TP
\fB\-\-wds\-set\-ip\-family\fR=\fI\,[4\/\fR|6]
Set IP family
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/reference/libqmi-glib/html/index.html
new/libqmi-1.30.4/docs/reference/libqmi-glib/html/index.html
--- old/libqmi-1.30.2/docs/reference/libqmi-glib/html/index.html
2021-09-06 11:13:03.000000000 +0200
+++ new/libqmi-1.30.4/docs/reference/libqmi-glib/html/index.html
2022-02-11 11:01:58.000000000 +0100
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2"
cellspacing="0"><tr><th valign="middle"><p class="title">libqmi-glib Reference
Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- For libqmi-glib 1.30.2
+ For libqmi-glib 1.30.4
. The latest version of this documentation can be found on-line at
<a class="ulink"
href="https://www.freedesktop.org/software/libqmi/libqmi-glib/latest/";
target="_top">https://www.freedesktop.org/software/libqmi/libqmi-glib/latest/</a>.
</p></div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/reference/libqmi-glib/html/libqmi-glib-Version-and-feature-checks.html
new/libqmi-1.30.4/docs/reference/libqmi-glib/html/libqmi-glib-Version-and-feature-checks.html
---
old/libqmi-1.30.2/docs/reference/libqmi-glib/html/libqmi-glib-Version-and-feature-checks.html
2021-09-06 11:13:03.000000000 +0200
+++
new/libqmi-1.30.4/docs/reference/libqmi-glib/html/libqmi-glib-Version-and-feature-checks.html
2022-02-11 11:01:58.000000000 +0100
@@ -148,7 +148,7 @@
<hr>
<div class="refsect2">
<a name="QMI-MICRO-VERSION:CAPS"></a><h3>QMI_MICRO_VERSION</h3>
-<pre class="programlisting">#define QMI_MICRO_VERSION (2)
+<pre class="programlisting">#define QMI_MICRO_VERSION (4)
</pre>
<p>Evaluates to the micro version number of libqmi-glib which this source
compiled against.</p>
@@ -170,7 +170,7 @@
2
3</pre></td>
<td class="listing_code"><pre class="programlisting"><span
class="cp">#if QMI_MBIM_QMUX_SUPPORTED</span>
- <span class="c1">// do something</span>
+<span class="w"> </span><span class="c1">// do something</span>
<span class="cp">#endif</span></pre></td>
</tr>
</tbody>
@@ -196,7 +196,7 @@
2
3</pre></td>
<td class="listing_code"><pre class="programlisting"><span
class="cp">#if QMI_QRTR_SUPPORTED</span>
- <span class="c1">// do something</span>
+<span class="w"> </span><span class="c1">// do something</span>
<span class="cp">#endif</span></pre></td>
</tr>
</tbody>
@@ -222,7 +222,7 @@
2
3</pre></td>
<td class="listing_code"><pre class="programlisting"><span
class="cp">#if QMI_RMNET_SUPPORTED</span>
- <span class="c1">// do something</span>
+<span class="w"> </span><span class="c1">// do something</span>
<span class="cp">#endif</span></pre></td>
</tr>
</tbody>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/reference/libqmi-glib/html/style.css
new/libqmi-1.30.4/docs/reference/libqmi-glib/html/style.css
--- old/libqmi-1.30.2/docs/reference/libqmi-glib/html/style.css 2021-09-06
11:13:03.000000000 +0200
+++ new/libqmi-1.30.4/docs/reference/libqmi-glib/html/style.css 2022-02-11
11:01:58.000000000 +0100
@@ -461,22 +461,22 @@
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left:
5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0;
padding-left: 5px; padding-right: 5px; }
.hll { background-color: #ffffcc }
-.c { color: #408080; font-style: italic } /* Comment */
+.c { color: #3D7B7B; font-style: italic } /* Comment */
.err { border: 1px solid #FF0000 } /* Error */
.k { color: #008000; font-weight: bold } /* Keyword */
.o { color: #666666 } /* Operator */
-.ch { color: #408080; font-style: italic } /* Comment.Hashbang */
-.cm { color: #408080; font-style: italic } /* Comment.Multiline */
-.cp { color: #BC7A00 } /* Comment.Preproc */
-.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
-.c1 { color: #408080; font-style: italic } /* Comment.Single */
-.cs { color: #408080; font-style: italic } /* Comment.Special */
+.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.cp { color: #9C6500 } /* Comment.Preproc */
+.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
.gd { color: #A00000 } /* Generic.Deleted */
.ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
+.gr { color: #E40000 } /* Generic.Error */
.gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.gi { color: #00A000 } /* Generic.Inserted */
-.go { color: #888888 } /* Generic.Output */
+.gi { color: #008400 } /* Generic.Inserted */
+.go { color: #717171 } /* Generic.Output */
.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
.gs { font-weight: bold } /* Generic.Strong */
.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
@@ -489,15 +489,15 @@
.kt { color: #B00040 } /* Keyword.Type */
.m { color: #666666 } /* Literal.Number */
.s { color: #BA2121 } /* Literal.String */
-.na { color: #7D9029 } /* Name.Attribute */
+.na { color: #687822 } /* Name.Attribute */
.nb { color: #008000 } /* Name.Builtin */
.nc { color: #0000FF; font-weight: bold } /* Name.Class */
.no { color: #880000 } /* Name.Constant */
.nd { color: #AA22FF } /* Name.Decorator */
-.ni { color: #999999; font-weight: bold } /* Name.Entity */
-.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.ni { color: #717171; font-weight: bold } /* Name.Entity */
+.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
.nf { color: #0000FF } /* Name.Function */
-.nl { color: #A0A000 } /* Name.Label */
+.nl { color: #767600 } /* Name.Label */
.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
.nt { color: #008000; font-weight: bold } /* Name.Tag */
.nv { color: #19177C } /* Name.Variable */
@@ -514,11 +514,11 @@
.dl { color: #BA2121 } /* Literal.String.Delimiter */
.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
.s2 { color: #BA2121 } /* Literal.String.Double */
-.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
.sh { color: #BA2121 } /* Literal.String.Heredoc */
-.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
.sx { color: #008000 } /* Literal.String.Other */
-.sr { color: #BB6688 } /* Literal.String.Regex */
+.sr { color: #A45A77 } /* Literal.String.Regex */
.s1 { color: #BA2121 } /* Literal.String.Single */
.ss { color: #19177C } /* Literal.String.Symbol */
.bp { color: #008000 } /* Name.Builtin.Pseudo */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/docs/reference/libqmi-glib/version.xml
new/libqmi-1.30.4/docs/reference/libqmi-glib/version.xml
--- old/libqmi-1.30.2/docs/reference/libqmi-glib/version.xml 2021-09-06
11:10:22.000000000 +0200
+++ new/libqmi-1.30.4/docs/reference/libqmi-glib/version.xml 2022-02-11
10:59:08.000000000 +0100
@@ -1 +1 @@
-1.30.2
+1.30.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/missing new/libqmi-1.30.4/missing
--- old/libqmi-1.30.2/missing 2021-09-06 11:10:12.000000000 +0200
+++ new/libqmi-1.30.4/missing 2022-02-11 10:58:59.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/src/libqmi-glib/qmi-proxy.c
new/libqmi-1.30.4/src/libqmi-glib/qmi-proxy.c
--- old/libqmi-1.30.2/src/libqmi-glib/qmi-proxy.c 2021-08-06
12:08:15.000000000 +0200
+++ new/libqmi-1.30.4/src/libqmi-glib/qmi-proxy.c 2022-02-01
10:46:51.000000000 +0100
@@ -793,8 +793,6 @@
return;
}
}
-
- g_assert_not_reached ();
}
/*****************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/src/qmi-firmware-update/qfu-sahara-device.c
new/libqmi-1.30.4/src/qmi-firmware-update/qfu-sahara-device.c
--- old/libqmi-1.30.2/src/qmi-firmware-update/qfu-sahara-device.c
2021-08-06 12:08:15.000000000 +0200
+++ new/libqmi-1.30.4/src/qmi-firmware-update/qfu-sahara-device.c
2021-10-07 14:35:36.000000000 +0200
@@ -50,7 +50,9 @@
static GParamSpec *properties[PROP_LAST];
-#define MAX_PRINTABLE_SIZE 80
+#define DEFAULT_SECTOR_SIZE_IN_BYTES 4096
+#define DEFAULT_PAGES_IN_BLOCK 64
+#define MAX_PRINTABLE_SIZE 80
struct _QfuSaharaDevicePrivate {
GFile *file;
@@ -60,8 +62,6 @@
/* target and transfer settings */
guint max_payload_size_to_target_in_bytes;
guint sector_size_in_bytes;
- guint num_partition_sectors;
- guint total_sector_size_in_bytes;
guint pages_in_block;
/* computed from settings */
guint transfer_block_size;
@@ -874,8 +874,6 @@
FirehoseInitStep step;
guint max_payload_size_to_target_in_bytes;
guint sector_size_in_bytes;
- guint num_partition_sectors;
- guint total_sector_size_in_bytes;
guint pages_in_block;
} FirehoseInitContext;
@@ -896,10 +894,6 @@
g_strstrip (strv[1]);
if (g_ascii_strcasecmp (strv[0], "sector_size_in_bytes") == 0)
ctx->sector_size_in_bytes = atoi (strv[1]);
- else if (g_ascii_strcasecmp (strv[0], "num_partition_sectors") == 0)
- ctx->num_partition_sectors = atoi (strv[1]);
- else if (g_ascii_strcasecmp (strv[0], "total_sector_size_in_bytes") ==
0)
- ctx->total_sector_size_in_bytes = atoi (strv[1]);
else if (g_ascii_strcasecmp (strv[0], "pages_in_block") == 0)
ctx->pages_in_block = atoi (strv[1]);
}
@@ -1020,8 +1014,6 @@
.step = FIREHOSE_INIT_STEP_PING,
.max_payload_size_to_target_in_bytes = 0,
.sector_size_in_bytes = 0,
- .num_partition_sectors = 0,
- .total_sector_size_in_bytes = 0,
.pages_in_block = 0,
};
@@ -1037,21 +1029,23 @@
error))
return FALSE;
-#define VALIDATE_FIELD(FIELD,DESCR) do {
\
- if (!ctx.FIELD) {
\
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unknown "
DESCR); \
- return FALSE;
\
- }
\
- self->priv->FIELD = ctx.FIELD;
\
- } while (0)
-
- VALIDATE_FIELD (max_payload_size_to_target_in_bytes, "max payload size");
- VALIDATE_FIELD (sector_size_in_bytes, "sector size");
- VALIDATE_FIELD (num_partition_sectors, "number of partition
sectors");
- VALIDATE_FIELD (total_sector_size_in_bytes, "total sector size");
- VALIDATE_FIELD (pages_in_block, "pages in block");
+ if (!ctx.sector_size_in_bytes) {
+ g_debug ("[qfu-sahara-device] using default sector size (%u bytes)",
DEFAULT_SECTOR_SIZE_IN_BYTES);
+ self->priv->sector_size_in_bytes = DEFAULT_SECTOR_SIZE_IN_BYTES;
+ } else
+ self->priv->sector_size_in_bytes = ctx.sector_size_in_bytes;
+
+ if (!ctx.pages_in_block) {
+ g_debug ("[qfu-sahara-device] using default pages in block (%u)",
DEFAULT_PAGES_IN_BLOCK);
+ self->priv->pages_in_block = DEFAULT_PAGES_IN_BLOCK;
+ } else
+ self->priv->pages_in_block = ctx.pages_in_block;
-#undef VALIDATE_FIELD
+ if (!ctx.max_payload_size_to_target_in_bytes) {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "unknown max
payload size");
+ return FALSE;
+ }
+ self->priv->max_payload_size_to_target_in_bytes =
ctx.max_payload_size_to_target_in_bytes;
/* compute transfer block size, which will be equal to the max payload size
* to target if it's multiple of sector size */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libqmi-1.30.2/src/qmicli/qmicli-wds.c
new/libqmi-1.30.4/src/qmicli/qmicli-wds.c
--- old/libqmi-1.30.2/src/qmicli/qmicli-wds.c 2021-08-31 14:35:37.000000000
+0200
+++ new/libqmi-1.30.4/src/qmicli/qmicli-wds.c 2022-02-11 10:54:57.000000000
+0100
@@ -239,7 +239,7 @@
#endif
#if defined HAVE_QMI_MESSAGE_WDS_BIND_MUX_DATA_PORT
{ "wds-bind-mux-data-port", 0, 0, G_OPTION_ARG_STRING, &bind_mux_str,
- "Bind qmux data port to controller device (allowed keys: mux-id, ep-type
(undefined|hsusb|pcie|embedded), ep-iface-number) to be used with
`--client-no-release-cid'",
+ "Bind qmux data port to controller device (allowed keys: mux-id, ep-type
(undefined|hsusb|pcie|embedded|bam-dmux), ep-iface-number) to be used with
`--client-no-release-cid'",
"[\"key=value,...\"]"
},
#endif
