Skip to contentSkip to conversation

kbd: Fix stdarg related errors on uclibc

PATCH New Khem Raj 2 participants 3 messages Nov 7, 2013 – Nov 8, 2013

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 kbd: Fix stdarg related errors on uclibc

It does not get stdarg.h included indirectly as it happens on uclibc due to different include chain

---
 meta/recipes-core/kbd/kbd/uclibc-stdarg.patch | 36 +++++++++++++++++++++++++++
 meta/recipes-core/kbd/kbd_2.0.0.bb            |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/kbd/kbd/uclibc-stdarg.patch
meta/recipes-core/kbd/kbd/uclibc-stdarg.patch new file +36 -0
new file mode 100644
index 0000000..be7f324
@@ -0,0 +1,36 @@
+In file included from keymap.h:5:0,
+                 from ksyms.c:6:
+./keymap/common.h:65:38: error: unknown type name 'va_list'
+                  const char *format, va_list args),
+                                      ^
+./keymap/common.h:66:3: error: expected ';', ',' or ')' before 'const'
+   const void *data);
+   ^
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+Index: kbd-2.0.0/src/libkeymap/contextP.h
+===================================================================
+--- kbd-2.0.0.orig/src/libkeymap/contextP.h	2013-08-13 06:46:23.000000000 -0700
++++ kbd-2.0.0/src/libkeymap/contextP.h	2013-11-05 22:33:49.200528226 -0800
+@@ -2,7 +2,7 @@
+ #define LK_CONTEXTP_H
+ 
+ #include "keymap.h"
+-
++#include <stdarg.h>
+ /**
+  * @brief Copy of struct kbdiacruc.
+  */
+Index: kbd-2.0.0/src/libkeymap/keymap/common.h
+===================================================================
+--- kbd-2.0.0.orig/src/libkeymap/keymap/common.h	2013-08-13 06:46:23.000000000 -0700
++++ kbd-2.0.0/src/libkeymap/keymap/common.h	2013-11-05 22:33:59.964528438 -0800
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <keymap/context.h>
++#include <stdarg.h>
+ 
+ /** Initializes the structures necessary to read and/or parse keymap.
+  *
meta/recipes-core/kbd/kbd_2.0.0.bb +3 -1
index e66018f..18d1da7 100644
@@ -10,7 +10,9 @@ RREPLACES_${PN} = "console-tools"
 RPROVIDES_${PN} = "console-tools"
 RCONFLICTS_${PN} = "console-tools"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2 \
+           file://uclibc-stdarg.patch \
+          "
 
 SRC_URI[md5sum] = "1d9bbc36506b8c25740d028b0f6d2839"
 SRC_URI[sha256sum] = "f5eb125d5154bc0fe6f38175de9fcd394879485dadbba75c350d4ab050684a42"
Signature · 1 line
1.8.4.2
author
#1 lore raw

PATCH 1/1 systemd: Upgrade 206 -> 208

Remove patches accepted upstream
Forward-port uclibc patches
Create additional packages to bundle zsh
and pam.d files

---
 .../0001-use-CAP_MKNOD-ConditionCapability.patch   |  32 --
 .../systemd/systemd/systemd-pam-fix-msformat.patch | 137 +++++----
 meta/recipes-core/systemd/systemd_206.bb           | 327 --------------------
 meta/recipes-core/systemd/systemd_208.bb           | 330 +++++++++++++++++++++
 4 files changed, 398 insertions(+), 428 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
 delete mode 100644 meta/recipes-core/systemd/systemd_206.bb
 create mode 100644 meta/recipes-core/systemd/systemd_208.bb
meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch deleted +0 -32
deleted file mode 100644
index 4a35c23..0000000
@@ -1,32 +0,0 @@
-Upstream-Status: Submitted
-
-From cfdd1eb76dced87c73bac8ec22d3a10244c9bbf6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 21 Aug 2013 20:25:19 -0700
-Subject: [PATCH] use CAP_MKNOD ConditionCapability
-
-Fixes errors seen when booting VMs on QEMU like
-
-systemd[1]: kmod-static-nodes.service: main process exited, code=exited, status=203/EXEC
-systemd[1]: Failed to start Create list of required static device nodes for the current kernel.
-systemd[1]: Unit kmod-static-nodes.service entered failed state.
-
-Make sure that mknod capability is available
-
-Signed-off-by: Khem Raj <[email protected]>
----
- units/kmod-static-nodes.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: systemd-206/units/kmod-static-nodes.service.in
-===================================================================
---- systemd-206.orig/units/kmod-static-nodes.service.in	2013-08-21 19:13:02.000000000 -0700
-+++ systemd-206/units/kmod-static-nodes.service.in	2013-08-21 20:39:13.310689871 -0700
-@@ -9,6 +9,7 @@
- Description=Create list of required static device nodes for the current kernel
- DefaultDependencies=no
- Before=sysinit.target systemd-tmpfiles-setup-dev.service
-+ConditionCapability=CAP_MKNOD
- 
- [Service]
- Type=oneshot
meta/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch +68 -69

230 lines not on this page · raw message

meta/recipes-core/systemd/systemd_206.bb deleted +0 -327

327 lines not on this page · raw message

meta/recipes-core/systemd/systemd_208.bb new file +330 -0

330 lines not on this page · raw message

Signature · 1 line
1.8.4.2
#2 lore raw

Re: [PATCH] systemd: Upgrade 206 -> 208

Quoted 1 line · Khem Raj

Create additional packages to bundle zsh and pam.d files

Oh, will this mean systemd-user actually works with PAM? I hit this problem before ELCE and ended up reverting the change to error instead of warn on missing rules.

If so, please don't package the files in a separate package but ship them with systemd itself as they are practically essential if PAM is enabled. If the (negligible) size impact is a concern they can be deleted if the pam DISTRO_FEATURE isn't enabled.

(and please sent patches with -M)

Ross