diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-04-14 15:57:16 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-04-14 15:57:19 -0400 |
commit | a24ce339fdd1fcd70032680515d067697895496f (patch) | |
tree | 7543f23d7ab0ad2e7dc815b899d486e9b4203e39 /recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | |
parent | 660ffa675e6d2a6157bde5677816916ddb822630 (diff) | |
download | meta-virtualization-a24ce339fdd1fcd70032680515d067697895496f.tar.gz |
lxc: refresh patches to remove fuzz
The recent uprev of lxc left some fuzz in a patches. devtool refresh
cleans this up, and no runtime issues have been detected.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch')
-rw-r--r-- | recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch index e4bb72a0..56ff2f07 100644 --- a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch +++ b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3a7112a38d2c44b6fa49e0da1dc4765defd88dbb Mon Sep 17 00:00:00 2001 | 1 | From 96bf043ec0ed93613036c324174c149655cf52be Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 11:44:44 -0400 | 3 | Date: Thu, 31 May 2018 11:44:44 -0400 |
4 | Subject: [PATCH] template: make busybox template compatible with | 4 | Subject: [PATCH] template: make busybox template compatible with |
@@ -23,10 +23,10 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
23 | 1 file changed, 13 insertions(+), 3 deletions(-) | 23 | 1 file changed, 13 insertions(+), 3 deletions(-) |
24 | 24 | ||
25 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | 25 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in |
26 | index 9637a71..45b386f 100644 | 26 | index 8ba7cfe..effdb73 100644 |
27 | --- a/templates/lxc-busybox.in | 27 | --- a/templates/lxc-busybox.in |
28 | +++ b/templates/lxc-busybox.in | 28 | +++ b/templates/lxc-busybox.in |
29 | @@ -181,6 +181,19 @@ configure_busybox() | 29 | @@ -194,6 +194,19 @@ configure_busybox() |
30 | return 1 | 30 | return 1 |
31 | fi | 31 | fi |
32 | 32 | ||
@@ -46,7 +46,7 @@ index 9637a71..45b386f 100644 | |||
46 | # symlink busybox for the commands it supports | 46 | # symlink busybox for the commands it supports |
47 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" | 47 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" |
48 | # but that only works right in a chroot with busybox >= 1.19.0 | 48 | # but that only works right in a chroot with busybox >= 1.19.0 |
49 | @@ -189,9 +202,6 @@ configure_busybox() | 49 | @@ -202,9 +215,6 @@ configure_busybox() |
50 | ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox | 50 | ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox |
51 | ) | 51 | ) |
52 | 52 | ||