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