[installer]: Move platform-specific files under new device/ tree (#450)

* Move platform-specific ONIE installer config files with rest of device-specific files
* Merge contents of dell-s6000-replace-reboot.sh into s6000 installer conf file
* Remove dell-s6000-replace-reboot.sh

.gitignore

@@ -1,6 +1,5 @@
 # Build system related
 .platform
-.sku
 
 # Build artifacts
 fsroot/
@@ -39,3 +38,5 @@ dockers/docker-base/Dockerfile
 platform/*/docker-syncd-*/Dockerfile
 platform/*/docker-syncd-*-rpc/Dockerfile
 
+# Installer-related files and directories
+installer/x86_64/platforms/

build_image.sh

@@ -27,6 +27,18 @@ if [ "$IMAGE_TYPE" = "onie" ]; then
     echo "Build ONIE installer"
     mkdir -p `dirname $OUTPUT_ONIE_IMAGE`
     sudo rm -f $OUTPUT_ONIE_IMAGE
+
+    # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
+    rm -rf ./installer/x86_64/platforms/
+    mkdir -p ./installer/x86_64/platforms/
+    for VENDOR in `ls ./device`; do
+        for PLATFORM in `ls ./device/$VENDOR`; do
+            if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
+                cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
+            fi
+        done
+    done
+
     ## Generate an ONIE installer image
     ## Note: Don't leave blank between lines. It is single line command.
     ./onie-mk-demo.sh $TARGET_PLATFORM $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \

device/dell/x86_64-dell_s6000_s1220-r0/installer.conf

@@ -1,4 +1,4 @@
-#!/bin/sh
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="processor.max_cstate=1 intel_idle.max_cstate=0"
 
 echo "Replace ONIE reboot with Dell reset commands"
 

installer/x86_64/platforms/x86_64-dell_s6000_s1220-r0

@@ -1,2 +0,0 @@
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="processor.max_cstate=1 intel_idle.max_cstate=0"
-./dell-s6000-replace-reboot.sh