From: Don Zickus <dzickus@xxxxxxxxxx>
Remove legacy elrdy cruft
Remove an idea that never worked out, 'elrdy'. The Makefiles have
enough complexity in there, lets remove a layer of it, in hopes someone
finds a way to simplify things.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index blahblah..blahblah 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -42,9 +42,7 @@ endif
# on a branch tracking upstream. This allows for generating rpms
# based on untagged releases.
ifndef VERSION_ON_UPSTREAM
- ifeq ("$(DIST)", ".elrdy")
- VERSION_ON_UPSTREAM:=1
- else ifeq ("$(DISTRO)", "fedora")
+ ifeq ("$(DISTRO)", "fedora")
VERSION_ON_UPSTREAM:=1
else
VERSION_ON_UPSTREAM:=0
@@ -103,9 +101,7 @@ ARCH_LIST=aarch64 ppc64le s390x x86_64
# upstream sources and redhat patches. A non-unified tarball means that
# the tarball is only upstream sources and the patches get applied as
# a diff in the spec file
-ifeq ("$(DIST)", ".elrdy")
- SINGLE_TARBALL:=0
-else ifeq ("$(DISTRO)", "fedora")
+ifeq ("$(DISTRO)", "fedora")
SINGLE_TARBALL:=0
else
SINGLE_TARBALL:=1
@@ -144,9 +140,7 @@ KABIDW_TARBALL:=$(REDHAT)/rpm/SOURCES/$(KABIDW_TARFILE)
CHANGELOG:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(RHEL_MINOR)
CHANGELOG_PREV:=$(PACKAGE_NAME).changelog-$(RHEL_MAJOR).$(shell expr $(RHEL_MINOR) - 1)
-ifeq ("$(DIST)", ".elrdy")
- RHPRODUCT:=rhel-ready
-else ifeq ("$(DISTRO)", "fedora")
+ifeq ("$(DISTRO)", "fedora")
RHPRODUCT:=rawhide
else ifeq ("$(DISTRO)", "centos")
RHPRODUCT:=c$(RHEL_MAJOR)s
@@ -154,9 +148,7 @@ else
RHPRODUCT:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR).0
endif
-ifeq ("$(DIST)", ".elrdy")
- BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
-else ifeq ("$(DISTRO)", "fedora")
+ifeq ("$(DISTRO)", "fedora")
BUILD_SCRATCH_TARGET ?= temp-ark-rhel-8-test
else ifeq ("$(DISTRO)", "centos")
BUILD_PROFILE ?= -p stream
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1446
_______________________________________________
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
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
