beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch to make build for packaging (#1279)

Browse source 
* switch to make build for packaging
* build as first target

Co-authored-by: sabban <15465465+sabban@users.noreply.github.com>
This commit is contained in:
Manuel Sabban 2022-02-18 18:09:19 +01:00 committed by GitHub
parent 75ba0e2bfc
commit 2763366309
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -66,12 +66,12 @@ GOTEST=$(GOCMD) test
RELDIR = crowdsec-$(BUILD_VERSION) RELDIR = crowdsec-$(BUILD_VERSION)
.PHONY: all
all: clean test build
.PHONY: build .PHONY: build
build: goversion crowdsec cscli plugins build: goversion crowdsec cscli plugins
.PHONY: all
all: clean test build
.PHONY: static .PHONY: static
static: crowdsec_static cscli_static plugins_static static: crowdsec_static cscli_static plugins_static

2
debian/rules vendored
View file

@ -22,7 +22,7 @@ override_dh_auto_install:
# echo $($GOCMD version) # echo $($GOCMD version)
# cd cmd/crowdsec && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o $(CROWDSEC_BIN) -v && cd .. # cd cmd/crowdsec && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o $(CROWDSEC_BIN) -v && cd ..
# cd cmd/crowdsec-cli && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o cscli -v && cd .. # cd cmd/crowdsec-cli && GOROOT=/tmp/go GO111MODULE=on $(GOBUILD) $(LD_OPTS) -o cscli -v && cd ..
make make build
mkdir -p debian/crowdsec/usr/bin mkdir -p debian/crowdsec/usr/bin
mkdir -p debian/crowdsec/etc/crowdsec mkdir -p debian/crowdsec/etc/crowdsec
mkdir -p debian/crowdsec/usr/share/crowdsec mkdir -p debian/crowdsec/usr/share/crowdsec

2
rpm/SPECS/crowdsec.spec
View file

@ -39,7 +39,7 @@ BuildRequires: systemd
%patch2 %patch2
%build %build
BUILD_VERSION=%{local_version} make BUILD_VERSION=%{local_version} make build
sed -i "s#/usr/local/lib/crowdsec/plugins/#%{_libdir}/%{name}/plugins/#g" config/config.yaml sed -i "s#/usr/local/lib/crowdsec/plugins/#%{_libdir}/%{name}/plugins/#g" config/config.yaml
%install %install