wok-next view bristuff/stuff/bristuff.u @ rev 2156

bash: fix sh link when removing
author Christophe Lincoln <pankso@slitaz.org>
date Thu Feb 05 22:30:20 2009 +0100 (2009-02-05)
parents d659eda8a095
children
line source
1 --- apply-patches.sh
2 +++ apply-patches.sh
3 @@ -12,6 +12,2 @@
4 patch_file="$patches_dir/$patch_name"
5 - if ! patch -p1 < "$patch_file" --quiet --dry-run; then
6 - echo "Failed applying $patch_file (directory: $2). Aborting."
7 - exit 1
8 - fi
9 patch -p1 < "$patch_file"
10
11 --- download.sh
12 +++ download.sh
13 @@ -44,3 +44,3 @@
14 url="$1"
15 - file=`echo $url | rev | cut -d/ -f1 | rev`
16 + file=${url##*/}
17 wget -c $url.sha1
18 @@ -51,3 +51,3 @@
19 # we have a file. Let's check if it is valid
20 - if sha1sum -c --status $file.sha1; then return; fi
21 + if sha1sum -c -s $file.sha1; then return; fi
22
23 --- download.sh Tue Apr 29 09:43:48 2008
24 +++ download.sh Tue Apr 29 09:48:51 2008
25 @@ -36,6 +36,18 @@
26 fi
27 }
28
29 +. /etc/tazwok.conf
30 +slitaz_wget()
31 +{
32 + if [ ! -f $SOURCES_REPOSITORY/$(basename $2) ]; then
33 + local here=$(pwd)
34 + cd $SOURCES_REPOSITORY
35 + wget $1 $2
36 + cd $here
37 + fi
38 + cp $SOURCES_REPOSITORY/$(basename $2) .
39 +}
40 +
41 # A simple 'wget -c' won't work with Digium, as they keep providing a
42 # newer timestamp on files.
43 #
44 @@ -43,26 +54,26 @@
45 digium_download() {
46 url="$1"
47 file=${url##*/}
48 - wget -c $url.sha1
49 + slitaz_wget -c $url.sha1
50 if [ ! -f "$file" ]; then
51 - wget -c "$url"
52 + slitaz_wget -c "$url"
53 fi
54
55 # we have a file. Let's check if it is valid
56 if sha1sum -c -s $file.sha1; then return; fi
57
58 # If we're still here: bad download
59 - wget -c "$url"
60 + slitaz_wget -c "$url"
61 }
62
63 -#wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz
64 -#wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz
65 +#slitaz_wget -c http://updates.xorcom.com/astribank/src/zaptel-${ZAP_VER}.tar.gz
66 +#slitaz_wget -c http://astimax.de/mirror/zaptel/zaptel-${ZAP_VER}.tar.gz
67 digium_download http://downloads.digium.com/pub/zaptel/releases/zaptel-${ZAP_VER}.tar.gz
68 -#wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz
69 +#slitaz_wget -c http://astimax.de/mirror/libpri/libpri-${PRI_VER}.tar.gz
70 digium_download http://downloads.digium.com/pub/libpri/releases/libpri-${PRI_VER}.tar.gz
71 -#wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz
72 +#slitaz_wget -c http://astimax.de/mirror/asterisk-1.4/asterisk-${AST_VER}.tar.gz
73 digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-${AST_VER}.tar.gz
74 -wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz
75 +slitaz_wget -c http://astimax.de/mirror/asterisk-addons/asterisk-addons-${ADD_VER}.tar.gz
76 #digium_download http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-${ADD_VER}.tar.gz
77
78 move_dir zaptel-${ZAP_VER}
79 --- patches/zaptel/series
80 +++ patches/zaptel/series
81 @@ -3,3 +3,4 @@
82 zt_alarm_notify_no_master_change
83 ztcfg-start_stop
84 ztpty
85 +slitaz
86 --- patches/zaptel/slitaz
87 +++ patches/zaptel/slitaz
88 @@ -0,0 +1,88 @@
89 +--- zaptel-1.4.8/zaptel-base.c 2008-04-29 11:04:40.000000000 +0200
90 ++++ zaptel-1.4.8/zaptel-base.c 2008-04-29 11:05:16.000000000 +0200
91 +@@ -4432,3 +4432,3 @@
92 + void *rxgain=NULL;
93 +- struct echo_can_state *ec;
94 ++ struct echo_can_state *ec, *tec;
95 + struct zt_echocanparams ecp;
96 +--- zaptel-1.4.8/Makefile.org 2008-04-29 13:07:17.000000000 +0200
97 ++++ zaptel-1.4.8/Makefile 2008-04-29 13:08:20.000000000 +0200
98 +@@ -205,14 +205,14 @@
99 + INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d))
100 + ifneq (,$(INITRD_DIR))
101 + INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/zaptel
102 +- COPY_INITD := install -D zaptel.init $(INIT_TARGET)
103 ++ COPY_INITD := cp zaptel.init $(INIT_TARGET)
104 + endif
105 + RCCONF_DIR := $(firstword $(wildcard /etc/sysconfig /etc/default))
106 +
107 + NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts ))
108 + ifneq (,$(NETSCR_DIR))
109 + NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc
110 +- COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET)
111 ++ COPY_NETSCR := cp ifup-hdlc $(NETSCR_TARGET)
112 + endif
113 +
114 + ifneq ($(wildcard .version),)
115 +@@ -466,7 +466,7 @@
116 + install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
117 + endif
118 + ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
119 +- $(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
120 ++ cp zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
121 + endif
122 +
123 + # Pushing those two to a separate target that is not used by default:
124 +@@ -482,8 +482,8 @@
125 + endif
126 +
127 + install-libs: libs
128 +- $(INSTALL) -D -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
129 +- $(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
130 ++ cp $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
131 ++ cp $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
132 + ifeq (,$(DESTDIR))
133 + if [ `id -u` = 0 ]; then \
134 + /sbin/ldconfig || : ;\
135 +@@ -499,7 +499,7 @@
136 + /sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
137 + endif
138 + endif
139 +- $(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
140 ++ cp tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
141 +
142 + install-utils-subdirs:
143 + @for dir in $(SUBDIRS_UTILS); do \
144 +@@ -507,7 +507,7 @@
145 + done
146 +
147 + install-include:
148 +- $(INSTALL) -D -m 644 zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
149 ++ cp zaptel.h $(DESTDIR)$(INC_DIR)/zaptel.h
150 +
151 + devices:
152 + ifndef DYNFS
153 +@@ -578,7 +578,7 @@
154 + endif
155 + ifneq (,$(RCCONF_DIR))
156 + ifeq (,$(wildcard $(DESTDIR)$(RCCONF_DIR)/zaptel))
157 +- $(INSTALL) -D -m 644 zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
158 ++ cp zaptel.sysconfig $(DESTDIR)$(RCCONF_DIR)/zaptel
159 + endif
160 + endif
161 + ifneq (,$(COPY_NETSCR))
162 +
163 +--- zaptel-1.4.8/zconfig.h.org 2008-10-13 21:49:25.000000000 +0200
164 ++++ zaptel-1.4.8/zconfig.h 2008-10-13 21:49:43.000000000 +0200
165 +@@ -88,9 +88,11 @@
166 + /* #define NO_ECHOCAN_DISABLE */
167 +
168 + /* udev support */
169 ++#ifdef LINUX_VERSION_CODE
170 + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
171 + #define CONFIG_ZAP_UDEV
172 + #endif
173 ++#endif
174 +
175 + /* We now use the linux kernel config to detect which options to use */
176 + /* You can still override them below */
177
178 --- patches/zaphfc/series
179 +++ patches/zaphfc/series
180 @@ -1,3 +1,4 @@
181 local_zap
182 newzaptel
183 florz.diff
184 +slitaz
185 --- /dev/null
186 +++ patches/zaphfc/slitaz
187 @@ -0,0 +1,13 @@
188 +--- zaphfc/Makefile.org 2008-04-29 13:07:25.000000000 +0200
189 ++++ zaphfc/Makefile 2008-04-29 13:08:38.000000000 +0200
190 +@@ -111,8 +111,8 @@
191 + install: install$(BUILDVER)
192 +
193 + installlinux26:
194 +- install -D -m 644 zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.ko
195 ++ cp zaphfc.ko $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/
196 +
197 + installlinux24:
198 +- install -D -m 644 zaphfc.o $(INSTALL_PREFIX)/lib/modules/`uname -r`/misc/zaphfc.o
199 ++ cp zaphfc.o $(INSTALL_PREFIX)/lib/modules/*/misc/
200 +
201
202 --- patches/cwain/series
203 +++ patches/cwain/series
204 @@ -1,3 +1,2 @@
205 -# Does not seem to apply cleanly. Testing needed:
206 -#beronet.diff
207 +beronet.diff
208 local_zap