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

Updated fpm buiilds to build from destdir and include everything for a simpler single file installation. Also removing python specific dependencies, to use requirements.txt as alternative

Browse source
This commit is contained in:
bharnden 2019-06-07 22:07:13 -07:00
parent 579c0d5783
commit 39bcdcaf79
1 changed files with 23 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Makefile.am
View file

@ -44,38 +44,18 @@ DISTCLEANFILES = aclocal.m4 \
MAINTAINERCLEANFILES = .version \ MAINTAINERCLEANFILES = .version \
.version.date .version.date
define fpm-python = define fpm-rpm =
fpm -s python -t $1 \ fpm -s dir -t rpm -n core \
-m "$(PACKAGE_MAINTAINERS)" \
--vendor "$(PACKAGE_VENDOR)" \
$2
endef
define fpm-gui =
fpm -s dir -t $1 -n core-gui \
-m "$(PACKAGE_MAINTAINERS)" \ -m "$(PACKAGE_MAINTAINERS)" \
--license "BSD" \ --license "BSD" \
--description "Common Open Research Emulator GUI front-end" \ --description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \ --url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \ --vendor "$(PACKAGE_VENDOR)" \
-p core-gui_VERSION_ARCH.$1 \ -p core_VERSION_ARCH.rpm \
-v $(PACKAGE_VERSION) \ -v $(PACKAGE_VERSION) \
-d "bash" \ --rpm-init scripts/core-daemon \
-d "tcl" \ -d "tcl" \
-d "tk" \ -d "tk" \
$2 \
-C $(DESTDIR)
endef
define fpm-daemon-rpm =
fpm -s python -t rpm \
-p NAME_sysv_VERSION_ARCH.rpm \
--rpm-init scripts/core-daemon \
--python-install-bin $(bindir) \
--python-install-data $(prefix) \
--python-install-lib $(pythondir) \
-m "$(PACKAGE_MAINTAINERS)" \
--vendor "$(PACKAGE_VENDOR)" \
-d "procps-ng" \ -d "procps-ng" \
-d "bash >= 3.0" \ -d "bash >= 3.0" \
-d "bridge-utils" \ -d "bridge-utils" \
@ -83,19 +63,23 @@ fpm -s python -t rpm \
-d "iproute" \ -d "iproute" \
-d "libev" \ -d "libev" \
-d "net-tools" \ -d "net-tools" \
-d "python >= 2.7, python < 3.0" \ -d "python >= 2.7" \
netns/setup.py daemon/setup.py -C $(DESTDIR)
endef endef
define fpm-daemon-deb = define fpm-deb =
fpm -s python -t deb \ fpm -s dir -t deb -n core \
-p NAME_$1_VERSION_ARCH.deb \
--python-install-bin $(bindir) \
--python-install-data $(prefix) \
--python-install-lib $(pythondir) \
$2 $3 \
-m "$(PACKAGE_MAINTAINERS)" \ -m "$(PACKAGE_MAINTAINERS)" \
--license "BSD" \
--description "Common Open Research Emulator" \
--url https://github.com/coreemu/core \
--vendor "$(PACKAGE_VENDOR)" \ --vendor "$(PACKAGE_VENDOR)" \
-p core_VERSION_ARCH.deb \
-v $(PACKAGE_VERSION) \
--deb-systemd scripts/core-daemon.service \
-d "tcl" \
-d "tk" \
-d "libtk-img" \
-d "procps" \ -d "procps" \
-d "libc6 >= 2.14" \ -d "libc6 >= 2.14" \
-d "bash >= 3.0" \ -d "bash >= 3.0" \
@ -103,21 +87,15 @@ fpm -s python -t deb \
-d "ebtables" \ -d "ebtables" \
-d "iproute2" \ -d "iproute2" \
-d "libev4" \ -d "libev4" \
-d "python (>= 2.7), python (<< 3.0)" \ -d "python >= 2.7" \
--deb-recommends quagga \ -C $(DESTDIR)
netns/setup.py daemon/setup.py
endef endef
.PHONY: fpm .PHONY: fpm
fpm: clean-local-fpm fpm: clean-local-fpm
$(MAKE) -C gui install DESTDIR=$(DESTDIR) $(MAKE) install DESTDIR=$(DESTDIR)
$(call fpm-gui,rpm) $(call fpm-deb)
$(call fpm-gui,deb,-d "libtk-img") $(call fpm-rpm)
$(call fpm-python,rpm,ns3/setup.py)
$(call fpm-python,deb,ns3/setup.py)
$(call fpm-daemon-rpm)
$(call fpm-daemon-deb,sysv,--deb-init,scripts/core-daemon)
$(call fpm-daemon-deb,systemd,--deb-systemd,scripts/core-daemon.service)
.PHONY: clean-local-fpm .PHONY: clean-local-fpm
clean-local-fpm: clean-local-fpm: