diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-17 19:05:18 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-17 19:34:30 +0100 |
commit | 7fa6312de8008d535419795c7c8805ff34970645 (patch) | |
tree | 779e58377c0f3df5ac0f218460f3fa7a4874208e /patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch | |
parent | 03854a0311149a140fb751a47886ff1c05022231 (diff) |
sub: packetary: remove, patches upstream
Backported from [1] and adapted for Trusty, since Armband
did not switch to Ubuntu Xenial / Openstack Newton yet.
[1] https://gerrit.opnfv.org/gerrit/#/c/23999/7/
JIRA: ARMBAND-185
Change-Id: I1dd2cec09aa1077a5779573bc54c01db93339ac9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch')
-rw-r--r-- | patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch b/patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch deleted file mode 100644 index da01bc33..00000000 --- a/patches/packetary/0003-AArch64-support-api-cli-controllers-drivers.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Thu, 27 Oct 2016 21:51:10 +0200 -Subject: [PATCH] AArch64 support: api, cli, controllers, drivers - -Enable new architecture 'aarch64' ('arm64' on Ubuntu). -Tested with DEB driver. - -Closes-bug: 1638635 - -Change-Id: I9761322020837186c109c18e849128791ab909d8 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - packetary/api/repositories.py | 3 ++- - packetary/cli/commands/base.py | 2 +- - packetary/controllers/repository.py | 3 ++- - packetary/drivers/deb_driver.py | 2 ++ - 4 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/packetary/api/repositories.py b/packetary/api/repositories.py -index ec8c54c..d49d8d0 100644 ---- a/packetary/api/repositories.py -+++ b/packetary/api/repositories.py -@@ -73,7 +73,8 @@ class RepositoryApi(object): - - :param config: the configuration - :param repotype: the kind of repository(deb, yum, etc) -- :param repoarch: the architecture of repository (x86_64 or i386) -+ :param repoarch: the architecture of repository -+ (x86_64, i386 or aarch64) - """ - context = config if isinstance(config, Context) else Context(config) - return cls(RepositoryController.load(context, repotype, repoarch)) -diff --git a/packetary/cli/commands/base.py b/packetary/cli/commands/base.py -index 83c2f38..c2cc497 100644 ---- a/packetary/cli/commands/base.py -+++ b/packetary/cli/commands/base.py -@@ -56,7 +56,7 @@ class BaseRepoCommand(BaseCommand): - '-a', - '--arch', - type=str, -- choices=["x86_64", "i386"], -+ choices=["x86_64", "i386", "aarch64"], - metavar='ARCHITECTURE', - default="x86_64", - help='The target architecture.') -diff --git a/packetary/controllers/repository.py b/packetary/controllers/repository.py -index 921a5c1..e6cbc9b 100644 ---- a/packetary/controllers/repository.py -+++ b/packetary/controllers/repository.py -@@ -45,7 +45,8 @@ class RepositoryController(object): - - :param context: the context - :param driver_name: the name of required driver -- :param repoarch: the architecture of repository (x86_64 or i386) -+ :param repoarch: the architecture of repository -+ (x86_64, i386 or aarch64) - """ - if cls._drivers is None: - cls._drivers = stevedore.ExtensionManager( -diff --git a/packetary/drivers/deb_driver.py b/packetary/drivers/deb_driver.py -index ece9fa1..0df1aa4 100644 ---- a/packetary/drivers/deb_driver.py -+++ b/packetary/drivers/deb_driver.py -@@ -48,10 +48,12 @@ _OPERATORS_MAPPING = { - } - - _ARCHITECTURES = { -+ "aarch64": "arm64", - "x86_64": "amd64", - "i386": "i386", - "source": "Source", - "amd64": "x86_64", -+ "arm64": "aarch64", - } - - _PRIORITIES = { |