From 42f981918d34e784abfe4adfdcff24f7809f186c Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Mon, 3 Jun 2019 08:34:32 -0400 Subject: [PATCH] Force ordering in configure script To prevent using macros before they are defined, enfoce calling them in an appropriate order. Signed-off-by: Michal Mielewczyk --- configure | 2 +- configure.d/{append_bio.conf => 1_append_bio.conf} | 0 configure.d/{bdev_lookup.conf => 1_bdev_lookup.conf} | 0 configure.d/{bio_clone.conf => 1_bio_clone.conf} | 0 configure.d/{bio_cmpl.conf => 1_bio_cmpl.conf} | 0 configure.d/{bio_discard.conf => 1_bio_discard.conf} | 0 configure.d/{bio_err.conf => 1_bio_err.conf} | 0 configure.d/{bio_flags.conf => 1_bio_flags.conf} | 0 configure.d/{bio_iter.conf => 1_bio_iter.conf} | 0 configure.d/{biovec.conf => 1_biovec.conf} | 0 configure.d/{block_pc.conf => 1_block_pc.conf} | 0 configure.d/{deamonize.conf => 1_deamonize.conf} | 0 configure.d/{dentry.conf => 1_dentry.conf} | 0 configure.d/{discard_zeros.conf => 1_discard_zeros.conf} | 0 configure.d/{flush_flag.conf => 1_flush_flag.conf} | 0 configure.d/{generic_acct.conf => 1_generic_acct.conf} | 0 .../{global_page_state.conf => 1_global_page_state.conf} | 0 configure.d/{hlist.conf => 1_hlist.conf} | 0 configure.d/{inode.conf => 1_inode.conf} | 0 configure.d/{munmap.conf => 1_munmap.conf} | 0 configure.d/{queue_bounce.conf => 1_queue_bounce.conf} | 0 .../{queue_chunk_sectors.conf => 1_queue_chunk_sectors.conf} | 0 configure.d/{queue_flag_set.conf => 1_queue_flag_set.conf} | 0 configure.d/{queue_limits.conf => 1_queue_limits.conf} | 0 configure.d/{req_fs.conf => 1_req_fs.conf} | 0 configure.d/{submit_bio.conf => 1_submit_bio.conf} | 0 configure.d/{whlt.conf => 1_whlt.conf} | 0 configure.d/{write_flag.conf => 1_write_flag.conf} | 0 configure.d/{write_fua.conf => 1_write_fua.conf} | 0 configure.d/{bio_barrier.conf => 2_bio_barrier.conf} | 0 configure.d/{flush_fua.conf => 2_flush_fua.conf} | 0 configure.d/{make_req.conf => 2_make_req.conf} | 0 configure.d/{queue_write.conf => 2_queue_write.conf} | 0 configure.d/{write_flush.conf => 2_write_flush.conf} | 0 34 files changed, 1 insertion(+), 1 deletion(-) rename configure.d/{append_bio.conf => 1_append_bio.conf} (100%) rename configure.d/{bdev_lookup.conf => 1_bdev_lookup.conf} (100%) rename configure.d/{bio_clone.conf => 1_bio_clone.conf} (100%) rename configure.d/{bio_cmpl.conf => 1_bio_cmpl.conf} (100%) rename configure.d/{bio_discard.conf => 1_bio_discard.conf} (100%) rename configure.d/{bio_err.conf => 1_bio_err.conf} (100%) rename configure.d/{bio_flags.conf => 1_bio_flags.conf} (100%) rename configure.d/{bio_iter.conf => 1_bio_iter.conf} (100%) rename configure.d/{biovec.conf => 1_biovec.conf} (100%) rename configure.d/{block_pc.conf => 1_block_pc.conf} (100%) rename configure.d/{deamonize.conf => 1_deamonize.conf} (100%) rename configure.d/{dentry.conf => 1_dentry.conf} (100%) rename configure.d/{discard_zeros.conf => 1_discard_zeros.conf} (100%) rename configure.d/{flush_flag.conf => 1_flush_flag.conf} (100%) rename configure.d/{generic_acct.conf => 1_generic_acct.conf} (100%) rename configure.d/{global_page_state.conf => 1_global_page_state.conf} (100%) rename configure.d/{hlist.conf => 1_hlist.conf} (100%) rename configure.d/{inode.conf => 1_inode.conf} (100%) rename configure.d/{munmap.conf => 1_munmap.conf} (100%) rename configure.d/{queue_bounce.conf => 1_queue_bounce.conf} (100%) rename configure.d/{queue_chunk_sectors.conf => 1_queue_chunk_sectors.conf} (100%) rename configure.d/{queue_flag_set.conf => 1_queue_flag_set.conf} (100%) rename configure.d/{queue_limits.conf => 1_queue_limits.conf} (100%) rename configure.d/{req_fs.conf => 1_req_fs.conf} (100%) rename configure.d/{submit_bio.conf => 1_submit_bio.conf} (100%) rename configure.d/{whlt.conf => 1_whlt.conf} (100%) rename configure.d/{write_flag.conf => 1_write_flag.conf} (100%) rename configure.d/{write_fua.conf => 1_write_fua.conf} (100%) rename configure.d/{bio_barrier.conf => 2_bio_barrier.conf} (100%) rename configure.d/{flush_fua.conf => 2_flush_fua.conf} (100%) rename configure.d/{make_req.conf => 2_make_req.conf} (100%) rename configure.d/{queue_write.conf => 2_queue_write.conf} (100%) rename configure.d/{write_flush.conf => 2_write_flush.conf} (100%) diff --git a/configure b/configure index 2556357..05f38d6 100755 --- a/configure +++ b/configure @@ -7,7 +7,7 @@ SCRIPTPATH=`dirname $0` SCRIPTPATH=`realpath $SCRIPTPATH` -CONFIG_FILES=`ls $SCRIPTPATH/configure.d/*.conf` +CONFIG_FILES=`ls $SCRIPTPATH/configure.d/*.conf | sort` rm -f $SCRIPTPATH/modules/generated_defines.h diff --git a/configure.d/append_bio.conf b/configure.d/1_append_bio.conf similarity index 100% rename from configure.d/append_bio.conf rename to configure.d/1_append_bio.conf diff --git a/configure.d/bdev_lookup.conf b/configure.d/1_bdev_lookup.conf similarity index 100% rename from configure.d/bdev_lookup.conf rename to configure.d/1_bdev_lookup.conf diff --git a/configure.d/bio_clone.conf b/configure.d/1_bio_clone.conf similarity index 100% rename from configure.d/bio_clone.conf rename to configure.d/1_bio_clone.conf diff --git a/configure.d/bio_cmpl.conf b/configure.d/1_bio_cmpl.conf similarity index 100% rename from configure.d/bio_cmpl.conf rename to configure.d/1_bio_cmpl.conf diff --git a/configure.d/bio_discard.conf b/configure.d/1_bio_discard.conf similarity index 100% rename from configure.d/bio_discard.conf rename to configure.d/1_bio_discard.conf diff --git a/configure.d/bio_err.conf b/configure.d/1_bio_err.conf similarity index 100% rename from configure.d/bio_err.conf rename to configure.d/1_bio_err.conf diff --git a/configure.d/bio_flags.conf b/configure.d/1_bio_flags.conf similarity index 100% rename from configure.d/bio_flags.conf rename to configure.d/1_bio_flags.conf diff --git a/configure.d/bio_iter.conf b/configure.d/1_bio_iter.conf similarity index 100% rename from configure.d/bio_iter.conf rename to configure.d/1_bio_iter.conf diff --git a/configure.d/biovec.conf b/configure.d/1_biovec.conf similarity index 100% rename from configure.d/biovec.conf rename to configure.d/1_biovec.conf diff --git a/configure.d/block_pc.conf b/configure.d/1_block_pc.conf similarity index 100% rename from configure.d/block_pc.conf rename to configure.d/1_block_pc.conf diff --git a/configure.d/deamonize.conf b/configure.d/1_deamonize.conf similarity index 100% rename from configure.d/deamonize.conf rename to configure.d/1_deamonize.conf diff --git a/configure.d/dentry.conf b/configure.d/1_dentry.conf similarity index 100% rename from configure.d/dentry.conf rename to configure.d/1_dentry.conf diff --git a/configure.d/discard_zeros.conf b/configure.d/1_discard_zeros.conf similarity index 100% rename from configure.d/discard_zeros.conf rename to configure.d/1_discard_zeros.conf diff --git a/configure.d/flush_flag.conf b/configure.d/1_flush_flag.conf similarity index 100% rename from configure.d/flush_flag.conf rename to configure.d/1_flush_flag.conf diff --git a/configure.d/generic_acct.conf b/configure.d/1_generic_acct.conf similarity index 100% rename from configure.d/generic_acct.conf rename to configure.d/1_generic_acct.conf diff --git a/configure.d/global_page_state.conf b/configure.d/1_global_page_state.conf similarity index 100% rename from configure.d/global_page_state.conf rename to configure.d/1_global_page_state.conf diff --git a/configure.d/hlist.conf b/configure.d/1_hlist.conf similarity index 100% rename from configure.d/hlist.conf rename to configure.d/1_hlist.conf diff --git a/configure.d/inode.conf b/configure.d/1_inode.conf similarity index 100% rename from configure.d/inode.conf rename to configure.d/1_inode.conf diff --git a/configure.d/munmap.conf b/configure.d/1_munmap.conf similarity index 100% rename from configure.d/munmap.conf rename to configure.d/1_munmap.conf diff --git a/configure.d/queue_bounce.conf b/configure.d/1_queue_bounce.conf similarity index 100% rename from configure.d/queue_bounce.conf rename to configure.d/1_queue_bounce.conf diff --git a/configure.d/queue_chunk_sectors.conf b/configure.d/1_queue_chunk_sectors.conf similarity index 100% rename from configure.d/queue_chunk_sectors.conf rename to configure.d/1_queue_chunk_sectors.conf diff --git a/configure.d/queue_flag_set.conf b/configure.d/1_queue_flag_set.conf similarity index 100% rename from configure.d/queue_flag_set.conf rename to configure.d/1_queue_flag_set.conf diff --git a/configure.d/queue_limits.conf b/configure.d/1_queue_limits.conf similarity index 100% rename from configure.d/queue_limits.conf rename to configure.d/1_queue_limits.conf diff --git a/configure.d/req_fs.conf b/configure.d/1_req_fs.conf similarity index 100% rename from configure.d/req_fs.conf rename to configure.d/1_req_fs.conf diff --git a/configure.d/submit_bio.conf b/configure.d/1_submit_bio.conf similarity index 100% rename from configure.d/submit_bio.conf rename to configure.d/1_submit_bio.conf diff --git a/configure.d/whlt.conf b/configure.d/1_whlt.conf similarity index 100% rename from configure.d/whlt.conf rename to configure.d/1_whlt.conf diff --git a/configure.d/write_flag.conf b/configure.d/1_write_flag.conf similarity index 100% rename from configure.d/write_flag.conf rename to configure.d/1_write_flag.conf diff --git a/configure.d/write_fua.conf b/configure.d/1_write_fua.conf similarity index 100% rename from configure.d/write_fua.conf rename to configure.d/1_write_fua.conf diff --git a/configure.d/bio_barrier.conf b/configure.d/2_bio_barrier.conf similarity index 100% rename from configure.d/bio_barrier.conf rename to configure.d/2_bio_barrier.conf diff --git a/configure.d/flush_fua.conf b/configure.d/2_flush_fua.conf similarity index 100% rename from configure.d/flush_fua.conf rename to configure.d/2_flush_fua.conf diff --git a/configure.d/make_req.conf b/configure.d/2_make_req.conf similarity index 100% rename from configure.d/make_req.conf rename to configure.d/2_make_req.conf diff --git a/configure.d/queue_write.conf b/configure.d/2_queue_write.conf similarity index 100% rename from configure.d/queue_write.conf rename to configure.d/2_queue_write.conf diff --git a/configure.d/write_flush.conf b/configure.d/2_write_flush.conf similarity index 100% rename from configure.d/write_flush.conf rename to configure.d/2_write_flush.conf