From 48b61ca65257b03b19cfdb4cdb2ff57e0804abc0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Aug 2018 20:35:48 -0700 Subject: [PATCH] turbostat: Provide a persistent COPYING file we were having static md5 sum but the COPYING file was very much tied to certain versions of kernel this makes it fail for several different kernel versions so lets keep the upstream version of copying file Signed-off-by: Khem Raj --- .../recipes-kernel/turbostat/turbostat/COPYING | 18 ++++++++++++++++++ .../recipes-kernel/turbostat/turbostat_3.4.bb | 13 ++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 meta-oe/recipes-kernel/turbostat/turbostat/COPYING diff --git a/meta-oe/recipes-kernel/turbostat/turbostat/COPYING b/meta-oe/recipes-kernel/turbostat/turbostat/COPYING new file mode 100644 index 0000000000..da4cb28feb --- /dev/null +++ b/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-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 3559417948..dc3e78febb 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -12,16 +12,15 @@ processor frequency and idle power saving state residency on supported \ processors." LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - +LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' COMPATIBLE_HOST_libc-musl = "null" -DEPENDS = "virtual/kernel" +SRC_URI += "\ + file://COPYING \ + " -do_fetch[noexec] = "1" -do_unpack[noexec] = "1" -do_patch[noexec] = "1" +DEPENDS = "virtual/kernel" # This looks in S, so we better make sure there's # something in the directory. @@ -43,7 +42,7 @@ do_configure_prepend() { 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 ${STAGING_KERNEL_DIR}/COPYING ${S} + cp -r ${WORKDIR}/COPYING ${S} } do_compile() {