b=24093 not all build files/scripts being distributed

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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index ae56e83..9062f30 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -94,7 +94,7 @@ 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/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         \
@@ -107,6 +107,7 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec                                 \
        build/autoconf/lustre-build-darwin.m4                           \
        build/autoconf/lustre-build.m4 build/rdac_spec                  \
        build/mptlinux.spec.patch build/patches
+       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//'); \
@@ -197,6 +198,7 @@ debs:
                        done; \
                fi; \
        fi
+       rm -rf debs
        dpkg-buildpackage || { \
                rc=$${PIPESTATUS[0]}; \
                [ $${rc} -gt 1 ] && exit $${rc}; \
@@ -206,7 +208,7 @@ debs:
        version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
        rm -rf debian/tmp/modules-deb && \
        mkdir debian/tmp/modules-deb && \
-       cd 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 && \
@@ -216,4 +218,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 && \
-       m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre
+       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/