ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and simplify

Browse Source 
This patch addresses two things:
1) It simplifies the Makefile to build RPMs by removing duplication and
use environment variables instead;
2) It aligns openSUSE with others with regards to invoke "pkg-rpm" by
the build.sh for Vagrant

Change-Id: I51557f54e4ddf49d83bb69fa0035c8fff122857e
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
This commit is contained in:
Marco Varlese
2017-11-29 16:13:04 +01:00
committed by Damjan Marion
parent 837503cf66
commit aba730fc0d
2 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
extras/rpm/Makefile
View File

@ -26,41 +26,24 @@ PC=%
all: RPM all: RPM
ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
srpm: TOPDIR=$(CURDIR)
@echo $(TARBALL) SPEC_FILE='vpp-suse.spec'
mkdir -p rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS}
cp $(TARBALL) rpmbuild/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
cp vpp.spec rpmbuild/SOURCES
sed -i '1s/^/$(PC)define _version $(VERSION)\n/' rpmbuild/SOURCES/vpp-suse.spec
sed -i '1s/^/$(PC)define _release $(RELEASE)\n/' rpmbuild/SOURCES/vpp-suse.spec
sed -i '/define _topdir/d' rpmbuild/SOURCES/vpp-suse.spec
rpmbuild -bs \
--define "_topdir rpmbuild" \
rpmbuild/SOURCES/vpp-suse.spec
mv $$(find rpmbuild/SRPMS -name \*.src.rpm -type f) .
RPM:
@echo $(TARBALL)
mkdir -p RPMS SOURCES
cp $(TARBALL) SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
rpmbuild -bb \
--define "_topdir $(CURDIR)" \
--define "_version $(VERSION)" \
--define "_release $(RELEASE)" \
vpp-suse.spec
mv $$(find RPMS -name \*.rpm -type f) .
else else
TOPDIR=$(PWD)
SPEC_FILE='vpp.spec'
endif
srpm: srpm:
@echo $(TARBALL) @echo $(TARBALL)
mkdir -p rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS} mkdir -p rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS}
cp $(TARBALL) rpmbuild/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz cp $(TARBALL) rpmbuild/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
cp vpp.spec rpmbuild/SOURCES cp $(SPEC_FILE) rpmbuild/SOURCES
sed -i '1s/^/$(PC)define _version $(VERSION)\n/' rpmbuild/SOURCES/vpp.spec sed -i '1s/^/$(PC)define _version $(VERSION)\n/' rpmbuild/SOURCES/$(SPEC_FILE)
sed -i '1s/^/$(PC)define _release $(RELEASE)\n/' rpmbuild/SOURCES/vpp.spec sed -i '1s/^/$(PC)define _release $(RELEASE)\n/' rpmbuild/SOURCES/$(SPEC_FILE)
sed -i '/define _topdir/d' rpmbuild/SOURCES/vpp.spec sed -i '/define _topdir/d' rpmbuild/SOURCES/$(SPEC_FILE)
rpmbuild -bs \ rpmbuild -bs \
--define "_topdir rpmbuild" \ --define "_topdir rpmbuild" \
rpmbuild/SOURCES/vpp.spec rpmbuild/SOURCES/$(SPEC_FILE)
mv $$(find rpmbuild/SRPMS -name \*.src.rpm -type f) . mv $$(find rpmbuild/SRPMS -name \*.src.rpm -type f) .
RPM: RPM:
@ -68,9 +51,8 @@ RPM:
mkdir -p RPMS SOURCES mkdir -p RPMS SOURCES
cp $(TARBALL) SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz cp $(TARBALL) SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
rpmbuild -bb \ rpmbuild -bb \
--define "_topdir $(PWD)" \ --define "_topdir $(TOPDIR)" \
--define "_version $(VERSION)" \ --define "_version $(VERSION)" \
--define "_release $(RELEASE)" \ --define "_release $(RELEASE)" \
vpp.spec $(SPEC_FILE)
mv $$(find RPMS -name \*.rpm -type f) . mv $$(find RPMS -name \*.rpm -type f) .
endif

2
extras/vagrant/build.sh
View File

@ -67,6 +67,6 @@ elif [ "$OS_ID" == "centos" ]; then
(cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a) (cd $VPP_DIR/vnet ;$SUDOCMD aclocal;$SUDOCMD automake -a)
$SUDOCMD make pkg-rpm $SUDOCMD make pkg-rpm
elif [ "$OS_ID" == "opensuse" ]; then elif [ "$OS_ID" == "opensuse" ]; then
$SUDOCMD make build-release $SUDOCMD make pkg-rpm
fi fi