[OS-BUILD PATCH] redhat/Makefile: Add fedora-configs and rh-configs make targets

[GitLab Bridge on behalf of prarit]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

There are times when I have to generate both Fedora and RHEL configs.

Add fedora-configs and rh-configs make targets.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
---
 redhat/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/redhat/Makefile b/redhat/Makefile
index 32542936dd1f..ba9d278bf35a 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
 	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
 	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
 
+fedora-configs: DIST_TARGET=fedora
+fedora-configs: dist-configs
+
+rh-configs: DIST_TARGET=rhel
+rh-configs: dist-configs
+
 dist-configs-check: dist-configs-prep
 	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME)
 
-- 
GitLab

[Brian Masney]

On Wed, Jun 17, 2020 at 12:14:55AM -0000, GitLab Bridge on behalf of prarit wrote:
>  From: Prarit Bhargava <prarit(a)redhat.com&gt;
>  
>  There are times when I have to generate both Fedora and RHEL configs.
>  
>  Add fedora-configs and rh-configs make targets.
>  
>  Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
>  ---
>   redhat/Makefile | 6 ++++++
>   1 file changed, 6 insertions(+)
>  
>  diff --git a/redhat/Makefile b/redhat/Makefile
>  index 32542936dd1f..ba9d278bf35a 100644
>  --- a/redhat/Makefile
>  +++ b/redhat/Makefile
>  @@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
>   	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
>   	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
>   
>  +fedora-configs: DIST_TARGET=fedora
>  +fedora-configs: dist-configs
>  +
>  +rh-configs: DIST_TARGET=rhel
>  +rh-configs: dist-configs
>  +
>   dist-configs-check: dist-configs-prep
>   	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
> $(PACKAGE_NAME) 
Should help text be added to rh-help or rh-full-help for these new
targets?

Brian

[Prarit Bhargava]

On 6/17/20 11:06 AM, Brian Masney wrote:
>  On Wed, Jun 17, 2020 at 12:14:55AM -0000, GitLab Bridge on behalf of
> prarit wrote:
> > From: Prarit Bhargava <prarit(a)redhat.com&gt;
> >
> > There are times when I have to generate both Fedora and RHEL configs.
> >
> > Add fedora-configs and rh-configs make targets.
> >
> > Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
> > ---
> >  redhat/Makefile | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/redhat/Makefile b/redhat/Makefile
> > index 32542936dd1f..ba9d278bf35a 100644
> > --- a/redhat/Makefile
> > +++ b/redhat/Makefile
> > @@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
> >  	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
> >  	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
> >  
> > +fedora-configs: DIST_TARGET=fedora
> > +fedora-configs: dist-configs
> > +
> > +rh-configs: DIST_TARGET=rhel
> > +rh-configs: dist-configs
> > +
> >  dist-configs-check: dist-configs-prep
> >  	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
> $(PACKAGE_NAME)
>  
>  Should help text be added to rh-help or rh-full-help for these new
>  targets?
>   
Oops.  Yup.  Will send a v2.

P.

>  Brian
>  
>

[OS-BUILD PATCHv2] redhat/Makefile: Add fedora-configs and rh-configs make targets

[GitLab Bridge on behalf of prarit]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

There are times when I have to generate both Fedora and RHEL configs.

Add fedora-configs and rh-configs make targets.

v2: Add rh-help entries.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
---
 redhat/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/redhat/Makefile b/redhat/Makefile
index 32542936dd1f..7cdf9e3bd0bf 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
 	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
 	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
 
+fedora-configs: DIST_TARGET=fedora
+fedora-configs: dist-configs
+
+rh-configs: DIST_TARGET=rhel
+rh-configs: dist-configs
+
 dist-configs-check: dist-configs-prep
 	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME)
 
@@ -435,6 +441,8 @@ dist-full-help:
 	@echo  '  dist-cross-<arch>-rpms  - [x86_64 only] execute rpm builds for
specified'
 	@echo  '                            <arch> using RHEL cross compiler.'
 	@echo  '                            See dist-cross-<arch>-build for the
