classes: Sync staging layout cleanups from Poky

1 files changed, 26 insertions, 2 deletions

diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index 441da77bd0..63f12117eb 100644
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -16,12 +16,36 @@ CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
 
+# Path prefixes
 prefix = "${SDK_PREFIX}"
 exec_prefix = "${prefix}"
-base_prefix = "${exec_prefix}"
+base_prefix = "${prefix}"
+
+# Base paths
+export base_bindir = "${prefix}/bin"
+export base_sbindir = "${prefix}/bin"
+export base_libdir = "${prefix}/lib"
+
+# Architecture independent paths
+export datadir = "${prefix}/share"
+export sysconfdir = "${prefix}/etc"
+export sharedstatedir = "${datadir}/com"
+export localstatedir = "${prefix}/var"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
+export servicedir = "${prefix}/srv"
+
+# Architecture dependent paths
+export bindir = "${prefix}/bin"
+export sbindir = "${prefix}/bin"
+export libexecdir = "${prefix}/libexec"
+export libdir = "${prefix}/lib"
+export includedir = "${prefix}/include"
+export oldincludedir = "${prefix}/include"
 
 FILES_${PN} = "${prefix}"
 FILES_${PN}-dbg += "${prefix}/.debug \
                     ${prefix}/bin/.debug \
-                    ${prefix}/sbin/.debug \
                    "
+