emo/haproxy
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'package-haring-cli-tool' into 'main'

Browse Source 
Build and package haring CLI tool into the builds

See merge request mangadex-pub/haproxy!9
This commit is contained in:
Tristan 2022-08-12 15:30:17 +00:00
commit 81926da02e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
haproxy/Makefile
View File

@ -76,6 +76,7 @@ patches: $(HAPROXY_BUILDIR)
build: $(HAPROXY_BUILDIR) patches build: $(HAPROXY_BUILDIR) patches
$(MAKE) build_$(shell uname -s) $(MAKE) build_$(shell uname -s)
if [ -d "$(HAPROXY_BUILDIR)/dev/haring" ]; then $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" dev/haring/haring; fi
.PHONY: build_Linux .PHONY: build_Linux
build_Linux: build_Linux:
@ -98,6 +99,7 @@ $(HAPROXY_DESTDIR):
@if [ -d "$(HAPROXY_DESTDIR)" ]; then rm -rf $(HAPROXY_DESTDIR); fi @if [ -d "$(HAPROXY_DESTDIR)" ]; then rm -rf $(HAPROXY_DESTDIR); fi
@mkdir -pv "$(HAPROXY_DESTDIR)" @mkdir -pv "$(HAPROXY_DESTDIR)"
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install
if [ -f "$(HAPROXY_BUILDIR)/dev/haring/haring" ]; then install -m 0755 -D "$(HAPROXY_BUILDIR)/dev/haring/haring" "$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haring"; fi
$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv $(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv
$(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR) $(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR)

2
haproxy/debian/rules
View File

@ -49,6 +49,7 @@ override_dh_auto_configure:
override_dh_auto_build-arch: override_dh_auto_build-arch:
$(MAKE) -j $(shell nproc) $(MAKEARGS) $(MAKE) -j $(shell nproc) $(MAKEARGS)
if [ -d "dev/haring" ]; then $(MAKE) -j $(shell nproc) dev/haring/haring; fi
$(MAKE) -j $(shell nproc) -C admin/systemd $(MAKEARGS) $(MAKE) -j $(shell nproc) -C admin/systemd $(MAKEARGS)
override_dh_auto_clean: override_dh_auto_clean:
@ -58,6 +59,7 @@ override_dh_auto_clean:
override_dh_auto_install-arch: override_dh_auto_install-arch:
cp -rf $(DEP_DIST_ROOT_QUICTLS)/opt debian/haproxy/opt cp -rf $(DEP_DIST_ROOT_QUICTLS)/opt debian/haproxy/opt
$(MAKE) -j $(shell nproc) $(MAKEARGS) install $(MAKE) -j $(shell nproc) $(MAKEARGS) install
if [ -f "dev/haring/haring" ]; then install -m 0755 -D dev/haring/haring debian/haproxy/usr/sbin/haring; fi
install -m 0644 -D debian/rsyslog.conf debian/haproxy/etc/rsyslog.d/49-haproxy.conf install -m 0644 -D debian/rsyslog.conf debian/haproxy/etc/rsyslog.d/49-haproxy.conf
install -m 0644 -D debian/logrotate.conf debian/haproxy/etc/logrotate.d/haproxy install -m 0644 -D debian/logrotate.conf debian/haproxy/etc/logrotate.d/haproxy