mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 13:00:02 +00:00
gdm: upgrade 3.36.3 -> 41.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,48 +0,0 @@
|
|||||||
From f7bba53adf8a26f900442a05bb98326747c392b4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Tue, 3 Dec 2019 00:24:27 +0100
|
|
||||||
Subject: [PATCH] Ensure pam-file installation
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
All the detection magic does not work for us
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [OE-specific]
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
data/Makefile.am | 12 +-----------
|
|
||||||
1 file changed, 1 insertion(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
|
||||||
index bda9160..dbc3ea3 100644
|
|
||||||
--- a/data/Makefile.am
|
|
||||||
+++ b/data/Makefile.am
|
|
||||||
@@ -296,22 +296,12 @@ endif
|
|
||||||
chown root:root $(DESTDIR)$(logdir) || : ; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
- system=`uname`; \
|
|
||||||
- if test -f /usr/include/security/pam_appl.h; then \
|
|
||||||
- if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \
|
|
||||||
chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \
|
|
||||||
- fi; \
|
|
||||||
- if test $$system = Linux; then \
|
|
||||||
for pamfile in $(pam_files); do \
|
|
||||||
bn=$$(basename $$pamfile .pam); \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$pamfile $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; \
|
|
||||||
- done; \
|
|
||||||
- fi; \
|
|
||||||
- if test $$system = SunOS; then \
|
|
||||||
- echo "Please add PAM authentication for gdm, gdm-autologin and gdm-welcome in $(PAM_PREFIX)/pam.conf!"; \
|
|
||||||
- fi; \
|
|
||||||
- fi
|
|
||||||
+ done;
|
|
||||||
|
|
||||||
if test '!' -d $(DESTDIR)$(xauthdir); then \
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(xauthdir); \
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
||||||
+13
-8
@@ -12,15 +12,20 @@ DEPENDS = " \
|
|||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit"
|
REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit"
|
||||||
|
|
||||||
inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check
|
GNOMEBASEBUILDCLASS = "meson"
|
||||||
|
|
||||||
SRC_URI[archive.sha256sum] = "3bfbb620cbc0d1cbd70b4c4376cf4b705db4dc36a37124e5be386ccc25fa7e81"
|
inherit gnomebase gsettings gobject-introspection gettext systemd useradd itstool gnome-help features_check
|
||||||
SRC_URI += "file://0001-Ensure-pam-file-installation.patch"
|
|
||||||
|
|
||||||
EXTRA_OECONF = " \
|
SRC_URI[archive.sha256sum] = "5738c4293a9f5a80d4a6e9e06f4d0df3e9f313ca7b61bfb4d8afaba983e200dc"
|
||||||
--without-plymouth \
|
|
||||||
--with-default-pam-config=openembedded \
|
# gobject-introspection is mandatory and cannot be configured
|
||||||
--with-pam-mod-dir=${base_libdir}/security \
|
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
|
||||||
|
UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
|
||||||
|
|
||||||
|
EXTRA_OEMESON = " \
|
||||||
|
-Dplymouth=disabled \
|
||||||
|
-Ddefault-pam-config=openembedded \
|
||||||
|
-Dpam-mod-dir=${base_libdir}/security \
|
||||||
"
|
"
|
||||||
|
|
||||||
do_install:append() {
|
do_install:append() {
|
||||||
@@ -48,7 +53,7 @@ FILES:${PN} += " \
|
|||||||
${datadir}/dconf \
|
${datadir}/dconf \
|
||||||
${base_libdir}/security/pam_gdm.so \
|
${base_libdir}/security/pam_gdm.so \
|
||||||
${localstatedir} \
|
${localstatedir} \
|
||||||
${systemd_unitdir} \
|
${systemd_unitdir} ${systemd_user_unitdir} \
|
||||||
"
|
"
|
||||||
|
|
||||||
RDEPENDS:${PN} += "${PN}-base"
|
RDEPENDS:${PN} += "${PN}-base"
|
||||||
Reference in New Issue
Block a user