Commit 32ec4ce8 authored by Daniel Silveira's avatar Daniel Silveira

Configure files set on wrong relase, bug correction

refs #111269
parent 451f9171
......@@ -386,15 +386,22 @@ class Configuration(object):
return input_file, output_file
##
# @brief Execute POS git checkout
# @param pos_name Name of the pos
# @return Path to the makefile template
#def git_pos_checkout(self, pos_name, logger):
# if self.supported_pos[pos_name].git_id is not "":
# logger.information(1, 'Checking out ' + pos_name + ' from GIT')
# FNULL = open(os.devnull, 'w')
# subprocess.call(['git','checkout', self.supported_pos[pos_name].git_id], cwd="pos/" + pos_name+ "/" + pos_name, stdout=FNULL, stderr=subprocess.STDOUT)
##
# @brief Execute POS git checkout and then patchit
# @param pos_name Name of the pos
# @return Path to the makefile template
# def pos_checkout_and_patch(self, pos_name, logger):
# if self.supported_pos[pos_name].git_id is not "":
# logger.information(1, 'Checking out ' + pos_name + ' from GIT')
# FNULL = open(os.devnull, 'w')
# git stash current files to merge ahead and patch on pos checkout
# subprocess.call(['git','stash'], cwd="pos", stdout=FNULL, stderr=subprocess.STDOUT)
# git checkout call
# subprocess.call(['git','checkout', self.supported_pos[pos_name].git_id], cwd="pos/" + pos_name+ "/" + pos_name, stdout=FNULL, stderr=subprocess.STDOUT)
# patch pos by doing git stash pop
# subprocess.call(['git','stash', 'pop'], cwd="pos", stdout=FNULL, stderr=subprocess.STDOUT)
##
......
......@@ -3,13 +3,14 @@
# @author pfnf
# @brief Tool to configuration a AIR OS instalation
__author__ = "pfnf"
__author__ = "pfnf,dtms"
import os
import air
import sys
import utils.templates as makoutils
import utils.terminal as terminalutils
import utils.file as fileutils
import air.configurations as air_configuration
......@@ -48,6 +49,9 @@ def Run(args, logger):
# show info
if args.info: ShowInstallInfo(logger)
#check hardcoded files to replace generated
fileutils.setHardcodedFiles()
# parse input args or prompt the user for configuration
if args.target is None:
arch, bsp, fpu_enabled = prompt_configuration(logger)
......@@ -107,7 +111,7 @@ def Run(args, logger):
pos = os_configuration.get_pos_config(pos_name)
#Git checkout of pos
#os_configuration.git_pos_checkout(pos_name, logger)
#os_configuration.git_pos_checkout_and_patch(pos_name, logger)
# check if it is an alias
# if pos.alias is not None and pos_name in pos.alias:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment