From 403d89f7731634c5e26fb0fbf97cd334487f8aba Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Aug 31 2022 10:01:44 +0000 Subject: mkspec: eliminate @NOSOURCE@ macro This should be alsways used with @SOURCES@, just include the content there. Signed-off-by: Michal Suchanek --- diff --git a/rpm/dtb.spec.in.in b/rpm/dtb.spec.in.in index 6a797aa..01b9e77 100644 --- a/rpm/dtb.spec.in.in +++ b/rpm/dtb.spec.in.in @@ -49,8 +49,6 @@ BuildRequires: dtc >= 1.4.0 BuildRequires: xz Requires: kernel = %version @SOURCES@ -# These files are found in the kernel-source package: -@NOSOURCE@ %description Device Tree files for $MACHINES. diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in index dae3be4..0b3ec3b 100644 --- a/rpm/kernel-binary.spec.in +++ b/rpm/kernel-binary.spec.in @@ -247,8 +247,6 @@ Provides: %name-srchash-@COMMIT_FULL@ @PROVIDES_OBSOLETES_BASE@ %obsolete_rebuilds %name @SOURCES@ -# These files are found in the kernel-source package: -@NOSOURCE@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ diff --git a/rpm/kernel-docs.spec.in b/rpm/kernel-docs.spec.in index 14a8bf6..9a20883 100644 --- a/rpm/kernel-docs.spec.in +++ b/rpm/kernel-docs.spec.in @@ -70,8 +70,6 @@ Provides: %name-srchash-@COMMIT_FULL@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @SOURCES@ -# These files are found in the kernel-source package: -@NOSOURCE@ %description A few basic documents from the current kernel sources. diff --git a/rpm/mkspec b/rpm/mkspec index f9967a9..66ab61c 100755 --- a/rpm/mkspec +++ b/rpm/mkspec @@ -114,8 +114,7 @@ my %macros = ( RELEASE => $rpmrelease, COMMIT => $commit, COMMIT_FULL => $commit_full, - SOURCES => $sources, - NOSOURCE => $nosource, + SOURCES => $sources . "\n# These files are found in the kernel-source package:\n" . $nosource, UNPACK_PATCHES => $unpack_patches, SCRIPTS => $scripts, LIVEPATCH => $livepatch,