This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via e9062718d1247375422920a7d69ca8fd00b8b949 (commit) via 7a22b050fa84ffef05dff3b145282ecfbfea9734 (commit) from eb9e29f9a742d5472180371b99c2e17b966852f1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e9062718d1247375422920a7d69ca8fd00b8b949 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 6 10:07:19 2022 +0000
Revert "Core Update 172: Remove powertop add-on, if installed"
This reverts commit d3a4fcc7097a3df6e45f4d2b15960ccb61f0152f.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7a22b050fa84ffef05dff3b145282ecfbfea9734 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 6 10:05:47 2022 +0000
Revert "Drop powertop"
This reverts commit f7b0247e02ed5af880f03932807d039ef9008d91.
https://community.ipfire.org/t/will-the-powertop-add-on-be-available-in-futu...
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/172/update.sh | 4 ++-- config/rootfiles/packages/powertop | 23 +++++++++++++++++++++++ lfs/{spandsp => powertop} | 13 +++++++------ make.sh | 1 + 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/packages/powertop copy lfs/{spandsp => powertop} (90%)
Difference in files: diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh index d66156f16..585943950 100644 --- a/config/rootfiles/core/172/update.sh +++ b/config/rootfiles/core/172/update.sh @@ -129,8 +129,8 @@ rm -rvf \ /usr/libexec/ipsec/scepclient \ /var/ipfire/ca/dh1024.pem
-# Remove gnu-netcat and powertop add-on, if installed -for addon in gnu-netcat powertop; do +# Remove gnu-netcat add-on, if installed +for addon in gnu-netcat; do if [ -e "/opt/pakfire/db/installed/meta-${addon}" ]; then for i in $(</opt/pakfire/db/rootfiles/${addon}); do rm -rfv "/${i}" diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop new file mode 100644 index 000000000..3ec61dd8e --- /dev/null +++ b/config/rootfiles/packages/powertop @@ -0,0 +1,23 @@ +usr/sbin/powertop +#usr/share/bash-completion/completions/powertop +#usr/share/locale/ca/LC_MESSAGES/powertop.mo +#usr/share/locale/cs_CZ/LC_MESSAGES/powertop.mo +#usr/share/locale/de_DE +#usr/share/locale/de_DE/LC_MESSAGES +#usr/share/locale/de_DE/LC_MESSAGES/powertop.mo +#usr/share/locale/en_GB/LC_MESSAGES/powertop.mo +#usr/share/locale/en_US/LC_MESSAGES/powertop.mo +#usr/share/locale/es_ES +#usr/share/locale/es_ES/LC_MESSAGES +#usr/share/locale/es_ES/LC_MESSAGES/powertop.mo +#usr/share/locale/hu_HU +#usr/share/locale/hu_HU/LC_MESSAGES +#usr/share/locale/hu_HU/LC_MESSAGES/powertop.mo +#usr/share/locale/id_ID +#usr/share/locale/id_ID/LC_MESSAGES +#usr/share/locale/id_ID/LC_MESSAGES/powertop.mo +#usr/share/locale/nl_NL +#usr/share/locale/nl_NL/LC_MESSAGES +#usr/share/locale/nl_NL/LC_MESSAGES/powertop.mo +#usr/share/locale/zh_TW/LC_MESSAGES/powertop.mo +#usr/share/man/man8/powertop.8 diff --git a/lfs/powertop b/lfs/powertop new file mode 100644 index 000000000..c909a73bf --- /dev/null +++ b/lfs/powertop @@ -0,0 +1,90 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = A Linux Tool to Find out What is Using Power on a Laptop + +VER = 2.14 + +THISAPP = powertop-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = powertop +PAK_VER = 4 + +DEPS = + +SERVICES = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + $(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 413d04491..7d9a278b5 100755 --- a/make.sh +++ b/make.sh @@ -1593,6 +1593,7 @@ buildipfire() { lfsmake2 zerofree lfsmake2 minicom lfsmake2 ddrescue + lfsmake2 powertop lfsmake2 parted lfsmake2 swig lfsmake2 dtc
hooks/post-receive -- IPFire 2.x development tree