Commit f98a0619 authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Call binary_efi after binary_hooks to include the files after they have been...

Call binary_efi after binary_hooks to include the files after they have been customized by the binary hooks.
parent 5f046226
live-build (3.0.5-1kali7) kali; urgency=medium
* Call binary_efi after binary_hooks to include the files after they have
been customized by the binary hooks.
-- Raphaël Hertzog <hertzog@debian.org> Mon, 21 Jul 2014 23:20:58 +0200
live-build (3.0.5-1kali6) kali; urgency=medium live-build (3.0.5-1kali6) kali; urgency=medium
* Use the xorriso syntax that doesn't create a GPT but does create * Use the xorriso syntax that doesn't create a GPT but does create
......
...@@ -9,15 +9,16 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680 ...@@ -9,15 +9,16 @@ Bug-Kali: https://bugs.kali.org/view.php?id=680
--- a/scripts/build/binary --- a/scripts/build/binary
+++ b/scripts/build/binary +++ b/scripts/build/binary
@@ -71,6 +71,8 @@ lb binary_disk ${@} @@ -72,6 +72,9 @@ lb binary_loadlin ${@}
lb binary_loadlin ${@}
lb binary_win32-loader ${@} lb binary_win32-loader ${@}
lb binary_includes ${@} lb binary_includes ${@}
+lb binary_efi ${@} # After includes because it copies files that can be
+ # overriden by binary_includes in efi.img
lb binary_hooks ${@} lb binary_hooks ${@}
+lb binary_efi ${@} # After includes/hooks because it copies in efi.img
+ # files that can be overriden by binary_includes and
+ # modified by binary_hooks
lb binary_checksums ${@} lb binary_checksums ${@}
if [ "${LB_BUILD_WITH_CHROOT}" != "true" ]
--- a/scripts/build/binary_iso --- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso +++ b/scripts/build/binary_iso
@@ -88,6 +88,23 @@ fi @@ -88,6 +88,23 @@ fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment