wok-next diff get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff @ rev 14334
nano: fix nanorc path, tiny edits
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Apr 13 15:06:57 2013 +0000 (2013-04-13) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff Sat Apr 13 15:06:57 2013 +0000 1.3 @@ -0,0 +1,170 @@ 1.4 +diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak 1.5 +--- hsfmodem-7.80.02.04full/config.mak 2009-02-20 22:30:12.000000000 +0100 1.6 ++++ hsfmodem-7.80.02.04full-slitaz/config.mak 2009-06-15 11:49:13.000000000 +0200 1.7 +@@ -131,4 +131,4 @@ 1.8 + -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \ 1.9 + -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \ 1.10 + < $< > $@ 1.11 +- chmod --reference=$< $@ 1.12 ++ chmod 755 $@ 1.13 +diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile 1.14 +--- hsfmodem-7.80.02.04full/makefile 2009-02-23 22:51:37.000000000 +0100 1.15 ++++ hsfmodem-7.80.02.04full-slitaz/makefile 2009-06-15 11:49:13.000000000 +0200 1.16 +@@ -149,7 +149,7 @@ 1.17 + ifeq ($(RPMOPTEVAL),yes) 1.18 + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu') 1.19 + else 1.20 +-RPMTARGETCPU=$(shell uname -i) 1.21 ++RPMTARGETCPU=$(shell uname -m) 1.22 + endif 1.23 + 1.24 + ifneq ($(RPMOPTDEFINE),yes) 1.25 +diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile 1.26 +--- hsfmodem-7.80.02.04full/modules/Makefile 2009-04-24 03:03:57.000000000 +0200 1.27 ++++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile 2009-06-15 11:49:13.000000000 +0200 1.28 +@@ -20,7 +20,7 @@ 1.29 + include $(TOP)/config.mak 1.30 + 1.31 + IMPORTED = $(TOP)/modules/imported 1.32 +-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) 1.33 ++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) 1.34 + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH)) 1.35 + $(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... ***) 1.36 + endif 1.37 +diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in 1.38 +--- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in 2009-04-23 17:32:18.000000000 +0200 1.39 ++++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in 2009-06-15 21:29:49.000000000 +0200 1.40 +@@ -74,7 +74,7 @@ 1.41 + answer="${region}" 1.42 + ;; 1.43 + *) 1.44 +- answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`" 1.45 ++ answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" 1.46 + ;; 1.47 + esac 1.48 + fi 1.49 +@@ -109,15 +109,13 @@ 1.50 + { 1.51 + # Try to guess what region we're in, using the timezone settings 1.52 + 1.53 +- localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`" 1.54 +- 1.55 +- if ! [ ${localtime_size} -gt 0 ]; then 1.56 ++ if [ ! -e /etc/TZ ]; then 1.57 + return 1 1.58 + fi 1.59 + 1.60 +- zoneinfo_dir=/usr/share/zoneinfo 1.61 ++ zoneinfo_dir=/usr/share/hsfmodem 1.62 + 1.63 +- if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then 1.64 ++ if [ ! -f ${zoneinfo_dir}/zone.tab ]; then 1.65 + return 1 1.66 + fi 1.67 + 1.68 +@@ -206,18 +204,11 @@ 1.69 + iso_VN=00BC # VIETNAM 1.70 + 1.71 + ( 1.72 +- cd ${zoneinfo_dir} 2>/dev/null || return 1 1.73 +- find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \ 1.74 +- while read file; do 1.75 +- cmp -s /etc/localtime $file || continue 1.76 +-# in the egrep and sed regular expressions below, it is very important to 1.77 +-# have tabs, not spaces 1.78 +- egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab 1.79 +- done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ 1.80 +- while read code; do 1.81 +- eval "echo \${iso_${code}}" 1.82 +- done | sort | uniq 1.83 ++ zone=`cat /etc/TZ` 1.84 ++ code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq` 1.85 ++ eval "echo \${iso_${code}}" 1.86 + return 0 1.87 ++ 1.88 + ) 1.89 + } 1.90 + 1.91 +@@ -271,7 +262,7 @@ 1.92 + # The md5sum is used for input verification. 1.93 + disptokey() 1.94 + { 1.95 +- k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`" 1.96 ++ k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`" 1.97 + case $k in 1.98 + 00000000) 1.99 + echo "$k" 1.100 +@@ -1655,7 +1646,7 @@ 1.101 + update-modules 1.102 + else 1.103 + if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then 1.104 +- if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then 1.105 ++ if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then 1.106 + if ! cp ${modulesconf}.$$ ${modulesconf}; then 1.107 + rm -f ${modulesconf}.$$ ${f} 1.108 + exit 1 1.109 +@@ -1681,7 +1672,7 @@ 1.110 + fi 1.111 + 1.112 + if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then 1.113 +- if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then 1.114 ++ if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then 1.115 + if ! cp ${modprobeconf}.$$ ${modprobeconf}; then 1.116 + rm -f ${modprobeconf}.$$ ${f} 1.117 + exit 1 1.118 +@@ -2214,6 +2205,10 @@ 1.119 + elif [ -d /var/lib/LST ]; then 1.120 + OSDISTNAME=Caldera 1.121 + OSDISTIDNT=caldera 1.122 ++ elif [ -f /etc/slitaz-release ]; then 1.123 ++ OSDISTNAME=SliTaz 1.124 ++ OSDISTIDNT=slitaz 1.125 ++ OSDISTVERS="`cat /etc/slitaz-release`" 1.126 + fi 1.127 + 1.128 + OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`" 1.129 +@@ -2268,7 +2263,7 @@ 1.130 + 1.131 + dump_file() 1.132 + { 1.133 +- dump_cmd cat -v $@ 1.134 ++ dump_cmd cat $@ 1.135 + } 1.136 + 1.137 + dump_diagnostics() 1.138 +@@ -2587,7 +2582,7 @@ 1.139 + fi 1.140 + units="${specificunit}" 1.141 + if [ -z "${units}" ]; then 1.142 +- units=`ls --ignore=flush_nvm ${procdrvdir}` 1.143 ++ units=`ls ${procdrvdir} | grep -v flush_nvm` 1.144 + 1.145 + if [ -z "${units}" ]; then 1.146 + echo "" 1.147 +@@ -2884,7 +2879,7 @@ 1.148 + explicitopt=true 1.149 + do_cfgregion=true 1.150 + if [ -n "$2" ]; then 1.151 +- setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`" 1.152 ++ setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" 1.153 + fi 1.154 + shift 2 1.155 + ;; 1.156 +@@ -2954,6 +2949,6 @@ 1.157 + 1.158 + # Accept --region <name> as equivalent to --region=<name> 1.159 + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then 1.160 +- setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`" 1.161 ++ setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`" 1.162 + shift 1.163 + fi 1.164 + 1.165 +@@ -3033,0 +3027,0 @@ 1.166 + 1.167 + if ${do_cfgnewinstance}; then 1.168 + if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then 1.169 +- mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $? 1.170 ++ mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $? 1.171 + # The purpose of --info here is to ensure module reload: 1.172 + (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 & 1.173 + fi