app-emulation/vmware-server: delete old files

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/vmware@1737 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-12-24 15:40:51 +00:00
parent 4955024c9d
commit db2854dbeb
10 changed files with 12 additions and 167 deletions

View File

@ -2,6 +2,17 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.61 2009/12/18 16:14:42 vadimk Exp $
24 Dec 2009; Mario Fetka <mario.fetka@gmail.com> -files/2.0.1.156745,
-files/2.0.1.156745/000_all_initd-location.patch,
-files/2.0.1.156745/001_all_fix-permissions.patch,
-files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
-files/2.0.1.156745/004_all_do-not-build-modules.patch,
-files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
-files/2.0.1.156745/009_all_init.d-modules-warning.patch,
-files/2.0.1.156745/011_all_legit-modules-only.patch,
-files/2.0.1.156745/012_all_rc-config.patch:
delete old files
24 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+vmware-server-1.0.8.126538.ebuild,
+files/2.0.1.156745/000_all_initd-location.patch,

View File

@ -1,11 +1,3 @@
AUX 2.0.1.156745/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
AUX 2.0.1.156745/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
AUX 2.0.1.156745/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
AUX 2.0.1.156745/004_all_do-not-build-modules.patch 553 RMD160 6dd19e4a7626f97354f4cb1725aeba306d72e113 SHA1 7b949213c10681026eb22fe6a6e96af482931e2c SHA256 39884f9af3d85883b06beb6678ad12e5fed32bded8a039b49c680336011425ec
AUX 2.0.1.156745/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c8342e00fe8e04c76f08f0901a6539a SHA1 62d4a5ee744c36fa59b44e4382338760e67e88e1 SHA256 68cb51ad4ea3a24faa1101c3a72cd17f61fcdb901af5fa93a9eeaad5b6c9383d
AUX 2.0.1.156745/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
AUX 2.0.1.156745/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
AUX 2.0.1.156745/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
AUX 2.0.2.203138/000_all_initd-location.patch 1259 RMD160 edced247443fc535e5a6b98404153e970721e5aa SHA1 9a36424152bc38aba53c66cea983a41f0b23baff SHA256 5e163e7232a260ea6bff570180756807f9587ab5cf836c9c293d7162d788c062
AUX 2.0.2.203138/001_all_fix-permissions.patch 702 RMD160 9d77ba6ff6cba0b9ee529777870470028c687f22 SHA1 863278b6cfadca04ae539bc858731658074ed01e SHA256 8f5fac381a2eda0f1da8a521fcb0ef17b139bf5b8b926425946534e802ce8307
AUX 2.0.2.203138/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
@ -38,5 +30,5 @@ EBUILD vmware-server-1.0.10.203137.ebuild 2997 RMD160 6e96bbcbf49a342e07f5492d57
EBUILD vmware-server-1.0.8.126538.ebuild 2989 RMD160 3a22b7e35954720de1a81055572cebcb7db007b0 SHA1 a638eb4dfe6bc6161a9cd6f6006a1c275cd71264 SHA256 751e72adba53ba20f2370c700b5dd9a6cb2ee5f6b5e5f828608750505b414e2a
EBUILD vmware-server-1.0.9.156507.ebuild 2989 RMD160 7cffef1e863b926c7ecd9ec9646e4ff53ea5813c SHA1 1dfdc02f3248b396565a4bd216b3c806e1ac4ad0 SHA256 5583d0b5ed2e67b6136fc8b0746f0c4883652f9cb399f2509cbdaba8cb2fbcf3
EBUILD vmware-server-2.0.2.203138.ebuild 9607 RMD160 ad3febab5eb3eea7af50ae615dacea010485e23e SHA1 89a0a7c7f757659f795a72bc40451157179f53c8 SHA256 0a31f29a384e8616d59ee4f1b8c72078a702f3479cc28211b6134987891a2f0f
MISC ChangeLog 13561 RMD160 9f315d19242bba20a82c3d57abaf8165165f6339 SHA1 d1287a839a91150abd319441ffdd2bce579568b5 SHA256 68edd4603f5723be8d5d7770476e60ffd7046ced318541054f1e040010f4da28
MISC ChangeLog 14102 RMD160 b80ce3b8571bfbbeeee9e7819aa1c4427f628e4d SHA1 43460dfaef20f9892f54a86159cf26e0edaaa279 SHA256 4c13f0354de0dc93ee529d874000c7bd6dc1db1836352961d89faf46778813ea
MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3

View File

