Skip to content

Commit

Permalink
Add support for el8 to nautilus -release package
Browse files Browse the repository at this point in the history 
Adds a condition in the Makefile to build correctly the ceph-nautilus
release package on el8.
  • Loading branch information
@gfidente
gfidente committed Feb 10, 2020
1 parent ba9499d commit 535b3cd
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
12 changes: 9 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@ $(SRPM):
$(NAME).spec

build: $(SRPM)
# XXX: remove hard-coded "7" here:
cbs build core7-extras-common-$(DISTRO).centos $(SRPM) && \
cbs tag-build core7-extras-common-testing $(NVR)
ifeq ($(DISTRO),el8)
# XXX: remove hard-coded "8" here:
cbs build core8-extras-common-$(DISTRO).centos $(SRPM) && \
cbs tag-build core8-extras-common-testing $(NVR)
else
# XXX: remove hard-coded "7" here:
cbs build core7-extras-common-$(DISTRO).centos $(SRPM) && \
cbs tag-build core7-extras-common-testing $(NVR)
endif

.PHONY: all build srpm
5 changes: 4 additions & 1 deletion centos-release-ceph-nautilus.spec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Ceph Nautilus packages from the CentOS Storage SIG repository
Name: centos-release-ceph-nautilus
Version: 1.2
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
URL: http://wiki.centos.org/SpecialInterestGroup/Storage
Source0: CentOS-Ceph-Nautilus.repo
Expand Down Expand Up @@ -29,6 +29,9 @@ install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-
%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Ceph-Nautilus.repo

%changelog
* Mon Feb 10 2020 Giulio Fidente <gfidente@redhat.com> - 1.2-3
* Add case in Makefile to support el8

* Wed Jun 19 2019 Giulio Fidente <gfidente@redhat.com> - 1.2-2
* Update changelog as necessary to document changes in 1.2-1

Expand Down

2 comments on commit 535b3cd

@gfidente
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ktdreyer can you help review this one too to make sure we're not doing anything wrong or missing anything?

@ktdreyer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. I've pushed three more changes as follow-ups to this one:
045fbbe Makefile: update DISTRO help text for el8
54670ef Makefile: remove hard-coded OS version in "build" target
9979685 Makefile: document el8 build failure

Please sign in to comment.