Re: SPECS: kvm.spec - rm BR: alsa-lib-devel (already required by SDL-d...

Kamil Dziedzic Fri, 14 Dec 2007 14:03:06 -0800

Dnia piątek 14 grudzień 2007, Jakub Bogusz napisał:
> $ rpm -qR SDL-devel | grep alsa | wc -l
> 0
>
Owszem bezpośrednio nie, ale pośrednio tak:


# poldek -u SDL-devel
SDL-devel-1.2.11-2.x86_64 zaznaczył artsc-devel-1.5.8-1.x86_64 (wł. 
libtool(/usr/lib64/libartsc.la))
  artsc-devel-1.5.8-1.x86_64 zaznaczył arts-devel-1.5.8-1.x86_64 (wł. 
libtool(/usr/lib64/libartsflow.la))
    arts-devel-1.5.8-1.x86_64 zaznaczył alsa-lib-devel-1.0.15-1.x86_64 (wł. 
alsa-lib-devel)
    arts-devel-1.5.8-1.x86_64 zaznaczył esound-devel-0.2.38-1.x86_64 (wł. 
esound-devel)

> Nie ma to jak nadgorliwość, do tego źle rozumiana.
Najwyraźniej nie rozumiem. Co robię źle? Gdzie leży problem?

p.s. Skorzystam odrazu z tego tematu i zadam pytanie czy ktoś ma coś przeciwko 
takiej zmianie w kvm.spec którą planowałem (w załącznikach patch i gotowy 
spec). Jeśli tak to co? Co poprawić? A może nie ruszać? Dodam jeszcze, że 
podobnie jest w debianie i mandrivie.

-- 
Pozdrawiam, Kamil Dziedzic

# $Revision: 1.17 $, $Date: 2007-12-14 21:23:02 $
#
# Conditional build:
%bcond_without  dist_kernel     	# allow non-distribution kernel
%bcond_without  kernel                  # build for unpatched kernel (which doesn't provide kvm.ko already)
%bcond_without  userspace               # don't build userspace utilities

%define	no_install_post_strip	1

%define	_rel	0.2

Summary:	Kernel-based Virtual Machine for Linux
Summary(pl.UTF-8):	Oparta na jÄdrze maszyna wirtualna dla Linuksa
Name:		kvm
Version:	56
Release:	%{_rel}
License:	GPL
Group:		Applications/System
Source0:	http://dl.sourceforge.net/kvm/%{name}-%{version}.tar.gz
# Source0-md5:	8a241c535f6d44f08e53f586068219b9
URL:		http://kvm.sourceforge.net/
BuildRequires:	bash
%if %{with kernel}
BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2
BuildRequires:	rpmbuild(macros) >= 1.379
%endif
%if %{with userspace}
BuildRequires:	SDL-devel
BuildRequires:	zlib-devel
Requires:	qemu
%endif
BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)

%description
KVM (for Kernel-based Virtual Machine) is a full virtualization
solution for Linux on x86 hardware. It consists of a loadable kernel
module (kvm.ko) and a userspace component.

Using KVM, one can run multiple virtual machines running unmodified
Linux or Windows images. Each virtual machine has private virtualized
hardware: a network card, disk, graphics adapter, etc.

%description -l pl.UTF-8
KVM (Kernel-based Virtual Machine) to peĹne rozwiÄzanie wirtualizacji
dla Linuksa na sprzÄcie x86. Zawiera Ĺadowalny moduĹ jÄdra (kvm.ko)
oraz komponent dziaĹajÄcy w przestrzeni uĹźytkownika.

Przy uĹźyciu KVM moĹźna uruchomiÄ wiele maszyn wirtualnych z
dziaĹajÄcymi niezmodyfikowanymi obrazami Linuksa i Windows. Kazda z
maszyn wirtualnych ma prywatny wirtualizowany sprzÄt: kartÄ sieciowÄ,
dysk, kartÄ graficznÄ itp.

%package -n kernel%{_alt_kernel}-misc-kvm
Summary:	kvm - Linux kernel module
Summary(pl.UTF-8):	kvm - moduĹ jÄdra Linuksa
Release:	[EMAIL PROTECTED]
Group:		Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel}
License:	Free to use, non-distributable
Requires(post,postun):	/sbin/depmod
Requires:	module-init-tools >= 3.2.2-2

%description -n kernel%{_alt_kernel}-misc-kvm
kvm - Linux kernel module.

%description -n kernel%{_alt_kernel}-misc-kvm -l pl.UTF-8
kvm - moduĹ jÄdra Linuka.

%prep
%setup -q

%build
# not ac stuff
./configure \
	%{!?with_kernel:--with-patched-kernel} \
	--disable-gcc-check \
	--kerneldir=%{_kernelsrcdir} \
	--prefix=%{_prefix} \
	--kerneldir=$PWD/kernel \
	--disable-gcc-check \
	--enable-alsa \
	--qemu-cc="%{__cc}"

%if %{with userspace}
%{__make} qemu
%endif

%if %{with kernel}
%build_kernel_modules -C kernel -m kvm,kvm-amd,kvm-intel
%endif

