From 38724c80ab32d5d578029f19a1b443341ff3aaf4 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Sat, 14 Nov 2015 14:47:13 -0800 Subject: [PATCH] fix experimental boolean macro Signed-off-by: Jessica Frazelle --- hack/make/build-rpm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 506dcfd128..988dfb46df 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -86,7 +86,12 @@ set -e WORKDIR /root/rpmbuild/SPECS RUN tar -cz -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar.gz ${rpmName} RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec - RUN rpmbuild -ba --define '_release $rpmRelease' --define '_version $rpmVersion' --define '_origversion $VERSION' ${rpmName}.spec + RUN rpmbuild -ba \ + --define '_release $rpmRelease' \ + --define '_version $rpmVersion' \ + --define '_origversion $VERSION' \ + --define '_experimental ${DOCKER_EXPERIMENTAL:-0}' \ + ${rpmName}.spec EOF # selinux policy referencing systemd things won't work on non-systemd versions # of centos or rhel, which we don't support anyways @@ -99,7 +104,6 @@ set -e --define '_release $rpmRelease' \ --define '_version $rpmVersion' \ --define '_origversion $VERSION' \ - --define '_experimental ${DOCKER_EXPERIMENTAL:-0}' \ ${rpmName}-selinux.spec EOF fi