From 4a330c3a2d8c1b02bb2956ba607c7908ac329878 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Sun, 15 Feb 2015 11:51:26 +0000
Subject: usrmerge glibc  workaround

---
 strata/build-essential/glibc.morph | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index cf4f1f96..eded604d 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -84,3 +84,22 @@ install-commands:
   netgroup: nis
   EOF
 - install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf"
+
+post-install-commands:
+# Avoid the creation of /sbin /lib /lib64
+- |
+  mkdir -p "$DESTDIR"/usr/sbin
+  mkdir -p "$DESTDIR"/usr/lib
+  mkdir -p "$DESTDIR"/usr/lib64
+  if test -e "$DESTDIR/sbin"; then
+    mv "$DESTDIR"/sbin/* "$DESTDIR"/usr/sbin/
+    rm -r "$DESTDIR/sbin"
+  fi
+  if test -e "$DESTDIR/lib"; then
+    mv "$DESTDIR"/lib/* "$DESTDIR"/usr/lib/
+    rm -r "$DESTDIR/lib"
+  fi
+  if test -e "$DESTDIR/lib64"; then
+    mv "$DESTDIR"/lib64/* "$DESTDIR"/usr/lib64/
+    rm -r "$DESTDIR/lib64"
+  fi
-- 
cgit v1.2.1