From d48429f2bafb556dceee10323c90867ba0e37e4d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 31 Aug 2015 21:34:41 +0200
Subject: distro/gluon: enabled merged /usr

---
 conf/distro/gluon.conf | 6 ++++++
 1 file changed, 6 insertions(+)

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"
-- 
cgit v1.2.3