Fixes for display managers, emacs, and dracut
cover Fixes for display managers, emacs, and dracut
From: Dan McGregor <[email protected]>
Here are a bunch of patches that I've been sitting on for far too long; it's time to push them up.
Dan McGregor (5):
xserver-nodm-init: only enable for runlevel 5
lxdm: RDEPEND on libsvg-gtk
emacs: Un-blacklist, seems to work fine with new qemu
gdm: Only start in runlevel 5
dracut: recipe cleanup
meta-gnome/recipes-gnome/gdm/gdm/gdm | 4 +- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 2 +- .../recipes-devtools/dracut/dracut_git.bb | 25 ++++-- meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 2 +- .../xserver-nodm-init-2.0/xserver-nodm | 9 +++ .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 4 +- meta-oe/recipes-support/emacs/emacs.inc | 89 +--------------------- meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 - 8 files changed, 36 insertions(+), 101 deletions(-)
Signature · 19 lines
2.1.0 From 2e55392c655f8cfa934d589d337b00b0264c9664 Mon Sep 17 00:00:00 2001 From: Dan McGregor <[email protected]> Date: Wed, 13 Aug 2014 16:46:42 -0600 Subject: [meta-oe][PATCH 1/5] xserver-nodm-init: only enable for runlevel 5 To: [email protected] From: Dan McGregor <[email protected]> Runlevel 5 is traditionally graphical. If it starts in runlevel 2 or 3 systemd gets confused and adds it as a dependency of the multi-user target, not just the graphical target. Signed-off-by: Dan McGregor <[email protected]> --- .../xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm | 9 +++++++++ .../recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm +9 -0
@@ -1,4 +1,13 @@ #!/bin/sh +# +### BEGIN INIT INFO +# Provides: xserver +# Required-Start: $local_fs $remote_fs dbus +# Required-Stop: $local_fs $remote_fs +# Default-Start: 5 +# Default-Stop: 0 1 2 3 6 +### END INIT INFO + . /etc/init.d/functions
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +2 -2
@@ -15,8 +15,8 @@ S = "${WORKDIR}" inherit allarch update-rc.d systemd INITSCRIPT_NAME = "xserver-nodm" -INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." -INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." +INITSCRIPT_PARAMS = "start 01 5 . stop 01 0 1 2 3 6 ." +INITSCRIPT_PARAMS_shr = "start 90 5 . stop 90 0 1 2 3 6 ." do_install() { install -d ${D}${sysconfdir}/init.d
Signature · 18 lines
2.1.0 From 326102dab4af209f6e171ee5773b1eae91e1fdf8 Mon Sep 17 00:00:00 2001 From: Dan McGregor <[email protected]> Date: Fri, 10 Oct 2014 10:14:52 -0600 Subject: [meta-oe][PATCH 2/5] lxdm: RDEPEND on libsvg-gtk To: [email protected] From: Dan McGregor <[email protected]> The theme uses svg files. If libsvg-gtk isn't available lxdm still runs, but throws a bunch of pixbuf errors. Signed-off-by: Dan McGregor <[email protected]> --- meta-oe/recipes-graphics/lxdm/lxdm_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/lxdm/lxdm_git.bb +1 -1
@@ -70,7 +70,7 @@ done sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf } -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash" +RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd"
Signature · 24 lines
2.1.0 From 9a238ca43caf0989b4ace91926500493741e6e02 Mon Sep 17 00:00:00 2001 From: Dan McGregor <[email protected]> Date: Mon, 24 Nov 2014 08:00:34 -0600 Subject: [meta-oe][PATCH 3/5] emacs: Un-blacklist, seems to work fine with new qemu To: [email protected] From: Dan McGregor <[email protected]> I've only tested the build with armv7 and x86, but the build doesn't segfault anymore. The last time this was tested was with qemu 1.5, we're now using 2.1. While here, don't copy stuff from the sysroot into the qemu tree just use the sysroot itself. Signed-off-by: Dan McGregor <[email protected]> --- meta-oe/recipes-support/emacs/emacs.inc | 89 +---------------------------- meta-oe/recipes-support/emacs/emacs_23.4.bb | 2 - 2 files changed, 2 insertions(+), 89 deletions(-)
meta-oe/recipes-support/emacs/emacs.inc +2 -87
119 lines not on this page · raw message
meta-oe/recipes-support/emacs/emacs_23.4.bb +0 -2
@@ -2,8 +2,6 @@ require emacs.inc PR = "r4" -PNBLACKLIST[emacs] ?= "qemu: uncaught target signal 11 (Segmentation fault) - core dumped" - SRC_URI = "${GNU_MIRROR}/emacs/emacs-${PV}.tar.gz;name=tarball \ file://use-qemu.patch \ file://nostdlib-unwind.patch \
Signature · 20 lines
2.1.0 From 09961c681ffd5bd98d5f96ee6a82a710386e119a Mon Sep 17 00:00:00 2001 From: Dan McGregor <[email protected]> Date: Thu, 14 Aug 2014 08:21:02 -0600 Subject: [meta-gnome][PATCH 4/5] gdm: Only start in runlevel 5 To: [email protected] From: Dan McGregor <[email protected]> Runlevel 5 is traditionally graphical. If it starts in runlevel 2 or 3 systemd gets confused and adds it as a dependency of the multi-user target, not just the graphical target. Signed-off-by: Dan McGregor <[email protected]> --- meta-gnome/recipes-gnome/gdm/gdm/gdm | 4 ++-- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
meta-gnome/recipes-gnome/gdm/gdm/gdm +2 -2
@@ -4,8 +4,8 @@ # Should-Start: console-screen acpid dbus hal network-manager # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Start: 5 +# Default-Stop: 0 1 2 3 6 # Short-Description: GNOME Display Manager # Description: Debian init script for the GNOME Display Manager ### END INIT INFO
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +1 -1
@@ -88,7 +88,7 @@ RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "gdm.service" INITSCRIPT_NAME = "gdm" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 2 3 6 ." USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
Signature · 20 lines
2.1.0 From 4dbe8a0bc32d09ea82726d78cfd1292a3a6b3719 Mon Sep 17 00:00:00 2001 From: Dan McGregor <[email protected]> Date: Fri, 23 Jan 2015 08:13:23 -0600 Subject: [meta-initramfs][PATCH 5/5] dracut: recipe cleanup To: [email protected] From: Dan McGregor <[email protected]> Split out bash-completion data Update RDEPENDS: getopt is util-linux-getopt now Use distro_features_check to require systemd Recommend busybox Signed-off-by: Dan McGregor <[email protected]> --- .../recipes-devtools/dracut/dracut_git.bb | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +19 -6
@@ -4,6 +4,8 @@ DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the t LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +PACKAGES =+ "${PN}-bash-completion" + PE = "1" PV = "038"
@@ -13,8 +15,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git" S = "${WORKDIR}/git" -do_configure() { - ./configure --prefix=${prefix} \ +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +EXTRA_OECONF = "--prefix=${prefix} \ --libdir=${libdir} \ --datadir=${datadir} \ --sysconfdir=${sysconfdir} \
@@ -23,20 +27,29 @@ do_configure() { --bindir=${bindir} \ --includedir=${includedir} \ --localstatedir=${localstatedir} \ + --systemdsystemunitdir=${systemd_unitdir}/system" + +do_configure() { + ./configure ${EXTRA_OECONF} } do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} += "${datadir}/bash-completion \ - ${libdir}/kernel \ +FILES_${PN}-bash-completion = "${datadir}/bash-completion" + +FILES_${PN} += " ${libdir}/kernel \ + ${systemd_unitdir} \ " +CONFFILES_${PN} += "${sysconfdir}/dracut.conf" + +RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" +RDEPENDS_${PN}-bash-completion = "bash-completion" -# 'getopt' is in the util-linux main package -RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd" # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS_${PN} = " \ kernel-modules \ + busybox \ coreutils \ "
Signature · 1 line
2.1.0