| Message ID | 20240311162238.1761147-1-jtornosm@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V2] kbuild: rpm-pkg: add dtb files in kernel rpm | expand |
On Mon, Mar 11, 2024 at 05:22:38PM +0100, Jose Ignacio Tornos Martinez wrote: > Some architectures, like aarch64 ones, need a dtb file to configure the > hardware. The default dtb file can be preloaded from u-boot, but the final > and/or more complete dtb file needs to be able to be loaded later from > rootfs. > > Add the possible dtb files to the kernel rpm and mimic Fedora shipping > process, storing the dtb files in the module directory. These dtb files > will be copied to /boot directory by the install scripts, but add fallback > just in case, checking if the content in /boot directory is correct. > > Mark the files installed to /boot as %ghost to make sure they will be > removed when the package is uninstalled. > > Tested with Fedora Rawhide (x86_64 and aarch64) with dnf and rpm tools. > In addition, fallback was also tested after modifying the install scripts. > > Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> Tested-by: Nathan Chancellor <nathan@kernel.org> I can see the new files in my arm64 package using 'rpm -qf'. > --- > V1 -> V2: > - Follow the suggestions from Masahiro Yamada to improve the checks and > avoid the loop to ghost the dtb files in /boot folder. > > scripts/package/kernel.spec | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec > index c256b73cca3e..e095eb1e290e 100644 > --- a/scripts/package/kernel.spec > +++ b/scripts/package/kernel.spec > @@ -61,6 +61,9 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEAS > %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install > cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE} > cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config > +if %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='test -d ${srctree}/arch/${SRCARCH}/boot/dts' 2>/dev/null; then > + %{make} %{makeflags} INSTALL_DTBS_PATH=%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb dtbs_install > +fi > ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build > %if %{with_devel} > %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' > @@ -81,6 +84,11 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA > echo "%ghost /boot/${x}-%{KERNELRELEASE}" > done > > + if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then > + echo "/lib/modules/%{KERNELRELEASE}/dtb" > + find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n" > + fi > + > echo "%exclude /lib/modules/%{KERNELRELEASE}/build" > } > %{buildroot}/kernel.list > > @@ -96,6 +104,11 @@ for file in vmlinuz System.map config; do > cp "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}" > fi > done > +if [ -d "/lib/modules/%{KERNELRELEASE}/dtb" ] && \ > + ! diff -rq "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}" >/dev/null 2>&1; then > + rm -rf "/boot/dtb-%{KERNELRELEASE}" > + cp -r "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}" > +fi > if [ ! -e "/lib/modules/%{KERNELRELEASE}/modules.dep" ]; then > /usr/sbin/depmod %{KERNELRELEASE} > fi > -- > 2.44.0 >
On Tue, Mar 12, 2024 at 1:22 AM Jose Ignacio Tornos Martinez <jtornosm@redhat.com> wrote: > > Some architectures, like aarch64 ones, need a dtb file to configure the > hardware. The default dtb file can be preloaded from u-boot, but the final > and/or more complete dtb file needs to be able to be loaded later from > rootfs. > > Add the possible dtb files to the kernel rpm and mimic Fedora shipping > process, storing the dtb files in the module directory. These dtb files > will be copied to /boot directory by the install scripts, but add fallback > just in case, checking if the content in /boot directory is correct. > > Mark the files installed to /boot as %ghost to make sure they will be > removed when the package is uninstalled. > > Tested with Fedora Rawhide (x86_64 and aarch64) with dnf and rpm tools. > In addition, fallback was also tested after modifying the install scripts. > > Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> > --- > V1 -> V2: > - Follow the suggestions from Masahiro Yamada to improve the checks and > avoid the loop to ghost the dtb files in /boot folder. Applied to linux-kbuild. Thanks.
diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index c256b73cca3e..e095eb1e290e 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -61,6 +61,9 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEAS %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE} cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config +if %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='test -d ${srctree}/arch/${SRCARCH}/boot/dts' 2>/dev/null; then + %{make} %{makeflags} INSTALL_DTBS_PATH=%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb dtbs_install +fi ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build %if %{with_devel} %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' @@ -81,6 +84,11 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA echo "%ghost /boot/${x}-%{KERNELRELEASE}" done + if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then + echo "/lib/modules/%{KERNELRELEASE}/dtb" + find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n" + fi + echo "%exclude /lib/modules/%{KERNELRELEASE}/build" } > %{buildroot}/kernel.list @@ -96,6 +104,11 @@ for file in vmlinuz System.map config; do cp "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}" fi done +if [ -d "/lib/modules/%{KERNELRELEASE}/dtb" ] && \ + ! diff -rq "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}" >/dev/null 2>&1; then + rm -rf "/boot/dtb-%{KERNELRELEASE}" + cp -r "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}" +fi if [ ! -e "/lib/modules/%{KERNELRELEASE}/modules.dep" ]; then /usr/sbin/depmod %{KERNELRELEASE} fi
Some architectures, like aarch64 ones, need a dtb file to configure the hardware. The default dtb file can be preloaded from u-boot, but the final and/or more complete dtb file needs to be able to be loaded later from rootfs. Add the possible dtb files to the kernel rpm and mimic Fedora shipping process, storing the dtb files in the module directory. These dtb files will be copied to /boot directory by the install scripts, but add fallback just in case, checking if the content in /boot directory is correct. Mark the files installed to /boot as %ghost to make sure they will be removed when the package is uninstalled. Tested with Fedora Rawhide (x86_64 and aarch64) with dnf and rpm tools. In addition, fallback was also tested after modifying the install scripts. Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> --- V1 -> V2: - Follow the suggestions from Masahiro Yamada to improve the checks and avoid the loop to ghost the dtb files in /boot folder. scripts/package/kernel.spec | 13 +++++++++++++ 1 file changed, 13 insertions(+)