aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2018-02-27 09:40:19 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-04 23:57:52 +1200
commit10a639a6b74a46bc6029b5d736ee60a228bdf6dd (patch)
treee0931c828b398dd713057a284feb635d669b079f
parentf58754c9981cbabf44fea96c0108652fc60fac12 (diff)
downloadopenembedded-core-contrib-10a639a6b74a46bc6029b5d736ee60a228bdf6dd.tar.gz
rrs/tools/rrs_unique_recipes: drop
We can't just delete arbitrary recipes that do exist in the layer if we're in a general layer index database. We'll need to handle this in a different way, or just live with the fact that there will be duplicate entries. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--README.rrs1
-rwxr-xr-xrrs/tools/daily_run.sh1
-rwxr-xr-xrrs/tools/rrs_unique_recipes.py82
3 files changed, 0 insertions, 84 deletions
diff --git a/README.rrs b/README.rrs
index 8722bdf64a..65ab017959 100644
--- a/README.rrs
+++ b/README.rrs
@@ -33,7 +33,6 @@ $ ./scripts/tools/import_layer.py -s meta git://git.openembedded.org/openembedd
8. In the first run should regenerate Recipe upgrade information,
$ ./layerindex/update.py
-$ ./rrs/tools/rrs_unique_recipes.py -d
$ ./rrs/tools/rrs_maintainer_history.py -d
$ ./rrs/tools/rrs_upgrade_history.py -d --initial
$ ./rrs/tools/rrs_upstream_history.py -d
diff --git a/rrs/tools/daily_run.sh b/rrs/tools/daily_run.sh
index b8d373ca48..c00839f426 100755
--- a/rrs/tools/daily_run.sh
+++ b/rrs/tools/daily_run.sh
@@ -6,7 +6,6 @@ venv_activate=__VENV_ACTIVATE__
source $venv_activate
$rrs_dir/layerindex/update.py --reload
-$rrs_dir/rrs/tools/rrs_unique_recipes.py -d
$rrs_dir/rrs/tools/rrs_maintainer_history.py -d
$rrs_dir/rrs/tools/rrs_upgrade_history.py -d
$rrs_dir/rrs/tools/rrs_upstream_history.py -d
diff --git a/rrs/tools/rrs_unique_recipes.py b/rrs/tools/rrs_unique_recipes.py
deleted file mode 100755
index c3b211fec5..0000000000
--- a/rrs/tools/rrs_unique_recipes.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-
-# Filters recipes only keep one by PN.
-#
-# Copyright (C) 2015 Intel Corporation
-# Author: Anibal Limon <anibal.limon@linux.intel.com>
-#
-# Licensed under the MIT license, see COPYING.MIT for details
-
-import sys
-import os.path
-import optparse
-import logging
-
-sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__))))
-from common import common_setup, get_pv_type, get_logger, get_recipe_pv_without_srcpv
-common_setup()
-from layerindex import utils
-
-utils.setup_django()
-from django.db import transaction
-import settings
-
-logger = get_logger("UniqueRecipes", settings)
-fetchdir = settings.LAYER_FETCH_DIR
-if not fetchdir:
- logger.error("Please set LAYER_FETCH_DIR in settings.py")
- sys.exit(1)
-
-# setup bitbake
-bitbakepath = os.path.join(fetchdir, 'bitbake')
-sys.path.insert(0, os.path.join(bitbakepath, 'lib'))
-from bb.utils import vercmp_string
-
-from layerindex.models import Recipe, LayerBranch
-
-if __name__=="__main__":
- parser = optparse.OptionParser(usage = """%prog [options]""")
-
- parser.add_option("-d", "--debug",
- help = "Enable debug output",
- action="store_const", const=logging.DEBUG, dest="loglevel", default=logging.INFO)
-
- options, args = parser.parse_args(sys.argv)
- logger.setLevel(options.loglevel)
-
- logger.info('Starting unique recipes ...')
-
- # only keep the major version of recipe
- logger.info('Starting remove of duplicate recipes only keep major version ...')
- with transaction.atomic():
- for layerbranch in LayerBranch.objects.all():
- recipes = {}
-
- for recipe in Recipe.objects.filter(layerbranch=layerbranch):
- recipes[recipe.pn] = None
-
- for pn in recipes.keys():
- for recipe in Recipe.objects.filter(layerbranch=layerbranch,
- pn=pn):
-
- if recipes[pn] is None:
- recipes[pn] = recipe
- else:
- (ppv, _, _) = get_recipe_pv_without_srcpv(recipes[pn].pv,
- get_pv_type(recipes[pn].pv))
- (npv, _, _) = get_recipe_pv_without_srcpv(recipe.pv,
- get_pv_type(recipe.pv))
-
- if npv == 'git':
- logger.debug("%s: Removed git recipe without version." \
- % (recipe.pn))
- recipe.delete()
- elif ppv == 'git' or vercmp_string(ppv, npv) == -1:
- logger.debug("%s: Removed older recipe (%s), new recipe (%s)." \
- % (recipes[pn].pn, recipes[pn].pv, recipe.pv))
- recipes[pn].delete()
- recipes[pn] = recipe
- else:
- logger.debug("%s: Removed older recipe (%s), current recipe (%s)." \
- % (recipes[pn].pn, recipe.pv, recipes[pn].pv))
- recipe.delete()