rpms/kernel/devel Makefile.config, 1.57, 1.58 kernel-2.6.spec, 1.3246, 1.3247 config-olpc-generic, 1.12, NONE linux-2.6-libertas.diff, 1.1, NONE linux-2.6-olpc-touchpad.diff, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603

Modified Files:
	Makefile.config kernel-2.6.spec 
Removed Files:
	config-olpc-generic linux-2.6-libertas.diff 
	linux-2.6-olpc-touchpad.diff 
Log Message:
* Tue Jul 03 2007 Dave Jones <davej at redhat.com>
- Drop the stale olpc bits, it's now built from a separate branch.



Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile.config	28 May 2007 18:27:26 -0000	1.57
+++ Makefile.config	3 Jul 2007 05:30:45 -0000	1.58
@@ -21,7 +21,7 @@
 configs: $(CONFIGFILES)
 	@rm -f kernel-*-config
 	@rm -f $(TEMPFILES)
-	@rm -f temp-generic temp-*-generic temp-*-generic-tmp temp-olpc-config
+	@rm -f temp-generic temp-*-generic temp-*-generic-tmp
 
 # Augment the clean target to clean up our own cruft
 clean ::
@@ -90,9 +90,6 @@
 kernel-$(VERSION)-i686-PAE-debug.config: configs/config-i686-PAE temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-olpc.config: configs/config-olpc temp-x86-generic
-	perl merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3246
retrieving revision 1.3247
diff -u -r1.3246 -r1.3247
--- kernel-2.6.spec	3 Jul 2007 00:31:19 -0000	1.3246
+++ kernel-2.6.spec	3 Jul 2007 05:30:45 -0000	1.3247
@@ -132,12 +132,6 @@
 %define debugbuildsenabled 0
 %endif
 
-# don't build xen or kdump kernels for OLPC
-%if 0%{?olpc}
-%define with_xen 0
-%define with_kdump 0
-%endif
-
 %define all_x86 i386 i686
 
 # Overrides for generic default options
@@ -333,13 +327,9 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-%if 0%{?olpc}
-ExclusiveArch: i386
-%else
-# DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
+# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %nobuildarches (ABOVE) INSTEAD
 ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56
-%endif
 ExclusiveOS: Linux
 Provides: kernel-drm = 4.3.0
 Provides: kernel-drm-nouveau = 6
@@ -410,7 +400,6 @@
 
 Source80: config-rhel-generic
 Source81: config-rhel-x86-generic
-Source82: config-olpc-generic
 
 %if %{using_upstream_branch}
 ### BRANCH PATCH ###
@@ -471,8 +460,6 @@
 Patch480: linux-2.6-proc-self-maps-fix.patch
 Patch490: linux-2.6-softlockup-disable.patch
 Patch510: linux-2.6-silence-noise.patch
-Patch530: linux-2.6-libertas.diff
-Patch540: linux-2.6-olpc-touchpad.diff
 Patch560: linux-2.6-crap-sysfs-workaround.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-obsolete-oss-warning.patch
@@ -844,15 +831,6 @@
     rm $i.tmp
   done
 %endif
-#if a olpc kernel, apply the olpc config options
-%if 0%{?olpc}
-  for i in %{all_arch_configs}
-  do
-    mv $i $i.tmp
-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i
-    rm $i.tmp
-  done
-%endif
 
 
 # First we unpack the kernel tarball.
@@ -1060,14 +1038,6 @@
 # Silence some useless messages that still get printed with 'quiet'
 ApplyPatch linux-2.6-silence-noise.patch
 
-# OLPC specific patches
-%if 0%{?olpc}
-# Marvell Libertas wireless driver
-ApplyPatch linux-2.6-libertas.diff
-# OLPC touchpad
-ApplyPatch linux-2.6-olpc-touchpad.diff
-%endif
-
 # Work around sysfs/uevent use-after-free problems with Bluetooth HID
 #ApplyPatch linux-2.6-crap-sysfs-workaround.patch
 
@@ -1140,12 +1110,6 @@
 
 cp -f %{all_arch_configs} .
 
-%if 0%{?olpc}
-# don't need these for OLPC
-rm -f kernel-%{kversion}-*PAE*.config
-rm -f kernel-%{kversion}-*xen*.config
-%endif
-
 %if ! %{with_debug}
 rm -f kernel-%{kversion}-*-debug.config
 %endif
@@ -1160,6 +1124,8 @@
   cat .config >> configs/$i
 done
 
+rm -f $RPM_SOURCE_DIR/kernel-*.config
+
 # make sure the kernel has the sublevel we know it has. This looks weird
 # but for -pre and -rc versions we need it since we only want to use
 # the higher version when the final kernel is released.
@@ -2057,6 +2023,9 @@
 %endif
 
 %changelog
+* Tue Jul 03 2007 Dave Jones <davej at redhat.com>
+- Drop the stale olpc bits, it's now built from a separate branch.
+
 * Mon Jul 02 2007 Dave Jones <davej at redhat.com>
 - Bump minimum required mkinitrd to match F-7.
 


--- config-olpc-generic DELETED ---


--- linux-2.6-libertas.diff DELETED ---


--- linux-2.6-olpc-touchpad.diff DELETED ---