merged disable-broken.sh into lx_config.sh (incl. status messages)

added a poqwerpc kernel26-disable.lst to fix linux26 for PowerPC


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2039 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -2,6 +2,8 @@
 *) 2003-12-22 (2.0.0-rc3 - 2.0.0-rc4)
 
  - fixed kdenetwork (kmime / kmail) mostly for big-endian systems
+ - merged disable-broken.sh into lx_config.sh incl. status output
+ - added a powerpc kernel26-disable.lst to fix linux26 for PowerPC
 
 *) 2003-12-21 (2.0.0-rc3 - 2.0.0-rc4)
 

architecture/powerpc/kernel26-disable.lst

@@ -1,7 +1,7 @@
 CONFIG_VIDEO_PLANB	2003-12-22	2.6.0
 CONFIG_OAKNET		2003-12-22	2.6.0
 CONFIG_LANCE		2003-12-22	2.6.0
-CONFIG_AT17000		2003-12-22	2.6.0
+CONFIG_AT1700		2003-12-22	2.6.0
 CONFIG_3C515		2003-12-22	2.6.0
 CONFIG_EEXPRESS		2003-12-22	2.6.0
 CONFIG_VLSI_FIR		2003-12-22	2.6.0

package/base/linux24/disable-broken.sh

@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/linux24/disable-broken.sh
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-#
-# This script disables drivers in the .config file which are known to
-# be broken in the current kernel version.
-
-rm -f /tmp/$$.sed
-
-list="CONFIG_THIS_DOES_NOT_EXIST"
-
-for x ; do
-    if [ -f "$x" ] ; then
-	list="$list `tr ' ' '\t' < $x | cut -f1 | grep '^CONFIG_'`"
-    fi
-done
-
-for x in $list
-do
-	echo "s,^$x=.\$,# $x is not set,;" >> /tmp/$$.sed
-done
-
-sed -f /tmp/$$.sed ; rm -f /tmp/$$.sed
-

package/base/linux24/lx_config.sh

@@ -107,10 +107,21 @@ auto_config ()
 	# create a valid .config
 	yes '' | eval $MAKE oldconfig > /dev/null ; cp .config .config.5
 
-	# last disable broken crap
-	sh $base/package/base/linux24/disable-broken.sh \
-	$pkg_linux_brokenfiles < .config > config.6
-	cp config.6 .config
+	# last disable broken stuff
+	rm -f /tmp/$$.sed
+	list="CONFIG_THIS_DOES_NOT_EXIST"
+	for x in $pkg_linux_brokenfiles ; do
+	    if [ -f "$x" ] ; then
+		echo "Disable broken file: $x"
+		list="$list `tr ' ' '\t' < $x | cut -f1 | grep '^CONFIG_'`"
+            fi
+	done
+	for x in $list ; do
+		echo "s,^$x=.\$,# $x is not set,;" >> /tmp/$$.sed
+	done
+
+	sed -f /tmp/$$.sed < .config > .config.6
+	cp .config.6 .config ; rm -f /tmp/$$.sed
 
 	# create a valid .config (dependencies might need to be disabled)
 	yes '' | eval $MAKE oldconfig > /dev/null
@@ -183,3 +194,4 @@ pkg_linux_brokenfiles="$base/architecture/$arch/kernel-disable.lst \
 	$base/architecture/$arch/kernel$treever-disable.lst \
 	$base/package/base/linux$treever/disable-broken.lst \
 	$pkg_linux_brokenfiles"
+