[systemd-commits] 4 commits - Makefile.am src/journal

[Lennart Poettering]

 Makefile.am            |    4 ++--
 src/journal/coredump.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cacd6403a0242f46cf1473a157af91757993063c
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Thu Jun 19 11:18:36 2014 -0700

    coredump: fix include of xattr.h
    
    The correct path is now <sys/xattr.h> (from glibc-headers) and no longer
    <attr/xattr.h> (from libattr-devel.)
    
    Fixes: 34c10968cbe3b5591b3c0ce225b8694edd9709d0

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index 0a141c9..442c969 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 
 #include <systemd/sd-journal.h>
 #include <systemd/sd-login.h>

commit 228b2a1277d3b3ae5e7cec32d200ec1a9259d9b0
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Thu Jun 19 11:59:36 2014 -0700

    sd-dhcp6-client: include dhcp6-protocol.h in the list of sources
    
    If the file is not listed, then "make dist" will not include it.
    
    Tested: "make distcheck" works after this fix is applied.
    
    Fixes: 139b011ab81ccea1d51f09e0261a1c390115c6ff

diff --git a/Makefile.am b/Makefile.am
index caee5c9..fd3205d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2611,6 +2611,7 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/sd-icmp6-nd.c \
 	src/libsystemd-network/sd-dhcp6-client.c \
 	src/libsystemd-network/dhcp6-internal.h \
+	src/libsystemd-network/dhcp6-protocol.h \
 	src/libsystemd-network/dhcp6-network.c \
 	src/libsystemd-network/dhcp6-option.c \
 	src/libsystemd-network/dhcp6-lease-internal.h \

commit ab2bc6feee7022cea057f8e00f513f7dba962c74
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Thu Jun 19 11:59:35 2014 -0700

    sd-dhcp6-client: fix path of sd-icmp6-nd.h in Makefile.am
    
    It was incorrectly looking for a file in src/libsystemd-network/ when the file was actually deployed to src/systemd/ instead.  This broke "make dist".
    
    Tested: "make dist" works again after this patchset is applied.
    
    Fixes: f20a35cc0d537dd4cfc1054cf7936b04a1700f3a

diff --git a/Makefile.am b/Makefile.am
index 004f5e7..caee5c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2666,7 +2666,7 @@ test_ipv4ll_LDADD = \
 
 test_icmp6_rs_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
-	src/libsystemd-network/sd-icmp6-nd.h \
+	src/systemd/sd-icmp6-nd.h \
 	src/libsystemd-network/dhcp6-internal.h \
 	src/libsystemd-network/test-icmp6-rs.c
 

commit 302c9d6c8b4f778240c29a08060c037c6b6211a0
Author: Filipe Brandenburger <filbranden at google.com>
Date:   Thu Jun 19 11:59:34 2014 -0700

    sd-dhcp6-client: remove bogus dependency on dhcp6-icmp6.h
    
    Makefile.am had a reference to it but it none of the sources included it.
    
    Tested: "make dist" works again after this patchset is applied.
    
    Fixes: 2ea8857effb833615b16d10fc7a19a7104c19e13

diff --git a/Makefile.am b/Makefile.am
index 06105bd..004f5e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2677,7 +2677,6 @@ test_icmp6_rs_LDADD = \
 
 test_dhcp6_client_SOURCES = \
 	src/systemd/sd-dhcp6-client.h \
-	src/libsystemd-network/dhcp6-icmp6.h \
 	src/libsystemd-network/dhcp6-internal.h \
 	src/libsystemd-network/test-dhcp6-client.c