Re: [OS-BUILD PATCHv2 4/4] tempfix

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

 




On 8/16/20 8:12 PM, GitLab Bridge on behalf of prarit wrote:
> From: Prarit Bhargava <prarit@xxxxxxxxxx>
> 

Not sure how this happened.  I thought I had squashed commits and my tree
indicates that I did too.  Will rebase and send a v3.

P.

> ---
>  redhat/Makefile                        | 2 +-
>  redhat/configs/generate_all_configs.sh | 6 +++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/redhat/Makefile b/redhat/Makefile
> index 91497b3249d0..32de9e1f9aa8 100644
> --- a/redhat/Makefile
> +++ b/redhat/Makefile
> @@ -127,7 +127,7 @@ dist-kabi-dw-check: dist-kabi
>  	@rm -rf $(KABIDW)/base/$(CURARCH).tmp
>  
>  dist-configs-commit: dist-configs-prep
> -	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \
> +	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh "$(FLAVOR)" 1; \
>  	./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
>  
>  dist-configs: dist-configs-prep
> diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
> index 15a39a8fccc8..969ecaa965e3 100755
> --- a/redhat/configs/generate_all_configs.sh
> +++ b/redhat/configs/generate_all_configs.sh
> @@ -13,7 +13,11 @@ if [ -z $2 ]; then
>  	exit 1
>  fi
>  
> -if [ $PRIMARY == "fedora" ]; then
> +if [ -z "$PRIMARY" ]; then
> +	PRIMARY=rhel
> +fi
> +
> +if [ "$PRIMARY" == "fedora" ]; then
>  	SECONDARY=rhel
>  else
>  	SECONDARY=fedora
> 
_______________________________________________
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