# HG changeset patch # User Dominique Corbex # Date 1245071101 -7200 # Node ID ae3625ef65a59a7c2d5cdf4d3e5793b9dc6cb105 # Parent d1e04eb36da34a3c590a8dcc1728f19a23674004 get-softmodem-driver: hsfmodem up to 7.80.02.04 diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/description.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/get-softmodem-driver/description.txt Mon Jun 15 15:05:01 2009 +0200 @@ -0,0 +1,3 @@ +Support for software modems: Conexant + +Warning: This package HAS huge dependencies including a full install of dev tools and a complete kernel compilation. This will use a significant amount of disk space and take a while depending on your processing power. diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/receipt --- a/get-softmodem-driver/receipt Mon Jun 15 09:08:48 2009 +0200 +++ b/get-softmodem-driver/receipt Mon Jun 15 15:05:01 2009 +0200 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="get-softmodem-driver" -VERSION="0.2" +VERSION="0.3" CATEGORY="non-free" SHORT_DESC="Get misc softmodem drivers." MAINTAINER="domcox@slitaz.org" @@ -18,5 +18,6 @@ done mkdir -p $fs/usr/share/softmodem cp stuff/*diff $fs/usr/share/softmodem + cp stuff/*receipt $fs/usr/share/softmodem cp stuff/zone.tab $fs/usr/share/softmodem } diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/stuff/get-softmodem-driver --- a/get-softmodem-driver/stuff/get-softmodem-driver Mon Jun 15 09:08:48 2009 +0200 +++ b/get-softmodem-driver/stuff/get-softmodem-driver Mon Jun 15 15:05:01 2009 +0200 @@ -7,12 +7,7 @@ case "$PACKAGE" in hsfmodem) - VERSION="7.80.02.03full" - TARBALL="$PACKAGE-$VERSION.tar.gz" - SHORT_DESC="Modem driver for Conexant HSF chipsets" - WEB_SITE="http://www.linuxant.com/drivers" - WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL" - DEPENDS="module-init-tools linux-source" + . /usr/share/softmodem/hsfmodem.receipt ;; *) echo "Unknown modem driver. Please run one of the following commands:" for i in $(cd $(dirname $0); ls get-*-driver); do @@ -80,13 +75,8 @@ hsfmodem) # Rules to configure and make the package. cd $src - while read file; do - echo "Apply $file..." - patch -p1 < /usr/share/softmodem/$PACKAGE-$VERSION-$file || return 1 - done < $PACKAGE-$VERSION/receipt < $PACKAGE-$VERSION/receipt # Pack tazpkg pack $PACKAGE-$VERSION @@ -120,5 +108,3 @@ # Clean rm -rf $taz -cd $src -make clean diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-cnxtconfig.diff --- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-cnxtconfig.diff Mon Jun 15 09:08:48 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,205 +0,0 @@ ---- hsfmodem-7.80.02.03full/scripts/cnxtconfig.in Fri Feb 20 22:30:17 2009 -+++ hsfmodem-7.80.02.03full-slitaz/scripts/cnxtconfig.in Fri Jun 12 16:20:59 2009 -@@ -74,7 +74,7 @@ - answer="${region}" - ;; - *) -- answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`" -+ answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" - ;; - esac - fi -@@ -109,15 +109,25 @@ - { - # Try to guess what region we're in, using the timezone settings - -- localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`" -+# localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`" -+# -+# if ! [ ${localtime_size} -gt 0 ]; then -+# return 1 -+# fi - -- if ! [ ${localtime_size} -gt 0 ]; then -+# zoneinfo_dir=/usr/share/zoneinfo -+# -+# if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then -+# return 1 -+# -+# fi -+ if [ ! -e /etc/TZ ]; then - return 1 - fi - -- zoneinfo_dir=/usr/share/zoneinfo -+ zoneinfo_dir=/usr/share/softmodem - -- if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then -+ if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then - return 1 - fi - -@@ -206,18 +216,25 @@ - iso_VN=00BC # VIETNAM - - ( -- cd ${zoneinfo_dir} 2>/dev/null || return 1 -- find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \ -- while read file; do -- cmp -s /etc/localtime $file || continue -+# cd ${zoneinfo_dir} 2>/dev/null || return 1 -+# find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \ -+# while read file; do -+# cmp -s /etc/localtime $file || continue - # in the egrep and sed regular expressions below, it is very important to - # have tabs, not spaces -- egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab -- done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ -- while read code; do -- eval "echo \${iso_${code}}" -- done | sort | uniq -- return 0 -+# egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab -+# done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ -+# while read code; do -+# eval "echo \${iso_${code}}" -+# done | sort | uniq -+# return 0 -+ zone=`cat /etc/TZ` -+ egrep $zone ${zoneinfo_dir}/zone.tab | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ -+ while read code; do -+ eval "echo \${iso_${code}}" -+ done | sort | uniq -+ return 0 -+ - ) - } - -@@ -1636,7 +1653,7 @@ - update-modules - else - if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then -- if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then -+ if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then - if ! cp ${modulesconf}.$$ ${modulesconf}; then - rm -f ${modulesconf}.$$ ${f} - exit 1 -@@ -1662,7 +1679,7 @@ - fi - - if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then -- if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then -+ if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then - if ! cp ${modprobeconf}.$$ ${modprobeconf}; then - rm -f ${modprobeconf}.$$ ${f} - exit 1 -@@ -1710,7 +1727,7 @@ - fi - - if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then -- rm -f /dev/modem -+ echo - fi - - rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules -@@ -1734,7 +1751,7 @@ - fi - - echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@" -- echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@" -+ echo "alias /dev/modem none" - echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@" - if [ "$1" = modulesconf ]; then - echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@" -@@ -1908,7 +1925,7 @@ - REGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem - UNREGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \ - > /etc/devfs/conf.d/@CNXTTARGET@.conf -- rm -f /dev/modem -+ echo - which update-devfsd >/dev/null 2>&1 && update-devfsd - killall -HUP devfsd 2>/dev/null - else -@@ -1922,7 +1939,7 @@ - cp /etc/devfsd.conf.$$ /etc/devfsd.conf - fi - rm -f /etc/devfsd.conf.$$ -- rm -f /dev/modem -+ echo - killall -HUP devfsd 2>/dev/null - fi - fi -@@ -1971,13 +1988,13 @@ - done - - if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then -- rm -f /dev/modem -+ echo - fi - - if [ -e /dev/modem ]; then - if ! fuser /dev/modem >/dev/null 2>&1; then -- rm -f /dev/modem.old -- mv /dev/modem /dev/modem.old -+ echo -+ echo - - echo "WARNING: renamed existing /dev/modem to /dev/modem.old:" - echo "" -@@ -1986,7 +2003,7 @@ - fi - - if [ ! -e /dev/modem ]; then -- ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem -+ echo - fi - fi - fi -@@ -2195,6 +2212,10 @@ - elif [ -d /var/lib/LST ]; then - OSDISTNAME=Caldera - OSDISTIDNT=caldera -+ elif [ -f /etc/slitaz-release ]; then -+ OSDISTNAME=SliTaz -+ OSDISTIDNT=slitaz -+ OSDISTVERS="`cat /etc/slitaz-release`" - fi - - OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`" -@@ -2249,7 +2270,7 @@ - - dump_file() - { -- dump_cmd cat -v $@ -+ dump_cmd cat $@ - } - - dump_diagnostics() -@@ -2568,7 +2589,7 @@ - fi - units="${specificunit}" - if [ -z "${units}" ]; then -- units=`ls --ignore=flush_nvm ${procdrvdir}` -+ units=`ls ${procdrvdir} | grep -v flush_nvm` - - if [ -z "${units}" ]; then - echo "" -@@ -2865,7 +2886,7 @@ - explicitopt=true - do_cfgregion=true - if [ -n "$2" ]; then -- setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`" -+ setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" - fi - shift 2 - ;; -@@ -2935,7 +2956,7 @@ - - # Accept --region as equivalent to --region= - if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then -- setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`" -+ setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`" - shift - fi - - diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-makefile.diff --- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-makefile.diff Mon Jun 15 09:08:48 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ ---- hsfmodem-7.80.02.03full/config.mak Fri Feb 20 22:30:12 2009 -+++ hsfmodem-7.80.02.03full-slitaz/config.mak Sat May 9 22:38:51 2009 -@@ -55,7 +55,7 @@ - # maximum number of modem units - CNXTMAXMDM=8 - --ROOT= -+ROOT=$(DESTDIR) - PREFIX=$(ROOT)/usr - - ETCDIR=$(ROOT)/etc -@@ -131,4 +131,4 @@ - -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \ - -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \ - < $< > $@ -- chmod --reference=$< $@ -+ chmod 755 $@ ---- hsfmodem-7.80.02.03full/makefile Mon Feb 23 22:51:37 2009 -+++ hsfmodem-7.80.02.03full-slitaz/makefile Sat May 9 22:38:51 2009 -@@ -149,7 +149,7 @@ - ifeq ($(RPMOPTEVAL),yes) - RPMTARGETCPU=$(shell rpm --eval '%_target_cpu') - else --RPMTARGETCPU=$(shell uname -i) -+RPMTARGETCPU=$(shell uname -m) - endif - - ifneq ($(RPMOPTDEFINE),yes) ---- hsfmodem-7.80.02.03full/modules/Makefile Fri Feb 20 22:30:12 2009 -+++ hsfmodem-7.80.02.03full-slitaz/modules/Makefile Sat May 9 22:38:51 2009 -@@ -20,7 +20,7 @@ - include $(TOP)/config.mak - - IMPORTED = $(TOP)/modules/imported --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) -+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) - ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH)) - $(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... ***) - endif diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff Mon Jun 15 15:05:01 2009 +0200 @@ -0,0 +1,224 @@ +diff -ru hsfmodem-7.80.02.04full/config.mak hsfmodem-7.80.02.04full-slitaz/config.mak +--- hsfmodem-7.80.02.04full/config.mak 2009-02-20 22:30:12.000000000 +0100 ++++ hsfmodem-7.80.02.04full-slitaz/config.mak 2009-06-15 11:49:13.000000000 +0200 +@@ -55,7 +55,7 @@ + # maximum number of modem units + CNXTMAXMDM=8 + +-ROOT= ++ROOT=$(DESTDIR) + PREFIX=$(ROOT)/usr + + ETCDIR=$(ROOT)/etc +@@ -131,4 +131,4 @@ + -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \ + -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \ + < $< > $@ +- chmod --reference=$< $@ ++ chmod 755 $@ +diff -ru hsfmodem-7.80.02.04full/makefile hsfmodem-7.80.02.04full-slitaz/makefile +--- hsfmodem-7.80.02.04full/makefile 2009-02-23 22:51:37.000000000 +0100 ++++ hsfmodem-7.80.02.04full-slitaz/makefile 2009-06-15 11:49:13.000000000 +0200 +@@ -149,7 +149,7 @@ + ifeq ($(RPMOPTEVAL),yes) + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu') + else +-RPMTARGETCPU=$(shell uname -i) ++RPMTARGETCPU=$(shell uname -m) + endif + + ifneq ($(RPMOPTDEFINE),yes) +diff -ru hsfmodem-7.80.02.04full/modules/Makefile hsfmodem-7.80.02.04full-slitaz/modules/Makefile +--- hsfmodem-7.80.02.04full/modules/Makefile 2009-04-24 03:03:57.000000000 +0200 ++++ hsfmodem-7.80.02.04full-slitaz/modules/Makefile 2009-06-15 11:49:13.000000000 +0200 +@@ -20,7 +20,7 @@ + include $(TOP)/config.mak + + IMPORTED = $(TOP)/modules/imported +-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) ++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) + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH)) + $(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... ***) + endif + +diff -ru hsfmodem-7.80.02.04full/scripts/cnxtconfig.in hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in +--- hsfmodem-7.80.02.04full/scripts/cnxtconfig.in 2009-04-23 17:32:18.000000000 +0200 ++++ hsfmodem-7.80.02.04full-slitaz/scripts/cnxtconfig.in 2009-06-15 14:08:02.000000000 +0200 +@@ -74,7 +74,7 @@ + answer="${region}" + ;; + *) +- answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`" ++ answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" + ;; + esac + fi +@@ -109,15 +109,13 @@ + { + # Try to guess what region we're in, using the timezone settings + +- localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`" +- +- if ! [ ${localtime_size} -gt 0 ]; then ++ if [ ! -e /etc/TZ ]; then + return 1 + fi + +- zoneinfo_dir=/usr/share/zoneinfo ++ zoneinfo_dir=/usr/share/softmodem + +- if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then ++ if [ ! -f ${zoneinfo_dir}/hsfzone.tab ]; then + return 1 + fi + +@@ -206,18 +204,11 @@ + iso_VN=00BC # VIETNAM + + ( +- cd ${zoneinfo_dir} 2>/dev/null || return 1 +- find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \ +- while read file; do +- cmp -s /etc/localtime $file || continue +-# in the egrep and sed regular expressions below, it is very important to +-# have tabs, not spaces +- egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab +- done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ +- while read code; do +- eval "echo \${iso_${code}}" +- done | sort | uniq ++ zone=`cat /etc/TZ` ++ code=`grep $zone ${zoneinfo_dir}/hsfzone.tab | awk '{print $1}' | sort | uniq` ++ eval "echo \${iso_${code}}" + return 0 ++ + ) + } + +@@ -1655,7 +1646,7 @@ + update-modules + else + if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then +- if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then ++ if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then + if ! cp ${modulesconf}.$$ ${modulesconf}; then + rm -f ${modulesconf}.$$ ${f} + exit 1 +@@ -1681,7 +1672,7 @@ + fi + + if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then +- if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then ++ if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then + if ! cp ${modprobeconf}.$$ ${modprobeconf}; then + rm -f ${modprobeconf}.$$ ${f} + exit 1 +@@ -1729,7 +1720,7 @@ + fi + + if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then +- rm -f /dev/modem ++ echo + fi + + rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules +@@ -1753,7 +1744,7 @@ + fi + + echo "alias /dev/ttyS@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@" +- echo "alias /dev/modem /dev/ttyS@CNXTSERDEV@" ++ echo "alias /dev/modem none" + echo "alias char-major-${cnxttty_major} /dev/ttyS@CNXTSERDEV@" + if [ "$1" = modulesconf ]; then + echo "alias /dev/cua@CNXTSERDEV@[0-9]* /dev/ttyS@CNXTSERDEV@" +@@ -1927,7 +1918,7 @@ + REGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL symlink $devname modem + UNREGISTER ^ttyS@CNXTSERDEV@0$ CFUNCTION GLOBAL unlink modem' \ + > /etc/devfs/conf.d/@CNXTTARGET@.conf +- rm -f /dev/modem ++ echo + which update-devfsd >/dev/null 2>&1 && update-devfsd + killall -HUP devfsd 2>/dev/null + else +@@ -1941,7 +1932,7 @@ + cp /etc/devfsd.conf.$$ /etc/devfsd.conf + fi + rm -f /etc/devfsd.conf.$$ +- rm -f /dev/modem ++ echo + killall -HUP devfsd 2>/dev/null + fi + fi +@@ -1990,13 +1981,13 @@ + done + + if [ -h /dev/modem ] && /bin/ls -l /dev/modem 2>/dev/null | ${AWK} '{print $11}' | egrep -q '(ttyS|cua)@CNXTSERDEV@[0-9][0-9]*'; then +- rm -f /dev/modem ++ echo + fi + + if [ -e /dev/modem ]; then + if ! fuser /dev/modem >/dev/null 2>&1; then +- rm -f /dev/modem.old +- mv /dev/modem /dev/modem.old ++ echo ++ echo + + echo "WARNING: renamed existing /dev/modem to /dev/modem.old:" + echo "" +@@ -2005,7 +1996,7 @@ + fi + + if [ ! -e /dev/modem ]; then +- ln -sf /dev/ttyS@CNXTSERDEV@0 /dev/modem ++ echo + fi + fi + fi +@@ -2214,6 +2205,10 @@ + elif [ -d /var/lib/LST ]; then + OSDISTNAME=Caldera + OSDISTIDNT=caldera ++ elif [ -f /etc/slitaz-release ]; then ++ OSDISTNAME=SliTaz ++ OSDISTIDNT=slitaz ++ OSDISTVERS="`cat /etc/slitaz-release`" + fi + + OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`" +@@ -2268,7 +2263,7 @@ + + dump_file() + { +- dump_cmd cat -v $@ ++ dump_cmd cat $@ + } + + dump_diagnostics() +@@ -2587,7 +2582,7 @@ + fi + units="${specificunit}" + if [ -z "${units}" ]; then +- units=`ls --ignore=flush_nvm ${procdrvdir}` ++ units=`ls ${procdrvdir} | grep -v flush_nvm` + + if [ -z "${units}" ]; then + echo "" +@@ -2884,7 +2879,7 @@ + explicitopt=true + do_cfgregion=true + if [ -n "$2" ]; then +- setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`" ++ setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" + fi + shift 2 + ;; +@@ -2954,7 +2949,7 @@ + + # Accept --region as equivalent to --region= + if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then +- setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`" ++ setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/s'`" + shift + fi + diff -r d1e04eb36da3 -r ae3625ef65a5 get-softmodem-driver/stuff/hsfmodem.receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/get-softmodem-driver/stuff/hsfmodem.receipt Mon Jun 15 15:05:01 2009 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="hsfmodem" +VERSION="7.80.02.04full" +CATEGORY="non-free" +SHORT_DESC="Modem driver for Conexant HSF chipsets." +MAINTAINER="domcox@slitaz.org" +TARBALL="$PACKAGE-$VERSION.tar.gz" +DEPENDS="module-init-tools linux-source" +WEB_SITE="http://www.linuxant.com/drivers" +WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL" + +# Rules to gen a SliTaz package suitable for Tazpkg. + +post_install() +{ + /usr/sbin/hsfconfig --auto +}