Re: [OS-BUILD PATCH] genspec.sh: 'touch' empty Patchlist file for single tarball

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jun 15, 2020 at 08:15:30PM -0000, GitLab Bridge on behalf of dzickusrh wrote:
> From: Don Zickus <dzickus@xxxxxxxxxx>
> 
> I was playing around with SINGLE_TARBALL=1 to workaround an issue and
> noticed the patch for breaking out individual patches did not account
> for that scenario.
> 
> The srpm fails to generate due to the missing Patchlist file, which
> is used to track the individual patch files.
> 
> Fix this by creating a empty file to use or 'touch $SOURCES/Patchlist'.
> 
> This allows the srpm to package all the necessary files.  I tested the
> 'prep' stage of rpmbuild and this empty file has no side effects.
> 
> Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
> ---
>  redhat/genspec.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/redhat/genspec.sh b/redhat/genspec.sh
> index 79e71af04ee9..b72dffe14729 100755
> --- a/redhat/genspec.sh
> +++ b/redhat/genspec.sh
> @@ -244,7 +244,7 @@ test -n "$SPECFILE" &&
>  	s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
>  	s/%%TARBALL_VERSION%%/$TARFILE_RELEASE/" $SPECFILE
>  
> -
> +touch $plistf
>  if [ "$SINGLE_TARBALL" = 0 ]; then
>  	truncate -s 0 $plistf
>  	COMMITS=$(git log --reverse --pretty=format:"%h" --no-merges "$MARKER".. \

Acked-by: Brian Masney <bmasney@xxxxxxxxxx>
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux