[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-81-g1629b09d3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-81-g1629b09d3
|
From: Sébastien S. <ss...@us...> - 2019-06-07 14:59:41
|
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 "armadeus".
The branch, master has been updated
via 1629b09d3e0345a3e4a470baf942fe63892a6b50 (commit)
from 02e3c56f475d7855296454141a55ff8b5ce49742 (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 1629b09d3e0345a3e4a470baf942fe63892a6b50
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jun 7 16:58:27 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: add cpupower support
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
buildroot/configs/opos6ulsp_defconfig | 1 +
...-cpupower-fix-64bit-detection-when-cross-.patch | 61 ++++++++++++++++++++++
4 files changed, 64 insertions(+)
create mode 100644 patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index a8a53e973..fbe2b131b 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index f85b757d9..11488673c 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulnanodev imx6ull-opos6ulnanodev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 5db22ed2a..550b58c07 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6ulspdev imx6ull-opos6ulspdev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch b/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
new file mode 100644
index 000000000..57da394e7
--- /dev/null
+++ b/patches/linux/4.19/0809-tools-power-cpupower-fix-64bit-detection-when-cross-.patch
@@ -0,0 +1,61 @@
+From e1e026e4805cc3fe62b0fcfbb18c5263dd22871a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 7 Jun 2019 16:18:53 +0200
+Subject: [PATCH 1/1] tools/power/cpupower: fix 64bit detection when
+ cross-compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When cross-compiling cpupower, 64bit detection is done with the host
+compiler instead of the cross-compiler and libcpupower.so.0 ends up in
+/usr/lib64 instead of /usr/lib for 32bit target. Fix this by moving
+64bit detection after CC is defined.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ tools/power/cpupower/Makefile | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
+index 9063fca480b3..c8622497ef23 100644
+--- a/tools/power/cpupower/Makefile
++++ b/tools/power/cpupower/Makefile
+@@ -18,7 +18,6 @@ OUTDIR := $(shell cd $(OUTPUT) && pwd)
+ $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
+ endif
+
+-include ../../scripts/Makefile.arch
+
+ # --- CONFIGURATION BEGIN ---
+
+@@ -69,11 +68,6 @@ bindir ?= /usr/bin
+ sbindir ?= /usr/sbin
+ mandir ?= /usr/man
+ includedir ?= /usr/include
+-ifeq ($(IS_64_BIT), 1)
+-libdir ?= /usr/lib64
+-else
+-libdir ?= /usr/lib
+-endif
+ localedir ?= /usr/share/locale
+ docdir ?= /usr/share/doc/packages/cpupower
+ confdir ?= /etc/
+@@ -100,6 +94,14 @@ RANLIB = $(CROSS)ranlib
+ HOSTCC = gcc
+ MKDIR = mkdir
+
++# 64bit library detection
++include ../../scripts/Makefile.arch
++
++ifeq ($(IS_64_BIT), 1)
++libdir ?= /usr/lib64
++else
++libdir ?= /usr/lib
++endif
+
+ # Now we set up the build system
+ #
+--
+2.19.2
hooks/post-receive
--
armadeus
|