SPECS: kernel-mosix.spec, kernel-net-3c990.spec, kernel-net-e100.s...
ankry
ankry at pld-linux.org
Sat Aug 12 19:02:55 CEST 2006
Author: ankry Date: Sat Aug 12 17:02:55 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- spacing, new bconds, etc.
---- Files affected:
SPECS:
kernel-mosix.spec (1.88 -> 1.89) , kernel-net-3c990.spec (1.24 -> 1.25) , kernel-net-e100.spec (1.48 -> 1.49) , kernel-net-hostap.spec (1.28 -> 1.29) , kernel-net-sundance.spec (1.21 -> 1.22) , kernel-pcmcia-orinoco.spec (1.22 -> 1.23) , kernel-plustek-sane.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SPECS/kernel-mosix.spec
diff -u SPECS/kernel-mosix.spec:1.88 SPECS/kernel-mosix.spec:1.89
--- SPECS/kernel-mosix.spec:1.88 Wed Mar 1 00:37:25 2006
+++ SPECS/kernel-mosix.spec Sat Aug 12 19:02:49 2006
@@ -4,26 +4,26 @@
# packages will be built
#
# _without_owl - build without owl patch
-# _without_smp - don't build SMP kernel
-# _without_up - don't build UP kernel
-# _without_source - don't build source
-# _without_doc - don't build documentation package
+# _without_smp - don't build SMP kernel
+# _without_up - don't build UP kernel
+# _without_source - don't build source
+# _without_doc - don't build documentation package
#
-%define base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/')
-%define no_install_post_strip 1
-%define no_install_post_compress_modules 1
+%define base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/')
+%define no_install_post_strip 1
+%define no_install_post_compress_modules 1
#
-%define pre_version pre1
-%define freeswan_version 2.00
-%define jfs_version 2.4-1.1.2
+%define pre_version pre1
+%define freeswan_version 2.00
+%define jfs_version 2.4-1.1.2
%define xfs_version 1.3.0
-%define lvm_version 1.0.7
-%define evms_version 2.0.1
-%define ntfs_version 2.1.4a
-%define drm_xfree_version 4.3.0
-%define hostap_version 2002-10-12
-%define ACL_version 0.8.56
+%define lvm_version 1.0.7
+%define evms_version 2.0.1
+%define ntfs_version 2.1.4a
+%define drm_xfree_version 4.3.0
+%define hostap_version 2002-10-12
+%define ACL_version 0.8.56
%define mosix_ver 2.4.22
%define owl_ver 2.4.22
%define kern_name kernel
@@ -693,67 +693,67 @@
%build
BuildKernel() {
- %{?_debug:set -x}
- # is this a special kernel we want to build?
- smp=
- [ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
-
- if [ "$smp" = "yes" ]; then
- Config="ia32-smp"
- else
- Config="ia32"
- fi
- KernelVer=%{version}-%{release}$1
-
- echo "BUILDING THE NORMAL KERNEL $*..."
-:> arch/%{base_arch}/defconfig
- cat $RPM_SOURCE_DIR/kernel-$Config.config >> arch/%{base_arch}/defconfig
+ %{?_debug:set -x}
+ # is this a special kernel we want to build?
+ smp=
+ [ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
+
+ if [ "$smp" = "yes" ]; then
+ Config="ia32-smp"
+ else
+ Config="ia32"
+ fi
+ KernelVer=%{version}-%{release}$1
+
+ echo "BUILDING THE NORMAL KERNEL $*..."
+ :> arch/%{base_arch}/defconfig
+ cat $RPM_SOURCE_DIR/kernel-$Config.config >> arch/%{base_arch}/defconfig
%ifarch i386
- echo "CONFIG_M386=y" >> arch/%{base_arch}/defconfig
+ echo "CONFIG_M386=y" >> arch/%{base_arch}/defconfig
%endif
%ifarch i586
- echo "CONFIG_M586=y" >> arch/%{base_arch}/defconfig
+ echo "CONFIG_M586=y" >> arch/%{base_arch}/defconfig
%endif
%ifarch i686
- echo "CONFIG_M686=y" >> arch/%{base_arch}/defconfig
+ echo "CONFIG_M686=y" >> arch/%{base_arch}/defconfig
%endif
%ifarch athlon
- echo "CONFIG_MK7=y" >> arch/%{base_arch}/defconfig
+ echo "CONFIG_MK7=y" >> arch/%{base_arch}/defconfig
%endif
- cat %{SOURCE1000} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1002} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1003} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1005} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1006} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1000} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1002} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1003} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1005} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1006} >> arch/%{base_arch}/defconfig
%ifnarch i386 i486
- cat %{SOURCE1007} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1007} >> arch/%{base_arch}/defconfig
%endif
- cat %{SOURCE1008} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1009} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1010} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1011} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1012} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1013} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1671} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1672} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1673} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1674} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1675} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1676} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1677} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1678} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1679} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1667} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1668} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1669} >> arch/%{base_arch}/defconfig
- cat %{SOURCE1670} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1008} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1009} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1010} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1011} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1012} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1013} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1671} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1672} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1673} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1674} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1675} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1676} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1677} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1678} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1679} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1667} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1668} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1669} >> arch/%{base_arch}/defconfig
+ cat %{SOURCE1670} >> arch/%{base_arch}/defconfig
echo "# CONFIG_MKI is not set" >> arch/%{base_arch}/defconfig
%ifarch i386
- mv -f arch/%{base_arch}/defconfig arch/%{base_arch}/defconfig.orig
- sed -e 's/# CONFIG_MATH_EMULATION is not set/CONFIG_MATH_EMULATION=y/' \
- arch/%{base_arch}/defconfig.orig > arch/%{base_arch}/defconfig
+ mv -f arch/%{base_arch}/defconfig arch/%{base_arch}/defconfig.orig
+ sed -e 's/# CONFIG_MATH_EMULATION is not set/CONFIG_MATH_EMULATION=y/' \
+ arch/%{base_arch}/defconfig.orig > arch/%{base_arch}/defconfig
%endif
# mosix
cat %{SOURCE3000} >> arch/%{base_arch}/defconfig
@@ -762,31 +762,29 @@
%{!?_without_owl:cat %{SOURCE3001} >> arch/%{base_arch}/defconfig}
perl -p -i -e "s/^CONFIG_FUSION=m/CONFIG_FUSION=n/" arch/%{base_arch}/defconfig
- %{__make} mrproper
- ln -sf arch/%{base_arch}/defconfig .config
+ %{__make} mrproper
+ ln -sf arch/%{base_arch}/defconfig .config
+ %{__make} oldconfig
+ %{__make} dep clean
- %{__make} oldconfig
- %{__make} dep clean
-
- %{__make} include/linux/version.h
-# making table for soundmodem.
- (cd drivers/net/hamradio/soundmodem; \
- %{__cc} -o gentbl -lm gentbl.c; \
- ./gentbl)
-
-%{__make} bzImage
-%{__make} modules
-
-mkdir -p $KERNEL_INSTALL_DIR/boot
-install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
-cp arch/i386/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
-
-%{__make} modules_install \
-INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
-KERNELRELEASE=$KernelVer
-echo KERNEL RELEASE $KernelVer
-
+ %{__make} include/linux/version.h
+# making table for soundmodem.
+ (cd drivers/net/hamradio/soundmodem
+ %{__cc} -o gentbl -lm gentbl.c
+ ./gentbl)
+
+ %{__make} bzImage
+ %{__make} modules
+
+ mkdir -p $KERNEL_INSTALL_DIR/boot
+ install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
+ cp arch/i386/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+
+ %{__make} modules_install \
+ INSTALL_MOD_PATH=$KERNEL_INSTALL_DIR \
+ KERNELRELEASE=$KernelVer
+ echo KERNEL RELEASE $KernelVer
}
KERNEL_BUILD_DIR=`pwd`
@@ -795,7 +793,7 @@
install -d $KERNEL_INSTALL_DIR
# make drivers/scsi/ missing files
-# (cd drivers/scsi; make -f M)
+# (cd drivers/scsi; make -f M)
# UP KERNEL
%{!?_without_up:BuildKernel}
@@ -819,11 +817,11 @@
[ "$KERNEL_BUILD_INSTALL" = "yes" ] && cp -a $KERNEL_BUILD_DIR-installed/* $RPM_BUILD_ROOT
for i in "" smp ; do
- if [ -e $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i ] ; then
- rm -f $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
- ln -sf %{_prefix}/src/linux-%{version} \
- $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
- fi
+ if [ -e $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i ] ; then
+ rm -f $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
+ ln -sf %{_prefix}/src/linux-%{version} \
+ $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
+ fi
done
ln -sf ../src/linux/include/linux $RPM_BUILD_ROOT%{_includedir}/linux
ln -sf linux-%{version} $RPM_BUILD_ROOT%{_prefix}/src/linux
@@ -847,8 +845,8 @@
%if %{?_without_source:0}%{!?_without_source:1}
%{__make} mrproper
-find -name "*~" -print | xargs rm -f
-find -name "*.orig" -print | xargs rm -f
+find -name "*~" -print | xargs rm -f
+find -name "*.orig" -print | xargs rm -f
cat $RPM_SOURCE_DIR/kernel-ia32.config > .config
@@ -873,7 +871,7 @@
cat %{SOURCE3000} >> .config
cat %{SOURCE1667} >> .config
%ifnarch i386 i486
- cat %{SOURCE1007} >> .config
+cat %{SOURCE1007} >> .config
%endif
cat %{SOURCE1008} >> .config
cat %{SOURCE1009} >> .config
@@ -924,7 +922,7 @@
cat %{SOURCE3000} >> .config
cat %{SOURCE1667} >> .config
%ifnarch i386 i486
- cat %{SOURCE1007} >> .config
+cat %{SOURCE1007} >> .config
%endif
cat %{SOURCE1008} >> .config
cat %{SOURCE1009} >> .config
@@ -971,9 +969,9 @@
%{__make} depend
find $RPM_BUILD_ROOT/usr/src/linux-%{version} -name ".*depend" | \
while read file ; do
- mv $file $file.old
- sed -e "s|$RPM_BUILD_ROOT\(/usr/src/linux\)|\1|g" < $file.old > $file
- rm -f $file.old
+ mv $file $file.old
+ sed -e "s|$RPM_BUILD_ROOT\(/usr/src/linux\)|\1|g" < $file.old > $file
+ rm -f $file.old
done
%{__make} clean
@@ -992,7 +990,7 @@
ln -sf System.map-%{version}-%{release} /boot/System.map
if [ ! -L /lib/modules/%{version} ] ; then
- mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave > /dev/null 2>&1
+ mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave > /dev/null 2>&1
fi
rm -f /lib/modules/%{version}
ln -snf %{version}-%{release} /lib/modules/%{version}
@@ -1005,11 +1003,11 @@
ln -sf initrd-%{version}-%{release}.gz /boot/initrd
if [ -f %{_prefix}/src/linux-%{version}/config-up ] ; then
- ln -sf %{_prefix}/src/linux-%{version}/config-up %{_prefix}/src/linux-%{version}/.config
+ ln -sf %{_prefix}/src/linux-%{version}/config-up %{_prefix}/src/linux-%{version}/.config
fi
if [ -x /sbin/rc-boot ] ; then
- /sbin/rc-boot 1>&2 || :
+ /sbin/rc-boot 1>&2 || :
fi
%post smp
@@ -1019,7 +1017,7 @@
ln -sf System.map-%{version}-%{release}smp /boot/System.map
if [ ! -L /lib/modules/%{version} ] ; then
- mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave > /dev/null 2>&1
+ mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave > /dev/null 2>&1
fi
rm -f /lib/modules/%{version}
ln -snf %{version}-%{release}smp /lib/modules/%{version}
@@ -1030,20 +1028,20 @@
ln -sf initrd-%{version}-%{release}smp.gz /boot/initrd
if [ -f %{_prefix}/src/linux-%{version}/config-smp ] ; then
- ln -s %{_prefix}/src/linux-%{version}/config-smp %{_prefix}/src/linux-%{version}/.config
+ ln -s %{_prefix}/src/linux-%{version}/config-smp %{_prefix}/src/linux-%{version}/.config
fi
if [ -x /sbin/rc-boot ] ; then
- /sbin/rc-boot 1>&2 || :
+ /sbin/rc-boot 1>&2 || :
fi
%postun
if [ -L /lib/modules/%{version} ]; then
- if [ "`ls -l /lib/modules/%{version} | awk '{ print $11 }'`" = "%{version}-%{release}" ]; then
- if [ "$1" = "0" ]; then
- rm -f /lib/modules/%{version}
- fi
- fi
+ if [ "`ls -l /lib/modules/%{version} | awk '{ print $11 }'`" = "%{version}-%{release}" ]; then
+ if [ "$1" = "0" ]; then
+ rm -f /lib/modules/%{version}
+ fi
+ fi
fi
rm -f /boot/initrd-%{version}-%{release}.gz
@@ -1061,12 +1059,11 @@
%postun smp
if [ -L /lib/modules/%{version} ]; then
- if [ "`ls -l /lib/modules/%{version} | awk '{ print $11 }'`" = "%{version}-%{release}smp" ];
-then
- if [ "$1" = "0" ]; then
- rm -f /lib/modules/%{version}
- fi
- fi
+ if [ "`ls -l /lib/modules/%{version} | awk '{ print $11 }'`" = "%{version}-%{release}smp" ]; then
+ if [ "$1" = "0" ]; then
+ rm -f /lib/modules/%{version}
+ fi
+ fi
fi
rm -f /boot/initrd-%{version}-%{release}smp.gz
%post smp-pcmcia-cs
@@ -1089,11 +1086,11 @@
%postun headers
if [ -L /usr/src/linux ]; then
- if [ "`ls -l /usr/src/linux | awk '{ print $11 }'`" = "linux-%{version}" ]; then
- if [ "$1" = "0" ]; then
- rm -f /usr/src/linux
- fi
- fi
+ if [ "`ls -l /usr/src/linux | awk '{ print $11 }'`" = "linux-%{version}" ]; then
+ if [ "$1" = "0" ]; then
+ rm -f /usr/src/linux
+ fi
+ fi
fi
@@ -1135,7 +1132,7 @@
%files drm
%defattr(644,root,root,755)
/lib/modules/%{version}-%{release}/kernel/drivers/char/drm
-%endif # %%{_without_up}
+%endif # %%{_without_up}
%if %{?_without_smp:0}%{!?_without_smp:1}
%files smp
@@ -1176,7 +1173,7 @@
%files -n kernel-mosix-smp-drm
%defattr(644,root,root,755)
/lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
-%endif # %%{_without_smp}
+%endif # %%{_without_smp}
%files headers
%defattr(644,root,root,755)
@@ -1225,6 +1222,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2006/08/12 17:02:49 ankry
+- spacing, new bconds, etc.
+
Revision 1.88 2006/02/28 23:37:25 glen
- adapterized (killed trailing spaces/tabs)
================================================================
Index: SPECS/kernel-net-3c990.spec
diff -u SPECS/kernel-net-3c990.spec:1.24 SPECS/kernel-net-3c990.spec:1.25
--- SPECS/kernel-net-3c990.spec:1.24 Wed Aug 13 00:32:47 2003
+++ SPECS/kernel-net-3c990.spec Sat Aug 12 19:02:49 2006
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
-# _without_dist_kernel without distribution kernel
+bcond_without dist_kernel # without distribution kernel
#
%define _orig_name 3c990
@@ -16,10 +16,10 @@
Source0: http://support.3com.com/infodeli/tools/nic/linux/%{_orig_name}-%{version}.tar.gz
# Source0-md5: e7597b2747a18f0cfe7bc81e83a2bc68
Patch0: %{_orig_name}-redefine.patch
-%{!?_without_dist_kernel:BuildRequires: kernel-headers }
+%{?with_dist_kernel:BuildRequires: kernel-headers }
BuildRequires: %{kgcc_package}
BuildRequires: rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,7 +42,7 @@
Summary(pl): Sterownik dla Linuksa SMP dla kart sieciowych 3Com 3C990
Release: %{_rel}@%{_kernel_ver_str}
Group: Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): /sbin/depmod
%description -n kernel-smp-net-%{_orig_name}
@@ -65,9 +65,9 @@
%build
rm -f %{_orig_name}.o
-%{kgcc} -o %{_orig_name}.o -c %{rpmcflags} -c -DMODULE -D__KERNEL__ -O2 -DSMP=1 -D__SMP__ -DCONFIG_X86_LOCAL_APIC -Wall -Wstrict-prototypes -I%{_kernelsrcdir}/include %{_orig_name}.c
+%{kgcc} -o %{_orig_name}.o -c %{rpmcflags} -c -DMODULE -D__KERNEL__ -O2 -DSMP=1 -D__SMP__ -DCONFIG_X86_LOCAL_APIC -Wall -Wstrict-prototypes -I%{_kernelsrcdir}/include %{_orig_name}.c
mv -f %{_orig_name}.o %{_orig_name}-smp.o
-%{kgcc} -o %{_orig_name}.o -c %{rpmcflags} -c -DMODULE -D__KERNEL__ -O2 -Wall -Wstrict-prototypes -I%{_kernelsrcdir}/include %{_orig_name}.c
+%{kgcc} -o %{_orig_name}.o -c %{rpmcflags} -c -DMODULE -D__KERNEL__ -O2 -Wall -Wstrict-prototypes -I%{_kernelsrcdir}/include %{_orig_name}.c
%install
rm -rf $RPM_BUILD_ROOT
@@ -107,6 +107,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2006/08/12 17:02:49 ankry
+- spacing, new bconds, etc.
+
Revision 1.24 2003/08/12 22:32:47 ankry
- cosmetics
================================================================
Index: SPECS/kernel-net-e100.spec
diff -u SPECS/kernel-net-e100.spec:1.48 SPECS/kernel-net-e100.spec:1.49
--- SPECS/kernel-net-e100.spec:1.48 Fri Nov 18 09:43:40 2005
+++ SPECS/kernel-net-e100.spec Sat Aug 12 19:02:49 2006
@@ -6,8 +6,8 @@
%define _orig_name e100
-%{!?_without_dist_kernel:%define _mod_name %{_orig_name}_intel }
-%{?_without_dist_kernel:%define _mod_name %{_orig_name} }
+%{?with_dist_kernel:%define _mod_name %{_orig_name}_intel }
+%{!?with_dist_kernel:%define _mod_name %{_orig_name} }
Summary: Intel(R) PRO/100 driver for Linux
Summary(pl): Sterownik do karty Intel(R) PRO/100
@@ -21,13 +21,13 @@
Source0: ftp://aiedownload.intel.com/df-support/2896/eng/%{_orig_name}-%{version}.tar.gz
# Source0-md5: 847918a08443aac122205c122d5c3f98
URL: http://support.intel.com/support/network/adapter/pro100/
-%{!?_without_dist_kernel:BuildRequires: kernel-source > 2.4 }
+%{?with_dist_kernel:BuildRequires: kernel-source > 2.4 }
BuildRequires: %{kgcc_package}
BuildRequires: rpmbuild(macros) >= 1.118
%ifarch sparc
BuildRequires: crosssparc64-gcc
%endif
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
Provides: kernel(e100)
Obsoletes: e100
@@ -35,8 +35,8 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch sparc
-%define _target_base_arch sparc64
-%define _target_cpu sparc64
+%define _target_base_arch sparc64
+%define _target_cpu sparc64
%endif
%description
@@ -52,7 +52,7 @@
Summary(pl): Sterownik do karty Intel(R) PRO/100
Release: %{_rel}@%{_kernel_ver_str}
Group: Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): /sbin/depmod
Provides: kernel(e100)
Obsoletes: e100
@@ -74,7 +74,7 @@
%{__make} -C src SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA" KSRC=%{_kernelsrcdir}
%endif
%ifarch ppc
-%{__make} -C src SMP=1 CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
+%{__make} -C src SMP=1 CC="%{kgcc} -msoft-float -DSTB_WA" KSRC=%{_kernelsrcdir}
%endif
%ifnarch %{ix86} ppc
%{__make} -C src SMP=1 CC="%{kgcc} -DSTB_WA" KSRC=%{_kernelsrcdir}
@@ -127,6 +127,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.49 2006/08/12 17:02:49 ankry
+- spacing, new bconds, etc.
+
Revision 1.48 2005/11/18 08:43:40 paszczus
- new style bcond
================================================================
Index: SPECS/kernel-net-hostap.spec
diff -u SPECS/kernel-net-hostap.spec:1.28 SPECS/kernel-net-hostap.spec:1.29
--- SPECS/kernel-net-hostap.spec:1.28 Sat Apr 22 22:52:10 2006
+++ SPECS/kernel-net-hostap.spec Sat Aug 12 19:02:49 2006
@@ -109,36 +109,35 @@
# kernel module(s)
cd driver/modules
for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+ if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+ exit 1
+ fi
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
%if %{with dist_kernel}
- %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
%else
- install -d o/include/config
- touch o/include/config/MARKER
- ln -sf %{_kernelsrcdir}/scripts o/scripts
+ install -d o/include/config
+ touch o/include/config/MARKER
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
%endif
#
-# patching/creating makefile(s) (optional)
+# patching/creating makefile(s) (optional)
#
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
-
+ %{__make} -C %{_kernelsrcdir} clean \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
+ CC="%{__cc}" CPP="%{__cpp}" \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-mosix.spec?r1=1.88&r2=1.89&f=u
http://cvs.pld-linux.org/SPECS/kernel-net-3c990.spec?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/SPECS/kernel-net-e100.spec?r1=1.48&r2=1.49&f=u
http://cvs.pld-linux.org/SPECS/kernel-net-hostap.spec?r1=1.28&r2=1.29&f=u
http://cvs.pld-linux.org/SPECS/kernel-net-sundance.spec?r1=1.21&r2=1.22&f=u
http://cvs.pld-linux.org/SPECS/kernel-pcmcia-orinoco.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/kernel-plustek-sane.spec?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list