Home Home > GIT Browse > packaging
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-09 09:59:49 +0200
committerMichal Suchanek <msuchanek@suse.de>2018-10-09 09:59:49 +0200
commit48b03c4e62a9b45d666136bef7ab01aac892108e (patch)
treefbda7ebcc783d7e0d701e2e2bb0428e290507b1b
parent85c92724f44a568ef39d6e7df732a1345b63e8b4 (diff)
Revert "Limit kernel-source build to architectures for which we build binaries"
-rw-r--r--rpm/kernel-source.spec.in1
-rwxr-xr-xrpm/mkspec14
2 files changed, 2 insertions, 13 deletions
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index 18ad390f66..a8ab17f4bf 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -113,7 +113,6 @@ Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: noarch @ARCHS@
BuildArch: noarch
Prefix: /usr/src
# Source is only complete with devel files.
diff --git a/rpm/mkspec b/rpm/mkspec
index 4c848fadd4..4467462c44 100755
--- a/rpm/mkspec
+++ b/rpm/mkspec
@@ -126,7 +126,6 @@ for my $kmp (@kmps) {
}
$kmp_definitions = join("\n", @kmp_definitions);
-my %source_archs = ();
for my $flavor (sort keys(%flavor_archs)) {
my ($summary, $description);
if (!exists($binary_descriptions{"kernel-$flavor"})) {
@@ -145,15 +144,11 @@ for my $flavor (sort keys(%flavor_archs)) {
provides_obsoletes($flavor, $subpac, @{$flavor_archs{$flavor}});
}
- my @archs = arch2rpm(@{$flavor_archs{$flavor}});
- foreach my $sarch (@archs) {
- $source_archs{$sarch}++;
- }
do_spec('binary', "kernel-$flavor.spec", %macros,
FLAVOR => $flavor,
SUMMARY => $summary,
DESCRIPTION => $description,
- ARCHS => join(" ", @archs),
+ ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})),
COMMON_DEPS => $templates{common_deps},
KMPS => join(" ", @kmps),
KMP_DEFINITIONS => $kmp_definitions,
@@ -161,9 +156,7 @@ for my $flavor (sort keys(%flavor_archs)) {
);
}
# kernel-source.spec
-do_spec('source', "kernel-source$variant.spec", %macros,
- ARCHS => join(" ", sort(keys %source_archs))
- );
+do_spec('source', "kernel-source$variant.spec", %macros);
if ($variant eq "") {
# kernel-docs.spec
@@ -436,9 +429,6 @@ sub _arch2rpm {
my $arch = shift;
return "\%ix86" if $arch eq "i386";
return "aarch64" if $arch eq "arm64";
- # there is disagreement between OBS and RPM what the arch is called ..
- return "ppc64le powerpc64le" if $arch eq "ppc64le";
- return "ppc64 powerpc64" if $arch eq "ppc64";
return $arch;
}