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

extra/dist.build.ini

@@ -44,6 +44,12 @@ uxname = bdisk
 ; 2.) ASCII *only*
 pname = BDisk
 
+; What version is this?
+; If we don't have a version specified here, we'll
+; try to guess based on the current git commit in build:basedir.
+; 0.) No whitespace
+ver = 
+
 ; Your/your organization's name.
 ; The same rules as 'pname' apply:
 ; 0.) Can contain whitespace
@@ -206,7 +212,7 @@ basedir = /opt/dev/bdisk
 ; (The files will be very big!)
 ; 0.) No whitespace
 ; 1.) Will be created if it doesn't exist
-isodir = ${basedir}/iso
+isodir = ${dlpath}/iso
 
 ; This is a directory where we should save extra
 ; source code we download (if we need it).
@@ -217,7 +223,7 @@ srcdir = ${basedir}/extrasrc
 ; What directory should we use for staging?
 ; 0.) No whitespace
 ; 1.) Will be created if it doesn't exist
-tempdir = ${basedir}/temp
+tempdir = ${dlpath}/temp
 
 ; Where should we stage the boot files?
 ; This should not be the same dir as other options!

extra/pre-build.d/root/pre-build.sh

@@ -149,4 +149,5 @@ fi
 yes | pacman -Scc
 rm -f /root/.bash_history
 rm -f /root/.viminfo
-
+rm -f /root/apacman-*.pkg.tar.xz
+rm -f /root/pre-build.sh

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 }}