From e73608d56e498a7075e7a3e5550aafd76987d7aa Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Tue, 6 Jun 2017 14:46:54 +0800 Subject: lxc: 2.0.0 -> 2.0.8 1)Upgrade lxc from 2.0.0 to 2.0.8. 2)Delete two patches, since it is integrated upstream. Delete Generate-lxc-restore-net-properly.patch,this script has already been rearchitected out of existence by cba98d127bf490b018a016b792ae05fd2d29c5ee Delete Use-AC_HEADER_MAJOR-to-detect-major-minor-makedev.patch,this script has already been rearchitected out of existence by af6824fce9c9536fbcabef8d5547f6c486f55fdf from git://github.com/lxc/lxc.git 3)Modify two patches, since the data has been changed. automake-ensure-VPATH-builds-correctly.patch runtest.patch Signed-off-by: Huang Qiyu Signed-off-by: Bruce Ashfield --- .../files/Generate-lxc-restore-net-properly.patch | 121 --------------------- ...EADER_MAJOR-to-detect-major-minor-makedev.patch | 119 -------------------- .../automake-ensure-VPATH-builds-correctly.patch | 2 +- recipes-containers/lxc/files/runtest.patch | 2 +- 4 files changed, 2 insertions(+), 242 deletions(-) delete mode 100644 recipes-containers/lxc/files/Generate-lxc-restore-net-properly.patch delete mode 100644 recipes-containers/lxc/files/Use-AC_HEADER_MAJOR-to-detect-major-minor-makedev.patch (limited to 'recipes-containers/lxc/files') diff --git a/recipes-containers/lxc/files/Generate-lxc-restore-net-properly.patch b/recipes-containers/lxc/files/Generate-lxc-restore-net-properly.patch deleted file mode 100644 index 5adb730c..00000000 --- a/recipes-containers/lxc/files/Generate-lxc-restore-net-properly.patch +++ /dev/null @@ -1,121 +0,0 @@ -From e08f3573b3561f1f0490624f7ca95b7ccd8157cb Mon Sep 17 00:00:00 2001 -Message-Id: -From: Jim Somerville -Date: Wed, 24 Jun 2015 16:16:38 -0400 -Subject: [PATCH 1/1] Generate lxc-restore-net properly - -It's a script that should be run through the configure -mechanism the same as the others. We simply rename it -to have a .in extension and add it to configure.ac . - -Also, by generating the script from a .in file, it gets -placed into the build directory. This plays nice with -build systems that keep the src separate from the build -directory. Without this change, the install step won't -find the lxc-restore-net script as it still just resides -in the src directory and not in the build directory. - -Upstream-Status: Not applicable. This script has already -been rearchitected out of existence by -cba98d127bf490b018a016b792ae05fd2d29c5ee: -"c/r: use criu option instead of lxc-restore-net - -As of criu 1.5, the --veth-pair argument supports an additional parameter that -is the bridge name to attach to. This enables us to get rid of the goofy -action-script hack that passed bridge names as environment variables. - -This patch is on top of the systemd/lxcfs mount rework patch, as we probably -want to wait to use 1.5 options until it has been out for a while and is in -distros. - -Signed-off-by: Tycho Andersen -Acked-by: Serge E. Hallyn " - -Signed-off-by: Jim Somerville ---- - configure.ac | 1 + - src/lxc/lxc-restore-net | 26 -------------------------- - src/lxc/lxc-restore-net.in | 26 ++++++++++++++++++++++++++ - 3 files changed, 27 insertions(+), 26 deletions(-) - delete mode 100755 src/lxc/lxc-restore-net - create mode 100755 src/lxc/lxc-restore-net.in - -diff --git a/configure.ac b/configure.ac -index 574b2cd..4972803 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -768,6 +768,7 @@ AC_CONFIG_FILES([ - src/lxc/legacy/lxc-ls - src/lxc/lxc.functions - src/lxc/version.h -+ src/lxc/lxc-restore-net - src/python-lxc/Makefile - src/python-lxc/setup.py - -diff --git a/src/lxc/lxc-restore-net b/src/lxc/lxc-restore-net -deleted file mode 100755 -index 6ae3c19..0000000 ---- a/src/lxc/lxc-restore-net -+++ /dev/null -@@ -1,26 +0,0 @@ --#!/bin/sh -- --set -e -- --i=0 --while true; do -- eval "bridge=\$LXC_CRIU_BRIDGE$i" -- eval "veth=\$LXC_CRIU_VETH$i" -- -- if [ -z "$bridge" ] || [ -z "$veth" ]; then -- exit 0 -- fi -- -- if [ "$CRTOOLS_SCRIPT_ACTION" = "network-lock" ]; then -- brctl delif $bridge $veth -- fi -- -- if [ "$CRTOOLS_SCRIPT_ACTION" = "network-unlock" ]; then -- brctl addif $bridge $veth -- ip link set dev $veth up -- fi -- -- i=$((i+1)) --done -- --exit 1 -diff --git a/src/lxc/lxc-restore-net.in b/src/lxc/lxc-restore-net.in -new file mode 100755 -index 0000000..6ae3c19 ---- /dev/null -+++ b/src/lxc/lxc-restore-net.in -@@ -0,0 +1,26 @@ -+#!/bin/sh -+ -+set -e -+ -+i=0 -+while true; do -+ eval "bridge=\$LXC_CRIU_BRIDGE$i" -+ eval "veth=\$LXC_CRIU_VETH$i" -+ -+ if [ -z "$bridge" ] || [ -z "$veth" ]; then -+ exit 0 -+ fi -+ -+ if [ "$CRTOOLS_SCRIPT_ACTION" = "network-lock" ]; then -+ brctl delif $bridge $veth -+ fi -+ -+ if [ "$CRTOOLS_SCRIPT_ACTION" = "network-unlock" ]; then -+ brctl addif $bridge $veth -+ ip link set dev $veth up -+ fi -+ -+ i=$((i+1)) -+done -+ -+exit 1 --- -1.8.3.2 - diff --git a/recipes-containers/lxc/files/Use-AC_HEADER_MAJOR-to-detect-major-minor-makedev.patch b/recipes-containers/lxc/files/Use-AC_HEADER_MAJOR-to-detect-major-minor-makedev.patch deleted file mode 100644 index f9cecc07..00000000 --- a/recipes-containers/lxc/files/Use-AC_HEADER_MAJOR-to-detect-major-minor-makedev.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 5c957671a511441b112b137b88bf0b1f31adac20 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sat, 21 Jan 2017 11:57:13 +0000 -Subject: [PATCH] Use AC_HEADER_MAJOR to detect major()/minor()/makedev() - -commit af6824fce9c9536fbcabef8d5547f6c486f55fdf from -git://github.com/lxc/lxc.git - -Before the change build failed on Gentoo as: - - bdev/lxclvm.c: In function 'lvm_detect': - bdev/lxclvm.c:140:4: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration] - major(statbuf.st_rdev), minor(statbuf.st_rdev)); - ^~~~~ - bdev/lxclvm.c:140:28: error: implicit declaration of function 'minor' [-Werror=implicit-function-declaration] - major(statbuf.st_rdev), minor(statbuf.st_rdev)); - ^~~~~ - -glibc plans to remove from glibc's : - https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html - -Gentoo already applied glibc patch to experimental glibc-2.24 -to start preparingfor the change. - -Autoconf has AC_HEADER_MAJOR to find out which header defines -reqiured macros: - https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html - -This change should also increase portability across other libcs. - -Bug: https://bugs.gentoo.org/604360 -Signed-off-by: Sergei Trofimovich -Signed-off-by: Mark Asselstine ---- - configure.ac | 3 +++ - src/lxc/bdev/lxclvm.c | 9 +++++++++ - src/lxc/conf.c | 8 ++++++++ - src/lxc/lxccontainer.c | 8 ++++++++ - 4 files changed, 28 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 8f31c29..924baa1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -601,6 +601,9 @@ AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include ]) - # Check for some headers - AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/capability.h sys/personality.h utmpx.h sys/timerfd.h]) - -+# lookup major()/minor()/makedev() -+AC_HEADER_MAJOR -+ - # Check for some syscalls functions - AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat]) - -diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c -index 3d41b10..419d1c2 100644 ---- a/src/lxc/bdev/lxclvm.c -+++ b/src/lxc/bdev/lxclvm.c -@@ -32,10 +32,19 @@ - #include - - #include "bdev.h" -+#include "config.h" - #include "log.h" - #include "lxclvm.h" - #include "utils.h" - -+/* major()/minor() */ -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif -+ - lxc_log_define(lxclvm, lxc); - - extern char *dir_new_path(char *src, const char *oldname, const char *name, -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 3b023ef..53406ca 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -39,6 +39,14 @@ - #include - #include - -+/* makedev() */ -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif -+ - #ifdef HAVE_STATVFS - #include - #endif -diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c -index 9f12ca2..aa02833 100644 ---- a/src/lxc/lxccontainer.c -+++ b/src/lxc/lxccontainer.c -@@ -61,6 +61,14 @@ - #include "utils.h" - #include "version.h" - -+/* major()/minor() */ -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif -+ - #if HAVE_IFADDRS_H - #include - #else --- -2.7.4 - diff --git a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch index 2b5c853c..61c0e293 100644 --- a/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch +++ b/recipes-containers/lxc/files/automake-ensure-VPATH-builds-correctly.patch @@ -15,7 +15,7 @@ index d74c10d..6225f78 100644 @@ -66,7 +66,7 @@ buildtest-TESTS: $(TESTS) install-ptest: install -d $(TEST_DIR) - install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so + install -D ../lxc/.libs/liblxc.so $(TEST_DIR)/../lxc/liblxc.so - install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver + install -D $(top_srcdir)/config/test-driver $(TEST_DIR)/../../config/test-driver cp Makefile $(TEST_DIR) diff --git a/recipes-containers/lxc/files/runtest.patch b/recipes-containers/lxc/files/runtest.patch index e4e034b2..6572265f 100644 --- a/recipes-containers/lxc/files/runtest.patch +++ b/recipes-containers/lxc/files/runtest.patch @@ -19,7 +19,7 @@ diff -uNr a/src/tests/Makefile.am b/src/tests/Makefile.am + +install-ptest: + install -d $(TEST_DIR) -+ install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so ++ install -D ../lxc/.libs/liblxc.so $(TEST_DIR)/../lxc/liblxc.so + install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver + cp Makefile $(TEST_DIR) + @(for file in $(TESTS); do install $$file $(TEST_DIR); done;) -- cgit v1.2.3-54-g00ecf