alsa externalized again, as are the mosix-user utilities.

8 files changed, 300 insertions, 138 deletions

diff --git a/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild b/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild
new file mode 100644
index 000000000000..dafbfb8e4d2c
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.5.11.ebuild,v 1.1 2001/07/13 02:13:32 drobbins Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Advanced Linux Sound Architecture modules"
+SRC_URI="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${PV}.tar.bz2"
+HOMEPAGE="http://www.alsa-project.org"
+
+#add kernel includes dependency when we have one
+DEPEND="sys-devel/autoconf virtual/glibc sys-kernel/linux-sources"
+PROVIDE="virtual/alsa"
+
+#might be good to roll this into Portage at some point.
+KV=`readlink /usr/src/linux`
+if [ $? -ne 0 ]
+then
+	echo 
+	echo "/usr/src/linux symlink does not exist; cannot continue."
+	echo
+	exit 1
+fi
+#alsa-driver will compile modules for the kernel pointed to by /usr/src/linux
+KV=${KV/linux-/}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp configure.in configure.in.orig
+	sed -e 's/-m.86//g' configure.in.orig > configure.in
+	autoconf
+}
+
+src_compile() {
+	try ./configure --with-kernel=\"${ROOT}usr/src/linux-${KV}\" --with-isapnp=yes --with-sequencer=yes --with-oss=yes --with-cards=all
+	try emake
+}
+
+src_install () {
+	#point this to the kernel headers in the future, not the kernel sources
+	insinto /usr/src/linux/include/linux
+	cd ${S}/include
+	doins asound.h asoundid.h asequencer.h ainstr_*.h
+	dodoc INSTALL FAQ
+	dodir /lib/modules/${KV}/misc
+	cp ${S}/modules/*.o ${D}/lib/modules/${KV}/misc
+	dodir /etc/modutils
+	insinto /etc/modutils
+	doins ${FILESDIR}/alsa
+	#this is the new modular modules system (from Debian) :)
+}
+
+pkg_postinst() {
+	if [ -e /sbin/update-modules ]
+	then
+		/sbin/update-modules
+	fi
+}
diff --git a/media-sound/alsa-driver/files/alsa b/media-sound/alsa-driver/files/alsa
new file mode 100644
index 000000000000..e65df04f4799
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa
@@ -0,0 +1,17 @@
+# ALSA portion
+alias char-major-116 snd
+# OSS/Free portion
+alias char-major-14 soundcore
+
+# OSS/Free portion - card #1
+alias sound-service-0-0 snd-mixer-oss
+alias sound-service-0-1 snd-seq-oss
+alias sound-service-0-3 snd-pcm-oss
+alias sound-service-0-8 snd-seq-oss
+alias sound-service-0-12 snd-pcm-oss
+
+#customize the lines below to allow for demand-loading of modules
+#options snd snd_major=116 snd_cards_limit=1
+#alias snd-card-0 snd-card-ens1371
+#options snd-card-ens1371 snd_index=0
+#alias sound-slot-0 snd-card-0
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11 b/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11
new file mode 100644
index 000000000000..f4f8e99fdca4
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-0.5.11
@@ -0,0 +1 @@
+MD5 ff807499928379c4274a307855b9eeeb alsa-driver-0.5.11.tar.bz2
diff --git a/sys-apps/mosix-user/files/digest-mosix-user-1.0.5 b/sys-apps/mosix-user/files/digest-mosix-user-1.0.5
new file mode 100644
index 000000000000..375fe80fb108
--- /dev/null
+++ b/sys-apps/mosix-user/files/digest-mosix-user-1.0.5
@@ -0,0 +1 @@
+MD5 53736319d63557eb7bdbd90fa7168744 MOSIX-1.0.5.tar.gz
diff --git a/sys-apps/mosix-user/files/mosix.init-1.0.5 b/sys-apps/mosix-user/files/mosix.init-1.0.5
new file mode 100755
index 000000000000..f339dabb666e
--- /dev/null
+++ b/sys-apps/mosix-user/files/mosix.init-1.0.5
@@ -0,0 +1,118 @@
+#!/bin/sh -
+#RCUPDATE:2 3 4:95:This line is required for script management
+
+# description: MOSIX is am extension of the operating system,
+#	       supporting scalable and transparent cluster computing.
+#
+# mosix		Script to stop/start MOSIX
+#
+# Author:       Amnon Shiloh
+
+. /etc/rc.d/config/functions
+
+SERVICE="mosix"
+opts="start stop status restart"
+
+mosix_stop() {
+	echo 0 > /proc/mosix/admin/mospe
+	rm -f /var/lock/subsys/mosix
+}
+
+mosix_start() {
+	if [ -s /etc/overheads -a -f /proc/mosix/admin/overheads ]
+	then
+		 /bin/grep -v '^#' /etc/overheads > /proc/mosix/admin/overheads
+	fi
+	if [ -s /etc/mfscosts -a -f /proc/mosix/admin/mfscosts ]
+	then
+		 /bin/grep -v '^#' /etc/mfscosts > /proc/mosix/admin/mfscosts
+	fi
+	a1=
+	[ -s /etc/mospe ] && a1="-p `cat /etc/mospe`"
+	a2=
+	[ -s /etc/mosgates ] && a2="-g `cat /etc/mosgates`"
+	/sbin/setpe -W $a1 $a2 -f /etc/mosix.map
+	touch /var/lock/subsys/mosix
+}
+
+alarm() {
+	t=$2
+	while :
+	do
+		case "$t" in 0) break ;; esac
+		sleep 1
+		t=$(($t-1))
+	done
+	kill -1 $1
+	exit 0
+}
+
+# See how we were called.
+start() {
+	eecho "Initializing MOSIX"
+	if [ ! -f /etc/mosix.map ]
+	then
+		echo You have no MOSIX configuration - please edit yours now:
+		echo -n "Editor to use [q to quit] - [vi] :- "
+		trap 'echo Timed-Out ; exit 1' 1
+		alarm $$ 120 &
+		killer=$!
+		read editor
+		kill $killer
+		trap ''
+		case "$editor" in [qQ]) exit ;;
+			"") editor=/usr/bin/vi
+			    [ -f $editor ] || editor=/bin/vi
+				;;
+		esac
+		echo "# MOSIX CONFIGURATION" > /etc/mosix.map
+		echo "# ===================" >> /etc/mosix.map
+		echo "#" >> /etc/mosix.map
+		echo "# Each line should contain 3 fields, mapping IP addresses to MOSIX node-numbers:" >> /etc/mosix.map
+		echo "# 1) first MOSIX node-number in range." >> /etc/mosix.map
+		echo "# 2) IP address of the above node (or node-name from /etc/hosts)." >> /etc/mosix.map
+		echo "# 3) number of nodes in this range." >> /etc/mosix.map
+		echo "#" >> /etc/mosix.map
+		echo "# MOSIX-#  IP  number-of-nodes" >> /etc/mosix.map
+		echo "# ============================" >> /etc/mosix.map
+		$editor /etc/mosix.map
+		echo
+		while :
+		do
+			echo "If this node's standard IP address is not part of the table that"
+			echo "you just edited, because MOSIX uses a different or separate network,"
+			echo "you need to type this node's MOSIX-number now."
+			echo
+			/bin/echo -n "Otherwise please press only <Enter> :- "
+			read me
+			case "$me" in "") /bin/rm -f /etc/mospe ; break ;;
+				[1-9] | [1-9][0-9] | [1-9][0-9][0-9] | \
+				[1-9][0-9][0-9][0-9] | \
+				[1-6][0-9][0-9][0-9][0-9])
+					echo $me > /etc/mospe ; break ;;
+				*) echo Improper MOSIX number - please try again: ;;
+			esac
+		done
+	fi
+	start_mosix 
+	eend
+}
+
+stop() {
+	eecho "Stopping MOSIX"
+	stop_mosix 
+	eend
+}
+
+status() {
+	/sbin/setpe -r
+}
+
+restart() {
+	eecho "Restarting MOSIX"
+	stop_mosix
+	start_mosix 
+	eend
+}
+
+doservice ${@}
diff --git a/sys-apps/mosix-user/mosix-user-1.0.5.ebuild b/sys-apps/mosix-user/mosix-user-1.0.5.ebuild
new file mode 100644
index 000000000000..2e1a9b332e98
--- /dev/null
+++ b/sys-apps/mosix-user/mosix-user-1.0.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mosix-user/mosix-user-1.0.5.ebuild,v 1.1 2001/07/13 02:13:32 drobbins Exp $
+
+S=${WORKDIR}/user
+DESCRIPTION="User-land utilities for MOSIX process migration (clustering) software"
+SRC_URI="ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${PV}.tar.gz"
+HOMEPAGE="http://www.mosix.org"
+DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	mkdir ${WORKDIR}/user
+	cd ${WORKDIR}
+	tar -xz --no-same-owner -f ${DISTDIR}/${A} user.tar manuals.tar	
+	tar -x --no-same-owner -f user.tar -C ${S}	
+	tar -x --no-same-owner -f manuals.tar -C ${S}
+}
+
+src_compile() {
+	cd ${S}
+	local x
+	for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
+	do
+		cd $x
+		make
+		cd ../..
+	done
+}
+
+src_install () {
+	cd ${S}
+	dodir /usr/lib /usr/include
+	dolib.a libmos.a
+	dolib.so libmos.so.0
+	ln -s libmos.so.0 ${D}/usr/lib/libmos.so
+	insinto /usr/include
+	doins *.h
+
+	cd ../../sbin/setpe
+	doman setpe.1
+	into /
+	dosbin setpe
+
+	cd ../tune
+	dosbin tune mtune tunepass tune_kernel prep_tune
+	doman tune.1
+
+	cd ../../bin/mosrun
+	dobin mosrun nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
+	doman mosrun.1
+	local x
+	for x in nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
+	do
+		ln -s mosrun.1.gz ${D}/usr/share/man/man1/${x}.1.gz
+	done
+
+	cd ../../usr.bin/mon
+	into /usr
+	dobin mon
+	doman mon.1
+
+	cd ../migrate
+	dobin migrate
+	doman migrate.1
+
+	cd ../mosctl
+	dobin mosctl
+	doman mosctl.1
+
+	exeinto /etc/rc.d/init.d
+	newexe ${FILESDIR}/mosix.init-${PV} mosix
+	cd ${S}
+	doman man?/*
+}
+
diff --git a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.6 b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.6
index 383a6c88dc47..fbd7ceeae0f6 100644
--- a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.6
+++ b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.6
@@ -1,6 +1,6 @@
 MD5 53736319d63557eb7bdbd90fa7168744 MOSIX-1.0.5.tar.gz
-MD5 ff807499928379c4274a307855b9eeeb alsa-driver-0.5.11.tar.bz2
 MD5 88cabd12b0ed16152cb1981b466c053e ext3-2.4-0.9.1-246.gz
 MD5 3b04fb645ab68a081ab02079be937462 jfs-1.0.0-patch.tar.gz
 MD5 f0fce862f60daf4cb8d7c5b589d01158 linux-2.4.6.tar.bz2
+MD5 1ce6fb607f26dc20d4c77461057acb3c lvm_0.9.1_beta7.tar.gz
 MD5 f913c7246544b4a635e52734e99cba1f pcmcia-cs-3.1.27.tar.gz
diff --git a/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
index b4fdd91e1a15..52defbdc4ca9 100644
--- a/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
+++ b/sys-kernel/linux-sources/linux-sources-2.4.6.ebuild
@@ -22,12 +22,11 @@ fi
 #
 # Reiserfs             Y         -                 Production-ready
 # JFS                  N         jfs               Testing-only (commented out for now)
-# LVM                  Y         lvm               Production-ready
+# LVM                  Y         lvm               almost production-ready (still has race conditions during pvmove)
 # ext3                 Y         ext3              Production-ready
 # MOSIX                Y         mosix             Testing only
 # XFS                  N         xfs               Will add soon
 # PCMCIA-CS            Y         pcmcia            Need to move this to its own ebuild
-# ALSA                 N         alsa              Need to move this to its own ebuild
 # lm-sensors           N         lm_sensors        Need to move this to its own ebuild
 
 LVMV=0.9.1_beta7
@@ -50,24 +49,16 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	http://prdownloads.sourceforge.net/pcmcia-cs/pcmcia-cs-${PCV}.tar.gz
 	http://www.zip.com.au/~akpm/ext3-${EXT3V}.gz
 	http://oss.software.ibm.com/developerworks/opensource/jfs/project/pub/jfs-1.0.0-patch.tar.gz
-	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${MOSV}.tar.gz"
-	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMV}.tar.gz
+	ftp://ftp.cs.huji.ac.il/users/mosix/MOSIX-${MOSV}.tar.gz
+	ftp://ftp.sistina.com/pub/LVM/0.9.1_beta/lvm_${LVMV}.tar.gz"
 fi
 #	http://www.netroedge.com/~lm78/archive/lm_sensors-${SENV}.tar.gz
 #	http://www.netroedge.com/~lm78/archive/i2c-${SENV}.tar.gz
-#	ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${AV}.tar.bz2
 	
 if [ "$PN" != "linux-extras" ]
 then
 	PROVIDE="virtual/kernel"
 fi
-#if [ "$PN" != "linux-sources" ]
-#then
-#	if [ "`use alsa`" ]
-#	then
-#		PROVIDE="$PROVIDE virtual/alsa"
-#	fi
-#fi
 
 HOMEPAGE="http://www.kernel.org/
 	  http://www.netroedge.com/~lm78/
@@ -75,13 +66,19 @@ HOMEPAGE="http://www.kernel.org/
 	  http://www.sistina.com/lvm/
 	  http://pcmcia-cs.sourceforge.net"
 
-
+DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl"
 #these deps are messed up; fix 'em and add ncurses (required my mosix compile, menuconfig)
-if [ $PN != "linux-extras" ] ; then
-    RDEPEND=">=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
-    DEPEND=">=sys-apps/modutils-2.4.2 sys-devel/perl"
+if [ $PN = "linux" ]
+then
+	RDEPEND="mosix? ( ~sys-apps/mosix-user-1.0.5 ) >=sys-apps/e2fsprogs-1.22 >=sys-apps/util-linux-2.11f >=sys-apps/reiserfs-utils-3.6.25-r1"
+elif [ $PN = "linux-sources" ]
+then
+	#ncurses is required for "make menuconfig"
+	RDEPEND=">=sys-libs/ncurses-5.2"
 else
-    DEPEND=">=sys-kernel/${PF/extras/sources}"
+	#linux extras
+fi
+    DEPEND=">=sys-kernel/linux-sources-${PVR}"
 fi
 if [ "`use build`" ] && [ $PN = "linux-sources" ] ; then
     DEPEND=""
@@ -93,7 +90,9 @@ LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/incl
 
 src_unpack() {
 
-    # We only need to unpack for linux and linux-sources
+    mkdir ${S2}
+	
+	# We only need to unpack for linux and linux-sources
 
     if [ ! "$PN" = "linux-extras" ]
 	then
@@ -103,9 +102,11 @@ src_unpack() {
 		unpack linux-${OKV}.tar.bz2
 		try mv linux linux-${KV}
 		cd ${S}
-#		echo "Applying ${KV} patch..."
-#		try bzip2 -dc ${DISTDIR}/patch-${KV}.bz2 | patch -p1
-		
+		if [ "$KV" != "$OKV" ]
+		then
+			echo "Applying ${KV} patch..."
+			try bzip2 -dc ${DISTDIR}/patch-${KV}.bz2 | patch -p1
+		fi
 #		This patch is just *too* unweildy and creates tons of rejects all over the place (boo!)
 #		echo "Applying XFS patch..."
 #		local x
@@ -122,14 +123,10 @@ src_unpack() {
 			cd ${S2}
 			mkdir MOSIX-${MOSV}
 			cd MOSIX-${MOSV}
-			unpack MOSIX-${MOSV}.tar.gz
+			tar xzf MOSIX-${MOSV}.tar.gz patches.${OKV} kernel.new.${OKV}.tar
 			cd ${S}
 			try cat ${S2}/MOSIX-${MOSV}/patches.2.4.6 | patch -p0
 			tar -x --no-same-owner -vf ${S2}/MOSIX-${MOSV}/kernel.new.2.4.6.tar
-			cd ${S2}
-			mkdir user
-			tar -x --no-same-owner -vf user.tar -C user
-			rm user.tar
 		fi
 		
 		cd ${S}
@@ -156,14 +153,6 @@ src_unpack() {
 			try patch -p0 < ${FILESDIR}/${KV}/lvm.c.diff
 		fi
     
-#		if [ "`use alsa`" ]
-#		then  
-#			#unpack alsa drivers
-#			echo "Unpacking ALSA drivers..."
-#			cd ${S}/extras
-#			unpack alsa-driver-${AV}.tar.bz2
-#		fi
-    
 #		if [ "`use lm_sensors`" ]
 #		then
 #			#unpack and apply the lm_sensors patch
@@ -252,8 +241,8 @@ src_unpack() {
     
 		#fix silly permissions in tarball
 		cd ${WORKDIR}
-		chown -R 0.0 ${S}
-		chmod -R a+r-w+X,u+w ${S}
+		chown -R 0.0 *
+		chmod -R a+r-w+X,u+w *
 	
 	fi
 }
@@ -307,32 +296,6 @@ src_compile() {
 			#LEX=\""flex -l"\" modules
 		fi
 		
-#This is moving into its own package RSN
-# This must come after the kernel compilation in linux
-#		if [ "`use alsa`" ]
-#		then
-#			cd ${KS}/extras/alsa-driver-${AV}
-#			# This is needed for linux-extras
-#			if [ -f "Makefile.conf" ] 
-#			then
-#				try make clean
-#			fi
-#			try ./configure --with-kernel=\"${KS}\" --with-isapnp=yes --with-sequencer=yes --with-oss=yes --with-cards=all
-#			try make
-#		fi
-		
-		if [ "`use mosix`" ]
-		then
-			cd ${KS2}/MOSIX-${MOSV}
-			local x
-			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
-			do
-				cd $x
-				make
-				cd ../..
-			done
-		fi
-
 		if [ "`use pcmcia-cs`" ]
 		then
 			cd ${KS2}/pcmcia-cs-${PCV}
@@ -352,73 +315,10 @@ src_compile() {
 }
 
 src_install() {
-    # We install the alsa headers in all three packages
-#   if [ "`use alsa`" ]
-#	then
-#		#i get alsa includes
-#		cd ${KS}/extras/alsa-driver-${AV}
-#		insinto /usr/src/linux-${KV}/include/linux
-#		cd include
-#		doins asound.h asoundid.h asequencer.h ainstr_*.h
-#   fi
-
-	if [ ! "${PN}" = "linux-sources" ]
+	if [ "${PN}" != "linux-sources" ]
     then
 		dodir /usr/lib
 	
-		if [ "`use mosix`" ]
-		then
-			cd ${KS2}/MOSIX-${MOSV}
-			dodir /usr/lib /usr/include
-			dolib.a libmos.a
-			dolib.so libmos.so.0
-			ln -s libmos.so.0 ${D}/usr/lib/libmos.so
-			insinto /usr/include
-			doins *.h
-
-			cd ../../sbin/setpe
-			doman setpe.1
-			into /
-			dosbin setpe
-
-			cd ../tune
-			dosbin tune mtune tunepass tune_kernel prep_tune
-			doman tune.1
-
-			cd ../../bin/mosrun
-			dobin mosrun nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
-			doman mosrun.1
-			local x
-			for x in nomig runhome runon cpujob iojob nodecay slowdecay fastdecay
-			do
-				ln -s mosrun.1.gz ${D}/usr/share/man/man1/${x}.1.gz
-			done
-
-			cd ../../usr.bin/mon
-			into /usr
-			dobin mon
-			doman mon.1
-
-			cd ../migrate
-			dobin migrate
-			doman migrate.1
-
-			cd ../mosctl
-			dobin mosctl
-			doman mosctl.1
-
-			exeinto /etc/rc.d/init.d
-			newexe ${FILESDIR}/${KV}/mosix.init mosix
-		
-			cd ${KS2}/MOSIX-${MOSV}
-			for x in lib/moslib sbin/setpe sbin/tune bin/mosrun usr.bin/mon usr.bin/migrate usr.bin/mosctl
-			do
-				cd ${x}
-				make clean
-				cd ../..
-			done
-		fi
-		
 		if [ "`use lvm`" ]
 		then
 			cd ${KS2}/LVM/${LVMV}/tools
@@ -439,7 +339,6 @@ src_install() {
 
 		if [ "${PN}" = "linux" ] 
 		then
-			dodir /usr/src
 			dodir /usr/src/linux-${KV}
 			cd ${D}/usr/src
 			#grab includes and documentation only
@@ -468,14 +367,6 @@ src_install() {
 			ln -sf /usr/src/linux-${KV} build
 		fi
 
-#       if [ "`use alsa`" ]
-#       then
-#		  	#install ALSA modules
-#           cd ${KS}/extras/alsa-driver-${AV}
-#			dodoc INSTALL FAQ
-#			dodir /lib/modules/${KV}/misc
-#			cp modules/*.o ${D}/lib/modules/${KV}/misc
-#       fi
 		if [ "`use pcmcia-cs`" ]
 		then
 			#install PCMCIA modules and utilities
@@ -488,7 +379,6 @@ src_install() {
 	else
 		dodir /usr/src
 		cd ${S}
-		#make mrproper
 
 		if [ "`use build`" ] ; then
 			dodir /usr/src/linux-${KV}
@@ -497,7 +387,7 @@ src_install() {
 			cp -ax ${S}/include ${D}/usr/src/linux-${KV}
 		else
 			echo ">>> Copying sources..."
-			cp -ax ${S} ${D}/usr/src
+			cp -ax ${WORKDIR}/* ${D}/usr/src
 		fi
 	fi	
     if [ "$PN" != "linux-extras" ]