From b2cfbc3f1f4b70dd2bcbb8578383ae6fe13a8094 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sat, 28 Mar 2015 15:20:34 +0300 Subject: [PATCH] boot.mk: factor out boot/% from distro.mk Yes these bits are related to distro/ prefixed images still the overgeneralization in distro.mk didn't pay off but rather hid a bug with the only boot/isolinux in use having no dependency on use/syslinux (which is required). Maybe this will get revisited when we have other kinds of bootable images with other bootloaders (vm/ ones care for themselves as of today). --- lib/boot.mk | 9 +++++++++ lib/distro.mk | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 lib/boot.mk diff --git a/lib/boot.mk b/lib/boot.mk new file mode 100644 index 00000000..39bb2d81 --- /dev/null +++ b/lib/boot.mk @@ -0,0 +1,9 @@ +ifndef MKIMAGE_PROFILES +$(error this makefile is designed to be included in toplevel one) +endif + +ifeq (distro,$(IMAGE_CLASS)) +# install media bootloader +boot/isolinux: use/syslinux + @$(call set,BOOTLOADER,isolinux) +endif diff --git a/lib/distro.mk b/lib/distro.mk index d221d9f4..9be25320 100644 --- a/lib/distro.mk +++ b/lib/distro.mk @@ -5,11 +5,6 @@ $(error this makefile is designed to be included in toplevel one) endif ifeq (distro,$(IMAGE_CLASS)) - -# install media bootloader -boot/%: - @$(call set,BOOTLOADER,$*) - # fundamental targets distro/.init: profile/bare