summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xMakefile18
-rw-r--r--alpine-desktop.conf.mk4
-rw-r--r--alpine-desktop.packages4
3 files changed, 23 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 8135bc9..650743d 100755
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ PROFILE ?= alpine
BUILD_DATE := $(shell date +%y%m%d)
ALPINE_RELEASE ?= $(BUILD_DATE)
ALPINE_NAME ?= alpine-test
-ALPINE_ARCH := x86
+ALPINE_ARCH := $(shell uname -m)
DESTDIR ?= $(shell pwd)/isotmp.$(PROFILE)
MKCRAMFS = mkcramfs
@@ -72,6 +72,7 @@ endif
@echo "ALPINE_RELEASE: $(ALPINE_RELEASE)"
@echo "KERNEL_FLAVOR: $(KERNEL_FLAVOR)"
@echo "KERNEL: $(KERNEL)"
+ @echo "APKOVL: $(APKOVL)"
@echo
clean: clean-modloop clean-initfs
@@ -265,7 +266,15 @@ $(ISO_KERNEL_STAMP): $(MODLOOP_DIRSTAMP)
ALL_ISO_KERNEL = $(foreach flavor,$(KERNEL_FLAVOR),$(subst %,$(flavor),$(ISO_KERNEL_STAMP)))
-$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTAMP) $(SYSLINUX_CFG)
+APKOVL_STAMP = $(DESTDIR)/stamp.isofs.apkovl
+
+$(APKOVL_STAMP):
+ @if [ "x$(APKOVL)" != "x" ]; then \
+ (cd $(ISO_DIR); wget $(APKOVL)); \
+ fi
+ @touch $@
+
+$(ISOFS_DIRSTAMP): $(ALL_MODLOOP) $(ALL_INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ALL_ISO_KERNEL) $(ISO_REPOS_DIRSTAMP) $(APKOVL_STAMP) $(SYSLINUX_CFG)
@echo "$(ALPINE_NAME)-$(ALPINE_RELEASE) $(BUILD_DATE)" \
> $(ISO_DIR)/.alpine-release
@touch $@
@@ -354,7 +363,7 @@ sha1: $(ISO_SHA1)
release: $(ISO_SHA1) $(xdelta) $(pkgdiff)
-profiles ?= alpine alpine-mini alpine-vserver
+profiles ?= alpine alpine-mini alpine-vserver alpine-desktop
current = $(shell cat current 2>/dev/null)
current:
@@ -380,4 +389,7 @@ edge: current
vserver:
@fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-vserver sha1
+desktop: current
+ @fakeroot $(MAKE) ALPINE_RELEASE=$(current) PROFILE=alpine-desktop sha1
+
.PRECIOUS: $(MODLOOP_KERNELSTAMP) $(MODLOOP_DIRSTAMP) $(INITFS_DIRSTAMP) $(INITFS) $(ISO_KERNEL_STAMP)
diff --git a/alpine-desktop.conf.mk b/alpine-desktop.conf.mk
new file mode 100644
index 0000000..608e677
--- /dev/null
+++ b/alpine-desktop.conf.mk
@@ -0,0 +1,4 @@
+ALPINE_NAME := alpine-desktop
+MODLOOP_EXTRA :=
+KERNEL_FLAVOR := grsec
+APKOVL := http://dev.alpinelinux.org/~jbilyk/xfce.apkovl.tar.gz
diff --git a/alpine-desktop.packages b/alpine-desktop.packages
new file mode 100644
index 0000000..9cbc402
--- /dev/null
+++ b/alpine-desktop.packages
@@ -0,0 +1,4 @@
+alpine-base
+alpine-desktop
+slim
+xf86-input-evdev