From 4e09b61d0d7c9ae8d04f25ef43e9e486aafdec13 Mon Sep 17 00:00:00 2001 From: Bruce Jones Date: Tue, 26 Sep 2023 22:28:49 +0000 Subject: [PATCH] Revert "Fix kickstarts patching" This reverts commit 0366f8552d5ac9784de9992b6ae98958c9a40381. Reason for revert: breaks sanity Change-Id: Ie580ae328a80abfc2a1964157ac1b14b70dc98e9 --- .../deb_folder/platform-kickstarts.install | 2 -- kickstart/debian/deb_folder/rules | 16 +++++----------- kickstart/debian/deb_folder/tmpfiles.conf | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 kickstart/debian/deb_folder/tmpfiles.conf diff --git a/kickstart/debian/deb_folder/platform-kickstarts.install b/kickstart/debian/deb_folder/platform-kickstarts.install index b26f83ef..2282e249 100644 --- a/kickstart/debian/deb_folder/platform-kickstarts.install +++ b/kickstart/debian/deb_folder/platform-kickstarts.install @@ -1,3 +1 @@ var/www/pages/feed/* -usr/share/platform-kickstarts/* -usr/lib/tmpfiles.d/platform-kickstarts.conf diff --git a/kickstart/debian/deb_folder/rules b/kickstart/debian/deb_folder/rules index d52313b4..c60e5905 100644 --- a/kickstart/debian/deb_folder/rules +++ b/kickstart/debian/deb_folder/rules @@ -10,21 +10,15 @@ export platform_release="$(shell grep SW_VERSION /usr/include/build_info.h | cut override_dh_auto_configure: 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 debian/tmpfiles.conf dh_auto_configure 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/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)/usr/share/platform-kickstarts/rel-${platform_release} - 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)/usr/share/platform-kickstarts/rel-${platform_release}/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)/usr/share/platform-kickstarts/rel-${platform_release}/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 + install -p -D -m 700 miniboot.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart + 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_smallsystem_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/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/prestaged_installer_ks.cfg $(ROOT)/var/www/pages/feed/rel-${platform_release}/kickstart/centos dh_install diff --git a/kickstart/debian/deb_folder/tmpfiles.conf b/kickstart/debian/deb_folder/tmpfiles.conf deleted file mode 100644 index 50db24cc..00000000 --- a/kickstart/debian/deb_folder/tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -L+ /var/www/pages/feed/rel-xxxPLATFORM_RELEASExxx/kickstart - - - - /usr/share/platform-kickstarts/rel-xxxPLATFORM_RELEASExxx