From c6ad948e5e9705901a357731b70e3ca122fdebb3 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 16 Dec 2020 03:58:55 +0800 Subject: [PATCH 1/2] [patch tracking] 20201216035849778567 - https://github.com/OSInside/kiwi/commit/c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb --- ...c7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch diff --git a/c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch b/c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch new file mode 100644 index 0000000..97da611 --- /dev/null +++ b/c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch @@ -0,0 +1,60 @@ +diff --git a/doc/source/concept_and_workflow/shell_scripts.rst b/doc/source/concept_and_workflow/shell_scripts.rst +index 7906f55e87..f92f72a656 100644 +--- a/doc/source/concept_and_workflow/shell_scripts.rst ++++ b/doc/source/concept_and_workflow/shell_scripts.rst +@@ -208,10 +208,11 @@ suseSetupProductInformation + baseVagrantSetup + Configures the image to work as a vagrant box by performing the following + changes: +- - add the ``vagrant`` user to :file:`/etc/sudoers` or +- :file:`/etc/sudoers.d/vagrant` +- - insert the insecure vagrant ssh key, apply recommended ssh settings and +- start the ssh daemon ++ ++ - add the ``vagrant`` user to :file:`/etc/sudoers` ++ or :file:`/etc/sudoers.d/vagrant` ++ - insert the insecure vagrant ssh key, apply recommended ++ ssh settings and start the ssh daemon + - create the default shared folder :file:`/vagrant` + + Debug {message} +diff --git a/doc/source/conf.py b/doc/source/conf.py +index 7c6dc0db32..65abf426f6 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -61,7 +61,7 @@ def setup(app): + app.add_config_value('prolog_replacements', {}, True) + app.connect('source-read', prologReplace) + app.connect("autodoc-process-docstring", remove_module_docstring) +- app.add_stylesheet('css/custom.css') ++ app.add_css_file('css/custom.css') + + + prolog_replacements = { +diff --git a/doc/source/working_with_images/disk_setup_for_vagrant.rst b/doc/source/working_with_images/disk_setup_for_vagrant.rst +index 9f9afea655..eef985cfe0 100644 +--- a/doc/source/working_with_images/disk_setup_for_vagrant.rst ++++ b/doc/source/working_with_images/disk_setup_for_vagrant.rst +@@ -134,14 +134,14 @@ steps are required: + 6. Additional customizations: + + Additionally to ``baseVagrantSetup``, you might want to also ensure the +- following: +- +- - If you have installed the Virtualbox guest additions into your box, +- then also load the ``vboxsf`` kernel module. +- - When building boxes for libvirt, then ensure that the default wired +- networking interface is called ``eth0`` and uses DHCP. This is +- necessary since libvirt uses ``dnsmasq`` to issue IPs to the VMs. This +- step can be omitted for Virtualbox boxes. ++ following: ++ ++ - If you have installed the Virtualbox guest additions into your box, ++ then also load the ``vboxsf`` kernel module. ++ - When building boxes for libvirt, then ensure that the default wired ++ networking interface is called ``eth0`` and uses DHCP. This is ++ necessary since libvirt uses ``dnsmasq`` to issue IPs to the VMs. This ++ step can be omitted for Virtualbox boxes. + + An image built with the above setup creates a Vagrant box file with the + extension :file:`.vagrant.libvirt.box` or -- Gitee From 1ded8c609f24a343f70b3a70b05fa6b5552de050 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Wed, 16 Dec 2020 03:58:56 +0800 Subject: [PATCH 2/2] [patch tracking] 20201216035849778567 - update spec file --- kiwi.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kiwi.spec b/kiwi.spec index a5ce47a..60dcd59 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -2,7 +2,7 @@ Name: kiwi Version: 9.21.5 -Release: 2 +Release: 3 License: GPLv3+ Summary: Flexible operating system image builder @@ -15,6 +15,7 @@ Patch2: Include-box-plugin-images-to-build_status.patch Patch3: Added-s390-SLE15-integration-tests.patch Patch4: Cosmetic-update-for-build-status-helper.patch Patch5: Added-universal-box-to-build-status-helper.patch +Patch6000: c4cbc7c4e38fa8ca9c3f580c2f3661dd3097edeb.patch BuildRequires: bash-completion dracut fdupes gcc make BuildRequires: python3-devel python3-setuptools shadow-utils @@ -196,6 +197,9 @@ done %{_mandir}/man8/%{name}* %changelog +* 20201216035849778567 patch-tracking 9.21.5-3 +- append patch file of upstream repository from to + * Thu Nov 26 2020 wuchaochao - 9.21.5-2 - Type:bugfix - ID:NA @@ -221,4 +225,4 @@ done - Remove python2 dependency * Sat Sep 21 2019 openEuler Buildteam - 9.16.12-2 -- Package init +- Package init \ No newline at end of file -- Gitee