starlingx/monitoring
Code Issues Proposed changes

Adjusting paths due to apt-ostree restrictions

Browse Source 
Currently, apt-ostree doesn't implement changes made
to /opt/* files. While an adjustment to apt-ostree is
in progress, packages affected by this must install
their content in other directories.

Since LAT is redirecting content install to /opt
in this repo to /usr/rootdirs/opt, the paths here
have been adjusted to use the final destination directly.

Importantly, note that no behavior changes come from this.

In addition, since LAT creates the symlinks from /opt
to /usr/rootdirs/opt via tmpfiles here [1] and apt-ostree
doesn't, we need to add these tmpfiles as well.

Ref:
[1] https://github.com/Wind-River/meta-lat/blob/20230307/recipes-support/genimage/files/genimage/scripts/run.do_image_ostree#L94-L103

Test Plan:
pass: build pkgs
pass: Install ISO and verify contents are
      accessible from original location in /opt
pass: Create patch with the new debs and install it.
      Verify that the system files received the changes.

Story: 2010867
Task: 51559

Change-Id: I6caa6670b6c669927245c4fb9bd525597d897cfd
Signed-off-by: Leonardo Fagundes Luz Serrano <Leonardo.FagundesLuzSerrano@windriver.com>
This commit is contained in:
Leonardo Fagundes Luz Serrano 2025-01-15 20:52:48 -03:00
parent f38f1827d2
commit d1b334a731
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
collectd-extensions/debian/deb_folder/collectd-extensions-tmpfiles.conf Normal file
View File

@ -0,0 +1 @@
L /opt/collectd - - - - /usr/rootdirs/opt/collectd

5
collectd-extensions/debian/deb_folder/collectd-extensions.install
View File

@ -1,6 +1,7 @@
etc/collectd.d/*
opt/collectd/extensions/config/*
opt/collectd/extensions/python/*
etc/tmpfiles.d/collectd-extensions-tmpfiles.conf
usr/rootdirs/opt/collectd/extensions/config/*
usr/rootdirs/opt/collectd/extensions/python/*
# %config(noreplace)
etc/systemd/system/collectd.service

8
collectd-extensions/debian/deb_folder/rules
View File

@ -4,13 +4,17 @@ export ROOT = $(CURDIR)/debian/tmp
export LOCAL_UNIT_DIR = $(ROOT)/etc/systemd/system
export LOCAL_DEFAULT_PLUGIN_DIR = $(ROOT)/etc/collectd.d
export LOCAL_STARLINGX_PLUGIN_DIR = $(ROOT)/etc/collectd.d/starlingx
export LOCAL_PYTHON_EXTENSIONS_DIR = $(ROOT)/opt/collectd/extensions/python
export LOCAL_CONFIG_EXTENSIONS_DIR = $(ROOT)/opt/collectd/extensions/config
export LOCAL_PYTHON_EXTENSIONS_DIR = $(ROOT)/usr/rootdirs/opt/collectd/extensions/python
export LOCAL_CONFIG_EXTENSIONS_DIR = $(ROOT)/usr/rootdirs/opt/collectd/extensions/config
export TMPFILES_DIR = $(ROOT)/etc/tmpfiles.d/
%:
dh $@
override_dh_install:
# Set up symlink /opt/collectd->/usr/rootdirs/opt/collectd
install -d $(TMPFILES_DIR)
install -m 644 debian/collectd-extensions-tmpfiles.conf $(TMPFILES_DIR)
# Adjustments in the configuration files for debian
sed -i '/Encoding "utf-8"/D' python_plugins.conf