gistfile1.txt

[openswitch]$ git status                                                                                                                           [ops-build]
On branch master
Your branch is up-to-date with 'github/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   yocto/openswitch/meta-platform-openswitch-genericx86-64/conf/machine/genericx86-64.conf

no changes added to commit (use "git add" and/or "git commit -a")
[openswitch]$ git log -n1                                                                                                                          [ops-build]
commit a42c81be8d3d8959a6ff2931552ea6ec3254e514
Author: vijavaru <[email protected]>
Date:   Fri Aug 26 15:34:37 2016 -0700

    chg, dev : SRCREV update of ops-cli , Master branch
    
    Change-Id: I3c729275d1a8680559451241dc71d3bfde532664
    Signed-off-by: vijavaru <[email protected]>
[openswitch]$ git diff                                                                                                                             [ops-build]
diff --git a/yocto/openswitch/meta-platform-openswitch-genericx86-64/conf/machine/genericx86-64.conf b/yocto/openswitch/meta-platform-openswitch-genericx86-64/conf/machine/genericx86-64.conf
index 9460f43..59b97d6 100644
--- a/yocto/openswitch/meta-platform-openswitch-genericx86-64/conf/machine/genericx86-64.conf
+++ b/yocto/openswitch/meta-platform-openswitch-genericx86-64/conf/machine/genericx86-64.conf
@@ -6,6 +6,7 @@ IMAGE_FEATURES[validitems] += "ops-p4"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "3.14%"
+PREFERRED_PROVIDER_virtual/opennsl = "opennsl-cdp"
 
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts"
 
@@ -14,7 +15,7 @@ GLIBC_ADDONS = "nptl"
 IMAGE_FSTYPES = "tar"
 
 MACHINE_FEATURES = "pcbios usbhost acpi pci ext2 ext3 x86 vfat serial \
-    ops-container ops-container-coredump"
+    ops-container ops-container-coredump broadcom"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
   packagegroup-ops-min \
   packagegroup-ops-min-debug \
@@ -29,8 +30,9 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += \
   "${@bb.utils.contains("MACHINE_FEATURES", "ops-container", "packagegroup-ops-container", "", d)}"
 
-PREFERRED_PROVIDER_virtual/ops-switchd-switch-api-plugin ?= \
-  "${@bb.utils.contains("IMAGE_FEATURES", "ops-p4", "ops-switchd-p4switch-plugin", "ops-switchd-container-plugin", d)}"
+#PREFERRED_PROVIDER_virtual/ops-switchd-switch-api-plugin ?= \
+#  "${@bb.utils.contains("IMAGE_FEATURES", "ops-p4", "ops-switchd-p4switch-plugin", "ops-switchd-container-plugin", d)}"
+PREFERRED_PROVIDER_virtual/ops-switchd-switch-api-plugin ?= "ops-switchd-opennsl-plugin"
 
 # Allow login root with no password and enable vagrant tweaks
 EXTRA_IMAGE_FEATURES += "vagrant-tweaks debug-tweaks"