aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2017-09-20 17:36:54 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-09-20 17:36:54 +0000
commitbab5b166526f66d409eff09e12ac7f5db97b93b6 (patch)
treee15d67e26e34b59ea0ecc7712cf3a2d52febb8d6
parent6cb8577b915af1df82ce7ad40ce5591f818e3cfe (diff)
parent36d0e4617c16c193a8a9932f1b09cfe97f9f767e (diff)
Merge "rootfs_type: remove nfs"
-rw-r--r--templates/base/agl-base-defaults.jinja24
-rw-r--r--templates/boot/generic-uboot-tftp.jinja26
-rw-r--r--utils/agljobtemplate.py2
3 files changed, 2 insertions, 10 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2
index 92ef06e..c8b18b4 100644
--- a/templates/base/agl-base-defaults.jinja2
+++ b/templates/base/agl-base-defaults.jinja2
@@ -26,10 +26,6 @@
{%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %}
{%- set nbdinitrd = nbdinitrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %}
{%- set nbdinitrd_url = nbdinitrd_url|default(baseurl(nbdinitrd)) %}
-{%- elif rootfs_type == 'nfs' %}
-{%- set nfsrootfs = nfsrootfs|default("nfsrootfs-" + yocto_machine + ".tar.gz") %}
-{%- set nfsrootfs_url = nfsrootfs_url|default(baseurl(nfsrootfs)) %}
-{%- set nfsroot_compression = nfsroot_compression|default(nfsrootfs|get_extension) %}
{%- elif rootfs_type == 'ramdisk' %}
{%- set initrd = initrd|default("initramfs-boot-image-" + yocto_machine +".gz") %}
{%- set initrd_compression = initrd_compression|default(initrd|get_extension) %}
diff --git a/templates/boot/generic-uboot-tftp.jinja2 b/templates/boot/generic-uboot-tftp.jinja2
index cbdda7a..a7fa6ce 100644
--- a/templates/boot/generic-uboot-tftp.jinja2
+++ b/templates/boot/generic-uboot-tftp.jinja2
@@ -22,11 +22,7 @@ protocols:
{{ super() }}
kernel:
url: {{ kernel_url }}
-{%- if rootfs_type == 'nfs' %}
- nfsrootfs:
- url: {{ nfsrootfs_url }}
- compression: {{ nfsroot_compression }}
-{%- elif rootfs_type == 'nbd' %}
+{%- if rootfs_type == 'nbd' %}
initrd:
url: {{ nbdinitrd_url }}
allow_modify: false
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index 29f101e..df3800d 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -29,7 +29,7 @@ class Agljobtemplate(object):
CALLBACK_DIR = "callback"
MACHINES_DIR = "machines"
TESTS_DIR = "tests"
- RFS_TYPE = ['nfs', 'nbd', 'ramdisk']
+ RFS_TYPE = ['nbd', 'ramdisk']
def __init__(self, path=DEFAULT_PATH):
self._template_path = os.path.normpath(path)