Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-10-09 11:21:04 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-10-09 11:21:04 +0200
commitc2e6cfefd7b269613b948dac7276e32c194208f7 (patch)
tree3be511b033e6e0e4e2da50f0fc691b907ec68d5f
parent80b4b44075f6da57f3655c48c1b23eb5e31e705a (diff)
Revert "Limit kernel-source build to architectures for which we build binaries"
-rw-r--r--rpm/kernel-source.spec.in1
-rwxr-xr-xrpm/mkspec11
2 files changed, 2 insertions, 10 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..f3abbce6b8 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