Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package powertop for openSUSE:Factory checked in at 2021-06-07 22:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powertop (Old) and /work/SRC/openSUSE:Factory/.powertop.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powertop" Mon Jun 7 22:43:44 2021 rev:55 rq:897928 version:2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/powertop/powertop.changes 2020-11-11 20:46:35.263658022 +0100 +++ /work/SRC/openSUSE:Factory/.powertop.new.32437/powertop.changes 2021-06-07 22:44:12.224556384 +0200 @@ -1,0 +2,10 @@ +Sun Jun 6 13:14:31 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 2.14: + * add service file + * remove stale printf line + * Enable Rocket Lake platform support + * Enable Alder Lake support +- remove powertop-add-rocket-lake-support.patch (upstream) + +------------------------------------------------------------------- Old: ---- powertop-add-rocket-lake-support.patch v2.13.tar.gz New: ---- v2.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.v2mC83/_old 2021-06-07 22:44:13.044557769 +0200 +++ /var/tmp/diff_new_pack.v2mC83/_new 2021-06-07 22:44:13.048557776 +0200 @@ -1,7 +1,7 @@ # # spec file for package powertop # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,14 @@ Name: powertop -Version: 2.13 +Version: 2.14 Release: 0 Summary: A Linux Tool to Find out What is Using Power on a Laptop License: GPL-2.0-only Group: System/Monitoring URL: https://01.org/powertop/ -Source0: https://github.com/fenrus75/powertop/archive/v2.13.tar.gz +Source0: https://github.com/fenrus75/powertop/archive/v%{version}.tar.gz Source1: powertop.service -# jsc#SLE-13395: Add powertop support -Patch0: powertop-add-rocket-lake-support.patch # they repeatedly forget to upload a release tarball and only have the one from # GitHub which doesnt contain configure thus adding: # autoconf, autoconf-archive, automake, libtool @@ -54,7 +52,6 @@ %prep %setup -q -n powertop-%{version} -%patch0 -p1 # Delete objects files left in tarball find . -name '*.o' -delete @@ -63,8 +60,8 @@ # workaround for 'error: too many loops' in sle15sp3 # also see rhbz#1826935 autoreconf -fi || autoreconf -fi -export CFLAGS="%{optflags} -D_GNU_SOURCE" -%configure +export CFLAGS="%{optflags} -D_GNU_SOURCE -pthread" +%configure --disable-static %make_build %install ++++++ v2.13.tar.gz -> v2.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/.gitignore new/powertop-2.14/.gitignore --- old/powertop-2.13/.gitignore 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/.gitignore 2021-04-15 01:29:13.000000000 +0200 @@ -69,6 +69,7 @@ po/insert-header.sin po/quot.sed po/remove-potcdate.sin +po/remove-potcdate.sed # gettext build artifacts po/ca.gmo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/README.md new/powertop-2.14/README.md --- old/powertop-2.13/README.md 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/README.md 2021-04-15 01:29:13.000000000 +0200 @@ -26,7 +26,7 @@ sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \ libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \ - dh-autoreconf autoconf-archive pkg-config + dh-autoreconf pkg-config ## Building PowerTOP @@ -39,7 +39,7 @@ To build PowerTOP from the cloned source, use the following commands: ./autogen.sh - ./configure + ./configure LDFLAGS='-pthread' make diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/configure.ac new/powertop-2.14/configure.ac --- old/powertop-2.13/configure.ac 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/configure.ac 2021-04-15 01:29:13.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([powertop], [2.13], [power...@lists.01.org], [], [https://01.org/powertop]) +AC_INIT([powertop], [2.14], [power...@lists.01.org], [], [https://01.org/powertop]) AM_INIT_AUTOMAKE([ -Wall 1.12.2 @@ -26,7 +26,7 @@ AC_SUBST([GETTEXT_PACKAGE]) AM_SILENT_RULES([yes]) AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.20.2]) +AM_GNU_GETTEXT_VERSION([0.18.2]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # Checks for programs. @@ -36,17 +36,9 @@ AC_PROG_CC AC_PROG_INSTALL AM_PROG_CC_C_O -AX_ADD_FORTIFY_SOURCE -AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) +PKG_PROG_PKG_CONFIG # Checks for libraries. -AX_PTHREAD([ - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - CC="$PTHREAD_CC" - ], [ - AC_MSG_ERROR([Could not configure pthreads support]) -]) # Checks for header files. AC_CHECK_HEADERS([ \ @@ -155,8 +147,8 @@ ], []) -AS_IF([`pkg-config --exists bash-completion`], [ - bashcompletiondir=`pkg-config --variable=completionsdir --define-variable=prefix=${prefix} bash-completion` +AS_IF([`${PKG_CONFIG} --exists bash-completion`], [ + bashcompletiondir=`${PKG_CONFIG} --variable=completionsdir --define-variable=prefix=${prefix} bash-completion` ], [ bashcompletiondir=${datadir}/bash-completion/completions ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/m4/ChangeLog new/powertop-2.14/m4/ChangeLog --- old/powertop-2.13/m4/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/powertop-2.14/m4/ChangeLog 2021-04-15 01:29:13.000000000 +0200 @@ -0,0 +1,11 @@ +2016-08-03 gettextize <bug-gnu-gett...@gnu.org> + + * gettext.m4: New file, from gettext-0.18.2. + * iconv.m4: New file, from gettext-0.18.2. + * lib-ld.m4: New file, from gettext-0.18.2. + * lib-link.m4: New file, from gettext-0.18.2. + * lib-prefix.m4: New file, from gettext-0.18.2. + * nls.m4: New file, from gettext-0.18.2. + * po.m4: New file, from gettext-0.18.2. + * progtest.m4: New file, from gettext-0.18.2. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/po/ChangeLog new/powertop-2.14/po/ChangeLog --- old/powertop-2.13/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/powertop-2.14/po/ChangeLog 2021-04-15 01:29:13.000000000 +0200 @@ -0,0 +1,11 @@ +2016-08-03 gettextize <bug-gnu-gett...@gnu.org> + + * Makefile.in.in: Upgrade to gettext-0.18.2. + * boldquot.sed: New file, from gettext-0.18.2. + * en@boldquot.header: New file, from gettext-0.18.2. + * en@quot.header: New file, from gettext-0.18.2. + * insert-header.sin: New file, from gettext-0.18.2. + * quot.sed: New file, from gettext-0.18.2. + * remove-potcdate.sin: New file, from gettext-0.18.2. + * Rules-quot: New file, from gettext-0.18.2. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/po/Makefile.in.in new/powertop-2.14/po/Makefile.in.in --- old/powertop-2.13/po/Makefile.in.in 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/po/Makefile.in.in 2021-04-15 01:29:13.000000000 +0200 @@ -1,20 +1,20 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-2000 Ulrich Drepper <drep...@gnu.ai.mit.edu> -# Copyright (C) 2000-2020 Free Software Foundation, Inc. +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drep...@gnu.ai.mit.edu> # -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. # -# Origin: gettext-0.20.2 -GETTEXT_MACRO_VERSION = 0.20 +# Origin: gettext-0.18.2 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -44,22 +44,20 @@ MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ -# When building gettext-tools, we prefer to use the built programs -# rather than installed programs. However, we can't do that when we -# are cross compiling. -CROSS_COMPILING = @CROSS_COMPILING@ - GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ GMSGFMT_yes = @GMSGFMT_015@ GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) +MSGFMT_ = @MSGFMT@ +MSGFMT_no = @MSGFMT@ +MSGFMT_yes = @MSGFMT_015@ +MSGFMT = $(MSGFMT_$(USE_MSGCTXT)) XGETTEXT_ = @XGETTEXT@ XGETTEXT_no = @XGETTEXT@ XGETTEXT_yes = @XGETTEXT_015@ XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) -MSGMERGE = @MSGMERGE@ +MSGMERGE = msgmerge MSGMERGE_UPDATE = @MSGMERGE@ --update -MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@ MSGINIT = msginit MSGCONV = msgconv MSGFILTER = msgfilter @@ -78,56 +76,29 @@ CATALOGS = @CATALOGS@ -POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot -POFILESDEPS_yes = $(POFILESDEPS_) -POFILESDEPS_no = -POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) - -DISTFILESDEPS_ = update-po -DISTFILESDEPS_yes = $(DISTFILESDEPS_) -DISTFILESDEPS_no = -DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) - # Makevars gets inserted here. (Don't remove this line!) -all: all-@USE_NLS@ - - .SUFFIXES: -.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update + +.po.mo: + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ -# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs. -# The GNU Coding Standards say in -# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>: -# "GNU distributions usually contain some files which are not source files -# ... . Since these files normally appear in the source directory, they -# should always appear in the source directory, not in the build directory. -# So Makefile rules to update them should put the updated files in the -# source directory." -# Therefore we put these files in the source directory, not the build directory. - -# During .po -> .gmo conversion, take into account the most recent changes to -# the .pot file. This eliminates the need to update the .po files when the -# .pot file has changed, which would be troublesome if the .po files are put -# under version control. -$(GMOFILES): $(srcdir)/$(DOMAIN).pot .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \ - cd $(srcdir) && \ - rm -f $${lang}.gmo && \ - $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \ - $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \ - mv t-$${lang}.gmo $${lang}.gmo && \ - rm -f $${lang}.1po + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all-yes: $(srcdir)/stamp-po +all: all-@USE_NLS@ + +all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. @@ -141,24 +112,24 @@ # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that # LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. -# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target). +# In this case, stamp-po is a nop (i.e. a phony target). -# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS -# have been loosely updated. Its purpose is that when a developer or translator -# checks out the package from a version control system, and the $(DOMAIN).pot -# file is not under version control, "make" will update the $(DOMAIN).pot and -# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This -# timestamp would not be necessary if updating the $(CATALOGS) would always -# touch them; however, the rule for $(POFILES) has been designed to not touch -# files that don't need to be changed. -$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot +# stamp-po is a timestamp denoting the last time at which the CATALOGS have +# been loosely updated. Its purpose is that when a developer or translator +# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, +# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent +# invocations of "make" will do nothing. This timestamp would not be necessary +# if updating the $(CATALOGS) would always touch them; however, the rule for +# $(POFILES) has been designed to not touch files that don't need to be +# changed. +stamp-po: $(srcdir)/$(DOMAIN).pot @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ - echo "touch $(srcdir)/stamp-po" && \ - echo timestamp > $(srcdir)/stamp-poT && \ - mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \ + echo "touch stamp-po" && \ + echo timestamp > stamp-poT && \ + mv stamp-poT stamp-po; \ } # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', @@ -171,23 +142,15 @@ # heuristic whether some file in the top level directory mentions "GNU xyz". # If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - package_gnu="$(PACKAGE_GNU)"; \ - test -n "$$package_gnu" || { \ - if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ - LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ - else \ - LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ - fi; \ - } | grep -v 'libtool:' >/dev/null; then \ - package_gnu=yes; \ - else \ - package_gnu=no; \ - fi; \ - }; \ - if test "$$package_gnu" = "yes"; then \ - package_prefix='GNU '; \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ else \ - package_prefix=''; \ + package_gnu=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -197,30 +160,22 @@ case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ --msgid-bugs-address="$$msgid_bugs_address" \ - $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ *) \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_prefix}@PACKAGE@" \ + --package-name="$${package_gnu}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ - $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ ;; \ esac test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot-header; then \ - sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ - cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \ - rm -f $(DOMAIN).1po \ - || exit 1; \ - fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ @@ -243,20 +198,17 @@ # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(POFILESDEPS) - @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot +$(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ - 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ esac; \ }; \ else \ @@ -391,30 +343,28 @@ info dvi ps pdf html tags TAGS ctags CTAGS ID: -install-dvi install-ps install-pdf install-html: - mostlyclean: rm -f remove-potcdate.sed - rm -f $(srcdir)/stamp-poT + rm -f stamp-poT rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES) + rm -f stamp-po $(GMOFILES) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) + $(MAKE) update-po @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. -dist2: $(srcdir)/stamp-po $(DISTFILES) +dist2: stamp-po $(DISTFILES) dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ @@ -455,19 +405,17 @@ .nop.po-update: @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ - 0.1[6-7] | 0.1[6-7].*) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ *) \ - $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ esac; \ }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/po/powertop.pot new/powertop-2.14/po/powertop.pot --- old/powertop-2.13/po/powertop.pot 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/po/powertop.pot 2021-04-15 01:29:13.000000000 +0200 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: powertop 2.13\n" +"Project-Id-Version: powertop 2.14\n" "Report-Msgid-Bugs-To: \"power...@lists.01.org\"\n" -"POT-Creation-Date: 2020-06-11 12:04-0700\n" +"POT-Creation-Date: 2021-04-14 16:28-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -94,7 +94,7 @@ msgid " Core(OS)" msgstr "" -#: src/cpu/cpu_core.cpp:91 src/cpu/intel_cpus.cpp:347 +#: src/cpu/cpu_core.cpp:91 src/cpu/intel_cpus.cpp:351 #, c-format msgid " Core" msgstr "" @@ -171,7 +171,7 @@ msgid " CPU(OS) %i" msgstr "" -#: src/cpu/cpu_linux.cpp:341 src/cpu/intel_cpus.cpp:694 +#: src/cpu/cpu_linux.cpp:341 src/cpu/intel_cpus.cpp:701 #, c-format msgid " CPU %i" msgstr "" @@ -186,21 +186,21 @@ msgid " Pkg(OS)" msgstr "" -#: src/cpu/cpu_package.cpp:104 src/cpu/intel_cpus.cpp:455 +#: src/cpu/cpu_package.cpp:104 src/cpu/intel_cpus.cpp:466 #, c-format msgid " Package" msgstr "" -#: src/cpu/intel_cpus.cpp:140 +#: src/cpu/intel_cpus.cpp:144 #, c-format msgid "read_msr cpu%d 0x%llx : " msgstr "" -#: src/cpu/intel_cpus.cpp:617 +#: src/cpu/intel_cpus.cpp:624 msgid "C0 active" msgstr "" -#: src/cpu/intel_cpus.cpp:675 +#: src/cpu/intel_cpus.cpp:682 #, c-format msgid "Average" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/powertop.service new/powertop-2.14/powertop.service --- old/powertop-2.13/powertop.service 1970-01-01 01:00:00.000000000 +0100 +++ new/powertop-2.14/powertop.service 2021-04-15 01:29:13.000000000 +0200 @@ -0,0 +1,9 @@ +[Unit] +Description=Extend the battery life of laptop + +[Service] +Type=oneshot +ExecStart=/usr/sbin/powertop --auto-tune + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/src/cpu/abstract_cpu.cpp new/powertop-2.14/src/cpu/abstract_cpu.cpp --- old/powertop-2.13/src/cpu/abstract_cpu.cpp 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/src/cpu/abstract_cpu.cpp 2021-04-15 01:29:13.000000000 +0200 @@ -176,15 +176,11 @@ for (i = 0; i < cstates.size(); i++) { struct idle_state *state = cstates[i]; - if (state->after_count == 0) { - cout << "after count is 0 " << state->linux_name << "\n"; + if (state->after_count == 0) continue; - } - if (state->after_count != state->before_count) { - cout << "count mismatch " << state->after_count << " " << state->before_count << " on cpu " << number << "\n"; + if (state->after_count != state->before_count) continue; - } state->usage_delta = (state->usage_after - state->usage_before) / state->after_count; state->duration_delta = (state->duration_after - state->duration_before) / state->after_count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/src/cpu/intel_cpus.cpp new/powertop-2.14/src/cpu/intel_cpus.cpp --- old/powertop-2.13/src/cpu/intel_cpus.cpp 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/src/cpu/intel_cpus.cpp 2021-04-15 01:29:13.000000000 +0200 @@ -78,11 +78,15 @@ 0x8C, /* TGL_MOBILE */ 0x8D, /* TGL_DESKTOP */ 0x8E, /* KBL */ + 0X8F, /* SAPPHIRERAPIDS_X */ 0x96, /* EHL */ + 0x97, /* ADL_DESKTOP */ + 0x9A, /* ADL_MOBILE */ 0x9C, /* JSL */ 0x9E, /* KBL */ 0xA5, /* CML_DESKTOP */ 0xA6, /* CML_MOBILE */ + 0xA7, /* RKL_DESKTOP */ 0 /* last entry must be zero */ }; @@ -191,11 +195,15 @@ case 0x8C: /* TGL_MOBILE */ case 0x8D: /* TGL_DESKTOP */ case 0x8E: /* KBL */ + case 0x8F: /* SAPPHIRERAPIDS_X */ case 0x96: /* EHL */ + case 0x97: /* ADL_DESKTOP */ + case 0x9A: /* ADL_MOBILE */ case 0x9C: /* JSL */ case 0x9E: /* KBL */ case 0xA5: /* CML_DESKTOP */ case 0xA6: /* CML_MOBILE */ + case 0xA7: /* RKL_DESKTOP */ has_c7_res = 1; } @@ -299,15 +307,11 @@ for (i = 0; i < cstates.size(); i++) { struct idle_state *state = cstates[i]; - if (state->after_count == 0) { - cout << "after count is 0\n"; + if (state->after_count == 0) continue; - } - if (state->after_count != state->before_count) { - cout << "count mismatch\n"; + if (state->after_count != state->before_count) continue; - } state->usage_delta = ratio * (state->usage_after - state->usage_before) / state->after_count; state->duration_delta = ratio * (state->duration_after - state->duration_before) / state->after_count; @@ -384,11 +388,15 @@ case 0x8C: /* TGL_MOBILE */ case 0x8D: /* TGL_DESKTOP */ case 0x8E: /* KBL */ + case 0x8F: /* SAPPHIRERAPIDS_X */ case 0x96: /* EHL */ + case 0x97: /* ADL_DESKTOP */ + case 0X9A: /* ADL_MOBILE */ case 0x9C: /* JSL */ case 0x9E: /* KBL */ case 0xA5: /* CML_DESKTOP */ case 0xA6: /* CML_MOBILE */ + case 0xA7: /* RKL_DESKTOP */ has_c2c6_res=1; has_c7_res = 1; } @@ -428,10 +436,13 @@ case 0x8D: /* TGL_DESKTOP */ case 0x8E: /* KBL */ case 0x96: /* EHL */ + case 0x97: /* ADL_DESKTOP */ + case 0x9A: /* ADL_MOBILE */ case 0x9C: /* JSL */ case 0x9E: /* KBL */ case 0xA5: /* CML_DESKTOP */ case 0xA6: /* CML_MOBILE */ + case 0xA7: /* RKL_DESKTOP */ has_c8c9c10_res = 1; break; } @@ -572,15 +583,11 @@ for (i = 0; i < cstates.size(); i++) { struct idle_state *state = cstates[i]; - if (state->after_count == 0) { - cout << "after count is 0\n"; + if (state->after_count == 0) continue; - } - if (state->after_count != state->before_count) { - cout << "count mismatch\n"; + if (state->after_count != state->before_count) continue; - } state->usage_delta = ratio * (state->usage_after - state->usage_before) / state->after_count; state->duration_delta = ratio * (state->duration_after - state->duration_before) / state->after_count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/src/parameters/parameters.cpp new/powertop-2.14/src/parameters/parameters.cpp --- old/powertop-2.13/src/parameters/parameters.cpp 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/src/parameters/parameters.cpp 2021-04-15 01:29:13.000000000 +0200 @@ -428,7 +428,7 @@ /* force power data to be valid to the rest of the system */ -int global_power_override = 1; +int global_power_override = 0; int global_run_times=0; /* * only report power numbers once we have 3* more measurements than diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powertop-2.13/src/tuning/runtime.cpp new/powertop-2.14/src/tuning/runtime.cpp --- old/powertop-2.13/src/tuning/runtime.cpp 2020-06-11 21:09:47.000000000 +0200 +++ new/powertop-2.14/src/tuning/runtime.cpp 2021-04-15 01:29:13.000000000 +0200 @@ -188,7 +188,6 @@ continue; snprintf(port, sizeof(port), "sd%c", blk); - printf (" the port is %s\n", port); snprintf(filename, sizeof(filename), "/sys/block/%s/device", port); runtime_ahci_disk = new class runtime_tunable(filename, bus, entry->d_name, port); if (!device_has_runtime_pm(filename))
