From d66cceee0ebbb41bab3ba93ccb843c5f1c41a5c5 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Thu, 26 Apr 2018 17:32:04 +0000
Subject: [PATCH] Rename the 4.9-arm64-all kernel to 4.9-lts-arm64-all to
 confirm the the existing nameing conventions.

---
 .../src/lib/platform-config-defaults-uboot.yml                | 4 ++--
 packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile  | 4 ++--
 .../Makefile                                                  | 0
 .../PKG.yml                                                   | 2 +-
 .../builds/.gitignore                                         | 0
 .../builds/Makefile                                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/base/arm64/kernels/{kernel-4.9-arm64-all => kernel-4.9-lts-arm64-all}/Makefile (100%)
 rename packages/base/arm64/kernels/{kernel-4.9-arm64-all => kernel-4.9-lts-arm64-all}/PKG.yml (92%)
 rename packages/base/arm64/kernels/{kernel-4.9-arm64-all => kernel-4.9-lts-arm64-all}/builds/.gitignore (100%)
 rename packages/base/arm64/kernels/{kernel-4.9-arm64-all => kernel-4.9-lts-arm64-all}/builds/Makefile (88%)

diff --git a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
index dad51188..23953ddd 100644
--- a/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
+++ b/packages/base/all/vendor-config-onl/src/lib/platform-config-defaults-uboot.yml
@@ -47,10 +47,10 @@ default:
       <<: *arm-iproc-kernel-package
 
     arm64-kernel-package: &arm64-kernel-package
-      package: onl-kernel-4.9-arm64-all:arm64
+      package: onl-kernel-4.9-lts-arm64-all:arm64
 
     arm64-kernel: &arm64-kernel
-      =: kernel-4.9-arm64-all.bin.gz
+      =: kernel-4.9-lts-arm64-all.bin.gz
       <<: *arm64-kernel-package
 
     ##############################
diff --git a/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile b/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
index 161e3f14..2d5836b2 100644
--- a/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
+++ b/packages/base/any/kernels/4.9-lts/configs/arm64-all/Makefile
@@ -1,6 +1,6 @@
 ############################################################
 #
-# Default 4.9.30 configuration for arm64 platforms.
+# Default 4.9 LTS configuration for arm64 platforms.
 #
 ############################################################
 THIS_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
@@ -19,7 +19,7 @@ K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb-sdk.dtb  freescale/fs
 K_COPY_SRC := arch/arm64/boot/Image
 K_COPY_GZIP := 1
 ifndef K_COPY_DST
-K_COPY_DST := kernel-4.9-arm64-all.bin.gz
+K_COPY_DST := kernel-4.9-lts-arm64-all.bin.gz
 endif
 
 export ARCH=arm64
diff --git a/packages/base/arm64/kernels/kernel-4.9-arm64-all/Makefile b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/Makefile
similarity index 100%
rename from packages/base/arm64/kernels/kernel-4.9-arm64-all/Makefile
rename to packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/Makefile
diff --git a/packages/base/arm64/kernels/kernel-4.9-arm64-all/PKG.yml b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/PKG.yml
similarity index 92%
rename from packages/base/arm64/kernels/kernel-4.9-arm64-all/PKG.yml
rename to packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/PKG.yml
index 5dfebc53..a22e994f 100644
--- a/packages/base/arm64/kernels/kernel-4.9-arm64-all/PKG.yml
+++ b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/PKG.yml
@@ -7,7 +7,7 @@ common:
   support: opennetworklinux@googlegroups.com
 
 packages:
-  - name: onl-kernel-4.9-arm64-all
+  - name: onl-kernel-4.9-lts-arm64-all
     version: 1.0.0
     summary: Open Network Linux Kernel 4.9 for ARM64 Integrated Processor Platforms.
 
diff --git a/packages/base/arm64/kernels/kernel-4.9-arm64-all/builds/.gitignore b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/builds/.gitignore
similarity index 100%
rename from packages/base/arm64/kernels/kernel-4.9-arm64-all/builds/.gitignore
rename to packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/builds/.gitignore
diff --git a/packages/base/arm64/kernels/kernel-4.9-arm64-all/builds/Makefile b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/builds/Makefile
similarity index 88%
rename from packages/base/arm64/kernels/kernel-4.9-arm64-all/builds/Makefile
rename to packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/builds/Makefile
index 638a2aaf..0b055d6c 100644
--- a/packages/base/arm64/kernels/kernel-4.9-arm64-all/builds/Makefile
+++ b/packages/base/arm64/kernels/kernel-4.9-lts-arm64-all/builds/Makefile
@@ -7,4 +7,4 @@ kernel:
 	$(MAKE) -C $(ONL)/packages/base/any/kernels/4.9-lts/configs/arm64-all K_TARGET_DIR=$(THIS_DIR) $(ONL_MAKE_PARALLEL)
 
 clean:
-	rm -rf linux-4.9*
+	rm -rf linux-4.9* kernel-* lib