Re: [PATCH next v2] kbuild: add ability to make source rpm buildable using koji

[Randy Dunlap]

Hi,

On 12/5/22 21:37, Jonathan Toppins wrote:
> On 11/21/22 09:48, Jonathan Toppins wrote:
>> From: Ivan Vecera <ivecera@xxxxxxxxxx>
>>
>> Changes:
>> - added new target 'srcrpm-pkg' to generate source rpm
>> - added required build tools to spec file
>> - removed locally compiled host tools to force their re-compile
>>
>> Signed-off-by: Ivan Vecera <ivecera@xxxxxxxxxx>
>> Signed-off-by: Jonathan Toppins <jtoppins@xxxxxxxxxx>
>> Acked-by: Íñigo Huguet <ihuguet@xxxxxxxxxx>
>> Tested-by: Ivan Vecera <ivecera@xxxxxxxxxx>
>> ---
>>
>> Notes:
>>      v2:
>>       * updated UTS_MACHINE to be $(UTS_MACHINE)-linux
>>         suggested by Masahiro Yamada
> 
> Quick ping, wanted to make sure I didn't miss any requests. Looking at patchwork there appear to be no replies to this version. Would it be reasonable to assume this version will be accepted and make it into the next kernel?

I have a request:
Tell us what "koji" is. I'm surprised that that word is not in the
patch description at all.

Thanks.

>>
>>   scripts/Makefile.package | 10 ++++++++++
>>   scripts/package/mkspec   |  7 +++++++
>>   2 files changed, 17 insertions(+)
>>
>> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
>> index 8bbcced67c22..1290f1c631fb 100644
>> --- a/scripts/Makefile.package
>> +++ b/scripts/Makefile.package
>> @@ -62,6 +62,16 @@ rpm-pkg:
>>       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ta $(KERNELPATH).tar.gz \
>>       --define='_smp_mflags %{nil}'
>>   +# srcrpm-pkg
>> +# ---------------------------------------------------------------------------
>> +PHONY += srcrpm-pkg
>> +srcrpm-pkg:
>> +    $(MAKE) clean
>> +    $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
>> +    $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
>> +    +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ts $(KERNELPATH).tar.gz \
>> +    --define='_smp_mflags %{nil}' --define='_srcrpmdir $(srctree)'
>> +
>>   # binrpm-pkg
>>   # ---------------------------------------------------------------------------
>>   PHONY += binrpm-pkg
>> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
>> index 70392fd2fd29..dda00a948a01 100755
>> --- a/scripts/package/mkspec
>> +++ b/scripts/package/mkspec
>> @@ -33,6 +33,8 @@ EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \
>>   --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation \
>>   --exclude=.config.old --exclude=.missing-syscalls.d --exclude=*.s"
>>   +test -n "$LOCALVERSION" && MAKE="$MAKE LOCALVERSION=$LOCALVERSION"
>> +
>>   # We can label the here-doc lines for conditional output to the spec file
>>   #
>>   # Labels:
>> @@ -49,6 +51,9 @@ sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
>>       URL: https://www.kernel.org
>>   $S    Source: kernel-$__KERNELRELEASE.tar.gz
>>       Provides: $PROVIDES
>> +$S    BuildRequires: bc binutils bison dwarves elfutils-libelf-devel flex
>> +$S    BuildRequires: gcc make openssl openssl-devel perl python3 rsync
>> +
>>       # $UTS_MACHINE as a fallback of _arch in case
>>       # /usr/lib/rpm/platform/*/macros was not included.
>>       %define _arch %{?_arch:$UTS_MACHINE}
>> @@ -80,6 +85,8 @@ $S$M    against the $__KERNELRELEASE kernel package.
>>   $S$M
>>   $S    %prep
>>   $S    %setup -q
>> +$S    rm -f scripts/basic/fixdep scripts/kconfig/conf
>> +$S    rm -f tools/objtool/{fixdep,objtool}
>>   $S
>>   $S    %build
>>   $S    $MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
> 

-- 
~Randy