From 5083d76835a6b3d49769e247fd8e22b6eb5218fa Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Fri, 19 Jul 2019 15:20:09 -0500 Subject: [PATCH] ubuntu-cpc: remove unused final.binary hook support Right now this is a solution looking for a problem as the implementation no longer relies on it. --- live-build/ubuntu-cpc/hooks.d/make-hooks | 8 -------- 1 file changed, 8 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/make-hooks b/live-build/ubuntu-cpc/hooks.d/make-hooks index c1fe0e5d..25c8e0dd 100755 --- a/live-build/ubuntu-cpc/hooks.d/make-hooks +++ b/live-build/ubuntu-cpc/hooks.d/make-hooks @@ -44,9 +44,6 @@ saved to the "explicit_provides" file in the hooks output directory. In the case of the "all" target this list would be empty. This list is consumed by the "remove-implicit-artifacts" which is run at the end of the build. -The final.binary hook is always included as the last hook(s) if it exists, -it should not be specified in series files. - ACHTUNG: live build runs scripts with the suffix ".chroot" in a batch separate from scripts ending in ".binary". Even if you arrange them interleaved in your series files, the chroot scripts will be run before the binary scripts. @@ -214,11 +211,6 @@ class MakeHooks: sys.stderr.write("WARNING: Hooks directory exists and is not empty.\n") os.makedirs(self._hooks_dir, exist_ok=True) - # Always add final.binary hook if it exists - final_hook = os.path.join(self._script_dir, "base/final.binary") - if os.path.exists(final_hook) and os.path.isfile(final_hook): - self._hooks_list.append("base/final.binary") - for counter, hook in enumerate(self._hooks_list, start=1): hook_basename = os.path.basename(hook)