[lxc-devel] [lxd/master] tree-wide: add dummy include package for cgo

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 380 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200722/8956f64a/attachment.bin>
-------------- next part --------------
From ec39b6a12c1705604b55a4c766bb291fff719824 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 22 Jul 2020 19:50:15 +0200
Subject: [PATCH] tree-wide: add dummy include package for cgo

Closes: #7677.
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 lxd/devices.go                   | 1 +
 lxd/include/dummy.go             | 5 +++++
 lxd/main_checkfeature.go         | 1 +
 lxd/main_forkexec.go             | 2 ++
 lxd/main_forkmount.go            | 2 ++
 lxd/main_forknet.go              | 1 +
 lxd/main_forkproxy.go            | 1 +
 lxd/main_forksyscall.go          | 2 ++
 lxd/main_nsexec.go               | 4 ++++
 lxd/seccomp/seccomp.go           | 1 +
 lxd/storage/drivers/utils_cgo.go | 2 ++
 shared/idmap/shift_linux.go      | 1 +
 shared/util_linux_cgo.go         | 1 +
 13 files changed, 24 insertions(+)
 create mode 100644 lxd/include/dummy.go

diff --git a/lxd/devices.go b/lxd/devices.go
index 65aa81ec44..581b66dd59 100644
--- a/lxd/devices.go
+++ b/lxd/devices.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/lxc/lxd/lxd/cgroup"
 	"github.com/lxc/lxd/lxd/device"
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/lxd/instance"
 	"github.com/lxc/lxd/lxd/instance/instancetype"
 	"github.com/lxc/lxd/lxd/resources"
diff --git a/lxd/include/dummy.go b/lxd/include/dummy.go
new file mode 100644
index 0000000000..f9d2deed1f
--- /dev/null
+++ b/lxd/include/dummy.go
@@ -0,0 +1,5 @@
+// +build linux,cgo
+
+package include
+
+import "C"
diff --git a/lxd/main_checkfeature.go b/lxd/main_checkfeature.go
index 17dc46f662..50e1713452 100644
--- a/lxd/main_checkfeature.go
+++ b/lxd/main_checkfeature.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/shared/logger"
 )
 
diff --git a/lxd/main_forkexec.go b/lxd/main_forkexec.go
index d9e282a60c..b59d2bf131 100644
--- a/lxd/main_forkexec.go
+++ b/lxd/main_forkexec.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forkmount.go b/lxd/main_forkmount.go
index c71e6d2f23..c46df4a63a 100644
--- a/lxd/main_forkmount.go
+++ b/lxd/main_forkmount.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_forknet.go b/lxd/main_forknet.go
index d3d17c5cd6..a728c86684 100644
--- a/lxd/main_forknet.go
+++ b/lxd/main_forknet.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/shared/netutils"
 )
 
diff --git a/lxd/main_forkproxy.go b/lxd/main_forkproxy.go
index 8417adad12..98d2d80996 100644
--- a/lxd/main_forkproxy.go
+++ b/lxd/main_forkproxy.go
@@ -18,6 +18,7 @@ import (
 	"github.com/lxc/lxd/lxd/daemon"
 	"github.com/lxc/lxd/lxd/device"
 	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/shared"
 	"github.com/lxc/lxd/shared/netutils"
 )
diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
index f807ef5e6b..9983486166 100644
--- a/lxd/main_forksyscall.go
+++ b/lxd/main_forksyscall.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/lxd/main_nsexec.go b/lxd/main_nsexec.go
index 787c350c85..540e85c14d 100644
--- a/lxd/main_nsexec.go
+++ b/lxd/main_nsexec.go
@@ -18,6 +18,10 @@
  */
 package main
 
+import (
+	_ "github.com/lxc/lxd/lxd/include"
+)
+
 /*
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index 26a30b2b34..fcc233b72f 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -19,6 +19,7 @@ import (
 	liblxc "gopkg.in/lxc/go-lxc.v2"
 
 	deviceConfig "github.com/lxc/lxd/lxd/device/config"
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/lxd/project"
 	"github.com/lxc/lxd/lxd/state"
 	"github.com/lxc/lxd/lxd/ucred"
diff --git a/lxd/storage/drivers/utils_cgo.go b/lxd/storage/drivers/utils_cgo.go
index 8c3bd7ce86..70dcd517e4 100644
--- a/lxd/storage/drivers/utils_cgo.go
+++ b/lxd/storage/drivers/utils_cgo.go
@@ -9,6 +9,8 @@ import (
 	"unsafe"
 
 	"github.com/pkg/errors"
+
+	_ "github.com/lxc/lxd/lxd/include"
 )
 
 /*
diff --git a/shared/idmap/shift_linux.go b/shared/idmap/shift_linux.go
index a83660e807..dcb64796ae 100644
--- a/shared/idmap/shift_linux.go
+++ b/shared/idmap/shift_linux.go
@@ -12,6 +12,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
+	_ "github.com/lxc/lxd/lxd/include"
 	"github.com/lxc/lxd/shared"
 )
 
diff --git a/shared/util_linux_cgo.go b/shared/util_linux_cgo.go
index 9adbafc5b9..d025791381 100644
--- a/shared/util_linux_cgo.go
+++ b/shared/util_linux_cgo.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"unsafe"
 
+	_ "github.com/lxc/lxd/lxd/include"
 	"golang.org/x/sys/unix"
 )