successful build, UEFI and BIOS working. need to test USB method.

extra/templates/EFI/base.conf.j2

@@ -1,4 +1,4 @@
 title   {{ bdisk['pname'] }} (Media)
-linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else $}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
-initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else $}boot{% endif %}/{{ bdisk['uxname'] }}.img
+linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
+initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.img
 options archisobasedir={{ bdisk['name'] }} archisolabel={{ bdisk['name'] }}

extra/templates/EFI/ram.conf.j2

@@ -1,4 +1,4 @@
 title   {{ bdisk['pname'] }} (RAM)
-linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else $}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
-initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else $}boot{% endif %}/{{ bdisk['uxname'] }}.img
+linux   /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.{% if efi is defined %}efi{% else %}kern{% endif %}
+initrd  /{% if efi is defined %}EFI/{{ bdisk['name'] }}{% else %}boot{% endif %}/{{ bdisk['uxname'] }}.img
 options copytoram archisobasedir={{ bdisk['name'] }} archisolabel={{ bdisk['name'] }}

extra/templates/VERSION_INFO.txt.j2

@@ -1,4 +1,4 @@
-Version:        {{ build['ver'] }}
+Version:        {{ bdisk['ver'] }}
 Build:          {{ build['name'] }}
 Time:           {{ build['time'] }}
 Machine:        {{ hostname }}