Commit 874e4379 authored by Natanael Copa's avatar Natanael Copa build the isofs only by default

use 'make iso' to build the iso image.

This is because we might want to build for usb
parent cbb9ee82
......@@ -54,12 +54,13 @@ ACCT_APK := $(call find_apk,acct)
#$(error I did not find all APKs which I need.)
all: $(ISO)
all: isofs
@echo "Alpine ISO builder"
@echo "Type 'make' to build $(ISO)"
@echo "Type 'make iso' to build $(ISO)"
@echo "I will use the following sources files:"
@echo " 1. $(notdir $(KERNEL_APK)) (looks like $(KERNEL))"
......@@ -136,7 +137,7 @@ INITFS_MODDIRSTAMP := $(DESTDIR)/stamp.initfs.modules
INITFS_RAWBASEFILES := etc/mdev.conf etc/passwd etc/group etc/fstab \
etc/modules etc/modprobe.d/blacklist
etc/modules etc/modprobe.d/blacklist lib/mdev
initfs: $(INITFS)
......@@ -255,6 +256,7 @@ ISO_PKGDIR := $(ISO_DIR)/packages
ISO_REPOS := $(addprefix $(ISO_PKGDIR)/,$(REPOS))
ISO_APKINDEX := $(addsuffix /APK_INDEX.gz,$(ISO_REPOS))
ISO_REPOS_DIRSTAMP := $(DESTDIR)/stamp.isorepos
ISOFS_DIRSTAMP := $(DESTDIR)/stamp.isofs
$(ISO_REPOS_DIRSTAMP): $(addsuffix /APK_INDEX.gz,$(addprefix $(REPOS_DIR)/,$(REPOS)))
@echo "==> iso: prepare repositories $(REPOS)"
......@@ -278,7 +280,10 @@ $(ISO_KERNEL): $(KERNEL_APK)
@rm -f $(ISO_DIR)/.[A-Z]*
@touch $(ISO_KERNEL)
@touch $@
@echo "==> iso: building $(notdir $(ISO))"
> $(ISO_DIR)/.alpine-release
......@@ -292,4 +297,5 @@ $(ISO): $(MODLOOP) $(INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISO_KERNEL) $(ISO
@ln -fs $@ $(ISO_LINK)
iso: $(ISO)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment