A proper git formatted patch for inclusion.
>From 9be13cce871d1d7275acee8bcb106cd2f9e909b7 Mon Sep 17 00:00:00 2001 From: Mike Gilbert <flop...@gentoo.org> Date: Sat, 31 May 2014 19:58:47 +0300 Subject: [PATCH] Fix building with --disable-kmod --disable-networkd when kmod is not installed.
--- src/libsystemd-network/network-internal.c | 2 ++ src/libsystemd-network/network-internal.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 261603f..31d7bc2 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -327,6 +327,7 @@ int net_parse_inaddr(const char *address, unsigned char *family, void *dst) { return 0; } +#if HAVE_KMOD int load_module(struct kmod_ctx *ctx, const char *mod_name) { struct kmod_list *modlist = NULL, *l; int r; @@ -361,6 +362,7 @@ int load_module(struct kmod_ctx *ctx, const char *mod_name) { return r; } +#endif void serialize_in_addrs(FILE *f, const char *key, struct in_addr *addresses, size_t size) { unsigned i; diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index c08cddd..3e4018e 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -24,7 +24,9 @@ #include <netinet/ether.h> #include <netinet/in.h> #include <stdbool.h> +#if HAVE_KMOD #include <libkmod.h> +#endif #include "udev.h" #include "condition-util.h" @@ -67,7 +69,9 @@ int net_parse_inaddr(const char *address, unsigned char *family, void *dst); int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]); +#if HAVE_KMOD int load_module(struct kmod_ctx *ctx, const char *mod_name); +#endif void serialize_in_addrs(FILE *f, const char *key, struct in_addr *addresses, size_t size); int deserialize_in_addrs(struct in_addr **addresses, size_t *size, const char *string); -- 1.9.2
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel