Update buildroot to 2021.02.3 (#1422)
Signed-off-by: Stefan Agner <stefan@agner.ch>
(cherry picked from commit 9c8172df40)
This commit is contained in:
2
buildroot/support/misc/Vagrantfile
vendored
2
buildroot/support/misc/Vagrantfile
vendored
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# Buildroot version to use
|
||||
RELEASE='2021.02.2'
|
||||
RELEASE='2021.02.3'
|
||||
|
||||
### Change here for more memory/cores ###
|
||||
VM_MEMORY=2048
|
||||
|
||||
@@ -375,9 +375,9 @@ def package_init_make_info():
|
||||
variable_list = [x[5:] for x in variable_list if x.startswith("HOST_")] + \
|
||||
[x for x in variable_list if not x.startswith("HOST_")]
|
||||
|
||||
for l in variable_list:
|
||||
for item in variable_list:
|
||||
# Get variable name and value
|
||||
pkgvar, value = l.split("=")
|
||||
pkgvar, value = item.split("=")
|
||||
|
||||
# Strip the suffix according to the variable
|
||||
if pkgvar.endswith("_LICENSE"):
|
||||
|
||||
@@ -2,3 +2,8 @@ version: '3'
|
||||
services:
|
||||
busybox:
|
||||
image: "busybox:latest"
|
||||
command: httpd -f -h /www/
|
||||
ports:
|
||||
- "80:80"
|
||||
volumes:
|
||||
- "/bin:/www"
|
||||
|
||||
@@ -37,13 +37,16 @@ class TestDockerCompose(infra.basetest.BRTest):
|
||||
|
||||
def docker_test(self):
|
||||
# will download container if not available, which may take some time
|
||||
_, exit_code = self.emulator.run('docker run --rm busybox:latest /bin/true', 120)
|
||||
_, exit_code = self.emulator.run('docker run --rm -p 8888:8888 busybox:latest /bin/true', 120)
|
||||
self.assertEqual(exit_code, 0)
|
||||
|
||||
def docker_compose_test(self):
|
||||
# will download container if not available, which may take some time
|
||||
_, exit_code = self.emulator.run('docker-compose up', 120)
|
||||
self.assertEqual(exit_code, 0)
|
||||
self.assertRunOk('docker-compose up -d', 120)
|
||||
# container may take some time to start
|
||||
self.assertRunOk('while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done', 120)
|
||||
self.assertRunOk('wget -O /tmp/busybox http://127.0.0.1/busybox', 120)
|
||||
self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120)
|
||||
|
||||
def test_run(self):
|
||||
kernel = os.path.join(self.builddir, "images", "bzImage")
|
||||
|
||||
Reference in New Issue
Block a user