diff --git a/openEuler-custom-make.patch b/0001-openEuler-custom-make.patch similarity index 89% rename from openEuler-custom-make.patch rename to 0001-openEuler-custom-make.patch index 8f4bf420a3faf70e522da89aaa10d58bc98206cf..1b523a99a297b88847919441bf3e78d1f7cdb795 100644 --- a/openEuler-custom-make.patch +++ b/0001-openEuler-custom-make.patch @@ -1,20 +1,34 @@ +From 9a762dd40639616037a27e3f672665544b046d8a Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Mon, 15 Jul 2024 03:21:43 +0000 +Subject: [PATCH] openEuler custom make + +Signed-off-by: liweigang +--- + kiwi/archive/cpio.py | 60 ++++ + kiwi/boot/image/builtin_kiwi.py | 61 ++-- + kiwi/builder/kis.py | 38 ++- + kiwi/config/functions.sh | 498 +++++++++++++++++++++++++------- + kiwi/path.py | 2 +- + kiwi/runtime_config.py | 50 ++++ + kiwi/tasks/base.py | 1 - + 7 files changed, 567 insertions(+), 143 deletions(-) + diff --git a/kiwi/archive/cpio.py b/kiwi/archive/cpio.py -index 27d596c..042f1cd 100644 +index 27d596c..c269768 100644 --- a/kiwi/archive/cpio.py +++ b/kiwi/archive/cpio.py -@@ -17,7 +17,11 @@ +@@ -17,6 +17,9 @@ # # project from kiwi.command import Command +from kiwi.runtime_config import RuntimeConfig +import os +import logging - -+log = logging.getLogger('kiwi') - + + class ArchiveCpio: - """ -@@ -27,6 +31,7 @@ class ArchiveCpio: +@@ -27,6 +30,7 @@ class ArchiveCpio: """ def __init__(self, filename): self.filename = filename @@ -22,7 +36,7 @@ index 27d596c..042f1cd 100644 def create(self, source_dir, exclude=None): """ -@@ -35,6 +40,62 @@ class ArchiveCpio: +@@ -35,6 +39,62 @@ class ArchiveCpio: :param string source_dir: data source directory :param list exclude: list of excluded items """ @@ -86,7 +100,7 @@ index 27d596c..042f1cd 100644 find_command = ['cd', source_dir, '&&', 'find', '.'] cpio_command = [ diff --git a/kiwi/boot/image/builtin_kiwi.py b/kiwi/boot/image/builtin_kiwi.py -index 5b26798..30d30bc 100644 +index 0bd8e0e..00ff213 100644 --- a/kiwi/boot/image/builtin_kiwi.py +++ b/kiwi/boot/image/builtin_kiwi.py @@ -33,6 +33,7 @@ from kiwi.archive.cpio import ArchiveCpio @@ -98,41 +112,38 @@ index 5b26798..30d30bc 100644 log = logging.getLogger('kiwi') @@ -99,6 +100,7 @@ class BootImageKiwi(BootImageBase): - system.install_system( - manager - ) -+ self.runtime_config = RuntimeConfig() + system.install_system( + manager + ) ++ self.runtime_config = RuntimeConfig() - profile = Profile(self.boot_xml_state) - profile.add('kiwi_initrdname', boot_image_name) -@@ -121,16 +123,22 @@ class BootImageKiwi(BootImageBase): - self.setup.import_overlay_files( - follow_links=True - ) -+ -+ if self.runtime_config.get_custom_hw_systemflag(): -+ self.setup.setup_groups() -+ self.setup.setup_users() - self.setup.call_config_script() + profile = Profile(self.boot_xml_state) + profile.add('kiwi_initrdname', boot_image_name) +@@ -121,14 +123,19 @@ class BootImageKiwi(BootImageBase): + self.setup.import_overlay_files( + follow_links=True + ) ++ if self.runtime_config.get_custom_hw_systemflag(): ++ self.setup.setup_groups() ++ self.setup.setup_users() + self.setup.call_config_script() + +- system.pinch_system( +- manager=manager, force=True +- ) ++ if not self.runtime_config.get_custom_hw_systemflag(): ++ system.pinch_system( ++ manager=manager, force=True ++ ) -- system.pinch_system( -- manager=manager, force=True -- ) -+ if not self.runtime_config.get_custom_hw_systemflag(): -+ system.pinch_system( -+ manager=manager, force=True -+ ) - # make sure system instance is cleaned up before setting up - del system - self.setup.call_image_script() - self.setup.create_init_link_from_linuxrc() + if not self.runtime_config.get_custom_hw_systemflag(): + self.setup.create_init_link_from_linuxrc() - + def create_initrd( self, mbrid: Optional[SystemIdentifier] = None, -@@ -169,15 +177,16 @@ class BootImageKiwi(BootImageBase): +@@ -167,15 +174,15 @@ class BootImageKiwi(BootImageBase): data.sync_data( options=Defaults.get_sync_options() ) @@ -145,7 +156,6 @@ index 5b26798..30d30bc 100644 - Path.create(boot_directory) - image_identifier = boot_directory + '/mbrid' - mbrid.write(image_identifier) -+ + if not self.runtime_config.get_custom_hw_systemflag(): + Path.wipe(boot_directory) + if mbrid: @@ -158,7 +168,7 @@ index 5b26798..30d30bc 100644 cpio = ArchiveCpio( os.sep.join([self.target_dir, kiwi_initrd_basename]) -@@ -185,19 +194,33 @@ class BootImageKiwi(BootImageBase): +@@ -183,19 +190,33 @@ class BootImageKiwi(BootImageBase): # the following is a list of directories which were needed # during the process of creating an image but not when the # image is actually booting with this initrd @@ -177,11 +187,10 @@ index 5b26798..30d30bc 100644 + '/image', '/usr/lib/grub*' + ] # the following is a list of directories to exclude which -- # are not needed inside of the initrd + # are not needed inside of the initrd - exclude_from_archive += [ - '/usr/share/doc', '/usr/share/man', '/home', '/media', '/srv' - ] -+ # + if self.runtime_config.get_custom_hw_systemflag(): + exclude_from_archive += [ + '/media' @@ -201,14 +210,13 @@ index 5b26798..30d30bc 100644 '--> xz compressing archive' ) diff --git a/kiwi/builder/kis.py b/kiwi/builder/kis.py -index 55da66f..271f46b 100644 +index e02ae65..4179f15 100644 --- a/kiwi/builder/kis.py +++ b/kiwi/builder/kis.py -@@ -140,24 +140,27 @@ class KisBuilder: - self.boot_image_task.boot_root_directory +@@ -141,23 +141,27 @@ class KisBuilder: ) - -- # extract kernel from boot system + + # extract kernel from boot system - kernel = Kernel(self.boot_image_task.boot_root_directory) - kernel_data = kernel.get_kernel() - if kernel_data: @@ -249,7 +257,7 @@ index 55da66f..271f46b 100644 # extract hypervisor from boot(initrd) root system if self.xen_server: -@@ -198,6 +201,8 @@ class KisBuilder: +@@ -198,6 +202,8 @@ class KisBuilder: cmdline += ' {}'.format(self.custom_cmdline) with open(self.append_file, 'w') as append: append.write(cmdline) @@ -259,10 +267,10 @@ index 55da66f..271f46b 100644 # put results into a tarball if not self.xz_options: diff --git a/kiwi/config/functions.sh b/kiwi/config/functions.sh -index 98915af..0a7afb3 100644 +index f2c7c38..8125424 100644 --- a/kiwi/config/functions.sh +++ b/kiwi/config/functions.sh -@@ -173,10 +173,22 @@ function baseStripLocales { +@@ -204,10 +204,22 @@ function baseStripLocales { baseStripAndKeep "${keepLocales}" } @@ -288,7 +296,7 @@ index 98915af..0a7afb3 100644 } function baseStripUnusedLibs { -@@ -187,6 +199,8 @@ function baseStripUnusedLibs { +@@ -218,6 +230,8 @@ function baseStripUnusedLibs { local needlibs local found local dir @@ -297,7 +305,7 @@ index 98915af..0a7afb3 100644 local lib local lddref # /.../ -@@ -194,33 +208,33 @@ function baseStripUnusedLibs { +@@ -225,33 +239,33 @@ function baseStripUnusedLibs { # on files in *bin* # --- ldconfig @@ -344,7 +352,7 @@ index 98915af..0a7afb3 100644 count=$((count + 1)) fi done -@@ -228,47 +242,41 @@ function baseStripUnusedLibs { +@@ -259,47 +273,41 @@ function baseStripUnusedLibs { # /.../ # add exceptions # ---- @@ -406,7 +414,7 @@ index 98915af..0a7afb3 100644 fi done } -@@ -289,27 +297,160 @@ function baseUpdateSysConfig { +@@ -320,25 +328,156 @@ function baseUpdateSysConfig { fi } @@ -414,7 +422,6 @@ index 98915af..0a7afb3 100644 - declare kiwi_initrd_system=${kiwi_initrd_system} - declare kiwi_strip_tools=${kiwi_strip_tools} - declare kiwi_strip_libs=${kiwi_strip_libs} -+ +#find all need tool which าป +function baseStripAllTools { + local needtools=$1 @@ -506,7 +513,7 @@ index 98915af..0a7afb3 100644 + + #create busybox cmd link + baseSetupBusyBox -f -+ ++ #========================================== - # remove unneeded tools + # remove unused libs @@ -555,8 +562,8 @@ index 98915af..0a7afb3 100644 + # remove invalid link file + #------------------------------------------ + baseStripInvalidLink - } - ++} ++ +function strip_rpm { + #========================================== + # remove rpm cmd, until get src rpm list @@ -576,13 +583,10 @@ index 98915af..0a7afb3 100644 + rm -rf /var/lib/$p + done + fi -+} -+ -+ + } + function baseStripFirmware { - # /.../ - # check all kernel modules if they require a firmware and -@@ -412,7 +553,7 @@ function baseStripModules { +@@ -447,7 +586,7 @@ function baseStripModules { if [[ ${file} =~ ${mod} ]] && [[ ! ${file} =~ "updates" ]];then echo "baseStripModules: Update driver found for ${mod}" echo "baseStripModules: Removing old version: ${file}" @@ -591,7 +595,7 @@ index 98915af..0a7afb3 100644 fi done done -@@ -478,10 +619,6 @@ function baseStripKernel { +@@ -513,10 +652,6 @@ function baseStripKernel { if [ "${kiwi_initrd_system}" = "dracut" ]; then echo "dracut initrd system requested, kernel strip skipped" else @@ -602,12 +606,10 @@ index 98915af..0a7afb3 100644 baseCreateKernelTree baseStripKernelModules baseFixupKernelModuleDependencies -@@ -594,14 +731,40 @@ function suseInsertService { +@@ -629,15 +764,38 @@ function suseInsertService { baseInsertService "$@" } - -+ -+ + +#====================================== +# suseActivateAllServices ---- add +#-------------------------------------- @@ -639,18 +641,18 @@ index 98915af..0a7afb3 100644 # function kept for compatibility baseService "$@" } - + -function suseStripInitrd { - baseStripInitrd "$@" -} - +- function suseStripKernel { baseStripKernel -@@ -677,6 +840,46 @@ function Debug { + } +@@ -712,6 +870,45 @@ function Debug { fi } -+ +#====================================== +# baseSetupBusyBox +#-------------------------------------- @@ -693,7 +695,7 @@ index 98915af..0a7afb3 100644 function baseQuoteFile { # /.../ # Quote file to be shell sourceable -@@ -715,6 +918,14 @@ function baseSyncKernelTree { +@@ -750,6 +947,14 @@ function baseSyncKernelTree { rm -rf /lib/modules/* cp -a /kernel-tree/* /lib/modules/ rm -rf /kernel-tree @@ -708,7 +710,7 @@ index 98915af..0a7afb3 100644 } function baseFixupKernelModuleDependencies { -@@ -797,7 +1008,7 @@ function baseStripAndKeep { +@@ -832,7 +1037,7 @@ function baseStripAndKeep { fi done if [ "${found}" = 0 ]; then @@ -717,7 +719,7 @@ index 98915af..0a7afb3 100644 fi done } -@@ -816,6 +1027,11 @@ function baseStripTools { +@@ -851,6 +1056,11 @@ function baseStripTools { while IFS= read -r -d $'\0' file; do found=0 base=$(/usr/bin/basename "${file}") @@ -729,13 +731,13 @@ index 98915af..0a7afb3 100644 for need in ${tools};do if [ "${base}" = "$need" ];then found=1 -@@ -846,16 +1062,133 @@ function deprecated { - exit 1 - } - -+#====================================== +@@ -883,14 +1093,132 @@ function deprecated { + + + #====================================== +-# Deprecated methods +# baseStripcustomBep -+#-------------------------------------- + #-------------------------------------- +function baseStripcustomBep { + # /.../ + # remove custom difference files @@ -754,11 +756,10 @@ index 98915af..0a7afb3 100644 + rm -rf /usr/custom/usrfile/$hookdir + +} - - #====================================== --# Deprecated methods ++ ++#====================================== +# baseStripBep - #-------------------------------------- ++#-------------------------------------- +function baseStripBep { + # /.../ + # remove log,dnf, files @@ -850,7 +851,7 @@ index 98915af..0a7afb3 100644 + Debug "rpm $*" + rpm "$@" } - + +#====================================== +# baseGetPackagesForDeletion +#-------------------------------------- @@ -866,11 +867,11 @@ index 98915af..0a7afb3 100644 + function baseMount { deprecated "${FUNCNAME[0]}" <<- EOF - Mounting of kernel and other base filesystems are a -@@ -877,18 +1210,6 @@ function baseSetupUserPermissions { - EOF + Mounting of kernel and other base filesystems are a +@@ -912,18 +1240,6 @@ function baseSetupUserPermissions { + EOF } - + -function suseConfig { - deprecated "${FUNCNAME[0]}" <<- EOF - suse script no longer present @@ -885,11 +886,11 @@ index 98915af..0a7afb3 100644 - function baseGetProfilesUsed { deprecated "${FUNCNAME[0]}" <<- EOF - Provided by the kiwi_profiles environment variable -@@ -902,13 +1223,6 @@ function baseStripMans { - EOF + Provided by the kiwi_profiles environment variable +@@ -937,14 +1253,6 @@ function baseStripMans { + EOF } - + -function baseStripDocs { - deprecated "${FUNCNAME[0]}" <<- EOF - Documentation lives at different places and a method @@ -897,13 +898,14 @@ index 98915af..0a7afb3 100644 - of kiwi - EOF -} - +- function baseStripInfos { deprecated "${FUNCNAME[0]}" <<- EOF -@@ -917,18 +1231,6 @@ function baseStripInfos { - EOF + Info files are marked as documentation by the package manager +@@ -952,19 +1260,6 @@ function baseStripInfos { + EOF } - + -function Rpm { - deprecated "${FUNCNAME[0]}" <<- EOF - Please call rpm as it fits in the caller scope @@ -916,27 +918,29 @@ index 98915af..0a7afb3 100644 - This concept was never exposed to RHEL/Fedora - EOF -} - +- function debianStripInitrd { deprecated "${FUNCNAME[0]}" <<- EOF -@@ -937,12 +1239,6 @@ function debianStripInitrd { - EOF + Useful only in the context of a kiwi created initrd +@@ -972,13 +1267,6 @@ function debianStripInitrd { + EOF } - + -function rhelStripKernel { - deprecated "${FUNCNAME[0]}" <<- EOF - Useful only in the context of a kiwi created initrd - This concept was never exposed to RHEL/Fedora - EOF -} - +- function debianStripKernel { deprecated "${FUNCNAME[0]}" <<- EOF + Useful only in the context of a kiwi created initrd diff --git a/kiwi/path.py b/kiwi/path.py -index b763211..b2ce909 100644 +index 787426c..96a1be6 100644 --- a/kiwi/path.py +++ b/kiwi/path.py -@@ -150,7 +150,7 @@ class Path: +@@ -163,7 +163,7 @@ class Path: ) path_elements = path.split(os.sep) protected_elements = [ @@ -946,10 +950,10 @@ index b763211..b2ce909 100644 for path_index in reversed(range(0, len(path_elements))): sub_path = os.sep.join(path_elements[0:path_index]) diff --git a/kiwi/runtime_config.py b/kiwi/runtime_config.py -index 11863c3..5fb93dc 100644 +index 4ed7ab9..bdc4ce0 100644 --- a/kiwi/runtime_config.py +++ b/kiwi/runtime_config.py -@@ -345,6 +345,56 @@ class RuntimeConfig: +@@ -384,6 +384,56 @@ class RuntimeConfig: ) return disabled_checks or '' @@ -1007,10 +1011,10 @@ index 11863c3..5fb93dc 100644 if RUNTIME_CONFIG: try: diff --git a/kiwi/tasks/base.py b/kiwi/tasks/base.py -index 68b7bd5..d714770 100644 +index 4228bfa..2f1f2d2 100644 --- a/kiwi/tasks/base.py +++ b/kiwi/tasks/base.py -@@ -75,7 +75,6 @@ class CliTask: +@@ -74,7 +74,6 @@ class CliTask: 'check_efi_mode_for_disk_overlay_correctly_setup': [], 'check_initrd_selection_required': [], 'check_boot_description_exists': [], @@ -1019,4 +1023,5 @@ index 68b7bd5..d714770 100644 'check_volume_setup_defines_reserved_labels': [], 'check_volume_setup_defines_multiple_fullsize_volumes': [], -- -2.33.0 +2.45.1 + diff --git a/0001-openEuler-use-rsync-link.patch b/0001-openEuler-use-rsync-link.patch new file mode 100644 index 0000000000000000000000000000000000000000..48cc39f3ff6f858962963e8ad46dcea050799102 --- /dev/null +++ b/0001-openEuler-use-rsync-link.patch @@ -0,0 +1,35 @@ +From 029b940800269fdd5b376fdd09796e263334ba07 Mon Sep 17 00:00:00 2001 +From: liweigang +Date: Mon, 15 Jul 2024 01:56:10 +0000 +Subject: [PATCH] openEuler use rsync link + +Signed-off-by: liweigang +--- + kiwi/boot/image/builtin_kiwi.py | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/kiwi/boot/image/builtin_kiwi.py b/kiwi/boot/image/builtin_kiwi.py +index bf8cfbf..0bd8e0e 100644 +--- a/kiwi/boot/image/builtin_kiwi.py ++++ b/kiwi/boot/image/builtin_kiwi.py +@@ -113,9 +113,14 @@ class BootImageKiwi(BootImageBase): + Defaults.get_profile_file(self.boot_root_directory) + ) + self.setup.import_description() +- self.setup.import_overlay_files( +- follow_links=True +- ) ++ if self.runtime_config.get_custom_hw_systemflag(): ++ self.setup.import_overlay_files( ++ follow_links=False ++ ) ++ else: ++ self.setup.import_overlay_files( ++ follow_links=True ++ ) + self.setup.call_config_script() + + system.pinch_system( +-- +2.45.1 + diff --git a/huawei-sync-support-for-building-with-clang.patch b/huawei-sync-support-for-building-with-clang.patch deleted file mode 100644 index 3e99645c1e8f888d424e3013f90f8de499a05fa6..0000000000000000000000000000000000000000 --- a/huawei-sync-support-for-building-with-clang.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 53ad53556e476961e76c99d14b492250704acccc Mon Sep 17 00:00:00 2001 -From: zhoujing -Date: Tue, 7 Nov 2023 20:32:54 +0800 -Subject: [PATCH] [sync] Support for building with clang - -cherry-pick from https://gitee.com/openeuler-risc-v/kiwi/commit/b896168af10084bd227918eb1e68cfe34581a635 ---- - tools/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index f2ea5d7..126aaa3 100755 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -3,7 +3,7 @@ buildroot = / - SRCS := $(wildcard *.c) - PRGS := $(patsubst %.c,%,$(SRCS)) - --CC = gcc -+CC ?= gcc - - all: $(PRGS) - --- -2.42.0 - diff --git a/kiwi-10.0.25.tar.gz b/kiwi-10.0.25.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d78441a05f63a1c2824f2ea16ea7128fc2020173 Binary files /dev/null and b/kiwi-10.0.25.tar.gz differ diff --git a/kiwi-9.25.1.tar.gz b/kiwi-9.25.1.tar.gz deleted file mode 100644 index 67323c601003295961f2184d79859a8b11ea2e87..0000000000000000000000000000000000000000 Binary files a/kiwi-9.25.1.tar.gz and /dev/null differ diff --git a/kiwi.spec b/kiwi.spec index 8377f2fb408d22d34623d3e6a8c02789662a6ed5..5d0c1e6c4837db310ded9effcf316b84b2b514c7 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -1,23 +1,28 @@ %{?python_enable_dependency_generator} +%global debug_package %{nil} Name: kiwi -Version: 9.25.1 -Release: 3 +Version: 10.0.25 +Release: 1 License: GPLv3+ Summary: Flexible operating system image builder URL: http://osinside.github.io/kiwi/ Source0: https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz -Patch0: openEuler-use-rsync-link.patch -Patch1: openEuler-custom-make.patch -Patch2: huawei-sync-support-for-building-with-clang.patch +Patch0: 0001-openEuler-use-rsync-link.patch +Patch1: 0001-openEuler-custom-make.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils BuildRequires: python3-docopt python3-future python3-lxml python3-pyxattr BuildRequires: python3-six python3-pyyaml python3-requests +BuildRequires: python3-pip +BuildRequires: python3-wheel +BuildRequires: python3-sphinx +BuildRequires: python3-simplejson +BuildRequires: python3-poetry-core %description KIWI is an imaging solution that is based on an image XML description. @@ -131,11 +136,11 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py %build %set_build_flags -%py3_build -make CFLAGS="%{build_cflags}" tools +%pyproject_build +make -C doc man %install -%py3_install +%pyproject_install make buildroot=%{buildroot}/ install make buildroot=%{buildroot}/ install_dracut @@ -144,11 +149,9 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d rm -rf %{buildroot}%{_docdir}/packages mv %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi-ng-3 -mv %{buildroot}%{_bindir}/kiwicompat %{buildroot}%{_bindir}/kiwicompat-3 ln -sr %{buildroot}%{_bindir}/kiwi-ng %{buildroot}%{_bindir}/kiwi ln -sr %{buildroot}%{_bindir}/kiwi-ng-3 %{buildroot}%{_bindir}/kiwi-ng -ln -sr %{buildroot}%{_bindir}/kiwicompat-3 %{buildroot}%{_bindir}/kiwicompat %ifarch %{ix86} x86_64 for i in KIWI pxelinux.cfg image upload boot; do \ @@ -164,6 +167,8 @@ done %license LICENSE %{_bindir}/%{name}* %{python3_sitelib}/%{name}*/ +%dir %{_datadir}/kiwi +%{_datadir}/kiwi/xsl_to_v74 %exclude %{_bindir}/kiwi-parse-verity %files tools @@ -195,6 +200,9 @@ done %{_mandir}/man8/%{name}* %changelog +* Mon Jul 15 2024 liweigang - 10.0.25-1 +- update to version 10.0.25 + * Fri Mar 29 2024 chenhuihan - 9.25.1-3 - back version to 9.25.1 diff --git a/openEuler-use-rsync-link.patch b/openEuler-use-rsync-link.patch deleted file mode 100644 index 2fe86276dcd2af7ac2dd081587f7bc7e0cfd0a02..0000000000000000000000000000000000000000 --- a/openEuler-use-rsync-link.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/kiwi/boot/image/builtin_kiwi.py b/kiwi/boot/image/builtin_kiwi.py -index 6167ad5..5811a96 100644 ---- a/kiwi/boot/image/builtin_kiwi.py -+++ b/kiwi/boot/image/builtin_kiwi.py -@@ -113,9 +113,14 @@ class BootImageKiwi(BootImageBase): - Defaults.get_profile_file(self.boot_root_directory) - ) - self.setup.import_description() -- self.setup.import_overlay_files( -- follow_links=True -- ) -+ if self.runtime_config.get_custom_hw_systemflag(): -+ self.setup.import_overlay_files( -+ follow_links=False -+ ) -+ else: -+ self.setup.import_overlay_files( -+ follow_links=True -+ ) - self.setup.call_config_script() - - system.pinch_system( --- -2.39.1 \ No newline at end of file