Skip to content
Snippets Groups Projects
Commit bb816c49 authored by James Simmons's avatar James Simmons Committed by Oleg Drokin
Browse files

LU-3959 build: fix make rpms for lustre-iokit


With the recent merge of the lustre-iokit build
system with lustre's build system on some platforms
running make rpms from the top of the lustre tree
breaks with

make -C lustre-iokit  rpms
make[1]: Entering directory `lustre-2.4.93/lustre-iokit'
make[1]: *** No rule to make target `rpms'.  Stop.

This patch removes the offending code in the makfile
without breaking anything else.

Signed-off-by: default avatarJames Simmons <uja.ornl@gmail.com>
Change-Id: I837ab1c2c383e1ca68eaadc492c3c8cf18cecb92
Reviewed-on: http://review.whamcloud.com/7771


Reviewed-by: default avatarMinh Diep <minh.diep@intel.com>
Reviewed-by: default avatarChristopher J. Morrone <chris.morrone.llnl@gmail.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Tested-by: Hudson
Tested-by: default avatarMaloo <whamcloud.maloo@gmail.com>
Reviewed-by: default avatarBrian J. Murrell <brian.murrell@intel.com>
parent 7ee34b62
No related branches found
No related tags found
No related merge requests found
......@@ -94,7 +94,7 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec \
build/Rules.in \
build/gen_filelist.sh
rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
rpms: @PACKAGE_TARNAME@.spec dist Makefile
@CONFIGURE_ARGS=""; \
for arg in $(ac_configure_args); do \
case $$arg in \
......@@ -152,7 +152,7 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
echo "Building Lustre RPM with $$RPMARGS"; \
eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
srpm: @PACKAGE_TARNAME@.spec dist Makefile
if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
RPMARGS="--without lustre_tests"; \
fi; \
......@@ -161,18 +161,6 @@ srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
fi; \
eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz
rpms:
if BUILD_LUSTREIOKIT
$(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
endif
$(MAKE) $(AM_MAKEFLAGS) rpms-real
srpm:
if BUILD_LUSTREIOKIT
$(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
endif
$(MAKE) $(AM_MAKEFLAGS) srpm-real
# In the debs target, first make sure what's in the changelog reflects
# the software version. Here's how we could dig the version out of the
# autoconf version file directly:
......
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