kernel February 2024

kernel@lists.fedoraproject.org

4 participants
69 discussions

[OS-BUILD PATCH] redhat/kernel.spec.template: Add log_msg macro
by Prarit Bhargava (via Email Bridge) 21 Feb '24

21 Feb '24

From: Prarit Bhargava <prarit(a)redhat.com> redhat/kernel.spec.template: Add log_msg macro After last week's debugging session I was reminded why I hate debugging the kernel.spec. It's not that it's long, or that the code is difficult to understand -- it's that it can be difficult to map precisely where the fault in the spec file is. This isn't due to poor design and is due to the size of the kernel.spec and how rpmbuild creates bash scripts. In the %prep, %build, and %install stages, we often end up with an error that looks like cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' error: Bad exit status from /var/tmp/rpm-tmp.W1qm1T (%build) In this example, the /var/tmp/rpm-tmp.W1qm1T script is created by rpmbuild, and represents the %build stage of the spec file. It is left to the user to decipher the script and map that into the kernel.spec file to find the exact command(s) that failed; sometimes that is easy to do, and other times it is the most infuriating thing ever. It's made me question my choices in life and sent me into an existential crisis from which I'm likely never to recover. This changeset adds a log_msg macro. The hope is that this will be much more useful than digging through the resulting prep, build, and install scripts and trying to map the result to the spec file. Add log_msg() to the %prep, %build, and %install stages, and prepopulate the spec file with some log_msg's to indicate progress. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1711,11 +1711,20 @@ Prebuilt 64k unified kernel image for virtual machines. %kernel_ipaclones_package %endif +%define log_msg() set +x \ + _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \ + echo "kernel.spec:${_log_msglineno}: %{*}" \ + set -x + %prep +%{log_msg "Start of prep stage"} + +%{log_msg "Sanity checks"} + # do a few sanity-checks for --with *only builds %if %{with_baseonly} %if !%{with_up} -echo "Cannot build --with baseonly, up build is disabled" +%{log_msg "Cannot build --with baseonly, up build is disabled"} exit 1 %endif %endif @@ -1724,7 +1733,7 @@ exit 1 if [ "%{patches}" != "%%{patches}" ] ; then for patch in %{patches} ; do if [ ! -f $patch ] ; then - echo "ERROR: Patch ${patch##/*/} listed in specfile but is missing" + %{log_msg "ERROR: Patch ${patch##/*/} listed in specfile but is missing"} exit 1 fi done @@ -1740,7 +1749,7 @@ ApplyPatch() fi if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ; then if [ "${patch:0:8}" != "patch-%{kversion}." ] ; then - echo "ERROR: Patch $patch not listed as a source patch in specfile" + %{log_msg "ERROR: Patch $patch not listed as a source patch in specfile"} exit 1 fi fi 2>/dev/null @@ -1757,6 +1766,7 @@ ApplyOptionalPatch() { local patch=$1 shift + %{log_msg "ApplyOptionalPatch: $1"} if [ ! -f $RPM_SOURCE_DIR/$patch ]; then exit 1 fi @@ -1766,12 +1776,14 @@ ApplyOptionalPatch() fi } +%{log_msg "Untar kernel tarball"} %setup -q -n kernel-%{tarfile_release} -c mv linux-%{tarfile_release} linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . +%{log_msg "Start of patch applications"} %if !%{nopatches} ApplyOptionalPatch patch-%{patchversion}-redhat.patch @@ -1779,10 +1791,11 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch ApplyOptionalPatch linux-kernel-test.patch +%{log_msg "End of patch applications"} # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. - +%{log_msg "Pre-build tree manipulations"} chmod +x scripts/checkpatch.pl mv COPYING COPYING-%{specrpmversion}-%{release} @@ -1797,7 +1810,7 @@ rm -f localversion-next # This fixes errors such as # *** ERROR: ambiguous python shebang in /usr/bin/kvm_stat: #!/usr/bin/python. Change it to python3 (or python2) explicitly. # We patch all sources below for which we got a report/error. -echo "Fixing Python shebangs..." +%{log_msg "Fixing Python shebangs..."} %py3_shebang_fix \ tools/kvm/kvm_stat/kvm_stat \ scripts/show_delta \ @@ -1817,6 +1830,7 @@ fi mkdir configs cd configs +%{log_msg "Copy additional source files into buildroot"} # Drop some necessary files from the source dir into the buildroot cp $RPM_SOURCE_DIR/%{name}-*.config . cp %{SOURCE80} . @@ -1828,6 +1842,7 @@ cp %{SOURCE3001} partial-kernel-local-debug-snip.config FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled} # Collect custom defined config options +%{log_msg "Collect custom defined config options"} PARTIAL_CONFIGS="" %if %{with_gcov} PARTIAL_CONFIGS="$PARTIAL_CONFIGS %{SOURCE70} %{SOURCE71}" @@ -1853,6 +1868,7 @@ GetArch() } # Merge in any user-provided local config option changes +%{log_msg "Merge in any user-provided local config option changes"} %ifnarch %nobuildarches for i in %{all_configs} do @@ -1877,6 +1893,7 @@ done # Add DUP and kpatch certificates to system trusted keys for RHEL %if 0%{?rhel} +%{log_msg "Add DUP and kpatch certificates to system trusted keys for RHEL"} %if %{signkernel}%{signmodules} openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem @@ -1894,11 +1911,13 @@ done # Adjust FIPS module name for RHEL %if 0%{?rhel} +%{log_msg "Adjust FIPS module name for RHEL"} for i in *.config; do sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i done %endif +%{log_msg "Set process_configs.sh $OPTS"} cp %{SOURCE81} . OPTS="" %if %{with_configchecks} @@ -1909,6 +1928,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif +%{log_msg "Generate redhat configs"} RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS %{specrpmversion} # We may want to override files from the primary target in case of building @@ -1923,20 +1943,21 @@ update_scripts() { done } +%{log_msg "Set scripts/SOURCES targets"} update_target=%{primary_target} if [ "%{primary_target}" == "rhel" ]; then : # no-op to avoid empty if-fi error %if 0%{?centos} update_scripts $update_target - echo "Updating scripts/sources to centos version" + %{log_msg "Updating scripts/sources to centos version"} update_target=centos %endif fi update_scripts $update_target -# end of kernel config %endif +%{log_msg "End of kernel config"} cd .. # # End of Configs stuff @@ -1952,7 +1973,9 @@ cd .. ### build ### %build +%{log_msg "Start of build stage"} +%{log_msg "General arch build configuration"} rm -rf %{buildroot_unstripped} || true mkdir -p %{buildroot_unstripped} @@ -1976,9 +1999,11 @@ cp_vmlinux() %define make %{__make} %{?cross_opts} %{?make_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}" InitBuildVars() { + %{log_msg "InitBuildVars for $1"} + + %{log_msg "InitBuildVars: Initialize build variables"} # Initialize the kernel .config file and create some variables that are # needed for the actual build process. - Variant=$1 # Pick the right kernel config file @@ -1987,6 +2012,7 @@ InitBuildVars() { KernelVer=%{specversion}-%{release}.%{_target_cpu}${Variant:++${Variant}} + %{log_msg "InitBuildVars: Update Makefile"} # make sure EXTRAVERSION says what we want it to say # Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r") @@ -1996,6 +2022,7 @@ InitBuildVars() { # if we are post rc1 this should match anyway so this won't matter perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile + %{log_msg "InitBuildVars: Copy files"} %{make} %{?_smp_mflags} mrproper cp configs/$Config .config @@ -2004,23 +2031,26 @@ InitBuildVars() { %endif Arch=`head -1 .config | cut -b 3-` - echo USING ARCH=$Arch + %{log_msg "InitBuildVars: USING ARCH=$Arch"} KCFLAGS="%{?kcflags}" # add kpatch flags for base kernel + %{log_msg "InitBuildVars: Configure KCFLAGS"} if [ "$Variant" == "" ]; then KCFLAGS="$KCFLAGS %{?kpatch_kcflags}" fi } BuildKernel() { + %{log_msg "BuildKernel for $4"} MakeTarget=$1 KernelImage=$2 DoVDSO=$3 Variant=$4 InstallName=${5:-vmlinuz} + %{log_msg "Setup variables"} DoModules=1 if [ "$Variant" = "zfcpdump" ]; then DoModules=0 @@ -2035,22 +2065,25 @@ BuildKernel() { fi %if %{with_gcov} + %{log_msg "Setup build directories"} # Make build directory unique for each variant, so that gcno symlinks # are also unique for each variant. if [ -n "$Variant" ]; then ln -s $(pwd) ../linux-%{KVERREL}-${Variant} fi - echo "GCOV - continuing build in: $(pwd)" + %{log_msg "GCOV - continuing build in: $(pwd)"} pushd ../linux-%{KVERREL}${Variant:+-${Variant}} pwd > ../kernel${Variant:+-${Variant}}-gcov.list %endif + %{log_msg "Calling InitBuildVars for $Variant"} InitBuildVars $Variant - echo BUILDING A KERNEL FOR ${Variant} %{_target_cpu}... + %{log_msg "BUILDING A KERNEL FOR ${Variant} %{_target_cpu}..."} %{make} ARCH=$Arch olddefconfig >/dev/null + %{log_msg "Setup build-ids"} # This ensures build-ids are unique to allow parallel debuginfo perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags} @@ -2058,6 +2091,7 @@ BuildKernel() { %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" %{?_smp_mflags} modules %{?sparse_mflags} || exit 1 fi + %{log_msg "Setup RPM_BUILD_ROOT directories"} mkdir -p $RPM_BUILD_ROOT/%{image_install_path} mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/systemtap @@ -2066,32 +2100,38 @@ BuildKernel() { %endif %ifarch aarch64 + %{log_msg "Build dtb kernel"} %{make} ARCH=$Arch dtbs INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer %{make} ARCH=$Arch dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb find arch/$Arch/boot/dts -name '*.dtb' -type f -delete %endif + %{log_msg "Cleanup temp btf files"} # Remove large intermediate files we no longer need to save space # (-f required for zfcpdump builds that do not enable BTF) rm -f vmlinux.o .tmp_vmlinux.btf + %{log_msg "Install files to RPM_BUILD_ROOT"} # Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer install -m 644 .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/config install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer install -m 644 System.map $RPM_BUILD_ROOT/lib/modules/$KernelVer/System.map + %{log_msg "Create initrfamfs"} # We estimate the size of the initramfs because rpm needs to take this size # into consideration when performing disk space calculations. (See bz #530778) dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img bs=1M count=20 if [ -f arch/$Arch/boot/zImage.stub ]; then + %{log_msg "Copy zImage.stub to RPM_BUILD_ROOT"} cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/lib/modules/$KernelVer/zImage.stub-$KernelVer || : fi %if %{signkernel} + %{log_msg "Copy kernel for signing"} if [ "$KernelImage" = vmlinux ]; then # We can't strip and sign $KernelImage in place, because # we need to preserve original vmlinux for debuginfo. @@ -2104,6 +2144,7 @@ BuildKernel() { SignImage=$KernelImage %ifarch x86_64 aarch64 + %{log_msg "Sign kernel image"} %pesign -s -i $SignImage -o vmlinuz.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} %pesign -s -i vmlinuz.tmp -o vmlinuz.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} rm vmlinuz.tmp @@ -2120,31 +2161,35 @@ BuildKernel() { %endif if [ ! -s vmlinuz.signed ]; then - echo "pesigning failed" + %{log_msg "pesigning failed"} exit 1 fi mv vmlinuz.signed $SignImage # signkernel %endif + %{log_msg "copy signed kernel"} $CopyKernel $KernelImage \ $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer cp $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/$InstallName # hmac sign the kernel for FIPS - echo "Creating hmac file: $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac" + %{log_msg "hmac sign the kernel for FIPS"} + %{log_msg "Creating hmac file: $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac"} ls -l $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer (cd $RPM_BUILD_ROOT/%{image_install_path} && sha512hmac $InstallName-$KernelVer) > $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac; cp $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac $RPM_BUILD_ROOT/lib/modules/$KernelVer/.vmlinuz.hmac if [ $DoModules -eq 1 ]; then + %{log_msg "Install modules in RPM_BUILD_ROOT"} # Override $(mod-fw) because we don't want it to install any firmware # we'll get it from the linux-firmware package and we don't want conflicts %{make} %{?_smp_mflags} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT %{?_smp_mflags} modules_install KERNELRELEASE=$KernelVer mod-fw= fi %if %{with_gcov} + %{log_msg "install gcov-needed files to $BUILDROOT/$BUILD/"} # install gcov-needed files to $BUILDROOT/$BUILD/...: # gcov_info->filename is absolute path # gcno references to sources can use absolute paths (e.g. in out-of-tree builds) @@ -2152,6 +2197,7 @@ BuildKernel() { find . $ -name '*.gcno' -o -name '*.[chS]' $ -exec install -D '{}' "$RPM_BUILD_ROOT/$(pwd)/{}" \; %endif + %{log_msg "Add VDSO files"} # add an a noop %%defattr statement 'cause rpm doesn't like empty file list files echo '%%defattr(-,-,-)' > ../kernel${Variant:+-${Variant}}-ldsoconf.list if [ $DoVDSO -ne 0 ]; then @@ -2165,6 +2211,7 @@ BuildKernel() { rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/vdso/.build-id fi + %{log_msg "Save headers/makefiles, etc. for kernel-headers"} # And save the headers/makefiles etc for building modules against # # This all looks scary, but the end result is supposed to be: @@ -2199,12 +2246,12 @@ BuildKernel() { # NOTENOTE: script which dynamically adds exported kernel symbol # NOTENOTE: checksums to the rpm metadata provides list. # NOTENOTE: if you change the symvers name, update the backend too - echo "**** GENERATING kernel ABI metadata ****" + %{log_msg "GENERATING kernel ABI metadata"} %compression --stdout %compression_flags < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext cp $RPM_BUILD_ROOT/boot/symvers-$KernelVer.%compext $RPM_BUILD_ROOT/lib/modules/$KernelVer/symvers.%compext %if %{with_kabichk} - echo "**** kABI checking is enabled in kernel SPEC file. ****" + %{log_msg "kABI checking is enabled in kernel SPEC file."} chmod 0755 $RPM_SOURCE_DIR/check-kabi if [ -e $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu}$Variant ]; then cp $RPM_SOURCE_DIR/Module.kabi_%{_target_cpu}$Variant $RPM_BUILD_ROOT/Module.kabi @@ -2212,19 +2259,19 @@ BuildKernel() { # for now, don't keep it around. rm $RPM_BUILD_ROOT/Module.kabi else - echo "**** NOTE: Cannot find reference Module.kabi file. ****" + %{log_msg "NOTE: Cannot find reference Module.kabi file."} fi %endif %if %{with_kabidupchk} - echo "**** kABI DUP checking is enabled in kernel SPEC file. ****" + %{log_msg "kABI DUP checking is enabled in kernel SPEC file."} if [ -e $RPM_SOURCE_DIR/Module.kabi_dup_%{_target_cpu}$Variant ]; then cp $RPM_SOURCE_DIR/Module.kabi_dup_%{_target_cpu}$Variant $RPM_BUILD_ROOT/Module.kabi $RPM_SOURCE_DIR/check-kabi -k $RPM_BUILD_ROOT/Module.kabi -s Module.symvers || exit 1 # for now, don't keep it around. rm $RPM_BUILD_ROOT/Module.kabi else - echo "**** NOTE: Cannot find DUP reference Module.kabi file. ****" + %{log_msg "NOTE: Cannot find DUP reference Module.kabi file."} fi %endif @@ -2237,7 +2284,7 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists - echo "**** GENERATING DWARF-based kABI baseline dataset ****" + %{log_msg "GENERATING DWARF-based kABI baseline dataset"} chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh generate \ "$RPM_BUILD_ROOT/kabi-dwarf/stablelists/kabi-current/kabi_stablelist_%{_target_cpu}" \ @@ -2256,26 +2303,27 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists tar -xvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists - echo "**** GENERATING DWARF-based kABI dataset ****" + %{log_msg "GENERATING DWARF-based kABI dataset"} chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh generate \ "$RPM_BUILD_ROOT/kabi-dwarf/stablelists/kabi-current/kabi_stablelist_%{_target_cpu}" \ "$(pwd)" \ "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}.tmp" || : - echo "**** kABI DWARF-based comparison report ****" + %{log_msg "kABI DWARF-based comparison report"} $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh compare \ "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" \ "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}.tmp" || : - echo "**** End of kABI DWARF-based comparison report ****" + %{log_msg "End of kABI DWARF-based comparison report"} else - echo "**** Baseline dataset for kABI DWARF-BASED comparison report not found ****" + %{log_msg "Baseline dataset for kABI DWARF-BASED comparison report not found"} fi rm -rf $RPM_BUILD_ROOT/kabi-dwarf fi %endif + %{log_msg "Cleanup Makefiles/Kconfig files"} # then drop all but the needed Makefiles/Kconfig files rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include @@ -2287,11 +2335,13 @@ BuildKernel() { %ifarch s390x # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline/expoline.o # which is needed during external module build. + %{log_msg "Copy expoline.o"} if [ -f arch/s390/lib/expoline/expoline.o ]; then cp -a --parents arch/s390/lib/expoline/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build fi %endif + %{log_msg "Copy additional files for make targets"} # Files for 'make scripts' to succeed with kernel-devel. mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -2385,6 +2435,7 @@ BuildKernel() { cp -a --parents tools/objtool/arch/x86/ $RPM_BUILD_ROOT/lib/modules/$KernelVer/build %endif + %{log_msg "Clean up intermediate tools files"} # Clean up intermediate tools files find $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools $ -iname "*.o" -o -iname "*.cmd" $ -exec rm -f {} + @@ -2398,6 +2449,7 @@ BuildKernel() { eu-readelf -n vmlinux | grep "Build ID" | awk '{print $NF}' > vmlinux.id cp vmlinux.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.id + %{log_msg "Copy additional files for kernel-debuginfo rpm"} # # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm # (use mv + symlink instead of cp to reduce disk space requirements) @@ -2417,13 +2469,14 @@ BuildKernel() { fi %endif + %{log_msg "Create modnames"} find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames # mark modules executable so that strip-to-file can strip them xargs --no-run-if-empty chmod u+x < modnames # Generate a list of modules for block and networking. - + %{log_msg "Generate a list of modules for block and networking"} grep -F /drivers/ modnames | xargs --no-run-if-empty nm -upA | sed -n 's,^.*/$[^/]*\.ko$: *U $.*$$,\1 \2,p' > drivers.undef @@ -2445,6 +2498,7 @@ BuildKernel() { collect_modules_list modesetting \ 'drm_crtc_init' + %{log_msg "detect missing or incorrect license tags"} # detect missing or incorrect license tags ( find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name '*.ko' | xargs /sbin/modinfo -l | \ grep -E -v 'GPL( v2)?$|Dual BSD/GPL$|Dual MPL/GPL$|GPL and additional rights$' ) && exit 1 @@ -2460,8 +2514,10 @@ BuildKernel() { popd } + %{log_msg "Remove depmod files"} remove_depmod_files + %{log_msg "Identify modules in kenrel-modules-* packages"} # Identify modules in the kernel-modules-extras package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list) # Identify modules in the kernel-modules-internal package @@ -2478,6 +2534,7 @@ BuildKernel() { # # Generate the kernel-core and kernel-modules files lists # + %{log_msg "Gemerate the kernel-core and kernel-modules files lists"} # Copy the System.map file for depmod to use, and create a backup of the # full module tree so we can restore it after we're done filtering @@ -2487,6 +2544,7 @@ BuildKernel() { mkdir restore cp -r lib/modules/$KernelVer/* restore/. + %{log_msg "Remove files in the kernel-modules-* file lists"} # don't include anything going into kernel-modules-extra in the file lists xargs rm -rf < mod-extra.list # don't include anything going into kernel-modules-internal in the file lists @@ -2501,6 +2559,7 @@ BuildKernel() { fi if [ $DoModules -eq 1 ]; then + %{log_msg "Filter files into core and modules lists"} # Find all the module files and filter them out into the core and # modules lists. This actually removes anything going into -modules # from the dir. @@ -2511,13 +2570,14 @@ BuildKernel() { # Run depmod on the resulting module tree and make sure it isn't broken depmod -b . -aeF ./System.map $KernelVer &> depmod.out if [ -s depmod.out ]; then - echo "Depmod failure" + %{log_msg "Depmod failure"} cat depmod.out exit 1 else rm depmod.out fi else + %{log_msg "Create empty files for RPM packaging"} # Ensure important files/directories exist to let the packaging succeed echo '%%defattr(-,-,-)' > modules.list echo '%%defattr(-,-,-)' > k-d.list @@ -2529,9 +2589,10 @@ BuildKernel() { fi if [[ "$Variant" == "rt" || "$Variant" == "rt-debug" ]]; then - echo "Skipping efiuki build" + %{log_msg "Skipping efiuki build"} else %if %{with_efiuki} + %{log_msg "Setup the EFI UKI kernel"} popd KernelUnifiedImageDir="$RPM_BUILD_ROOT/lib/modules/$KernelVer" @@ -2551,13 +2612,13 @@ BuildKernel() { $KernelUnifiedImage %if %{signkernel} - + %{log_msg "Sign the EFI UKI kernel"} %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} %pesign -s -i $KernelUnifiedImage.tmp -o $KernelUnifiedImage.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} rm -f $KernelUnifiedImage.tmp if [ ! -s $KernelUnifiedImage.signed ]; then - echo "pesigning failed" + %{log_msg "pesigning failed"} exit 1 fi mv $KernelUnifiedImage.signed $KernelUnifiedImage @@ -2579,6 +2640,7 @@ BuildKernel() { find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n > module-dirs.list # Cleanup + %{log_msg "Cleanup build files"} rm System.map # Just "cp -r" can be very slow: here, it rewrites _existing files_ # with open(O_TRUNC). Many filesystems synchronously wait for metadata @@ -2593,6 +2655,7 @@ BuildKernel() { # Make sure the files lists start with absolute paths or rpmbuild fails. # Also add in the dir entries + %{log_msg "Create module list files for all kernel variants"} sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/k-d.list > ../kernel${Variant:+-${Variant}}-modules.list sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list > ../kernel${Variant:+-${Variant}}-modules-core.list sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-modules-core.list @@ -2601,7 +2664,8 @@ BuildKernel() { sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-kvm.list >> ../kernel${Variant:+-${Variant}}-kvm.list fi - # Cleanup + # Cleanup kernel variant module lists + %{log_msg "Clean up kernel variant module lists"} rm -f $RPM_BUILD_ROOT/k-d.list rm -f $RPM_BUILD_ROOT/modules.list rm -f $RPM_BUILD_ROOT/module-dirs.list @@ -2616,6 +2680,7 @@ BuildKernel() { %if %{signmodules} if [ $DoModules -eq 1 ]; then + %{log_msg "Save the signing keys for modules"} # Save the signing keys so we can sign the modules in __modsign_install_post cp certs/signing_key.pem certs/signing_key.pem.sign${Variant:++${Variant}} cp certs/signing_key.x509 certs/signing_key.x509.sign${Variant:++${Variant}} @@ -2623,6 +2688,7 @@ BuildKernel() { %endif # Move the devel headers out of the root file system + %{log_msg "Move the devel headers to RPM_BUILD_ROOT"} mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir @@ -2635,6 +2701,7 @@ BuildKernel() { # Generate vmlinux.h and put it to kernel-devel path # zfcpdump build does not have btf anymore if [ "$Variant" != "zfcpdump" ]; then + %{log_msg "Build the bootstrap bpftool to generate vmlinux.h"} # Build the bootstrap bpftool to generate vmlinux.h export BPFBOOTSTRAP_CFLAGS=$(echo "%{__global_compiler_flags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") export BPFBOOTSTRAP_LDFLAGS=$(echo "%{__global_ldflags}" | sed -r "s/\-specs=[^\ ]+\/redhat-annobin-cc1//") @@ -2643,12 +2710,14 @@ BuildKernel() { tools/bpf/bpftool/bootstrap/bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h fi + %{log_msg "Cleanup kernel-devel and kernel-debuginfo files"} # prune junk from kernel-devel find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete # prune junk from kernel-debuginfo find $RPM_BUILD_ROOT/usr/src/kernels -name "*.mod.c" -delete # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel + %{log_msg "Install certs"} mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer %ifarch x86_64 aarch64 install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca-20200609.cer @@ -2670,6 +2739,7 @@ BuildKernel() { %endif %if %{with_ipaclones} + %{log_msg "install IPA clones"} MAXPROCS=$(echo %{?_smp_mflags} | sed -n 's/-j\s*$[0-9]\+$/\1/p') if [ -z "$MAXPROCS" ]; then MAXPROCS=1 @@ -2698,7 +2768,6 @@ cd linux-%{KVERREL} %if %{with_debug} %if %{with_realtime} -echo "building rt-debug" BuildKernel %make_target %kernel_image %{_use_vdso} rt-debug %endif @@ -2711,7 +2780,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} 64k-debug %endif %if %{with_up} -echo "building main debug package" BuildKernel %make_target %kernel_image %{_use_vdso} debug %endif %endif @@ -2740,6 +2808,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %if !%{with_debug} && !%{with_zfcpdump} && !%{with_up} && !%{with_arm64_16k} && !%{with_arm64_64k} && !%{with_realtime} # If only building the user space tools, then initialize the build environment # and some variables so that the various userspace tools can be built. +%{log_msg "Initialize userspace tools build environment"} InitBuildVars %endif %endif @@ -2750,6 +2819,7 @@ InitBuildVars %global perf_make \ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} +%{log_msg "Build perf"} # perf # make sure check-headers.sh is executable chmod +x tools/perf/check-headers.sh @@ -2759,6 +2829,7 @@ chmod +x tools/perf/check-headers.sh %if %{with_libperf} %global libperf_make \ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/lib/perf V=1 + %{log_msg "build libperf"} %{libperf_make} DESTDIR=$RPM_BUILD_ROOT %endif @@ -2770,44 +2841,56 @@ chmod +x tools/perf/check-headers.sh # cpupower # make sure version-gen.sh is executable. chmod +x tools/power/cpupower/utils/version-gen.sh +%{log_msg "build cpupower"} %{tools_make} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false DEBUG=false %ifarch x86_64 pushd tools/power/cpupower/debug/x86_64 + %{log_msg "build centrino-decode powernow-k8-decode"} %{tools_make} %{?_smp_mflags} centrino-decode powernow-k8-decode popd %endif %ifarch x86_64 pushd tools/power/x86/x86_energy_perf_policy/ + %{log_msg "build x86_energy_perf_policy"} %{tools_make} popd pushd tools/power/x86/turbostat + %{log_msg "build turbostat"} %{tools_make} popd pushd tools/power/x86/intel-speed-select + %{log_msg "build intel-speed-select"} %{tools_make} popd pushd tools/arch/x86/intel_sdsi + %{log_msg "build intel_sdsi"} %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" popd %endif %endif pushd tools/thermal/tmon/ +%{log_msg "build tmon"} %{tools_make} popd pushd tools/iio/ +%{log_msg "build iio"} %{tools_make} popd pushd tools/gpio/ +%{log_msg "build gpio"} %{tools_make} popd # build VM tools pushd tools/mm/ +%{log_msg "build slabinfo page_owner_sort"} %{tools_make} slabinfo page_owner_sort popd pushd tools/verification/rv/ +%{log_msg "build rv"} %{tools_make} popd pushd tools/tracing/rtla +%{log_msg "build rtla"} %{tools_make} popd %endif @@ -2819,26 +2902,31 @@ fi %if %{with_bpftool} %global bpftool_make \ %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1 +%{log_msg "build bpftool"} pushd tools/bpf/bpftool %{bpftool_make} popd %else -echo "bpftools disabled ... disabling selftests" +%{log_msg "bpftools disabled ... disabling selftests"} %endif %if %{with_selftests} +%{log_msg "start build selftests"} # Unfortunately, samples/bpf/Makefile expects that the headers are installed # in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr # but there's no way to tell the Makefile to take them from there. +%{log_msg "install headers for selftests"} %{make} %{?_smp_mflags} headers_install # If we re building only tools without kernel, we need to generate config # headers and prepare tree for modules building. The modules_prepare target # will cover both. if [ ! -f include/generated/autoconf.h ]; then + %{log_msg "modules_prepare for selftests"} %{make} %{?_smp_mflags} modules_prepare fi +%{log_msg "build samples/bpf"} %{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true # Prevent bpf selftests to build bpftool repeatedly: @@ -2853,10 +2941,12 @@ pushd tools/testing/selftests force_targets="" %endif +%{log_msg "main selftests compile"} %{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. +%{log_msg "install selftests"} for dir in bpf bpf/no_alu32 bpf/progs; do # In ARK, the rpm build continues even if some of the selftests # cannot be built. It's not always possible to build selftests, @@ -2873,15 +2963,19 @@ done %buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32" popd export -n BPFTOOL +%{log_msg "end build selftests"} %endif %if %{with_doc} +%{log_msg "start install docs"} # Make the HTML pages. +%{log_msg "build html docs"} %{__make} PYTHON=/usr/bin/python3 htmldocs || %{doc_build_fail} # sometimes non-world-readable files sneak into the kernel source tree chmod -R a=rX Documentation find Documentation -type d | xargs chmod u+w +%{log_msg "end install docs"} %endif # Module signing (modsign) @@ -2893,17 +2987,17 @@ find Documentation -type d | xargs chmod u+w %define __modsign_install_post \ if [ "%{signmodules}" -eq "1" ]; then \ - echo "Signing kernel modules ..." \ + %{log_msg "Signing kernel modules ..."} \ modules_dirs="$(shopt -s nullglob; echo $RPM_BUILD_ROOT/lib/modules/%{KVERREL}*)" \ for modules_dir in $modules_dirs; do \ variant_suffix="${modules_dir#$RPM_BUILD_ROOT/lib/modules/%{KVERREL}}" \ [ "$variant_suffix" == "+zfcpdump" ] && continue \ - echo "Signing modules for %{KVERREL}${variant_suffix}" \ + %{log_msg "Signing modules for %{KVERREL}${variant_suffix}"} \ %{modsign_cmd} certs/signing_key.pem.sign${variant_suffix} certs/signing_key.x509.sign${variant_suffix} $modules_dir/ \ done \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \ - echo "Compressing kernel modules ..." \ + %{log_msg "Compressing kernel modules ..."} \ find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -n 16 -P${RPM_BUILD_NCPUS} -r %compression %compression_flags; \ fi \ %{nil} @@ -2954,6 +3048,7 @@ find Documentation -type d | xargs chmod u+w ### %install +%{log_msg "Start of install stage"} cd linux-%{KVERREL} @@ -2961,6 +3056,7 @@ cd linux-%{KVERREL} docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease} # copy the source over +%{log_msg "Copy the sources"} mkdir -p $docdir tar -h -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir cat %{SOURCE2} | xz > $docdir/kernel.changelog.xz @@ -2975,6 +3071,7 @@ chmod 0644 $docdir/kernel.changelog.xz %if %{with_headers} # Install kernel headers +%{log_msg "Install kernel headers"} %{__make} ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install find $RPM_BUILD_ROOT/usr/include \ @@ -2984,6 +3081,7 @@ find $RPM_BUILD_ROOT/usr/include \ %endif %if %{with_cross_headers} +%{log_msg "Install cross headers"} HDR_ARCH_LIST='arm64 powerpc s390 x86' mkdir -p $RPM_BUILD_ROOT/usr/tmp-headers @@ -2992,11 +3090,13 @@ for arch in $HDR_ARCH_LIST; do %{__make} ARCH=${arch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr/tmp-headers/arch-${arch} headers_install done +%{log_msg "Delete tmp-headers"} find $RPM_BUILD_ROOT/usr/tmp-headers \ $ -name .install -o -name .check -o \ -name ..install.cmd -o -name ..check.cmd $ -delete # Copy all the architectures we care about to their respective asm directories +%{log_msg "Install asm directories"} for arch in $HDR_ARCH_LIST ; do mkdir -p $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include mv $RPM_BUILD_ROOT/usr/tmp-headers/arch-${arch}/include/* $RPM_BUILD_ROOT/usr/${arch}-linux-gnu/include/ @@ -3011,12 +3111,14 @@ INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/ mkdir -p $INSTALL_KABI_PATH # install kabi releases directories +%{log_msg "install kabi releases directories"} tar -xvf %{SOURCE300} -C $INSTALL_KABI_PATH # with_kernel_abi_stablelists %endif %if %{with_perf} # perf tool binary and supporting scripts/binaries +%{log_msg "install perf tool binary and supporting scripts/binaries"} %{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace @@ -3026,13 +3128,16 @@ rm -f %{buildroot}%{_bindir}/trace # Whoever wants examples can fix it up! # remove examples +%{log_msg "remove perf examples and include"} rm -rf %{buildroot}/usr/lib/perf/examples rm -rf %{buildroot}/usr/lib/perf/include # python-perf extension +%{log_msg "install python-perf extension"} %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext # perf man pages (note: implicit rpm magic compresses them later) +%{log_msg "install perf man pages"} mkdir -p %{buildroot}/%{_mandir}/man1 %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-man @@ -3040,10 +3145,12 @@ mkdir -p %{buildroot}/%{_mandir}/man1 # even if we build against system's libtracevent during perf build (by setting # LIBTRACEEVENT_DYNAMIC=1 above in perf_make macro). Those files should already # ship with libtraceevent package. +%{log_msg "delete traceevent"} rm -rf %{buildroot}%{_libdir}/traceevent %endif %if %{with_libperf} +%{log_msg "install libperf"} %{libperf_make} DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir} install install_headers # This is installed on some arches and we don't want to ship it rm -rf %{buildroot}%{_libdir}/libperf.a @@ -3056,6 +3163,7 @@ rm -f %{buildroot}%{_libdir}/*.{a,la} %find_lang cpupower mv cpupower.lang ../ %ifarch x86_64 + %{log_msg "install cpupower"} pushd tools/power/cpupower/debug/x86_64 install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode @@ -3065,28 +3173,37 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* %endif %ifarch x86_64 mkdir -p %{buildroot}%{_mandir}/man8 + %{log_msg "install x86_energy_perf_policy"} pushd tools/power/x86/x86_energy_perf_policy %{tools_make} DESTDIR=%{buildroot} install popd + %{log_msg "install turbostat"} pushd tools/power/x86/turbostat + mkdir -p %{buildroot}%{_mandir}/man8 %{tools_make} DESTDIR=%{buildroot} install popd + %{log_msg "install intel-speed-select"} pushd tools/power/x86/intel-speed-select %{tools_make} DESTDIR=%{buildroot} install popd + %{log_msg "install intel_sdsi"} pushd tools/arch/x86/intel_sdsi %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} install popd %endif +%{log_msg "install tmon"} pushd tools/thermal/tmon %{tools_make} INSTALL_ROOT=%{buildroot} install popd +%{log_msg "install iio"} pushd tools/iio %{tools_make} DESTDIR=%{buildroot} install popd +%{log_msg "install gpio"} pushd tools/gpio %{tools_make} DESTDIR=%{buildroot} install popd +%{log_msg "install kvm_stat logrotate"} install -m644 -D %{SOURCE2002} %{buildroot}%{_sysconfdir}/logrotate.d/kvm_stat pushd tools/kvm/kvm_stat %{__make} INSTALL_ROOT=%{buildroot} install-tools @@ -3094,13 +3211,18 @@ pushd tools/kvm/kvm_stat install -m644 -D kvm_stat.service %{buildroot}%{_unitdir}/kvm_stat.service popd # install VM tools +%{log_msg "install VM tools"} pushd tools/mm/ +%{log_msg "install slabinfo"} install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo +%{log_msg "install page_owners_sort"} install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort popd +%{log_msg "install rv"} pushd tools/verification/rv/ %{tools_make} DESTDIR=%{buildroot} install popd +%{log_msg "install rtla"} pushd tools/tracing/rtla/ %{tools_make} DESTDIR=%{buildroot} install rm -f %{buildroot}%{_bindir}/hwnoise @@ -3116,15 +3238,18 @@ popd %endif %if %{with_bpftool} +%{log_msg "install bpftool docs"} pushd tools/bpf/bpftool %{bpftool_make} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install popd %endif %if %{with_selftests} +%{log_msg "install selftests"} pushd samples install -d %{buildroot}%{_libexecdir}/ksamples # install bpf samples +%{log_msg "install bpf samples"} pushd bpf install -d %{buildroot}%{_libexecdir}/ksamples/bpf find -type f -executable -exec install -m755 {} %{buildroot}%{_libexecdir}/ksamples/bpf \; @@ -3136,6 +3261,7 @@ install -m644 *_kern.o %{buildroot}%{_libexecdir}/ksamples/bpf || true install -m644 tcp_bpf.readme %{buildroot}%{_libexecdir}/ksamples/bpf popd # install pktgen samples +%{log_msg "install pktgen samples"} pushd pktgen install -d %{buildroot}%{_libexecdir}/ksamples/pktgen find . -type f -executable -exec install -m755 {} %{buildroot}%{_libexecdir}/ksamples/pktgen/{} \; @@ -3143,54 +3269,63 @@ find . -type f ! -executable -exec install -m644 {} %{buildroot}%{_libexecdir}/k popd popd # install mm selftests +%{log_msg "install mm selftests"} pushd tools/testing/selftests/mm find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/mm/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \; popd # install drivers/net/mlxsw selftests +%{log_msg "install drivers/net/mlxsw selftests"} pushd tools/testing/selftests/drivers/net/mlxsw find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \; popd # install drivers/net/netdevsim selftests +%{log_msg "install drivers/net/netdevsim selftests"} pushd tools/testing/selftests/drivers/net/netdevsim find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \; popd # install drivers/net/bonding selftests +%{log_msg "install drivers/net/bonding selftests"} pushd tools/testing/selftests/drivers/net/bonding find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/bonding/{} \; popd # install net/forwarding selftests +%{log_msg "install net/forwarding selftests"} pushd tools/testing/selftests/net/forwarding find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; popd # install net/mptcp selftests +%{log_msg "install net/mptcp selftests"} pushd tools/testing/selftests/net/mptcp find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \; popd # install tc-testing selftests +%{log_msg "install tc-testing selftests"} pushd tools/testing/selftests/tc-testing find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/tc-testing/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/tc-testing/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/tc-testing/{} \; popd # install livepatch selftests +%{log_msg "install livepatch selftests"} pushd tools/testing/selftests/livepatch find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \; popd # install netfilter selftests +%{log_msg "install netfilter selftests"} pushd tools/testing/selftests/netfilter find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \; @@ -3198,6 +3333,7 @@ find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/ popd # install memfd selftests +%{log_msg "install memfd selftests"} pushd tools/testing/selftests/memfd find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/memfd/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/memfd/{} \; -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2952

1 0

[OS-BUILD PATCH] gitlab-ci: drop test_makefile job
by Scott Weaver (via Email Bridge) 21 Feb '24

21 Feb '24

From: Scott Weaver <scweaver(a)redhat.com> gitlab-ci: drop test_makefile job We no longer need this test because we build using the cki build containers which already have the build dependencies installed and those build containers are gated on being able to build the kernel. Signed-off-by: Scott Weaver <scweaver(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -446,28 +446,6 @@ rawhide_release: - *only-os-build-schedule - if: $RAWHIDE_RELEASE == "true" -test_makefile: - image: quay.io/fedora/fedora:rawhide - variables: - GIT_DEPTH: "0" - GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark - before_script: - - echo "fastestmirror=true" >> /etc/dnf/dnf.conf - - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2 - # These packages are required for 'make dist-get-buildreqs' - - dnf -y install make rpm-build - - git config user.name "Fedora Kernel Team" - - git config user.email "kernel-team(a)fedoraproject.org" - script: - - export missing=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2-) - - if [ "$missing" == "" ]; then echo "Missing dependencies should not be null but are empty. Review test log." && exit 1; fi; - - dnf -y install $missing - - export missingafter=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2-) - - if [ "$missingafter" != "" ]; then echo "Missing dependencies should be null but are $missingafter. Review test log." && exit 1; fi; - rules: - - *only-os-build-mr - - *on-success - docs: image: quay.io/cki/cki-tools:production script: -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2951

1 0

[OS-BUILD PATCHv2] Add libperf-debuginfo subpackage
by Justin M. Forbes (via Email Bridge) 21 Feb '24

21 Feb '24

From: Justin M. Forbes <jforbes(a)fedoraproject.org> Add libperf-debuginfo subpackage When libperf was added, I failed to add the libperf-debuginfo subpackage. This leaves libperf debuginfo in kernel-debuginfo-common which is installonly, and creaes file conflicts. Add the debuginfo subpackage so things are where they belong. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1137,6 +1137,19 @@ Summary: Developement files for the perf library from kernel source This package includes libraries and header files needed for development of applications which use perf library from kernel source. +%package -n libperf-debuginfo +Summary: Debug information for package libperf +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release} +AutoReqProv: no +%description -n libperf-debuginfo +This package provides debug information for the libperf package. + +# Note that this pattern only works right to match the .build-id +# symlinks because of the trailing nonmatching alternation and +# the leading .*, because of find-debuginfo.sh's buggy handling +# of matching the pattern against the symlinks file. +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so(\.debug)?|XXX' -o libperf-debuginfo.list} # with_libperf %endif @@ -3561,6 +3574,7 @@ fi\ %{_docdir}/libperf/html/libperf-counting.html %{_docdir}/libperf/html/libperf-sampling.html +%files -f libperf-debuginfo.list -n libperf-debuginfo # with_libperf %endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2950

1 0

[OS-BUILD PATCH] Add libperf-debuginfo subpackage
by Justin M. Forbes (via Email Bridge) 21 Feb '24

21 Feb '24

1 0

[OS-BUILD PATCHv2 0/3] Intel Pinctrl Updates
by David Arcari (via Email Bridge) 21 Feb '24

21 Feb '24

From: David Arcari on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2946 The first patch in the series performs cleanup of the intel pinctrl config files resulting in a consistent view; however, no functional change is intended. The next two patches perform RHEL enablement. Signed-off-by: David Arcari <darcari(a)redhat.com> --- redhat/configs/common/generic/CONFIG_PINCTRL_ALDERLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ALDERLAKE | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_BROXTON => redhat/configs/common/generic/x86/CONFIG_PINCTRL_BROXTON | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_CANNONLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_CANNONLAKE | 0 redhat/configs/fedora/generic/CONFIG_PINCTRL_CEDARFORK => redhat/configs/common/generic/x86/CONFIG_PINCTRL_CEDARFORK | 0 redhat/configs/common/generic/CONFIG_PINCTRL_ELKHARTLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ELKHARTLAKE | 0 redhat/configs/common/generic/CONFIG_PINCTRL_EMMITSBURG => redhat/configs/common/generic/x86/CONFIG_PINCTRL_EMMITSBURG | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ICELAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_ICELAKE | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_INTEL_PLATFORM => redhat/configs/common/generic/x86/CONFIG_PINCTRL_INTEL_PLATFORM | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_JASPERLAKE => redhat/configs/common/generic/x86/CONFIG_PINCTRL_JASPERLAKE | 0 redhat/configs/common/generic/CONFIG_PINCTRL_LAKEFIELD => redhat/configs/common/generic/x86/CONFIG_PINCTRL_LAKEFIELD | 0 redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_METEORPOINT => redhat/configs/common/generic/x86/CONFIG_PINCTRL_METEORPOINT | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_BAYTRAIL | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_BROXTON | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_GEMINILAKE | 1 - redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ALDERLAKE | 1 - redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_ELKHARTLAKE | 1 - redhat/configs/fedora/generic/x86/CONFIG_PINCTRL_LAKEFIELD | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_CANNONLAKE | 1 - redhat/configs/fedora/generic/CONFIG_PINCTRL_JASPERLAKE | 1 - redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_BROXTON | 1 - redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CANNONLAKE | 1 - redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CEDARFORK | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_CHERRYVIEW => redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_CHERRYVIEW | 0 redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_JASPERLAKE | 1 - redhat/configs/common/generic/CONFIG_PINCTRL_LYNXPOINT => redhat/configs/rhel/generic/x86/CONFIG_PINCTRL_LYNXPOINT | 0 redhat/configs/rhel/generic/CONFIG_PINCTRL_BROXTON | 1 - redhat/configs/rhel/generic/CONFIG_PINCTRL_CHERRYVIEW | 1 - redhat/configs/rhel/generic/CONFIG_PINCTRL_ICELAKE | 1 - redhat/configs/rhel/generic/CONFIG_PINCTRL_INTEL_PLATFORM | 1 - redhat/configs/rhel/generic/CONFIG_PINCTRL_JASPERLAKE | 1 - redhat/configs/rhel/generic/CONFIG_PINCTRL_METEORPOINT | 1 - 31 files changed, 0 insertions(+), 18 deletions(-)

1 4

[OS-BUILD PATCHv2 0/2] redhat: Do not build libperf with cross builds
by Prarit Bhargava (via Email Bridge) 20 Feb '24

20 Feb '24

From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949 JIRA: https://issues.redhat.com/browse/RHELMISC-2923 When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 2 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 2 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 2 +- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 2 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 2 +- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 2 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 2 +- redhat/self-test/data/rhel-df0cc57e057f.el7 | 2 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 2 +- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 2 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 2 +- redhat/Makefile.cross | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)

1 2

[OS-BUILD PATCH] redhat: Do not build libperf with cross builds
by Prarit Bhargava (via Email Bridge) 20 Feb '24

20 Feb '24

From: Prarit Bhargava <prarit(a)redhat.com> redhat: Do not build libperf with cross builds When executing one of the cross build targets, for example, dist-cross-aarch64-build, the compile fails with cc1: error: unrecognized command-line option '-mbranch-protection=standard' cc1: error: unrecognized command-line option '-mbranch-protection=standard' These errors are from building libperf which, similar to perf, is base architecture specific. Do not build libperf in cross builds. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/redhat/Makefile.cross b/redhat/Makefile.cross index blahblah..blahblah 100644 --- a/redhat/Makefile.cross +++ b/redhat/Makefile.cross @@ -1,6 +1,6 @@ CROSS_RPMFLAGS = $(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" -CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools +CROSS_DISABLED_SUBPACKAGES=--without bpftool --without perf --without tools --without libperf CROSS_PACKAGE_LIST = \ cross-binutils-common cross-gcc-common diffstat \ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2949

1 0

[OS-BUILD PATCH] redhat: Do not build libperf with cross builds
by Prarit Bhargava (via Email Bridge) 20 Feb '24

20 Feb '24

1 0

[OS-BUILD PATCHv2] kernel.spec: include the GDB plugin in kernel-debuginfo
by Ondrej Mosnáček (via Email Bridge) 20 Feb '24

20 Feb '24

From: Ondrej Mosnacek <omosnace(a)redhat.com> kernel.spec: include the GDB plugin in kernel-debuginfo Provide the GDB plugin files in the debuginfo package so that consumers can use it when dubugging the kernel via GDB [1]. While it spossible to do it without this plugin to some extent, it becomes essential when you want to debug also code inside modules. And it provides many more convenience commands on top of that. Place the plugin files beside vmlinux so that gdb can auto-load it (after some path setup). Example gdb command line using manually extracted debuginfo RPM contents: gdb --directory <extracted_dir>/usr/src/debug/*/linux-<kver> \ --cd <extracted_dir>/usr/lib/debug/lib/modules/<kver> \ -iex 'add-auto-load-safe-path <extracted_dir>/usr/lib/debug/lib/modules/<kver>' \ -ex 'target remote <gdb_socket_or_port>' vmlinux I occasionally use this to debug kernels built as an RPM and having the plugin included will be very useful to me. [1] https://docs.kernel.org/dev-tools/gdb-kernel-debugging.html Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2415,6 +2415,13 @@ BuildKernel() { cp %{vmlinux_decompressor} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux.decompressor fi fi + + # build and copy the vmlinux-gdb plugin files into kernel-debuginfo + %{make} %{?_smp_mflags} scripts_gdb + cp -a --parents scripts/gdb/{,linux/}*.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer + # this should be a relative symlink (Kbuild creates an absolute one) + ln -s scripts/gdb/vmlinux-gdb.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux-gdb.py + %py_byte_compile %{python3} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/scripts/gdb %endif find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2929

1 0

[OS-BUILD PATCHv4 0/4] redhat/Makefile: fix and clean up some of the logic (v2)
by Ondrej Mosnáček (via Email Bridge) 20 Feb '24

20 Feb '24

From: Ondrej Mosnáček on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2913 Since !2892 was buggy and had to be reverted, this is a second attempt, hopefully correct this time. --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/centos-df0cc57e057f.el7 | 4 +- redhat/self-test/data/centos-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 4 +- redhat/self-test/data/create-data.sh | 2 +- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/fedora-df0cc57e057f.el7 | 4 +- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 4 +- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 4 +- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 4 +- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 4 +- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 4 +- redhat/self-test/data/rhel-df0cc57e057f.el7 | 4 +- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 4 +- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 4 +- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 4 +- redhat/Makefile | 38 +++++++++++-------------- 26 files changed, 66 insertions(+), 70 deletions(-)

1 5

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel February 2024