[meta-virtualization] [PATCH] docker: override GOROOT at build time
Usually $GOROOT is set by go tool, but if sstate is specified, $GOROOT
is set to the path in the first project. If docker is built in the
another project(with same SSTATE_DIR) later, and the first project is removed,
the following error will be seen:
| go: cannot find GOROOT directory:
/path/to/previous/project/bitbake_build/tmp/sysroots/x86_64-linux/usr/lib/x86_64-wrs-linux/go
This commit is overriding $GOROOT stored in the go tool in sstate cache,
making sure it is set to the correct path in current project.
See more information here: https://golang.org/doc/install#install
Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
recipes-containers/docker/docker_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-containers/docker/docker_git.bb
b/recipes-containers/docker/docker_git.bb
index 597ff4f..4eea3f4 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -82,6 +82,7 @@ do_compile() {
mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
export
GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
+ export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
cd -
# Pass the needed cflags/ldflags so that cgo
--
1.9.1
--
___
meta-virtualization mailing list
meta-virtualization@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-virtualization
[meta-virtualization] [PATCH 1/1] libvirt: uprev to 1.3.2
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
.../0001-to-fix-build-error.patch | 24 ++---
recipes-extended/libvirt/libvirt-python.inc| 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++---
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch| 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 -
.../{libvirt_1.2.19.bb => libvirt_1.3.2.bb}| 7 +-
7 files changed, 85 insertions(+), 125 deletions(-)
rename recipes-extended/libvirt/{libvirt-1.2.19 =>
libvirt-1.3.2}/0001-to-fix-build-error.patch (65%)
rename recipes-extended/libvirt/{libvirt_1.2.19.bb => libvirt_1.3.2.bb} (97%)
diff --git
a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
similarity index 65%
rename from
recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
rename to recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
index 61a54e1..089ee33 100644
--- a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
@@ -1,4 +1,4 @@
-From 62514c8c2925e48a4f20ce3d7d48387851cb76a5 Mon Sep 17 00:00:00 2001
+From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimao...@cn.fujitsu.com>
Date: Fri, 31 Jul 2015 03:17:07 +0900
Subject: [PATCH] to fix build error
@@ -13,32 +13,34 @@ The error likes as following
| make[3]: *** Waiting for unfinished jobs
Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com>
+[ywei: rebased to libvirt-1.3.2]
+Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
docs/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index daf37b6..125c5fd 100644
+index 1b4353b..c199551 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
-@@ -162,7 +162,7 @@ EXTRA_DIST=\
- sitemap.html.in aclperms.htmlinc \
- todo.pl hvsupport.pl todo.cfg-example
+@@ -164,7 +164,7 @@ EXTRA_DIST=\
+ todo.pl hvsupport.pl todo.cfg-example \
+ $(schema_DATA)
-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am
-@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl
page.xsl sitemap.html.in
- $(top_srcdir)/docs/subsite.xsl $< > $@ \
- || { rm $@ && exit 1; }; fi
+@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl
$(api_DATA) \
+ convert -rotate 90 $< $@
--%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
-+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
+ %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
+- sitemap.html.in $(acl_generated)
++ sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \
--
-1.8.4.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt-python.inc
b/recipes-extended/libvirt/libvirt-python.inc
index 015b4b6..c1dafe9 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/*
${libdir}/${PYTHON_DIR}/*"
SRC_URI +=
"http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python;
SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
-SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae"
-SRC_URI[libvirt_python.sha256sum] =
"88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49"
+SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
+SRC_URI[libvirt_python.sha256sum] =
"6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git
a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
index c2606bd..16c3a16 100644
---
a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
+++
b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
@@ -1,4 +1,4 @@
-From 171fc890bb5972e566bd7b3d87a40ac434a5b3e6 Mon Sep 17 00:00:00 2001
+From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001
From: Mark Asselstine &l
[meta-virtualization] [V3][PATCH 0/1] libvirt: uprev to 1.3.2
V3 changes:
Bring back the patch libvirt-use-pkg-config-to-locate-libcap.patch,
which was dropped in V2 by mistake.
V2 changes:
1. use git "-M" option to generate patch for easy review.
2. Drop the patch
0001-Add-missing-split-to-properly-retrieve-cflags-and-ld.patch
in V1 as the patch was actually fixing an issue introduced during
rebasing 1.2.19 patches.
3. Rebase existing patches to make 2) happen.
-
commit c3e03a8f5d4c8dce3d4d4076b2be5cb9bb44a8b5
Author: Yunguo Wei <yunguo@windriver.com>
Date: Mon Mar 28 16:54:04 2016 +0800
libvirt: uprev to 1.3.2
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo@windriver.com>
Added Files:
.../libvirt-1.3.2/0001-to-fix-build-error.patch| 46
recipes-extended/libvirt/libvirt_1.3.2.bb | 287 +
Removed Files:
--
.../libvirt-1.2.19/0001-to-fix-build-error.patch | 44
recipes-extended/libvirt/libvirt_1.2.19.bb | 287 -
Remaining Changes (diffstat):
-
recipes-extended/libvirt/libvirt-python.inc| 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++---
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch| 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 -
---
Test steps:
t@SDP_Wildcat_Pass-1:/media# libvirtd -V
libvirtd (libvirt) 1.3.2
root@SDP_Wildcat_Pass-1:/media# systemctl status libvirtd
● libvirtd.service - Virtualization daemon
Loaded: loaded (/lib/systemd/system/libvirtd.service; enabled; vendor
preset: enabled)
Active: active (running) since Thu 2016-03-31 03:43:57 UTC; 2s ago
Docs: man:libvirtd(8)
http://libvirt.org
Process: 2200 ExecStart=/usr/sbin/libvirtd $LIBVIRTD_ARGS
(code=exited, status=0/SUCCESS)
Main PID: 2202 (libvirtd)
CGroup: /system.slice/libvirtd.service
├─2026 /usr/bin/dnsmasq
--conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro
--dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper
├─2027 /usr/bin/dnsmasq
--conf-file=/var/lib/libvirt/dnsmasq/default.conf --leasefile-ro
--dhcp-script=/usr/lib64/libvirt/libvirt_leaseshelper
└─2202 /usr/sbin/libvirtd --listen --daemon
Mar 31 03:43:55 SDP_Wildcat_Pass-1 systemd[1]: Starting Virtualization
daemon...
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+: 2200: info : libvirt version: 1.3.2
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+: 2200: info : hostname: SDP_Wildcat_Pass-1
Mar 31 03:43:57 SDP_Wildcat_Pass-1 libvirtd[2200]: 2016-03-31
03:43:57.284+: 2200: warning : virGetHostnameImpl:703 : getaddrinfo
failed for 'SD...ot known
Mar 31 03:43:57 SDP_Wildcat_Pass-1 systemd[1]: Started Virtualization
daemon.
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq[2026]: read /etc/hosts - 6
addresses
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq[2026]: read
/var/lib/libvirt/dnsmasq/default.addnhosts - 0 addresses
Mar 31 03:43:57 SDP_Wildcat_Pass-1 dnsmasq-dhcp[2026]: read
/var/lib/libvirt/dnsmasq/default.hostsfile
Hint: Some lines were ellipsized, use -l to show in full.
root@SDP_Wildcat_Pass-1:/media# cat test.xml
test
2048000
1024000
1
hvm
/media/guest.kernel
root=/dev/vda2 selinux=0 enforcing=0
console=ttyS0 rw
root@SDP_Wildcat_Pass-1:/media# virsh define test.xml
Domain test defined from test.xml
root@SDP_Wildcat_Pass-1:/media# virsh start test
Domain test started
root@SDP_Wildcat_Pass-1:/media# virsh console test
Connected to domain test
Escape character is ^]
EXT4-fs (vda2): re-mounted. Opts: (null)
[ OK ] Started Remount Root and Kernel File Systems.
fuse init (API version 7.22)
Starting Create Static Device Nodes in /dev...
[ OK ] Started Load Kernel Modules.
Mounting FUSE Control File System...
Starting Apply Kernel Variables...
[ OK ] Mounted FUSE Control File System.
[ OK ] Started Apply Kernel Variables.
[ OK ] Started LSB: Set hostname based on /etc/hostname.
Starting (null)...
[ OK ] Started (null).
[ OK ] Started Create Static Device Nodes in /dev.
Starting udev Kernel Device Manager...
[ OK ] Reached target Local File Systems (Pre).
Mounting /mnt/huge...
systemd-udevd[178]: starting version 216
Mounting /var/volatile...
[ OK ] Mounted /mnt/huge.
[ OK ] Started udev Kernel Device Manager.
[ OK ]
[meta-virtualization] [PATCH 1/1] libvirt: uprev to 1.3.2
Release notes here http://libvirt.org/news.html.
Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
.../0001-to-fix-build-error.patch | 24 ++---
recipes-extended/libvirt/libvirt-python.inc| 4 +-
...vert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch | 52 +++---
.../libvirt/libvirt/libvirt_api_xml_path.patch | 14 +--
recipes-extended/libvirt/libvirt/runptest.patch| 2 +-
...ibvirt-net-rpc-to-virt-host-validate-when.patch | 107 -
.../{libvirt_1.2.19.bb => libvirt_1.3.2.bb}| 6 +-
7 files changed, 85 insertions(+), 124 deletions(-)
rename recipes-extended/libvirt/{libvirt-1.2.19 =>
libvirt-1.3.2}/0001-to-fix-build-error.patch (65%)
rename recipes-extended/libvirt/{libvirt_1.2.19.bb => libvirt_1.3.2.bb} (97%)
diff --git
a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
similarity index 65%
rename from
recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
rename to recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
index 61a54e1..089ee33 100644
--- a/recipes-extended/libvirt/libvirt-1.2.19/0001-to-fix-build-error.patch
+++ b/recipes-extended/libvirt/libvirt-1.3.2/0001-to-fix-build-error.patch
@@ -1,4 +1,4 @@
-From 62514c8c2925e48a4f20ce3d7d48387851cb76a5 Mon Sep 17 00:00:00 2001
+From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimao...@cn.fujitsu.com>
Date: Fri, 31 Jul 2015 03:17:07 +0900
Subject: [PATCH] to fix build error
@@ -13,32 +13,34 @@ The error likes as following
| make[3]: *** Waiting for unfinished jobs
Signed-off-by: Lei Maohui <leimao...@cn.fujitsu.com>
+[ywei: rebased to libvirt-1.3.2]
+Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
docs/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index daf37b6..125c5fd 100644
+index 1b4353b..c199551 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
-@@ -162,7 +162,7 @@ EXTRA_DIST=\
- sitemap.html.in aclperms.htmlinc \
- todo.pl hvsupport.pl todo.cfg-example
+@@ -164,7 +164,7 @@ EXTRA_DIST=\
+ todo.pl hvsupport.pl todo.cfg-example \
+ $(schema_DATA)
-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc
$(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
$(srcdir)/genaclperms.pl Makefile.am
-@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl
page.xsl sitemap.html.in
- $(top_srcdir)/docs/subsite.xsl $< > $@ \
- || { rm $@ && exit 1; }; fi
+@@ -221,7 +221,7 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl
$(api_DATA) \
+ convert -rotate 90 $< $@
--%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
-+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
+ %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
+- sitemap.html.in $(acl_generated)
++ sitemap.html.in
@if [ -x $(XSLTPROC) ] ; then \
echo "Generating $@"; \
name=`echo $@ | sed -e 's/.tmp//'`; \
--
-1.8.4.2
+1.9.1
diff --git a/recipes-extended/libvirt/libvirt-python.inc
b/recipes-extended/libvirt/libvirt-python.inc
index 015b4b6..c1dafe9 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/*
${libdir}/${PYTHON_DIR}/*"
SRC_URI +=
"http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python;
SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
-SRC_URI[libvirt_python.md5sum] = "429e328028fc59b62404a4163004f2ae"
-SRC_URI[libvirt_python.sha256sum] =
"88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49"
+SRC_URI[libvirt_python.md5sum] = "ed018c714d7ddbe93221c796dff283ed"
+SRC_URI[libvirt_python.sha256sum] =
"6d35ae9e7801573393b9c92471f39e6700d479f10b641df81d041b469f160bf8"
export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git
a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
index c2606bd..16c3a16 100644
---
a/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
+++
b/recipes-extended/libvirt/libvirt/Revert-build-add-prefix-to-SYSTEMD_UNIT_DIR.patch
@@ -1,4 +1,4 @@
-From 171fc890bb5972e566bd7b3d87a40ac434a5b3e6 Mon Sep 17 00:00:00 2001
+From dd915e7f70e676aea93f750c75d16ce646e71e4b Mon Sep 17 00:00:00 2001
From: Mark Asselstine &l
[meta-virtualization] [PATCH] go-fsnotify: switch to new repository on github
fsnotify is changed to new repository on gihub, so adapt this chanage
accordingly to avoid fetch failure.
Signed-off-by: Yunguo Wei <yunguo@windriver.com>
---
recipes-devtools/go/go-fsnotify_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-devtools/go/go-fsnotify_git.bb
b/recipes-devtools/go/go-fsnotify_git.bb
index e5bcf14..1d9fbdc 100644
--- a/recipes-devtools/go/go-fsnotify_git.bb
+++ b/recipes-devtools/go/go-fsnotify_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=c38914c9a7ab03bb2b96d4baaee10769"
SRCNAME = "fsnotify"
-PKG_NAME = "github.com/go-fsnotify/${SRCNAME}"
+PKG_NAME = "github.com/fsnotify/${SRCNAME}"
SRC_URI = "git://${PKG_NAME}.git"
SRCREV = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"
--
2.11.0
--
___
meta-virtualization mailing list
meta-virtualization@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-virtualization
[meta-virtualization] [PATCH] lxc: restore the ability to move nl80211 device
nl80211 device can't be moved to another namespace due to
e389f2afd8509(start: unify and simplify network creation), and lxc
community has fixed this issue with:
commit 3dd7829433f63b2ec1323a1f237efa7d67ea6e2b lxc upstream
This patch is grabbing the commit above, and should be abandoned with
lxc uprev afterwards.
See more details here: https://github.com/lxc/lxc/issues/3105
Signed-off-by: Yunguo Wei
---
...k-restore-ability-to-move-nl80211-devices.patch | 94 ++
recipes-containers/lxc/lxc_3.2.1.bb| 1 +
2 files changed, 95 insertions(+)
create mode 100644
recipes-containers/lxc/files/network-restore-ability-to-move-nl80211-devices.patch
diff --git
a/recipes-containers/lxc/files/network-restore-ability-to-move-nl80211-devices.patch
b/recipes-containers/lxc/files/network-restore-ability-to-move-nl80211-devices.patch
new file mode 100644
index 000..aa1aecd
--- /dev/null
+++
b/recipes-containers/lxc/files/network-restore-ability-to-move-nl80211-devices.patch
@@ -0,0 +1,94 @@
+From 3dd7829433f63b2ec1323a1f237efa7d67ea6e2b Mon Sep 17 00:00:00 2001
+From: Christian Brauner
+Date: Fri, 26 Jul 2019 08:20:02 +0200
+Subject: [PATCH] network: restore ability to move nl80211 devices
+
+Closes #3105.
+Signed-off-by: Christian Brauner
+---
+ src/lxc/network.c | 31 +--
+ 1 file changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/src/lxc/network.c b/src/lxc/network.c
+index 9755116..7684f95 100644
+--- a/src/lxc/network.c
b/src/lxc/network.c
+@@ -1248,22 +1248,21 @@ static int lxc_netdev_rename_by_name_in_netns(pid_t
pid, const char *old,
+ static int lxc_netdev_move_wlan(char *physname, const char *ifname, pid_t pid,
+ const char *newname)
+ {
+- char *cmd;
++ __do_free char *cmd = NULL;
+ pid_t fpid;
+- int err = -1;
+
+ /* Move phyN into the container. TODO - do this using netlink.
+* However, IIUC this involves a bit more complicated work to talk to
+* the 80211 module, so for now just call out to iw.
+*/
+ cmd = on_path("iw", NULL);
+- if (!cmd)
+- goto out1;
+- free(cmd);
++ if (!cmd) {
++ return -1;
++ }
+
+ fpid = fork();
+ if (fpid < 0)
+- goto out1;
++ return -1;
+
+ if (fpid == 0) {
+ char pidstr[30];
+@@ -1274,21 +1273,18 @@ static int lxc_netdev_move_wlan(char *physname, const
char *ifname, pid_t pid,
+ }
+
+ if (wait_for_pid(fpid))
+- goto out1;
++ return -1;
+
+- err = 0;
+ if (newname)
+- err = lxc_netdev_rename_by_name_in_netns(pid, ifname, newname);
++ return lxc_netdev_rename_by_name_in_netns(pid, ifname, newname);
+
+-out1:
+- free(physname);
+- return err;
++ return 0;
+ }
+
+ int lxc_netdev_move_by_name(const char *ifname, pid_t pid, const char*
newname)
+ {
++ __do_free char *physname = NULL;
+ int index;
+- char *physname;
+
+ if (!ifname)
+ return -EINVAL;
+@@ -3279,13 +3275,20 @@ int lxc_network_move_created_netdev_priv(struct
lxc_handler *handler)
+ return 0;
+
+ lxc_list_for_each(iterator, network) {
++ __do_free char *physname = NULL;
+ int ret;
+ struct lxc_netdev *netdev = iterator->elem;
+
+ if (!netdev->ifindex)
+ continue;
+
+- ret = lxc_netdev_move_by_index(netdev->ifindex, pid, NULL);
++ if (netdev->type == LXC_NET_PHYS)
++ physname = is_wlan(netdev->link);
++
++ if (physname)
++ ret = lxc_netdev_move_wlan(physname, netdev->link, pid,
NULL);
++ else
++ ret = lxc_netdev_move_by_index(netdev->ifindex, pid,
NULL);
+ if (ret) {
+ errno = -ret;
+ SYSERROR("Failed to move network device \"%s\" with
ifindex %d to network namespace %d",
+--
+2.7.4
+
diff --git a/recipes-containers/lxc/lxc_3.2.1.bb
b/recipes-containers/lxc/lxc_3.2.1.bb
index 585ab8f..4b8f10b 100644
--- a/recipes-containers/lxc/lxc_3.2.1.bb
+++ b/recipes-containers/lxc/lxc_3.2.1.bb
@@ -43,6 +43,7 @@ SRC_URI =
"http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
file://template-make-busybox-template-compatible-with-core-.patch \
file://tests-our-init-is-not-busybox.patch \
file://tests-add-no-validate-when-using-download-template.patch \
+ file://network-restore-ability-to-move-nl80211-devices.patch \
file://dnsmasq.conf \
file://lxc-net \
"
--
2.7.4
--
___
meta-virtualization mailing list
meta-virtualization@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-virtualization
