davidlt
/
kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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@redhat.com>
This commit is contained in:
Don Zickus 2021-10-28 17:27:27 -04:00 committed by Justin M. Forbes
parent ccd7a95852
commit 53a58b01e9
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redhat/Makefile.common
View File

@ -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