%install
rm -rf $RPM_BUILD_ROOT

%if %{with userspace}
%{__make} -C qemu install \
	DESTDIR=$RPM_BUILD_ROOT

# removing files which are provided by required qemu package
rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_docdir}
rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img

# changing binary name to avoid conflict with qemu
mv -f $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/%{name}
%endif

%if %{with kernel}
%install_kernel_modules -m kernel/{kvm-amd,kvm,kvm-intel} -d misc
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post   -n kernel%{_alt_kernel}-misc-kvm
%depmod %{_kernel_ver}

%postun -n kernel%{_alt_kernel}-misc-kvm
%depmod %{_kernel_ver}

%if %{with userspace}
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/%{name}
%endif

%if %{with kernel}
%files -n kernel%{_alt_kernel}-misc-kvm
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/kvm*
%endif

%define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org

$Log: kvm.spec,v $
Revision 1.17  2007-12-14 21:23:02  arvenil
- rm BR: alsa-lib-devel (already required by SDL-devel)
- --enable-alsa

Revision 1.16  2007-12-14 14:03:41  arvenil
- up to 56

Revision 1.15  2007-12-12 21:28:47  qboosh
- sorted BRs

Revision 1.14  2007-12-09 15:26:27  wiget
- BR: perl-tools-pod for pod2man

Revision 1.13  2007-12-09 14:41:16  wiget
- updated to 55

Revision 1.12  2007-11-27 13:11:00  shadzik
- kvm-54, not tested
- rel 0.1

Revision 1.11  2007-10-29 14:37:14  areq
- 49

Revision 1.10  2007/10/29 11:17:04  arvenil
- no man anymore
- %{_libdir}/kvm/lib => %{_libdir}/kvm/%{_lib}
- rel 0.2

Revision 1.9  2007/10/28 22:07:39  areq
- 48, now build on TH

Revision 1.8  2007/06/07 22:02:38  areq
- kvm-27, NFY

Revision 1.7  2007/02/12 22:09:10  glen
- tabs in preamble

Revision 1.6  2007/02/12 01:06:38  baggins
- converted to UTF-8

Revision 1.5  2007/02/05 15:36:28  qboosh
- fixme: userspace shouldn't reference _kernelsrcdir

Revision 1.4  2007/02/05 15:34:07  qboosh
- pl, cleanup

Revision 1.3  2007/02/02 13:28:39  mkierus
- up to 12

Revision 1.2  2007/01/11 11:48:07  arekm
- more

Revision 1.1  2007/01/10 19:06:55  arekm
- raw, need gcc3

--- kvm.spec	14 Dec 2007 21:23:02 -0000
+++ kvm.spec	14 Dec 2007 21:29:22 -0000
@@ -7,7 +7,7 @@
 
 %define	no_install_post_strip	1
 
-%define	_rel	0.1
+%define	_rel	0.2
 
 Summary:	Kernel-based Virtual Machine for Linux
 Summary(pl.UTF-8):	Oparta na jÄdrze maszyna wirtualna dla Linuksa
@@ -26,9 +26,8 @@
 %endif
 %if %{with userspace}
 BuildRequires:	SDL-devel
-BuildRequires:	libuuid-devel
-BuildRequires:	perl-tools-pod
 BuildRequires:	zlib-devel
+Requires:	qemu
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,17 +75,13 @@
 	%{!?with_kernel:--with-patched-kernel} \
 	--disable-gcc-check \
 	--kerneldir=%{_kernelsrcdir} \
-	--prefix=%{_libdir}/kvm \
+	--prefix=%{_prefix} \
 	--kerneldir=$PWD/kernel \
 	--disable-gcc-check \
 	--enable-alsa \
 	--qemu-cc="%{__cc}"
 
 %if %{with userspace}
-# build bios or use binary one?
-#%{__make} bios
-%{__make} libkvm
-%{__make} user
 %{__make} qemu
 %endif
 
@@ -98,11 +93,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with userspace}
-%{__make} -C libkvm install \
-	DESTDIR=$RPM_BUILD_ROOT
-# KERNELDIR=%{_kernelsrcdir}
 %{__make} -C qemu install \
 	DESTDIR=$RPM_BUILD_ROOT
+
+# removing files which are provided by required qemu package
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_docdir}
+rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img
+
+# changing binary name to avoid conflict with qemu
+mv -f $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/%{name}
 %endif
 
 %if %{with kernel}
@@ -121,14 +120,7 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%dir %{_libdir}/kvm
-%dir %{_libdir}/kvm/bin
-%attr(755,root,root) %{_libdir}/kvm/bin/*
-%{_libdir}/kvm/include
-%{_libdir}/kvm/%{_lib}
-%dir %{_libdir}/kvm/share
-%{_libdir}/kvm/share/qemu
-%{_mandir}/man1/qemu*.1*
+%attr(755,root,root) %{_bindir}/%{name}
 %endif
 
 %if %{with kernel}

signature.asc
Description: This is a digitally signed message part.

_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl

Re: SPECS: kvm.spec - rm BR: alsa-lib-devel (already required by SDL-d...

Odpowiedź listem elektroniczym