[OS-BUILD PATCH 2/6] Remove redundant code in dist-release

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

 



From: Don Zickus <dzickus@xxxxxxxxxx>

Back with commit 3a65b42715c1286fc452df4093ce216eae140b3c, make
dist-git was changed to depend on dist-srpm instead of the spec
file.  As a result some legacy optimizations are now redundant,
remove them.

In dist-git, dist-srpm depends on TARBALL, so remove the explict
dependency in dist-git.

In dist-release-finish, dist-srpm calls dist-configs, dist-kabi,
dist-kabi-dup, sources-rh, so remove them too.

These cleanups also help speed up release testing. :-)

No noticable changes expected.

Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
 redhat/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index d29e5646e746..403da2b874f7 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -302,10 +302,6 @@ dist-release-finish: setup-source
 	@echo $(MARKER) > $(REDHAT)/marker
 	@git add $(REDHAT)/marker
 	@git commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"
-	@$(MAKE) dist-configs
-	@$(MAKE) dist-kabi
-	@$(MAKE) dist-kabi-dup
-	@$(MAKE) sources-rh
 dist-release: dist-clean-sources
 	@$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM)
 	@$(MAKE) dist-release-finish
@@ -354,7 +350,7 @@ $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
 dist-git-test: export RH_DIST_GIT_TEST="1"
 dist-git-test: dist-git
 
-dist-git: dist-srpm $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL)
+dist-git: dist-srpm $(KABI_TARBALL) $(KABIDW_TARBALL)
 ifeq ("$(RHDISTGIT_BRANCH)", "")
  $(error RHDISTGIT_BRANCH unset)
 endif
-- 
GitLab
_______________________________________________
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