From 7a2b0458f934478995f4f15c083173af0e3c16af Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 3 Aug 2011 06:19:53 +0000 Subject: [PATCH] systemd: Refresh format-replace-m-uclibc.patch This patch needed refresh against latest systemd sources Signed-off-by: Khem Raj Signed-off-by: Koen Kooi --- .../systemd/format-replace-m-uclibc.patch | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch b/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch index 3b9ed31d70..48f870bec6 100644 --- a/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch +++ b/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch @@ -9,9 +9,9 @@ Signed-off-by: Khem Raj Index: git/src/mount-setup.c =================================================================== ---- git.orig/src/mount-setup.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/mount-setup.c 2011-07-03 08:35:23.592956700 -0700 -@@ -147,10 +147,11 @@ +--- git.orig/src/mount-setup.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/mount-setup.c 2011-08-02 11:29:52.818915041 -0700 +@@ -172,10 +172,11 @@ for (;;) { MountPoint p; @@ -25,7 +25,7 @@ Index: git/src/mount-setup.c if (feof(f)) break; -@@ -161,12 +162,10 @@ +@@ -186,12 +187,10 @@ } if (!enabled) { @@ -38,18 +38,18 @@ Index: git/src/mount-setup.c r = -ENOMEM; goto finish; } -@@ -180,7 +179,6 @@ +@@ -205,7 +204,6 @@ p.fatal = false; - r = mount_one(&p); + r = mount_one(&p, true); - free(controller); free(where); if (r < 0) Index: git/src/socket-util.c =================================================================== ---- git.orig/src/socket-util.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/socket-util.c 2011-07-03 08:25:38.242098176 -0700 +--- git.orig/src/socket-util.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/socket-util.c 2011-08-02 11:28:16.178773302 -0700 @@ -192,7 +192,7 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) { int family; @@ -80,8 +80,8 @@ Index: git/src/socket-util.c Index: git/src/cryptsetup-generator.c =================================================================== ---- git.orig/src/cryptsetup-generator.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/cryptsetup-generator.c 2011-07-03 08:25:38.252098188 -0700 +--- git.orig/src/cryptsetup-generator.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/cryptsetup-generator.c 2011-08-02 11:28:16.458773716 -0700 @@ -260,7 +260,7 @@ for (;;) { @@ -115,8 +115,8 @@ Index: git/src/cryptsetup-generator.c finish: Index: git/src/swap.c =================================================================== ---- git.orig/src/swap.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/swap.c 2011-07-03 08:34:20.512864178 -0700 +--- git.orig/src/swap.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/swap.c 2011-08-02 11:28:16.488773760 -0700 @@ -1043,11 +1043,12 @@ (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); @@ -147,9 +147,9 @@ Index: git/src/swap.c return -ENOMEM; Index: git/src/tmpfiles.c =================================================================== ---- git.orig/src/tmpfiles.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/tmpfiles.c 2011-07-03 08:25:38.272098222 -0700 -@@ -66,7 +66,7 @@ +--- git.orig/src/tmpfiles.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/tmpfiles.c 2011-08-02 11:28:16.488773760 -0700 +@@ -67,7 +67,7 @@ typedef struct Item { char type; @@ -158,7 +158,7 @@ Index: git/src/tmpfiles.c uid_t uid; gid_t gid; mode_t mode; -@@ -619,7 +619,6 @@ +@@ -664,7 +664,6 @@ static void item_free(Item *i) { assert(i); @@ -166,7 +166,7 @@ Index: git/src/tmpfiles.c free(i); } -@@ -654,7 +653,7 @@ +@@ -699,7 +698,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { Item *i, *existing; @@ -175,7 +175,7 @@ Index: git/src/tmpfiles.c Hashmap *h; int r; -@@ -669,17 +668,17 @@ +@@ -714,17 +713,17 @@ if (sscanf(buffer, "%c " @@ -202,7 +202,7 @@ Index: git/src/tmpfiles.c log_error("[%s:%u] Syntax error.", fname, line); r = -EIO; goto finish; -@@ -793,11 +792,6 @@ +@@ -825,11 +824,6 @@ r = 0; finish: @@ -216,8 +216,8 @@ Index: git/src/tmpfiles.c Index: git/src/mount.c =================================================================== ---- git.orig/src/mount.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/mount.c 2011-07-03 08:33:43.112809328 -0700 +--- git.orig/src/mount.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/mount.c 2011-08-02 11:28:16.488773760 -0700 @@ -24,6 +24,7 @@ #include #include @@ -304,8 +304,8 @@ Index: git/src/mount.c free(o); Index: git/src/umount.c =================================================================== ---- git.orig/src/umount.c 2011-07-03 08:24:43.892018457 -0700 -+++ git/src/umount.c 2011-07-03 08:33:06.732755969 -0700 +--- git.orig/src/umount.c 2011-08-02 11:28:04.000000000 -0700 ++++ git/src/umount.c 2011-08-02 11:28:16.498773772 -0700 @@ -60,7 +60,9 @@ static int mount_points_list_get(MountPoint **head) {