Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package powerstat for openSUSE:Factory
checked in at 2023-01-03 15:05:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/powerstat (Old)
and /work/SRC/openSUSE:Factory/.powerstat.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerstat"
Tue Jan 3 15:05:12 2023 rev:14 rq:1046244 version:0.02.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/powerstat/powerstat.changes 2022-11-03
19:14:28.156107985 +0100
+++ /work/SRC/openSUSE:Factory/.powerstat.new.1563/powerstat.changes
2023-01-03 15:05:27.766543974 +0100
@@ -1,0 +2,11 @@
+Mon Jan 2 14:11:16 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 0.02.28:
+ * Add hint on how to use powerstat if -R option fails to find RAPL
+ * Widen range of power_domains and thermal_zones, make them signed integers
+ * powerstat: sanity check readdir name
+ * Update copyright year
+ * Clean up some whitespaces
+ * powerstat: add notes on deprecated i915 power interface
+
+-------------------------------------------------------------------
Old:
----
V0.02.27.tar.gz
New:
----
V0.02.28.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerstat.spec ++++++
--- /var/tmp/diff_new_pack.9rpfM9/_old 2023-01-03 15:05:28.150546216 +0100
+++ /var/tmp/diff_new_pack.9rpfM9/_new 2023-01-03 15:05:28.154546239 +0100
@@ -1,7 +1,7 @@
#
# spec file for package powerstat
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2017-2021, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: powerstat
-Version: 0.02.27
+Version: 0.02.28
Release: 0
Summary: Laptop power measuring tool
License: GPL-2.0-only
++++++ V0.02.27.tar.gz -> V0.02.28.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/Makefile
new/powerstat-0.02.28/Makefile
--- old/powerstat-0.02.27/Makefile 2021-11-10 19:31:27.000000000 +0100
+++ new/powerstat-0.02.28/Makefile 2022-12-06 14:09:51.000000000 +0100
@@ -1,5 +1,6 @@
#
# Copyright (C) 2011-2021 Canonical, Ltd.
+# Copyright (C) 2021-2022 Colin Ian King.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -16,7 +17,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
-VERSION=0.02.27
+VERSION=0.02.28
CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/debian/changelog
new/powerstat-0.02.28/debian/changelog
--- old/powerstat-0.02.27/debian/changelog 2021-11-10 19:31:27.000000000
+0100
+++ new/powerstat-0.02.28/debian/changelog 2022-12-06 14:09:51.000000000
+0100
@@ -1,3 +1,16 @@
+powerstat (0.02.28-1) unstable; urgency=medium
+
+ * Makefile: bump version
+ * Debian: update control to 4.6.1
+ * Add hint on how to use powerstat if -R option fails to find RAPL
+ * Widen range of power_domains and thermal_zones, make them signed integers
+ * powerstat: sanity check readdir name
+ * Update copyright year
+ * Clean up some whitespaces
+ * powerstat: add notes on deprecated i915 power interface
+
+ -- Colin Ian King <colin.i.k...@gmail.com> Tue, 6 Dec 2022 13:09:11 +0000
+
powerstat (0.02.27-1) unstable; urgency=medium
* Makefile: bump version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/debian/control
new/powerstat-0.02.28/debian/control
--- old/powerstat-0.02.27/debian/control 2021-11-10 19:31:27.000000000
+0100
+++ new/powerstat-0.02.28/debian/control 2022-12-06 14:09:51.000000000
+0100
@@ -3,7 +3,7 @@
Section: admin
Priority: optional
Maintainer: Colin Ian King <colin.i.k...@gmail.com>
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
Build-Depends: debhelper (>= 13),
debhelper-compat (=13)
Homepage: https://github.com/ColinIanKing/powerstat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/debian/copyright
new/powerstat-0.02.28/debian/copyright
--- old/powerstat-0.02.27/debian/copyright 2021-11-10 19:31:27.000000000
+0100
+++ new/powerstat-0.02.28/debian/copyright 2022-12-06 14:09:51.000000000
+0100
@@ -5,7 +5,7 @@
Files: *
Copyright: 2011-2021, Canonical Ltd
- 2021, Colin Ian King
+ 2021-2022, Colin Ian King
License: GPL-2+
On Debian systems, the complete text of the GNU General Public
License can be found in `/usr/share/common-licenses/GPL-2'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/powerstat.8
new/powerstat-0.02.28/powerstat.8
--- old/powerstat-0.02.27/powerstat.8 2021-11-10 19:31:27.000000000 +0100
+++ new/powerstat-0.02.28/powerstat.8 2022-12-06 14:09:51.000000000 +0100
@@ -163,7 +163,7 @@
This manual page was written by Colin Ian King <colin.i.k...@gmail.com>,
for the Ubuntu project (but may be used by others).
.SH COPYRIGHT
-Copyright \(co 2011-2021 Canonical Ltd. Copyright Colin Ian King
+Copyright \(co 2011-2021 Canonical Ltd. Copyright \(co 2021-2022 Colin Ian King
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.27/powerstat.c
new/powerstat-0.02.28/powerstat.c
--- old/powerstat-0.02.27/powerstat.c 2021-11-10 19:31:27.000000000 +0100
+++ new/powerstat-0.02.28/powerstat.c 2022-12-06 14:09:51.000000000 +0100
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2011-2021 Canonical
+ * Copyright (C) 2021-2022 Colin Ian King
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -148,7 +149,6 @@
uint32_t cpu_id; /* CPU ID */
} cpu_info_t;
-
typedef struct {
double threshold;
double scale;
@@ -274,8 +274,8 @@
static bool power_calc_from_capacity = false; /* true of power is calculated
via capacity change */
static const char *app_name = "powerstat"; /* name of application */
static const char *(*get_domain)(const int i) = NULL;
-static uint8_t power_domains = 0; /* Number of RAPL domains */
-static uint8_t thermal_zones = 0; /* Number of thermal zones */
+static int power_domains = 0; /* Number of RAPL domains */
+static int thermal_zones = 0; /* Number of thermal zones */
static const char *tz_get_type(const int n);
static int tz_get_temperature(stats_t *stats);
@@ -681,6 +681,7 @@
static void handle_sig(int dummy)
{
(void)dummy;
+
stop_recv = true;
}
@@ -978,7 +979,7 @@
*/
static void stats_headings(void)
{
- uint8_t i;
+ int i;
if (opts & OPTS_USE_NETLINK)
(void)printf(" Time User Nice Sys Idle IO Run
Ctxt/s IRQ/s Fork Exec Exit Watts");
@@ -1013,7 +1014,7 @@
*/
static void stats_ruler(void)
{
- uint8_t i;
+ int i;
if (opts & OPTS_USE_NETLINK)
(void)printf("-------- ----- ----- ----- ----- ----- ----
------ ------ ---- ---- ---- ------ ");
@@ -1062,7 +1063,7 @@
const stats_t *const s)
{
char buf[10];
- uint8_t i;
+ int i;
if (summary) {
if (s->inaccurate[POWER_TOTAL])
@@ -1888,6 +1889,7 @@
return 0;
}
(void)printf("Device does not have any RAPL domains, cannot
power measure power usage.\n");
+ (void)printf("Force powerstat to run without RAPL by using the
-z option\n");
return -1;
}
return 0;
@@ -1897,6 +1899,14 @@
/*
* power_get_gpu_i915()
* get Intel i915 GPU power stats
+ *
+ * interface was removed from Linux 5.5 i915 driver by the commit:
+ *
+ * commit 6311d260a1794d8ccef0ac8b39405fea0e1d9474
+ * Author: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
+ * Date: Thu Feb 6 14:07:25 2020 +0000
+ * drm/i915/debugfs: Remove i915_energy_uJ
+ *
*/
static int power_get_gpu_i915(
const stats_t *const s1,
@@ -1938,7 +1948,6 @@
stats_t *s2,
stats_t *const res)
{
-
if (power_get_gpu_i915(s1, s2, res) < 0) {
s2->value[POWER_GPU] = 0.0;
res->value[POWER_GPU] = 0.0;
@@ -2301,8 +2310,13 @@
n_states = scandir(path, &states_list, NULL, alphasort);
for (j = 0; j < n_states; j++) {
- char *sname = states_list[j]->d_name;
+ char *sname;
+ if (!states_list[j])
+ continue;
+ sname = states_list[j]->d_name;
+ if (!sname)
+ continue;
if (!strncmp("state", sname, 5)) {
cpu_info_t *info;
info =
cpu_info_get(states_list[j]->d_name, cpu_id);
