publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deb: fix libjpeg-turbo build

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-09-01 23:35:38 +12:00
parent 0ba05f4da0
commit edbc2e0505
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builder/build-deb-inside-docker
View File

@@ -24,7 +24,7 @@ if [ "$BUILD_TAG" = "+libjpeg-turbo_latest" ]; then
echo 'libjpeg 62 libjpeg-turbo (>= 2.1.1)' > debian/shlibs.local echo 'libjpeg 62 libjpeg-turbo (>= 2.1.1)' > debian/shlibs.local
debian_revision="$(echo $BUILD_TAG | tr _ -)" debian_revision="$(echo $BUILD_TAG | tr _ -)"
sed -i -e "1 s/)/$debian_revision)/p" debian/changelog sed -i -e "1 s/)/$debian_revision)/" debian/changelog
fi fi
dpkg-buildpackage -us -uc -b dpkg-buildpackage -us -uc -b

11
builder/build-tarball
View File

@@ -12,6 +12,13 @@ build_www_dir() {
fi fi
} }
move_libjpeg_turbo_to_os_specific_dir() {
chown $L_UID:$L_GID $shared_with_docker_dir/${os_codename}/*
mkdir -p $PWD/builder/build/${os_codename}/
mv $shared_with_docker_dir/${os_codename}/libjpeg-turbo*.deb \
$PWD/builder/build/${os_codename}/
}
shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp} shared_with_docker_dir=${GITLAB_SHARED_DIND_DIR:-/tmp}
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
@@ -35,7 +42,5 @@ mv $shared_with_docker_dir/$tarball_name \
$PWD/builder/build/"$tarball_name_with_build_tag" $PWD/builder/build/"$tarball_name_with_build_tag"
if [ "$build_tag" = "+libjpeg-turbo_latest" ]; then if [ "$build_tag" = "+libjpeg-turbo_latest" ]; then
chown $L_UID:$L_GID $shared_with_docker_dir/${os_codename}/* move_libjpeg_turbo_to_os_specific_dir
mv $shared_with_docker_dir/${os_codename}/*.deb \
$PWD/builder/build/${os_codename}/
fi fi