From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Over time more workflow commands can be added to help developers.
Start with a stub config file.
Signed-off-by: Don Zickus dzickus@redhat.com --- redhat/Makefile | 6 ++++++ redhat/kernel.gitconfig | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 redhat/kernel.gitconfig
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..88860dd83069 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -133,6 +133,10 @@ rh-kabi-dw-check: rh-kabi @echo "**** End of KABI DWARF-based comparison report ****" @rm -rf $(KABIDW)/base/$(CURARCH).tmp
+rh-gitconfig: + @git config --get include.path | grep -q 'redhat/kernel.gitconfig' || \ + git config --local --add include.path "../redhat/kernel.gitconfig" + rh-configs-commit: rh-configs-prep @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \ ./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR) @@ -363,6 +367,7 @@ rh-help: @echo ' rh-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.' @echo '' @echo 'Configuration targets:' + @echo ' rh-gitconfig - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Create RHEL config files in redhat/config/.' @echo '' @echo 'For detailed description and full list of targets, run `make rh-full-help`.' @@ -442,6 +447,7 @@ rh-full-help:
@echo '' @echo 'Configuration targets:' + @echo ' rh-gitconfig - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Creates config files for RHEL $(RHEL_MAJOR) architectures, cleans them' @echo ' by running make nonint_oldconfig, and copies them to' @echo ' redhat/configs/ directory. This is the target to use for a config!' diff --git a/redhat/kernel.gitconfig b/redhat/kernel.gitconfig new file mode 100644 index 000000000000..28d7d4a21201 --- /dev/null +++ b/redhat/kernel.gitconfig @@ -0,0 +1,2 @@ +# DO NOT add personal info in here!! +[alias]
From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Over time more workflow commands can be added to help developers.
Start with a stub config file.
Signed-off-by: Don Zickus dzickus@redhat.com --- redhat/Makefile | 6 ++++++ redhat/kernel.gitconfig | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 redhat/kernel.gitconfig
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..88860dd83069 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -133,6 +133,10 @@ rh-kabi-dw-check: rh-kabi @echo "**** End of KABI DWARF-based comparison report ****" @rm -rf $(KABIDW)/base/$(CURARCH).tmp
+rh-gitconfig: + @git config --get include.path | grep -q 'redhat/kernel.gitconfig' || \ + git config --local --add include.path "../redhat/kernel.gitconfig" + rh-configs-commit: rh-configs-prep @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \ ./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR) @@ -363,6 +367,7 @@ rh-help: @echo ' rh-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.' @echo '' @echo 'Configuration targets:' + @echo ' rh-gitconfig - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Create RHEL config files in redhat/config/.' @echo '' @echo 'For detailed description and full list of targets, run `make rh-full-help`.' @@ -442,6 +447,7 @@ rh-full-help:
@echo '' @echo 'Configuration targets:' + @echo ' rh-gitconfig - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Creates config files for RHEL $(RHEL_MAJOR) architectures, cleans them' @echo ' by running make nonint_oldconfig, and copies them to' @echo ' redhat/configs/ directory. This is the target to use for a config!' diff --git a/redhat/kernel.gitconfig b/redhat/kernel.gitconfig new file mode 100644 index 000000000000..6fd63c7ac1aa --- /dev/null +++ b/redhat/kernel.gitconfig @@ -0,0 +1,10 @@ +# The kernel workflow is growing in complexity. Developers can not always +# remember all the nuisances involved. +# This file is meant to aid developers by providing wrappers around some +# parts of the workflow that everyone can use. +# +# Examples include 'aliases' for git-push options or a shortcut for +# executing workflow checks before pushing. +# +# Please do not include personal information here. +[alias]
On Mon, 04 May 2020 21:58:47 -0000, Gitlab Bridge on behalf of dzickusrh wrote:
From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Perhaps "rh-gitsetup" would be a better name? My initial thought was that "rh-gitconfig" somehow creates kernel .config file based on information stored in git. It's too similar name to the current "rh-configs".
Thanks,
Jiri
On 5/5/20 7:56 AM, Jiri Benc wrote:
On Mon, 04 May 2020 21:58:47 -0000, Gitlab Bridge on behalf of dzickusrh wrote:
From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Perhaps "rh-gitsetup" would be a better name? My initial thought was that "rh-gitconfig" somehow creates kernel .config file based on information stored in git. It's too similar name to the current "rh-configs".
I was thinking the same thing. It's too similar in namespace to the config options. I like rh-gitsetup too.
Politely,
Nacked-by: Prarit Bhargava prarit@redhat.com
P.
Thanks,
Jiri _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@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/kernel@lists.fedoraproject.org
From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Over time more workflow commands can be added to help developers.
Start with a stub config file.
V4: s/gitconfig/gitsetup V3: expand comment in kernel.gitconfig
Signed-off-by: Don Zickus dzickus@redhat.com --- redhat/Makefile | 6 ++++++ redhat/kernel.gitconfig | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 redhat/kernel.gitconfig
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..a9e40dd87a40 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -133,6 +133,10 @@ rh-kabi-dw-check: rh-kabi @echo "**** End of KABI DWARF-based comparison report ****" @rm -rf $(KABIDW)/base/$(CURARCH).tmp
+rh-gitsetup: + @git config --get include.path | grep -q 'redhat/kernel.gitconfig' || \ + git config --local --add include.path "../redhat/kernel.gitconfig" + rh-configs-commit: rh-configs-prep @cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh $(FLAVOR) 1; \ ./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR) @@ -363,6 +367,7 @@ rh-help: @echo ' rh-cross-all-rpms - Build RPMs for all supported archs using a cross compiler.' @echo '' @echo 'Configuration targets:' + @echo ' rh-gitsetup - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Create RHEL config files in redhat/config/.' @echo '' @echo 'For detailed description and full list of targets, run `make rh-full-help`.' @@ -442,6 +447,7 @@ rh-full-help:
@echo '' @echo 'Configuration targets:' + @echo ' rh-gitsetup - include redhat/kernel.gitconfig in repo git config' @echo ' rh-configs - Creates config files for RHEL $(RHEL_MAJOR) architectures, cleans them' @echo ' by running make nonint_oldconfig, and copies them to' @echo ' redhat/configs/ directory. This is the target to use for a config!' diff --git a/redhat/kernel.gitconfig b/redhat/kernel.gitconfig new file mode 100644 index 000000000000..6fd63c7ac1aa --- /dev/null +++ b/redhat/kernel.gitconfig @@ -0,0 +1,10 @@ +# The kernel workflow is growing in complexity. Developers can not always +# remember all the nuisances involved. +# This file is meant to aid developers by providing wrappers around some +# parts of the workflow that everyone can use. +# +# Examples include 'aliases' for git-push options or a shortcut for +# executing workflow checks before pushing. +# +# Please do not include personal information here. +[alias]
Am 06.05.20 um 09:21 schrieb Jiri Benc:
On Tue, 05 May 2020 19:40:35 -0000, Gitlab Bridge on behalf of dzickusrh wrote:
A new command 'make rh-gitconfig' runs
^^^^^^^^^^^^ still the old name in the patch description
While at it I can not resist some bike shedding (sorry, it was on my mind for a while already, and seems I need to get it out): Now that Fedora uses this tree can we maybe tone down the usage of "rh" over time? Maybe a simple 's/rh/ark/' in all places that are not really specific to rhel?
CU, knurd
On 5/6/20 3:38 AM, Thorsten Leemhuis wrote:
Am 06.05.20 um 09:21 schrieb Jiri Benc:
On Tue, 05 May 2020 19:40:35 -0000, Gitlab Bridge on behalf of dzickusrh wrote:
A new command 'make rh-gitconfig' runs
^^^^^^^^^^^^ still the old name in the patch description
While at it I can not resist some bike shedding (sorry, it was on my mind for a while already, and seems I need to get it out): Now that Fedora uses this tree can we maybe tone down the usage of "rh" over time? Maybe a simple 's/rh/ark/' in all places that are not really specific to rhel?
Good idea and I think it would be a smart thing to do. However, I think that should be a separate patch an is out-of-scope for dzickus' change.
dzickus, if you don't care I can take on the responsibility of sending out the rh- to ark- patch.
P.
CU, knurd _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@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/kernel@lists.fedoraproject.org
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
Jiri
On 5/6/20 7:45 AM, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
On a previous thread someone (Thorsten? Was it you?) commented on the 'internal' branch name in the tree. I had previously suggested that the branch name be changed to 'os-build'. Is keeping that consistent and using 'os' as the prefix a better solution?
P.
Jiri
On Wed, 6 May 2020 09:05:40 -0400, Prarit Bhargava wrote:
On a previous thread someone (Thorsten? Was it you?) commented on the 'internal' branch name in the tree. I had previously suggested that the branch name be changed to 'os-build'. Is keeping that consistent and using 'os' as the prefix a better solution?
"os-" looks good to me.
Thanks,
Jiri
On Wed, May 06, 2020 at 01:45:34PM +0200, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
I had the same opinion. As we migrated the redhat/ over directly from RHEL, it is very much polluted with RHELisms. I am happy to clean up the RHELisms, I would like to use a generic term that covers Fedora/CentOS-stream/RHEL/ARK.
I had thoughts of using 'distro' and using that as a generic framework to push upstream for other distros to plug into, but I never fully flushed out that idea (ie s/redhat//distro//;s/rh-/distro-/).
Though 'distro' is a tad cumbersome. 'os' may work as it is short enough (using Prarit's suggestion) but is it intuitively descriptive enough?
Thoughts?
Cheers, Don
On Wed, May 06, 2020 at 09:44:55AM -0400, Don Zickus wrote:
On Wed, May 06, 2020 at 01:45:34PM +0200, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
I had the same opinion. As we migrated the redhat/ over directly from RHEL, it is very much polluted with RHELisms. I am happy to clean up the RHELisms, I would like to use a generic term that covers Fedora/CentOS-stream/RHEL/ARK.
I had thoughts of using 'distro' and using that as a generic framework to push upstream for other distros to plug into, but I never fully flushed out that idea (ie s/redhat//distro//;s/rh-/distro-/).
Though 'distro' is a tad cumbersome. 'os' may work as it is short enough (using Prarit's suggestion) but is it intuitively descriptive enough?
'dist'? I like the shortness of os, but as you say it's not super descriptive. I don't have strong feelings either way, though.
- Jeremy
On 5/6/20 3:55 PM, Jeremy Cline wrote:
On Wed, May 06, 2020 at 09:44:55AM -0400, Don Zickus wrote:
On Wed, May 06, 2020 at 01:45:34PM +0200, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
I had the same opinion. As we migrated the redhat/ over directly from RHEL, it is very much polluted with RHELisms. I am happy to clean up the RHELisms, I would like to use a generic term that covers Fedora/CentOS-stream/RHEL/ARK.
I had thoughts of using 'distro' and using that as a generic framework to push upstream for other distros to plug into, but I never fully flushed out that idea (ie s/redhat//distro//;s/rh-/distro-/).
Though 'distro' is a tad cumbersome. 'os' may work as it is short enough (using Prarit's suggestion) but is it intuitively descriptive enough?
'dist'? I like the shortness of os, but as you say it's not super descriptive. I don't have strong feelings either way, though.
dist would work too. jbenc? dzickus? Anyone else before I push a patch?
P.
- Jeremy
On 5/7/20 7:32 PM, Prarit Bhargava wrote:
On 5/6/20 3:55 PM, Jeremy Cline wrote:
On Wed, May 06, 2020 at 09:44:55AM -0400, Don Zickus wrote:
On Wed, May 06, 2020 at 01:45:34PM +0200, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
I had the same opinion. As we migrated the redhat/ over directly from RHEL, it is very much polluted with RHELisms. I am happy to clean up the RHELisms, I would like to use a generic term that covers Fedora/CentOS-stream/RHEL/ARK.
I had thoughts of using 'distro' and using that as a generic framework to push upstream for other distros to plug into, but I never fully flushed out that idea (ie s/redhat//distro//;s/rh-/distro-/).
Though 'distro' is a tad cumbersome. 'os' may work as it is short enough (using Prarit's suggestion) but is it intuitively descriptive enough?
'dist'? I like the shortness of os, but as you say it's not super descriptive. I don't have strong feelings either way, though.
dist would work too. jbenc? dzickus? Anyone else before I push a patch?
Since there isn't a strenuous objection to 'os' (although I do like 'dist' too), I'm going to go with 'os' for the sake of brevity.
P.
P.
- Jeremy
kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-leave@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/kernel@lists.fedoraproject.org
On Fri, May 08, 2020 at 12:50:13PM -0400, Prarit Bhargava wrote:
On 5/7/20 7:32 PM, Prarit Bhargava wrote:
On 5/6/20 3:55 PM, Jeremy Cline wrote:
On Wed, May 06, 2020 at 09:44:55AM -0400, Don Zickus wrote:
On Wed, May 06, 2020 at 01:45:34PM +0200, Jiri Benc wrote:
On Wed, 6 May 2020 07:37:35 -0400, Prarit Bhargava wrote:
Good idea and I think it would be a smart thing to do.
I generally agree but I don't think "ark" is the best option. The kernels are used for Fedora, too, and they will be used for RHEL. We should find a prefix that works for all of those kernels/distros. I was trying to think of something but I could not find anything suitable. It should be short (rules out "downstream") and easily remembered (rules out abbreviations for "downstream").
I had the same opinion. As we migrated the redhat/ over directly from RHEL, it is very much polluted with RHELisms. I am happy to clean up the RHELisms, I would like to use a generic term that covers Fedora/CentOS-stream/RHEL/ARK.
I had thoughts of using 'distro' and using that as a generic framework to push upstream for other distros to plug into, but I never fully flushed out that idea (ie s/redhat//distro//;s/rh-/distro-/).
Though 'distro' is a tad cumbersome. 'os' may work as it is short enough (using Prarit's suggestion) but is it intuitively descriptive enough?
'dist'? I like the shortness of os, but as you say it's not super descriptive. I don't have strong feelings either way, though.
dist would work too. jbenc? dzickus? Anyone else before I push a patch?
Since there isn't a strenuous objection to 'os' (although I do like 'dist' too), I'm going to go with 'os' for the sake of brevity.
I will throw my hat in the ring for 'dist' over 'os'.
Cheers, Don
On Tue, May 05, 2020 at 07:40:35PM -0000, Gitlab Bridge on behalf of dzickusrh wrote:
From: Don Zickus dzickus@redhat.com
The kernel workflow is adding complexity. Let's hide some of that complexity behind git aliases. Instead of having the developer manually add them all the time, add a make command to 'include' kernel aliases.
A new command 'make rh-gitconfig' runs
git config --local --add include.path "../redhat/kernel.gitconfig"
and adds an include to the local repo's .git/config file.
Over time more workflow commands can be added to help developers.
Start with a stub config file.
V4: s/gitconfig/gitsetup V3: expand comment in kernel.gitconfig
Signed-off-by: Don Zickus dzickus@redhat.com
redhat/Makefile | 6 ++++++ redhat/kernel.gitconfig | 10 ++++++++++ 2 files changed, 16 insertions(+) create mode 100644 redhat/kernel.gitconfig
diff --git a/redhat/Makefile b/redhat/Makefile index 0118e5b9e2e9..a9e40dd87a40 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -133,6 +133,10 @@ rh-kabi-dw-check: rh-kabi @echo "**** End of KABI DWARF-based comparison report ****" @rm -rf $(KABIDW)/base/$(CURARCH).tmp
+rh-gitsetup:
- @git config --get include.path | grep -q 'redhat/kernel.gitconfig' || \
- git config --local --add include.path "../redhat/kernel.gitconfig"
Just a minor nit since another version is coming out: I think the second line should be indented an additional tab to help with code readability.
Brian
kernel@lists.fedoraproject.org