diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-04-19 13:52:23 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2017-06-06 14:00:22 -0400 |
| commit | 7a9ba73da3e5cdc8b13b39f081e2a7108e2f3d89 (patch) | |
| tree | 653bcdc4104f7b6e602be3f0a1006b28fa8ea8a9 /build/Makefile | |
| parent | b9f63d58a83e18dd221be13348e585533eedcedc (diff) | |
Adding rpmlint to the build
- updating syntax to meet rpmlint standards
Change-Id: I056b7600df0f4383b97c67e705bc0b749b4c1633
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/build/Makefile b/build/Makefile index 51cb3e47..2e1da051 100644 --- a/build/Makefile +++ b/build/Makefile @@ -68,7 +68,7 @@ $(BUILD_DIR)/opnfv-apex-release.tar.gz: .PHONY: release-rpm-check release-rpm-check: $(BUILD_DIR)/opnfv-apex-release.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: release-rpm release-rpm: $(BUILD_DIR)/opnfv-apex-release.tar.gz $(RPMREL) @@ -76,14 +76,14 @@ release-rpm: $(BUILD_DIR)/opnfv-apex-release.tar.gz $(RPMREL) $(RPMREL): @echo "Building the Apex Release RPM" # build the release RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex-release.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" $(BUILD_DIR)/opnfv-apex-common.tar.gz: pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > $(BUILD_DIR)/opnfv-apex-common.tar.gz .PHONY: common-rpm-check common-rpm-check: $(BUILD_DIR)/opnfv-apex-common.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: common-rpm common-rpm: $(BUILD_DIR)/opnfv-apex-common.tar.gz $(RPMCOM) @@ -91,7 +91,7 @@ common-rpm: $(BUILD_DIR)/opnfv-apex-common.tar.gz $(RPMCOM) $(RPMCOM): @echo "Building the Apex Common RPM" # build the common RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" ################## # PYTHON TESTS # @@ -125,6 +125,14 @@ python-pep8-check: yamllint: @echo "Running yamllint against all .yaml files" cd ../ && yamllint $(shell cd ../ && git ls-tree -r HEAD --name-only | grep 'yaml$$') +############# +# RPMLINT # +############# + +.PHONY: rpmlint +rpmlint: + @echo "Running rpmlint against all RPM spec files" + rpmlint rpm_specs/*.spec ################## # NETWORKING-VPP # @@ -162,14 +170,14 @@ $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz: $(BUILD_DIR)/undercloud.qcow2 .PHONY: undercloud-rpm-check undercloud-rpm-check: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: undercloud-rpm undercloud-rpm: $(BUILD_DIR)/opnfv-apex-undercloud.tar.gz $(RPMUDR) $(RPMUDR): @echo "Building the Apex Undercloud RPM" - rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" ############### # OVERCLOUD # @@ -198,7 +206,7 @@ $(BUILD_DIR)/opnfv-apex.tar.gz: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 .PHONY: opendaylight-rpm-check opendaylight-rpm-check: $(BUILD_DIR)/opnfv-apex.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: opendaylight-rpm opendaylight-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMODL) @@ -206,7 +214,7 @@ opendaylight-rpm: $(BUILD_DIR)/opnfv-apex.tar.gz $(RPMODL) $(RPMODL): @echo "Building the Apex OpenDaylight RPM" # build the overcloud RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" ############### # ONOS # @@ -224,7 +232,7 @@ $(BUILD_DIR)/opnfv-apex-onos.tar.gz: $(BUILD_DIR)/overcloud-full-onos.qcow2 .PHONY: onos-rpm-check onos-rpm-check: $(BUILD_DIR)/opnfv-apex-onos.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" .PHONY: onos-rpm onos-rpm: $(BUILD_DIR)/opnfv-apex-onos.tar.gz $(RPMONO) @@ -232,7 +240,7 @@ onos-rpm: $(BUILD_DIR)/opnfv-apex-onos.tar.gz $(RPMONO) $(RPMONO): @echo "Building the Apex ONOS RPM" # build the overcloud RPM - rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "release $(shell echo $(RELEASE) | tr -d '_-')" + rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec $(RPM_DIR_ARGS) -D "_release $(shell echo $(RELEASE) | tr -d '_-')" ############### # ISO # |