[Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion
@ 2019-01-12 21:08 Fabrice Fontaine
  2019-01-12 21:08 ` [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0 Fabrice Fontaine
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-01-12 21:08 UTC (permalink / raw)
  To: buildroot

lxc uses the completionsdir variable from bash-completions.pc to decide
where to install things.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/lxc/lxc.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index c9838fb229..c758a15b9d 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -17,6 +17,10 @@ LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
 	--disable-werror \
 	$(if $(BR2_PACKAGE_BASH),,--disable-bash)
 
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+LXC_DEPENDENCIES += bash-completion
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 LXC_CONF_OPTS += --enable-gnutls
 LXC_DEPENDENCIES += gnutls
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0
  2019-01-12 21:08 [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Fabrice Fontaine
@ 2019-01-12 21:08 ` Fabrice Fontaine
  2019-01-13 13:28   ` Thomas Petazzoni
  2019-01-13 13:29 ` [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Thomas Petazzoni
  2019-01-24 16:17 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2019-01-12 21:08 UTC (permalink / raw)
  To: buildroot

Remove both patchrs (already in version)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...01-stringutils-include-stdarg-for-va_list.patch | 30 ------------------
 ...gure.ac-fix-build-without-stack-protector.patch | 37 ----------------------
 package/lxc/lxc.hash                               |  2 +-
 package/lxc/lxc.mk                                 |  2 +-
 4 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 package/lxc/0001-stringutils-include-stdarg-for-va_list.patch
 delete mode 100644 package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch

diff --git a/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch b/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch
deleted file mode 100644
index b1fe989237..0000000000
--- a/package/lxc/0001-stringutils-include-stdarg-for-va_list.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b7df06ad14c04f18b7db5b64d5142b802bf64cb2 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 3 Dec 2018 22:18:16 +0100
-Subject: [PATCH] stringutils: include stdarg for va_list
-
-Fixes:
- - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/lxc/lxc/commit/b7df06ad14c04f18b7db5b64d5142b802bf64cb2]
----
- src/lxc/string_utils.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lxc/string_utils.h b/src/lxc/string_utils.h
-index 4065e4e6..d4e633cc 100644
---- a/src/lxc/string_utils.h
-+++ b/src/lxc/string_utils.h
-@@ -20,6 +20,8 @@
- #ifndef __LXC_STRING_UTILS_H
- #define __LXC_STRING_UTILS_H
- 
-+#include <stdarg.h>
-+
- #include "config.h"
- 
- #include "initutils.h"
--- 
-2.14.1
-
diff --git a/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch b/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch
deleted file mode 100644
index 744fcbbed3..0000000000
--- a/package/lxc/0002-configure.ac-fix-build-without-stack-protector.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3aa7271157d3c815a4426c1f8eaea2f3b6dafa6a Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 4 Dec 2018 08:40:05 +0100
-Subject: [PATCH] configure.ac: fix build without stack-protector
-
-Compiler based hardening (including -fstack-protector-strong) are
-enabled since version 3.0.3 and
-https://github.com/lxc/lxc/commit/2268c27754152aa538db2c9e3753d72d19bcd17a
-
-However, some compilers could missed the needed library (-lssp or
--lssp_nonshared) at linking step so use ax_check_link_flag instead of
-ax_check_compile_flag
-
-Fixes:
- - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a9adac3..032e4cfd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -696,7 +696,7 @@ AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror]
- AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [CFLAGS="$CFLAGS -fstack-clash-protection"],,[-Werror])
--AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
-+AX_CHECK_LINK_FLAG([-fstack-protector-strong], [CFLAGS="$CFLAGS -fstack-protector-strong"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-g], [CFLAGS="$CFLAGS -g"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([--mcet -fcf-protection], [CFLAGS="$CFLAGS --mcet -fcf-protection"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"],,[-Werror])
--- 
-2.14.1
-
diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index c741a5baba..aad38ca57a 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	620cb832cc02c63bf4d330657bf6176544e145da281ee384a34d689635a19841	lxc-3.0.3.tar.gz
+sha256	4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5	lxc-3.1.0.tar.gz
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index c758a15b9d..0b7b7a67b5 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LXC_VERSION = 3.0.3
+LXC_VERSION = 3.1.0
 LXC_SITE = https://linuxcontainers.org/downloads/lxc
 LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0
  2019-01-12 21:08 ` [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0 Fabrice Fontaine
@ 2019-01-13 13:28   ` Thomas Petazzoni
  2019-01-13 13:56     ` Fabrice Fontaine
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2019-01-13 13:28 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 12 Jan 2019 22:08:44 +0100, Fabrice Fontaine wrote:
> Remove both patchrs (already in version)

patchrs -> patches

Since you're removing both patches, we no longer have any patch
touching configure.ac. Is AUTORECONF = YES still needed ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0
  2019-01-13 13:28   ` Thomas Petazzoni
@ 2019-01-13 13:56     ` Fabrice Fontaine
  0 siblings, 0 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-01-13 13:56 UTC (permalink / raw)
  To: buildroot

Dear Thomas,

Le dim. 13 janv. 2019 ? 14:29, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a ?crit :
>
> Hello,
>
> On Sat, 12 Jan 2019 22:08:44 +0100, Fabrice Fontaine wrote:
> > Remove both patchrs (already in version)
>
> patchrs -> patches
>
> Since you're removing both patches, we no longer have any patch
> touching configure.ac. Is AUTORECONF = YES still needed ?
Indeed, I sent a v2.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion
  2019-01-12 21:08 [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Fabrice Fontaine
  2019-01-12 21:08 ` [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0 Fabrice Fontaine
@ 2019-01-13 13:29 ` Thomas Petazzoni
  2019-01-24 16:17 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2019-01-13 13:29 UTC (permalink / raw)
  To: buildroot

Hello,

On Sat, 12 Jan 2019 22:08:43 +0100, Fabrice Fontaine wrote:
> lxc uses the completionsdir variable from bash-completions.pc to decide
> where to install things.
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/lxc/lxc.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion
  2019-01-12 21:08 [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Fabrice Fontaine
  2019-01-12 21:08 ` [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0 Fabrice Fontaine
  2019-01-13 13:29 ` [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Thomas Petazzoni
@ 2019-01-24 16:17 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-01-24 16:17 UTC (permalink / raw)
  To: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > lxc uses the completionsdir variable from bash-completions.pc to decide
 > where to install things.

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2018.11.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-01-24 16:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-12 21:08 [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Fabrice Fontaine
2019-01-12 21:08 ` [Buildroot] [PATCH 2/2] lxc: bump to version 3.1.0 Fabrice Fontaine
2019-01-13 13:28   ` Thomas Petazzoni
2019-01-13 13:56     ` Fabrice Fontaine
2019-01-13 13:29 ` [Buildroot] [PATCH 1/2] lxc: add optional dependency to bash-completion Thomas Petazzoni
2019-01-24 16:17 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox