diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-26 13:40:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-11-26 13:50:34 +0000 |
| commit | 1467b0478f3b9077cdff727f335ca7a1a82366b9 (patch) | |
| tree | 61d99860facc44fbfbcbfe109ec536002a6e605e | |
| parent | a7c38e80158a74c862e03c9cc1ae42e1fd85dec6 (diff) | |
| download | alpine-iso-1467b0478f3b9077cdff727f335ca7a1a82366b9.tar.bz2 alpine-iso-1467b0478f3b9077cdff727f335ca7a1a82366b9.tar.xz | |
remove isolinux.cfg
we dont need separate syslinux.cfg/isolinux.cfg since we no longer
depend on alpine_dev. All boot media should be able to use same
syslinuyx.cfg.
| -rwxr-xr-x | Makefile | 27 |
1 files changed, 2 insertions, 25 deletions
@@ -214,7 +214,6 @@ ISOLINUX := $(ISO_DIR)/$(ISOLINUX_DIR) ISOLINUX_BIN := $(ISOLINUX)/isolinux.bin ISOLINUX_C32 := $(ISOLINUX)/ldlinux.c32 $(ISOLINUX)/libutil.c32 \ $(ISOLINUX)/libcom32.c32 $(ISOLINUX)/mboot.c32 -ISOLINUX_CFG := $(ISOLINUX)/isolinux.cfg SYSLINUX_CFG := $(ISOLINUX)/syslinux.cfg SYSLINUX_SERIAL ?= SYSLINUX_TIMEOUT ?= 20 @@ -240,28 +239,6 @@ $(ISOLINUX_BIN): # strip trailing -vanilla on kernel name VMLINUZ_NAME = $$(echo vmlinuz-$(1) | sed 's/-vanilla//') -$(ISOLINUX_CFG): - @echo "==> iso: configure isolinux" - @mkdir -p $(dir $(ISOLINUX_BIN)) - @echo "$(SYSLINUX_SERIAL)" >$@ - @echo "timeout $(SYSLINUX_TIMEOUT)" >>$@ - @echo "prompt $(SYSLINUX_PROMPT)" >>$@ -ifeq ($(PROFILE), alpine-xen) - @echo "default xen-$(KERNEL_FLAVOR_DEFAULT)" >>$@ - @for flavor in $(KERNEL_FLAVOR); do \ - echo "label xen-$$flavor"; \ - echo " kernel /$(ISOLINUX_DIR)/mboot.c32"; \ - echo " append /boot/xen.gz $(XEN_PARAMS) --- /boot/$(call VMLINUZ_NAME,$$flavor) modloop=/boot/modloop-$$flavor modules=loop,squashfs,sd-mod,usb-storage,sr-mod $(BOOT_OPTS) --- /boot/initramfs-$$flavor"; \ - done >>$@ -else - @echo "default $(KERNEL_FLAVOR_DEFAULT)" >>$@ - @for flavor in $(KERNEL_FLAVOR); do \ - echo "label $$flavor"; \ - echo " kernel /boot/$(call VMLINUZ_NAME,$$flavor)";\ - echo " append initrd=/boot/initramfs-$$flavor modloop=/boot/modloop-$$flavor modules=loop,squashfs,sd-mod,usb-storage,sr-mod quiet $(BOOT_OPTS)"; \ - done >>$@ -endif - $(SYSLINUX_CFG): $(ALL_MODLOOP_DIRSTAMP) @echo "==> iso: configure syslinux" @echo "$(SYSLINUX_SERIAL)" >$@ @@ -284,7 +261,7 @@ else endif clean-syslinux: - @rm -f $(SYSLINUX_CFG) $(ISOLINUX_CFG) $(ISOLINUX_BIN) + @rm -f $(SYSLINUX_CFG) $(ISOLINUX_BIN) ISO_KERNEL_STAMP := $(DESTDIR)/stamp.kernel.% ISO_KERNEL = $(ISO_DIR)/boot/$* @@ -339,7 +316,7 @@ $(APKOVL_STAMP): fi @touch $@ -$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISO_REPOS_DIRSTAMP) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISOLINUX_C32) $(ALL_ISO_KERNEL) $(APKOVL_STAMP) $(SYSLINUX_CFG) $(APKOVL_DEST) +$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISO_REPOS_DIRSTAMP) $(ISOLINUX_BIN) $(ISOLINUX_C32) $(ALL_ISO_KERNEL) $(APKOVL_STAMP) $(SYSLINUX_CFG) $(APKOVL_DEST) @echo "$(ALPINE_NAME)-$(ALPINE_RELEASE) $(BUILD_DATE)" \ > $(ISO_DIR)/.alpine-release @touch $@ |