forked from Mirrors/flatpak-builder
tests: Hacks to handle coreutils-single
In the Fedora 28 base container, `coreutils-single` is used and so `/usr/bin/ls` is actually a "script": ``` $ file /usr/bin/ls /usr/bin/ls: a /usr/bin/coreutils --coreutils-prog-shebang=ls script, ASCII text executable ``` We handle this by detecting shebangs in dependencies and recursively adding them. Closes: #163 Approved by: alexlarssonauto
parent
8f00199480
commit
d63d9ee5bb
|
@ -2,6 +2,9 @@
|
|||
|
||||
set -e
|
||||
|
||||
# Don't inherit the -x from the testsuite
|
||||
set +x
|
||||
|
||||
DIR=`mktemp -d`
|
||||
|
||||
REPONAME=$1
|
||||
|
@ -18,7 +21,9 @@ cat > ${DIR}/metadata <<EOF
|
|||
name=${ID}
|
||||
EOF
|
||||
|
||||
cat ${DIR}/metadata
|
||||
# On Debian derivatives, /usr/sbin and /sbin aren't in ordinary users'
|
||||
# PATHs, but ldconfig is kept in /sbin
|
||||
PATH="$PATH:/usr/sbin:/sbin"
|
||||
|
||||
# Add bash and dependencies
|
||||
mkdir -p ${DIR}/usr/bin
|
||||
|
@ -30,11 +35,32 @@ if test -f /sbin/ldconfig.real; then
|
|||
else
|
||||
cp `which ldconfig` ${DIR}/usr/bin
|
||||
fi
|
||||
T=`mktemp`
|
||||
LIBS=`mktemp`
|
||||
BINS=`mktemp`
|
||||
|
||||
add_bin() {
|
||||
local f=$1
|
||||
shift
|
||||
|
||||
if grep -qFe "${f}" $BINS; then
|
||||
# Already handled
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo $f >> $BINS
|
||||
|
||||
# Add library dependencies
|
||||
(ldd "${f}" | sed "s/.* => //" | awk '{ print $1}' | grep ^/ | sort -u -o $LIBS $LIBS -) || true
|
||||
|
||||
local shebang=$(sed -n '1s/^#!\([^ ]*\).*/\1/p' "${f}")
|
||||
if [ x$shebang != x ]; then
|
||||
add_bin "$shebang"
|
||||
fi
|
||||
}
|
||||
|
||||
for i in $@; do
|
||||
I=`which $i`
|
||||
cp $I ${DIR}/usr/bin
|
||||
ldd $I | sed "s/.* => //" | awk '{ print $1}' | grep ^/ | grep ^/ >> $T
|
||||
add_bin $I
|
||||
if test $i == python2; then
|
||||
mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
|
||||
# This is a hardcoded minimal set of modules we need in the current tests.
|
||||
|
@ -61,10 +87,15 @@ for i in $@; do
|
|||
done
|
||||
fi
|
||||
done
|
||||
ln -s bash ${DIR}/usr/bin/sh
|
||||
for i in `sort -u $T`; do
|
||||
for i in `cat $BINS`; do
|
||||
echo Adding binary $i 1>&2
|
||||
cp "$i" ${DIR}/usr/bin/
|
||||
done
|
||||
for i in `cat $LIBS`; do
|
||||
echo Adding library $i 1>&2
|
||||
cp "$i" ${DIR}/usr/lib/
|
||||
done
|
||||
ln -s bash ${DIR}/usr/bin/sh
|
||||
|
||||
# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
|
||||
# the real en_US locale is often not available, because its in the
|
||||
|
|
Loading…
Reference in New Issue