From bfc5dda027ed1fe66e106ba153d429c6a85c3b90 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 30 Dec 2003 23:46:04 +0000 Subject: Fixed misc 2.6 problems. Bumping to stable on x86. Closing Bug #36116 and Bug #36107. --- app-emulation/vmware-workstation/ChangeLog | 7 +- app-emulation/vmware-workstation/Manifest | 5 +- .../files/vmware-26kern-init-gentoo.patch | 85 ++++++++++++++++++++++ .../vmware-workstation-4.0.5.6030.ebuild | 8 +- 4 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch (limited to 'app-emulation') diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog index ef301ac857ee..ea6427a98079 100644 --- a/app-emulation/vmware-workstation/ChangeLog +++ b/app-emulation/vmware-workstation/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/vmware-workstation # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.26 2003/12/04 15:20:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.27 2003/12/30 23:45:56 wolf31o2 Exp $ + + 30 Dec 2003; Chris Gianelloni + vmware-workstation-4.0.5.6030.ebuild, files/vmware-26kern-init-gentoo.patch: + Fixed misc 2.6 problems. Bumping to stable on x86. Closing Bug #36116 and Bug + #36107. 04 Dec 2003; Chris Gianelloni vmware-workstation-4.0.5.6030.ebuild: diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index 96f044373bcd..b6b0b3458694 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -1,12 +1,13 @@ MD5 30fde7b9d9f138de1671667fc959483d vmware-workstation-4.0.2.5592-r1.ebuild 6662 MD5 9e78f6958425d0676df3e19dcab57bd7 vmware-workstation-3.2.1.2242-r1.ebuild 6743 -MD5 fe1adae881f1c62256681aa5dbac666d vmware-workstation-4.0.5.6030.ebuild 6751 -MD5 74accc654460e8a2d07c35fceb6e3ffd ChangeLog 7679 +MD5 92d86909ca4d5408c6ce2ebf2eae70bf vmware-workstation-4.0.5.6030.ebuild 6853 +MD5 2d95a041cafe7c03befb5f25dad8918f ChangeLog 7903 MD5 bda09e992bf673c85bb424eb5e3dddcb metadata.xml 507 MD5 48c1667773503fee21a1068da07440b9 files/90vmware 70 MD5 a7dcdc198780d005b5f9b349a345fbee files/digest-vmware-workstation-3.2.1.2242-r1 158 MD5 63e8db623fa8cd0faefe346e049d6fcf files/vmware.rc 1430 MD5 ee4be8534a887489bd8abe11bfc97731 files/digest-vmware-workstation-4.0.5.6030 158 +MD5 5c852829f9043917fddc2f80ebb99802 files/vmware-26kern-init-gentoo.patch 3983 MD5 b2cb31a62c30e2bfd9a43046cf73def5 files/digest-vmware-workstation-4.0.2.5592-r1 158 MD5 7ca1ec14670b51d8cf824a58bc8d6621 files/vmware.png 470 MD5 48c1667773503fee21a1068da07440b9 files/3.2.1.2242/90vmware 70 diff --git a/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch b/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch new file mode 100644 index 000000000000..d9e0f8d7464d --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-26kern-init-gentoo.patch @@ -0,0 +1,85 @@ +--- installer/services.sh 2003-10-02 08:00:37.000000000 +0900 ++++ installer/services.sh 2003-12-20 01:12:19.835868864 +0900 +@@ -632,11 +632,12 @@ + + # Start the virtual machine parallel port kernel service + vmware_start_vmppuser() { +- if ! grep -q ' parport_release[^'$'\t'']*$' /proc/ksyms; then ++ test -f /proc/ksyms && ksyms=/proc/ksyms || ksyms=/proc/kallsyms ++ if ! grep -q ' parport_release[^'$'\t'']*$' $ksyms; then + # parport support is not built in the kernel + /sbin/modprobe parport || exit 1 + fi +- if ! grep -q ' parport_pc_[^'$'\t'']*$' /proc/ksyms; then ++ if ! grep -q ' parport_pc_[^'$'\t'']*$' $ksyms; then + # parport_pc support is not built in the kernel + /sbin/modprobe parport_pc || exit 1 + fi +--- bin/vmware-config.pl 2003-10-02 08:00:36.000000000 +0900 ++++ bin/vmware-config.pl 2003-12-20 01:11:05.144216413 +0900 +@@ -513,6 +513,7 @@ + my $cConnectSocketDir = '/var/run/vmware'; + my $machine = 'host'; + my $os = 'host'; ++my $ksyms = -f '/proc/ksyms' ? ' /proc/ksyms' : ' /proc/kallsyms'; + if (vmware_product() eq 'server') { + $machine = 'machine'; + $os = "Console OS"; +@@ -2211,7 +2212,7 @@ + $gSystem{'smp'} = (direct_command(shell_string($gHelper{'uname'}) + . ' -v') =~ / SMP /) ? 'yes' : 'no'; + $gSystem{'versioned'} = (direct_command(shell_string($gHelper{'grep'}) . ' ' +- . shell_string('^[0-9a-fA-F]\{8\} Using_Versions') . ' /proc/ksyms') ++ . shell_string('^[0-9a-fA-F]\{8\} Using_Versions') . $ksyms) + eq '') ? 'no' : 'yes'; + } + +@@ -2224,7 +2225,7 @@ + + @fields = split(' ', direct_command( + shell_string($gHelper{'grep'}) . ' ' +- . shell_string('^[0-9a-fA-F]\{8\} printk') . ' /proc/ksyms')); ++ . shell_string('^[0-9a-fA-F]\{8\} printk') . $ksyms)); + if (defined($fields[0])) { + my $first; + +@@ -2248,7 +2249,7 @@ + # Linux kernel build bug + $gSystem{'build_bug'} = (direct_command(shell_string($gHelper{'grep'}) . ' ' + . shell_string('^[0-9a-fA-F]\{8\} __global_cli_R__ver___global_cli') +- . ' /proc/ksyms') eq '') ? 'no' : 'yes'; ++ . $ksyms) eq '') ? 'no' : 'yes'; + } + + # Warning, the return after the end of the if statement +@@ -2287,10 +2288,10 @@ + if ($gSystem{'version_integer'} < kernel_version_integer(2, 1, 0)) { + if ( (direct_command(shell_string($gHelper{'grep'}) . ' ' + . shell_string('^[0-9a-fA-F]\{8\} misc_register') +- . ' /proc/ksyms') eq '') ++ . $ksyms) eq '') + || (direct_command(shell_string($gHelper{'grep'}) . ' ' + . shell_string('^[0-9a-fA-F]\{8\} misc_deregister') +- . ' /proc/ksyms') eq '')) { ++ . $ksyms) eq '')) { + error('You are running a Linux kernel version ' + . $gSystem{'version_utsclean'} . ' that was not built with the ' + . 'CONFIG_UMISC configuration parameter set. ' +@@ -2886,7 +2887,7 @@ + # make sure it is loaded before beginning our tests + if (direct_command(shell_string($gHelper{'grep'}) . ' ' + . shell_string(' parport_release[^' . "\t" . ']*$') +- . ' /proc/ksyms') eq '') { ++ . $ksyms) eq '') { + # This comment fixes emacs's broken syntax highlighting + # parport support is not built in the kernel + if (system(shell_string($gHelper{'modprobe'}) +@@ -2908,7 +2909,7 @@ + # make sure it is loaded before beginning our tests + if (direct_command(shell_string($gHelper{'grep'}) . ' ' + . shell_string(' parport_pc_[^' . "\t" . ']*$') +- . ' /proc/ksyms') eq '') { ++ . $ksyms) eq '') { + # This comment fixes emacs's broken syntax highlighting + # parport_pc support is not built in the kernel + if (system(shell_string($gHelper{'modprobe'}) diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild index b1c1aa22dfe0..52dbf810da17 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild,v 1.5 2003/12/04 15:20:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.0.5.6030.ebuild,v 1.6 2003/12/30 23:45:56 wolf31o2 Exp $ # Unlike many other binary packages the user doesn't need to agree to a licence # to download VMWare. The agreeing to a licence is part of the configure step @@ -9,7 +9,7 @@ inherit eutils S=${WORKDIR}/vmware-distrib -N26KernSupport="vmware-any-any-update43" +N26KernSupport="vmware-any-any-update45" NP="VMware-workstation-4.0.5-6030" DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html" @@ -27,7 +27,7 @@ SRC_URI="http://vmware-svca.www.conxion.com/software/wkst/${NP}.tar.gz LICENSE="vmware" SLOT="0" -KEYWORDS="-* ~x86" +KEYWORDS="-* x86" RESTRICT="nostrip" DEPEND="virtual/glibc @@ -42,6 +42,8 @@ src_unpack() { unpack ${NP}.tar.gz if [ "${KV:0:3}" == "2.6" ] || [ "${KV:0:3}" == "2.5" ] ; then einfo "Adding 2.{5,6}.x kernel support" + # Fix from Georgi Georgiev (chutz@chubaka.net) + epatch ${FILESDIR}/vmware-26kern-ksyms-gentoo.patch unpack ${N26KernSupport}.tar.gz mv ${N26KernSupport}/*.tar ${S}/lib/modules/source/ else -- cgit v1.2.3-65-gdbad