Skip to content

Commit

Permalink
Build on EL8
Browse files Browse the repository at this point in the history
Skip-PR-comments: true

Signed-off-by: Brian J. Murrell <brian.murrell@intel.com>
  • Loading branch information
brianjmurrell committed Apr 26, 2021
1 parent 4fbde11 commit d690c82
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
// I.e. for testing library changes
//@Library(value="pipeline-lib@your_branch") _

packageBuildingPipelineDAOS(['distros': ['centos7', 'leap15', 'ubuntu20.04']])
packageBuildingPipelineDAOS(['distros': ['centos7', 'centos8', 'leap15', 'ubuntu20.04']])
11 changes: 0 additions & 11 deletions packaging/Makefile

This file was deleted.

13 changes: 7 additions & 6 deletions packaging/Makefile_packaging.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RPMS = $(eval RPMS := $(addsuffix .rpm,$(addprefix _topdir/RPMS/x86
DEB_TOP := _topdir/BUILD
DEB_BUILD := $(DEB_TOP)/$(NAME)-$(VERSION)
DEB_TARBASE := $(DEB_TOP)/$(DEB_NAME)_$(VERSION)
SOURCE ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\\\#/\\\\\#/g' -e 's/.*: *//'))$(SOURCE)
SOURCE ?= $(eval SOURCE := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -S -l $(SPEC) | sed -e 2,\$$d -e 's/\#/\\\#/g' -e 's/.*: *//'))$(SOURCE)
PATCHES ?= $(eval PATCHES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/p'))$(PATCHES)
OTHER_SOURCES := $(eval OTHER_SOURCES := $(shell CHROOT_NAME=$(CHROOT_NAME) $(SPECTOOL) $(COMMON_RPM_ARGS) -l $(SPEC) | sed -ne 1d -e 's/.*: *//' -e 's/.*\///' -e '/\.patch/d' -e p))$(OTHER_SOURCES)
SOURCES := $(addprefix _topdir/SOURCES/,$(notdir $(SOURCE)) $(PATCHES) $(OTHER_SOURCES))
Expand Down Expand Up @@ -139,23 +139,23 @@ endif

$(DL_NAME)-$(DL_VERSION).tar.$(SRC_EXT).asc: $(SPEC) $(CALLING_MAKEFILE)
rm -f ./$(DL_NAME)-*.tar.{gz,bz*,xz}.asc
curl -f -L -O '$(SOURCE).asc'
$(SPECTOOL) -g $(SPEC)

$(DL_NAME)-$(DL_VERSION).tar.$(SRC_EXT).sig: $(SPEC) $(CALLING_MAKEFILE)
rm -f ./$(DL_NAME)-*.tar.{gz,bz*,xz}.sig
curl -f -L -O '$(SOURCE).sig'
$(SPECTOOL) -g $(SPEC)

$(DL_NAME)-$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE)
rm -f ./$(DL_NAME)-*.tar.{gz,bz*,xz}
curl -f -L -O '$(SOURCE)'
$(SPECTOOL) -g $(SPEC)

v$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE)
rm -f ./v*.tar.{gz,bz*,xz}
curl -f -L -O '$(SOURCE)'
$(SPECTOOL) -g $(SPEC)

$(DL_VERSION).tar.$(SRC_EXT): $(SPEC) $(CALLING_MAKEFILE)
rm -f ./*.tar.{gz,bz*,xz}
curl -f -L -O '$(SOURCE)'
$(SPECTOOL) -g $(SPEC)

$(DEB_TOP)/%: % | $(DEB_TOP)/

Expand Down Expand Up @@ -361,6 +361,7 @@ packaging_check:
--exclude \*.code-workspace \
--exclude install \
--exclude packaging \
--exclude utils \
-bur $(PACKAGING_CHECK_DIR)/ packaging/; then \
exit 1; \
fi
Expand Down

0 comments on commit d690c82

Please sign in to comment.