From b8c6f17e24621c2f70278802317f42d893af0c28 Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Wed, 5 Dec 2018 17:09:59 -0800 Subject: [PATCH] appliances/x: cleanups --- appliances/x/Makefile | 10 +++++++--- appliances/x/make.conf | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/appliances/x/Makefile b/appliances/x/Makefile index b47e0bc..16feb76 100644 --- a/appliances/x/Makefile +++ b/appliances/x/Makefile @@ -1,9 +1,13 @@ -xdm_files = $(wildcard xdm/*) +xdm_files := $(wildcard xdm/*) +xdm_targets := $(patsubst %,$(CHROOT)/etc/X11/%,$(xdm_files)) + + +$(CHROOT)/etc/X11/xdm/%: xdm/% + cp $< $@ preinstall: -postinstall: $(xdm_files) - COPY xdm/* /etc/X11/xdm +postinstall: $(xdm_targets) RUN systemctl enable xdm clean: diff --git a/appliances/x/make.conf b/appliances/x/make.conf index e54273e..2d16fbc 100644 --- a/appliances/x/make.conf +++ b/appliances/x/make.conf @@ -2,3 +2,4 @@ PYTHON_TARGETS="python3_6" PYTHON_SINGLE_TARGET="python3_6" VIDEO_CARDS="" INPUT_DEVICES="" +INSTALL_MASK="$INSTALL_MASK /etc/X11/xdm/Xaccess /etc/X11/xdm/xdm-config /etc/X11/xdm/Xservers"