wok-undigest annotate linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff @ rev 1227

copied perl recipe from wok-next
author Hans-G?nter Theisgen
date Fri Nov 15 17:49:31 2019 +0100 (2019-11-15)
parents
children
rev   line source
pankso@281 1 --- hsfmodem-7.80.02.05full/config.mak Fri Feb 20 22:30:12 2009
pankso@281 2 +++ hsfmodem-7.80.02.05full+patch2/config.mak Sun Apr 11 19:29:08 2010
pankso@281 3 @@ -131,4 +131,4 @@
pankso@281 4 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
pankso@281 5 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
pankso@281 6 < $< > $@
pankso@281 7 - chmod --reference=$< $@
pankso@281 8 + chmod 755 $@
pankso@281 9 --- hsfmodem-7.80.02.05full/makefile Mon Feb 23 22:51:37 2009
pankso@281 10 +++ hsfmodem-7.80.02.05full+patch2/makefile Sun Apr 11 19:29:08 2010
pankso@281 11 @@ -149,7 +149,7 @@
pankso@281 12 ifeq ($(RPMOPTEVAL),yes)
pankso@281 13 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
pankso@281 14 else
pankso@281 15 -RPMTARGETCPU=$(shell uname -i)
pankso@281 16 +RPMTARGETCPU=$(shell uname -m)
pankso@281 17 endif
pankso@281 18
pankso@281 19 ifneq ($(RPMOPTDEFINE),yes)
pankso@281 20 --- hsfmodem-7.80.02.05full/modules/Makefile Thu Oct 22 00:35:59 2009
pankso@281 21 +++ hsfmodem-7.80.02.05full+patch2/modules/Makefile Sun Apr 11 19:49:54 2010
pankso@281 22 @@ -20,7 +20,7 @@
pankso@281 23 include $(TOP)/config.mak
pankso@281 24
pankso@281 25 IMPORTED = $(TOP)/modules/imported
pankso@281 26 -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)
pankso@281 27 +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)
pankso@281 28 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
pankso@281 29 $(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... ***)
pankso@281 30 endif
pankso@281 31 @@ -56,6 +56,7 @@
pankso@281 32 CNXT_KERNELSRC := /usr/src/kernel-headers-$(shell uname -r)
pankso@281 33 else
pankso@281 34 CNXT_KERNELSRC := /usr/src/linux
pankso@281 35 +CNXT_KERNELSRC := ../../../linux/linux-$(shell uname -r | sed s/-slitaz//)
pankso@281 36 endif
pankso@281 37 KERNELSRC_EXISTS := $(shell test -r ${CNXT_KERNELSRC}/include/linux/version.h && echo yes || echo no)
pankso@281 38 endif
pankso@281 39
pankso@281 40 --- hsfmodem-7.80.02.05full/nvm/linksame Fri Jan 13 20:23:51 2006
pankso@281 41 +++ hsfmodem-7.80.02.05full+patch2/nvm/linksame Sun Apr 11 19:29:08 2010
pankso@281 42 @@ -17,7 +17,7 @@
pankso@281 43
pankso@281 44 if $dryrun; then
pankso@281 45 echo "dry run.."
pankso@281 46 - find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
pankso@281 47 + find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
pankso@281 48 if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
pankso@281 49 echo ln "$prevfile" "$file"
pankso@281 50 else
pankso@281 51 @@ -28,7 +28,7 @@
pankso@281 52 exit $?
pankso@281 53 fi
pankso@281 54
pankso@281 55 -find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do
pankso@281 56 +find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do
pankso@281 57 if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then
pankso@281 58 rm -f "$file"
pankso@281 59 echo ln "$prevfile" "$file"
pankso@281 60 --- hsfmodem-7.80.02.05full/nvm/makefile Wed Oct 1 17:23:26 2008
pankso@281 61 +++ hsfmodem-7.80.02.05full+patch2/nvm/makefile Sun Apr 11 19:29:08 2010
pankso@281 62 @@ -52,7 +52,7 @@
pankso@281 63 all: $(ALL)
pankso@281 64
pankso@281 65 $(NVMCVTDIR)/.linksame: $(NVMDIRS_CVT)
pankso@281 66 - cd $(NVMCVTDIR) && find . -type f ! -empty -exec md5sum {} ';' | sort | \
pankso@281 67 + cd $(NVMCVTDIR) && find . -type f ! -size 0 -exec md5sum {} ';' | sort | \
pankso@281 68 while read sum file ; do \
pankso@281 69 if [ "$$sum" = "$$prevsum" ] && cmp -s "$$file" "$$prevfile"; then \
pankso@281 70 rm -f "$$file"; \
pankso@281 71 --- hsfmodem-7.80.02.05full/scripts/cnxtconfig.in Thu Oct 22 00:35:59 2009
pankso@281 72 +++ hsfmodem-7.80.02.05full+patch2/scripts/cnxtconfig.in Sun Apr 11 19:29:08 2010
pankso@281 73 @@ -74,7 +74,7 @@
pankso@281 74 answer="${region}"
pankso@281 75 ;;
pankso@281 76 *)
pankso@281 77 - answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"
pankso@281 78 + answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
pankso@281 79 ;;
pankso@281 80 esac
pankso@281 81 fi
pankso@281 82 @@ -109,15 +109,13 @@
pankso@281 83 {
pankso@281 84 # Try to guess what region we're in, using the timezone settings
pankso@281 85
pankso@281 86 - localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"
pankso@281 87 -
pankso@281 88 - if ! [ ${localtime_size} -gt 0 ]; then
pankso@281 89 + if [ ! -e /etc/TZ ]; then
pankso@281 90 return 1
pankso@281 91 fi
pankso@281 92
pankso@281 93 - zoneinfo_dir=/usr/share/zoneinfo
pankso@281 94 + zoneinfo_dir=/etc/hsfmodem
pankso@281 95
pankso@281 96 - if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then
pankso@281 97 + if [ ! -f ${zoneinfo_dir}/zone.tab ]; then
pankso@281 98 return 1
pankso@281 99 fi
pankso@281 100
pankso@281 101 @@ -206,18 +204,11 @@
pankso@281 102 iso_VN=00BC # VIETNAM
pankso@281 103
pankso@281 104 (
pankso@281 105 - cd ${zoneinfo_dir} 2>/dev/null || return 1
pankso@281 106 - find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \
pankso@281 107 - while read file; do
pankso@281 108 - cmp -s /etc/localtime $file || continue
pankso@281 109 -# in the egrep and sed regular expressions below, it is very important to
pankso@281 110 -# have tabs, not spaces
pankso@281 111 - egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab
pankso@281 112 - done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \
pankso@281 113 - while read code; do
pankso@281 114 - eval "echo \${iso_${code}}"
pankso@281 115 - done | sort | uniq
pankso@281 116 + zone=`cat /etc/TZ`
pankso@281 117 + code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`
pankso@281 118 + eval "echo \${iso_${code}}"
pankso@281 119 return 0
pankso@281 120 +
pankso@281 121 )
pankso@281 122 }
pankso@281 123
pankso@281 124 @@ -271,7 +262,7 @@
pankso@281 125 # The md5sum is used for input verification.
pankso@281 126 disptokey()
pankso@281 127 {
pankso@281 128 - k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"
pankso@281 129 + k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"
pankso@281 130 case $k in
pankso@281 131 00000000)
pankso@281 132 echo "$k"
pankso@281 133 @@ -1655,7 +1646,7 @@
pankso@281 134 update-modules
pankso@281 135 else
pankso@281 136 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then
pankso@281 137 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then
pankso@281 138 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then
pankso@281 139 if ! cp ${modulesconf}.$$ ${modulesconf}; then
pankso@281 140 rm -f ${modulesconf}.$$ ${f}
pankso@281 141 exit 1
pankso@281 142 @@ -1681,7 +1672,7 @@
pankso@281 143 fi
pankso@281 144
pankso@281 145 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then
pankso@281 146 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then
pankso@281 147 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then
pankso@281 148 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then
pankso@281 149 rm -f ${modprobeconf}.$$ ${f}
pankso@281 150 exit 1
pankso@281 151 @@ -2214,6 +2205,10 @@
pankso@281 152 elif [ -d /var/lib/LST ]; then
pankso@281 153 OSDISTNAME=Caldera
pankso@281 154 OSDISTIDNT=caldera
pankso@281 155 + elif [ -f /etc/slitaz-release ]; then
pankso@281 156 + OSDISTNAME=SliTaz
pankso@281 157 + OSDISTIDNT=slitaz
pankso@281 158 + OSDISTVERS="`cat /etc/slitaz-release`"
pankso@281 159 fi
pankso@281 160
pankso@281 161 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"
pankso@281 162 @@ -2268,7 +2263,7 @@
pankso@281 163
pankso@281 164 dump_file()
pankso@281 165 {
pankso@281 166 - dump_cmd cat -v $@
pankso@281 167 + dump_cmd cat $@
pankso@281 168 }
pankso@281 169
pankso@281 170 dump_diagnostics()
pankso@281 171 @@ -2587,7 +2582,7 @@
pankso@281 172 fi
pankso@281 173 units="${specificunit}"
pankso@281 174 if [ -z "${units}" ]; then
pankso@281 175 - units=`ls --ignore=flush_nvm ${procdrvdir}`
pankso@281 176 + units=`ls ${procdrvdir} | grep -v flush_nvm`
pankso@281 177
pankso@281 178 if [ -z "${units}" ]; then
pankso@281 179 echo ""
pankso@281 180 @@ -2884,7 +2879,7 @@
pankso@281 181 explicitopt=true
pankso@281 182 do_cfgregion=true
pankso@281 183 if [ -n "$2" ]; then
pankso@281 184 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"
pankso@281 185 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
pankso@281 186 fi
pankso@281 187 shift 2
pankso@281 188 ;;
pankso@281 189 @@ -2954,7 +2949,7 @@
pankso@281 190
pankso@281 191 # Accept --region <name> as equivalent to --region=<name>
pankso@281 192 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then
pankso@281 193 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"
pankso@281 194 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"
pankso@281 195 shift
pankso@281 196 fi
pankso@281 197
pankso@281 198 @@ -3033,7 +3028,7 @@
pankso@281 199
pankso@281 200 if ${do_cfgnewinstance}; then
pankso@281 201 if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
pankso@281 202 - mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
pankso@281 203 + mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
pankso@281 204 # The purpose of --info here is to ensure module reload:
pankso@281 205 (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
pankso@281 206 fi
pankso@281 207