packages: kernel-xen0/kernel-xen0.spec - dropped all non-x86 stuff.
pawelz
pawelz at pld-linux.org
Tue Feb 16 17:20:36 CET 2010
Author: pawelz Date: Tue Feb 16 16:20:36 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- dropped all non-x86 stuff.
---- Files affected:
packages/kernel-xen0:
kernel-xen0.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/kernel-xen0/kernel-xen0.spec
diff -u packages/kernel-xen0/kernel-xen0.spec:1.5 packages/kernel-xen0/kernel-xen0.spec:1.6
--- packages/kernel-xen0/kernel-xen0.spec:1.5 Tue Feb 16 17:17:20 2010
+++ packages/kernel-xen0/kernel-xen0.spec Tue Feb 16 17:20:31 2010
@@ -2,7 +2,6 @@
#
# TODO:
# - test it
-# - drop non-x86 garbage
# - warning: Installed (but unpackaged) file(s) found:
# /usr/src/linux-2.6.30_xen0/arch/m68k/install.sh
# /usr/src/linux-2.6.30_xen0/tools/perf/*
@@ -28,14 +27,7 @@
%define have_sound 1
%define have_drm 1
-%ifnarch %{ix86} alpha ppc
%define have_isa 0
-%endif
-%ifarch sparc sparc64
-%define have_drm 0
-%define have_oss 0
-%define have_pcmcia 0
-%endif
%define alt_kernel xen0
@@ -79,9 +71,6 @@
Source9: kernel-xen0-no-preempt-nort.config
URL: http://www.kernel.org/
BuildRequires: binutils >= 3:2.14.90.0.7
-%ifarch sparc sparc64
-BuildRequires: elftoaout
-%endif
BuildRequires: %{kgcc_package} >= 5:3.2
BuildRequires: module-init-tools
# for hostname command
@@ -91,9 +80,6 @@
BuildRequires: python-modules
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
-%ifarch ppc
-BuildRequires: uboot-mkimage
-%endif
Autoreqprov: no
Requires: /sbin/depmod
Requires: coreutils
@@ -119,11 +105,7 @@
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%ifarch %{ix86} %{x8664}
%define target_arch_dir x86
-%else
-%define target_arch_dir %{_target_base_arch}
-%endif
# No ELF objects there to strip (skips processing 27k files)
%define _noautostrip .*%{_kernelsrcdir}/.*
@@ -523,24 +505,7 @@
install -d $RPM_BUILD_ROOT/boot
cp -a %{objdir}/System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
-%ifarch %{ix86} %{x8664}
cp -a %{objdir}/arch/%{target_arch_dir}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%endif
-%ifarch ppc ppc64
-install %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%endif
-%ifarch alpha sparc sparc64
- %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
- cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%ifarch sparc
- elftoaout %{objdir}/arch/sparc/boot/image -o %{objdir}/vmlinux.aout
- install %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
-%endif
-%ifarch sparc64
- elftoaout %{objdir}/arch/sparc64/boot/image -o %{objdir}/vmlinux.aout
- install %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
-%endif
-%endif # ifarch alpha sparc sparc64
# for initrd
touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}.gz
@@ -662,9 +627,6 @@
%files
%defattr(644,root,root,755)
-%ifarch sparc sparc64
-/boot/vmlinux.aout-%{kernel_release}
-%endif
/boot/vmlinuz-%{kernel_release}
/boot/System.map-%{kernel_release}
%ghost /boot/initrd-%{kernel_release}.gz
@@ -710,11 +672,9 @@
%defattr(644,root,root,755)
%dir %{_kernelsrcdir}
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
%files vmlinux
%defattr(644,root,root,755)
/boot/vmlinux-%{kernel_release}
-%endif
%if %{have_drm}
%files drm
@@ -849,7 +809,7 @@
/lib/firmware/tigon/tg3_tso5.bin
/lib/firmware/ti_3410.fw
/lib/firmware/ti_5052.fw
-%ifarch %{ix86} ppc
+%ifarch %{ix86}
/lib/firmware/tr_smctr.bin
%endif
%dir /lib/firmware/ttusb-budget
@@ -897,9 +857,6 @@
%files module-build -f aux_files
%defattr(644,root,root,755)
%{_kernelsrcdir}/Kbuild
-%ifarch ppc ppc64
-%{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
-%endif
%{_kernelsrcdir}/arch/*/kernel/asm-offsets*
%{_kernelsrcdir}/arch/*/kernel/sigframe*.h
%{_kernelsrcdir}/drivers/lguest/lg.h
@@ -939,9 +896,6 @@
%{_kernelsrcdir}/arch/x86/ia32/[!M]*
%{_kernelsrcdir}/arch/ia64/kvm
%{_kernelsrcdir}/arch/powerpc/kvm
-%ifarch ppc ppc64
-%exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
-%endif
%{_kernelsrcdir}/arch/s390/kvm
%{_kernelsrcdir}/arch/x86/kvm
%exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
@@ -988,6 +942,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2010/02/16 16:20:31 pawelz
+- dropped all non-x86 stuff.
+
Revision 1.5 2010/02/16 16:17:20 pawelz
- TODO: Installed (but unpackaged) file(s) found:
/usr/src/linux-2.6.30_xen0/arch/m68k/install.sh
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xen0/kernel-xen0.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list