summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-07-05 19:54:04 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-07-10 13:27:20 (GMT)
commit5391de7771b1d8f9d6f6f6fad7bb8a39247e31e9 (patch)
treec8a9f1af0ae6c18cfcd2f4423310be2909775d16
parent4346902ca9a0e91e915ba40a50a66d66941d3c67 (diff)
downloadbuildroot-5391de7771b1d8f9d6f6f6fad7bb8a39247e31e9.tar.gz
buildroot-5391de7771b1d8f9d6f6f6fad7bb8a39247e31e9.tar.bz2
syslinux: convert to GENTARGETS
Moreover, the installation of pxelinux and/or isolinux is now handled as suboptions, like we traditionally do for other packages. This allows to have a single option (BR2_TARGET_SYSLINUX) that enables the syslinux package. [Peter: drop basename in install step] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--boot/syslinux/Config.in14
-rw-r--r--boot/syslinux/syslinux.mk50
2 files changed, 26 insertions, 38 deletions
diff --git a/boot/syslinux/Config.in b/boot/syslinux/Config.in
index 5650f91..60f3b8f 100644
--- a/boot/syslinux/Config.in
+++ b/boot/syslinux/Config.in
@@ -5,8 +5,12 @@ config BR2_TARGET_SYSLINUX
The syslinux bootloader for x86 systems.
This includes: syslinux, pxelinux, extlinux.
-config BR2_TARGET_PXELINUX
- bool "pxelinux"
- depends on BR2_i386 || BR2_x86_64
- help
- The pxelinux loader for x86 systems.
+config BR2_TARGET_SYSLINUX_ISOLINUX
+ bool "Install isolinux"
+ depends on BR2_TARGET_SYSLINUX
+ default y
+
+config BR2_TARGET_SYSLINUX_PXELINUX
+ bool "Install pxelinux"
+ depends on BR2_TARGET_SYSLINUX
+ default y
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 192e905..e9c32b6 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,42 +4,29 @@
#
#############################################################
-SYSLINUX_VERSION:=3.85
-SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
-SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_CAT:=$(BZCAT)
-SYSLINUX_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
+SYSLINUX_VERSION = 3.85
+SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2
+SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
-$(DL_DIR)/$(SYSLINUX_SOURCE):
- $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE))
+SYSLINUX_INSTALL_TARGET = NO
+SYSLINUX_INSTALL_IMAGES = YES
-syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE)
+SYSLINUX_DEPENDENCIES = host-nasm
-$(SYSLINUX_DIR)/.unpacked: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
- mkdir -p $(@D)
- $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(@D) boot/syslinux/ \*.patch
- touch -c $@
+define SYSLINUX_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(@D)
+endef
-$(SYSLINUX_DIR)/.compiled: $(SYSLINUX_DIR)/.unpacked
- $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" AR="$(HOSTAR)" -C $(SYSLINUX_DIR)
- touch -c $@
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += isolinux.bin
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += pxelinux.bin
-$(BINARIES_DIR)/isolinux.bin: $(SYSLINUX_DIR)/.compiled
- cp -a $(SYSLINUX_DIR)/core/isolinux.bin $@
+define SYSLINUX_INSTALL_IMAGES_CMDS
+ for i in $(SYSLINUX_IMAGES-y); do \
+ $(INSTALL) -D -m 0755 $(@D)/core/$$i $(BINARIES_DIR)/$$i; \
+ done
+endef
-$(BINARIES_DIR)/pxelinux.bin: $(SYSLINUX_DIR)/.compiled
- cp -a $(SYSLINUX_DIR)/core/pxelinux.bin $@
-
-syslinux: host-nasm $(BINARIES_DIR)/isolinux.bin
-pxelinux: host-nasm $(BINARIES_DIR)/pxelinux.bin
-
-pxelinux-clean syslinux-clean:
- rm -f $(BINARIES_DIR)/isolinux.bin $(BINARIES_DIR)/pxelinux.bin
- -$(MAKE) -C $(SYSLINUX_DIR) clean
-
-pxelinux-dirclean syslinux-dirclean:
- rm -rf $(SYSLINUX_DIR)
+$(eval $(call GENTARGETS,boot,syslinux))
#############################################################
#
@@ -49,6 +36,3 @@ pxelinux-dirclean syslinux-dirclean:
ifeq ($(BR2_TARGET_SYSLINUX),y)
TARGETS+=syslinux
endif
-ifeq ($(BR2_TARGET_PXELINUX),y)
-TARGETS+=pxelinux
-endif