Author: qboosh Date: Mon Jan 28 18:26:14 2008 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- s/_target_base_arch_dir/target_arch_dir/ (nothing to do with "base")
- handle ppc* -> powerpc case
---- Files affected:
SPECS:
kernel.spec (1.441.2.1831 -> 1.441.2.1832)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1831 SPECS/kernel.spec:1.441.2.1832
--- SPECS/kernel.spec:1.441.2.1831 Mon Jan 28 03:08:53 2008
+++ SPECS/kernel.spec Mon Jan 28 19:26:08 2008
@@ -402,9 +402,13 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch %{ix86} %{x8664}
-%define _target_base_arch_dir x86
-%else
-%define _target_base_arch_dir %{_target_base_arch}
+%define target_arch_dir x86
+%endif
+%ifarch ppc ppc64
+%define target_arch_dir powerpc
+%endif
+%ifnarch %{ix86} %{x8664}
+%define target_arch_dir %{_target_base_arch}
%endif
# No ELF objects there to strip (skips processing 27k files)
@@ -1042,124 +1046,124 @@
Config="%{_target_base_arch}"
KernelVer=%{kernel_release}
echo "Building config file using $Config.conf..."
- cat $RPM_SOURCE_DIR/kernel-$Config.config >
arch/%{_target_base_arch_dir}/defconfig
+ cat $RPM_SOURCE_DIR/kernel-$Config.config >
arch/%{target_arch_dir}/defconfig
./kernel-config.py %{_target_base_arch}
$RPM_SOURCE_DIR/kernel-multiarch.config \
- arch/%{_target_base_arch_dir}/defconfig
arch/%{_target_base_arch_dir}/defconfig
- TuneUpConfigForIX86 arch/%{_target_base_arch_dir}/defconfig
+ arch/%{target_arch_dir}/defconfig
arch/%{target_arch_dir}/defconfig
+ TuneUpConfigForIX86 arch/%{target_arch_dir}/defconfig
## Temporary disabled - we should have the proper config files in defconfig
loaded
##
## %ifarch ppc
-## install %{SOURCE25} arch/%{_target_base_arch_dir}/defconfig
+## install %{SOURCE25} arch/%{target_arch_dir}/defconfig
## %endif
##
## %ifarch ppc64
-## install %{SOURCE27} arch/%{_target_base_arch_dir}/defconfig
-## # sed -i "s:# CONFIG_PPC64 is not set:CONFIG_PPC64=y:"
arch/%{_target_base_arch_dir}/defconfig
+## install %{SOURCE27} arch/%{target_arch_dir}/defconfig
+## # sed -i "s:# CONFIG_PPC64 is not set:CONFIG_PPC64=y:"
arch/%{target_arch_dir}/defconfig
## %endif
# netfilter
- cat %{SOURCE40} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE40} >> arch/%{target_arch_dir}/defconfig
# squashfs
- cat %{SOURCE41} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE41} >> arch/%{target_arch_dir}/defconfig
# tuxonice
%if %{with tuxonice}
- cat %{SOURCE42} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE42} >> arch/%{target_arch_dir}/defconfig
%endif
%ifarch ppc ppc64
- sed -i "s:CONFIG_SUSPEND2=y:# CONFIG_SUSPEND2 is not set:"
arch/%{_target_base_arch_dir}/defconfig
+ sed -i "s:CONFIG_SUSPEND2=y:# CONFIG_SUSPEND2 is not set:"
arch/%{target_arch_dir}/defconfig
%endif
%if %{with vserver}
- cat %{SOURCE43} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE43} >> arch/%{target_arch_dir}/defconfig
%if %{with vs22}
- sed -i "s:CONFIG_IPV6=y:CONFIG_IPV6=m:"
arch/%{_target_base_arch_dir}/defconfig
+ sed -i "s:CONFIG_IPV6=y:CONFIG_IPV6=m:"
arch/%{target_arch_dir}/defconfig
%endif
%endif
%if %{without ipv6}
- sed -i "s:CONFIG_IPV6=.:# CONFIG_IPV6 is not set:"
arch/%{_target_base_arch_dir}/defconfig
+ sed -i "s:CONFIG_IPV6=.:# CONFIG_IPV6 is not set:"
arch/%{target_arch_dir}/defconfig
%endif
# vesafb-tng
- cat %{SOURCE44} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE44} >> arch/%{target_arch_dir}/defconfig
# grsecurity & pax stuff - temporary - work in progress
#
%if %{with pax_full}
- cat %{SOURCE45} >> arch/%{_target_base_arch_dir}/defconfig
- cat %{SOURCE49} >> arch/%{_target_base_arch_dir}/defconfig
- PaXconfig arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE45} >> arch/%{target_arch_dir}/defconfig
+ cat %{SOURCE49} >> arch/%{target_arch_dir}/defconfig
+ PaXconfig arch/%{target_arch_dir}/defconfig
%else
%if %{with grsec_full}
- cat %{SOURCE45} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE45} >> arch/%{target_arch_dir}/defconfig
%else
%if %{with grsec_minimal}
- cat %{SOURCE51} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE51} >> arch/%{target_arch_dir}/defconfig
%endif
%endif
%if %{with pax}
- cat %{SOURCE49} >> arch/%{_target_base_arch_dir}/defconfig
- PaXconfig arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE49} >> arch/%{target_arch_dir}/defconfig
+ PaXconfig arch/%{target_arch_dir}/defconfig
%else
- cat %{SOURCE50} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE50} >> arch/%{target_arch_dir}/defconfig
%endif
%endif
# Temporary disabled RELOCATABLE. Needed only on x86??
%if %{with pax} || %{with grsec_full}
- sed -i "s:CONFIG_RELOCATABLE=y:# CONFIG_RELOCATABLE is not set:"
arch/%{_target_base_arch_dir}/defconfig
+ sed -i "s:CONFIG_RELOCATABLE=y:# CONFIG_RELOCATABLE is not set:"
arch/%{target_arch_dir}/defconfig
%endif
#
# end of grsecurity & pax stuff
%if %{with imq}
- cat %{SOURCE55} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE55} >> arch/%{target_arch_dir}/defconfig
%endif
%if %{with wrr}
- cat %{SOURCE57} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE57} >> arch/%{target_arch_dir}/defconfig
%endif
%if %{with reiser4}
- cat %{SOURCE56} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE56} >> arch/%{target_arch_dir}/defconfig
%endif
%if %{with xen0}
- cat %{SOURCE46} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE46} >> arch/%{target_arch_dir}/defconfig
%endif
%if %{with xenU}
- cat %{SOURCE47} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE47} >> arch/%{target_arch_dir}/defconfig
%endif
# fbsplash && bootsplash
- echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch_dir}/defconfig
- echo "CONFIG_BOOTSPLASH=y" >> arch/%{_target_base_arch_dir}/defconfig
+ echo "CONFIG_FB_SPLASH=y" >> arch/%{target_arch_dir}/defconfig
+ echo "CONFIG_BOOTSPLASH=y" >> arch/%{target_arch_dir}/defconfig
%if %{with nfsroot}
- sed -i "s:CONFIG_NFS_FS=m:CONFIG_NFS_FS=y:"
arch/%{_target_base_arch_dir}/defconfig
- echo "CONFIG_ROOT_NFS=y" >> arch/%{_target_base_arch_dir}/defconfig
+ sed -i "s:CONFIG_NFS_FS=m:CONFIG_NFS_FS=y:"
arch/%{target_arch_dir}/defconfig
+ echo "CONFIG_ROOT_NFS=y" >> arch/%{target_arch_dir}/defconfig
%endif
%ifarch %{ix86}
%if %{with abi}
- cat %{SOURCE34} >> arch/%{_target_base_arch_dir}/defconfig
+ cat %{SOURCE34} >> arch/%{target_arch_dir}/defconfig
%endif
%endif
-%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:"
arch/%{_target_base_arch_dir}/defconfig}
-%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:"
arch/%{_target_base_arch_dir}/defconfig}
-%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not
set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:"
arch/%{target_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:"
arch/%{target_arch_dir}/defconfig}
+%{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not
set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{target_arch_dir}/defconfig}
- ln -sf arch/%{_target_base_arch_dir}/defconfig .config
+ ln -sf arch/%{target_arch_dir}/defconfig .config
install -d $KERNEL_INSTALL_DIR%{_kernelsrcdir}/include/linux
rm -f include/linux/autoconf.h
%{__make} %CrossOpts include/linux/autoconf.h
@@ -1174,7 +1178,7 @@
echo "Building kernel $1 ..."
%{__make} %CrossOpts mrproper \
RCS_FIND_IGNORE='-name build-done -prune -o'
- ln -sf arch/%{_target_base_arch_dir}/defconfig .config
+ ln -sf arch/%{target_arch_dir}/defconfig .config
%{__make} %CrossOpts clean \
RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -1606,6 +1610,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1832 2008-01-28 18:26:08 qboosh
+- s/_target_base_arch_dir/target_arch_dir/ (nothing to do with "base")
+- handle ppc* -> powerpc case
+
Revision 1.441.2.1831 2008-01-28 02:08:53 zbyniu
- info about pax.patch updated, TODO updated, rel 0.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1831&r2=1.441.2.1832&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
