Commit 3cbddb56 authored by Markus Frosch's avatar Markus Frosch
Browse files

rpm: Fix hard requirement for os-release

parent 8ef0273b
......@@ -119,7 +119,9 @@ get_rpmbuild() {
"$@"
)
source /etc/os-release
if [ -f /etc/os-release ]; then
source /etc/os-release
fi
if [ "$ID" != sles ] && [[ "$VERSION" != 11.* ]]; then
RPMBUILD+=(
--define "_buildrootdir %{_topdir}/BUILDROOT" \
......@@ -212,7 +214,9 @@ setup_extra_repository() {
) | sudo bash -c "cat >'/etc/zypp/credentials.d/${extra_name}'"
fi
(
source /etc/os-release
if [ -f /etc/os-release ]; then
source /etc/os-release
fi
opt=()
if [ "$ID" != sles ] && [[ "$VERSION" != 11.* ]]; then
opt+=(--priority 50)
......
......@@ -103,7 +103,9 @@ fi
echo "[ Running rpmlint ]"
(
source /etc/os-release
if [ -f /etc/os-release ]; then
source /etc/os-release
fi
if [ "$ID" = sles ] && [[ "$VERSION" = 11.* ]]; then
echo "Skip rpmlint..."
exit 0
......
......@@ -92,7 +92,9 @@ if [ -e "rpmlint/${ICINGA_BUILD_PROJECT}.conf" ]; then
lintconf+=("-f" "rpmlint/${ICINGA_BUILD_PROJECT}.conf")
fi
(
source /etc/os-release
if [ -f /etc/os-release ]; then
source /etc/os-release
fi
if [ "$ID" = sles ] && [[ "$VERSION" = 11.* ]]; then
echo "Skip rpmlint..."
exit 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment