diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
commit | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch) | |
tree | 852c90a4bf354c30ea66504f70bfab5401fba18d /app-emulation/lxc/files | |
parent | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff) |
gentoo resync : 28.04.2018
Diffstat (limited to 'app-emulation/lxc/files')
-rw-r--r-- | app-emulation/lxc/files/lxc-1.0.11-major.patch | 64 | ||||
-rw-r--r-- | app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch | 35 | ||||
-rw-r--r-- | app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch (renamed from app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch) | 12 |
3 files changed, 6 insertions, 105 deletions
diff --git a/app-emulation/lxc/files/lxc-1.0.11-major.patch b/app-emulation/lxc/files/lxc-1.0.11-major.patch deleted file mode 100644 index 8a3c2b2bd6d3..000000000000 --- a/app-emulation/lxc/files/lxc-1.0.11-major.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c -index 59eda7e4..44b71d4c 100644 ---- a/src/lxc/bdev.c -+++ b/src/lxc/bdev.c -@@ -41,6 +41,7 @@ - #include <libgen.h> - #include <linux/loop.h> - #include <dirent.h> -+#include <sys/sysmacros.h> - - #include "lxc.h" - #include "config.h" -@@ -58,9 +59,6 @@ - #ifdef MAJOR_IN_MKDEV - # include <sys/mkdev.h> - #endif --#ifdef MAJOR_IN_SYSMACROS --# include <sys/sysmacros.h> --#endif - - #ifndef BLKGETSIZE64 - #define BLKGETSIZE64 _IOR(0x12,114,size_t) -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 5d583d5f..d4217c27 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -36,14 +36,12 @@ - #include <pwd.h> - #include <grp.h> - #include <time.h> -+#include <sys/sysmacros.h> - - /* makedev() */ - #ifdef MAJOR_IN_MKDEV - # include <sys/mkdev.h> - #endif --#ifdef MAJOR_IN_SYSMACROS --# include <sys/sysmacros.h> --#endif - - #ifdef HAVE_STATVFS - #include <sys/statvfs.h> -diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c -index 3963a3ee..30ac6733 100644 ---- a/src/lxc/lxccontainer.c -+++ b/src/lxc/lxccontainer.c -@@ -36,6 +36,7 @@ - #include <stdint.h> - #include <grp.h> - #include <sys/syscall.h> -+#include <sys/sysmacros.h> - - #include <lxc/lxccontainer.h> - #include <lxc/version.h> -@@ -60,9 +61,6 @@ - #ifdef MAJOR_IN_MKDEV - # include <sys/mkdev.h> - #endif --#ifdef MAJOR_IN_SYSMACROS --# include <sys/sysmacros.h> --#endif - - #if HAVE_IFADDRS_H - #include <ifaddrs.h> diff --git a/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch b/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch deleted file mode 100644 index e9e0e6c98dfd..000000000000 --- a/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: lxc-lxc-1.0.8/config/bash/Makefile.am -=================================================================== ---- lxc-lxc-1.0.8.orig/config/bash/Makefile.am -+++ lxc-lxc-1.0.8/config/bash/Makefile.am -@@ -2,12 +2,12 @@ EXTRA_DIST = lxc - - if ENABLE_BASH - install-bash: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ -- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/ -+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/ -+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/ - - uninstall-bash: -- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc -- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || : -+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc -+ rmdir $(DESTDIR)$(datarootdir)/bash-completion// || : - - install-data-local: install-bash - uninstall-local: uninstall-bash -Index: lxc-lxc-1.0.8/config/bash/lxc.in -=================================================================== ---- lxc-lxc-1.0.8.orig/config/bash/lxc.in -+++ lxc-lxc-1.0.8/config/bash/lxc.in -@@ -1,4 +1,3 @@ --have lxc-start && { - _lxc_names() { - COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) - } -@@ -100,4 +99,3 @@ have lxc-start && { - - complete -o default -F _lxc_generic_o lxc-clone - complete -o default -F _lxc_generic_o lxc-start-ephemeral --} diff --git a/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch b/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch index d8d0bac55a76..2a08eedb1c2d 100644 --- a/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch +++ b/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch @@ -1,5 +1,5 @@ diff --git a/config/bash/lxc.in b/config/bash/lxc.in -index 344d5cb2..f051eaae 100644 +index 43056882..0a22d4ad 100644 --- a/config/bash/lxc.in +++ b/config/bash/lxc.in @@ -1,4 +1,3 @@ @@ -7,16 +7,16 @@ index 344d5cb2..f051eaae 100644 _lxc_names() { COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) ) } -@@ -100,4 +99,3 @@ _have lxc-start && { +@@ -108,4 +107,3 @@ _have lxc-start && { + complete -o default -F _lxc_generic_t lxc-create - complete -o default -F _lxc_generic_o lxc-clone - complete -o default -F _lxc_generic_o lxc-start-ephemeral + complete -o default -F _lxc_generic_o lxc-copy -} diff --git a/configure.ac b/configure.ac -index 2ea88c19..f52d772a 100644 +index 50c99836..0569caec 100644 --- a/configure.ac +++ b/configure.ac -@@ -429,7 +429,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) +@@ -395,7 +395,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"]) AM_COND_IF([ENABLE_BASH], [AC_MSG_CHECKING([bash completion directory]) PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , |