Received-SPF: pass (google.com: domain of linux-kernel+bounces-210109-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <20240610163856.693110-1-aquini@redhat.com>
In-Reply-To: <20240610163856.693110-1-aquini@redhat.com>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Wed, 12 Jun 2024 00:00:18 +0900
Message-ID: <CAK7LNASe0q4W2cuLnLnpJbWtyoOoZ6Gi+wJw=JiRyZrT9KdNEQ@mail.gmail.com>
Subject: Re: [PATCH] kbuild: rpm-pkg: fix rpmbuild warnings for kernel.spec
To: Rafael Aquini <aquini@redhat.com>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, 
	Nathan Chancellor <nathan@kernel.org>, Nicolas Schier <nicolas@fjasle.eu>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Jun 11, 2024 at 1:39=E2=80=AFAM Rafael Aquini <aquini@redhat.com> w=
rote:
>
> Newer revisions of rpmbuild are throwing warnings about the current
> kernel.spec template having an unversioned kernel-headers in the
> 'Obsoletes:' field and not being able to source the epoch's date from
> the spec's missing '%changelog' section:
>
>   $ make srcrpm-pkg
>     UPD     include/config/kernel.release
>     GEN     rpmbuild/SPECS/kernel.spec
>     UPD     .tmp_HEAD
>     ARCHIVE linux.tar.gz
>   rpmbuild -bs rpmbuild/SPECS/kernel.spec --define=3D'_topdir /mnt/nfs/wo=
rk/kernel/linux/rpmbuild'
>   warning: line 34: It's not recommended to have unversioned Obsoletes: O=
bsoletes: kernel-headers
>   warning: source_date_epoch_from_changelog set but %changelog is missing
>   Wrote: /mnt/nfs/work/kernel/linux/rpmbuild/SRPMS/kernel-6.10.0_rc3-1.sr=
c.rpm
>
>   RPM build warnings:
>       line 34: It's not recommended to have unversioned Obsoletes: Obsole=
tes: kernel-headers
>       source_date_epoch_from_changelog set but %changelog is missing
>
> This patch addresses both RPM build warnings.
>
> Signed-off-by: Rafael Aquini <aquini@redhat.com>
> ---
>  scripts/package/kernel.spec | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
> index e095eb1e290e..4d58b29c03ad 100644
> --- a/scripts/package/kernel.spec
> +++ b/scripts/package/kernel.spec
> @@ -1,3 +1,5 @@
> +%global source_date_epoch_from_changelog 0
>


Another possibility might be to add %changelog section.

In Debian packaging, debian/changelog is a requirement.

scripts/package/mkdebian generates a very small
debian/changelog with a single log entry.


>  # _arch is undefined if /usr/lib/rpm/platform/*/macros was not included.
>  %{!?_arch: %define _arch dummy}
>  %{!?make: %define make make}
> @@ -27,7 +29,7 @@ The Linux Kernel, the operating system core itself
>  %package headers
>  Summary: Header files for the Linux kernel for use by glibc
>  Group: Development/System
> -Obsoletes: kernel-headers
> +Obsoletes: kernel-headers < %{version}


No objection to this fix.


>  Provides: kernel-headers =3D %{version}
>  %description headers
>  Kernel-headers includes the C header files that specify the interface
> --
> 2.45.1
>


--=20
Best Regards
Masahiro Yamada