From 09fe7d138c8a94fd72f86586bf9b4f14a0767058 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 26 Oct 2017 14:04:44 -0700 Subject: cpufrequtils: move to recipes-bsp Signed-off-by: Armin Kuster --- .../cpufrequtils/0001-dont-unset-cflags.patch | 30 ++++++++++++++++++ .../recipes-bsp/cpufrequtils/cpufrequtils_008.bb | 37 ++++++++++++++++++++++ .../cpufrequtils/0001-dont-unset-cflags.patch | 30 ------------------ .../cpufrequtils/cpufrequtils_008.bb | 37 ---------------------- 4 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch create mode 100644 meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb delete mode 100644 meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch delete mode 100644 meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch new file mode 100644 index 0000000000..fb2f07f073 --- /dev/null +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch @@ -0,0 +1,30 @@ +--- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 ++++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 +@@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} + +-# If you are running a cross compiler, you may want to set this +-# to something more interesting, like "arm-linux-". If you want +-# to compile vs uClibc, that can be done here as well. +-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- +-CC = $(CROSS)gcc +-LD = $(CROSS)gcc +-AR = $(CROSS)ar +-STRIP = $(CROSS)strip +-RANLIB = $(CROSS)ranlib +-HOSTCC = gcc +- ++HOSTCC = $(BUILD_CC) + + # Now we set up the build system + # +@@ -95,7 +85,7 @@ HOSTCC = gcc + # set up PWD so that older versions of make will work with our build. + PWD = $(shell pwd) + +-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ++export CFLAGS LDFLAGS LIB_OBJS + + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb new file mode 100644 index 0000000000..88fcc0200f --- /dev/null +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "To make access to the Linux kernel cpufreq subsystem easier for users and cpufreq userspace tools, a cpufrequtils package was created" + +inherit gettext + +DEPENDS = "libtool-cross" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" +# SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git + +SRC_URI = "git://github.com/emagii/cpufrequtils.git \ + file://0001-dont-unset-cflags.patch \ +" + +EXTRA_OEMAKE_append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " + +PR = "r5" + +S = "${WORKDIR}/git" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo 'CP=cp'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake -e install DESTDIR=${D} + rm -f ${D}${libdir}/libcpufreq.so.0 ${D}${libdir}/libcpufreq.so + ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so.0 + ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so +} + diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch deleted file mode 100644 index fb2f07f073..0000000000 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 -+++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 -@@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - INSTALL_SCRIPT = ${INSTALL_PROGRAM} - --# If you are running a cross compiler, you may want to set this --# to something more interesting, like "arm-linux-". If you want --# to compile vs uClibc, that can be done here as well. --CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- --CC = $(CROSS)gcc --LD = $(CROSS)gcc --AR = $(CROSS)ar --STRIP = $(CROSS)strip --RANLIB = $(CROSS)ranlib --HOSTCC = gcc -- -+HOSTCC = $(BUILD_CC) - - # Now we set up the build system - # -@@ -95,7 +85,7 @@ HOSTCC = gcc - # set up PWD so that older versions of make will work with our build. - PWD = $(shell pwd) - --export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS -+export CFLAGS LDFLAGS LIB_OBJS - - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb deleted file mode 100644 index 88fcc0200f..0000000000 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "To make access to the Linux kernel cpufreq subsystem easier for users and cpufreq userspace tools, a cpufrequtils package was created" - -inherit gettext - -DEPENDS = "libtool-cross" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" -# SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git - -SRC_URI = "git://github.com/emagii/cpufrequtils.git \ - file://0001-dont-unset-cflags.patch \ -" - -EXTRA_OEMAKE_append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " - -PR = "r5" - -S = "${WORKDIR}/git" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OEMAKE = "V=1 CROSS=${TARGET_PREFIX} LIBTOOL='${HOST_SYS}-libtool --tag cc' STRIPCMD=echo 'CP=cp'" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake -e install DESTDIR=${D} - rm -f ${D}${libdir}/libcpufreq.so.0 ${D}${libdir}/libcpufreq.so - ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so.0 - ln -s libcpufreq.so.0.0.0 ${D}${libdir}/libcpufreq.so -} - -- cgit 1.2.3-korg