From 1740beb1f284d01c19387ad2d891f3042d3e8929 Mon Sep 17 00:00:00 2001
From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com>
Date: Thu, 3 Mar 2022 02:36:20 +0530
Subject: [PATCH] [sonic-cfggen]: Fix sonic-cfggen build failures for armhf
 (#10132)

Why I did it
amrhf build fails while building sonic-config-engine whl package
https://dev.azure.com/mssonic/be1b070f-be15-4154-aade-b1d3bfb17054/_apis/build/builds/77089/logs/9

The reason for the failure is due to the fact that there is a new line generated at the top of the file in buffer config test cases while building for broadcom based platform and this issue is not seen in Marvell based platforms.

How I did it
Removed the new line for all the buffer test cases as there is no need to add it and accordingly changed the buffer_config.j2 where the new line is generated.
---
 files/build_templates/buffers_config.j2                          | 1 -
 .../tests/sample_output/py2/buffers-dell6100.json                | 1 -
 .../tests/sample_output/py2/buffers-mellanox2410-dynamic.json    | 1 -
 .../tests/sample_output/py2/buffers-mellanox2410.json            | 1 -
 .../tests/sample_output/py2/buffers-mellanox2700.json            | 1 -
 .../tests/sample_output/py3/buffers-dell6100.json                | 1 -
 .../tests/sample_output/py3/buffers-mellanox2410-dynamic.json    | 1 -
 .../tests/sample_output/py3/buffers-mellanox2410.json            | 1 -
 .../tests/sample_output/py3/buffers-mellanox2700.json            | 1 -
 9 files changed, 9 deletions(-)

diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index d0ff3ade10..cb64cd3d43 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -131,7 +131,6 @@ def
     {%- if port_names_list_inactive.append(port) %}{%- endif %}
 {%- endfor %}
 {%- set port_names_inactive  = port_names_list_inactive  | join(',') %}
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
index 90ad5f795c..be6292366e 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-dell6100.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410-dynamic.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410-dynamic.json
index a09e15eecc..1cb60747fc 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410-dynamic.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410-dynamic.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
index 7ebd39c36c..39cebfcdf8 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2410.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
index 221a9b89b8..ea9fe0c9ea 100644
--- a/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
+++ b/src/sonic-config-engine/tests/sample_output/py2/buffers-mellanox2700.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
index 7c06ed93f3..08f238bcc4 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-dell6100.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410-dynamic.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410-dynamic.json
index 215fa85cf2..109389c950 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410-dynamic.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410-dynamic.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
index c212061af4..eaf119ab0a 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2410.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json
index 2aaef20598..49da9b064a 100644
--- a/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json
+++ b/src/sonic-config-engine/tests/sample_output/py3/buffers-mellanox2700.json
@@ -1,4 +1,3 @@
-
 {
     "CABLE_LENGTH": {
         "AZURE": {