Skip to content
Snippets Groups Projects
Commit 0551559a authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge subtree commit 'a36b947a'

parents 18de3b97 a36b947a
No related branches found
No related tags found
No related merge requests found
......@@ -75,8 +75,11 @@ var/lock \
var/tmp \
${NULL}
ln -s /run/lock var/lock
install -d root
install -d run
install -d run/lock
install -d -m1777 tmp
install -d var/cache
install -d -m1777 var/tmp
ln -s /dev/shm run/shm
ln -s /run/lock var/lock
......@@ -178,7 +178,7 @@ def main():
sources_required = set()
if os.path.exists(platform_manifest):
platform_packages = read_manifest(manifest)
platform_packages = read_manifest(platform_manifest)
else:
platform_packages = []
......
......@@ -48,6 +48,9 @@ fi
sysroot="$1"
cd "$sysroot"
ls -ld bin sbin lib*
ls -ld usr/*
in_chroot () {
chroot "$sysroot" "$@"
}
......@@ -84,14 +87,20 @@ usrmerge () {
fi
}
( cd "$sysroot"; find bin sbin lib* -not -xtype d -print0 ) |
( find bin sbin lib* -not -xtype d -print0 ) |
while read -r -d '' f; do
if chroot "$sysroot" test -e "/usr/$f"; then
usrmerge "/$f"
fi
done
tar -cf- bin sbin lib* | tar -C usr -xf-
cd "$sysroot"
for f in bin sbin lib*; do
if [ -L "$f" ]; then
rm -v -f "$f" >&2
else
echo "$f"
fi
done | tar -cf- -T- | tar -C usr -xf-
rm -fr bin sbin lib*
ln -vs usr/bin usr/sbin usr/lib* .
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment