Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

fix packaging issues

Browse source
This commit is contained in:
Steffen Vogel 2017-12-14 14:23:47 +01:00
parent 6b3fc6dba3
commit 1c85fb0384
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.distignore
View file

@ -1,10 +1,12 @@
build build/
thirdparty thirdparty/
.git/
.git
.gitmodules .gitmodules
.gitignore .gitignore
.dockerignore .dockerignore
.distignore
.DS_Store .DS_Store
*~ *~

1
.dockerignore
View file

@ -2,3 +2,4 @@
!build/release/packaging/rpm/* !build/release/packaging/rpm/*
!thirdparty/criterion/ !thirdparty/criterion/
!thirdparty/libiec61850/ !thirdparty/libiec61850/
thirdparty/*/build/

2
Makefile
View file

@ -169,4 +169,4 @@ clean: $(addprefix clean-, $(filter-out thirdparty doc clients,$(MODULES)))
include $(wildcard $(SRCDIR)/make/Makefile.*) include $(wildcard $(SRCDIR)/make/Makefile.*)
include $(wildcard $(BUILDDIR)/**/*.d) include $(wildcard $(BUILDDIR)/**/*.d)
include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES)) -include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))

4
packaging/rpm/villas-node.spec
View file

@ -14,8 +14,8 @@ BuildRequires: gcc pkgconfig make
Requires: iproute kernel-modules-extra module-init-tools Requires: iproute kernel-modules-extra module-init-tools
BuildRequires: openssl-devel libconfig-devel libnl3-devel libcurl-devel jansson-devel libxil-devel libwebsockets-devel zeromq-devel nanomsg-devel libiec61850-devel BuildRequires: openssl-devel libconfig-devel libnl3-devel libcurl-devel jansson-devel libwebsockets-devel zeromq-devel nanomsg-devel libiec61850-devel
Requires: openssl libconfig libnl3 libcurl jansson libxil libwebsockets zeromq nanomsg libiec61850 Requires: openssl libconfig libnl3 libcurl jansson libwebsockets zeromq nanomsg libiec61850
%description %description