supported archs.'
+	@echo  '  rh-configs       - build ELN configs'
+	@echo  '  fedora-configs   - build Fedora configs'
 
 	@echo  ''
 	@echo  'kABI targets:'
-- 
GitLab

[OS-BUILD PATCHv2] redhat/Makefile: Add fedora-configs and rh-configs make targets

[Brian Masney]

On Wed, Jun 17, 2020 at 03:44:16PM -0000, GitLab Bridge on behalf of prarit wrote:
>  From: Prarit Bhargava <prarit(a)redhat.com&gt;
>  
>  There are times when I have to generate both Fedora and RHEL configs.
>  
>  Add fedora-configs and rh-configs make targets.
>  
>  v2: Add rh-help entries.
>  
>  Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; 
Acked-by: Brian Masney <bmasney(a)redhat.com&gt;

[OS-BUILD PATCHv2] redhat/Makefile: Add fedora-configs and rh-configs make targets

[Don Zickus]

On Wed, Jun 17, 2020 at 03:44:16PM -0000, GitLab Bridge on behalf of prarit wrote:
>  From: Prarit Bhargava <prarit(a)redhat.com&gt;
>  
>  There are times when I have to generate both Fedora and RHEL configs. 
I believe 'make dist-configs' does this by default, builds both??

>  
>  Add fedora-configs and rh-configs make targets. 
Regardless, I like this idea and as bonus keeps muscle memory for
rh-configs.

Acked-by: Don Zickus <dzickus(a)redhat.com&gt;

>  
>  v2: Add rh-help entries.
>  
>  Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
>  ---
>   redhat/Makefile | 8 ++++++++
>   1 file changed, 8 insertions(+)
>  
>  diff --git a/redhat/Makefile b/redhat/Makefile
>  index 32542936dd1f..7cdf9e3bd0bf 100644
>  --- a/redhat/Makefile
>  +++ b/redhat/Makefile
>  @@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
>   	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
>   	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
>   
>  +fedora-configs: DIST_TARGET=fedora
>  +fedora-configs: dist-configs
>  +
>  +rh-configs: DIST_TARGET=rhel
>  +rh-configs: dist-configs
>  +
>   dist-configs-check: dist-configs-prep
>   	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
> $(PACKAGE_NAME)
>   
>  @@ -435,6 +441,8 @@ dist-full-help:
>   	@echo  '  dist-cross-<arch>-rpms  - [x86_64 only] execute rpm builds for
> specified'
>   	@echo  '                            <arch> using RHEL cross compiler.'
>   	@echo  '                            See dist-cross-<arch>-build for the
> supported archs.'
>  +	@echo  '  rh-configs       - build ELN configs'
>  +	@echo  '  fedora-configs   - build Fedora configs'
>   
>   	@echo  ''
>   	@echo  'kABI targets:'
>  -- 
>  GitLab
>  _______________________________________________
>  kernel mailing list -- kernel(a)lists.fedoraproject.org
>  To unsubscribe send an email to kernel-leave(a)lists.fedoraproject.org
>  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/[e-mail]

[OS-BUILD PATCHv2] redhat/Makefile: Add fedora-configs and rh-configs make targets

[Prarit Bhargava]

On 6/18/20 12:52 PM, Don Zickus wrote:
>  On Wed, Jun 17, 2020 at 03:44:16PM -0000, GitLab Bridge on behalf of
> prarit wrote:
> > From: Prarit Bhargava <prarit(a)redhat.com&gt;
> >
> > There are times when I have to generate both Fedora and RHEL configs.
>  
>  I believe 'make dist-configs' does this by default, builds both??
>   
That's not what I see.  From the messages:

cd /home/prarit/git-kernel/kernel-ark/redhat/configs; TARGET=fedora
./build_configs.sh kernel

where TARGET is defined by DIST_TARGET, which is

ifeq ("$(IS_FEDORA)", "1")
   DIST_TARGET=fedora
else
   DIST_TARGET=rhel
endif

IS_FEDORA, is

IS_FEDORA:=$(shell ! echo $(DIST) | grep -q fc; echo $$?)

IOW, you have to be on Fedora to get Fedora configs, and on RHEL to get RHEL
configs *or* use

