rpms/kernel/devel patch-2.6.15-git10.bz2.sign, NONE, 1.1 .cvsignore, 1.324, 1.325 kernel-2.6.spec, 1.1853, 1.1854 sources, 1.266, 1.267 upstream, 1.242, 1.243 linux-2.6-bcm43xx-wpa.patch, 1.1, NONE linux-2.6-chrp-build.patch, 1.1, NONE patch-2.6.15-git8.bz2.sign, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jan 14 09:52:01 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24984
Modified Files:
.cvsignore kernel-2.6.spec sources upstream
Added Files:
patch-2.6.15-git10.bz2.sign
Removed Files:
linux-2.6-bcm43xx-wpa.patch linux-2.6-chrp-build.patch
patch-2.6.15-git8.bz2.sign
Log Message:
git10
--- NEW FILE patch-2.6.15-git10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBDyLDEyGugalF9Dw4RAlFxAJ4jYnpDBDaZSlJG1Qad+gMrW3LIfACZATPa
uYe0Z0ICOGOVftvpv9U2GpI=
=symn
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- .cvsignore 13 Jan 2006 15:50:35 -0000 1.324
+++ .cvsignore 14 Jan 2006 09:51:58 -0000 1.325
@@ -2,5 +2,5 @@
temp-*
kernel-2.6.15
linux-2.6.15.tar.bz2
-bcm43xx-20060111.tar.bz2
-patch-2.6.15-git9.bz2
+bcm43xx-20060114.tar.bz2
+patch-2.6.15-git10.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1853
retrieving revision 1.1854
diff -u -r1.1853 -r1.1854
--- kernel-2.6.spec 14 Jan 2006 00:18:19 -0000 1.1853
+++ kernel-2.6.spec 14 Jan 2006 09:51:58 -0000 1.1854
@@ -183,7 +183,7 @@
Source10: COPYING.modules
Source11: genkey
-%define BCMVER 20060111
+%define BCMVER 20060114
Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2
Source20: kernel-%{kversion}-i586.config
@@ -207,7 +207,7 @@
#
# Patches 0 through 100 are meant for core subsystem upgrades
#
-Patch1: patch-2.6.15-git9.bz2
+Patch1: patch-2.6.15-git10.bz2
#Patch2: patch-2.6.16-rc1-git1.bz2
# Patches 100 through 500 are meant for architecture patches
@@ -225,7 +225,6 @@
# 300 - 399 ppc(64)
Patch300: linux-2.6.15-default-powerpc.patch
Patch301: linux-2.6.15-cell-numa-init.patch
-Patch302: linux-2.6-chrp-build.patch
Patch304: linux-2.6.15-mv643xx-fixes.patch
Patch305: linux-2.6-cell-mambo-drivers.patch
Patch306: linux-2.6-hvc-console.patch
@@ -374,7 +373,6 @@
# Broadcom wireless driver
Patch5000: linux-2.6-softmac-git.patch
Patch5001: linux-2.6-bcm43xx.patch
-Patch5002: linux-2.6-bcm43xx-wpa.patch
#
# 10000 to 20000 is for stuff that has to come last due to the
@@ -577,13 +575,13 @@
else
# We already have a vanilla dir.
cd kernel-%{kversion}
- if [ -d linux-%{kversion}.%{_arch} ]; then
- mv linux-%{kversion}.%{_arch} deleteme
+ if [ -d linux-%{kversion}.%{_target_cpu} ]; then
+ mv linux-%{kversion}.%{_target_cpu} deleteme
rm -rf deleteme &
fi
fi
-cp -rl vanilla linux-%{kversion}.%{_arch}
-cd linux-%{kversion}.%{_arch}
+cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+cd linux-%{kversion}.%{_target_cpu}
# Update to latest upstream.
%patch1 -p1
@@ -629,8 +627,6 @@
%patch300 -p1
# Arnd says don't call cell_spumem_init() till he fixes it.
%patch301 -p1
-# Make CHRP build again
-%patch302 -p1
# Fix the MV643xx Gigabit Ethernet driver
%patch304 -p1
# Support the IBM Mambo simulator; core as well as disk and network drivers.
@@ -875,8 +871,6 @@
%patch5000 -p1
# Patch Kconfig and Makefiles to merge bcm43xx 'properly'
%patch5001 -p1
-# Add WPA support
-%patch5002 -p1
#
# final stuff
@@ -932,10 +926,10 @@
gpg --homedir . --batch --gen-key %{SOURCE11}
gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
-make linux-%{kversion}.%{_arch}/scripts/bin2c
-linux-%{kversion}.%{_arch}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_arch}/crypto/signature/key.h
+make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
+linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
-cd linux-%{kversion}.%{_arch}
+cd linux-%{kversion}.%{_target_cpu}
@@ -1133,7 +1127,7 @@
%install
-cd linux-%{kversion}.%{_arch}
+cd linux-%{kversion}.%{_target_cpu}
%if %{buildxen}
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
@@ -1363,6 +1357,10 @@
%changelog
* Sat Jan 14 2006 David Woodhouse <dwmw2 at redhat.com>
+- 2.6.15-git10
+- Re-enable Wacom driver on PPC
+
+* Sat Jan 14 2006 David Woodhouse <dwmw2 at redhat.com>
- Make CHRP build again
* Fri Jan 13 2006 David Woodhouse <dwmw2 at redhat.com>
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- sources 13 Jan 2006 15:50:35 -0000 1.266
+++ sources 14 Jan 2006 09:51:58 -0000 1.267
@@ -1,3 +1,3 @@
cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2
-e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2
-e2b01ad85559d6f690cadca732347936 patch-2.6.15-git9.bz2
+ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2
+b88bcec6eddc41ccb4e34a486d58b3dd patch-2.6.15-git10.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- upstream 12 Jan 2006 23:52:50 -0000 1.242
+++ upstream 14 Jan 2006 09:51:58 -0000 1.243
@@ -1,3 +1,3 @@
linux-2.6.15.tar.bz2
-patch-2.6.15-git8.bz2
+patch-2.6.15-git10.bz2
--- linux-2.6-bcm43xx-wpa.patch DELETED ---
--- linux-2.6-chrp-build.patch DELETED ---
--- patch-2.6.15-git8.bz2.sign DELETED ---
More information about the fedora-cvs-commits
mailing list