summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d1d12d3)
We are replacing non-standard binary macros with standard
--with/--without mechanism
Signed-off-by: Minh Diep <minh.diep@intel.com>
Change-Id: Id499726b28f33b60b969b1d72b97625ca1f50967
Reviewed-on: http://review.whamcloud.com/6856
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Brian J. Murrell <brian.murrell@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Christopher J. Morrone <chris.morrone.llnl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
sed -re 's/--with-release=[^ ][^ ]*//'); \
RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
sed -re 's/--with-release=[^ ][^ ]*//'); \
RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
- RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+ RPMARGS="$$RPMARGS --without lustre_tests"; \
fi; \
if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
fi; \
if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
- RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
+ RPMARGS="$$RPMARGS --without servers"; \
+ if [ -n "@CROSS_PATH@" ]; then \
+ RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
+ fi; \
fi; \
if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
fi; \
if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
- RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \
+ RPMARGS="$$RPMARGS --with ldiskfs"; \
fi; \
if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
fi; \
if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
- RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 1\""; \
+ RPMARGS="$$RPMARGS --with zfs"; \
fi; \
echo "Building Lustre RPM with $$RPMARGS"; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
fi; \
echo "Building Lustre RPM with $$RPMARGS"; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
- RPMARGS="--define \"build_lustre_tests 0\""; \
+ RPMARGS="--without lustre_tests"; \
fi; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
fi; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
fi
$RPMBUILD $targets $rpmbuildopt "$LUSTRE" \
fi
$RPMBUILD $targets $rpmbuildopt "$LUSTRE" \
- ${is_patchless:+--define "lustre_name lustre-client"} \
- ${lustre_tests:+--define "build_lustre_tests 0"} \
- ${osd_zfs:+--define "build_lustre_osd_zfs 1"} \
- ${osd_ldiskfs:+--define "build_lustre_osd_ldiskfs 1"} \
+ ${is_patchless:+--without servers} \
+ ${lustre_tests:+--without lustre_tests} \
+ ${osd_zfs:+--with zfs} \
+ ${osd_ldiskfs:+--with ldiskfs} \
${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "kdir $linux" \
${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "kdir $linux" \
if $DO_SRC; then
if ! $RPMBUILD -ts "$LUSTRE" \
if $DO_SRC; then
if ! $RPMBUILD -ts "$LUSTRE" \
- ${is_patchless:+--define "lustre_name lustre-client"} \
- ${lustre_tests:+--define "build_lustre_tests 0"} \
+ ${is_patchless:+--without servers} \
+ ${lustre_tests:+--without lustre_tests} \
${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "kdir $linux" \
${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
--define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "kdir $linux" \
+
+# Declare rpmbuild --with/--without parameters
+%bcond_without servers
+%bcond_without ldiskfs
+%bcond_with zfs
+%bcond_without lustre_tests
+
+%if %{without servers}
+ # --without servers overrides --with {ldiskfs|zfs}
+ # so undefine the internal variables set by bcond_*
+ %undefine with_ldiskfs
+ %undefine with_zfs
+%endif
+
%{!?version: %global version @VERSION@}
%{!?kver: %global kver ""}
%{!?kdir: %global kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)}
%{!?version: %global version @VERSION@}
%{!?kver: %global kver ""}
%{!?kdir: %global kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)}
# always append the buildid, even when the caller defines %release
%define fullrelease %{myrelease}%{buildid}
# always append the buildid, even when the caller defines %release
%define fullrelease %{myrelease}%{buildid}
-%{!?lustre_name: %global lustre_name lustre}
-%{!?build_lustre_tests: %global build_lustre_tests 1}
-
-%{!?build_lustre_osd_ldiskfs: %global build_lustre_osd_ldiskfs 0}
-%{!?build_lustre_osd_zfs: %global build_lustre_osd_zfs 0}
-
# in order to get kernel symset and/or kernel module dependencies into
# the RPM, in order to support weak-modules, the internal dependency gen-
# erator needs to be disabled
# in order to get kernel symset and/or kernel module dependencies into
# the RPM, in order to support weak-modules, the internal dependency gen-
# erator needs to be disabled
# response from them
#%%global _use_internal_dependency_generator 0
# response from them
#%%global _use_internal_dependency_generator 0
-%define is_client %(bash -c "if [[ %{lustre_name} = *-client* ]]; then echo -n '1'; else echo -n '0'; fi")
# for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
# of %kversion
%define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
# for those uses that don't want the -smp/-bigsmp (or the .arch) on the end
# of %kversion
%define krequires %(bash -c "echo %{kversion} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/-ppc64$//' -e 's/-default$//'")
%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'")
%endif
%define flavor %(bash -c "echo %{kversion} | sed -e 's/^.*-//'")
%endif
-%if %is_client
-%define build_lustre_osd_ldiskfs 0
-%define build_lustre_osd_zfs 0
+# Set the package name prefix
+%if %{undefined lustre_name}
+ %if %{with servers}
+ %global lustre_name lustre
+ %else
+ %global lustre_name lustre-client
+ %endif
%endif
%if %{defined cross_path} && %{defined post_script}
%endif
%if %{defined cross_path} && %{defined post_script}
Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
Requires: %{name}-modules = %{version}
Obsoletes: lustre-lite, lustre-lite-utils, lustre-ldap nfs-utils-lustre
Provides: lustre-lite = %{version}, lustre-lite-utils = %{version}
Requires: %{name}-modules = %{version}
Requires: lustre-osd
%endif
# GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
Requires: lustre-osd
%endif
# GSS requires this: BuildRequires: pkgconfig, libgssapi-devel >= 0.10
%description modules
Lustre file system, server and network drivers for Linux %{kversion}.
%description modules
Lustre file system, server and network drivers for Linux %{kversion}.
-%if %{build_lustre_osd_ldiskfs}
%package osd-ldiskfs
Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre.
Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0
%package osd-ldiskfs
Summary: osd-ldiskfs is the mandatory glue for LDISKFS support in Lustre.
Requires: lustre-modules = %{version}, lustre-ldiskfs >= 4.1.0
backing store of a Lustre server.
%endif
backing store of a Lustre server.
%endif
-%if %{build_lustre_osd_zfs}
%package osd-zfs
Summary: osd-zfs is the mandatory glue for ZFS support in Lustre.
Requires: lustre-modules = %{version}, zfs-kmod
%package osd-zfs
Summary: osd-zfs is the mandatory glue for ZFS support in Lustre.
Requires: lustre-modules = %{version}, zfs-kmod
# build failures
%define optflags -g -O2 -Werror
CONFIGURE_ARGS="%{?configure_args} --with-release=%release"
# build failures
%define optflags -g -O2 -Werror
CONFIGURE_ARGS="%{?configure_args} --with-release=%release"
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests"
%else
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-tests --enable-liblustre-tests"
%else
CONFIGURE_ARGS="$CONFIGURE_ARGS --disable-tests --disable-liblustre-tests"
echo '%attr(-, root, root) %{_includedir}/linux/lustre_types.h' >>lustre.files
fi
echo '%attr(-, root, root) %{_includedir}/linux/lustre_types.h' >>lustre.files
fi
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
echo '%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
echo '%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/liblustre/tests ] ; then
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}.sh
echo '%attr(0555, root, root) %{rpm_post_base}.sh' >>lustre.files
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-modules.sh
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}.sh
echo '%attr(0555, root, root) %{rpm_post_base}.sh' >>lustre.files
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-modules.sh
-%if %{build_lustre_osd_ldiskfs}
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh
%endif
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-ldiskfs.sh
%endif
-%if %{build_lustre_osd_zfs}
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh
%endif
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-osd-zfs.sh
%endif
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-tests.sh
echo '%attr(0555, root, root) %{rpm_post_base}-tests.sh' >>lustre-tests.files
%endif
cp -f $POST_SCRIPT $RPM_BUILD_ROOT/%{rpm_post_base}-tests.sh
echo '%attr(0555, root, root) %{rpm_post_base}-tests.sh' >>lustre-tests.files
%endif
%files modules
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/*
%files modules
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/*
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko
%endif
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko
%endif
-%if %{build_lustre_osd_ldiskfs}
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
%endif
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
%endif
-%if %{build_lustre_osd_zfs}
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
%endif
%if %{defined rpm_post_base}
%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
%endif
%if %{defined rpm_post_base}
%attr(-, root, root) %doc ChangeLog-lustre
%attr(-, root, root) %doc ChangeLog-lnet
%attr(-, root, root) %doc ChangeLog-lustre
%attr(-, root, root) %doc ChangeLog-lnet
-%if %{build_lustre_osd_ldiskfs}
%files osd-ldiskfs
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
%files osd-ldiskfs
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko
-%if %{build_lustre_osd_zfs}
%files osd-zfs
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
%if %{defined rpm_post_base}
%files osd-zfs
%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_zfs.ko
%if %{defined rpm_post_base}
# %files deps-sles
# %files deps-rhel
# %files deps-sles
# %files deps-rhel
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
%files tests -f lustre-tests.files
%endif
%files tests -f lustre-tests.files
%endif
-%if %{build_lustre_osd_ldiskfs}
%post osd-ldiskfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then
%post osd-ldiskfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then
-%if %{build_lustre_osd_zfs}
%post osd-zfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-zfs.sh ]; then
%post osd-zfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-zfs.sh ]; then
rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true
%endif
rpm -ql $MODULES_RPM_NAME | grep '\.ko$' > /var/run/%{name}-modules || true
%endif
-%if %{build_lustre_osd_ldiskfs}
%preun osd-ldiskfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then
%preun osd-ldiskfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-ldiskfs.sh ]; then
-%if %{build_lustre_osd_zfs}
%preun osd-zfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-zfs.sh ]; then
%preun osd-zfs
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-osd-zfs.sh ]; then
fi
rm /var/run/%{name}-modules
fi
rm /var/run/%{name}-modules
-%if %{build_lustre_osd_ldiskfs}
%postun osd-ldiskfs
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
%postun osd-ldiskfs
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
rm /var/run/%{name}-osd-ldiskfs
%endif
rm /var/run/%{name}-osd-ldiskfs
%endif
-%if %{build_lustre_osd_zfs}
%postun osd-zfs
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
%postun osd-zfs
if [ -f /boot/System.map-%{kversion} ]; then
depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0
-%if %{build_lustre_tests}
+%if %{with lustre_tests}
%post tests
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-tests.sh ]; then
%post tests
%if %{defined rpm_post_base}
if [ -x %{rpm_post_base}-tests.sh ]; then