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: <d6d5ce3169da8559cd20d20889849546cc69be50.1669042125.git.jtoppins@redhat.com>
 <88901065-469f-0988-f56b-c84d1fabbe8a@redhat.com> <f8c49457-7f7a-b8bf-b212-b607a1ecf346@infradead.org>
In-Reply-To: <f8c49457-7f7a-b8bf-b212-b607a1ecf346@infradead.org>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Tue, 6 Dec 2022 16:13:34 +0900
Message-ID: <CAK7LNASyvQKkOmCfshfW7uuFtfSR7hSv7g4-_Vi1QoOL6VUFWw@mail.gmail.com>
Subject: Re: [PATCH next v2] kbuild: add ability to make source rpm buildable
 using koji
To:     Randy Dunlap <rdunlap@infradead.org>
Cc:     Jonathan Toppins <jtoppins@redhat.com>,
        linux-kbuild@vger.kernel.org, dzickus@redhat.com,
        ihuguet@redhat.com, ivecera@redhat.com, jtornosm@redhat.com,
        kheib@redhat.com, linux-kernel@vger.kernel.org,
        michal.lkml@markovi.net, ndesaulniers@google.com,
        Nathan Chancellor <nathan@kernel.org>,
        Nicolas Schier <nicolas@fjasle.eu>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, Dec 6, 2022 at 2:44 PM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> Hi,
>
> On 12/5/22 21:37, Jonathan Toppins wrote:
> > On 11/21/22 09:48, Jonathan Toppins wrote:
> >> From: Ivan Vecera <ivecera@redhat.com>
> >>
> >> 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@redhat.com>
> >> Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
> >> Acked-by: =C3=8D=C3=B1igo Huguet <ihuguet@redhat.com>
> >> Tested-by: Ivan Vecera <ivecera@redhat.com>
> >> ---
> >>
> >> 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 reason=
able to assume this version will be accepted and make it into the next kern=
el?
>
> I have a request:
> Tell us what "koji" is. I'm surprised that that word is not in the
> patch description at all.
>
> Thanks.


I applied this patch, but somehow I replied to v1
https://lore.kernel.org/linux-kbuild/CAK7LNATPZkMCabD5aGNamp-gH3aZvFPr2_Yq=
=3DN=3DrM_ht2i3p6g@mail.gmail.com/


I have never used it, but I guess koji is a build engine
that generates binary packages from a source package.

That's why they want to create only a source package.


This patch is not related to koji
(and I suggested them to drop it from the subject)

I just tested it by using 'rpmbuild' on my local machine.


> >>
> >>   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 $(KERNELP=
ATH).tar.gz \
> >>       --define=3D'_smp_mflags %{nil}'
> >>   +# srcrpm-pkg
> >> +# -------------------------------------------------------------------=
--------
> >> +PHONY +=3D 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 $(KERNELPA=
TH).tar.gz \
> >> +    --define=3D'_smp_mflags %{nil}' --define=3D'_srcrpmdir $(srctree)=
'
> >> +
> >>   # binrpm-pkg
> >>   # ------------------------------------------------------------------=
---------
> >>   PHONY +=3D 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=3D"$RCS_TAR_IGNORE --exclude=3D*vmlinux* --=
exclude=3D*.mod \
> >>   --exclude=3D*.o --exclude=3D*.ko --exclude=3D*.cmd --exclude=3DDocum=
entation \
> >>   --exclude=3D.config.old --exclude=3D.missing-syscalls.d --exclude=3D=
*.s"
> >>   +test -n "$LOCALVERSION" && MAKE=3D"$MAKE LOCALVERSION=3D$LOCALVERSI=
ON"
> >> +
> >>   # 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 rsyn=
c
> >> +
> >>       # $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=3D%{release}
> >
>
> --
> ~Randy


--=20
Best Regards
Masahiro Yamada