mirror of
https://github.com/flatpak/flatpak.git
synced 2026-01-29 10:01:18 -05:00
e847bb31b6
Re-implement flatpak_installation_list_installed_refs_for_update() using a FlatpakTransaction, so we can guarantee it always gives the same set of things to update as the update command. This API is used by GNOME Software and many times in the past g-s has not shown the same list of apps to be updated as the flatpak CLI. See: - https://gitlab.gnome.org/GNOME/gnome-software/issues/539 - https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/430 This commit also expands the unit tests for this API, which were already quite good. Now we test that missing subpaths of locale extensions show up as updates, and updates that have been pulled but not deployed show up as well. The latter is a break from how this function used to behave, but it seems unlikely to break any application.
102 lines
2.0 KiB
Bash
Executable File
102 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
# Don't inherit the -x from the testsuite
|
|
set +x
|
|
|
|
DIR=`mktemp -d`
|
|
|
|
REPO=$1
|
|
shift
|
|
ID=$1
|
|
shift
|
|
BRANCH=$1
|
|
shift
|
|
COLLECTION_ID=$1
|
|
shift
|
|
|
|
EXTRA="${1-}"
|
|
shift
|
|
|
|
mkdir ${DIR}/files
|
|
mkdir ${DIR}/usr
|
|
cat > ${DIR}/metadata <<EOF
|
|
[Runtime]
|
|
name=${ID}
|
|
EOF
|
|
|
|
# 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
|
|
mkdir -p ${DIR}/usr/lib
|
|
ln -s ../lib ${DIR}/usr/lib64
|
|
ln -s ../lib ${DIR}/usr/lib32
|
|
if test -f /sbin/ldconfig.real; then
|
|
cp /sbin/ldconfig.real ${DIR}/usr/bin/ldconfig
|
|
else
|
|
cp `which ldconfig` ${DIR}/usr/bin
|
|
fi
|
|
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 $@ bash ls cat echo readlink socat; do
|
|
I=`which $i`
|
|
add_bin $I
|
|
done
|
|
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
|
|
|
|
# This only exists so we can update the runtime
|
|
cat > ${DIR}/usr/bin/runtime_hello.sh <<EOF
|
|
#!/bin/sh
|
|
echo "Hello world, from a runtime$EXTRA"
|
|
EOF
|
|
chmod a+x ${DIR}/usr/bin/runtime_hello.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
|
|
# local archive.
|
|
mkdir -p ${DIR}/usr/lib/locale/
|
|
cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
|
|
|
|
if [ x$COLLECTION_ID != x ]; then
|
|
collection_args=--collection-id=${COLLECTION_ID}
|
|
else
|
|
collection_args=
|
|
fi
|
|
|
|
mkdir -p repos
|
|
flatpak build-export ${collection_args} --disable-sandbox --runtime ${GPGARGS-} ${REPO} ${DIR} ${BRANCH}
|
|
rm -rf ${DIR}
|