From 41e8d69f6e375dbd8559bd85f3212ed8fb53f333 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 9 Apr 2015 20:33:07 +0200 Subject: disable oprofile when preempt rt full is choosen --- target/linux/config/Config.in.debug | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index d1682093b..181088cc4 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -114,6 +114,7 @@ config ADK_KERNEL_OPROFILE tristate "Oprofile support" select ADK_KERNEL_PROFILING depends on !ADK_TARGET_ARCH_M68K + depends on !ADK_KERNEL_PREEMPT_RT_FULL default n help use oprofile package to make use of the kernel support. -- cgit v1.2.3 From ebf3cba90795d40111e3dbd2bf531c78203b3195 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 9 Apr 2015 20:33:20 +0200 Subject: fixup LIBC_DEPENDS --- package/libiconv-tiny/Makefile | 2 +- package/libnids/Makefile | 2 +- package/librpcsecgss/Makefile | 2 +- package/libunistring/Makefile | 2 +- package/pcrepp/Makefile | 2 -- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/libiconv-tiny/Makefile b/package/libiconv-tiny/Makefile index 7c81fc6c0..2889a58b9 100644 --- a/package/libiconv-tiny/Makefile +++ b/package/libiconv-tiny/Makefile @@ -15,7 +15,7 @@ PKG_OPTS:= dev devonly DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_LIBC_DEPENDS:= uclibc +PKG_LIBC_DEPENDS:= uclibc-ng uclibc include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 32a907b59..0ae8dfe78 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -17,7 +17,7 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_LIBC_DEPENDS:= uclibc glibc +PKG_LIBC_DEPENDS:= uclibc-ng uclibc glibc include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile index 7a1b5116d..280f2fc5a 100644 --- a/package/librpcsecgss/Makefile +++ b/package/librpcsecgss/Makefile @@ -16,7 +16,7 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_LIBC_DEPENDS:= uclibc glibc +PKG_LIBC_DEPENDS:= uclibc-ng uclibc glibc include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile index 607bf7e8d..cce139329 100755 --- a/package/libunistring/Makefile +++ b/package/libunistring/Makefile @@ -13,7 +13,7 @@ PKG_URL:= http://www.gnu.org/software/libunistring/ PKG_SITES:= ${MASTER_SITE_GNU:=libunistring/} PKG_OPTS:= dev -PKG_LIBC_DEPENDS:= uclibc glibc +PKG_LIBC_DEPENDS:= uclibc-ng uclibc glibc DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index 581402dc4..8132ef67a 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= http://www.daemon.de/idisk/Apps/pcre++/ PKG_CXX:= PCREPP PKG_OPTS:= dev -PKG_LIBC_DEPENDS:= glibc musl - DISTFILES:= pcre++-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/pcre++-${PKG_VERSION} -- cgit v1.2.3