SliTaz Repositories

1 diff -ru hcfpcimodem-1.19full/config.mak hcfpcimodem-1.19full-slitaz/config.mak

2 --- hcfpcimodem-1.19full/config.mak 2009-04-29 22:04:22.000000000 +0200

3 +++ hcfpcimodem-1.19full-slitaz/config.mak 2009-06-15 22:17:05.000000000 +0200

4 @@ -131,4 +131,4 @@

5 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \

6 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \

7 < $< > $@

8 - chmod --reference=$< $@

9 + chmod 755 $@

10 diff -ru hcfpcimodem-1.19full/makefile hcfpcimodem-1.19full-slitaz/makefile

11 --- hcfpcimodem-1.19full/makefile 2009-04-29 22:04:22.000000000 +0200

12 +++ hcfpcimodem-1.19full-slitaz/makefile 2009-06-15 22:17:47.000000000 +0200

13 @@ -149,7 +149,7 @@

14 ifeq ($(RPMOPTEVAL),yes)

15 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')

16 else

17 -RPMTARGETCPU=$(shell uname -i)

18 +RPMTARGETCPU=$(shell uname -m)

19 endif

20

21 ifneq ($(RPMOPTDEFINE),yes)

22 diff -ru hcfpcimodem-1.19full/modules/Makefile hcfpcimodem-1.19full-slitaz/modules/Makefile

23 --- hcfpcimodem-1.19full/modules/Makefile 2009-04-29 22:04:22.000000000 +0200

24 +++ hcfpcimodem-1.19full-slitaz/modules/Makefile 2009-06-15 22:19:01.000000000 +0200

25 @@ -20,7 +20,7 @@

26 include $(TOP)/config.mak

27

28 IMPORTED = $(TOP)/modules/imported

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)

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)

31 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))

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... ***)

33 endif

34 diff -ru hcfpcimodem-1.19full/scripts/cnxtconfig.in hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in

35 --- hcfpcimodem-1.19full/scripts/cnxtconfig.in 2009-04-29 22:04:22.000000000 +0200

36 +++ hcfpcimodem-1.19full-slitaz/scripts/cnxtconfig.in 2009-06-16 09:32:18.000000000 +0200

37 @@ -74,7 +74,7 @@

38 answer="${region}"

39 ;;

40 *)

41 - answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`"

42 + answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"

43 ;;

44 esac

45 fi

46 @@ -109,15 +109,13 @@

47 {

48 # Try to guess what region we're in, using the timezone settings

49

50 - localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`"

51 -

52 - if ! [ ${localtime_size} -gt 0 ]; then

53 + if [ ! -e /etc/TZ ]; then

54 return 1

55 fi

56

57 - zoneinfo_dir=/usr/share/zoneinfo

58 + zoneinfo_dir=/usr/share/hcfpcimodem

59

60 - if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then

61 + if [ -f ${zoneinfo_dir}/zone.tab ]; then

62 return 1

63 fi

64

65 @@ -206,17 +204,9 @@

66 iso_VN=00BC # VIETNAM

67

68 (

69 - cd ${zoneinfo_dir} 2>/dev/null || return 1

70 - find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \

71 - while read file; do

72 - cmp -s /etc/localtime $file || continue

73 -# in the egrep and sed regular expressions below, it is very important to

74 -# have tabs, not spaces

75 - egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab

76 - done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \

77 - while read code; do

78 - eval "echo \${iso_${code}}"

79 - done | sort | uniq

80 + zone=`cat /etc/TZ`

81 + code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq`

82 + eval "echo \${iso_${code}}"

83 return 0

84 )

85 }

86 @@ -271,7 +261,7 @@

87 # The md5sum is used for input verification.

88 disptokey()

89 {

90 - k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`"

91 + k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`"

92 case $k in

93 00000000)

94 echo "$k"

95 @@ -1655,7 +1645,7 @@

96 update-modules

97 else

98 if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then

99 - if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then

100 + if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then

101 if ! cp ${modulesconf}.$$ ${modulesconf}; then

102 rm -f ${modulesconf}.$$ ${f}

103 exit 1

104 @@ -1681,7 +1671,7 @@

105 fi

106

107 if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then

108 - if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then

109 + if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then

110 if ! cp ${modprobeconf}.$$ ${modprobeconf}; then

111 rm -f ${modprobeconf}.$$ ${f}

112 exit 1

113 @@ -2214,6 +2204,10 @@

114 elif [ -d /var/lib/LST ]; then

115 OSDISTNAME=Caldera

116 OSDISTIDNT=caldera

117 + elif [ -f /etc/slitaz-release ]; then

118 + OSDISTNAME=SliTaz

119 + OSDISTIDNT=slitaz

120 + OSDISTVERS="`cat /etc/slitaz-release`"

121 fi

122

123 OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`"

124 @@ -2268,7 +2262,7 @@

125

126 dump_file()

127 {

128 - dump_cmd cat -v $@

129 + dump_cmd cat $@

130 }

131

132 dump_diagnostics()

133 @@ -2587,7 +2581,7 @@

134 fi

135 units="${specificunit}"

136 if [ -z "${units}" ]; then

137 - units=`ls --ignore=flush_nvm ${procdrvdir}`

138 + units=`ls ${procdrvdir} | grep -v flush_nvm`

139

140 if [ -z "${units}" ]; then

141 echo ""

142 @@ -2884,7 +2878,7 @@

143 explicitopt=true

144 do_cfgregion=true

145 if [ -n "$2" ]; then

146 - setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`"

147 + setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`"

148 fi

149 shift 2

150 ;;

151 @@ -2954,7 +2948,7 @@

152

153 # Accept --region <name> as equivalent to --region=<name>

154 if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then

155 - setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`"

156 + setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`"

157 shift

158 fi

159

160 @@ -3033,7 +3027,7 @@

161

162 if ${do_cfgnewinstance}; then

163 if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then

164 - mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?

165 + mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?

166 # The purpose of --info here is to ensure module reload:

167 (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &

168 fi

169