From 6406a6992b709b4ae65de5b2f7b27cb005a2ec8d Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Fri, 16 Oct 2015 14:51:05 +0000 Subject: Disable chunk morph generation in python importer These chunk morphs are redundant since the build tools have them already. Change-Id: Ibf8dbaf5c19bb77993ea2590f2ac5ff8e58557da --- baserockimport/app.py | 1 + baserockimport/exts/python.to_chunk | 33 --------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100755 baserockimport/exts/python.to_chunk diff --git a/baserockimport/app.py b/baserockimport/app.py index ecdfff5..ccd941b 100644 --- a/baserockimport/app.py +++ b/baserockimport/app.py @@ -229,6 +229,7 @@ class BaserockImportApplication(cliapp.Application): goal_kind='python', goal_name=package_name, goal_version=package_version, + generate_chunk_morphs=False, ignore_version_field=True) loop.enable_importer('python', strata=['strata/core.morph'], package_comp_callback=comp) diff --git a/baserockimport/exts/python.to_chunk b/baserockimport/exts/python.to_chunk deleted file mode 100755 index 74befeb..0000000 --- a/baserockimport/exts/python.to_chunk +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# Copyright (C) 2014 Codethink Limited -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# We can get rid of all of this once we modify the import tool - -from __future__ import print_function - -import sys - -if len(sys.argv) not in [3, 4]: - print('usage: %s package_source_dir chunk_name [version]' % sys.argv[0], - file=sys.stderr) - sys.exit(1) - -print('''name: %s -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR"''' % sys.argv[2]) -- cgit v1.2.1