Whamcloud - gitweb
LU-3953 build: Only chmod dkms.mkconf once 16/17516/2
authorChristopher J. Morrone <morrone2@llnl.gov>
Tue, 8 Dec 2015 21:55:52 +0000 (16:55 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Sat, 9 Jan 2016 00:07:30 +0000 (00:07 +0000)
With AC_CONFIG_FILES, the "commands" parameter (the second one) is
applied for _each_ command, not just once.  That means the existing
chmod command was run many times, and several of the times it runs
it complains because the dkms.mkconf file does not yet exist.

This patch fixes that by giving the dkms.mkconf file its own
AC_CONFIG_FILES macro.

Change-Id: Ic71cc5d8c3555d28ff16efa23d564dce28662443
Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
Reviewed-on: http://review.whamcloud.com/17516
Tested-by: Jenkins
Reviewed-by: Faccini Bruno <bruno.faccini@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
config/lustre-build.m4

index 21976fc..7e2e239 100644 (file)
@@ -449,7 +449,6 @@ AC_DEFUN([LB_CONFIG_FILES], [
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
                AC_PACKAGE_TARNAME[-dkms.spec]
                [Rules:build/Rules.in]
                AC_PACKAGE_TARNAME[.spec]
                AC_PACKAGE_TARNAME[-dkms.spec]
-               lustre/scripts/dkms.mkconf
                contrib/Makefile
                contrib/lbuild/Makefile
                contrib/scripts/Makefile
                contrib/Makefile
                contrib/lbuild/Makefile
                contrib/scripts/Makefile
@@ -461,9 +460,10 @@ AC_DEFUN([LB_CONFIG_FILES], [
                lustre-iokit/sgpdd-survey/Makefile
                lustre-iokit/mds-survey/Makefile
                lustre-iokit/ior-survey/Makefile
                lustre-iokit/sgpdd-survey/Makefile
                lustre-iokit/mds-survey/Makefile
                lustre-iokit/ior-survey/Makefile
-               lustre-iokit/stats-collect/Makefile,
-               [chmod +x lustre/scripts/dkms.mkconf]
+               lustre-iokit/stats-collect/Makefile
        )
        )
+       AC_CONFIG_FILES([lustre/scripts/dkms.mkconf],
+                       [chmod +x lustre/scripts/dkms.mkconf])
 ])
 
 #
 ])
 
 #