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

Fixed virtualbox-ose pre_remove and post_install with seeding MODULE_LIST.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Dec 12 19:51:46 2010 +0000 (2010-12-12)
parents e5ab27ad8b9e
children
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 @@ -131,4 +131,4 @@
5 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
6 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
7 < $< > $@
8 - chmod --reference=$< $@
9 + chmod 755 $@
10 diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile
11 --- hsfmodem-7.80.02.04full/makefile 2009-02-23 22:51:37.000000000 +0100
12 +++ hsfmodem-7.80.02.04full-slitaz/makefile 2009-06-15 11:49:13.000000000 +0200
13 @@ -149,7 +149,7 @@
14 ifeq ($(RPMOPTEVAL),yes)
15 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
16 else
17 -RPMTARGETCPU=$(shell uname -i)
18 +RPMTARGETCPU=$(shell uname -m)
19 endif
21 ifneq ($(RPMOPTDEFINE),yes)
22 diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile
23 --- hsfmodem-7.80.02.04full/modules/Makefile 2009-04-24 03:03:57.000000000 +0200
24 +++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile 2009-06-15 11:49:13.000000000 +0200
25 @@ -20,7 +20,7 @@
26 include $(TOP)/config.mak
28 IMPORTED = $(TOP)/modules/imported
29 -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)
30 +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)
31 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
32 $(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... ***)
33 endif
34 diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in
35 --- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in 2009-04-23 17:32:18.000000000 +0200
36 +++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in 2009-06-15 21:29:49.000000000 +0200
37 @@ -74,7 +74,7 @@
38 answer="${region}"
39 ;;
40 *)
41 - answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
42 + answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
43 ;;
44 esac
45 fi
46 @@ -109,15 +109,13 @@
47 {
48 # Try to guess what region we're in, using the timezone settings
50 - localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
51 -
52 - if ! [ ${localtime_size} -gt 0 ]; then
53 + if [ ! -e /etc/TZ ]; then
54 return 1
55 fi
57 - zoneinfo_dir=/usr/share/zoneinfo
58 + zoneinfo_dir=/usr/share/hsfmodem
60 - if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
61 + if [ ! -f ${zoneinfo_dir}/zone.tab ]; then
62 return 1
63 fi
65 @@ -206,18 +204,11 @@
66 iso_VN=00BC # VIETNAM
68 (
69 - cd ${zoneinfo_dir} 2>/dev/null || return 1
70 - find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
71 - while read file; do
72 - cmp -s /etc/localtime $file || continue
73 -# in the egrep and sed regular expressions below, it is very important to
74 -# have tabs, not spaces
75 - egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab
76 - done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
77 - while read code; do
78 - eval "echo \${iso_${code}}"
79 - done | sort | uniq
80 + zone=`cat /etc/TZ`
81 + code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
82 + eval "echo \${iso_${code}}"
83 return 0
84 +
85 )
86 }
88 @@ -271,7 +262,7 @@
89 # The md5sum is used for input verification.
90 disptokey()
91 {
92 - k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
93 + k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
94 case $k in
95 00000000)
96 echo "$k"
97 @@ -1655,7 +1646,7 @@
98 update-modules
99 else
100 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
101 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
102 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
103 if ! cp ${modulesconf}.$$ ${modulesconf}; then
104 rm -f ${modulesconf}.$$ ${f}
105 exit 1
106 @@ -1681,7 +1672,7 @@
107 fi
109 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
110 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
111 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
112 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
113 rm -f ${modprobeconf}.$$ ${f}
114 exit 1
115 @@ -2214,6 +2205,10 @@
116 elif [ -d /var/lib/LST ]; then
117 OSDISTNAME=Caldera
118 OSDISTIDNT=caldera
119 + elif [ -f /etc/slitaz-release ]; then
120 + OSDISTNAME=SliTaz
121 + OSDISTIDNT=slitaz
122 + OSDISTVERS="`cat /etc/slitaz-release`"
123 fi
125 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
126 @@ -2268,7 +2263,7 @@
128 dump_file()
129 {
130 - dump_cmd cat -v $@
131 + dump_cmd cat $@
132 }
134 dump_diagnostics()
135 @@ -2587,7 +2582,7 @@
136 fi
137 units="${specificunit}"
138 if [ -z "${units}" ]; then
139 - units=`ls --ignore=flush_nvm ${procdrvdir}`
140 + units=`ls ${procdrvdir} | grep -v flush_nvm`
142 if [ -z "${units}" ]; then
143 echo ""
144 @@ -2884,7 +2879,7 @@
145 explicitopt=true
146 do_cfgregion=true
147 if [ -n "$2" ]; then
148 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
149 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
150 fi
151 shift 2
152 ;;
153 @@ -2954,6 +2949,6 @@
155 # Accept --region <name> as equivalent to --region=<name>
156 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
157 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
158 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
159 shift
160 fi
162 @@ -3033,0 +3027,0 @@
164 if ${do_cfgnewinstance}; then
165 if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
166 - mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
167 + mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
168 # The purpose of --info here is to ensure module reload:
169 (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
170 fi