summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/conf/layer.conf4
-rw-r--r--meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 851219765e..760edbce3e 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -56,8 +56,10 @@ PREFERRED_RPROVIDER_libdevmapper = "lvm2"
56PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" 56PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native"
57PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2" 57PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2"
58PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" 58PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf"
59# Configures whether coreutils or uutils-coreutils is used. 59# Those lines configure whether coreutils or uutils-coreutils is used.
60PREFERRED_PROVIDER_coreutils = "coreutils" 60PREFERRED_PROVIDER_coreutils = "coreutils"
61PREFERRED_PROVIDER_coreutils-native = "coreutils-native"
62PREFERRED_PROVIDER_nativesdk-coreutils = "nativesdk-coreutils"
61PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader" 63PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader"
62PREFERRED_RPROVIDER_virtual-redis ?= "redis" 64PREFERRED_RPROVIDER_virtual-redis ?= "redis"
63 65
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
index 1e207f7fb4..38b3e97dd2 100644
--- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
+++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.3.0.bb
@@ -63,6 +63,8 @@ python __anonymous() {
63 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) 63 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog))
64} 64}
65 65
66BBCLASSEXTEND = "native nativesdk"
67
66do_compile:prepend() { 68do_compile:prepend() {
67 export LIBSTDBUF_DIR="${libdir}/coreutils" 69 export LIBSTDBUF_DIR="${libdir}/coreutils"
68} 70}