starlingx/stx-puppet
Code Issues Proposed changes

puppet-manifests: fix the hardcoded kernel name

Browse Source 
The kernel names in puppet-update-grub-env.py is hardcoded
as amd64, use dpkg-architecture to check host arch and
replace the hardcoded names.

Test Plan:
PASS: build-pkgs on x86-64 host
PASS: build-image on x86-64 host
PASS: build-pkgs on arm64 host
PASS: build-image on arm64 host
PASS: install AIO-SX on x86-64 targets
PASS: install AIO-SX on arm64 targets

Story: 2010739
Task: 48284

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I1df220f585f53e58f2fcd8f6918273f8ea45fb90
This commit is contained in:
Jackie Huang 2023-07-12 10:32:54 +08:00
parent be1d47c726
commit 7de97e8870
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet-manifests/debian/deb_folder/rules
View File

@ -1,6 +1,8 @@
#!/usr/bin/make -f #!/usr/bin/make -f
#export DH_VERBOSE = 1 #export DH_VERBOSE = 1
export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
%: %:
dh $@ dh $@
@ -10,6 +12,9 @@ override_dh_usrlocal:
echo "Do Nothing" echo "Do Nothing"
override_dh_install: override_dh_install:
ifeq ($(DEB_HOST_ARCH),arm64)
sed -i "s/amd64/arm64/" $(CURDIR)/bin/puppet-update-grub-env.py
endif
$(MAKE) install hiera_v5=true ignore_puppet_warnings=true \ $(MAKE) install hiera_v5=true ignore_puppet_warnings=true \
BINDIR=$(CURDIR)/debian/tmp/usr/local/bin \ BINDIR=$(CURDIR)/debian/tmp/usr/local/bin \
CONFIGDIR=$(CURDIR)/debian/tmp/etc/puppet \ CONFIGDIR=$(CURDIR)/debian/tmp/etc/puppet \