2023-04-17 14:40:08

by Masahiro Yamada

Subject: [PATCH] kbuild: rpm-pkg: remove kernel-drm PROVIDES

This code was added more than 20 years ago. [1]

I checked the kernel spec files in Fedora and OpenSUSE, but did not
see 'kernel-drm'. I do not know if there exists a distro that uses it
in RPM dependency.

Remove this, and let's see if somebody complains about it.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=6d956df7d6b716b28c910c4f5b360c4d44d96c4d

Signed-off-by: Masahiro Yamada <[email protected]>
---

scripts/package/mkspec | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index fc8ad3fbc0a9..8049f0e2c110 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -28,11 +28,6 @@ else
M=DEL
fi

-if grep -q CONFIG_DRM=y include/config/auto.conf; then
- PROVIDES=kernel-drm
-fi
-
-PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
__KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \
--exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \
@@ -55,7 +50,7 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
$S Source0: linux.tar.gz
$S Source1: config
$S Source2: diff.patch
- Provides: $PROVIDES
+ Provides: kernel-$KERNELRELEASE
$S BuildRequires: bc binutils bison dwarves
$S BuildRequires: (elfutils-libelf-devel or libelf-devel) flex
$S BuildRequires: gcc make openssl openssl-devel perl python3 rsync
--
2.37.2

2023-04-18 18:42:21

by Nathan Chancellor

Subject: Re: [PATCH] kbuild: rpm-pkg: remove kernel-drm PROVIDES

On Mon, Apr 17, 2023 at 11:35:35PM +0900, Masahiro Yamada wrote:
> This code was added more than 20 years ago. [1]
>
> I checked the kernel spec files in Fedora and OpenSUSE, but did not
> see 'kernel-drm'. I do not know if there exists a distro that uses it
> in RPM dependency.
>
> Remove this, and let's see if somebody complains about it.
>
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/history/history.git/commit/?id=6d956df7d6b716b28c910c4f5b360c4d44d96c4d
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
>
> scripts/package/mkspec | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index fc8ad3fbc0a9..8049f0e2c110 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -28,11 +28,6 @@ else
> M=DEL
> fi
>
> -if grep -q CONFIG_DRM=y include/config/auto.conf; then
> - PROVIDES=kernel-drm
> -fi
> -
> -PROVIDES="$PROVIDES kernel-$KERNELRELEASE"
> __KERNELRELEASE=$(echo $KERNELRELEASE | sed -e "s/-/_/g")
> EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \
> --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \
> @@ -55,7 +50,7 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
> $S Source0: linux.tar.gz
> $S Source1: config
> $S Source2: diff.patch
> - Provides: $PROVIDES
> + Provides: kernel-$KERNELRELEASE
> $S BuildRequires: bc binutils bison dwarves
> $S BuildRequires: (elfutils-libelf-devel or libelf-devel) flex
> $S BuildRequires: gcc make openssl openssl-devel perl python3 rsync
> --
> 2.37.2
>