diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-04-25 14:55:34 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-04-25 16:26:23 -0400 |
| commit | 38cdaf39bfdbb1369567debc112e91c379f6d792 (patch) | |
| tree | 482bc677fddaa37af0df2f223a35294caf91d81d /recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch | |
| parent | 3498e94adfcb264965560c34ca4b01652fa7187f (diff) | |
| download | meta-virtualization-38cdaf39bfdbb1369567debc112e91c379f6d792.tar.gz | |
lxc: update to 2.0.0
2.0.0 is released, and contains many of the patches we've been carrying for
1.x.
With this updated, we drop upstream backports (and submitted patches), and
refresh on patch. Otherwise, everything is the same.
Sanity tested on x86-64.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch')
| -rw-r--r-- | recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch b/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch deleted file mode 100644 index c0a810b1..00000000 --- a/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From 07e4c41f2963d73b9aedd552c74f17a33e89f020 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bogdan Purcareata <bogdan.purcareata@nxp.com> | ||
| 3 | Date: Thu, 24 Mar 2016 11:54:27 +0000 | ||
| 4 | Subject: [PATCH] lxc-busybox: Remove warning for dynamically linked Busybox | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | The warning has been present since commit 32b37181ea (with no purpose stated). | ||
| 10 | Support for dynamically linked Busybox has been added since commit bf6cc73696. | ||
| 11 | Haven't encountered any issues with dynamically linked Busybox in my last | ||
| 12 | 2 years' testing. | ||
| 13 | |||
| 14 | Upstream-status: Accepted | ||
| 15 | [https://github.com/lxc/lxc/commit/07e4c41f2963d73b9aedd552c74f17a33e89f020] | ||
| 16 | |||
| 17 | Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com> | ||
| 18 | Acked-by: Stéphane Graber <stgraber@ubuntu.com> | ||
| 19 | --- | ||
| 20 | templates/lxc-busybox.in | 7 ------- | ||
| 21 | 1 file changed, 7 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | ||
| 24 | index f547f9e..336fa12 100644 | ||
| 25 | --- a/templates/lxc-busybox.in | ||
| 26 | +++ b/templates/lxc-busybox.in | ||
| 27 | @@ -304,13 +304,6 @@ configure_busybox() | ||
| 28 | return 1 | ||
| 29 | fi | ||
| 30 | |||
| 31 | - file -L $(which busybox) | grep -q "statically linked" | ||
| 32 | - if [ $? -ne 0 ]; then | ||
| 33 | - echo "warning : busybox is not statically linked." | ||
| 34 | - echo "warning : The template script may not correctly" | ||
| 35 | - echo "warning : setup the container environment." | ||
| 36 | - fi | ||
| 37 | - | ||
| 38 | # copy busybox in the rootfs | ||
| 39 | cp $(which busybox) $rootfs/bin | ||
| 40 | if [ $? -ne 0 ]; then | ||
| 41 | -- | ||
| 42 | 1.9.1 | ||
| 43 | |||