Skip to content

Commit

Permalink
add packetfence-ci-lib to Debian packages
Browse files Browse the repository at this point in the history
  • Loading branch information
nqb committed Nov 28, 2022
1 parent eea8c63 commit eadb254
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 0 deletions.
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,20 @@ pfconnector_remote_install:
make -C $(SRC_GODIR) pfconnector
install -v -m 0755 $(SRC_GODIR)/pfconnector $(DESTDIR)$(PFCONNECTOR_BINDIR)/pfconnector

# install -D will automatically create target directories
# SRC_RELATIVE_CILIBDIR is used to only get relative paths from PF source tree
# $$file in destination of install command contain relative path
.PHONY: ci_lib_install
ci_lib_install:
@echo "create directories under $(DESTDIR)$(CIDIR)"
install -d -m0755 $(DESTDIR)$(CIDIR)
install -d -m0755 $(DESTDIR)$(CILIBDIR)

@echo "install $(SRC_RELATIVE_CILIBDIR) files"
for file in $(shell find $(SRC_RELATIVE_CILIBDIR) -type f); do \
install -v -m 0644 $$file -D $(DESTDIR)$(PF_PREFIX)/$$file ; \
done

# packetfence-export package
.PHONY: distclean-packetfence-export
distclean-packetfence-export:
Expand Down
3 changes: 3 additions & 0 deletions config.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ PFCONNECTOR_PREFIX = $(PREFIX)/pfconnector-remote
BINDIR = $(PF_PREFIX)/bin
SBINDIR = $(PF_PREFIX)/sbin
TESTDIR = $(PF_PREFIX)/t
CIDIR = $(PF_PREFIX)/ci
CILIBDIR = $(CIDIR)/lib

# PF connector
PFCONNECTOR_BINDIR = $(PFCONNECTOR_PREFIX)/bin
Expand All @@ -32,6 +34,7 @@ SRC_CI_TESTDIR = $(SRC_CIDIR)/lib/test
SRC_GODIR = $(SRC_ROOT_DIR)/go
SRC_TESTDIR= $(SRC_ROOT_DIR)/t
SRC_RELATIVE_TESTDIR = t
SRC_RELATIVE_CILIBDIR = ci/lib
SRC_ADDONSDIR = $(SRC_ROOT_DIR)/addons
SRC_FULL_IMPORTDIR = $(SRC_ADDONSDIR)/full-import
SRC_FULL_UPGRADEDIR = $(SRC_ADDONSDIR)/full-upgrade
Expand Down
5 changes: 5 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ Depends: fingerbank-collector-remote (>= 1.4.1)
Description: PacketFence Connector
PacketFence Connector files. This package contains all files related to PacketFence Connector.

Package: packetfence-ci-lib
Architecture: all
Description: CI librairies used by PacketFence
PacketFence CI librairies. This package contains all files related to PacketFence CI librairies.

Package: packetfence-pfcmd-suid
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Expand Down
11 changes: 11 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ install: build
# packetfence-pfconnector-remote package
make DESTDIR=$(CURDIR)/debian/packetfence-pfconnector-remote pfconnector_remote_install

# packetfence-ci-lib package
make DESTDIR=$(CURDIR)/debian/packetfence-ci-lib ci_lib_install

# packetfence-config package
for i in `find * -path 'lib/pfconfig*' -type d`; do \
install -d -m0700 $(CURDIR)/debian/packetfence-config$(PREFIX)/$(NAME)/$$i; \
Expand Down Expand Up @@ -347,6 +350,14 @@ binary-arch: build install

# Addon Stress-tester
chmod 0755 $(CURDIR)/debian/packetfence$(PREFIX)/$(NAME)/addons/stress-tester/dhcp_test

# packetfence-ci-lib
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/build/*.sh
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/check/*.sh
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/common/*.sh
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/release/*.sh
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/test/*.sh
chmod 0755 $(CURDIR)/debian/packetfence-ci-lib$(PREFIX)/$(NAME)/ci/lib/upload/*.sh
# packetfence pkg
chmod 0755 $(CURDIR)/debian/packetfence$(PREFIX)/$(NAME)/addons/*.pl
chmod 0755 $(CURDIR)/debian/packetfence$(PREFIX)/$(NAME)/addons/*.sh
Expand Down

0 comments on commit eadb254

Please sign in to comment.