1 |
ikelos 08/09/30 16:45:02 |
2 |
|
3 |
Added: 000_all_initd-location.patch |
4 |
001_all_fix-permissions.patch |
5 |
002_all_pagebreak-detection-fix.patch |
6 |
004_all_do-not-build-modules.patch |
7 |
007_all_use-modprobe-over-insmod.patch |
8 |
009_all_init.d-modules-warning.patch |
9 |
Log: |
10 |
Clear out old/masked versions and bump to 5.5.8 and 6.0.5. |
11 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) |
12 |
(Signed Manifest commit) |
13 |
|
14 |
Revision Changes Path |
15 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/000_all_initd-location.patch |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/000_all_initd-location.patch?rev=1.1&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/000_all_initd-location.patch?rev=1.1&content-type=text/plain |
19 |
|
20 |
Index: 000_all_initd-location.patch |
21 |
=================================================================== |
22 |
--- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000 |
23 |
+++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000 |
24 |
@@ -8433,7 +8433,7 @@ |
25 |
error('Please shut down any running VMs and run this script again.' . |
26 |
"\n\n"); |
27 |
} else { |
28 |
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') |
29 |
+ if (system(shell_string('/etc/init.d' . '/vmware') |
30 |
. ' stop')) { |
31 |
error('Unable to stop services for ' . vmware_product_name() . |
32 |
"\n\n"); |
33 |
@@ -8463,8 +8463,8 @@ |
34 |
} |
35 |
if (vmware_product() ne 'server') { |
36 |
configure_gtk2(); |
37 |
- createMimePackageFile(); |
38 |
- configureDesktopFiles(); |
39 |
+# createMimePackageFile(); |
40 |
+# configureDesktopFiles(); |
41 |
configure_mon(); |
42 |
configure_pp(); |
43 |
configure_net(); |
44 |
@@ -8532,7 +8532,7 @@ |
45 |
db_save(); |
46 |
# Then start VMware's services |
47 |
if (!$gOption{'skipstopstart'}) { |
48 |
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); |
49 |
+ system(shell_string('/etc/init.d' . '/vmware') . ' start'); |
50 |
print "\n"; |
51 |
} |
52 |
|
53 |
|
54 |
|
55 |
|
56 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/001_all_fix-permissions.patch |
57 |
|
58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/001_all_fix-permissions.patch?rev=1.1&view=markup |
59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/001_all_fix-permissions.patch?rev=1.1&content-type=text/plain |
60 |
|
61 |
Index: 001_all_fix-permissions.patch |
62 |
=================================================================== |
63 |
diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
64 |
--- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500 |
65 |
+++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500 |
66 |
@@ -7327,7 +7327,10 @@ |
67 |
error('Unable to write configuration file "' . $name . '".' . "\n\n"); |
68 |
} |
69 |
db_add_file($name, 0x1); |
70 |
- safe_chmod(0644, $name); |
71 |
+ safe_chmod(0664, $name); |
72 |
+ my $gid = (getgrnam('vmware'))[2]; |
73 |
+ my $uid = (stat($name))[4]; |
74 |
+ safe_chown($uid,$gid,$name); |
75 |
|
76 |
# Append the promotional configuration if it exists |
77 |
$promoconfig = $libdir . '/configurator/PROMOCONFIG'; |
78 |
|
79 |
|
80 |
|
81 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/002_all_pagebreak-detection-fix.patch |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/002_all_pagebreak-detection-fix.patch?rev=1.1&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/002_all_pagebreak-detection-fix.patch?rev=1.1&content-type=text/plain |
85 |
|
86 |
Index: 002_all_pagebreak-detection-fix.patch |
87 |
=================================================================== |
88 |
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl |
89 |
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100 |
90 |
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100 |
91 |
@@ -2015,9 +2015,9 @@ |
92 |
. shell_string($pattern)); |
93 |
chomp($header_page_offset); |
94 |
# Ignore PAGE_OFFSET if we cannot parse it. |
95 |
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) { |
96 |
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) { |
97 |
# We found a valid page offset |
98 |
- $header_page_offset = $1; |
99 |
+ $header_page_offset = $2; |
100 |
if (defined($gSystem{'page_offset'}) and |
101 |
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) { |
102 |
if ($source eq 'user') { |
103 |
|
104 |
|
105 |
|
106 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/004_all_do-not-build-modules.patch |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/004_all_do-not-build-modules.patch?rev=1.1&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/004_all_do-not-build-modules.patch?rev=1.1&content-type=text/plain |
110 |
|
111 |
Index: 004_all_do-not-build-modules.patch |
112 |
=================================================================== |
113 |
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl |
114 |
--- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000 |
115 |
+++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000 |
116 |
@@ -8571,10 +8571,10 @@ |
117 |
configure_gtk2(); |
118 |
# createMimePackageFile(); |
119 |
# configureDesktopFiles(); |
120 |
- configure_mon(); |
121 |
- configure_pp(); |
122 |
+# configure_mon(); |
123 |
+# configure_pp(); |
124 |
configure_net(); |
125 |
- build_vmnet(); |
126 |
+# build_vmnet(); |
127 |
} |
128 |
|
129 |
# Create the directory for the UNIX domain sockets |
130 |
|
131 |
|
132 |
|
133 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch |
134 |
|
135 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch?rev=1.1&view=markup |
136 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch?rev=1.1&content-type=text/plain |
137 |
|
138 |
Index: 007_all_use-modprobe-over-insmod.patch |
139 |
=================================================================== |
140 |
diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh |
141 |
--- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000 |
142 |
+++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000 |
143 |
@@ -538,7 +538,7 @@ |
144 |
} |
145 |
|
146 |
vmware_load_module() { |
147 |
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 |
148 |
+ /sbin/modprobe -s "$1" || exit 1 |
149 |
exit 0 |
150 |
} |
151 |
|
152 |
|
153 |
|
154 |
|
155 |
1.1 app-emulation/vmware-workstation/files/5.5.8.108000/009_all_init.d-modules-warning.patch |
156 |
|
157 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/009_all_init.d-modules-warning.patch?rev=1.1&view=markup |
158 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-workstation/files/5.5.8.108000/009_all_init.d-modules-warning.patch?rev=1.1&content-type=text/plain |
159 |
|
160 |
Index: 009_all_init.d-modules-warning.patch |
161 |
=================================================================== |
162 |
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh |
163 |
--- vmware-server-distrib.orig/installer/services.sh 2006-07-01 03:14:16.000000000 +0000 |
164 |
+++ vmware-server-distrib/installer/services.sh 2006-07-14 11:59:28.000000000 +0000 |
165 |
@@ -606,8 +606,13 @@ |
166 |
start) |
167 |
if [ -e "$vmware_etc_dir"/not_configured ]; then |
168 |
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured' |
169 |
- echo 'for the running kernel. To (re-)configure it, invoke the' |
170 |
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.' |
171 |
+ echo 'for the running kernel.' |
172 |
+ echo |
173 |
+ echo 'Please ensure that the modules have been compiled for this kernel:' |
174 |
+ echo ' emerge --oneshot vmware-modules' |
175 |
+ echo |
176 |
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:' |
177 |
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl' |
178 |
echo |
179 |
|
180 |
exit 1 |