Сравнить коммиты

...

10 Коммитов

7 изменённых файлов: 27 добавлений и 19 удалений

16
build
Просмотреть файл

@ -2,13 +2,13 @@
set -e
[ -d cache ] || mkdir cache
SPAWN="systemd-nspawn -M gentoolooqsbuilder -D gentoo --bind=$(realpath ./out):/out --bind=$(realpath scripts):/scripts --bind=$(realpath cache):/var/cache/distfiles"
export UNPRIVUSER="user"
SETUPSCRIPT="/scripts/3-setup-gentoo.sh"
BUILDSCRIPT="/scripts/4-build-looqs.sh"
./scripts/1-create.sh
sudo ./scripts/2-create.sh
sudo ${SPAWN} /${SETUPSCRIPT}
sudo ${SPAWN} su - builder -c /${BUILDSCRIPT}
./scripts/5-bundle.sh
su $UNPRIVUSER -c ./scripts/1-create.sh
./scripts/2-create.sh
${SPAWN} /scripts/3-setup-gentoo.sh
chown "$UNPRIVUSER" -R out
${SPAWN} su - builder -c /scripts/4-build-looqs.sh
chown "$UNPRIVUSER" -R out
su $UNPRIVUSER -c "cd $(pwd); ./scripts/5-bundle.sh"

Просмотреть файл

@ -1,9 +1,9 @@
#!/bin/bash
set -e
# TODO: always download latest
wget https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-hardened-openrc/stage3-amd64-hardened-openrc-20220619T170540Z.tar.xz -O hardened.tar.xz
wget https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-hardened-openrc/stage3-amd64-hardened-openrc-20220619T170540Z.tar.xz.asc -O hardened.tar.xz.asc
LATEST=$( curl -L "https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/latest-stage3-amd64-hardened-openrc.txt" | tail -n 1 | awk '{print $1}' )
wget "https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/$LATEST" -O hardened.tar.xz
wget "https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/$LATEST.asc" -O hardened.tar.xz.asc
gpg --verify hardened.tar.xz.asc hardened.tar.xz

Просмотреть файл

@ -5,10 +5,13 @@ mkdir --parents /etc/portage/repos.conf
cp /usr/share/portage/config/repos.conf /etc/portage/repos.conf/gentoo.conf
emerge-webrsync
export USE="X jpeg png icu -accessibility -debug -dbus cairo"
echo 'USE="X vulkan jpeg png icu cairo -accessibility -debug -dbus"' >> /etc/portage/make.conf
emerge -v --update --newuse --deep @world
emerge -v qtcore qtgui uchardet
emerge -v qtwidgets qtsql qtnetwork qtconcurrent
export USE="X jpeg png icu -accessibility -debug -dbus qt5 cairo minizip"
emerge -v qtsvg
export USE="minizip qt5"
emerge -v app-text/poppler
emerge -v dev-libs/quazip
emerge -v dev-vcs/git

Просмотреть файл

@ -31,7 +31,7 @@ done
cp -a /usr/lib64/libcrypto* /out/lib/
cp -a /usr/lib64/qt5/plugins /out/lib/
for lib in $( ldd gui/looqs-gui | awk '{print $3}' | grep so | grep -vE "libGL|libm|libc|fontconfig|libgcc|freetype|libX11|libQt" ) ; do
for lib in $( ldd gui/looqs-gui | awk '{print $3}' | grep so | grep -vE "libGL|libm.so|libc|harfbuzz|fontconfig|libgcc|freetype|libX11|libQt" ) ; do
cp "$lib" /out/lib/
done

Просмотреть файл

@ -4,10 +4,17 @@ set -e
DIRNAME="looqs-${TAG}"
ARCHIVENAME="${DIRNAME}.tar.xz"
mv out ${DIRNAME}
rm -rf $DIRNAME*
cp -a out ${DIRNAME}
cp src/looqs-gui ${DIRNAME}
cp src/looqs ${DIRNAME}
chmod 755 src/looqs-gui
chmod 755 src/looqs
patchelf --set-rpath '$ORIGIN/../lib/' ${DIRNAME}/bin/*
patchelf --set-rpath '$ORIGIN' ${DIRNAME}/lib/*.so*
patchelf --set-rpath '$ORIGIN/../../' $( find "${DIRNAME}/lib/plugins/" | grep so$ )
tar cfpvJ "${DIRNAME}".tar.xz "${DIRNAME}"
gpg -b --local-user "$SIGNING_KEY_EMAIL" "$ARCHIVENAME"
gpg --batch --no-tty -b --local-user "$SIGNING_KEY_EMAIL" "$ARCHIVENAME"

Просмотреть файл

@ -2,6 +2,5 @@
SELF=$(readlink -f "$0")
HERE=${SELF%/*}
export LD_LIBRARY_PATH="/${HERE}/lib"
export QT_PLUGIN_PATH="/${HERE}/lib/plugins"
./bin/looqs

Просмотреть файл

@ -2,6 +2,5 @@
SELF=$(readlink -f "$0")
HERE=${SELF%/*}
export LD_LIBRARY_PATH="/${HERE}/lib"
export QT_PLUGIN_PATH="/${HERE}/lib/plugins"
"${HERE}/bin/looqs-gui"