mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

systemd: Upgrade 206 -> 208

Browse Source 
Remove patches accepted upstream
Forward-port uclibc patches
Create additional packages to bundle zsh support files

(From OE-Core rev: 9131cd014443243dc41c828efdcc8d87b179940d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2013-11-10 21:45:03 -08:00
committed by Richard Purdie
parent a6784563ef
commit c7a80e429e
3 changed files with 76 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
-32
View File
@@ -1,32 +0,0 @@
Upstream-Status: Submitted
From cfdd1eb76dced87c73bac8ec22d3a10244c9bbf6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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
View File
@@ -1,10 +1,10 @@
Upstream-Status: Denied [no desire for uclibc support] Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: systemd-204/src/fsck/fsck.c Index: systemd-208/src/fsck/fsck.c
=================================================================== ===================================================================
--- systemd-204.orig/src/fsck/fsck.c 2013-04-02 05:48:49.000000000 -0700 --- systemd-208.orig/src/fsck/fsck.c 2013-08-13 13:02:46.000000000 -0700
+++ systemd-204/src/fsck/fsck.c 2013-05-23 11:26:51.776345015 -0700 +++ systemd-208/src/fsck/fsck.c 2013-11-05 22:01:26.776490078 -0800
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
#include "virt.h" #include "virt.h"
#include "fileio.h" #include "fileio.h"
@@ -33,10 +33,10 @@ Index: systemd-204/src/fsck/fsck.c
/* Only show one progress counter at max */ /* Only show one progress counter at max */
if (!locked) { if (!locked) {
Index: systemd-204/src/core/swap.c Index: systemd-208/src/core/swap.c
=================================================================== ===================================================================
--- systemd-204.orig/src/core/swap.c 2013-05-06 12:06:04.000000000 -0700 --- systemd-208.orig/src/core/swap.c 2013-09-26 11:20:30.000000000 -0700
+++ systemd-204/src/core/swap.c 2013-05-23 11:26:51.780345015 -0700 +++ systemd-208/src/core/swap.c 2013-11-05 22:01:26.776490078 -0800
@@ -41,6 +41,8 @@ @@ -41,6 +41,8 @@
#include "path-util.h" #include "path-util.h"
#include "virt.h" #include "virt.h"
@@ -46,15 +46,15 @@ Index: systemd-204/src/core/swap.c
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE, [SWAP_DEAD] = UNIT_INACTIVE,
[SWAP_ACTIVATING] = UNIT_ACTIVATING, [SWAP_ACTIVATING] = UNIT_ACTIVATING,
@@ -1055,6 +1057,7 @@ @@ -1041,6 +1043,7 @@
char *dev = NULL, *d; _cleanup_free_ char *dev = NULL, *d = NULL;
int prio = 0, k; int prio = 0, k;
+#ifdef HAVE_MSFORMAT +#ifdef HAVE_MSFORMAT
k = fscanf(m->proc_swaps, k = fscanf(m->proc_swaps,
"%ms " /* device/file */ "%ms " /* device/file */
"%*s " /* type of swap */ "%*s " /* type of swap */
@@ -1062,6 +1065,16 @@ @@ -1048,6 +1051,16 @@
"%*s " /* used */ "%*s " /* used */
"%i\n", /* priority */ "%i\n", /* priority */
&dev, &prio); &dev, &prio);
@@ -71,10 +71,10 @@ Index: systemd-204/src/core/swap.c
if (k != 2) { if (k != 2) {
if (k == EOF) if (k == EOF)
break; break;
Index: systemd-204/src/core/mount-setup.c Index: systemd-208/src/core/mount-setup.c
=================================================================== ===================================================================
--- systemd-204.orig/src/core/mount-setup.c 2013-04-24 06:34:38.000000000 -0700 --- systemd-208.orig/src/core/mount-setup.c 2013-08-13 13:02:46.000000000 -0700
+++ systemd-204/src/core/mount-setup.c 2013-05-23 11:26:51.780345015 -0700 +++ systemd-208/src/core/mount-setup.c 2013-11-05 22:01:26.776490078 -0800
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <assert.h> #include <assert.h>
#include <unistd.h> #include <unistd.h>
@@ -107,10 +107,10 @@ Index: systemd-204/src/core/mount-setup.c
if (feof(f)) if (feof(f))
break; break;
Index: systemd-204/src/core/mount.c Index: systemd-208/src/core/mount.c
=================================================================== ===================================================================
--- systemd-204.orig/src/core/mount.c 2013-05-06 12:06:04.000000000 -0700 --- systemd-208.orig/src/core/mount.c 2013-09-26 11:20:30.000000000 -0700
+++ systemd-204/src/core/mount.c 2013-05-23 11:26:51.780345015 -0700 +++ systemd-208/src/core/mount.c 2013-11-05 22:07:43.784497482 -0800
@@ -43,6 +43,8 @@ @@ -43,6 +43,8 @@
#include "exit-status.h" #include "exit-status.h"
#include "def.h" #include "def.h"
@@ -120,52 +120,51 @@ Index: systemd-204/src/core/mount.c
static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
[MOUNT_DEAD] = UNIT_INACTIVE, [MOUNT_DEAD] = UNIT_INACTIVE,
[MOUNT_MOUNTING] = UNIT_ACTIVATING, [MOUNT_MOUNTING] = UNIT_ACTIVATING,
@@ -1626,7 +1628,7 @@ @@ -1559,6 +1561,7 @@
_cleanup_free_ char *device = NULL, *path = NULL, *options = NULL, *options2 = NULL, *fstype = NULL, *d = NULL, *p = NULL, *o = NULL;
int k; int k;
device = path = options = options2 = fstype = d = p = o = NULL;
-
+#ifdef HAVE_MSFORMAT +#ifdef HAVE_MSFORMAT
if ((k = fscanf(m->proc_self_mountinfo, k = fscanf(m->proc_self_mountinfo,
"%*s " /* (1) mount id */ "%*s " /* (1) mount id */
"%*s " /* (2) parent id */ "%*s " /* (2) parent id */
@@ -1645,7 +1647,31 @@ @@ -1577,7 +1580,31 @@
&fstype, &fstype,
&device, &device,
&options2)) != 5) { &options2);
- -
+#else +#else
+ path = malloc(257); + path = malloc(257);
+ options = malloc(257); + options = malloc(257);
+ fstype = malloc(257); + fstype = malloc(257);
+ device = malloc(257); + device = malloc(257);
+ options2 = malloc(257); + options2 = malloc(257);
+ if ((k = fscanf(m->proc_self_mountinfo, + k = fscanf(m->proc_self_mountinfo,
+ "%*s " /* (1) mount id */ + "%*s " /* (1) mount id */
+ "%*s " /* (2) parent id */ + "%*s " /* (2) parent id */
+ "%*s " /* (3) major:minor */ + "%*s " /* (3) major:minor */
+ "%*s " /* (4) root */ + "%*s " /* (4) root */
+ "%256s " /* (5) mount point */ + "%256s " /* (5) mount point */
+ "%256s" /* (6) mount options */ + "%256s" /* (6) mount options */
+ "%*[^-]" /* (7) optional fields */ + "%*[^-]" /* (7) optional fields */
+ "- " /* (8) separator */ + "- " /* (8) separator */
+ "%256s " /* (9) file system type */ + "%256s " /* (9) file system type */
+ "%256s" /* (10) mount source */ + "%256s" /* (10) mount source */
+ "%256s" /* (11) mount options 2 */ + "%256s" /* (11) mount options 2 */
+ "%*[^\n]", /* some rubbish at the end */ + "%*[^\n]", /* some rubbish at the end */
+ path, + path,
+ options, + options,
+ fstype, + fstype,
+ device, + device,
+ options2)) != 5) { + options2);
+#endif /* HAVE_MSFORMAT */ +#endif /* HAVE_MSFORMAT */
if (k == EOF) if (k == EOF)
break; break;
Index: systemd-204/src/core/umount.c Index: systemd-208/src/core/umount.c
=================================================================== ===================================================================
--- systemd-204.orig/src/core/umount.c 2013-04-18 08:14:11.000000000 -0700 --- systemd-208.orig/src/core/umount.c 2013-08-13 13:02:46.000000000 -0700
+++ systemd-204/src/core/umount.c 2013-05-23 11:26:51.780345015 -0700 +++ systemd-208/src/core/umount.c 2013-11-05 22:01:26.776490078 -0800
@@ -36,6 +36,8 @@ @@ -36,6 +36,8 @@
#include "util.h" #include "util.h"
#include "virt.h" #include "virt.h"
@@ -235,10 +234,10 @@ Index: systemd-204/src/core/umount.c
if (k == EOF) if (k == EOF)
break; break;
Index: systemd-204/src/shared/socket-util.c Index: systemd-208/src/shared/socket-util.c
=================================================================== ===================================================================
--- systemd-204.orig/src/shared/socket-util.c 2013-04-18 08:14:11.000000000 -0700 --- systemd-208.orig/src/shared/socket-util.c 2013-09-26 11:20:30.000000000 -0700
+++ systemd-204/src/shared/socket-util.c 2013-05-23 11:30:53.528348084 -0700 +++ systemd-208/src/shared/socket-util.c 2013-11-05 22:01:26.776490078 -0800
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
#include "missing.h" #include "missing.h"
#include "fileio.h" #include "fileio.h"
@@ -266,28 +265,28 @@ Index: systemd-204/src/shared/socket-util.c
family = netlink_family_from_string(sfamily); family = netlink_family_from_string(sfamily);
if (family < 0) if (family < 0)
Index: systemd-204/src/tmpfiles/tmpfiles.c Index: systemd-208/src/tmpfiles/tmpfiles.c
=================================================================== ===================================================================
--- systemd-204.orig/src/tmpfiles/tmpfiles.c 2013-04-24 06:34:38.000000000 -0700 --- systemd-208.orig/src/tmpfiles/tmpfiles.c 2013-09-17 14:55:37.000000000 -0700
+++ systemd-204/src/tmpfiles/tmpfiles.c 2013-05-23 11:26:51.784345016 -0700 +++ systemd-208/src/tmpfiles/tmpfiles.c 2013-11-05 22:01:26.776490078 -0800
@@ -52,6 +52,8 @@ @@ -53,6 +53,8 @@
#include "conf-files.h"
#include "capability.h" #include "capability.h"
#include "specifier.h"
+#include "config.h" +#include "config.h"
+ +
/* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
* them in the file system. This is intended to be used to create * them in the file system. This is intended to be used to create
* properly owned directories beneath /tmp, /var/tmp, /run, which are * properly owned directories beneath /tmp, /var/tmp, /run, which are
@@ -1029,6 +1031,7 @@ @@ -1082,6 +1084,7 @@
if (!i) assert(line >= 1);
return log_oom(); assert(buffer);
+#ifdef HAVE_MSFORMAT +#ifdef HAVE_MSFORMAT
r = sscanf(buffer, r = sscanf(buffer,
"%c %ms %ms %ms %ms %ms %n", "%c %ms %ms %ms %ms %ms %n",
&type, &type,
@@ -1038,6 +1041,29 @@ @@ -1091,6 +1094,29 @@
&group, &group,
&age, &age,
&n); &n);
@@ -317,10 +316,10 @@ Index: systemd-204/src/tmpfiles/tmpfiles.c
if (r < 2) { if (r < 2) {
log_error("[%s:%u] Syntax error.", fname, line); log_error("[%s:%u] Syntax error.", fname, line);
return -EIO; return -EIO;
Index: systemd-204/src/cryptsetup/cryptsetup-generator.c Index: systemd-208/src/cryptsetup/cryptsetup-generator.c
=================================================================== ===================================================================
--- systemd-204.orig/src/cryptsetup/cryptsetup-generator.c 2013-05-06 12:06:04.000000000 -0700 --- systemd-208.orig/src/cryptsetup/cryptsetup-generator.c 2013-09-30 09:57:04.000000000 -0700
+++ systemd-204/src/cryptsetup/cryptsetup-generator.c 2013-05-23 11:26:51.784345016 -0700 +++ systemd-208/src/cryptsetup/cryptsetup-generator.c 2013-11-05 22:01:26.776490078 -0800
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#include "strv.h" #include "strv.h"
#include "fileio.h" #include "fileio.h"
@@ -330,7 +329,7 @@ Index: systemd-204/src/cryptsetup/cryptsetup-generator.c
static const char *arg_dest = "/tmp"; static const char *arg_dest = "/tmp";
static bool arg_enabled = true; static bool arg_enabled = true;
static bool arg_read_crypttab = true; static bool arg_read_crypttab = true;
@@ -398,7 +400,16 @@ @@ -420,7 +422,16 @@
if (*l == '#' || *l == 0) if (*l == '#' || *l == 0)
continue; continue;
meta/recipes-core/systemd/systemd_206.bb → meta/recipes-core/systemd/systemd_208.bb
+8 -4
View File
@@ -18,7 +18,6 @@ SECTION = "base/shell"
inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://0001-use-CAP_MKNOD-ConditionCapability.patch \
file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \ file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \
file://binfmt-install.patch \ file://binfmt-install.patch \
file://touchscreen.rules \ file://touchscreen.rules \
@@ -27,8 +26,8 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://init \ file://init \
file://run-ptest \ file://run-ptest \
" "
SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc" SRC_URI[md5sum] = "df64550d92afbffb4f67a434193ee165"
SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de" SRC_URI[sha256sum] = "aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"
UCLIBCPATCHES = "" UCLIBCPATCHES = ""
UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \
@@ -134,7 +133,8 @@ python populate_packages_prepend (){
} }
PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install ${PN}-rpm-macros ${PN}-binfmt" PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
SYSTEMD_PACKAGES = "${PN}-binfmt" SYSTEMD_PACKAGES = "${PN}-binfmt"
SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -160,6 +160,10 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \
FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
" "
FILES_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)}"
FILES_${PN}-zsh = "${datadir}/zsh/site-functions"
FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
${exec_prefix}/lib/binfmt.d \ ${exec_prefix}/lib/binfmt.d \
${rootlibexecdir}/systemd/systemd-binfmt \ ${rootlibexecdir}/systemd/systemd-binfmt \