Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
libjson-c-dev libnuma-dev libprotobuf-c-dev libreadline-dev \
librtr-dev libsmartcols-dev libtool libyang-dev meson ninja-build \
patch pkg-config protobuf-c-compiler python3-dev python3-pyelftools \
texinfo
systemd-dev texinfo
- uses: actions/checkout@v4
with:
fetch-depth: 0 # force fetch all history
Expand Down
6 changes: 6 additions & 0 deletions cli/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ if not compiler.has_function(
endif

cli_inc += include_directories('.')

install_data(
files('grcli.bash-completion'),
rename: ['grcli'],
install_dir: get_option('datadir') / 'bash-completion/completions',
)
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Build-Depends:
patch,
pkg-config,
python3-pyelftools,
systemd-dev,
Standards-Version: 4.7.0
Rules-Requires-Root: no
Homepage: https://github.com/DPDK/grout
Expand Down
2 changes: 0 additions & 2 deletions debian/grout.bash-completion

This file was deleted.

3 changes: 3 additions & 0 deletions debian/grout.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
/etc/grout.init
/usr/bin/grcli
/usr/bin/grout
/usr/lib/systemd/system/grout.service
/usr/share/bash-completion/completions/grcli
/usr/share/bash-completion/completions/grout
/usr/share/man/man1/grcli.1
/usr/share/man/man8/grout.8
1 change: 0 additions & 1 deletion debian/grout.service

This file was deleted.

2 changes: 0 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ override_dh_auto_configure:

override_dh_auto_install:
meson install -C $(build) --skip-subprojects --destdir=$(dest)
install -D -m 644 main/grout.default $(dest)/etc/default/grout
install -D -m 644 main/grout.init $(dest)/etc/grout.init
install -D -m 0755 subprojects/dpdk/usertools/dpdk-telemetry-exporter.py \
$(dest)/usr/bin/grout-telemetry-exporter
install -D -m 0644 -t $(dest)/usr/share/dpdk/telemetry-endpoints \
Expand Down
24 changes: 24 additions & 0 deletions main/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,27 @@ tests += [
],
},
]

systemd_dep = dependency('systemd', required: false)
if systemd_dep.found()
systemd_system_unit_dir = systemd_dep.get_variable(
pkgconfig: 'systemdsystemunitdir',
pkgconfig_define: ['prefix', get_option('prefix')]
)
install_data(
files('grout.service'),
install_dir: systemd_system_unit_dir,
)
install_data(
files('grout.default'),
rename: ['grout'],
install_dir: get_option('sysconfdir') / 'default',
)
install_data('grout.init', install_dir: get_option('sysconfdir'))
endif

install_data(
files('grout.bash-completion'),
rename: ['grout'],
install_dir: get_option('datadir') / 'bash-completion/completions',
)
5 changes: 0 additions & 5 deletions rpm/grout.spec
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ FRR dplane plugin for grout
%install
%meson_install --skip-subprojects

install -D -m 0644 main/grout.default %{buildroot}%{_sysconfdir}/default/grout
install -D -m 0644 main/grout.init %{buildroot}%{_sysconfdir}/grout.init
install -D -m 0644 main/grout.service %{buildroot}%{_unitdir}/grout.service
install -D -m 0644 main/grout.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/grout
install -D -m 0644 cli/grcli.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/grcli
install -D -m 0755 subprojects/dpdk/usertools/dpdk-telemetry-exporter.py %{buildroot}%{_bindir}/grout-telemetry-exporter
install -D -m 0644 -t %{buildroot}%{_datadir}/dpdk/telemetry-endpoints subprojects/dpdk/usertools/telemetry-endpoints/*

Expand Down