SPECS (AC-branch): kernel24.spec - various fixes to fix building
glen
glen at pld-linux.org
Mon May 12 21:46:31 CEST 2008
Author: glen Date: Mon May 12 19:46:31 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- various fixes to fix building
---- Files affected:
SPECS:
kernel24.spec (1.793.2.14 -> 1.793.2.15)
---- Diffs:
================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.793.2.14 SPECS/kernel24.spec:1.793.2.15
--- SPECS/kernel24.spec:1.793.2.14 Mon May 12 19:29:24 2008
+++ SPECS/kernel24.spec Mon May 12 21:46:26 2008
@@ -981,20 +981,19 @@
%endif
%build
-
%if "%{_target_base_arch}" != "%{_arch}"
-Opts="ARCH=%{_target_base_arch} CROSS_COMPILE=\"%{_target_cpu}-pld-linux-\" OURCC=\"gcc\""
+%define Opts ARCH=%{_target_base_arch} CROSS_COMPILE="%{_target_cpu}-pld-linux-" OURCC="gcc"
%else
%ifarch %{ix86} alpha sparc ppc
-Opts="OURCC=\"%{__cc}\""
+%define Opts OURCC="%{__cc}"
%endif
%ifarch sparc64
-Opts="OURCC=\"sparc64-pld-linux-gcc\""
+%define Opts OURCC="sparc64-pld-linux-gcc"
%endif
%endif
BuildKernel() {
- %{?debug:set -x}
+ set -x
# is this a special kernel we want to build?
BOOT=
smp=
@@ -1029,7 +1028,7 @@
KernelVer=%{version}-%{release}$1
fi
echo "BUILDING KERNEL $*..."
-:> arch/%{base_arch}/defconfig
+ :> arch/%{base_arch}/defconfig
cat $RPM_SOURCE_DIR/%{name}-$Config.config >> arch/%{base_arch}/defconfig
%if !%{with um}
%ifarch i386
@@ -1055,7 +1054,7 @@
cat %{SOURCE1001} >> arch/%{base_arch}/defconfig
%ifarch sparc64
- sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' | \
+ sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' \
arch/%{base_arch}/defconfig
%endif
@@ -1064,7 +1063,7 @@
else
:;
%if %{with grsec}
- sed -i -e 's/CONFIG_CRYPTO_SHA256=m/CONFIG_CRYPTO_SHA256=y/g' | \
+ sed -i -e 's/CONFIG_CRYPTO_SHA256=m/CONFIG_CRYPTO_SHA256=y/g' \
arch/%{base_arch}/defconfig
cat %{SOURCE1002} >> arch/%{base_arch}/defconfig
%endif
@@ -1074,21 +1073,21 @@
%endif
%ifarch i386 i486
- sed -i -e 's/# CONFIG_MATH_EMULATION is not set/CONFIG_MATH_EMULATION=y/g' | \
+ sed -i -e 's/# CONFIG_MATH_EMULATION is not set/CONFIG_MATH_EMULATION=y/g' \
arch/%{base_arch}/defconfig
%endif
- %{__make} $Opts mrproper
+ %{__make} %Opts mrproper
ln -sf arch/%{base_arch}/defconfig .config
%ifarch sparc
- sparc32 %{__make} $Opts oldconfig %{?with_um:ARCH=um}
- sparc32 %{__make} $Opts dep clean %{?with_um:ARCH=um}
+ sparc32 %{__make} %Opts oldconfig %{?with_um:ARCH=um}
+ sparc32 %{__make} %Opts dep clean %{?with_um:ARCH=um}
%else
- %{__make} $Opts oldconfig %{?with_um:ARCH=um}
- %{__make} $Opts dep clean %{?with_um:ARCH=um}
+ %{__make} %Opts oldconfig %{?with_um:ARCH=um}
+ %{__make} %Opts dep clean %{?with_um:ARCH=um}
%endif
- %{__make} $Opts include/linux/version.h %{?with_um:ARCH=um}
+ %{__make} %Opts include/linux/version.h %{?with_um:ARCH=um}
# making table for soundmodem.
cd drivers/net/hamradio/soundmodem
@@ -1097,27 +1096,27 @@
cd ../../../..
%if %{with um}
- %{__make} $Opts linux ARCH=um
+ %{__make} %Opts linux ARCH=um
%else
%ifarch %{ix86} %{x8664}
- %{__make} $Opts bzImage
+ %{__make} %Opts bzImage
%endif
%ifarch sparc
- sparc32 %{__make} $Opts boot
+ sparc32 %{__make} %Opts boot
%else
%ifarch sparc64
- %{__make} $Opts vmlinux image
+ %{__make} %Opts vmlinux image
%else
%ifnarch %{ix86} %{x8664}
- %{__make} $Opts
+ %{__make} %Opts
%endif
%endif
%endif
%endif
%ifarch sparc
- sparc32 %{__make} $Opts modules %{?with_um:ARCH=um}
+ sparc32 %{__make} %Opts modules %{?with_um:ARCH=um}
%else
- %{__make} $Opts modules %{?with_um:ARCH=um}
+ %{__make} %Opts modules %{?with_um:ARCH=um}
%endif
mkdir -p $KERNEL_INSTALL_DIR/boot
@@ -1143,13 +1142,13 @@
%endif
%endif
%ifarch sparc
- sparc32 %{__make} $Opts modules_install \
+ sparc32 %{__make} %Opts modules_install \
%{?with_um:ARCH=um} \
INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
KERNELRELEASE=$KernelVer
echo KERNEL RELEASE $KernelVer
%else
- %{__make} $Opts modules_install \
+ %{__make} %Opts modules_install \
%{?with_um:ARCH=um} \
INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
KERNELRELEASE=$KernelVer
@@ -1175,7 +1174,7 @@
%if %{without up} && %{without smp}
# We need include/asm created somewhere
-%{__make} $Opts symlinks
+%{__make} %Opts symlinks
%endif
# BOOT kernel
@@ -1189,17 +1188,6 @@
rm -rf $RPM_BUILD_ROOT
umask 022
-%if "%{_target_base_arch}" != "%{_arch}"
-Opts="ARCH=%{_target_base_arch} CROSS_COMPILE=\"%{_target_cpu}-pld-linux-\" OURCC=\"gcc\""
-%else
-%ifarch %{ix86} alpha sparc ppc
-Opts="OURCC=\"%{__cc}\""
-%endif
-%ifarch sparc64
-Opts="OURCC=\"sparc64-pld-linux-gcc\""
-%endif
-%endif
-
sed -i -e 's#CC.*$(CROSS_COMPILE)$(OURCC)#CC = $(CROSS_COMPILE)gcc#g' Makefile
install -d $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
@@ -1260,7 +1248,7 @@
%endif
%if %{with source}
-%{__make} $Opts mrproper
+%{__make} %Opts mrproper
find -name "*~" -print | xargs rm -f
find -name "*.orig" -print | xargs rm -f
@@ -1295,7 +1283,7 @@
%{?with_grsec:cat %{SOURCE1002} >> .config}
%ifarch sparc64
- sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' | \
+ sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' \
.config
%endif
@@ -1304,9 +1292,9 @@
%endif
%ifarch sparc
-sparc32 %{__make} $Opts oldconfig
+sparc32 %{__make} %Opts oldconfig
%else
-%{__make} $Opts oldconfig
+%{__make} %Opts oldconfig
%endif
mv include/linux/autoconf.h include/linux/autoconf-up.h
@@ -1343,7 +1331,7 @@
%{?with_grsec:cat %{SOURCE1002} >> .config}
%ifarch sparc64
- sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' | \
+ sed -i -e 's/^CONFIG_FB_I810=.*/# CONFIG_FB_I810 is not set/g' \
.config
%endif
@@ -1352,9 +1340,9 @@
%endif
%ifarch sparc
-sparc32 %{__make} $Opts oldconfig
+sparc32 %{__make} %Opts oldconfig
%else
-%{__make} $Opts oldconfig
+%{__make} %Opts oldconfig
%endif
mv include/linux/autoconf.h include/linux/autoconf-smp.h
cp .config config-smp
@@ -1365,8 +1353,8 @@
%if %{with source}
# this generates modversions info which we want to include and we may as
# well include the depends stuff as well
-%{__make} $Opts symlinks
-%{__make} $Opts include/linux/version.h
+%{__make} %Opts symlinks
+%{__make} %Opts include/linux/version.h
%endif
rm -f include/linux/modversions.h
echo "#include <linux/modsetver.h>" > include/linux/modversions.h
@@ -1375,10 +1363,10 @@
# well include the depends stuff as well, after we fix the paths
%if %{with source}
-%{__make} $Opts depend
+%{__make} %Opts depend
find $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version} -name ".*depend" | xargs sed -i -e "s|$RPM_BUILD_ROOT||g"
-%{__make} $Opts clean
+%{__make} %Opts clean
rm -f scripts/mkdep
rm -f drivers/net/hamradio/soundmodem/gentbl
%endif
@@ -1724,6 +1712,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.793.2.15 2008-05-12 19:46:26 glen
+- various fixes to fix building
+
Revision 1.793.2.14 2008-05-12 17:29:24 glen
- kick in epoll patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel24.spec?r1=1.793.2.14&r2=1.793.2.15&f=u
More information about the pld-cvs-commit
mailing list