wok view get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff @ rev 3453

get-softmodem-driver: hsfmodem up to 7.80.02.04
author Dominique Corbex <domcox@users.sourceforge.net>
date Mon Jun 15 15:05:01 2009 +0200 (2009-06-15)
parents
children 60e75b775499
line source
1 diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak
2 --- hsfmodem-7.80.02.04full/config.mak 2009-02-20 22:30:12.000000000 +0100
3 +++ hsfmodem-7.80.02.04full-slitaz/config.mak 2009-06-15 11:49:13.000000000 +0200
4 @@ -55,7 +55,7 @@
5 # maximum number of modem units
6 CNXTMAXMDM=8
7
8 -ROOT=
9 +ROOT=$(DESTDIR)
10 PREFIX=$(ROOT)/usr
11
12 ETCDIR=$(ROOT)/etc
13 @@ -131,4 +131,4 @@
14 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
15 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
16 < $< > $@
17 - chmod --reference=$< $@
18 + chmod 755 $@
19 diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile
20 --- hsfmodem-7.80.02.04full/makefile 2009-02-23 22:51:37.000000000 +0100
21 +++ hsfmodem-7.80.02.04full-slitaz/makefile 2009-06-15 11:49:13.000000000 +0200
22 @@ -149,7 +149,7 @@
23 ifeq ($(RPMOPTEVAL),yes)
24 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
25 else
26 -RPMTARGETCPU=$(shell uname -i)
27 +RPMTARGETCPU=$(shell uname -m)
28 endif
29
30 ifneq ($(RPMOPTDEFINE),yes)
31 diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile
32 --- hsfmodem-7.80.02.04full/modules/Makefile 2009-04-24 03:03:57.000000000 +0200
33 +++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile 2009-06-15 11:49:13.000000000 +0200
34 @@ -20,7 +20,7 @@
35 include $(TOP)/config.mak
36
37 IMPORTED = $(TOP)/modules/imported
38 -MACHINE_ARCH := $(shell if uname --hardware-platform >/dev/null 2>&1 && ! uname --hardware-platform | grep -q "unknown"; then uname --hardware-platform; else uname --machine | sed 's/^i.86$$/i386/'; fi)
39 +MACHINE_ARCH := $(shell if uname -p >/dev/null 2>&1 && ! uname -p | grep -q "unknown"; then uname -p; else uname -m | sed 's/^i.86$$/i386/'; fi)
40 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
41 $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***)
42 endif
43
44 diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
45 --- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in 2009-04-23 17:32:18.000000000 +0200
46 +++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in 2009-06-15 14:08:02.000000000 +0200
47 @@ -74,7 +74,7 @@
48 answer="${region}"
49 ;;
50 *)
51 - answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
52 + answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
53 ;;
54 esac
55 fi
56 @@ -109,15 +109,13 @@
57 {
58 # Try to guess what region we're in, using the timezone settings
59
60 - localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
61 -
62 - if ! [ ${localtime_size} -gt 0 ]; then
63 + if [ ! -e /etc/TZ ]; then
64 return 1
65 fi
66
67 - zoneinfo_dir=/usr/share/zoneinfo
68 + zoneinfo_dir=/usr/share/softmodem
69
70 - if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
71 + if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then
72 return 1
73 fi
74
75 @@ -206,18 +204,11 @@
76 iso_VN=00BC # VIETNAM
77
78 (
79 - cd ${zoneinfo_dir} 2>/dev/null || return 1
80 - find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
81 - while read file; do
82 - cmp -s /etc/localtime $file || continue
83 -# in the egrep and sed regular expressions below, it is very important to
84 -# have tabs, not spaces
85 - egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab
86 - done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
87 - while read code; do
88 - eval "echo \${iso_${code}}"
89 - done | sort | uniq
90 + zone=`cat /etc/TZ`
91 + code=`grep $zone ${zoneinfo_dir}/hsfzone.tab | awk '{print $1}' | sort | uniq`
92 + eval "echo \${iso_${code}}"
93 return 0
94 +
95 )
96 }
97
98 @@ -1655,7 +1646,7 @@
99 update-modules
100 else
101 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
102 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
103 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
104 if ! cp ${modulesconf}.$$ ${modulesconf}; then
105 rm -f ${modulesconf}.$$ ${f}
106 exit 1
107 @@ -1681,7 +1672,7 @@
108 fi
109
110 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
111 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
112 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
113 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
114 rm -f ${modprobeconf}.$$ ${f}
115 exit 1
116 @@ -1729,7 +1720,7 @@
117 fi
118
119 if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
120 - rm -f /dev/modem
121 + echo
122 fi
123
124 rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
125 @@ -1753,7 +1744,7 @@
126 fi
127
128 echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
129 - echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@"
130 + echo "alias /dev/modem none"
131 echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@"
132 if [ "$1" = modulesconf ]; then
133 echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@"
134 @@ -1927,7 +1918,7 @@
135 REGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem
136 UNREGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \
137 > /etc/devfs/conf.d/@CNXTTARGET@.conf
138 - rm -f /dev/modem
139 + echo
140 which update-devfsd >/dev/null 2>&1 && update-devfsd
141 killall -HUP devfsd 2>/dev/null
142 else
143 @@ -1941,7 +1932,7 @@
144 cp /etc/devfsd.conf.$$ /etc/devfsd.conf
145 fi
146 rm -f /etc/devfsd.conf.$$
147 - rm -f /dev/modem
148 + echo
149 killall -HUP devfsd 2>/dev/null
150 fi
151 fi
152 @@ -1990,13 +1981,13 @@
153 done
154
155 if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then
156 - rm -f /dev/modem
157 + echo
158 fi
159
160 if [ -e /dev/modem ]; then
161 if ! fuser /dev/modem >/dev/null 2>&1; then
162 - rm -f /dev/modem.old
163 - mv /dev/modem /dev/modem.old
164 + echo
165 + echo
166
167 echo "WARNING: renamed existing /dev/modem to /dev/modem.old:"
168 echo ""
169 @@ -2005,7 +1996,7 @@
170 fi
171
172 if [ ! -e /dev/modem ]; then
173 - ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem
174 + echo
175 fi
176 fi
177 fi
178 @@ -2214,6 +2205,10 @@
179 elif [ -d /var/lib/LST ]; then
180 OSDISTNAME=Caldera
181 OSDISTIDNT=caldera
182 + elif [ -f /etc/slitaz-release ]; then
183 + OSDISTNAME=SliTaz
184 + OSDISTIDNT=slitaz
185 + OSDISTVERS="`cat /etc/slitaz-release`"
186 fi
187
188 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
189 @@ -2268,7 +2263,7 @@
190
191 dump_file()
192 {
193 - dump_cmd cat -v $@
194 + dump_cmd cat $@
195 }
196
197 dump_diagnostics()
198 @@ -2587,7 +2582,7 @@
199 fi
200 units="${specificunit}"
201 if [ -z "${units}" ]; then
202 - units=`ls --ignore=flush_nvm ${procdrvdir}`
203 + units=`ls ${procdrvdir} | grep -v flush_nvm`
204
205 if [ -z "${units}" ]; then
206 echo ""
207 @@ -2884,7 +2879,7 @@
208 explicitopt=true
209 do_cfgregion=true
210 if [ -n "$2" ]; then
211 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
212 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
213 fi
214 shift 2
215 ;;
216 @@ -2954,7 +2949,7 @@
217
218 # Accept --region <name> as equivalent to --region=<name>
219 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
220 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
221 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
222 shift
223 fi
224