Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 10635c8b71957449b4c53c5f6b9210cc1a7d984d

Authored by Nicholas Bellinger
Committed by James Bottomley
1 parent 6d1802539d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[SCSI] target: tcm_mod_builder.py generated Makefile cleanups 

This patch converts the tcm_mod_builder.py generation script to
create a new drivers/target/$TCM_FABRIC_MOD/Makefile and update
drivers/target/Makefile, instead of creating+updating a 'Kbuild'
filename.

It also removes the remaining EXTRA_CFLAGS includes from
tcm_mod_build_kbuild(), and converts fabric module generated .c
code to us ""-style includes for $FABRIC_MOD_[base,fabric].h

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 1 changed file with 8 additions and 9 deletions Side-by-side Diff

Documentation/target/tcm_mod_builder.py
Diff comments   View file @ 10635c8
... ... @@ -239,8 +239,8 @@
239 239 buf += "#include <target/target_core_configfs.h>\n"
240 240 buf += "#include <target/target_core_base.h>\n"
241 241 buf += "#include <target/configfs_macros.h>\n\n"
242   - buf += "#include <" + fabric_mod_name + "_base.h>\n"
243   - buf += "#include <" + fabric_mod_name + "_fabric.h>\n\n"
  242 + buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
  243 + buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
244 244  
245 245 buf += "/* Local pointer to allocated TCM configfs fabric module */\n"
246 246 buf += "struct target_fabric_configfs *" + fabric_mod_name + "_fabric_configfs;\n\n"
... ... @@ -583,9 +583,9 @@
583 583 buf += "#include <target/target_core_fabric_lib.h>\n"
584 584 buf += "#include <target/target_core_device.h>\n"
585 585 buf += "#include <target/target_core_tpg.h>\n"
586   - buf += "#include <target/target_core_configfs.h>\n"
587   - buf += "#include <" + fabric_mod_name + "_base.h>\n"
588   - buf += "#include <" + fabric_mod_name + "_fabric.h>\n\n"
  586 + buf += "#include <target/target_core_configfs.h>\n\n"
  587 + buf += "#include \"" + fabric_mod_name + "_base.h\"\n"
  588 + buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
589 589  
590 590 buf += "int " + fabric_mod_name + "_check_true(struct se_portal_group *se_tpg)\n"
591 591 buf += "{\n"
592 592  
... ... @@ -973,14 +973,13 @@
973 973 def tcm_mod_build_kbuild(fabric_mod_dir_var, fabric_mod_name):
974 974  
975 975 buf = ""
976   - f = fabric_mod_dir_var + "/Kbuild"
  976 + f = fabric_mod_dir_var + "/Makefile"
977 977 print "Writing file: " + f
978 978  
979 979 p = open(f, 'w')
980 980 if not p:
981 981 tcm_mod_err("Unable to open file: " + f)
982 982  
983   - buf = "EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/include/ -I$(srctree)/drivers/scsi/ -I$(srctree)/include/scsi/ -I$(srctree)/drivers/target/" + fabric_mod_name + "\n\n"
984 983 buf += fabric_mod_name + "-objs := " + fabric_mod_name + "_fabric.o \\\n"
985 984 buf += " " + fabric_mod_name + "_configfs.o\n"
986 985 buf += "obj-$(CONFIG_" + fabric_mod_name.upper() + ") += " + fabric_mod_name + ".o\n"
... ... @@ -1018,7 +1017,7 @@
1018 1017  
1019 1018 def tcm_mod_add_kbuild(tcm_dir, fabric_mod_name):
1020 1019 buf = "obj-$(CONFIG_" + fabric_mod_name.upper() + ") += " + fabric_mod_name.lower() + "/\n"
1021   - kbuild = tcm_dir + "/drivers/target/Kbuild"
  1020 + kbuild = tcm_dir + "/drivers/target/Makefile"
1022 1021  
1023 1022 f = open(kbuild, 'a')
1024 1023 f.write(buf)
... ... @@ -1064,7 +1063,7 @@
1064 1063 tcm_mod_build_kbuild(fabric_mod_dir, fabric_mod_name)
1065 1064 tcm_mod_build_kconfig(fabric_mod_dir, fabric_mod_name)
1066 1065  
1067   - input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Kbuild..? [yes,no]: ")
  1066 + input = raw_input("Would you like to add " + fabric_mod_name + "to drivers/target/Makefile..? [yes,no]: ")
1068 1067 if input == "yes" or input == "y":
1069 1068 tcm_mod_add_kbuild(tcm_dir, fabric_mod_name)
1070 1069