From: Chulwoo Shin Date: Tue, 7 Mar 2017 07:07:14 +0000 (+0900) Subject: [TIC-CORE] fix partition for default recipe X-Git-Tag: v20170316~1^2~1 X-Git-Url: http://review.tizen.org/git/?p=archive%2F20170607%2Ftools%2Ftic-core.git;a=commitdiff_plain;h=254deb71144ae28889013afc99f5a327826949de [TIC-CORE] fix partition for default recipe fix partition for default recipe Change-Id: I8f91bba394b3186f869bdf6ef0c882f3007157a9 Signed-off-by: Chulwoo Shin --- diff --git a/tic/command.py b/tic/command.py index e5ac428..5ff9b2b 100644 --- a/tic/command.py +++ b/tic/command.py @@ -34,6 +34,7 @@ from tic.utils import process from tic.utils import misc DEFAULT_CACHEDIR='/var/tmp/tic-core' +DEFAULT_ANALYSIS_CACHEDIR='/var/tmp/tic-core/analysis' DEFAULT_KICKSTARTDIR='/var/tmp/tic-core/kickstart' def analyze(repo_list, recipe_list=None): @@ -59,6 +60,14 @@ def analyze(repo_list, recipe_list=None): #Download repodata from repositories (Remote/Local) repoinfo = get_repodata_from_repos(repos, DEFAULT_CACHEDIR) logger.info('time to get repodata from repo: %d ms', misc.get_timestamp() - start_time) + +# checksum_list=[] +# for repo in repoinfo: +# checksum_list.append(repo['checksum']); +# all_checksum='_'.join(checksum_list); +# analysis_file=os.path.join(DEFAULT_ANALYSIS_CACHEDIR, all_checksum, 'analysis.json') +# if os.path.exists(analysis_file): +# pass start_time = misc.get_timestamp() # Parse the xml files for the analysis of package (.rpm) diff --git a/tic/parser/recipe_parser.py b/tic/parser/recipe_parser.py index 3e22f1a..c506bbd 100644 --- a/tic/parser/recipe_parser.py +++ b/tic/parser/recipe_parser.py @@ -34,7 +34,7 @@ def get_default_recipe(): Baseline= 'tizen-3.0', Active= True, Mic2Options= '-f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap', - Part='mobile-mbr', + Part='headless', Language= 'en_US.UTF-8', Keyboard= 'us', Timezone= 'Asia/Seoul', @@ -51,7 +51,7 @@ def get_default_recipe(): UserGroups= "audio,video" ), Wayland=dict( - Part='mobile-mbr', + Part='headless', UserGroups='audio,video', Groups=[], PostScripts=[], @@ -65,7 +65,7 @@ def get_default_recipe(): Schedule= "*", Active= True, Platform= 'Wayland', - Part= 'mobile-mbr', + Part= 'headless', Mic2Options= '-f loop --pack-to=@NAME@.tar.gz', FileName= 'default', Repos=['tizen-unified', 'tizen-base'], diff --git a/tic/repo.py b/tic/repo.py index ea570d5..82c5de7 100644 --- a/tic/repo.py +++ b/tic/repo.py @@ -133,6 +133,7 @@ def get_repodata_from_repos(repos, cachedir): checksums[item]) my_repodata.append({"name":reponame, "baseurl":baseurl, + "checksum":repo_checksum, "repomd":repomd, "primary":filepaths['primary'], "cachedir":cache_dir,