aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-09 09:34:11 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-09 09:34:11 +0000
commit9963f8c4ba885210f4f30c4d7e0fc210dc40b813 (patch)
tree4f8fa0990c0b50ca6f8a7f4627932df3fac99da5
parentff9eca15506b6b31d2a18768332d053868aa2c14 (diff)
downloadalpine-iso-9963f8c4ba885210f4f30c4d7e0fc210dc40b813.tar.bz2
alpine-iso-9963f8c4ba885210f4f30c4d7e0fc210dc40b813.tar.xz
include dahdi-linux firmware in modloop. combine build targets
-rwxr-xr-xMakefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 16b94a8..7fa36b2 100755
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ MODLOOP_DIR = $(DESTDIR)/modloop.$*
MODLOOP_KERNELSTAMP := $(DESTDIR)/stamp.modloop.kernel.%
MODLOOP_DIRSTAMP := $(DESTDIR)/stamp.modloop.%
MODLOOP_EXTRA ?= $(addsuffix -$*, dahdi-linux xtables-addons)
-MODLOOP_FIRMWARE ?= linux-firmware
+MODLOOP_FIRMWARE ?= linux-firmware dahdi-linux
MODLOOP_PKGS = $(KERNEL_PKGNAME) $(MODLOOP_EXTRA) $(MODLOOP_FIRMWARE)
modloop-%: $(MODLOOP)
@@ -403,13 +403,7 @@ all-release: current previous $(addsuffix .conf.mk, $(profiles))
PROFILE=$$i release || break; \
done
-edge: current
- @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-edge sha1
-
-vserver: current
- @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-vserver sha1
-
-desktop: current
- @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-desktop sha1
+edge vserver desktop mini: current
+ @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-$@ sha1
.PRECIOUS: $(MODLOOP_KERNELSTAMP) $(MODLOOP_DIRSTAMP) $(INITFS_DIRSTAMP) $(INITFS) $(ISO_KERNEL_STAMP)