forked from pool/python-kiwi
- 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/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=123
This commit is contained in:
parent
4cff00908d
commit
cf8ef19c4e
@ -1,3 +1,222 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
%endif
|
||||
|
||||
Name: python-kiwi
|
||||
Version: 9.16.20
|
||||
Version: 9.16.27
|
||||
Provides: kiwi-schema = 6.6
|
||||
Release: 0
|
||||
Url: https://github.com/SUSE/kiwi
|
||||
@ -103,6 +103,9 @@ Requires(postun): update-alternatives
|
||||
%ifarch x86_64
|
||||
Requires: grub2-x86_64-efi
|
||||
%endif
|
||||
%ifarch %{ix86} x86_64
|
||||
Requires: gfxboot
|
||||
%endif
|
||||
Requires: qemu-tools
|
||||
Requires: squashfs
|
||||
Requires: gptfdisk
|
||||
@ -130,6 +133,9 @@ Requires: debootstrap
|
||||
Requires: qemu-utils
|
||||
Requires: squashfs-tools
|
||||
Requires: gdisk
|
||||
%ifarch %{ix86} x86_64
|
||||
Requires: gfxboot
|
||||
%endif
|
||||
%endif
|
||||
Requires: dosfstools
|
||||
Requires: e2fsprogs
|
||||
@ -180,6 +186,9 @@ Requires(postun): update-alternatives
|
||||
%ifarch x86_64
|
||||
Requires: grub2-x86_64-efi
|
||||
%endif
|
||||
%ifarch %{ix86} x86_64
|
||||
Requires: gfxboot
|
||||
%endif
|
||||
Requires: qemu-tools
|
||||
Requires: squashfs
|
||||
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.
|
||||
|
||||
%if %{_vendor} != "debbuild"
|
||||
%ifarch %ix86 x86_64
|
||||
%ifarch %{ix86} x86_64
|
||||
%package -n kiwi-pxeboot
|
||||
Summary: KIWI - PXE boot structure
|
||||
Requires: syslinux
|
||||
@ -270,9 +279,10 @@ BuildRequires: dracut
|
||||
%endif
|
||||
Requires: bc
|
||||
Requires: cryptsetup
|
||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?debian} || 0%{?ubuntu}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: btrfs-progs
|
||||
Requires: gdisk
|
||||
Requires: dracut-network
|
||||
%else
|
||||
Requires: btrfsprogs
|
||||
Requires: gptfdisk
|
||||
@ -291,6 +301,9 @@ Requires: curl
|
||||
%if 0%{?debian} || 0%{?ubuntu}
|
||||
Requires: xz-utils
|
||||
Requires: dmsetup
|
||||
Requires: btrfs-tools
|
||||
Requires: gdisk
|
||||
Requires: dracut-network
|
||||
%else
|
||||
Requires: xz
|
||||
Requires: device-mapper
|
||||
@ -364,7 +377,13 @@ Requires: e2fsprogs
|
||||
Requires: util-linux
|
||||
%if 0%{?debian} || 0%{?ubuntu}
|
||||
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
|
||||
%endif
|
||||
Requires: dracut
|
||||
@ -431,7 +450,7 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--ins
|
||||
make buildroot=%{buildroot}/ install_dracut
|
||||
|
||||
# Install documentation in PDF format
|
||||
make buildroot=%{buildroot}/ install_pdf_docs
|
||||
make buildroot=%{buildroot}/ docdir=%{_defaultdocdir}/ install_package_docs
|
||||
|
||||
%if %{_vendor} != "debbuild"
|
||||
# init alternatives setup
|
||||
@ -453,19 +472,13 @@ ln -s %{_sysconfdir}/alternatives/kiwicompat \
|
||||
%{buildroot}%_bindir/kiwicompat
|
||||
|
||||
# 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 \
|
||||
mkdir -p %{buildroot}/srv/tftpboot/$i ;\
|
||||
done
|
||||
%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}
|
||||
%fdupes %{buildroot}/srv/tftpboot
|
||||
%endif
|
||||
@ -507,7 +520,7 @@ rm -rf %{buildroot}/%{_defaultdocdir}/packages
|
||||
%endif
|
||||
|
||||
%if %{_vendor} != "debbuild"
|
||||
%ifarch %ix86 x86_64
|
||||
%ifarch %{ix86} x86_64
|
||||
%pre -n kiwi-pxeboot
|
||||
#============================================================
|
||||
# create user and group tftp if they does not exist
|
||||
@ -585,7 +598,7 @@ fi
|
||||
%{_usr}/lib/dracut/modules.d/90kiwi-overlay
|
||||
|
||||
%if %{_vendor} != "debbuild"
|
||||
%ifarch %ix86 x86_64
|
||||
%ifarch %{ix86} x86_64
|
||||
%files -n kiwi-pxeboot
|
||||
%defattr(-, root, root)
|
||||
%dir %attr(0755,tftp,tftp) /srv/tftpboot
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1e76e3d1a981aebba858192307c9d8553877e80e8fce51ef073b105e1eb24cbe
|
||||
size 1256735
|
||||
oid sha256:ced4b9442a0e521c50a4825d471247e927e175d5ee6734ab7c813caa02bc25d6
|
||||
size 1259853
|
||||
|
Loading…
Reference in New Issue
Block a user