summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-15 11:51:26 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-15 14:26:32 +0000
commit4a330c3a2d8c1b02bb2956ba607c7908ac329878 (patch)
tree4ee57b0659ed157b10e35b28b6b6948b7a41dc12
parentd3b180f8a3529e45ff1708c28d3e6df926d0711e (diff)
downloaddefinitions-4a330c3a2d8c1b02bb2956ba607c7908ac329878.tar.gz
usrmerge glibc workaround
-rw-r--r--strata/build-essential/glibc.morph19
1 files changed, 19 insertions, 0 deletions
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