Packaging for JWR58

Change-Id: Ia485dcbaf3f069974c5a005b075bc1da8426cfaa
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index ec0bfae..d8a83c6 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -41,13 +41,14 @@
 # end jb-mr1.1-dev
 # start jb-mr2-dev
 # 683083 = JWR51
+# 689345 = JWR58
 # end jb-mr2-dev
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=683083
+BUILD=689345
 DEVICE=grouper
 PRODUCT=nakasi
-VERSION=jwr51
+VERSION=jwr58
 #SRCPREFIX=signed-
 BOOTLOADERFILE=bootloader.bin
 BOOTLOADER=4.23
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 47c4a22..6a3b7fb 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -44,6 +44,7 @@
 # 683083 = JWR51
 # 684634 = JWR52
 # 686185 = JWR53
+# 689345 = JWR58
 # end jb-mr2-dev
 BRANCH=jb-mr2-dev
 if test $BRANCH = jb-dev
@@ -63,8 +64,8 @@
 fi # jb-mr1.1-dev
 if test $BRANCH = jb-mr2-dev
 then
-  ZIP=nakasi-ota-686185
-  BUILD=jwr53
+  ZIP=nakasi-ota-689345
+  BUILD=jwr58
 fi # jb-mr2-dev
 ROOTDEVICE=grouper
 DEVICE=grouper