Skip to contentSkip to conversation

lxc: bump to version 3.0.1

PATCH New Fabrice Fontaine 3 participants 3 messages Jun 2, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 lxc: bump to version 3.0.1

Remove both patches (already in version)

Signed-off-by Fabrice Fontaine <[email protected]>
---
 ...ools-lxc_monitor-include-missing-stddef.h.patch | 40 ------------
 ...tion-with-static-libcap-and-shared-gnutls.patch | 73 ----------------------
 package/lxc/lxc.hash                               |  2 +-
 package/lxc/lxc.mk                                 |  2 +-
 4 files changed, 2 insertions(+), 115 deletions(-)
 delete mode 100644 package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch
 delete mode 100644 package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch
package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch deleted +0 -40
deleted file mode 100644
index 525d5d72b0..0000000000
@@ -1,40 +0,0 @@
-From 77d407537f57c3fb92787bdda1eeaec7941d344f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Fri, 20 Apr 2018 12:26:33 +0200
-Subject: [PATCH] lxc/tools/lxc_monitor: include missing <stddef.h>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-lxc_monitor.c uses offsetof(), so it should include
-<stddef.h>. Otherwise the build fails with the musl C library:
-
-tools/lxc_monitor.c: In function ???lxc_abstract_unix_connect???:
-tools/lxc_monitor.c:324:9: warning: implicit declaration of function ???offsetof??? [-Wimplicit-function-declaration]
-         offsetof(struct sockaddr_un, sun_path) + len + 1);
-         ^~~~~~~~
-tools/lxc_monitor.c:324:18: error: expected expression before ???struct???
-         offsetof(struct sockaddr_un, sun_path) + len + 1);
-                  ^~~~~~
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: https://github.com/lxc/lxc/pull/2285
----
- src/lxc/tools/lxc_monitor.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lxc/tools/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c
-index 72dca8e2..c60e14ff 100644
---- a/src/lxc/tools/lxc_monitor.c
-+++ b/src/lxc/tools/lxc_monitor.c
-@@ -30,6 +30,7 @@
- #include <libgen.h>
- #include <poll.h>
- #include <regex.h>
-+#include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.14.3
-
package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch deleted +0 -73

73 lines not on this page · raw message

package/lxc/lxc.hash +1 -1
index e2f9108507..f46b1e1f5e 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	6230224c27f050201b372b18a9f39cd220ed584899c5f0cf73c6b313dabc8d8a	lxc-3.0.0.tar.gz
+sha256	45986c49be1c048fa127bd3e7ea1bd3347e25765c008a09a2e4c233151a2d5db	lxc-3.0.1.tar.gz
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
package/lxc/lxc.mk +1 -1
index 5a7038f88f..d1487e0e59 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LXC_VERSION = 3.0.0
+LXC_VERSION = 3.0.1
 LXC_SITE = https://linuxcontainers.org/downloads/lxc
 LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 lxc: bump to version 3.0.1

Hello,

Quoted 11 lines · Fabrice Fontaine

Remove both patches (already in version)

Signed-off-by Fabrice Fontaine <[email protected]>
---
 ...ools-lxc_monitor-include-missing-stddef.h.patch | 40 ------------
 ...tion-with-static-libcap-and-shared-gnutls.patch | 73 ----------------------
 package/lxc/lxc.hash                               |  2 +-
 package/lxc/lxc.mk                                 |  2 +-
 4 files changed, 2 insertions(+), 115 deletions(-)
 delete mode 100644 package/lxc/0001-lxc-tools-lxc_monitor-include-missing-stddef.h.patch
 delete mode 100644 package/lxc/0002-Fix-compilation-with-static-libcap-and-shared-gnutls.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com