diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-12 22:55:22 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-13 00:24:28 +0200 |
| commit | 4cf310642588e599e37050ade4da7902f866758a (patch) | |
| tree | c0768334c9d70a9e642bfc971a73d07e4a986d7a /rules/xorg-app-xdm.make | |
| parent | fcc167b8ad50a3478f412900691d4c71345e0caf (diff) | |
| download | ptxdist-4cf310642588e599e37050ade4da7902f866758a.tar.gz ptxdist-4cf310642588e599e37050ade4da7902f866758a.tar.xz | |
xorg-app-xdm: version bump 1.1.10 -> 1.1.11
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-app-xdm.make')
| -rw-r--r-- | rules/xorg-app-xdm.make | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make index 64f23f4ef..05bf40912 100644 --- a/rules/xorg-app-xdm.make +++ b/rules/xorg-app-xdm.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XORG_APP_XDM) += xorg-app-xdm # # Paths and names # -XORG_APP_XDM_VERSION := 1.1.10 -XORG_APP_XDM_MD5 := 329383040cdbda5b5c8ce6c7e1120c97 +XORG_APP_XDM_VERSION := 1.1.11 +XORG_APP_XDM_MD5 := 64a1af1f7eb69feae12e75d4cc3aaf19 XORG_APP_XDM := xdm-$(XORG_APP_XDM_VERSION) XORG_APP_XDM_SUFFIX := tar.bz2 XORG_APP_XDM_URL := $(call ptx/mirror, XORG, individual/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)) @@ -25,42 +25,30 @@ XORG_APP_XDM_SOURCE := $(SRCDIR)/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX) XORG_APP_XDM_DIR := $(BUILDDIR)/$(XORG_APP_XDM) # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(XORG_APP_XDM_SOURCE): - @$(call targetinfo) - @$(call get, XORG_APP_XDM) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -XORG_APP_XDM_PATH := PATH=$(CROSS_PATH) -XORG_APP_XDM_ENV := $(CROSS_ENV) XORG_APP_XDM_BINCONFIG_GLOB := "" # # autoconf # -XORG_APP_XDM_AUTOCONF := \ +XORG_APP_XDM_CONF_TOOL := autoconf +XORG_APP_XDM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(XORG_OPTIONS_TRANS) \ + --$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_SECURE_RPC)-secure-rpc \ --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) \ + --enable-xpm-logos \ + --disable-xdmshell \ + --disable-xdm-auth \ + --without-pam \ + --without-selinux \ + --with-systemdsystemunitdir=/lib/systemd/system \ --with-random-device=$(XORG_APP_XDM_DEV_RANDOM) \ --with-utmp-file=/var/run/utmp \ --with-wtmp-file=/var/log/wtmp -ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC -XORG_APP_XDM_AUTOCONF += --enable-secure-rpc -else -XORG_APP_XDM_AUTOCONF += --disable-secure-rpc -endif - -XORG_APP_XDM_AUTOCONF += --enable-xpm-logos # Display xpm logos in greeter -XORG_APP_XDM_AUTOCONF += --enable-dynamic-greeter # Build greeter as dynamically loaded shared object -XORG_APP_XDM_AUTOCONF += --without-pam # FXIME - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -76,6 +64,13 @@ $(STATEDIR)/xorg-app-xdm.targetinstall: @$(call install_copy, xorg-app-xdm, 0, 0, 0755, -, /usr/bin/xdm) +ifdef PTXCONF_XORG_APP_XDM_SYSTEMD_UNIT + @$(call install_alternative, xorg-app-xdm, 0, 0, 0644, \ + /lib/systemd/system/xdm.service) + @$(call install_link, xorg-app-xdm, ../xmd.service, \ + /lib/systemd/system/graphical.target.wants/xdm.service) +endif + @$(call install_finish, xorg-app-xdm) @$(call touch) |