mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
lxdm: drop debug-tweaks
Remove deprecated DISTRO_TYPE as the debug-tweaks IMAGE_FEATURE has been removed in oe-core. Use allow-root-login, empty-root-password and allow-empty-password instead. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
18759cae81
commit
9c8bdaea06
@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \
|
||||
file://lxdm.conf \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
|
||||
${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
|
||||
${@bb.utils.contains("IMAGE_FEATURES", "allow-root-login", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
|
||||
file://0002-let-autotools-create-lxdm.conf.patch \
|
||||
file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \
|
||||
file://0004-fix-css-under-gtk-3.20.patch \
|
||||
@ -29,9 +29,6 @@ DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3
|
||||
DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
|
||||
DEPENDS:append:libc-musl = " libexecinfo"
|
||||
|
||||
# combine oe-core way with angstrom DISTRO_TYPE
|
||||
DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
|
||||
|
||||
inherit autotools pkgconfig gettext systemd features_check
|
||||
# depends on virtual/libx11
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
@ -65,7 +62,8 @@ do_install:append() {
|
||||
# ArchLinux version of pam config has the following advantages:
|
||||
# * simple setup of passwordless login
|
||||
# * in XFCE powerdown/restart enabled in logoff dialog
|
||||
install -m 644 ${UNPACKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm
|
||||
install -m 644 ${UNPACKDIR}/${@bb.utils.contains_any("IMAGE_FEATURES", [ "allow-empty-password", "empty-root-password" ], "lxdm-pam-debug", "lxdm-pam",d)} \
|
||||
${D}${sysconfdir}/pam.d/lxdm
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user