diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-kernel/turbostat | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-kernel/turbostat')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat/COPYING | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 57 |
2 files changed, 75 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat/COPYING b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat/COPYING new file mode 100644 index 000000000..da4cb28fe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat/COPYING @@ -0,0 +1,18 @@ +The Linux Kernel is provided under: + + SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note + +Being under the terms of the GNU General Public License version 2 only, +according with: + + LICENSES/preferred/GPL-2.0 + +With an explicit syscall exception, as stated at: + + LICENSES/exceptions/Linux-syscall-note + +In addition, other licenses may also apply. Please see: + + Documentation/process/license-rules.rst + +for more details. diff --git a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb new file mode 100644 index 000000000..dc3e78feb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -0,0 +1,57 @@ +# +# Copyright (C) 2013 Wind River Systems, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +SUMMARY = "Frequency and Idle power monitoring tools for Linux" + +DESCRIPTION = "The turbostat tool allows you to determine the actual \ +processor frequency and idle power saving state residency on supported \ +processors." + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' +COMPATIBLE_HOST_libc-musl = "null" + +SRC_URI += "\ + file://COPYING \ + " + +DEPENDS = "virtual/kernel" + +# This looks in S, so we better make sure there's +# something in the directory. +# +do_populate_lic[depends] = "${PN}:do_configure" + + +EXTRA_OEMAKE = '\ + CC="${CC}" \ + 'CFLAGS=-Wall -I${STAGING_KERNEL_DIR}/arch/x86/include/uapi ${LDFLAGS}' \ + ' + +# If we build under STAGING_KERNEL_DIR, source will not be put +# into the dbg rpm. STAGING_KERNEL_DIR will exist by the time +# do_configure() is invoked so we can safely copy from it. +# +do_configure_prepend() { + mkdir -p ${S} + cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} + cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} + cp -r ${WORKDIR}/COPYING ${S} +} + +do_compile() { + sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c + sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c + sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile + oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} +} + +do_install() { + oe_runmake DESTDIR="${D}" install +} |