diff options
Diffstat (limited to 'Makefile')
| -rwxr-xr-x | Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -227,7 +227,7 @@ $(ISOLINUX_CFG): @for flavor in $(KERNEL_FLAVOR); do \ echo "label $$flavor"; \ echo " kernel /boot/$$flavor"; \ - echo " append initrd=/boot/$$flavor.gz alpine_dev=cdrom:iso9660 modules=loop,cramfs,sd-mod,usb-storage,floppy quiet"; \ + echo " append initrd=/boot/$$flavor.gz alpine_dev=cdrom:iso9660 modules=loop,cramfs,sd-mod,usb-storage,floppy,sr-mod quiet"; \ done >>$@ $(SYSLINUX_CFG): $(ALL_MODLOOP_DIRSTAMP) @@ -367,7 +367,7 @@ sha1: $(ISO_SHA1) release: $(ISO_SHA1) $(xdelta) $(pkgdiff) -profiles := $(wildcard *.conf.mk) +profiles ?= $(alpine alpine-mini alpine-vserver) current := $(shell cat current) all-release: current previous $(profiles) @@ -376,12 +376,16 @@ all-release: current previous $(profiles) @echo "*" @echo @for i in $(profiles); do\ - p=$${i%.conf.mk}; \ echo "*";\ - echo "* Release $$p $(current)"; \ + echo "* Release $$i $(current)"; \ echo "*"; \ fakeroot $(MAKE) ALPINE_RELEASE=$(current) \ - PROFILE=$$p release || break; \ + PROFILE=$$i release || break; \ done +<<<<<<< HEAD +edge: + @fakeroot $(MAKE) PROFILE=alpine-edge sha1 +======= .PRECIOUS: $(MODLOOP_KERNELSTAMP) $(MODLOOP_DIRSTAMP) $(INITFS_DIRSTAMP) $(INITFS) $(ISO_KERNEL_STAMP) +>>>>>>> sdrik/master |