wok annotate get-softmodem-driver/stuff/hcfpcimodem-1.19full.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
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 hcfpcimodem-1.19full/config.mak hcfpcimodem-1.19full-slitaz/config.mak
pascal@13591 2 --- hcfpcimodem-1.19full/config.mak 2009-04-29 22:04:22.000000000 +0200
pascal@13591 3 +++ hcfpcimodem-1.19full-slitaz/config.mak 2009-06-15 22:17:05.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 hcfpcimodem-1.19full/makefile hcfpcimodem-1.19full-slitaz/makefile
pascal@13591 11 --- hcfpcimodem-1.19full/makefile 2009-04-29 22:04:22.000000000 +0200
pascal@13591 12 +++ hcfpcimodem-1.19full-slitaz/makefile 2009-06-15 22:17:47.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 hcfpcimodem-1.19full/modules/Makefile hcfpcimodem-1.19full-slitaz/modules/Makefile
pascal@13591 23 --- hcfpcimodem-1.19full/modules/Makefile 2009-04-29 22:04:22.000000000 +0200
pascal@13591 24 +++ hcfpcimodem-1.19full-slitaz/modules/Makefile 2009-06-15 22:19:01.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 hcfpcimodem-1.19full/scripts/cnxtconfig.in hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in
pascal@13591 35 --- hcfpcimodem-1.19full/scripts/cnxtconfig.in 2009-04-29 22:04:22.000000000 +0200
pascal@13591 36 +++ hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in 2009-06-16 09:32:18.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/hcfpcimodem
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,17 +204,9 @@
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 @@ -271,7 +261,7 @@
pascal@13591 87 # The md5sum is used for input verification.
pascal@13591 88 disptokey()
pascal@13591 89 {
pascal@13591 90 - k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
pascal@13591 91 + k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
pascal@13591 92 case $k in
pascal@13591 93 00000000)
pascal@13591 94 echo "$k"
pascal@13591 95 @@ -1655,7 +1645,7 @@
pascal@13591 96 update-modules
pascal@13591 97 else
pascal@13591 98 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
pascal@13591 99 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
pascal@13591 100 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
pascal@13591 101 if ! cp ${modulesconf}.$$ ${modulesconf}; then
pascal@13591 102 rm -f ${modulesconf}.$$ ${f}
pascal@13591 103 exit 1
pascal@13591 104 @@ -1681,7 +1671,7 @@
pascal@13591 105 fi
pascal@13591 106
pascal@13591 107 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
pascal@13591 108 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
pascal@13591 109 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
pascal@13591 110 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
pascal@13591 111 rm -f ${modprobeconf}.$$ ${f}
pascal@13591 112 exit 1
pascal@13591 113 @@ -2214,6 +2204,10 @@
pascal@13591 114 elif [ -d /var/lib/LST ]; then
pascal@13591 115 OSDISTNAME=Caldera
pascal@13591 116 OSDISTIDNT=caldera
pascal@13591 117 + elif [ -f /etc/slitaz-release ]; then
pascal@13591 118 + OSDISTNAME=SliTaz
pascal@13591 119 + OSDISTIDNT=slitaz
pascal@13591 120 + OSDISTVERS="`cat /etc/slitaz-release`"
pascal@13591 121 fi
pascal@13591 122
pascal@13591 123 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
pascal@13591 124 @@ -2268,7 +2262,7 @@
pascal@13591 125
pascal@13591 126 dump_file()
pascal@13591 127 {
pascal@13591 128 - dump_cmd cat -v $@
pascal@13591 129 + dump_cmd cat $@
pascal@13591 130 }
pascal@13591 131
pascal@13591 132 dump_diagnostics()
pascal@13591 133 @@ -2587,7 +2581,7 @@
pascal@13591 134 fi
pascal@13591 135 units="${specificunit}"
pascal@13591 136 if [ -z "${units}" ]; then
pascal@13591 137 - units=`ls --ignore=flush_nvm ${procdrvdir}`
pascal@13591 138 + units=`ls ${procdrvdir} | grep -v flush_nvm`
pascal@13591 139
pascal@13591 140 if [ -z "${units}" ]; then
pascal@13591 141 echo ""
pascal@13591 142 @@ -2884,7 +2878,7 @@
pascal@13591 143 explicitopt=true
pascal@13591 144 do_cfgregion=true
pascal@13591 145 if [ -n "$2" ]; then
pascal@13591 146 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
pascal@13591 147 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
pascal@13591 148 fi
pascal@13591 149 shift 2
pascal@13591 150 ;;
pascal@13591 151 @@ -2954,7 +2948,7 @@
pascal@13591 152
pascal@13591 153 # Accept --region <name> as equivalent to --region=<name>
pascal@13591 154 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
pascal@13591 155 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
pascal@13591 156 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"
pascal@13591 157 shift
pascal@13591 158 fi
pascal@13591 159
pascal@13591 160 @@ -3033,7 +3027,7 @@
pascal@13591 161
pascal@13591 162 if ${do_cfgnewinstance}; then
pascal@13591 163 if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
pascal@13591 164 - mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
pascal@13591 165 + mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
pascal@13591 166 # The purpose of --info here is to ensure module reload:
pascal@13591 167 (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
pascal@13591 168 fi
pascal@13591 169