[packages] lxc: update to latest git version
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/packages@38798 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,13 +1,13 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -11,29 +11,6 @@ AC_CANONICAL_HOST
|
||||
@@ -22,29 +22,6 @@ AC_CANONICAL_HOST
|
||||
AM_PROG_CC_C_O
|
||||
AC_GNU_SOURCE
|
||||
|
||||
-# Detect the distribution. This is used for the default configuration and
|
||||
-# for some distro-specific build options.
|
||||
-AC_MSG_CHECKING([host distribution])
|
||||
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, fedora, suse, gentoo, debian, arch, slackware, paldo, mandriva or pardus.]))
|
||||
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, oracle, fedora, suse, gentoo, debian, arch, slackware, paldo, openmandriva or pardus.]))
|
||||
-if test "z$with_distro" = "z"; then
|
||||
- with_distro=`lsb_release -is`
|
||||
-fi
|
||||
@ -21,8 +21,8 @@
|
||||
- AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
|
||||
- AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
|
||||
- AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
|
||||
- AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="mandriva")
|
||||
- AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
|
||||
- AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
|
||||
- AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
|
||||
- AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
|
||||
-fi
|
||||
-with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
|
||||
|
@ -11,15 +11,12 @@
|
||||
char *newname;
|
||||
--- a/src/lxc/lxc_user_nic.c
|
||||
+++ b/src/lxc/lxc_user_nic.c
|
||||
@@ -43,11 +43,7 @@
|
||||
#include <linux/sockios.h>
|
||||
@@ -49,6 +49,8 @@
|
||||
#include "config.h"
|
||||
#include "utils.h"
|
||||
|
||||
-#ifndef HAVE_GETLINE
|
||||
-#ifdef HAVE_FGETLN
|
||||
#include <../include/getline.h>
|
||||
-#endif
|
||||
-#endif
|
||||
|
||||
+#include <../include/getline.h>
|
||||
+
|
||||
#if ISTEST
|
||||
#define CONF_FILE "/tmp/lxc-usernet"
|
||||
#define DB_FILE "/tmp/nics"
|
||||
|
@ -1,9 +1,9 @@
|
||||
--- a/src/lxc/lxc-checkconfig.in
|
||||
+++ b/src/lxc/lxc-checkconfig.in
|
||||
@@ -3,6 +3,17 @@
|
||||
# Allow environment variables to override grep and config
|
||||
@@ -4,6 +4,17 @@
|
||||
: ${CONFIG:=/proc/config.gz}
|
||||
: ${GREP:=zgrep}
|
||||
: ${MODNAME:=configs}
|
||||
+: ${ZGREP:=zgrep}
|
||||
+: ${GUNZIP:=gunzip}
|
||||
+
|
||||
|
Reference in New Issue
Block a user