* [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-04-27 18:33 [meta-gnome/meta-xfce 0/4] gdm/xfce-enhancements Andreas Müller
@ 2013-04-27 18:33 ` Andreas Müller
2013-04-27 19:31 ` Martin Jansa
2013-04-27 18:33 ` [meta-gnome/meta-xfce 2/4] gdm: avoid displaying system users in greeter's list Andreas Müller
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2013-04-27 18:33 UTC (permalink / raw)
To: openembedded-devel
Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
causes postinst not to finish at first boot (gdm.service is not aliased to
display-manager.service -> started much too early) and is not neccesary:
language preparation can be done offline.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 31 ++++++++++-----------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 1e55dd9..87efc28 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
-PR = "r15"
+PR = "r16"
-inherit gnome update-rc.d systemd
+inherit gnome update-rc.d systemd useradd
SRC_URI += " \
file://cross-xdetection.diff \
@@ -33,8 +33,8 @@ do_configure_prepend() {
}
do_install_prepend() {
- mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
- cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
+ install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory
+ install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/
}
do_install_append() {
@@ -54,6 +54,9 @@ do_install_append() {
sed -e 's,%sbindir%,${sbindir},g' \
< ${WORKDIR}/gdm.service.in \
> ${D}${systemd_unitdir}/system/gdm.service
+
+ chown -R gdm:gdm ${D}${localstatedir}/lib/gdm
+ chmod 0750 ${D}${localstatedir}/lib/gdm
}
FILES_${PN} += "${datadir}/icon* \
@@ -72,23 +75,13 @@ SYSTEMD_SERVICE_${PN} = "gdm.service"
INITSCRIPT_NAME = "gdm"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
-pkg_postinst_${PN} () {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
- grep "^gdm:" /etc/group > /dev/null || addgroup gdm
- grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
-
-if [ -d /var/lib/gdm ]; then
- chown -R gdm:gdm /var/lib/gdm
- chmod 0750 /var/lib/gdm
-fi
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
+pkg_postinst_${PN} () {
# Register up as default dm
-mkdir -p ${sysconfdir}/X11/
-echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
-
+mkdir -p $D${sysconfdir}/X11/
+echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
}
pkg_postrm_${PN} () {
--
1.7.4.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-04-27 18:33 ` [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues Andreas Müller
@ 2013-04-27 19:31 ` Martin Jansa
2013-04-29 7:33 ` Andreas Müller
0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2013-04-27 19:31 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3498 bytes --]
On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
> causes postinst not to finish at first boot (gdm.service is not aliased to
> display-manager.service -> started much too early) and is not neccesary:
> language preparation can be done offline.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 31 ++++++++++-----------------
> 1 files changed, 12 insertions(+), 19 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> index 1e55dd9..87efc28 100644
> --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>
> DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
>
> -PR = "r15"
> +PR = "r16"
>
> -inherit gnome update-rc.d systemd
> +inherit gnome update-rc.d systemd useradd
>
> SRC_URI += " \
> file://cross-xdetection.diff \
> @@ -33,8 +33,8 @@ do_configure_prepend() {
> }
>
> do_install_prepend() {
> - mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
> - cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
> + install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory
> + install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/
> }
>
> do_install_append() {
> @@ -54,6 +54,9 @@ do_install_append() {
> sed -e 's,%sbindir%,${sbindir},g' \
> < ${WORKDIR}/gdm.service.in \
> > ${D}${systemd_unitdir}/system/gdm.service
> +
> + chown -R gdm:gdm ${D}${localstatedir}/lib/gdm
> + chmod 0750 ${D}${localstatedir}/lib/gdm
> }
>
> FILES_${PN} += "${datadir}/icon* \
> @@ -72,23 +75,13 @@ SYSTEMD_SERVICE_${PN} = "gdm.service"
> INITSCRIPT_NAME = "gdm"
> INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
>
> -pkg_postinst_${PN} () {
> - # can't do this offline
> - if [ "x$D" != "x" ]; then
> - exit 1
> - fi
> - grep "^gdm:" /etc/group > /dev/null || addgroup gdm
> - grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
> -
> -if [ -d /var/lib/gdm ]; then
> - chown -R gdm:gdm /var/lib/gdm
> - chmod 0750 /var/lib/gdm
> -fi
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
>
> +pkg_postinst_${PN} () {
> # Register up as default dm
> -mkdir -p ${sysconfdir}/X11/
> -echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
> -
> +mkdir -p $D${sysconfdir}/X11/
> +echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
Maybe we should use u-a for default-display-manager like we use x-window-manager for WMs.
but git grep display-manager shows only
meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
doing the same as gdm
> }
>
> pkg_postrm_${PN} () {
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-04-27 19:31 ` Martin Jansa
@ 2013-04-29 7:33 ` Andreas Müller
2013-05-02 14:48 ` Andreas Müller
0 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2013-04-29 7:33 UTC (permalink / raw)
To: openembedded-devel
On Sat, Apr 27, 2013 at 9:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
>> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
>> causes postinst not to finish at first boot (gdm.service is not aliased to
>> display-manager.service -> started much too early) and is not neccesary:
>> language preparation can be done offline.
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>> meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 31 ++++++++++-----------------
>> 1 files changed, 12 insertions(+), 19 deletions(-)
>>
>>
>> +pkg_postinst_${PN} () {
>> # Register up as default dm
>> -mkdir -p ${sysconfdir}/X11/
>> -echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
>> -
>> +mkdir -p $D${sysconfdir}/X11/
>> +echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager
>
> Maybe we should use u-a for default-display-manager like we use x-window-manager for WMs.
>
> but git grep display-manager shows only
> meta-oe/recipes-graphics/nonworking/slim/slim_1.3.2.bb
> doing the same as gdm
>
Intention of this patch is fixing postinst failure. I have no idea
what this file is for. Can somebody give me a hint (is it required in
systemd environments?) and can we fix this in another series?
By the way: I am not using gdm. From what I have seen during tests for
this series it needs a lot more love to work as expected:
* gdm decides to put my standard user into the list of excluded users
so it is not displayed in the list and has to be entered manually.
* it is terribly slow
* the log files are full of different warnings - one thing I saw was
that polkit-gnome does not find its way into the image although it is
recommended
Andreas
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-04-29 7:33 ` Andreas Müller
@ 2013-05-02 14:48 ` Andreas Müller
2013-05-02 14:58 ` Andreas Müller
0 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2013-05-02 14:48 UTC (permalink / raw)
To: openembedded-devel
On Mon, Apr 29, 2013 at 9:33 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Sat, Apr 27, 2013 at 9:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
>>> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
>>> causes postinst not to finish at first boot (gdm.service is not aliased to
>>> display-manager.service -> started much too early) and is not neccesary:
>>> language preparation can be done offline.
Just learned that the chown code does not belong to do_install. Shall
I send a V2 or a follow up?
Andreas
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-05-02 14:48 ` Andreas Müller
@ 2013-05-02 14:58 ` Andreas Müller
2013-05-03 11:35 ` Martin Jansa
0 siblings, 1 reply; 11+ messages in thread
From: Andreas Müller @ 2013-05-02 14:58 UTC (permalink / raw)
To: openembedded-devel
On Thu, May 2, 2013 at 4:48 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Mon, Apr 29, 2013 at 9:33 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> On Sat, Apr 27, 2013 at 9:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>> On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
>>>> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
>>>> causes postinst not to finish at first boot (gdm.service is not aliased to
>>>> display-manager.service -> started much too early) and is not neccesary:
>>>> language preparation can be done offline.
> Just learned that the chown code does not belong to do_install. Shall
> I send a V2 or a follow up?
I was too fast - it still discussed [1]
Andreas
[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-May/039111.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-05-02 14:58 ` Andreas Müller
@ 2013-05-03 11:35 ` Martin Jansa
2013-05-03 11:44 ` Andreas Müller
0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2013-05-03 11:35 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1375 bytes --]
On Thu, May 02, 2013 at 04:58:13PM +0200, Andreas Müller wrote:
> On Thu, May 2, 2013 at 4:48 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Mon, Apr 29, 2013 at 9:33 AM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> >> On Sat, Apr 27, 2013 at 9:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >>> On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
> >>>> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
> >>>> causes postinst not to finish at first boot (gdm.service is not aliased to
> >>>> display-manager.service -> started much too early) and is not neccesary:
> >>>> language preparation can be done offline.
> > Just learned that the chown code does not belong to do_install. Shall
> > I send a V2 or a follow up?
> I was too fast - it still discussed [1]
Do you want me to apply these 4 and then add better fix in follow-up if
needed? From that discussion it looks like you did all what you could in
gdm :).
> [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-May/039111.html
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues
2013-05-03 11:35 ` Martin Jansa
@ 2013-05-03 11:44 ` Andreas Müller
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2013-05-03 11:44 UTC (permalink / raw)
To: openembedded-devel
On Fri, May 3, 2013 at 1:35 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, May 02, 2013 at 04:58:13PM +0200, Andreas Müller wrote:
>> On Thu, May 2, 2013 at 4:48 PM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > On Mon, Apr 29, 2013 at 9:33 AM, Andreas Müller
>> > <schnitzeltony@googlemail.com> wrote:
>> >> On Sat, Apr 27, 2013 at 9:31 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >>> On Sat, Apr 27, 2013 at 08:33:57PM +0200, Andreas Müller wrote:
>> >>>> Exiting postinst code leaves systemd.bbclass offline postinst code unexecuted,
>> >>>> causes postinst not to finish at first boot (gdm.service is not aliased to
>> >>>> display-manager.service -> started much too early) and is not neccesary:
>> >>>> language preparation can be done offline.
>> > Just learned that the chown code does not belong to do_install. Shall
>> > I send a V2 or a follow up?
>> I was too fast - it still discussed [1]
>
> Do you want me to apply these 4 and then add better fix in follow-up if
> needed? From that discussion it looks like you did all what you could in
> gdm :).
Yes please - otherwise I'll loose overview of patches around :)
Andreas
^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta-gnome/meta-xfce 2/4] gdm: avoid displaying system users in greeter's list
2013-04-27 18:33 [meta-gnome/meta-xfce 0/4] gdm/xfce-enhancements Andreas Müller
2013-04-27 18:33 ` [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues Andreas Müller
@ 2013-04-27 18:33 ` Andreas Müller
2013-04-27 18:33 ` [meta-gnome/meta-xfce 3/4] gdm: cosmetics Andreas Müller
2013-04-27 18:34 ` [meta-gnome/meta-xfce 4/4] xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG Andreas Müller
3 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2013-04-27 18:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...nager.c-avoid-displaying-system-users-in-.patch | 34 ++++++++++++++++++++
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 3 +-
2 files changed, 36 insertions(+), 1 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch b/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch
new file mode 100644
index 0000000..ad21073
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch
@@ -0,0 +1,34 @@
+From 43e59f3deadb3914a1cc931ae18d4023874cdeca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 26 Apr 2013 17:15:48 +0200
+Subject: [PATCH] gdm-user-manager.c: avoid displaying system users in
+ greeter's list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+yocto environment system users have UID below 1000
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ gui/simple-greeter/gdm-user-manager.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
+index c631989..f18e478 100644
+--- a/gui/simple-greeter/gdm-user-manager.c
++++ b/gui/simple-greeter/gdm-user-manager.c
+@@ -63,7 +63,7 @@
+ #ifdef __sun
+ #define FALLBACK_MINIMAL_UID 100
+ #else
+-#define FALLBACK_MINIMAL_UID 500
++#define FALLBACK_MINIMAL_UID 1000
+ #endif
+
+ #ifndef _PATH_SHELLS
+--
+1.7.4.4
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 87efc28..09a6f93 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,13 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
-PR = "r16"
+PR = "r17"
inherit gnome update-rc.d systemd useradd
SRC_URI += " \
file://cross-xdetection.diff \
file://0001-Remove-user-switch-applet.patch \
+ file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
file://sysrooted-pkg-config.patch \
file://%gconf-tree.xml \
file://gdm \
--
1.7.4.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-gnome/meta-xfce 3/4] gdm: cosmetics
2013-04-27 18:33 [meta-gnome/meta-xfce 0/4] gdm/xfce-enhancements Andreas Müller
2013-04-27 18:33 ` [meta-gnome/meta-xfce 1/4] gdm: fix postinst-code to unbreak first boot issues Andreas Müller
2013-04-27 18:33 ` [meta-gnome/meta-xfce 2/4] gdm: avoid displaying system users in greeter's list Andreas Müller
@ 2013-04-27 18:33 ` Andreas Müller
2013-04-27 18:34 ` [meta-gnome/meta-xfce 4/4] xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG Andreas Müller
3 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2013-04-27 18:33 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch | 12 --------
.../gdm/{gdm-2.32.2 => gdm}/%gconf-tree.xml | 0
.../0001-Remove-user-switch-applet.patch | 0
.../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/Default | 0
.../gdm/{gdm-2.32.2 => gdm}/cross-xdetection.diff | 0
.../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm | 0
.../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm-pam | 0
.../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm.conf | 0
.../{gdm-2.32.2 => gdm}/sysrooted-pkg-config.patch | 0
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 30 ++++++++++---------
10 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/%gconf-tree.xml (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/0001-Remove-user-switch-applet.patch (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/Default (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/cross-xdetection.diff (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm-pam (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm.conf (100%)
rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/sysrooted-pkg-config.patch (100%)
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
deleted file mode 100644
index 395fa62..0000000
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200
-+++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200
-@@ -5,8 +5,7 @@
- vicious-extensions \
- daemon \
- gui \
-- utils \
-- docs
-+ utils
-
- # add these when help gets added back
- # docs omf-install
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml
rename to meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/0001-Remove-user-switch-applet.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/0001-Remove-user-switch-applet.patch
rename to meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default b/meta-gnome/recipes-gnome/gdm/gdm/Default
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default
rename to meta-gnome/recipes-gnome/gdm/gdm/Default
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff
rename to meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch
rename to meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 09a6f93..da12ab8 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -9,25 +9,27 @@ PR = "r17"
inherit gnome update-rc.d systemd useradd
SRC_URI += " \
- file://cross-xdetection.diff \
- file://0001-Remove-user-switch-applet.patch \
- file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
- file://sysrooted-pkg-config.patch \
- file://%gconf-tree.xml \
- file://gdm \
- file://gdm.conf \
- file://gdm-pam \
- file://Default \
- file://gdm.service.in \
+ file://cross-xdetection.diff \
+ file://0001-Remove-user-switch-applet.patch \
+ file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
+ file://sysrooted-pkg-config.patch \
+ file://%gconf-tree.xml \
+ file://gdm \
+ file://gdm.conf \
+ file://gdm-pam \
+ file://Default \
+ file://gdm.service.in \
"
SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703"
-EXTRA_OECONF = " --enable-authentication-scheme=shadow \
- --enable-debug=yes \
- --with-console-kit \
- --disable-scrollkeeper"
+EXTRA_OECONF = " \
+ --enable-authentication-scheme=shadow \
+ --enable-debug=yes \
+ --with-console-kit \
+ --disable-scrollkeeper \
+"
do_configure_prepend() {
sed -i -e "s:\bdocs::g" ${S}/Makefile.am
--
1.7.4.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [meta-gnome/meta-xfce 4/4] xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG
2013-04-27 18:33 [meta-gnome/meta-xfce 0/4] gdm/xfce-enhancements Andreas Müller
` (2 preceding siblings ...)
2013-04-27 18:33 ` [meta-gnome/meta-xfce 3/4] gdm: cosmetics Andreas Müller
@ 2013-04-27 18:34 ` Andreas Müller
3 siblings, 0 replies; 11+ messages in thread
From: Andreas Müller @ 2013-04-27 18:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../xfce4-session/xfce4-session_4.10.0.bb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 8de95ee..bbe92e8 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -3,9 +3,8 @@ SECTION = "x11"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r6"
+RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower"
+PR = "r7"
inherit xfce update-alternatives
@@ -25,6 +24,10 @@ pkg_postinst_${PN} () {
echo 127.0.0.1 ${MACHINE} >> /etc/hosts
}
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd"
+PACKAGECONFIG[consolekit] = ",,,consolekit"
+
FILES_${PN} += "${libdir}/xfce4/*/*/*.so \
${libdir}/xfce4/session/*-*-* \
${datadir}/xsessions \
--
1.7.4.4
^ permalink raw reply related [flat|nested] 11+ messages in thread