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

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