Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230712-kbuild_rpm_dtbs-v1-1-99693e8faaaf@jannau.net>
In-Reply-To: <20230712-kbuild_rpm_dtbs-v1-1-99693e8faaaf@jannau.net>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Fri, 21 Jul 2023 03:41:55 +0900
Message-ID: <CAK7LNASd9aCEJcAutVN+rPZKfbs28qayY2H-qO7KPu-kr_Q3QA@mail.gmail.com>
Subject: Re: [PATCH] kbuild: rpm-pkg: Add dtbs support
To:     j@jannau.net
Cc:     Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Nicolas Schier <nicolas@fjasle.eu>,
        linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Jul 12, 2023 at 3:42=E2=80=AFPM Janne Grunau via B4 Relay
<devnull+j.jannau.net@kernel.org> wrote:
>
> From: Janne Grunau <j@jannau.net>
>
> Based on the dtbs support in builddeb. Both Fedora and openSUSE kernel
> rpm install their dtbs in "/boot/dtb-${KERNELRELEASE}". There seems no
> other popular rpm based distributions which would benefit from dtbs
> support and are not derived from those two.
>
> Signed-off-by: Janne Grunau <j@jannau.net>
> ---
>  scripts/package/mkspec | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index 8049f0e2c110..a170b0c0a93f 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -28,6 +28,14 @@ else
>         M=3DDEL
>  fi
>
> +# Only some architectures with OF support have the dtbs_install target
> +if grep -q CONFIG_OF_EARLY_FLATTREE=3Dy include/config/auto.conf && \
> +   [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then
> +       D=3D
> +else
> +       D=3DDEL
> +fi

This is unneeded. See below.


> +
>  __KERNELRELEASE=3D$(echo $KERNELRELEASE | sed -e "s/-/_/g")
>  EXCLUDES=3D"$RCS_TAR_IGNORE --exclude=3D*vmlinux* --exclude=3D*.mod \
>  --exclude=3D*.o --exclude=3D*.ko --exclude=3D*.cmd --exclude=3DDocumenta=
tion \
> @@ -38,6 +46,8 @@ EXCLUDES=3D"$RCS_TAR_IGNORE --exclude=3D*vmlinux* --exc=
lude=3D*.mod \
>  # Labels:
>  #  $S: this line is enabled only when building source package
>  #  $M: this line is enabled only when CONFIG_MODULES is enabled
> +#  $D: this line is enabled only when CONFIG_OF_EARLY_FLATTREE is enable=
d and
> +#      the arch has a dts directory
>  sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
>         Name: kernel
>         Summary: The Linux Kernel
> @@ -103,6 +113,7 @@ $S
>         %endif
>  $M     $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=3D%{buildroot} modules_ins=
tall
>         $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=3D%{buildroot}/usr headers=
_install
> +$D     $MAKE %{?_smp_mflags} INSTALL_DTBS_PATH=3D%{buildroot}/boot/dtb-$=
{KERNELRELEASE} dtbs_install


Like deb-pkg, you can check CONFIG_OF_EARLY_FLATTREE
while building the package instead of while creating the spec file.

 if grep -q CONFIG_OF_EARLY_FLATTREE=3Dy include/config/auto.conf; then
     $MAKE %{?_smp_mflags}
INSTALL_DTBS_PATH=3D%{buildroot}/boot/dtb-${KERNELRELEASE} dtbs_install
 fi

(please note it is untested)


The reason for $S and $M is because they determine
whether the kernel-devel package is needed.
But, I regret the implementation was too ugly.
I will clean up mkspec.
Please submit v2 after the code clean-up.


>         cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
>         cp .config %{buildroot}/boot/config-$KERNELRELEASE
>  $S$M   rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
>
> ---
> base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
> change-id: 20230712-kbuild_rpm_dtbs-d055a3780bbe
>
> Best regards,
> --
> Janne Grunau <j@jannau.net>
>


--
Best Regards
Masahiro Yamada