gdm: fix build without the pam option.
conditionalize PLIST for pam stuff. While here, also use vt05 on aarch64 (which is where I am trying this).
This commit is contained in:
parent
f8441dc786
commit
d4797d0c26
|
@ -95,7 +95,8 @@ GDMGRP= daemon
|
||||||
# will receive key presses. And on slow machines, X will have lost access
|
# will receive key presses. And on slow machines, X will have lost access
|
||||||
# to the keyboard.
|
# to the keyboard.
|
||||||
.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
|
.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
|
||||||
(${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
|
(${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
|
||||||
|
${MACHINE_ARCH} == "aarch64")
|
||||||
CONFIGURE_ARGS+= X_SERVER_ARGS="vt05"
|
CONFIGURE_ARGS+= X_SERVER_ARGS="vt05"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
|
12
gdm/PLIST
12
gdm/PLIST
|
@ -23,12 +23,12 @@ share/examples/gdm/PostSession/Default
|
||||||
share/examples/gdm/PreSession/Default
|
share/examples/gdm/PreSession/Default
|
||||||
share/examples/gdm/Xsession
|
share/examples/gdm/Xsession
|
||||||
share/examples/gdm/custom.conf
|
share/examples/gdm/custom.conf
|
||||||
share/examples/gdm/pam.d/gdm-autologin
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-autologin
|
||||||
share/examples/gdm/pam.d/gdm-fingerprint
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-fingerprint
|
||||||
share/examples/gdm/pam.d/gdm-launch-environment
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-launch-environment
|
||||||
share/examples/gdm/pam.d/gdm-password
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-password
|
||||||
share/examples/gdm/pam.d/gdm-pin
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-pin
|
||||||
share/examples/gdm/pam.d/gdm-smartcard
|
${PLIST.pam}share/examples/gdm/pam.d/gdm-smartcard
|
||||||
share/examples/pam.d/gdm-launch-environment
|
share/examples/pam.d/gdm-launch-environment
|
||||||
share/gdm/BuiltInSessions/custom.desktop
|
share/gdm/BuiltInSessions/custom.desktop
|
||||||
share/gdm/gdb-cmd
|
share/gdm/gdb-cmd
|
||||||
|
|
|
@ -21,9 +21,12 @@ CONFIGURE_ARGS+= --with-console-kit=yes
|
||||||
CONFIGURE_ARGS+= --with-console-kit=no
|
CONFIGURE_ARGS+= --with-console-kit=no
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
PLIST_VARS+= pam
|
||||||
|
|
||||||
.if !empty(PKG_OPTIONS:Mpam)
|
.if !empty(PKG_OPTIONS:Mpam)
|
||||||
. include "../../mk/pam.buildlink3.mk"
|
. include "../../mk/pam.buildlink3.mk"
|
||||||
CONFIGURE_ARGS+= --enable-authentication-scheme=pam
|
CONFIGURE_ARGS+= --enable-authentication-scheme=pam
|
||||||
|
PLIST.pam= yes
|
||||||
.elif exists(/etc/shadow)
|
.elif exists(/etc/shadow)
|
||||||
CONFIGURE_ARGS+= --enable-authentication-scheme=shadow
|
CONFIGURE_ARGS+= --enable-authentication-scheme=shadow
|
||||||
.else
|
.else
|
||||||
|
|
Loading…
Reference in New Issue