diff options
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, 43 insertions, 0 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 new file mode 100644 index 00000000..c0a810b1 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-busybox-Remove-warning-for-dynamically-linked-Bu.patch | |||
@@ -0,0 +1,43 @@ | |||
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 | |||