aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-11 09:04:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-11 09:04:57 +0000
commit8cfb0b853ce25aeb4bcd9bd685f334bb56eabc63 (patch)
tree45771482c7b7f549789ef41f82d994b6f1c6ebcd
parent4fc8419f46c543ae18bda240350d17f83f5bc936 (diff)
downloadalpine-iso-8cfb0b853ce25aeb4bcd9bd685f334bb56eabc63.tar.bz2
alpine-iso-8cfb0b853ce25aeb4bcd9bd685f334bb56eabc63.tar.xz
support for syslinux-5
-rwxr-xr-xMakefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bb19383..e4cc584 100755
--- a/Makefile
+++ b/Makefile
@@ -253,10 +253,20 @@ $(ISO_DIR)/xen.apkovl.tar.gz:
ISOLINUX_DIR := boot/isolinux
ISOLINUX := $(ISO_DIR)/$(ISOLINUX_DIR)
ISOLINUX_BIN := $(ISOLINUX)/isolinux.bin
+ISOLINUX_C32 := $(ISOLINUX)/ldlinux.c32 $(ISOLINUX)/libutil.c32
ISOLINUX_CFG := $(ISOLINUX)/isolinux.cfg
SYSLINUX_CFG := $(ISO_DIR)/syslinux.cfg
SYSLINUX_SERIAL ?=
+
+
+$(ISOLINUX_C32):
+ @echo "==> iso: install $(notdir $@)"
+ @mkdir -p $(dir $@)
+ @if ! apk fetch $(APK_REPO) --stdout syslinux | $(TAR) -O -zx usr/share/syslinux/$(notdir $@) > $@; then \
+ rm -f $@ && exit 1;\
+ fi
+
$(ISOLINUX_BIN):
@echo "==> iso: install isolinux"
@mkdir -p $(dir $(ISOLINUX_BIN))
@@ -352,7 +362,7 @@ $(APKOVL_STAMP):
fi
@touch $@
-$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTAMP) $(APKOVL_STAMP) $(SYSLINUX_CFG) $(APKOVL_DEST)
+$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISOLINUX_C32) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTAMP) $(APKOVL_STAMP) $(SYSLINUX_CFG) $(APKOVL_DEST)
@echo "$(ALPINE_NAME)-$(ALPINE_RELEASE) $(BUILD_DATE)" \
> $(ISO_DIR)/.alpine-release
@touch $@