diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-12-09 09:35:54 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-12-10 16:21:07 -0800 |
commit | 88cb338ca92ce3cab21f43d910fa5934a8e50581 (patch) | |
tree | 01c0b7213ad3de264edab4c59f39da0a1f57b25a | |
parent | 05d876b8f40b4d86792851788c454109de8d8e9d (diff) | |
download | meta-openembedded-88cb338ca92ce3cab21f43d910fa5934a8e50581.tar.gz |
gdm: re-add 3.34.1
GDM is a mandatory component for all types of gnome sessions. To give users the
choice to build images with gnome-session using different display-manager
without changing systemd service configuration,, mandatory parts were split
into gdm-base package.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch | 48 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb | 56 |
2 files changed, 104 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch new file mode 100644 index 0000000000..6362d5ee6a --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From f7bba53adf8a26f900442a05bb98326747c392b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Tue, 3 Dec 2019 00:24:27 +0100 | ||
4 | Subject: [PATCH] Ensure pam-file installation | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | All the detection magic does not work for us | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE-specific] | ||
12 | |||
13 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
14 | --- | ||
15 | data/Makefile.am | 12 +----------- | ||
16 | 1 file changed, 1 insertion(+), 11 deletions(-) | ||
17 | |||
18 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
19 | index bda9160..dbc3ea3 100644 | ||
20 | --- a/data/Makefile.am | ||
21 | +++ b/data/Makefile.am | ||
22 | @@ -296,22 +296,12 @@ endif | ||
23 | chown root:root $(DESTDIR)$(logdir) || : ; \ | ||
24 | fi | ||
25 | |||
26 | - system=`uname`; \ | ||
27 | - if test -f /usr/include/security/pam_appl.h; then \ | ||
28 | - if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ | ||
29 | $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ | ||
30 | chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ | ||
31 | - fi; \ | ||
32 | - if test $$system = Linux; then \ | ||
33 | for pamfile in $(pam_files); do \ | ||
34 | bn=$$(basename $$pamfile .pam); \ | ||
35 | $(INSTALL_DATA) $(srcdir)/$$pamfile $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; \ | ||
36 | - done; \ | ||
37 | - fi; \ | ||
38 | - if test $$system = SunOS; then \ | ||
39 | - echo "Please add PAM authentication for gdm, gdm-autologin and gdm-welcome in $(PAM_PREFIX)/pam.conf!"; \ | ||
40 | - fi; \ | ||
41 | - fi | ||
42 | + done; | ||
43 | |||
44 | if test '!' -d $(DESTDIR)$(xauthdir); then \ | ||
45 | $(mkinstalldirs) $(DESTDIR)$(xauthdir); \ | ||
46 | -- | ||
47 | 2.21.0 | ||
48 | |||
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb new file mode 100644 index 0000000000..a47bf6fcf8 --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb | |||
@@ -0,0 +1,56 @@ | |||
1 | SUMMARY = "GNOME Display Manager" | ||
2 | LICENSE="GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
4 | |||
5 | DEPENDS = " \ | ||
6 | dconf-native \ | ||
7 | gtk+3 \ | ||
8 | accountsservice \ | ||
9 | libcanberra \ | ||
10 | libpam \ | ||
11 | " | ||
12 | |||
13 | REQUIRED_DISTRO_FEATURES = "x11 systemd pam" | ||
14 | |||
15 | inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check | ||
16 | |||
17 | SRC_URI[archive.md5sum] = "65d1fd4bb85e8b133d1cbffb80ecf62e" | ||
18 | SRC_URI[archive.sha256sum] = "e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3" | ||
19 | SRC_URI += "file://0001-Ensure-pam-file-installation.patch" | ||
20 | |||
21 | EXTRA_OECONF = " \ | ||
22 | --without-plymouth \ | ||
23 | --with-default-pam-config=openembedded \ | ||
24 | --with-pam-mod-dir=${base_libdir}/security \ | ||
25 | " | ||
26 | |||
27 | do_install_append() { | ||
28 | rm -rf ${D}/run ${D}${localstatedir}/run | ||
29 | } | ||
30 | |||
31 | USERADD_PACKAGES = "${PN}" | ||
32 | USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" | ||
33 | |||
34 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" | ||
35 | |||
36 | # Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm | ||
37 | # components. To allow gnome-images using different display-manager, split them | ||
38 | # out into a seperate package. | ||
39 | PACKAGE_BEFORE_PN = "${PN}-base" | ||
40 | FILES_${PN}-base = " \ | ||
41 | ${datadir}/glib-2.0 \ | ||
42 | ${datadir}/gnome-session \ | ||
43 | ${libdir}/lib*${SOLIBS} \ | ||
44 | ${libdir}/girepository-1.0 \ | ||
45 | " | ||
46 | |||
47 | CONFFILES_${PN} += "${sysconfdir}/gdm/custom.conf" | ||
48 | FILES_${PN} += " \ | ||
49 | ${datadir}/dconf \ | ||
50 | ${base_libdir}/security/pam_gdm.so \ | ||
51 | ${localstatedir} \ | ||
52 | ${systemd_unitdir} \ | ||
53 | " | ||
54 | |||
55 | RDEPENDS_${PN} += "${PN}-base" | ||
56 | |||