From 135949d8946e8a86579558ee9d5d688ea37db415 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Thu, 10 Sep 2015 11:42:26 +0500 Subject: [PATCH] rename KERNEL_URL to COMPILED_KERNEL_URL to avoid confusion with KERNEL_URL in rancher/os-kernel --- Makefile.docker | 2 +- build.conf | 2 +- tests/integration/assets/test_02/build.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.docker b/Makefile.docker index 2ef5b262..e162f925 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -24,7 +24,7 @@ $(DIST)/artifacts/vmlinuz: $(BUILD)/kernel/ $(BUILD)/kernel/: - mkdir -p $@ && curl -L "$(KERNEL_URL)" | tar -xzf - -C $@ --strip=0 + mkdir -p $@ && curl -L "$(COMPILED_KERNEL_URL)" | tar -xzf - -C $@ --strip=0 $(BUILD)/images.tar: bin/rancheros diff --git a/build.conf b/build.conf index c5874b3e..f1213d64 100644 --- a/build.conf +++ b/build.conf @@ -2,5 +2,5 @@ IMAGE_NAME=rancher/os VERSION=v0.4.0-dev DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.8.1-ros/docker-1.8.1 -KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-3.19.0-27.29-ros1/linux-3.19.8-ckt5-rancher-x86.tar.gz +COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-3.19.0-27.29-ros1/linux-3.19.8-ckt5-rancher-x86.tar.gz DFS_IMAGE=rancher/docker:1.8.1 diff --git a/tests/integration/assets/test_02/build.conf b/tests/integration/assets/test_02/build.conf index b8567aa6..6b559412 100644 --- a/tests/integration/assets/test_02/build.conf +++ b/tests/integration/assets/test_02/build.conf @@ -2,5 +2,5 @@ IMAGE_NAME=rancher/os VERSION=v0.4.0-test DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.8.2-rc1-ros/docker-1.8.2-rc1 -KERNEL_URL=https://github.com/imikushin/os-kernel/releases/download/4.2/linux-4.2.0-rancher-x86.tar.gz +COMPILED_KERNEL_URL=https://github.com/imikushin/os-kernel/releases/download/4.2/linux-4.2.0-rancher-x86.tar.gz DFS_IMAGE=rancher/docker:1.8.1