starlingx
/
ha
Code Issues Proposed changes

Merge "debian: Fix sm-common packaging issues"

This commit is contained in:
Zuul 2022-03-09 15:08:42 +00:00 committed by Gerrit Code Review
parent 3012c29a4a 680f233746
commit 2735950af5
8 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service-mgmt/sm-common/debian/deb_folder/control
View File

@ -5,8 +5,7 @@ Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
Build-Depends: debhelper (>= 13),
libsqlite3-dev,
libglib2.0-dev,
uuid-dev,
libsystemd-dev
uuid-dev
Standards-Version: 4.1.2
Homepage: https://www.starlingx.io
@ -25,7 +24,7 @@ Description: Service Management Common - shared library files
Package: sm-common-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, sm-common-libs
Depends: ${misc:Depends}, sm-common-libs
Description: Service Management Common - Development files
This package contains symbolic links, header files,
and related items necessary for software development.

9
service-mgmt/sm-common/debian/deb_folder/rules
View File

@ -9,11 +9,10 @@ export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
dh $@
override_dh_auto_install:
rm -rf ${ROOT}
$(MAKE) DEST_DIR=${ROOT} \
BIN_DIR=usr/bin \
UNIT_DIR=usr/lib/systemd/system \
LIB_DIR=/usr/lib64 \
UNIT_DIR=/lib/systemd/system \
LIB_DIR=/usr/lib \
INC_DIR=/usr/include \
BUILDSUBDIR=$(CURDIR) \
ETC_DIR=etc \
@ -28,3 +27,7 @@ override_dh_fixperms:
-Xlibsm_common.so.* \
-Xlibsm_watchdog_nfs.so.* \
-Xsm-eru*
override_dh_installsystemd:
dh_installsystemd -psm-common sm-watchdog.service
dh_installsystemd -psm-eru sm-eru.service

2
service-mgmt/sm-common/debian/deb_folder/sm-common-dev.install
View File

@ -1,3 +1,3 @@
usr/include/*
usr/lib64/*.so
usr/lib/*.so
var/lib/sm/watchdog/modules/libsm_watchdog_nfs.so

2
service-mgmt/sm-common/debian/deb_folder/sm-common-libs.install
View File

@ -1,2 +1,2 @@
usr/lib64/*.so.*
usr/lib/*.so.*
var/lib/sm/watchdog/modules/*.so.*

3
service-mgmt/sm-common/debian/deb_folder/sm-common.install
View File

@ -1,4 +1,5 @@
etc/init.d/sm-watchdog
etc/pmon.d/sm-watchdog.conf
usr/bin/sm-watchdog
usr/lib/systemd/system/sm-watchdog.service
lib/systemd/system/sm-watchdog.service
debian/systemd/00-sm-common.preset etc/systemd/system-preset

3
service-mgmt/sm-common/debian/deb_folder/sm-eru.install
View File

@ -2,4 +2,5 @@ etc/init.d/sm-eru
etc/pmon.d/sm-eru.conf
usr/bin/sm-eru
usr/bin/sm-eru-dump
usr/lib/systemd/system/sm-eru.service
lib/systemd/system/sm-eru.service
debian/systemd/00-sm-eru.preset etc/systemd/system-preset

1
service-mgmt/sm-common/debian/deb_folder/systemd/00-sm-common.preset Normal file
View File

@ -0,0 +1 @@
enable sm-watchdog.service

1
service-mgmt/sm-common/debian/deb_folder/systemd/00-sm-eru.preset Normal file
View File

@ -0,0 +1 @@
enable sm-eru.service