wok-undigest annotate get-softmodem-driver/stuff/hcfpcimodem-1.19full.diff @ rev 796

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