From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Steven Noonan <steven@uplinklabs.net>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 2/2] package/powertop: bump to version 2.15
Date: Sat, 30 Sep 2023 19:19:42 +0200 [thread overview]
Message-ID: <20230930171942.GF2579@scaer> (raw)
In-Reply-To: <20230929161208.1106775-2-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2023-09-29 18:12 +0200, Fabrice Fontaine spake thusly:
> - Switch site to get latest version
> - Replace patch by an upstreamable one
>
> https://github.com/fenrus75/powertop/compare/v2.13...v2.15
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> .checkpackageignore | 1 -
> ...1-add-disable-stack-protector-option.patch | 55 +++++++++++++++++++
> ...dont-force-stack-smashing-protection.patch | 18 ------
> package/powertop/Config.in | 2 +-
> package/powertop/powertop.hash | 6 +-
> package/powertop/powertop.mk | 16 ++++--
> 6 files changed, 70 insertions(+), 28 deletions(-)
> create mode 100644 package/powertop/0001-add-disable-stack-protector-option.patch
> delete mode 100644 package/powertop/0001-dont-force-stack-smashing-protection.patch
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 0c7fae9409..d6873fb5a3 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1110,7 +1110,6 @@ package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream
> package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch Upstream
> package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch Upstream
> package/postgresql/S50postgresql Variables
> -package/powertop/0001-dont-force-stack-smashing-protection.patch Upstream
> package/pppd/0001-pppd-Fix-compilation-with-older-glibc-or-kernel-headers.patch Upstream
> package/pppd/0002-pppd-eap-tls.c-fix-build-with-libressl.patch Upstream
> package/pptp-linux/0001-susv3-legacy.patch Upstream
> diff --git a/package/powertop/0001-add-disable-stack-protector-option.patch b/package/powertop/0001-add-disable-stack-protector-option.patch
> new file mode 100644
> index 0000000000..01a030522d
> --- /dev/null
> +++ b/package/powertop/0001-add-disable-stack-protector-option.patch
> @@ -0,0 +1,55 @@
> +From 95382246ddd889839633aa0da800a03936b93986 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 31 Oct 2021 18:26:01 +0100
> +Subject: [PATCH] add --disable-stack-protector option
> +
> +Allow the user to disable stack-protector as not all toolchains support
> +this feature
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Upstream: https://github.com/fenrus75/powertop/pull/138
> +---
> + configure.ac | 4 ++++
> + src/Makefile.am | 5 ++++-
> + 2 files changed, 8 insertions(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 37c1304..69160d5 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -43,6 +43,10 @@ AX_ADD_FORTIFY_SOURCE
> + AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
> + PKG_PROG_PKG_CONFIG
> +
> ++AC_ARG_ENABLE([stack-protector],
> ++ AS_HELP_STRING([--disable-stack-protector], [Disable stack-protector]))
> ++AM_CONDITIONAL([ENABLE_STACK_PROTECTOR], [test x$enable_stack_protector != xno])
> ++
> + # Checks for libraries.
> + AX_PTHREAD([
> + LIBS="$PTHREAD_LIBS $LIBS"
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index 6b523f6..ca30d20 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -138,13 +138,16 @@ powertop_CXXFLAGS = \
> + -Wformat \
> + -Wshadow \
> + -fno-omit-frame-pointer \
> +- -fstack-protector \
> + $(GLIB2_CFLAGS) \
> + $(LIBNL_CFLAGS) \
> + $(NCURSES_CFLAGS) \
> + $(PCIUTILS_CFLAGS) \
> + $(PTHREAD_CFLAGS)
> +
> ++if ENABLE_STACK_PROTECTOR
> ++powertop_CXXFLAGS += \
> ++ -fstack-protector
> ++endif
> +
> + powertop_CPPFLAGS = \
> + -DLOCALEDIR=\"$(localedir)\" \
> +--
> +2.33.0
> +
> diff --git a/package/powertop/0001-dont-force-stack-smashing-protection.patch b/package/powertop/0001-dont-force-stack-smashing-protection.patch
> deleted file mode 100644
> index 75ed2d1c24..0000000000
> --- a/package/powertop/0001-dont-force-stack-smashing-protection.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Do not pass -fstack-protector unconditionally
> -
> -Using -fstack-protector only works when the toolchain has SSP support.
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> -
> -Index: b/src/Makefile.am
> -===================================================================
> ---- a/src/Makefile.am
> -+++ b/src/Makefile.am
> -@@ -127,7 +127,6 @@
> - -Wformat \
> - -Wshadow \
> - -fno-omit-frame-pointer \
> -- -fstack-protector \
> - $(GLIB2_CFLAGS) \
> - $(LIBNL_CFLAGS) \
> - $(NCURSES_CFLAGS) \
> diff --git a/package/powertop/Config.in b/package/powertop/Config.in
> index fd88a3d0eb..2f7ba2bb9d 100644
> --- a/package/powertop/Config.in
> +++ b/package/powertop/Config.in
> @@ -9,7 +9,7 @@ config BR2_PACKAGE_POWERTOP
> A tool to diagnose issues with power consumption and power
> management
>
> - https://01.org/powertop/
> + https://github.com/fenrus75/powertop/
>
> comment "powertop needs a toolchain w/ C++, threads, wchar"
> depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
> diff --git a/package/powertop/powertop.hash b/package/powertop/powertop.hash
> index fc8f3cc52f..810b80a514 100644
> --- a/package/powertop/powertop.hash
> +++ b/package/powertop/powertop.hash
> @@ -1,5 +1,3 @@
> -# Locally calculated after checking pgp signature
> -# https://01.org/sites/default/files/downloads/powertop-2.13.tar.gz.asc.txt
> -# using key 22E8F306C8FA4BAA2A5F36F3A0303B060918941C
> -sha256 a65f992ca4a419bc73b623651060eb9fc00c5a86fa03556358cd9db011ef3178 powertop-2.13.tar.gz
> +# Locally calculated
> +sha256 e58ab3fd7b8ff5f4dd0d17f11848817e7d83c0a6918145ac81de03b5dccf8f49 powertop-2.15.tar.gz
> sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
> diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk
> index 681f5fda46..41403b0918 100644
> --- a/package/powertop/powertop.mk
> +++ b/package/powertop/powertop.mk
> @@ -4,16 +4,24 @@
> #
> ################################################################################
>
> -POWERTOP_VERSION = 2.13
> -POWERTOP_SITE = https://01.org/sites/default/files/downloads
> -POWERTOP_DEPENDENCIES = ncurses libnl host-pkgconf \
> +POWERTOP_VERSION = 2.15
> +POWERTOP_SITE = $(call github,fenrus75,powertop,v$(POWERTOP_VERSION))
> +POWERTOP_DEPENDENCIES = host-autoconf-archive ncurses libnl host-pkgconf \
> $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \
> $(TARGET_NLS_DEPENDENCIES)
> POWERTOP_LICENSE = GPL-2.0
> POWERTOP_LICENSE_FILES = COPYING
> POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
> -# 0001-dont-force-stack-smashing-protection.patch
> +POWERTOP_CONF_OPTS = --disable-stack-protector
> +# 0001-add-disable-stack-protector-option.patch
> POWERTOP_AUTORECONF = YES
> +POWERTOP_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
> +
> +# fix missing config.rpath (needed for autoreconf) in the codebase
> +define POWERTOP_TOUCH_CONFIG_RPATH
> + touch $(@D)/config.rpath
> +endef
> +POWERTOP_PRE_CONFIGURE_HOOKS += POWERTOP_TOUCH_CONFIG_RPATH
>
> # Help powertop at finding the right ncurses library depending on
> # which one is available.
> --
> 2.40.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2023-09-30 17:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 16:12 [Buildroot] [PATCH 1/2] package/powertop: picutils is optional, not mandatory Fabrice Fontaine
2023-09-29 16:12 ` [Buildroot] [PATCH 2/2] package/powertop: bump to version 2.15 Fabrice Fontaine
2023-09-30 17:19 ` Yann E. MORIN [this message]
2023-09-30 17:19 ` [Buildroot] [PATCH 1/2] package/powertop: picutils is optional, not mandatory Yann E. MORIN
2023-10-13 6:21 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230930171942.GF2579@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=fontaine.fabrice@gmail.com \
--cc=steven@uplinklabs.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.