summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-03-27 15:23:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-03-27 15:23:37 +0000
commit1e3647e71094d59eb05d74641db9cf06e30b77aa (patch)
tree9e54be03519468abe99e7880d5bccdc91270da46
parent050a8b048fa6768c128b84d7273a5dae41fcedb9 (diff)
alpine.mk: iso load usb-storage, sha1 target
-rwxr-xr-xalpine.mk16
1 files changed, 14 insertions, 2 deletions
diff --git a/alpine.mk b/alpine.mk
index 83adb038ffa..bbc024779bb 100755
--- a/alpine.mk
+++ b/alpine.mk
@@ -240,7 +240,7 @@ $(ISOLINUX_CFG):
@echo "default $(KERNEL_NAME)" >>$(ISOLINUX_CFG)
@echo "label $(KERNEL_NAME)" >>$(ISOLINUX_CFG)
@echo " kernel /boot/$(KERNEL_NAME)" >>$(ISOLINUX_CFG)
- @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=cdrom:iso9660 modules=floppy quiet" >>$(ISOLINUX_CFG)
+ @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=cdrom:iso9660 modules=sd-mod,usb-storage,floppy quiet" >>$(ISOLINUX_CFG)
$(SYSLINUX_CFG):
@echo "==> iso: configure syslinux"
@@ -249,7 +249,7 @@ $(SYSLINUX_CFG):
@echo "default $(KERNEL_NAME)" >>$@
@echo "label $(KERNEL_NAME)" >>$@
@echo " kernel /boot/$(KERNEL_NAME)" >>$@
- @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=sda1:vfat modules=usb-storage,sd-mod quiet" >>$@
+ @echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=sda1:vfat modules=sd-mod,usb-storage quiet" >>$@
ISO_KERNEL := $(ISO_DIR)/boot/$(KERNEL_NAME)
ISO_PKGDIR := $(ISO_DIR)/packages
@@ -294,8 +294,20 @@ $(ISO): $(ISOFS_DIRSTAMP)
-boot-load-size 4 \
-boot-info-table \
-quiet \
+ $(ISO_OPTS) \
$(ISO_DIR)
@ln -fs $@ $(ISO_LINK)
isofs: $(ISOFS_DIRSTAMP)
iso: $(ISO)
+
+#
+# SHA1 sum of ISO
+#
+SHA1 := $(ISO).sha1
+
+$(SHA1): $(ISO)
+ @echo "==> Generating sha1 sum"
+ @sha1sum $(ISO) > $@ || rm -f $@
+
+sha1: $(SHA1)