Skip to contentSkip to conversation

package/pcm-tools: bump to version 202110

PATCH Applied Adam Duskett 2 participants 2 messages Nov 4, 2021 – Dec 28, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pcm-tools: bump to version 202110

Changes:
- Update LICENSE hash due to a year bump.

- Remove 0001-Look-for-pcm-core-at-the-default-path.patch in favor of the upstream patch 0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch

- Add -fPIC to the CXXFLAGS to prevent the error:
"msr.o: relocation R_X86_64_PC32 against symbol `_ZTVN3pcm9MsrHandleE' can not be used when making a shared object; recompile with -fPIC"

- Depend on Python3 for the pmu-query script.

---
 ...ook-for-pcm-core-at-the-default-path.patch |  46 --------
 ...-python3-errors-add-linux-platform-s.patch | 103 ++++++++++++++++++
 package/pcm-tools/Config.in                   |  10 +-
 package/pcm-tools/pcm-tools.hash              |   4 +-
 package/pcm-tools/pcm-tools.mk                |   4 +-
 5 files changed, 111 insertions(+), 56 deletions(-)
 delete mode 100644 package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
 create mode 100644 package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch
package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch deleted +0 -46
deleted file mode 100644
index 933eec0237..0000000000
@@ -1,46 +0,0 @@
-From 53b6161d2413406778fa222274069c82846f0297 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <[email protected]>
-Date: Thu, 6 Dec 2018 21:17:02 -0200
-Subject: [PATCH] Look for pcm-core at the default path
-
-On Buildroot, pcm-core.x is installed as /usr/bin/pcm-core. Remove the
-platform test, since we know that it's neither CigWin nor Windows, and
-use the default path.
-
-It's not nice to have a Buildroot specific patch but let's use one while
-we look for a solution that is acceptable upstream.
-
-Signed-off-by: Carlos Santos <[email protected]>
----
- pmu-query.py | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/pmu-query.py b/pmu-query.py
-index 4c596c7..dc39df6 100755
---- a/pmu-query.py
-+++ b/pmu-query.py
-@@ -3,7 +3,6 @@ import urllib2
- import json, csv
- import subprocess
- import sys
--import platform
- import getopt
- 
- all_flag = False
-@@ -38,12 +37,7 @@ if filename == None:
-         except StopIteration:
-             break
- 
--    if platform.system() == 'CYGWIN_NT-6.1':
--        p = subprocess.Popen(['./pcm-core.exe -c'],stdout=subprocess.PIPE,shell=True) 
--    elif platform.system() == 'Windows':
--        p = subprocess.Popen(['pcm-core.exe -c'],stdout=subprocess.PIPE,shell=True)
--    else:
--        p = subprocess.Popen(['./pcm-core.x -c'],stdout=subprocess.PIPE,shell=True)
-+    p = subprocess.Popen(['/usr/bin/pcm-core -c'],stdout=subprocess.PIPE,shell=True)
- 
-     (output, err) = p.communicate()
-     p_status = p.wait()
--- 
-2.19.2
-
package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch new file +103 -0

103 lines not on this page · raw message

package/pcm-tools/Config.in +4 -6
index f347a265a4..ca9719dc5f 100644
@@ -18,16 +18,14 @@ config BR2_PACKAGE_PCM_TOOLS
 
 if BR2_PACKAGE_PCM_TOOLS
 
-# The pmu-query script is not compatible with Python 3
 config BR2_PACKAGE_PCM_TOOLS_PMU_QUERY
 	bool "install the pmu-query script"
 	default y
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_CA_CERTIFICATES # https
-	select BR2_PACKAGE_PYTHON_HASHLIB # urllib2
-	select BR2_PACKAGE_PYTHON_SSL # urllib2
+	select BR2_PACKAGE_PYTHON3_SSL # urllib2
 
-comment "pmu-query needs Python 2.x"
-	depends on !BR2_PACKAGE_PYTHON
+comment "pmu-query needs Python3"
+	depends on !BR2_PACKAGE_PYTHON3
 
 endif
package/pcm-tools/pcm-tools.hash +2 -2
index 77f1482462..1853dcebb5 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 798eb1bc5d9c34fa107de21b2100e8d4326cb45b613bc35baa1e1efb1dd13b04  pcm-tools-201812.tar.gz
-sha256 fac73f62c4d665c82622862a2be2b89713e0f480c93e593af2d8ef29a13d814b  LICENSE
+sha256  aa48ab1473720aeb7837b67bfc612100f484748720a8b8034daff00419709057  pcm-tools-202110.tar.gz
+sha256  0f476c77009f982dcc4bdff41e692ddd456a9862908e99f2ae3d57296decc649  LICENSE
package/pcm-tools/pcm-tools.mk +2 -2
index 6de11c0da2..8a58034232 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PCM_TOOLS_VERSION = 201812
+PCM_TOOLS_VERSION = 202110
 PCM_TOOLS_SITE = $(call github,opcm,pcm,$(PCM_TOOLS_VERSION))
 PCM_TOOLS_LICENSE = BSD-3-Clause
 PCM_TOOLS_LICENSE_FILES = LICENSE
@@ -16,7 +16,7 @@ PCM_TOOLS_EXE_FILES = \
 define PCM_TOOLS_BUILD_CMDS
 	touch $(@D)/daemon-binaries
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" \
 		UNAME=Linux HOST=_LINUX
 endef
 
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 14 lines · On Thu, 4 Nov 2021 11:27:56 -0700 Adam Duskett <[email protected]> wrote:

Changes:
- Update LICENSE hash due to a year bump.

- Remove 0001-Look-for-pcm-core-at-the-default-path.patch in favor of the upstream patch 0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch

- Add -fPIC to the CXXFLAGS to prevent the error:
"msr.o: relocation R_X86_64_PC32 against symbol `_ZTVN3pcm9MsrHandleE' can not be used when making a shared object; recompile with -fPIC"

- Depend on Python3 for the pmu-query script.

Quoted 9 lines
---
 ...ook-for-pcm-core-at-the-default-path.patch |  46 --------
 ...-python3-errors-add-linux-platform-s.patch | 103 ++++++++++++++++++
 package/pcm-tools/Config.in                   |  10 +-
 package/pcm-tools/pcm-tools.hash              |   4 +-
 package/pcm-tools/pcm-tools.mk                |   4 +-
 5 files changed, 111 insertions(+), 56 deletions(-)
 delete mode 100644 package/pcm-tools/0001-Look-for-pcm-core-at-the-default-path.patch
 create mode 100644 package/pcm-tools/0001-pmu-query.py-fix-python3-errors-add-linux-platform-s.patch

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot