LU-831 header: struct bit field should be unsigned type

[fs/lustre-release.git] / build / autoMakefile.am.toplevel

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index eb9b048..036ee86 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -50,7 +50,7 @@ doxygen-%: build/doxyfile.%
 if MODULES
 sources: all-sources
 
-all-sources: $(EXTRA_SOURCES)
+all-sources: $(MODULE_SYMVERS_DEPS)
        for dir in $(SOURCES_SUBDIRS) ; do \
                $(MAKE) sources -C $$dir || exit $$? ; \
        done
@@ -94,20 +94,31 @@ dist-hook:
          module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \
-       build/Makefile build/autoMakefile.am.toplevel build/lbuild      \
+       build/Makefile build/autoMakefile.am.toplevel build/lbuild*     \
        build/Rules.in                                                  \
        build/update_oldconfig                                          \
        build/autoconf/lustre-build-linux.m4                            \
        build/autoconf/lustre-build-darwin.m4                           \
        build/autoconf/lustre-build.m4 build/rdac_spec                  \
-       build/mptlinux.spec.patch build/patches
+       build/mptlinux.spec.patch build/patches                         \
+       build/funcs.sh build/find_linux_rpms build/exit_traps.sh
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
        CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \
-       RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
+       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
@@ -147,48 +158,8 @@ debs:
        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; \
-       if [ -d .git ]; then \
-               ver=$$(git describe --tags); \
-               if [[ $$ver = *-*-* ]]; then \
-                       hash=$${ver##*-}; \
-                       ffw=$${ver#*-}; \
-                       ffw=$${ffw%-*}; \
-                       ver=$${ver%%-*}; \
-               fi; \
-               if [ $$ffw -gt 0 ]; then \
-                       tag=$$ver; \
-                       if [[ $$ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$$ ]]; then \
-                               ver=$$(echo $$ver | \
-                                 sed -e 's/^v\(.*\)/\1/' \
-                                     -e 's/_RC[[0-9]].*$$//' \
-                                     -e 's/_/./g'); \
-                       fi; \
-                       pdir="debian/patches"; \
-                       git format-patch -o $$pdir $$tag..HEAD^; \
-                       if [ ! -d $$pdir ]; then \
-                               mkdir $$pdir; \
-                       fi; \
-                       pushd $$pdir; \
-                       if [ ! -d ../patched ]; then \
-                               mkdir ../patched; \
-                       fi; \
-                       rm -f 00list *.dpatch; \
-                       for file in [0-9][0-9][0-9][0-9]-*.patch; do \
-                               desc=$$(cat $$file | sed -e '1,/^$$/d' \
-                                                        -e '/^---$$/,$$d'); \
-                               dpatch_file=$${file/.patch/.dpatch}; \
-                               sed -e '1,/^---$$/d' $$file | \
-                                 dpatch patch-template -p "$${file%.patch}" \
-                                   "$$desc" > $$dpatch_file; \
-                               echo "faked by make debs run from git" > \
-                                 ../patched/$$dpatch_file; \
-                               echo $$dpatch_file >> 00list; \
-                               rm -f $$file; \
-                       done; \
-               fi; \
-       fi
        rm -rf debs
-       dpkg-buildpackage || { \
+       dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
                rc=$${PIPESTATUS[0]}; \
                [ $${rc} -gt 1 ] && exit $${rc}; \
                exit 0; \
@@ -207,8 +178,9 @@ debs:
        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}.tar.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb 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/