X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=8b72d471bad37b8d466749d08d1227c6bd66b983;hb=82a3a9d16c5a9c09255f43b324e160b79cb73e0d;hp=4ec9b6b6b22235c29063783c7f682319a49156f8;hpb=377627c4bd8666171db6f9424d3edd18bf968918;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 4ec9b6b..8b72d47 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -40,7 +40,7 @@ cscope:
 
 mkid:
 	$(FIND_TAG_FILES_CMD) | xargs mkid
-	
+
 
 doxygen:  doxygen-api doxygen-ref
 
@@ -94,23 +94,38 @@ dist-hook:
 	  module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
-	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
-	build/linux-merge-config.awk build/linux-merge-modules.awk	\
-	build/linux-rhconfig.h build/lmake build/Rules.in		\
-	build/lustre-kernel-2.4.spec.in build/suse-functions.sh		\
-	build/suse-post.sh build/suse-postun.sh				\
-	build/suse-trigger-script.sh.in build/README.kernel-source	\
-	build/sles8-post.sh build/sles8-postun.sh build/sles8-pre.sh	\
-	build/sles8-update_INITRD_MODULES.sh				\
-	build/sles8-update_rcfile_setting.sh build/update_oldconfig	\
+	build/Makefile build/autoMakefile.am.toplevel build/lbuild*	\
+	build/Rules.in 							\
+	build/update_oldconfig						\
 	build/autoconf/lustre-build-linux.m4				\
-	build/autoconf/lustre-build.m4
+	build/autoconf/lustre-build-darwin.m4				\
+	build/autoconf/lustre-build.m4 build/rdac_spec                  \
+	build/mptlinux.spec.patch build/patches                         \
+	build/funcs.sh build/find_linux_rpms build/exit_traps.sh
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
+	CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \
+	if [ -n "@LINUX@" ]; then \
+		CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-linux=[^ ][^ ]*//'); \
+		RPMARGS="--define \"kdir @LINUX@\""; \
+		CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-linux-obj=[^ ][^ ]*//'); \
+		if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \
+			RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
+		fi; \
+	fi; \
+	CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-release=[^ ][^ ]*//'); \
+	RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+	fi; \
+	echo "Building Lustre RPM with $$RPMARGS"; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ts $(distdir).tar.gz
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="--define \"build_lustre_tests 0\""; \
+	fi; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 rpms:
 	for subdir in $(RPM_SUBDIRS) ; do				\
@@ -128,3 +143,44 @@ srpm:
 	done;								\
 	$(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:
+# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p'
+#	lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//');
+#
+# However, one cannot really run "make debs" without having done a
+# configure first, so we could use the easier method of digging the
+# version out of the config.h file.
+debs:
+	lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
+	cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
+	if [ "$$lversion" != "$$cversion" ]; then \
+		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
+	fi; \
+	rm -rf debs
+	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
+		rc=$${PIPESTATUS[0]}; \
+		[ $${rc} -gt 1 ] && exit $${rc}; \
+		exit 0; \
+	}
+	export KPKG_DEST_DIR="$$(pwd)/.." && \
+	version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
+	rm -rf debian/tmp/modules-deb && \
+	mkdir debian/tmp/modules-deb && \
+	pushd debian/tmp/modules-deb && \
+	dpkg -x ../../../../lustre-source_$${version}_all.deb $$(pwd) && \
+	mkdir usr_src/ && \
+	tar -C usr_src/ -xjf usr/src/lustre.tar.bz2 && \
+	chmod 755 usr_src/modules/lustre/debian/rules && \
+	mkdir -p usr_share_modass && \
+	ln -s /usr/share/modass/include/ usr_share_modass/ && \
+	ln -s /usr/share/modass/packages/ usr_share_modass/ && \
+	echo "lustre" > usr_share_modass/compliant.list && \
+	export MA_DIR=$$(pwd)/usr_share_modass && \
+	KVERS=$${KVERS:-$(LINUXRELEASE)}; \
+	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+	popd && \
+	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \
+	mkdir -p debs && \
+	mv ../liblustre_$${VER}_*.deb ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/