diff --git a/_lastrevision b/_lastrevision index 39104bf..5e9604c 100644 --- a/_lastrevision +++ b/_lastrevision @@ -1 +1 @@ -9811afea3edef900b60b0fc513ffcb090a8ea8c6 \ No newline at end of file +6ea034113af0bc6f97110175d633bdf951af0fcd \ No newline at end of file diff --git a/add-ppc64le-as-a-valid-rpm-package-architecture.patch b/add-ppc64le-as-a-valid-rpm-package-architecture.patch new file mode 100644 index 0000000..97414c3 --- /dev/null +++ b/add-ppc64le-as-a-valid-rpm-package-architecture.patch @@ -0,0 +1,27 @@ +From aa9df9a08aa2a761cd91d91376a6a7dfa820c48f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= + +Date: Fri, 24 May 2019 16:27:07 +0100 +Subject: [PATCH] Add 'ppc64le' as a valid RPM package architecture + +--- + salt/utils/pkg/rpm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/salt/utils/pkg/rpm.py b/salt/utils/pkg/rpm.py +index 828b0cecda..cb85eb99fe 100644 +--- a/salt/utils/pkg/rpm.py ++++ b/salt/utils/pkg/rpm.py +@@ -21,7 +21,7 @@ log = logging.getLogger(__name__) + # These arches compiled from the rpmUtils.arch python module source + ARCHES_64 = ('x86_64', 'athlon', 'amd64', 'ia32e', 'ia64', 'geode') + ARCHES_32 = ('i386', 'i486', 'i586', 'i686') +-ARCHES_PPC = ('ppc', 'ppc64', 'ppc64iseries', 'ppc64pseries') ++ARCHES_PPC = ('ppc', 'ppc64', 'ppc64le', 'ppc64iseries', 'ppc64pseries') + ARCHES_S390 = ('s390', 's390x') + ARCHES_SPARC = ( + 'sparc', 'sparcv8', 'sparcv9', 'sparcv9v', 'sparc64', 'sparc64v' +-- +2.17.1 + + diff --git a/salt.changes b/salt.changes index 876dc79..2d4ff07 100644 --- a/salt.changes +++ b/salt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 24 16:03:09 UTC 2019 - psuarezhernandez@suse.com + +- Fix return status when installing or updating RPM packages + with "ppc64le" arch (bsc#1133647) + +- Added: + * add-ppc64le-as-a-valid-rpm-package-architecture.patch + ------------------------------------------------------------------- Thu May 23 08:27:52 UTC 2019 - psuarezhernandez@suse.com diff --git a/salt.spec b/salt.spec index 01507df..2f8b144 100644 --- a/salt.spec +++ b/salt.spec @@ -178,6 +178,8 @@ Patch54: fix-async-batch-multiple-done-events.patch Patch55: switch-firewalld-state-to-use-change_interface.patch # PATCH-FIX_OPENSUSE Patch56: add-standalone-configuration-file-for-enabling-packa.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/53237 +Patch57: add-ppc64le-as-a-valid-rpm-package-architecture.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -704,6 +706,7 @@ cp %{S:5} ./.travis.yml %patch54 -p1 %patch55 -p1 %patch56 -p1 +%patch57 -p1 %build %if 0%{?build_py2}