make dist-configs IS_FEDORA=0 # for RHEL
make dist-configs IS_FEDORA=1 # for Fedora

which is an annoying to my doggie-sized brain :).

P.




> >
> > Add fedora-configs and rh-configs make targets.
>  
>  Regardless, I like this idea and as bonus keeps muscle memory for
>  rh-configs.
>  
>  Acked-by: Don Zickus <dzickus(a)redhat.com&gt;
>  
> >
> > v2: Add rh-help entries.
> >
> > Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
> > ---
> >  redhat/Makefile | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/redhat/Makefile b/redhat/Makefile
> > index 32542936dd1f..7cdf9e3bd0bf 100644
> > --- a/redhat/Makefile
> > +++ b/redhat/Makefile
> > @@ -141,6 +141,12 @@ dist-configs: dist-configs-prep
> >  	@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh rhel 1; \
> >  	./process_configs.sh $(PROCESS_CONFIGS_OPTS) $(PACKAGE_NAME) $(KVERSION)
> >  
> > +fedora-configs: DIST_TARGET=fedora
> > +fedora-configs: dist-configs
> > +
> > +rh-configs: DIST_TARGET=rhel
> > +rh-configs: dist-configs
> > +
> >  dist-configs-check: dist-configs-prep
> >  	cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
> $(PACKAGE_NAME)
> >  
> > @@ -435,6 +441,8 @@ dist-full-help:
> >  	@echo  '  dist-cross-<arch>-rpms  - [x86_64 only] execute rpm builds for
> specified'
> >  	@echo  '                            <arch> using RHEL cross
> compiler.'
> >  	@echo  '                            See dist-cross-<arch>-build for the
> supported archs.'
> > +	@echo  '  rh-configs       - build ELN configs'
> > +	@echo  '  fedora-configs   - build Fedora configs'
> >  
> >  	@echo  ''
> >  	@echo  'kABI targets:'
> > -- 
> > GitLab
> > _______________________________________________
> > kernel mailing list -- kernel(a)lists.fedoraproject.org
> > To unsubscribe send an email to kernel-leave(a)lists.fedoraproject.org
> > 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/[e-mail]
>

[OS-BUILD PATCHv2] redhat/Makefile: Add fedora-configs and rh-configs make targets

[Don Zickus]

On Thu, Jun 18, 2020 at 01:01:25PM -0400, Prarit Bhargava wrote:
>  On 6/18/20 12:52 PM, Don Zickus wrote:
>  > On Wed, Jun 17, 2020 at 03:44:16PM -0000, GitLab Bridge on behalf of prarit wrote:
>  >> From: Prarit Bhargava <prarit(a)redhat.com&gt;
>  >>
>  >> There are times when I have to generate both Fedora and RHEL configs.
>  > 
>  > I believe 'make dist-configs' does this by default, builds both??
>  > 
>  
>  That's not what I see.  From the messages:
>  
>  cd /home/prarit/git-kernel/kernel-ark/redhat/configs; TARGET=fedora
>  ./build_configs.sh kernel
>  
>  where TARGET is defined by DIST_TARGET, which is
>  
>  ifeq ("$(IS_FEDORA)", "1")
>     DIST_TARGET=fedora
>  else
>     DIST_TARGET=rhel
>  endif
>  
>  IS_FEDORA, is
>  
>  IS_FEDORA:=$(shell ! echo $(DIST) | grep -q fc; echo $$?)
>  
>  IOW, you have to be on Fedora to get Fedora configs, and on RHEL to get RHEL
>  configs *or* use
>  
>  make dist-configs IS_FEDORA=0 # for RHEL
>  make dist-configs IS_FEDORA=1 # for Fedora
>  
>  which is an annoying to my doggie-sized brain :). 
Nevermind.  I was confused on the output of 'make dist-configs'.

The command _merges_ both distros, but based on the DIST it processes that
distro and removes the other one.

So the output shows all the rhel and fedora configs being merged, but only
one or the other being processed.  Processing is already slow, no need to
combine that too.

Sorry for the noise.

Cheers,
Don