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