Skip to content
Snippets Groups Projects
Commit 3cbddb56 authored by Markus Frosch's avatar Markus Frosch
Browse files

rpm: Fix hard requirement for os-release

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