diff --git a/libguestfs.changes b/libguestfs.changes index 0169b6e..82ca060 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 14 13:13:10 UTC 2016 - ohering@suse.de + +- Remove obsolete kernel checks from specfile (fate#316274) +- Remove kernel-default and mkinitrd from BuildRequires (fate#316274) + ------------------------------------------------------------------- Fri Aug 26 13:55:55 UTC 2016 - cbosdonnat@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 907e8fe..d8b1bb7 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -1,7 +1,7 @@ # # spec file for package libguestfs # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Michal Hrusecky # # All modifications and additions to the file contributed by third parties @@ -38,7 +38,6 @@ Release: 0 %bcond_with perl_bindings %bcond_with hivex %bcond_with zerofree -%bcond_without ext4_writeable %else %bcond_without ocaml_bindings %bcond_without lua_bindings @@ -46,7 +45,6 @@ Release: 0 %bcond_without perl_bindings %bcond_without hivex %bcond_without zerofree -%bcond_with ext4_writeable %endif %bcond_without fuse @@ -72,11 +70,6 @@ Release: 0 %define _configure_python --disable-python %define _configure_ruby --disable-ruby -%if %suse_version > 1310 -%define use_included_mkinitrd 1 -%else -%define use_included_mkinitrd 0 -%endif # /lib/udev is a symlink in 12.3+, package the full directory %if %suse_version > 1220 %define udevrulesdir /usr/lib/udev/rules.d @@ -84,23 +77,6 @@ Release: 0 %define udevrulesdir /lib/udev/rules.d %endif # -%define kernel_binary %{nil} -%ifarch ia64 %ix86 x86_64 -%define kernel_binary /boot/vmlinuz -%endif -%ifarch ppc ppc64 ppc64le sparc64 -%define kernel_binary /boot/vmlinux -%endif -%ifarch s390 s390x -%define kernel_binary /boot/image -%endif -%ifarch %arm -%define kernel_binary /boot/uImage -%endif -%ifarch aarch64 -%define kernel_binary /boot/Image -%endif -# # use 'env LIBGUESTFS_HV=/path/to/kvm libguestfs-test-tool' to verify %define kvm_binary /bin/false %ifarch aarch64 @@ -401,10 +377,6 @@ Requires: %{name} This package contains testcases to verify libguestfs functionality. %package -n guestfs-data -# kernel-default needs that -%if %{?sles_version}0 > 0 -BuildRequires: sles-release -%endif BuildRequires: augeas-lenses BuildRequires: bc BuildRequires: btrfsprogs @@ -416,12 +388,6 @@ BuildRequires: cryptsetup BuildRequires: diffutils BuildRequires: dosfstools BuildRequires: e2fsprogs -# ext4 in the sles11 kernel-binary.rpm packages operates only in read-only mode. -# The generated initrd operates inside the temporary guest on image files. -# For that reason it needs to make modifications to any kind of filesystems. -%if %{with ext4_writeable} -BuildRequires: ext4-writeable-kmp-default -%endif BuildRequires: file BuildRequires: findutils BuildRequires: gawk @@ -434,12 +400,8 @@ BuildRequires: gptfdisk BuildRequires: gzip BuildRequires: iproute2 BuildRequires: jfsutils -BuildRequires: kernel-default BuildRequires: lvm2 BuildRequires: mdadm -%if !%{use_included_mkinitrd} -BuildRequires: mkinitrd -%endif BuildRequires: module-init-tools BuildRequires: ncurses-utils BuildRequires: nfs-client @@ -619,16 +581,6 @@ export SUPERMIN_HELPER=supermin-helper # for configure macro below CFLAGS="$RPM_OPT_FLAGS -Wno-unused" CXXFLAGS="$RPM_OPT_FLAGS -Wno-unused" -# If the kernel happens to have no virtio-scsi force virtio-blk usage in the tools -# This is true for kernel.rpm included in 12.1 and older -ls -laR /boot/ || : -if /sbin/modinfo -k "`env PATH=/sbin:/usr/sbin:$PATH get_kernel_version '%{kernel_binary}'`" virtio-scsi -then - : use virtio-scsi, which is the default in libguestfs -else - CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" - CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" -fi autoreconf -fi #