starlingx
/
ha
Code Issues Proposed changes

Merge "sm: fix the hardcoded includes for arm64"

This commit is contained in:
Zuul 2024-01-17 15:52:16 +00:00 committed by Gerrit Code Review
parent 0db57d60be 15a8ffeee0
commit 56b60d15a5
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,17 @@ export PMONDIR = /usr/share/starlingx/pmon.d
export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
%:
dh $@
override_dh_auto_build:
ifeq ($(DEB_HOST_ARCH),arm64)
sed -i "s/x86_64/aarch64/" $(CURDIR)/src/Makefile
endif
dh_auto_build
override_dh_auto_install:
$(MAKE) DEST_DIR=${ROOT} \
BIN_DIR=usr/bin \

5
service-mgmt/sm-db/debian/deb_folder/rules
View File

@ -4,10 +4,15 @@ export ROOT = $(CURDIR)/debian/tmp
export VER = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export VER_MJR = $(shell echo $(VER) | cut -d. -f1)
export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
%:
dh $@
override_dh_auto_build:
ifeq ($(DEB_HOST_ARCH),arm64)
sed -i "s/x86_64/aarch64/" $(CURDIR)/src/Makefile
endif
sqlite3 database/sm.db < database/create_sm_db.sql
sqlite3 database/sm.hb.db < database/create_sm_hb_db.sql
dh_auto_build

8
service-mgmt/sm/debian/deb_folder/rules
View File

@ -4,6 +4,8 @@ ROOT := $(CURDIR)/debian/tmp
PMONDIR := /usr/share/starlingx/pmon.d
UNIT_DIR := /lib/systemd/system
export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
%:
dh $@
@ -11,6 +13,12 @@ override_dh_usrlocal:
# dh_usrlocal complains about files being put in /usr/local
# this empty override causes dh_usrlocal to be skipped.
override_dh_auto_build:
ifeq ($(DEB_HOST_ARCH),arm64)
sed -i "s/x86_64/aarch64/" $(CURDIR)/src/Makefile
endif
dh_auto_build
override_dh_auto_install:
$(MAKE) DEST_DIR=${ROOT} \
PMONDIR=${PMONDIR} \