Update handling of KEY_DIR to support naming used by lede

The key is no longer saved automatically

build.sh

@@ -65,11 +65,10 @@ fi
 
 if [ -n "${KEY_DIR}" ]; then
 	KEY_DIR=$(readlink -f "${KEY_DIR}")
+	[ -e "${KEY_DIR}" ] || abort "Can not find specified key directory: ${KEY_DIR}"
 else
 	KEY_DIR="${DEFAULT_KEY_DIR}"
 fi
-[ -e "${KEY_DIR}" ] || mkdir -p ${KEY_DIR}
-[ "$?" -eq "0" ] || abort "Unable to create key directory: ${KEY_DIR}"
 
 if [ -n "${VERSIONS_DIR}" ]; then
 	VERSIONS_DIR=$(readlink -f "${VERSIONS_DIR}")
@@ -201,13 +200,13 @@ echo "SITE=${SITE_COMMIT} # ${VERSION}" >> ${build_info_path}
 echo "TARGETS=${TARGETS}" >> ${build_info_path}
 echo "TS=${BUILD_TS}" >> ${build_info_path}
 
-### restore gluon-opkg-key, if already exists
-if [ -e "${KEY_DIR}/gluon-opkg-key" -a -e "${KEY_DIR}/gluon-opkg-key.pub" ]; then
-	info "gluon-opkg-key already exists, restoring it."
+### restore opkg-keys
+if [ -e "${KEY_DIR}" ]; then
+	info "build key already exists, restoring it."
 	mkdir -p ${GLUON_BUILD_DIR}/
 	[ "$?" -eq "0" ] || abort "Unable to create directory: ${GLUON_BUILD_DIR}/"
-	cp -f ${KEY_DIR}/gluon-opkg-key* ${GLUON_BUILD_DIR}/
-	[ "$?" -eq "0" ] || abort "Unable to copy gluon-opkg-key."
+	cp -f ${KEY_DIR}/* ${GLUON_BUILD_DIR}/
+	[ "$?" -eq "0" ] || abort "Unable to copy build key."
 fi
 
 ### create site.conf
@@ -297,10 +296,6 @@ if [ "${PUBLISH}" -eq "1" ]; then
 	popd > /dev/null #${OUTPUT_DIR}
 fi
 
-# Saving a copy of gluon-opkg-key
-[ -e "${KEY_DIR}/gluon-opkg-key" -a -e "${KEY_DIR}/gluon-opkg-key.pub" ] || cp ${GLUON_BUILD_DIR}/gluon-opkg-key* ${KEY_DIR}/
-[ "$?" -eq "0" ] || abort "Failed to save gluon-opkg-key, try to execute 'cp ${GLUON_BUILD_DIR}/gluon-opkg-key* ${KEY_DIR}/' manually"
-
 # The end. Finally.
 success "We're done, go and enjoy your new firmware (${VERSION})!"
 popd > /dev/null #${MY_DIR}