Accepting request 643192 from Virtualization:Appliances:Builder
- Bump version: 9.16.26 → 9.16.27 - Use %{ix86} rather than %ix86 in spec template Clear macro annotation prevents clarity issues - Fixed spec file for gfxboot requires Require gfxboot but only for the x86 architecture - Bump version: 9.16.25 → 9.16.26 - Move the default rpm database path into Defaults class - Handle default uri mime type in Defaults class - Add a hardcoded rpm database path to import trusted keys OBS-URL: https://build.opensuse.org/request/show/643192 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kiwi?expand=0&rev=33
This commit is contained in:
commit
553e434c35
@ -1,3 +1,358 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 19 14:26:39 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.26 → 9.16.27
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 19 08:51:47 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Use %{ix86} rather than %ix86 in spec template
|
||||||
|
|
||||||
|
Clear macro annotation prevents clarity issues
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 17:55:53 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed spec file for gfxboot requires
|
||||||
|
|
||||||
|
Require gfxboot but only for the x86 architecture
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 16:33:26 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.25 → 9.16.26
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 16:30:15 CEST 2018 - dcassany@suse.de
|
||||||
|
|
||||||
|
- Move the default rpm database path into Defaults class
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 16:08:29 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Handle default uri mime type in Defaults class
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 15:27:07 CEST 2018 - dcassany@suse.de
|
||||||
|
|
||||||
|
- Add a hardcoded rpm database path to import trusted keys
|
||||||
|
|
||||||
|
This commits adds a hardcoded rpm database location to make
|
||||||
|
sure the imported keys are in the expected location for zypper.
|
||||||
|
|
||||||
|
Fixes #855
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 13:57:11 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Allow simple path source in Uri class
|
||||||
|
|
||||||
|
This patch is needed as follow up fix for the setup of the
|
||||||
|
package cache in local repositories. The is_remote method
|
||||||
|
from the Uri class is used to identify if a repostory source
|
||||||
|
is remote or local. At that point the initial repository
|
||||||
|
source was already translated into its components. In case
|
||||||
|
of a local repository the Uri instance now receives a simple
|
||||||
|
path and the is_remote method raised with a style error.
|
||||||
|
This patch allows the Uri class to be more friendly and
|
||||||
|
initializes a local path as file:/ typed source.
|
||||||
|
Related to Issue #847
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 10:35:50 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.24 → 9.16.25
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 18 10:18:53 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Add timestamp to logfile entries
|
||||||
|
|
||||||
|
On the console output we use a log format with timestamps
|
||||||
|
This is useful for the logfile contents too
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 17 16:15:22 CEST 2018 - seife@tuxbox-git.slipkontur.de
|
||||||
|
|
||||||
|
- sort package list which accompanies the image
|
||||||
|
|
||||||
|
This makes it much easier to diff the lists of two images to find out
|
||||||
|
the differences in package versions.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 17 14:34:24 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Don't cache packages from local repos for zypper
|
||||||
|
|
||||||
|
Access to packages from local repositories is as fast as reading
|
||||||
|
them from a cache location. The additional package copy and cache
|
||||||
|
update is superfluous and should be avoided. This Fixes #847
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 16:56:45 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.23 → 9.16.24
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 11:58:23 CEST 2018 - dcassany@suse.de
|
||||||
|
|
||||||
|
- Update /etc/machine-id management docs
|
||||||
|
|
||||||
|
Updates the information about how /etc/machine-id is treated in KIWI
|
||||||
|
and provides some hints for old systems where /var/lib/dbus/machine-id
|
||||||
|
is not a symlink to /etc/machine-id
|
||||||
|
|
||||||
|
Related to #843
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 10:32:15 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Unpack root.tar.gz file for LVM integration test
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 10:28:44 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Added LVM integration test build
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 15 09:53:10 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.22 → 9.16.23
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 15 09:33:25 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Added machine id setup in dracut preparation
|
||||||
|
|
||||||
|
In case of a dracut booted image we empty out the systemd
|
||||||
|
machine-id configuration file to trigger the rebuild of that
|
||||||
|
information by the dracut boot code at boot time. This allows
|
||||||
|
for unique systemd identifiers if the same image gets deployed
|
||||||
|
on different machines. This also makes the script implementations
|
||||||
|
people put in in config.sh or images.sh to solve this problem
|
||||||
|
obsolete. This Fixes #843
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 12 21:42:28 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fix use of uri type in debootstrap call
|
||||||
|
|
||||||
|
Referencing a file in a debootstrap call is done using
|
||||||
|
the file:/ source type. However when using file:// debootstrap
|
||||||
|
does something different and failed to find the file. The
|
||||||
|
additional / had a bad impact to the call.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 17:37:37 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.21 → 9.16.22
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 17:35:54 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Delete obsolete rhel/fedora doc move
|
||||||
|
|
||||||
|
With the fix to use the rpm macro consistently it
|
||||||
|
is no longer required to move around the docs
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 17:13:34 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.20 → 9.16.21
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 16:02:01 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed package specs for dracut modules on fedora
|
||||||
|
|
||||||
|
dracut-network is a separate package on Fedora/RHEL too
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 15:48:34 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Add alternative search path for syslinux binaries
|
||||||
|
|
||||||
|
On debian/ubuntu systems /usr/lib/ISOLINUX is a valid
|
||||||
|
search path for syslinux binaries like isolinux.bin.
|
||||||
|
This Fixes #839
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 15:29:20 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed package doc install target
|
||||||
|
|
||||||
|
The spec file uses the %{_defaultdocdir} macro but the
|
||||||
|
corresponding Makefile target used a hardcoded path which
|
||||||
|
lead to inconsistencies on debian/ubuntu based systems.
|
||||||
|
This Fixes #838
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 11 15:04:48 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed package specs for dracut modules on debian
|
||||||
|
|
||||||
|
btrfs tools are provided by btrfs-tools package and not by
|
||||||
|
btrfs-progs. In addition dracut-network is a separate package
|
||||||
|
on debian/ubuntu based distributions. This Fixes #837
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 9 12:28:46 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Don't require gfxboot on rhel/fedora
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 9 10:44:03 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixup zypper calls in documentation
|
||||||
|
|
||||||
|
The way the documentation describes the zypper call to add
|
||||||
|
a repository was wrong in several places.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 9 10:32:26 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Added gfxboot to required packages in spec
|
||||||
|
|
||||||
|
kiwi calls gfxboot as tool when building live iso images.
|
||||||
|
Thus this tool provided by the gfxboot package should be
|
||||||
|
a requirement for kiwi
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 9 09:17:25 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.19 → 9.16.20
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 8 15:47:53 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- rebuild auto generated code with stable generateDS
|
||||||
|
|
||||||
|
For some reason the xml_parse code generated by generateDS v2.29.24
|
||||||
|
caused warnings on simple type XSD patterns. Therefore I rebuild
|
||||||
|
the code with the stable build version v2.29.14 which fixed that
|
||||||
|
issue
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 8 09:56:14 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixup README travis and codacy status badges
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 8 09:13:56 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Adding bugfix trace for bsc#1110869
|
||||||
|
|
||||||
|
bsc#1108508 ticket was fixed with request #831
|
||||||
|
from SUSE/fix_uri_handler
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Oct 7 20:49:44 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Include livenet module with dmsquash-live support
|
||||||
|
|
||||||
|
The upstream dracut dmsquash-live module supports network
|
||||||
|
mode with the livenet module. But that module must be
|
||||||
|
explicitly included and is not fetched automatically.
|
||||||
|
This Fixes #827
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 5 17:12:14 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Bump version: 9.16.18 → 9.16.19
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 5 16:37:14 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Rename private method to be more expressive
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 5 11:39:41 CEST 2018 - dcassany@suse.de
|
||||||
|
|
||||||
|
- Add Codec utils for bytes literals decoding
|
||||||
|
|
||||||
|
In case of a literal decoding failure it tries to decode
|
||||||
|
the result in utf-8. This is handy in python2 environments where
|
||||||
|
python and the host might be using different charset configurations.
|
||||||
|
In python3 this issue seams to be solved.
|
||||||
|
|
||||||
|
Fixes #829 and bsc#1110871
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 5 11:27:49 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed URI handling with token query option
|
||||||
|
|
||||||
|
So far only the query format ?credentials=... was supported.
|
||||||
|
In case of ?random_token_data the returned uri was truncated
|
||||||
|
and also the format check on the query caused a python trace.
|
||||||
|
This Fixes #830 and Fixes #828
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 5 11:08:02 CEST 2018 - dcassany@suse.de
|
||||||
|
|
||||||
|
- Make use of the quiet flag of mountpoint command
|
||||||
|
|
||||||
|
This commit sets the use of -q flag of mountpoint. Kiwi only
|
||||||
|
checks the return code, thus any stdout is useless in this case.
|
||||||
|
|
||||||
|
Fixes #829
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 2 05:51:40 CEST 2018 - fergal.mc.carthy@suse.com
|
||||||
|
|
||||||
|
- Eliminate redundant code
|
||||||
|
|
||||||
|
Create a helper method, _create_volume_no_zero, which calls the
|
||||||
|
lvreate command with appropriate options and calls the vgscan
|
||||||
|
command immeditately afterwards to create any missing /dev nodes.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 29 21:37:46 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Fixed broken link to ec2uploadimg tool
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 29 21:14:38 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
- Update contact information
|
||||||
|
|
||||||
|
We moved from IRC to Matrix as chat platform. Thus the
|
||||||
|
documentation needs to be updated accordingly
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 27 15:27:36 CEST 2018 - fergal.mc.carthy@suse.com
|
||||||
|
|
||||||
|
- Fixes LVM based image creation in OBS
|
||||||
|
|
||||||
|
While attempting to create LVM based images under the Open Build
|
||||||
|
Service I recently ran into some issues related to the fact that
|
||||||
|
there is no udev running in the chroot environment used to build
|
||||||
|
kiwi based images.
|
||||||
|
|
||||||
|
Two workarounds have been implemented in this patch:
|
||||||
|
|
||||||
|
(1) When calling lvcreate, include the `-Zn` option to disable
|
||||||
|
the automatic zeroing of the header of the newly created
|
||||||
|
LV device; doing so requires that the LV device's /dev
|
||||||
|
entry exists immediately after it has been created, but
|
||||||
|
in a chroot'd environment udev isn't going to be running
|
||||||
|
to automatically populate /dev/<vg_name>/<lv_name> or
|
||||||
|
/dev/mapper/<vg_name>-<lv_name>.
|
||||||
|
This should be safe to do since the LV is being created
|
||||||
|
within a loopback device based partition, which is backed
|
||||||
|
by a zero filled file, created by qemu-img.
|
||||||
|
|
||||||
|
(2) After creating an LV we need to run `vgscan --mknodes`
|
||||||
|
to create the required device nodes under /dev, which
|
||||||
|
won't be automatically created since udev isn't running
|
||||||
|
in the chroot'd environment.
|
||||||
|
|
||||||
|
Unit tests updated to account for additional `-Zn` arguments that
|
||||||
|
are being passed to `lvcreate` and for additional call that is
|
||||||
|
being made to `vgscan --mknodes`.
|
||||||
|
|
||||||
|
This fixes #824.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 26 17:00:15 CEST 2018 - ms@suse.de
|
Wed Sep 26 17:00:15 CEST 2018 - ms@suse.de
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: python-kiwi
|
Name: python-kiwi
|
||||||
Version: 9.16.18
|
Version: 9.16.27
|
||||||
Provides: kiwi-schema = 6.6
|
Provides: kiwi-schema = 6.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Url: https://github.com/SUSE/kiwi
|
Url: https://github.com/SUSE/kiwi
|
||||||
@ -103,6 +103,9 @@ Requires(postun): update-alternatives
|
|||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
Requires: grub2-x86_64-efi
|
Requires: grub2-x86_64-efi
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
Requires: gfxboot
|
||||||
|
%endif
|
||||||
Requires: qemu-tools
|
Requires: qemu-tools
|
||||||
Requires: squashfs
|
Requires: squashfs
|
||||||
Requires: gptfdisk
|
Requires: gptfdisk
|
||||||
@ -130,6 +133,9 @@ Requires: debootstrap
|
|||||||
Requires: qemu-utils
|
Requires: qemu-utils
|
||||||
Requires: squashfs-tools
|
Requires: squashfs-tools
|
||||||
Requires: gdisk
|
Requires: gdisk
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
Requires: gfxboot
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
Requires: dosfstools
|
Requires: dosfstools
|
||||||
Requires: e2fsprogs
|
Requires: e2fsprogs
|
||||||
@ -180,6 +186,9 @@ Requires(postun): update-alternatives
|
|||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
Requires: grub2-x86_64-efi
|
Requires: grub2-x86_64-efi
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch %{ix86} x86_64
|
||||||
|
Requires: gfxboot
|
||||||
|
%endif
|
||||||
Requires: qemu-tools
|
Requires: qemu-tools
|
||||||
Requires: squashfs
|
Requires: squashfs
|
||||||
Requires: gptfdisk
|
Requires: gptfdisk
|
||||||
@ -242,7 +251,7 @@ first boot of an appliance. The tools are not meant to be used
|
|||||||
outside of the scope of kiwi appliance building.
|
outside of the scope of kiwi appliance building.
|
||||||
|
|
||||||
%if %{_vendor} != "debbuild"
|
%if %{_vendor} != "debbuild"
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%package -n kiwi-pxeboot
|
%package -n kiwi-pxeboot
|
||||||
Summary: KIWI - PXE boot structure
|
Summary: KIWI - PXE boot structure
|
||||||
Requires: syslinux
|
Requires: syslinux
|
||||||
@ -270,9 +279,10 @@ BuildRequires: dracut
|
|||||||
%endif
|
%endif
|
||||||
Requires: bc
|
Requires: bc
|
||||||
Requires: cryptsetup
|
Requires: cryptsetup
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Requires: btrfs-progs
|
Requires: btrfs-progs
|
||||||
Requires: gdisk
|
Requires: gdisk
|
||||||
|
Requires: dracut-network
|
||||||
%else
|
%else
|
||||||
Requires: btrfsprogs
|
Requires: btrfsprogs
|
||||||
Requires: gptfdisk
|
Requires: gptfdisk
|
||||||
@ -291,6 +301,9 @@ Requires: curl
|
|||||||
%if 0%{?debian} || 0%{?ubuntu}
|
%if 0%{?debian} || 0%{?ubuntu}
|
||||||
Requires: xz-utils
|
Requires: xz-utils
|
||||||
Requires: dmsetup
|
Requires: dmsetup
|
||||||
|
Requires: btrfs-tools
|
||||||
|
Requires: gdisk
|
||||||
|
Requires: dracut-network
|
||||||
%else
|
%else
|
||||||
Requires: xz
|
Requires: xz
|
||||||
Requires: device-mapper
|
Requires: device-mapper
|
||||||
@ -364,7 +377,13 @@ Requires: e2fsprogs
|
|||||||
Requires: util-linux
|
Requires: util-linux
|
||||||
%if 0%{?debian} || 0%{?ubuntu}
|
%if 0%{?debian} || 0%{?ubuntu}
|
||||||
Requires: dmsetup
|
Requires: dmsetup
|
||||||
%else
|
Requires: dracut-network
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
Requires: device-mapper
|
||||||
|
Requires: dracut-network
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
Requires: device-mapper
|
Requires: device-mapper
|
||||||
%endif
|
%endif
|
||||||
Requires: dracut
|
Requires: dracut
|
||||||
@ -431,7 +450,7 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--ins
|
|||||||
make buildroot=%{buildroot}/ install_dracut
|
make buildroot=%{buildroot}/ install_dracut
|
||||||
|
|
||||||
# Install documentation in PDF format
|
# Install documentation in PDF format
|
||||||
make buildroot=%{buildroot}/ install_pdf_docs
|
make buildroot=%{buildroot}/ docdir=%{_defaultdocdir}/ install_package_docs
|
||||||
|
|
||||||
%if %{_vendor} != "debbuild"
|
%if %{_vendor} != "debbuild"
|
||||||
# init alternatives setup
|
# init alternatives setup
|
||||||
@ -453,19 +472,13 @@ ln -s %{_sysconfdir}/alternatives/kiwicompat \
|
|||||||
%{buildroot}%_bindir/kiwicompat
|
%{buildroot}%_bindir/kiwicompat
|
||||||
|
|
||||||
# kiwi pxeboot directory structure to be packed in kiwi-pxeboot
|
# kiwi pxeboot directory structure to be packed in kiwi-pxeboot
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %{ix86} x86_64
|
||||||
for i in KIWI pxelinux.cfg image upload boot; do \
|
for i in KIWI pxelinux.cfg image upload boot; do \
|
||||||
mkdir -p %{buildroot}/srv/tftpboot/$i ;\
|
mkdir -p %{buildroot}/srv/tftpboot/$i ;\
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
install -m 755 -d %{buildroot}/%{_defaultdocdir}/python-kiwi
|
|
||||||
mv %{buildroot}/%{_defaultdocdir}/packages/python-kiwi/* %{buildroot}/%{_defaultdocdir}/python-kiwi
|
|
||||||
rm -rf %{buildroot}/%{_defaultdocdir}/packages
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?suse_version}
|
%if 0%{?fedora} || 0%{?suse_version}
|
||||||
%fdupes %{buildroot}/srv/tftpboot
|
%fdupes %{buildroot}/srv/tftpboot
|
||||||
%endif
|
%endif
|
||||||
@ -507,7 +520,7 @@ rm -rf %{buildroot}/%{_defaultdocdir}/packages
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{_vendor} != "debbuild"
|
%if %{_vendor} != "debbuild"
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%pre -n kiwi-pxeboot
|
%pre -n kiwi-pxeboot
|
||||||
#============================================================
|
#============================================================
|
||||||
# create user and group tftp if they does not exist
|
# create user and group tftp if they does not exist
|
||||||
@ -585,7 +598,7 @@ fi
|
|||||||
%{_usr}/lib/dracut/modules.d/90kiwi-overlay
|
%{_usr}/lib/dracut/modules.d/90kiwi-overlay
|
||||||
|
|
||||||
%if %{_vendor} != "debbuild"
|
%if %{_vendor} != "debbuild"
|
||||||
%ifarch %ix86 x86_64
|
%ifarch %{ix86} x86_64
|
||||||
%files -n kiwi-pxeboot
|
%files -n kiwi-pxeboot
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%dir %attr(0755,tftp,tftp) /srv/tftpboot
|
%dir %attr(0755,tftp,tftp) /srv/tftpboot
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:cb29481480dc3c503a7b94e064852cc6e2adff182cc1ff802b19e0f3bc2e7935
|
oid sha256:ced4b9442a0e521c50a4825d471247e927e175d5ee6734ab7c813caa02bc25d6
|
||||||
size 1256228
|
size 1259853
|
||||||
|
Loading…
Reference in New Issue
Block a user