Added new ebuild with the migshm patch. Closes #32312. Cleaned out old ebuilds.

8 files changed, 129 insertions, 89 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index 2c694393cd20..e786232a5f56 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.30 2003/12/05 17:18:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.31 2003/12/27 11:20:14 tantive Exp $
+
+*openmosix-sources-2.4.21-r1 (27 Dec 2003)
+
+  27 Dec 2003; Michael Imhof <tantive@gentoo.org> openmosix-sources-2.4.21-r1.ebuild,
+  openmosix-sources-2.4.22-r1.ebuild, openmosix-sources-2.4.22.ebuild:
+  Cleaned out old ebuilds.
+
+  27 Dec 2003; Michael Imhof <tantive@gentoo.org> openmosix-sources-2.4.21-r1.ebuild:
+  Added new version with migshm-patch. Closes #32312.
 
   02 Dec 2003; Brian Jackson <iggy@gentoo.org> files/do_brk_fix.patch:
   Fix the 'do_brk' patch as it wasn't applying correctly.
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 22d7766a68f8..d334189c1cd7 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -2,14 +2,10 @@ MD5 5de707573772ebd655af578010d11ab8 openmosix-sources-2.4.20-r6.ebuild 3254
 MD5 249fc41c404cdf5a1d7de7742a6ea215 openmosix-sources-2.4.21.ebuild 3254
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 1530e5efae61f6dc42b3362d147c4ae3 openmosix-sources-2.4.22-r2.ebuild 1337
-MD5 8f43e9ef9b1c9d845cbbd9c588686994 ChangeLog 2641
-MD5 dc4c95c986f736c8574459500618e31a openmosix-sources-2.4.22-r1.ebuild 1336
-MD5 22f47b2bec6b172bff9b7b9fdc628f35 openmosix-sources-2.4.22.ebuild 1333
-MD5 3c6df847cc8e9edc81ec49b468703adf openmosix-sources-2.4.21-r1.ebuild 3541
+MD5 60b227238c6018a7c38822d59b2586af ChangeLog 3009
+MD5 159ecd2fa93e2d8014a53a0e1f382a09 openmosix-sources-2.4.21-r1.ebuild 3547
 MD5 b86824eda82b7145748fffb251dc62d4 files/do_brk_fix.patch 472
-MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22 134
 MD5 f5cf28ccf74eccc21f96d399b429420b files/digest-openmosix-sources-2.4.21 134
 MD5 518e0cc8ace05bda990128ccf3d11c32 files/digest-openmosix-sources-2.4.21-r1 192
 MD5 efe1d77bc50e3b37a4dcc0154edd1862 files/digest-openmosix-sources-2.4.22-r2 134
 MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r6 133
-MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22-r1 134
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r1
new file mode 100644
index 000000000000..6484c2c7bbcf
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r1
@@ -0,0 +1,3 @@
+MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
+MD5 c0f06cde9049b2e17fbc286532dbb2d4 openMosix-2.4.21-1.bz2 276962
+MD5 1f188f167710e419bfd844428bae974b Migshm-1.4.tgz 34128
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22
deleted file mode 100644
index 3a5463196016..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 5456d942d2d5327254a3b243654e529c openMosix-2.4.22-1.bz2 252954
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r1
deleted file mode 100644
index 3a5463196016..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 5456d942d2d5327254a3b243654e529c openMosix-2.4.22-1.bz2 252954
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r1.ebuild
new file mode 100644
index 000000000000..8624cfc2b2e0
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r1.ebuild,v 1.1 2003/12/27 11:20:14 tantive Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+#we use this next variable to avoid duplicating stuff on cvs
+GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
+OKV=2.4.21
+[ "${PR}" == "r0" ] && KV=${OKV}-openmosix || KV=${OKV}-openmosix-${PR}
+EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
+S=${WORKDIR}/linux-${KV}
+ETYPE="sources"
+
+# What's in this kernel?
+
+# INCLUDED:
+#   2.4.21, plus:
+#   2.4.21  openmosix-2.4.21-1
+#	Experimental Migshm-1.4 threading/shared memory support patch
+
+DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://sourceforge/openmosix/openMosix-2.4.21-1.bz2 http://mcaserta.com/maask/Migshm-1.4.tgz"
+PROVIDE="virtual/linux-sources"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-* x86"
+
+
+if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
+then
+	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
+	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
+	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
+fi
+
+[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+	unpack Migshm-1.4.tgz
+	mv linux-${OKV} linux-${KV} || die
+	cd ${S}
+	cat ${DISTDIR}/openMosix-2.4.21-1.bz2 | bzip2 -d | patch -p1 || die
+
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
+	# Gentoo Linux uses /boot, so fix 'make install' to work properly
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+	    -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
+		Makefile.orig > Makefile || die # test, remove me if Makefile ok
+	rm Makefile.orig
+#	rm Makefile~
+
+	# This is the experimental Migshm-1.4 patch...
+	cat ${WORKDIR}/Migshm-1.4/patch-Migshm-2.4.21.tgz | gzip -d | patch -p1 || die
+	rm -rf ${WORKDIR}/Migshm-1.4
+
+	#sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die
+
+	#this file is required for other things to build properly, so we autogenerate it
+	make include/linux/version.h || die
+
+	#fix silly permissions in tarball
+	cd ${WORKDIR}
+	chown -R root:root *
+	chmod -R a+r-w+X,u+w *
+}
+
+src_compile() {
+	if [ "$ETYPE" = "headers" ]
+	then
+		yes "" | make oldconfig
+		echo "Ignore any errors from the yes command above."
+	fi
+}
+
+src_install() {
+	if [ "$ETYPE" = "sources" ]
+	then
+		dodir /usr/src
+		echo ">>> Copying sources..."
+		mv ${WORKDIR}/* ${D}/usr/src
+	else
+		#linux-headers
+		dodir /usr/include/linux
+		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
+		rm -rf ${D}/usr/include/linux/modules
+		dodir /usr/include/asm
+		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
+	fi
+}
+
+pkg_preinst() {
+	if [ "$ETYPE" = "headers" ]
+	then
+		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
+		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
+		true
+	fi
+}
+
+pkg_postinst() {
+	[ "$ETYPE" = "headers" ] && return
+	if [ ! -e ${ROOT}usr/src/linux ]
+	then
+		rm -f ${ROOT}usr/src/linux
+		ln -sf linux-${KV} ${ROOT}/usr/src/linux
+	fi
+}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r1.ebuild
deleted file mode 100644
index d681e2f881be..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r1.ebuild,v 1.1 2003/12/02 07:45:47 iggy Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV="2.4.22"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-1
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-2.4.22-1.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-2.4.22-1.bz2|patch -p1 || die "-openmosix patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
deleted file mode 100644
index ea1a112f5f1a..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22.ebuild,v 1.6 2003/12/01 22:58:29 iggy Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-
-OKV="2.4.22"
-[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-1
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-2.4.22-1.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-2.4.22-1.bz2|patch -p1 || die "-openmosix patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	kernel_universal_unpack
-}