@ -1,32 +0,0 @@
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:40:41.000000000 +0000
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:43:29.000000000 +0000
@@ -10162,7 +10162,7 @@
error('Please shut down any running VMs and run this script again.' .
"\n\n");
} else {
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
+ if (system(shell_string('/etc/init.d' . '/vmware')
. ' stop')) {
error('Unable to stop services for ' . vmware_product_name() . "\n\n");
}
@@ -10212,8 +10212,8 @@
if (isDesktopProduct()) {
build_vmblock();
- createMimePackageFile();
- configureDesktopFiles();
+ # createMimePackageFile();
+ # configureDesktopFiles();
if (vmware_binary() ne "vmplayer") {
configure_eclipse_plugin();
}
@@ -10283,7 +10283,7 @@
db_save();
# Then start VMware's services
if (!$gOption{'skip-stop-start'}) {
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
+ system(shell_string('/etc/init.d' . '/vmware') . ' start');
print "\n";
}

View File

@ -1,15 +0,0 @@
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
--- vmware-server-distrib.orig/bin/vmware-config.pl 2007-12-02 11:16:42.000000000 +0000
+++ vmware-server-distrib/bin/vmware-config.pl 2007-12-02 11:25:36.000000000 +0000
@@ -9097,7 +9097,10 @@
error('Unable to write configuration file "' . $name . '".' . "\n\n");
}
db_add_file($name, $cFlagTimestamp | $cFlagConfig);
- safe_chmod(0644, $name);
+ safe_chmod(0664, $name);
+ my $gid = (getgrnam('vmware'))[2];
+ my $uid = (stat($name))[4];
+ safe_chown($uid,$gid,$name);
# Append the promotional configuration if it exists
$promoconfig = $libdir . '/configurator/PROMOCONFIG';

View File

@ -1,15 +0,0 @@
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100
@@ -2015,9 +2015,9 @@
. shell_string($pattern));
chomp($header_page_offset);
# Ignore PAGE_OFFSET if we cannot parse it.
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
# We found a valid page offset
- $header_page_offset = $1;
+ $header_page_offset = $2;
if (defined($gSystem{'page_offset'}) and
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
if ($source eq 'user') {

View File

@ -1,26 +0,0 @@
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
index 363f9cb..7ffc212 100755
--- a/bin/vmware-config.pl
+++ b/bin/vmware-config.pl
@@ -10404,16 +10404,16 @@ sub main {
}
if (vmware_product() ne 'server') {
- configure_mon();
- configure_vmci();
- configure_vsock();
- configure_pp();
+ #configure_mon();
+ #configure_vmci();
+ #configure_vsock();
+ #configure_pp();
if (vmware_product() eq 'wgs') {
configure_net();
}
- build_vmnet();
+ #build_vmnet();
}
if (isDesktopProduct()) {

View File

@ -1,13 +0,0 @@
diff --git a/installer/services.sh b/installer/services.sh
index 402ad79..2fb53ab 100755
--- a/installer/services.sh
+++ b/installer/services.sh
@@ -755,7 +755,7 @@ vmware_run_vimsh_cmd() {
}
vmware_load_module() {
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
+ /sbin/modprobe -s "$1" || exit 1
return 0
}

View File

@ -1,19 +0,0 @@
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
--- vmware-server-distrib.orig/installer/services.sh 2007-12-02 12:08:09.000000000 +0000
+++ vmware-server-distrib/installer/services.sh 2007-12-02 12:12:08.000000000 +0000
@@ -823,8 +823,13 @@
check_configured() {
if [ -e "$vmware_etc_dir"/not_configured ]; then
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
- echo 'for the running kernel. To (re-)configure it, invoke the'
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
+ echo 'for the running kernel.'
+ echo
+ echo 'Please ensure that the modules have been compiled for this kernel:'
+ echo ' emerge --oneshot vmware-modules'
+ echo
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:'
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
echo
exit 1

View File

@ -1,13 +0,0 @@
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
index bb9d04f..458a14b 100755
--- a/bin/vmware-config.pl
+++ b/bin/vmware-config.pl
@@ -10315,7 +10315,7 @@ sub main {
if ($gOption{'tools-switch'} == 0) {
my @modules = non_vmware_modules_installed();
- if (scalar(@modules) > 0) {
+ if (scalar(@modules) < 0) {
my $osVersion = direct_command(shell_string($gHelper{'uname'}) . ' -r');
chomp($osVersion);
error("The following VMware kernel modules have been found on your " .

View File

@ -1,25 +0,0 @@
--- bin.old/vmware-config.pl 2009-07-02 17:56:08.873568674 -0400
+++ bin/vmware-config.pl 2009-07-02 17:56:59.000000000 -0400
@@ -1341,6 +1341,14 @@
}
}
+ # Try using Genoot's rc-config
+ if ($gHelper{'rc-config'} ne '') {
+ if(0 == system(shell_string($gHelper{'rc-config'}) . ' add '
+ . $service . ' default')) {
+ return;
+ }
+ }
+
# Set up vmware to start/stop at run levels 2, 3 and 5
link_runlevel(2, $service, $S_level, $K_level);
link_runlevel(3, $service, $S_level, $K_level);
@@ -2552,6 +2560,7 @@
}
$gHelper{'insserv'} = internal_which('insserv');
$gHelper{'chkconfig'} = internal_which('/sbin/chkconfig');
+ $gHelper{'rc-config'} = internal_which('/usr/bin/rc-config');
if (vmware_product() eq 'server' &&
$gHelper{'chkconfig'} eq '') {
error('No initscript installer found.' . "\n\n");