b=22281 refactor packaging and versioning

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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index eb9b048..185b06f 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -104,10 +104,20 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec                                       \
 
 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
@@ -148,7 +158,7 @@ debs:
                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); \
+               ver=$$(git describe --match [0-9v]\* --tags); \
                if [[ $$ver = *-*-* ]]; then \
                        hash=$${ver##*-}; \
                        ffw=$${ver#*-}; \
@@ -164,25 +174,29 @@ debs:
                                      -e 's/_/./g'); \
                        fi; \
                        pdir="debian/patches"; \
-                       git format-patch -o $$pdir $$tag..HEAD^; \
-                       if [ ! -d $$pdir ]; then \
-                               mkdir $$pdir; \
+                       if [ -d $$pdir ]; then \
+                               rm -rf $$pdir; \
                        fi; \
+                       mkdir $$pdir; \
+                       git format-patch -o $$pdir $$tag..HEAD; \
                        pushd $$pdir; \
-                       if [ ! -d ../patched ]; then \
-                               mkdir ../patched; \
+                       if [ -d ../patched ]; then \
+                               rm -rf ../patched; \
                        fi; \
+                       mkdir ../patched; \
                        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; \
+                               if ! grep -q "^ debian/changelog" $$file; then \
+                                       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; \
+                               fi; \
                                rm -f $$file; \
                        done; \
                fi; \
@@ -207,6 +221,7 @@ 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); \