Merge pull request #24 from kinvolk/schu/updates

Update to rkt 1.26.0 etc

README.md

@@ -88,6 +88,17 @@ For a real world example, see [semaphore.sh from weaveworks/tcptracer-bpf](https
 
 ## FAQ
 
+### run: cannot find aci satisfying name ...
+
+If you encounter an error like
+
+```
+run: cannot find aci satisfying name: "coreos.com/rkt/stage1-kvm" and labels: [{"os" "linux"} {"arch" "amd64"} {"version" "1.26.0"}] in the local store
+```
+
+make sure you have pre-fetched the stage1 dependency as described above.
+
+
 ### Warning: unable to translate guest address
 
 ```

builder

@@ -48,7 +48,7 @@ mkdir -p "${kernel_dir}"
 readonly kernel_source_dir="${kernel_dir}/source"
 mkdir -p "${kernel_source_dir}"
 readonly kernel_bzimage="${kernel_source_dir}/arch/x86/boot/bzImage"
-readonly kernel_reboot_patch_url="https://raw.githubusercontent.com/coreos/rkt/v1.22.0/stage1/usr_from_kvm/kernel/patches/0001-reboot.patch"
+readonly kernel_reboot_patch_url="https://raw.githubusercontent.com/coreos/rkt/v1.26.0/stage1/usr_from_kvm/kernel/patches/0001-reboot.patch"
 readonly kernel_api_header_dir="/lib/modules/${kernel_version}${kernel_version_suffix}"
 readonly kernel_header_dir="/lib/modules/${kernel_version}${kernel_version_suffix}/source"
 

builder-config

@@ -8,10 +8,10 @@ readonly DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 S1B_OUT_DIR="${S1B_OUT_DIR:-${DIR}/aci-files}"
 
 # The kernel version to build and include
-S1B_KERNEL_VERSION="${S1B_KERNEL_VERSION:-"4.9.6"}"
+S1B_KERNEL_VERSION="${S1B_KERNEL_VERSION:-"4.11.5"}"
 
 # The upstream stage1 kvm to set as dependency
-S1B_UPSTREAM_STAGE1_KVM_VERSION="${S1B_UPSTREAM_STAGE1_KVM_VERSION:-"1.23.0"}"
+S1B_UPSTREAM_STAGE1_KVM_VERSION="${S1B_UPSTREAM_STAGE1_KVM_VERSION:-"1.26.0"}"
 
 # The kernel version suffix, e.g. ("-custom-v1")
 S1B_KERNEL_VERSION_SUFFIX="${S1B_KERNEL_VERSION_SUFFIX:-"-kinvolk-v1"}"