afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update to installation docs, tweaks to handling python2/3 package builds

Browse source
This commit is contained in:
Blake Harnden 2019-06-10 11:41:27 -07:00
parent 223bcb64f1
commit fc654a31a8
7 changed files with 138 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile.am
View file

@ -44,6 +44,13 @@ DISTCLEANFILES = aclocal.m4 \
MAINTAINERCLEANFILES = .version \
.version.date
if PYTHON3
PYTHON_DEP = python >= 3.0
else
PYTHON_DEP = python >= 2.7, python < 3.0
endif
define fpm-rpm =
fpm -s dir -t rpm -n core \
-m "$(PACKAGE_MAINTAINERS)" \
@ -51,7 +58,7 @@ fpm -s dir -t rpm -n core \
--description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \
-p core_python$(FPM_PYTHON)_VERSION_ARCH.rpm \
-p core_$(PYTHON)_VERSION_ARCH.rpm \
-v $(PACKAGE_VERSION) \
--rpm-init scripts/core-daemon \
-d "tcl" \
@ -63,7 +70,7 @@ fpm -s dir -t rpm -n core \
-d "iproute" \
-d "libev" \
-d "net-tools" \
-d "python >= $(FPM_PYTHON)" \
-d "$(PYTHON_DEP)" \
-C $(DESTDIR)
endef
@ -74,7 +81,7 @@ fpm -s dir -t deb -n core \
--description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \
-p core_python$(FPM_PYTHON)_VERSION_ARCH.deb \
-p core_$(PYTHON)_VERSION_ARCH.deb \
-v $(PACKAGE_VERSION) \
--deb-systemd scripts/core-daemon.service \
-d "tcl" \
@ -87,7 +94,7 @@ fpm -s dir -t deb -n core \
-d "ebtables" \
-d "iproute2" \
-d "libev4" \
-d "python >= $(FPM_PYTHON)" \
-d "$(PYTHON_DEP)" \
-C $(DESTDIR)
endef