starlingx/metal
Code Issues Proposed changes

Revert "Fix kickstarts patching"

Browse Source 
This reverts commit 0366f8552d5ac9784de9992b6ae98958c9a40381.

Reason for revert: breaks sanity

Change-Id: Ie580ae328a80abfc2a1964157ac1b14b70dc98e9
This commit is contained in:
Bruce Jones 2023-09-26 22:28:49 +00:00
parent 0366f8552d
commit 4e09b61d0d
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kickstart/debian/deb_folder/platform-kickstarts.install
View File

@ -1,3 +1 @@
var/www/pages/feed/* var/www/pages/feed/*
usr/share/platform-kickstarts/*
usr/lib/tmpfiles.d/platform-kickstarts.conf

16
kickstart/debian/deb_folder/rules
View File

@ -10,21 +10,15 @@ export platform_release="$(shell grep SW_VERSION /usr/include/build_info.h | cut
override_dh_auto_configure: override_dh_auto_configure:
sed -i s/xxxPLATFORM_RELEASExxx/$(platform_release)/g kickstart.cfg sed -i s/xxxPLATFORM_RELEASExxx/$(platform_release)/g kickstart.cfg
sed -i s/xxxPLATFORM_RELEASExxx/$(platform_release)/g miniboot.cfg sed -i s/xxxPLATFORM_RELEASExxx/$(platform_release)/g miniboot.cfg
sed -i s/xxxPLATFORM_RELEASExxx/$(platform_release)/g debian/tmpfiles.conf
dh_auto_configure dh_auto_configure
override_dh_install: override_dh_install:
install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart
install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos install -d -m 755 $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos
install -d -m 755 $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release}/centos
# kickstart.cfg must be copied to /var/../kickstarts for system installation.
# It's eventually symlinked from /usr/../platform-kickstarts.
install -p -D -m 700 kickstart.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart install -p -D -m 700 kickstart.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart
install -p -D -m 700 kickstart.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release} install -p -D -m 700 miniboot.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart
install -p -D -m 700 miniboot.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release} install -p -D -m 700 centos/miniboot_controller_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos
install -p -D -m 700 centos/miniboot_controller_ks.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release}/centos install -p -D -m 700 centos/miniboot_smallsystem_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos
install -p -D -m 700 centos/miniboot_smallsystem_ks.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release}/centos install -p -D -m 700 centos/miniboot_smallsystem_lowlatency_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos
install -p -D -m 700 centos/miniboot_smallsystem_lowlatency_ks.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release}/centos install -p -D -m 700 centos/prestaged_installer_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos
install -p -D -m 700 centos/prestaged_installer_ks.cfg $(ROOT)/usr/share/platform-kickstarts/rel-${platform_release}/centos
install -p -D -m 644 debian/tmpfiles.conf $(ROOT)/usr/lib/tmpfiles.d/platform-kickstarts.conf
dh_install dh_install

1
kickstart/debian/deb_folder/tmpfiles.conf
View File

@ -1 +0,0 @@
L+ /var/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/kickstart - - - - /usr/share/platform-kickstarts/rel-xxxPLATFORM_RELEASExxx