lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix package build for fedora

Browse Source
This commit is contained in:
Thomas Büttner 2019-01-23 21:14:10 +01:00
parent bd550ef996
commit cc3b1e5cc8
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/common.build.sh
View File

@ -23,8 +23,7 @@ get_version()
( (
local ROOT=${1-$DEFAULT_ROOT} local ROOT=${1-$DEFAULT_ROOT}
grep "AssemblyVersion" ${ROOT}/SharedVersion.cs \ grep "AssemblyVersion" ${ROOT}/SharedVersion.cs \
| sed -E 's/\[assembly: ?AssemblyVersion\("([0-9\.]+)"\)\]/\1/' \ | sed -E 's/\[assembly: ?AssemblyVersion\("([0-9\.]+)"\)\]/\1/'
| sed -E 's/.0$//'
) )
# Run a build # Run a build

12
deployment/fedora-package-x64/clean.sh
View File

@ -4,4 +4,14 @@ source ../common.build.sh
VERSION=`get_version ../..` VERSION=`get_version ../..`
clean_jellyfin ../.. Release `pwd`/dist/jellyfin_${VERSION} package_temporary_dir="`pwd`/pkg-dist-tmp"
pkg_src_dir="`pwd`/pkg-src"
image_name="jellyfin-rpmbuild"
docker_sudo=""
if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then
docker_sudo=sudo
fi
$docker_sudo docker image rm $image_name --force
rm -rf "$package_temporary_dir"
rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"

18
deployment/fedora-package-x64/package.sh
View File

@ -18,10 +18,14 @@ output_dir="`pwd`/pkg-dist"
pkg_src_dir="`pwd`/pkg-src" pkg_src_dir="`pwd`/pkg-src"
current_user="`whoami`" current_user="`whoami`"
image_name="jellyfin-rpmbuild" image_name="jellyfin-rpmbuild"
docker_sudo=""
if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then
docker_sudo=sudo
fi
cleanup() { cleanup() {
set +o errexit set +o errexit
docker image rm $image_name --force $docker_sudo docker image rm $image_name --force
rm -rf "$package_temporary_dir" rm -rf "$package_temporary_dir"
rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" rm -rf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz"
} }
@ -30,7 +34,7 @@ GNU_TAR=1
mkdir -p "$package_temporary_dir" mkdir -p "$package_temporary_dir"
echo "Bundling all sources for RPM build." echo "Bundling all sources for RPM build."
tar \ tar \
--transform "s,^\.,jellyfin-${VERSION}" \ --transform "s,^\.,jellyfin-${VERSION}," \
--exclude='.git*' \ --exclude='.git*' \
--exclude='**/.git' \ --exclude='**/.git' \
--exclude='**/.hg' \ --exclude='**/.hg' \
@ -42,10 +46,8 @@ tar \
--exclude='**/.nuget' \ --exclude='**/.nuget' \
--exclude='*.deb' \ --exclude='*.deb' \
--exclude='*.rpm' \ --exclude='*.rpm' \
-Jcvf \ -zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" \
"$package_temporary_dir/jellyfin-${VERSION}.tar.xz" \ -C "../.." ./ || GNU_TAR=0
-C "../.." \
./ || true && GNU_TAR=0
if [ $GNU_TAR -eq 0 ]; then if [ $GNU_TAR -eq 0 ]; then
echo "The installed tar binary did not support --transform. Using workaround." echo "The installed tar binary did not support --transform. Using workaround."
@ -75,9 +77,9 @@ if [ $GNU_TAR -eq 0 ]; then
tar -zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" -C "$package_temporary_dir" "jellyfin-${VERSION}" tar -zcf "$pkg_src_dir/jellyfin-${VERSION}.tar.gz" -C "$package_temporary_dir" "jellyfin-${VERSION}"
fi fi
docker build ../.. -t "$image_name" -f ./Dockerfile $docker_sudo docker build ../.. -t "$image_name" -f ./Dockerfile
mkdir -p "$output_dir" mkdir -p "$output_dir"
docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;' $docker_sudo docker run --rm -v "$package_temporary_dir:/temp" "$image_name" sh -c 'find /build/rpmbuild -maxdepth 3 -type f -name "jellyfin*.rpm" -exec mv {} /temp \;'
chown -R "$current_user" "$package_temporary_dir" \ chown -R "$current_user" "$package_temporary_dir" \
|| sudo chown -R "$current_user" "$package_temporary_dir" || sudo chown -R "$current_user" "$package_temporary_dir"
mv "$package_temporary_dir"/*.rpm "$output_dir" mv "$package_temporary_dir"/*.rpm "$output_dir"