Re: [OS-BUILD PATCH] redhat: Change Makefile target names to dist-
On Thu, 14 May 2020 07:38:04 -0400, Prarit Bhargava wrote: > I noticed the RHEL7 (and other RHEL) mentions as well but felt that they are > out > of scope for this changeset. Okay. Jiri ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@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
Re: [OS-BUILD PATCH] redhat: Change Makefile target names to dist-
On 5/14/20 4:55 AM, Jiri Benc wrote: > On Wed, 13 May 2020 23:03:12 -, GitLab Bridge on behalf of prarit wrote: >> +@echo ' dist-srpm - Create a source RPM and put it into the >> redhat/rpm/SRPMS/ directory.' >> +@echo ' See the dist-brew target for available >> options.' > > The help lines are no longer aligned correctly. Please ensure that the > output of both 'make dist-help' and 'make dist-full-help' is formatted > correctly. I'll fix that. > >> --- a/redhat/scripts/download_cross.sh >> +++ b/redhat/scripts/download_cross.sh >> @@ -26,7 +26,7 @@ fi >> >> # if we're not root, all we can do now is see what's installed >> if [ "$(whoami)" != "root" ]; then >> -echo "Checking for RHEL7 cross compile packages. If this fails, run >> \"make rh-cross-download\" as root." >> +echo "Checking for RHEL7 cross compile packages. If this fails, run >> \"make dist-cross-download\" as root." > > Please change the "RHEL7" as well. I noticed the RHEL7 (and other RHEL) mentions as well but felt that they are out of scope for this changeset. I was planning on coming to the list to ask what we should change the "RHEL" phrase to. Distribution? I'll start a new thread on that. There are other mentions throughout the kernel, for example, "RHEL_MAJOR" and "RHEL_MINOR", andsome of the patches include the phrase "RHEL only". We need to have a consistent policy at modifying all of those. P. > > Politely, requesting a new version, > Nacked-by: Jiri Benc > > Thanks, > > Jiri > ___ > kernel mailing list -- kernel@lists.fedoraproject.org > To unsubscribe send an email to kernel-le...@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 > ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@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
Re: [OS-BUILD PATCH] redhat: Change Makefile target names to dist-
On Thu, 14 May 2020 10:55:18 +0200, Jiri Benc wrote: > Please change the "RHEL7" as well. There are more mentions of "RHEL" in the Makefile, it might make sense to clean up them all. Jiri ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@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
Re: [OS-BUILD PATCH] redhat: Change Makefile target names to dist-
On Wed, 13 May 2020 23:03:12 -, GitLab Bridge on behalf of prarit wrote: > + @echo ' dist-srpm - Create a source RPM and put it into the > redhat/rpm/SRPMS/ directory.' > + @echo ' See the dist-brew target for available > options.' The help lines are no longer aligned correctly. Please ensure that the output of both 'make dist-help' and 'make dist-full-help' is formatted correctly. > --- a/redhat/scripts/download_cross.sh > +++ b/redhat/scripts/download_cross.sh > @@ -26,7 +26,7 @@ fi > > # if we're not root, all we can do now is see what's installed > if [ "$(whoami)" != "root" ]; then > - echo "Checking for RHEL7 cross compile packages. If this fails, run > \"make rh-cross-download\" as root." > + echo "Checking for RHEL7 cross compile packages. If this fails, run > \"make dist-cross-download\" as root." Please change the "RHEL7" as well. Politely, requesting a new version, Nacked-by: Jiri Benc Thanks, Jiri ___ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@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
[OS-BUILD PATCH] redhat: Change Makefile target names to dist-
From: Prarit Bhargava
The distribution specific Makefile target names begin with rh-. Switch
them to be use the distro agnostic dist-.
rh-dist-git-test and rh-dist-git are renamed to dist-git-test and
dist-git.
Signed-off-by: Prarit Bhargava
v2: Update to include jcline's newly added docs
---
makefile| 6 +-
redhat/Makefile | 216
redhat/Makefile.cross | 18 +-
redhat/configs/README | 2 +-
redhat/configs/editconfig | 2 +-
redhat/configs/evaluate_configs | 2 +-
redhat/docs/index.rst | 8 +-
redhat/docs/maintaining.rst | 12 +-
redhat/koji/Makefile| 2 +-
redhat/koji/kernel.spec | 2 +-
redhat/scripts/ci/ark-create-release.sh | 8 +-
redhat/scripts/ci/ark-update-configs.sh | 4 +-
redhat/scripts/configdiff.sh| 4 +-
redhat/scripts/download_cross.sh| 2 +-
14 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/makefile b/makefile
index 7dc9bcb3267e..819ac9a5cd60 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-ifeq ($(filter rh-% rhg-%,$(MAKECMDGOALS)),)
+ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
include Makefile
endif
@@ -8,9 +8,9 @@ ifeq ("$(origin O)", "command line")
_OUTPUT := "$(abspath $(O))"
_EXTRA_ARGS := O=$(_OUTPUT)
endif
-rh-%::
+dist-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-rhg-%::
+distg-%::
$(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
diff --git a/redhat/Makefile b/redhat/Makefile
index 0118e5b9e2e9..006e48de5870 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -57,9 +57,9 @@ KABIDW := $(REDHAT)/kabi-dwarf
include Makefile.cross
-default: rh-help
+default: dist-help
-rh-python-check:
+dist-python-check:
@if [ ! -f /usr/libexec/platform-python ]; then \
if ! which python3 > /dev/null 2>&1; then \
echo "ERROR: Python 3 is needed." ; \
@@ -71,7 +71,7 @@ rh-python-check:
exit 1; \
fi
-rh-kabi: rh-python-check
+dist-kabi: dist-python-check
@for KABIARCH in $(ARCH_LIST); do \
$(REDHAT)/kabi/show-kabi -k $(REDHAT)/kabi/kabi-module/ -m \
-a $$KABIARCH -r $(RHEL_MAJOR).$(RHEL_MINOR) >
$(REDHAT)/kabi/Module.kabi_$$KABIARCH;\
@@ -83,7 +83,7 @@ rh-kabi: rh-python-check
done;
@(cd $(REDHAT)/kabi/ && ln -Tsf kabi-rhel$(RHEL_MAJOR)$(RHEL_MINOR)
kabi-current)
-rh-kabi-dup: rh-python-check
+dist-kabi-dup: dist-python-check
@for KABIARCH in $(ARCH_LIST); do \
touch $(REDHAT)/kabi/Module.kabi_dup_$$KABIARCH;\
if [ -d $(REDHAT)/kabi/kabi-dup-module/kabi_$$KABIARCH ]; then \
@@ -93,7 +93,7 @@ rh-kabi-dup: rh-python-check
fi \
done;
-rh-check-kabi: rh-kabi
+dist-check-kabi: dist-kabi
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
exit 1;\
@@ -101,7 +101,7 @@ rh-check-kabi: rh-kabi
@$(REDHAT)/kabi/check-kabi -k $(REDHAT)/kabi/Module.kabi_$(MACH) \
-s $(_OUTPUT)/Module.symvers
-rh-check-kabi-dup: rh-kabi-dup
+dist-check-kabi-dup: dist-kabi-dup
@if [ ! -e $(_OUTPUT)/Module.symvers ]; then \
echo "ERROR: You must compile the kernel and modules first";\
exit 1;\
@@ -109,18 +109,18 @@ rh-check-kabi-dup: rh-kabi-dup
@$(REDHAT)/kabi/check-kabi -k $(REDHAT)/kabi/Module.kabi_dup_$(MACH) \
-s $(_OUTPUT)/Module.symvers
-rh-kabi-dw-base: rh-kabi
+dist-kabi-dw-base: dist-kabi
@echo "Generating baseline dataset for KABI DWARF-based comparison..."
@echo " GENERATING DWARF-based kABI baseline dataset "
@$(KABIDW)/run_kabi-dw.sh generate \
$(REDHAT)/kabi/kabi-current/kabi_whitelist_$(CURARCH) \
$(_OUTPUT) $(KABIDW)/base/$(CURARCH)/
-rh-kabi-dw-check: rh-kabi
+dist-kabi-dw-check: dist-kabi
@if [ ! -d $(KABIDW)/base/$(CURARCH) ]; then \
echo " ERROR: "; \
echo "Comparison base not found in $(KABIDW)/base/$(CURARCH).";
\
- echo "Please run \"make rh-kabi-dw-base\" first!"; \
+ echo "Please run \"make dist-kabi-dw-base\" first!"; \
exit 1; \
fi
@echo " GENERATING DWARF-based kABI dataset "
@@ -133,42 +133,42 @@ rh-kabi-dw-check: rh-kabi
@echo " End of KABI DWARF-based comparison report "
@rm -rf $(KABIDW)/base/$(CURARCH).tmp
-rh-configs-commit: rh-configs-prep
+dist-configs-commit: dist-configs-prep
@cd $(REDHAT)/configs; VERSION=$(KVERSION) ./generate_all_configs.sh
$(FLAVOR) 1; \
./process_configs.sh -z $(PACKAGE_NAME) $(KVERSION) "" $(FLAVOR)
-rh-configs: rh-configs-prep
+dist-configs: dist-configs-prep
