summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2015-08-31 21:34:41 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2015-08-31 21:34:41 +0200
commitd48429f2bafb556dceee10323c90867ba0e37e4d (patch)
tree20a475e2d6f14a85e35a3777605315fb2ea1a795
parent7835c4100601b0c645b5c3b90cd48f211e6e25da (diff)
downloadmeta-gluon-d48429f2bafb556dceee10323c90867ba0e37e4d.tar
meta-gluon-d48429f2bafb556dceee10323c90867ba0e37e4d.zip
distro/gluon: enabled merged /usr
-rw-r--r--conf/distro/gluon.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/conf/distro/gluon.conf b/conf/distro/gluon.conf
index 65cea95..bbcc220 100644
--- a/conf/distro/gluon.conf
+++ b/conf/distro/gluon.conf
@@ -12,6 +12,7 @@ TARGET_VENDOR = "-gluon"
LOCALCONF_VERSION = "1"
DISTRO_FEATURES_DEFAULT = "ipv4 ipv6 largefile wifi"
+DISTROOVERRIDES .= ":merged-usr"
PREFERRED_VERSION_linux-yocto ?= "4.1%"
PREFERRED_VERSION_linux-yocto_qemux86 ?= "4.1%"
@@ -40,6 +41,11 @@ ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
PACKAGE_CLASSES = "package_ipk"
+base_libdir = "${exec_prefix}/${baselib}"
+base_bindir = "${exec_prefix}/bin"
+base_sbindir = "${exec_prefix}/bin"
+sbindir = "${exec_prefix}/bin"
+
TCLIBC ?= "musl"
FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
PACKAGECONFIG_pn-musl = "minimal_iconv"