From 36d0e4617c16c193a8a9932f1b09cfe97f9f767e Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Wed, 13 Sep 2017 09:08:50 +0200
Subject: rootfs_type: remove nfs

NFS is untested and not used at the moment.
Remove it for now to avoid unnecessary issues

Change-Id: Ide7f0663f3c31cde14dcda3c6e6694e22165bf49
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 templates/base/agl-base-defaults.jinja2  | 4 ----
 templates/boot/generic-uboot-tftp.jinja2 | 6 +-----
 utils/agljobtemplate.py                  | 2 +-
 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)
-- 
cgit 1.2.3-korg