diff options
| -rw-r--r-- | patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch (renamed from patches/systemd-215/0003-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch) | 6 | ||||
| -rw-r--r-- | patches/systemd-215/0001-util.h-include-missing.h-for-MAX_HANDLE_SZ.patch | 22 | ||||
| -rw-r--r-- | patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch | 46 | ||||
| -rw-r--r-- | patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch | 44 | ||||
| -rw-r--r-- | patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch | 50 | ||||
| -rw-r--r-- | patches/systemd-215/0005-missing-defined-extra-clock-ids.patch (renamed from patches/systemd-215/0002-missing-defined-extra-clock-ids.patch) | 10 | ||||
| -rw-r--r-- | patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch | 282 | ||||
| l--------- | patches/systemd-215/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/systemd-215/series | 11 | ||||
| -rw-r--r-- | rules/host-systemd.in | 1 | ||||
| -rw-r--r-- | rules/host-systemd.make | 2 |
11 files changed, 440 insertions, 35 deletions
diff --git a/patches/systemd-215/0003-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch b/patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch index fd85fe97a..b9617d2d8 100644 --- a/patches/systemd-215/0003-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch +++ b/patches/systemd-215/0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch @@ -6,9 +6,9 @@ Subject: [PATCH] always check for __BYTE_ORDER == __BIG_ENDIAN when checking Let's always stick to glibc's way to determine byte order, and not mix autoconf-specific checks with gcc checks. --- - src/shared/architecture.h | 12 ++++++------ - src/shared/gpt.h | 4 ++-- - src/shared/time-dst.c | 6 +++--- + src/shared/architecture.h | 12 ++++++------ + src/shared/gpt.h | 4 ++-- + src/shared/time-dst.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/shared/architecture.h b/src/shared/architecture.h diff --git a/patches/systemd-215/0001-util.h-include-missing.h-for-MAX_HANDLE_SZ.patch b/patches/systemd-215/0001-util.h-include-missing.h-for-MAX_HANDLE_SZ.patch deleted file mode 100644 index aaa2e17d4..000000000 --- a/patches/systemd-215/0001-util.h-include-missing.h-for-MAX_HANDLE_SZ.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 19 Jun 2014 10:47:11 +0200 -Subject: [PATCH] util.h: include missing.h for MAX_HANDLE_SZ - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/shared/util.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/shared/util.h b/src/shared/util.h -index e23069c..9bf5412 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -43,6 +43,8 @@ - #include <mntent.h> - #include <sys/socket.h> - -+#include "missing.h" -+ - #if SIZEOF_PID_T == 4 - # define PID_FMT "%" PRIu32 - #elif SIZEOF_PID_T == 2 diff --git a/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch b/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch new file mode 100644 index 000000000..85a895db3 --- /dev/null +++ b/patches/systemd-215/0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch @@ -0,0 +1,46 @@ +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Wed, 16 Jul 2014 16:44:45 -0400 +Subject: [PATCH] missing.h: add IFLA_MACVLAN_FLAGS + +Now we are getting into kernel < 3.4 territory... + +https://bugs.freedesktop.org/show_bug.cgi?id=80095 +--- + configure.ac | 3 ++- + src/shared/missing.h | 9 +++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ae88382..df6b357 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -310,7 +310,8 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, LO_FLAGS_PARTSCAN] + #include <linux/loop.h> + ]]) + +-AC_CHECK_DECLS([IFLA_PHYS_PORT_ID, ++AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, ++ IFLA_PHYS_PORT_ID, + IFLA_BOND_AD_INFO, + IFLA_VLAN_PROTOCOL, + IFLA_VXLAN_LOCAL6, +diff --git a/src/shared/missing.h b/src/shared/missing.h +index f129f0b..818d704 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -371,6 +371,15 @@ static inline int setns(int fd, int nstype) { + #define LOOP_CTL_GET_FREE 0x4C82 + #endif + ++#if !HAVE_DECL_IFLA_MACVLAN_FLAGS ++#define IFLA_MACVLAN_UNSPEC 0 ++#define IFLA_MACVLAN_MODE 1 ++#define IFLA_MACVLAN_FLAGS 2 ++#define __IFLA_MACVLAN_MAX 3 ++ ++#define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1) ++#endif ++ + #if !HAVE_DECL_IFLA_PHYS_PORT_ID + #undef IFLA_PROMISCUITY + #define IFLA_PROMISCUITY 30 diff --git a/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch b/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch new file mode 100644 index 000000000..767b11d4c --- /dev/null +++ b/patches/systemd-215/0003-Add-IFLA_VTI-defines-to-missing.h.patch @@ -0,0 +1,44 @@ +From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= <jean.andre.santoni@gmail.com> +Date: Mon, 21 Jul 2014 21:04:44 -0400 +Subject: [PATCH] Add IFLA_VTI defines to missing.h + +--- + configure.ac | 1 + + src/shared/missing.h | 12 ++++++++++++ + 2 files changed, 13 insertions(+) + +diff --git a/configure.ac b/configure.ac +index df6b357..8925eb5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -311,6 +311,7 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, LO_FLAGS_PARTSCAN] + ]]) + + AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, ++ IFLA_VTI_REMOTE, + IFLA_PHYS_PORT_ID, + IFLA_BOND_AD_INFO, + IFLA_VLAN_PROTOCOL, +diff --git a/src/shared/missing.h b/src/shared/missing.h +index 818d704..2985285 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -380,6 +380,18 @@ static inline int setns(int fd, int nstype) { + #define IFLA_MACVLAN_MAX (__IFLA_MACVLAN_MAX - 1) + #endif + ++#if !HAVE_DECL_IFLA_VTI_REMOTE ++#define IFLA_VTI_UNSPEC 0 ++#define IFLA_VTI_LINK 1 ++#define IFLA_VTI_IKEY 2 ++#define IFLA_VTI_OKEY 3 ++#define IFLA_VTI_LOCAL 4 ++#define IFLA_VTI_REMOTE 5 ++#define __IFLA_VTI_MAX 6 ++ ++#define IFLA_VTI_MAX (__IFLA_VTI_MAX - 1) ++#endif ++ + #if !HAVE_DECL_IFLA_PHYS_PORT_ID + #undef IFLA_PROMISCUITY + #define IFLA_PROMISCUITY 30 diff --git a/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch b/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch new file mode 100644 index 000000000..35665cf9f --- /dev/null +++ b/patches/systemd-215/0004-util.h-include-missing.h-for-struct-file_handle.patch @@ -0,0 +1,50 @@ +From: Simon McVittie <simon.mcvittie@collabora.co.uk> +Date: Fri, 1 Aug 2014 15:53:07 +0100 +Subject: [PATCH] util.h: include missing.h, for struct file_handle + +This breaks udev-builtin-btrfs.c, which reinvents some of missing.h, +so use missing.h there too. + +[zj: removed #include "config.h" and wrapped #include <linux/btrfs.h> + in ifdef HAVE_LINUX_BTRFS_H as discussed on the mailing list.] +--- + src/shared/util.h | 1 + + src/udev/udev-builtin-btrfs.c | 10 ++++------ + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/shared/util.h b/src/shared/util.h +index e23069c..6566ed5 100644 +--- a/src/shared/util.h ++++ b/src/shared/util.h +@@ -84,6 +84,7 @@ + #endif + + #include "macro.h" ++#include "missing.h" + #include "time-util.h" + + /* What is interpreted as whitespace? */ +diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c +index 2baafe6..adbdd8c 100644 +--- a/src/udev/udev-builtin-btrfs.c ++++ b/src/udev/udev-builtin-btrfs.c +@@ -24,15 +24,13 @@ + #include <fcntl.h> + #include <errno.h> + #include <sys/ioctl.h> ++#ifdef HAVE_LINUX_BTRFS_H ++#include <linux/btrfs.h> ++#endif + ++#include "missing.h" + #include "udev.h" + +-#define BTRFS_PATH_NAME_MAX 4087 +-struct btrfs_ioctl_vol_args { +- int64_t fd; +- char name[BTRFS_PATH_NAME_MAX + 1]; +-}; +-#define BTRFS_IOCTL_MAGIC 0x94 + #define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, struct btrfs_ioctl_vol_args) + + static int builtin_btrfs(struct udev_device *dev, int argc, char *argv[], bool test) diff --git a/patches/systemd-215/0002-missing-defined-extra-clock-ids.patch b/patches/systemd-215/0005-missing-defined-extra-clock-ids.patch index ed3e29486..e91fc2fbc 100644 --- a/patches/systemd-215/0002-missing-defined-extra-clock-ids.patch +++ b/patches/systemd-215/0005-missing-defined-extra-clock-ids.patch @@ -2,16 +2,20 @@ From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Thu, 19 Jun 2014 10:48:55 +0200 Subject: [PATCH] missing: defined extra clock ids +This is required for glibc <= 2.13 + +Upstream requires glibc 2.14 but this is useful for host-systemd. + Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - src/shared/missing.h | 10 ++++++++++ + src/shared/missing.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/shared/missing.h b/src/shared/missing.h -index f129f0b..b344ec6 100644 +index 2985285..40160fe 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h -@@ -478,3 +478,13 @@ static inline int setns(int fd, int nstype) { +@@ -499,3 +499,13 @@ static inline int setns(int fd, int nstype) { #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1) #endif diff --git a/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch b/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch new file mode 100644 index 000000000..66e67a340 --- /dev/null +++ b/patches/systemd-215/0006-add-m4-files-needed-for-autogen.sh.patch @@ -0,0 +1,282 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 8 Aug 2014 12:06:45 +0200 +Subject: [PATCH] add m4 files needed for autogen.sh + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + m4/introspection.m4 | 96 ++++++++++++++++++++++++++++++++++++++++ + m4/libgcrypt.m4 | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/nls.m4 | 32 ++++++++++++++ + 3 files changed, 250 insertions(+) + create mode 100644 m4/introspection.m4 + create mode 100644 m4/libgcrypt.m4 + create mode 100644 m4/nls.m4 + +diff --git a/m4/introspection.m4 b/m4/introspection.m4 +new file mode 100644 +index 0000000..d89c3d9 +--- /dev/null ++++ b/m4/introspection.m4 +@@ -0,0 +1,96 @@ ++dnl -*- mode: autoconf -*- ++dnl Copyright 2009 Johan Dahlin ++dnl ++dnl This file is free software; the author(s) gives unlimited ++dnl permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++ ++# serial 1 ++ ++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first ++ ++ dnl enable/disable introspection ++ m4_if([$2], [require], ++ [dnl ++ enable_introspection=yes ++ ],[dnl ++ AC_ARG_ENABLE(introspection, ++ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], ++ [Enable introspection for this build]),, ++ [enable_introspection=auto]) ++ ])dnl ++ ++ AC_MSG_CHECKING([for gobject-introspection]) ++ ++ dnl presence/version checking ++ AS_CASE([$enable_introspection], ++ [no], [dnl ++ found_introspection="no (disabled, use --enable-introspection to enable)" ++ ],dnl ++ [yes],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0],, ++ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], ++ found_introspection=yes, ++ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) ++ ],dnl ++ [auto],[dnl ++ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) ++ dnl Canonicalize enable_introspection ++ enable_introspection=$found_introspection ++ ],dnl ++ [dnl ++ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) ++ ])dnl ++ ++ AC_MSG_RESULT([$found_introspection]) ++ ++ INTROSPECTION_SCANNER= ++ INTROSPECTION_COMPILER= ++ INTROSPECTION_GENERATE= ++ INTROSPECTION_GIRDIR= ++ INTROSPECTION_TYPELIBDIR= ++ if test "x$found_introspection" = "xyes"; then ++ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` ++ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` ++ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection ++ fi ++ AC_SUBST(INTROSPECTION_SCANNER) ++ AC_SUBST(INTROSPECTION_COMPILER) ++ AC_SUBST(INTROSPECTION_GENERATE) ++ AC_SUBST(INTROSPECTION_GIRDIR) ++ AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ AC_SUBST(INTROSPECTION_CFLAGS) ++ AC_SUBST(INTROSPECTION_LIBS) ++ AC_SUBST(INTROSPECTION_MAKEFILE) ++ ++ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") ++]) ++ ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ++]) ++ ++dnl Usage: ++dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) ++ ++ ++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], ++[ ++ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ++]) +diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 +new file mode 100644 +index 0000000..6cf482f +--- /dev/null ++++ b/m4/libgcrypt.m4 +@@ -0,0 +1,122 @@ ++dnl Autoconf macros for libgcrypt ++dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. ++dnl ++dnl This file is free software; as a special exception the author gives ++dnl unlimited permission to copy and/or distribute it, with or without ++dnl modifications, as long as this notice is preserved. ++dnl ++dnl This file is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. ++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed ++dnl with the API version to also check the API compatibility. Example: ++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed ++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using ++dnl this features allows to prevent build against newer versions of libgcrypt ++dnl with a changed API. ++dnl ++AC_DEFUN([AM_PATH_LIBGCRYPT], ++[ AC_REQUIRE([AC_CANONICAL_HOST]) ++ AC_ARG_WITH(libgcrypt-prefix, ++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], ++ [prefix where LIBGCRYPT is installed (optional)]), ++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") ++ if test x$libgcrypt_config_prefix != x ; then ++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ fi ++ fi ++ ++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ tmp=ifelse([$1], ,1:1.2.0,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_libgcrypt_api=0 ++ min_libgcrypt_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) ++ ok=no ++ if test "$LIBGCRYPT_CONFIG" != "no" ; then ++ req_major=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ major=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` ++ minor=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` ++ micro=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` ++ if test "$major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$major" -eq "$req_major"; then ++ if test "$minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$minor" -eq "$req_minor"; then ++ if test "$micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) ++ else ++ AC_MSG_RESULT(no) ++ fi ++ if test $ok = yes; then ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ AC_MSG_CHECKING([LIBGCRYPT API version]) ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ AC_MSG_RESULT([okay]) ++ else ++ ok=no ++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ ifelse([$2], , :, [$2]) ++ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` ++ if test x"$libgcrypt_config_host" != xnone ; then ++ if test x"$libgcrypt_config_host" != x"$host" ; then ++ AC_MSG_WARN([[ ++*** ++*** The config script $LIBGCRYPT_CONFIG was ++*** built for $libgcrypt_config_host and thus may not match the ++*** used host $host. ++*** You may want to use the configure option --with-libgcrypt-prefix ++*** to specify a matching config script. ++***]]) ++ fi ++ fi ++ else ++ LIBGCRYPT_CFLAGS="" ++ LIBGCRYPT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(LIBGCRYPT_CFLAGS) ++ AC_SUBST(LIBGCRYPT_LIBS) ++]) +diff --git a/m4/nls.m4 b/m4/nls.m4 +new file mode 100644 +index 0000000..53cdc8b +--- /dev/null ++++ b/m4/nls.m4 +@@ -0,0 +1,32 @@ ++# nls.m4 serial 5 (gettext-0.18) ++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, ++dnl Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. ++ ++dnl Authors: ++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. ++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. ++ ++AC_PREREQ([2.50]) ++ ++AC_DEFUN([AM_NLS], ++[ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE([nls], ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT([$USE_NLS]) ++ AC_SUBST([USE_NLS]) ++]) diff --git a/patches/systemd-215/autogen.sh b/patches/systemd-215/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/systemd-215/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/systemd-215/series b/patches/systemd-215/series index f0c8f0c83..719abe2e6 100644 --- a/patches/systemd-215/series +++ b/patches/systemd-215/series @@ -1,6 +1,9 @@ # generated by git-ptx-patches #tag:base --start-number 1 -0001-util.h-include-missing.h-for-MAX_HANDLE_SZ.patch -0002-missing-defined-extra-clock-ids.patch -0003-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch -# 69ccf43a69835ab1b39ba354f76f27f9 - git-ptx-patches magic +0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch +0002-missing.h-add-IFLA_MACVLAN_FLAGS.patch +0003-Add-IFLA_VTI-defines-to-missing.h.patch +0004-util.h-include-missing.h-for-struct-file_handle.patch +0005-missing-defined-extra-clock-ids.patch +0006-add-m4-files-needed-for-autogen.sh.patch +# ba3832df21ec41fc64ab637e609ca30f - git-ptx-patches magic diff --git a/rules/host-systemd.in b/rules/host-systemd.in index 2877db738..6cd9284d6 100644 --- a/rules/host-systemd.in +++ b/rules/host-systemd.in @@ -6,4 +6,3 @@ config HOST_SYSTEMD # for 'ln --relative' select HOST_COREUTILS select HOST_LIBCAP - select HOST_KERNEL_HEADER diff --git a/rules/host-systemd.make b/rules/host-systemd.make index 1db0f86a9..889e11fff 100644 --- a/rules/host-systemd.make +++ b/rules/host-systemd.make @@ -21,8 +21,6 @@ HOST_SYSTEMD_CONF_ENV := \ $(HOST_ENV) \ ac_cv_path_INTLTOOL_MERGE=: -HOST_SYSTEMD_CFLAGS := -I$(PTXDIST_SYSROOT_HOST)/kernel-headers/include - # # autoconf # |