| 1 |
chainsaw 09/04/06 14:59:26 |
| 2 |
|
| 3 |
Modified: zaptel-1.2.27.ebuild ChangeLog zaptel-1.2.18.ebuild |
| 4 |
zaptel-1.2.18-r1.ebuild |
| 5 |
Log: |
| 6 |
Port 1.4-branch hrtimer build fix to 1.2.27, fixes build against 2.6.28 kernels. Quote a few variables in the 1.2.18 ebuilds. |
| 7 |
(Portage version: 2.1.6.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-misc/zaptel/zaptel-1.2.27.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: zaptel-1.2.27.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- zaptel-1.2.27.ebuild 15 Dec 2008 11:26:36 -0000 1.2 |
| 23 |
+++ zaptel-1.2.27.ebuild 6 Apr 2009 14:59:26 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2008 Gentoo Foundation |
| 26 |
+# Copyright 1999-2009 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild,v 1.2 2008/12/15 11:26:36 pva Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild,v 1.3 2009/04/06 14:59:26 chainsaw Exp $ |
| 30 |
|
| 31 |
inherit toolchain-funcs eutils linux-mod flag-o-matic multilib |
| 32 |
|
| 33 |
@@ -175,6 +175,7 @@ |
| 34 |
epatch "${FILESDIR}"/zaptel-1.2.25-xpputils.diff |
| 35 |
epatch "${FILESDIR}"/zaptel-1.2.27-kernel.patch |
| 36 |
epatch "${FILESDIR}"/zaptel-1.2.27-semaphore.patch |
| 37 |
+ epatch "${FILESDIR}"/zaptel-1.2.27-hrtimer.patch |
| 38 |
|
| 39 |
# try to apply bristuff patch |
| 40 |
if use bri; then |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.115 net-misc/zaptel/ChangeLog |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/ChangeLog?rev=1.115&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/ChangeLog?rev=1.115&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/ChangeLog?r1=1.114&r2=1.115 |
| 49 |
|
| 50 |
Index: ChangeLog |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v |
| 53 |
retrieving revision 1.114 |
| 54 |
retrieving revision 1.115 |
| 55 |
diff -u -r1.114 -r1.115 |
| 56 |
--- ChangeLog 5 Apr 2009 14:20:01 -0000 1.114 |
| 57 |
+++ ChangeLog 6 Apr 2009 14:59:26 -0000 1.115 |
| 58 |
@@ -1,6 +1,11 @@ |
| 59 |
# ChangeLog for net-misc/zaptel |
| 60 |
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.114 2009/04/05 14:20:01 ranger Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.115 2009/04/06 14:59:26 chainsaw Exp $ |
| 63 |
+ |
| 64 |
+ 06 Apr 2009; <chainsaw@g.o> +files/zaptel-1.2.27-hrtimer.patch, |
| 65 |
+ zaptel-1.2.18.ebuild, zaptel-1.2.18-r1.ebuild, zaptel-1.2.27.ebuild: |
| 66 |
+ Port 1.4-branch hrtimer build fix to 1.2.27, fixes build against 2.6.28 |
| 67 |
+ kernels. Quote a few variables in the 1.2.18 ebuilds. |
| 68 |
|
| 69 |
05 Apr 2009; Brent Baude <ranger@g.o> zaptel-1.2.18.ebuild: |
| 70 |
Marking zaptel-1.2.18 ppc for bug 237476 |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.6 net-misc/zaptel/zaptel-1.2.18.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild?rev=1.6&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild?rev=1.6&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild?r1=1.5&r2=1.6 |
| 79 |
|
| 80 |
Index: zaptel-1.2.18.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v |
| 83 |
retrieving revision 1.5 |
| 84 |
retrieving revision 1.6 |
| 85 |
diff -u -r1.5 -r1.6 |
| 86 |
--- zaptel-1.2.18.ebuild 5 Apr 2009 14:20:01 -0000 1.5 |
| 87 |
+++ zaptel-1.2.18.ebuild 6 Apr 2009 14:59:26 -0000 1.6 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2009 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.5 2009/04/05 14:20:01 ranger Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.6 2009/04/06 14:59:26 chainsaw Exp $ |
| 93 |
|
| 94 |
inherit toolchain-funcs eutils linux-mod |
| 95 |
|
| 96 |
@@ -53,21 +53,21 @@ |
| 97 |
} |
| 98 |
|
| 99 |
zconfig_disable() { |
| 100 |
- if grep -q "${1}" ${S}/zconfig.h; then |
| 101 |
+ if grep -q "${1}" "${S}/zconfig.h"; then |
| 102 |
# match a little more than ${1} so we can use zconfig_disable |
| 103 |
# to disable all echo cancellers in zconfig.h w/o calling it several times |
| 104 |
sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \ |
| 105 |
- ${S}/zconfig.h |
| 106 |
+ "${S}/zconfig.h" |
| 107 |
fi |
| 108 |
|
| 109 |
return $? |
| 110 |
} |
| 111 |
|
| 112 |
zconfig_enable() { |
| 113 |
- if grep -q "${1}" ${S}/zconfig.h; then |
| 114 |
+ if grep -q "${1}" "${S}/zconfig.h"; then |
| 115 |
sed -i -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \ |
| 116 |
-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \ |
| 117 |
- ${S}/zconfig.h |
| 118 |
+ "${S}/zconfig.h" |
| 119 |
fi |
| 120 |
|
| 121 |
return $? |
| 122 |
@@ -168,10 +168,10 @@ |
| 123 |
src_unpack() { |
| 124 |
unpack ${A} |
| 125 |
|
| 126 |
- cd ${S} |
| 127 |
- epatch ${FILESDIR}/${P}-2.6.22.diff |
| 128 |
- epatch ${FILESDIR}/${P}-gentoo.diff |
| 129 |
- epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch |
| 130 |
+ cd "${S}" |
| 131 |
+ epatch "${FILESDIR}/${P}-2.6.22.diff" |
| 132 |
+ epatch "${FILESDIR}/${P}-gentoo.diff" |
| 133 |
+ epatch "${FILESDIR}/zaptel-1.2.9.1-ar.patch" |
| 134 |
|
| 135 |
# try to apply bristuff patch |
| 136 |
if use bri; then |
| 137 |
@@ -181,16 +181,16 @@ |
| 138 |
einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})" |
| 139 |
epatch ${S_BRI}/patches/zaptel.patch |
| 140 |
|
| 141 |
- cd ${S_BRI} |
| 142 |
+ cd "${S_BRI}" |
| 143 |
|
| 144 |
if use florz; then |
| 145 |
einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc" |
| 146 |
|
| 147 |
# remove as soon as there's a new florz patch available |
| 148 |
sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \ |
| 149 |
- ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff |
| 150 |
+ "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff" |
| 151 |
|
| 152 |
- epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff |
| 153 |
+ epatch "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff" |
| 154 |
fi |
| 155 |
|
| 156 |
# patch includes |
| 157 |
@@ -210,7 +210,7 @@ |
| 158 |
sed -i -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \ |
| 159 |
zaphfc/Makefile |
| 160 |
|
| 161 |
- cd ${S} |
| 162 |
+ cd "${S}" |
| 163 |
fi |
| 164 |
|
| 165 |
### Configuration changes |
| 166 |
@@ -254,12 +254,12 @@ |
| 167 |
KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die |
| 168 |
|
| 169 |
if use astribank; then |
| 170 |
- cd ${S}/xpp/utils |
| 171 |
+ cd "${S}"/xpp/utils |
| 172 |
make || die "make xpp utils failed" |
| 173 |
fi |
| 174 |
|
| 175 |
if use bri; then |
| 176 |
- cd ${S_BRI} |
| 177 |
+ cd "${S_BRI}" |
| 178 |
for x in cwain qozap zaphfc; do |
| 179 |
einfo "Building ${x}..." |
| 180 |
make KVERS=${KV_FULL} \ |
| 181 |
@@ -272,14 +272,14 @@ |
| 182 |
|
| 183 |
src_install() { |
| 184 |
# Create firmware directory |
| 185 |
- mkdir -p ${D}/lib/firmware/ |
| 186 |
+ mkdir -p "${D}/lib/firmware/" |
| 187 |
|
| 188 |
- kernel_is 2 4 && cp /etc/modules.conf ${D}/etc |
| 189 |
- make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \ |
| 190 |
- KVERS=${KV_FULL} KSRC=/usr/src/linux install || die |
| 191 |
+ kernel_is 2 4 && cp /etc/modules.conf "${D}/etc" |
| 192 |
+ make INSTALL_PREFIX="${D}" ARCH="$(tc-arch-kernel)" \ |
| 193 |
+ KVERS="${KV_FULL}" KSRC=/usr/src/linux install || die |
| 194 |
|
| 195 |
dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init |
| 196 |
- dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune |
| 197 |
+ dodoc zaptel.conf.sample zaptel.sysconfig README.fxotune |
| 198 |
|
| 199 |
# additional tools |
| 200 |
dobin ztmonitor ztspeed zttest fxotune |
| 201 |
@@ -291,12 +291,12 @@ |
| 202 |
|
| 203 |
if use bri; then |
| 204 |
einfo "Installing bri" |
| 205 |
- cd ${S_BRI} |
| 206 |
+ cd "${S_BRI}" |
| 207 |
|
| 208 |
- insinto /lib/modules/${KV_FULL}/misc |
| 209 |
- doins qozap/qozap.${KV_OBJ} |
| 210 |
- doins zaphfc/zaphfc.${KV_OBJ} |
| 211 |
- doins cwain/cwain.${KV_OBJ} |
| 212 |
+ insinto "/lib/modules/${KV_FULL}/misc" |
| 213 |
+ doins "qozap/qozap.${KV_OBJ}" |
| 214 |
+ doins "zaphfc/zaphfc.${KV_OBJ}" |
| 215 |
+ doins "cwain/cwain.${KV_OBJ}" |
| 216 |
|
| 217 |
# install example configs for octoBRI and quadBRI |
| 218 |
insinto /etc |
| 219 |
@@ -321,31 +321,31 @@ |
| 220 |
docinto bristuff/cwain |
| 221 |
dodoc cwain/TODO cwain/LICENSE |
| 222 |
|
| 223 |
- cd ${S} |
| 224 |
+ cd "${S}" |
| 225 |
fi |
| 226 |
|
| 227 |
# install init script |
| 228 |
- newinitd ${FILESDIR}/zaptel.rc6 zaptel |
| 229 |
- newconfd ${FILESDIR}/zaptel.confd zaptel |
| 230 |
+ newinitd "${FILESDIR}/zaptel.rc6" zaptel |
| 231 |
+ newconfd "${FILESDIR}/zaptel.confd" zaptel |
| 232 |
|
| 233 |
# install devfsd rule file |
| 234 |
insinto /etc/devfs.d |
| 235 |
- newins ${FILESDIR}/zaptel.devfsd zaptel |
| 236 |
+ newins "${FILESDIR}/zaptel.devfsd" zaptel |
| 237 |
|
| 238 |
# install udev rule file |
| 239 |
insinto /etc/udev/rules.d |
| 240 |
- newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules |
| 241 |
+ newins "${FILESDIR}/zaptel.udevd" 10-zaptel.rules |
| 242 |
|
| 243 |
# fix permissions if there's no udev / devfs around |
| 244 |
- if [[ -d ${D}/dev/zap ]]; then |
| 245 |
- chown -R root:dialout ${D}/dev/zap |
| 246 |
- chmod -R u=rwX,g=rwX,o= ${D}/dev/zap |
| 247 |
+ if [[ -d "${D}/dev/zap" ]]; then |
| 248 |
+ chown -R root:dialout "${D}/dev/zap" |
| 249 |
+ chmod -R u=rwX,g=rwX,o= "${D}/dev/zap" |
| 250 |
fi |
| 251 |
|
| 252 |
if use astribank; then |
| 253 |
- cd ${S}/xpp/utils |
| 254 |
+ cd "${S}/xpp/utils" |
| 255 |
eval `perl '-V:installarchlib'` |
| 256 |
- make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install" |
| 257 |
+ make DESTDIR="${D}" PERLLIBDIR="${installarchlib}" install || die "failed xpp utils install" |
| 258 |
dosbin zt_registration xpp_sync lszaptel |
| 259 |
fi |
| 260 |
} |
| 261 |
@@ -373,8 +373,8 @@ |
| 262 |
fi |
| 263 |
|
| 264 |
# fix permissions if there's no udev / devfs around |
| 265 |
- if [[ -d ${ROOT}dev/zap ]]; then |
| 266 |
- chown -R root:dialout ${ROOT}dev/zap |
| 267 |
- chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap |
| 268 |
+ if [[ -d "${ROOT}dev/zap" ]]; then |
| 269 |
+ chown -R root:dialout "${ROOT}dev/zap" |
| 270 |
+ chmod -R u=rwX,g=rwX,o= "${ROOT}dev/zap" |
| 271 |
fi |
| 272 |
} |
| 273 |
|
| 274 |
|
| 275 |
|
| 276 |
1.3 net-misc/zaptel/zaptel-1.2.18-r1.ebuild |
| 277 |
|
| 278 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild?rev=1.3&view=markup |
| 279 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild?rev=1.3&content-type=text/plain |
| 280 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild?r1=1.2&r2=1.3 |
| 281 |
|
| 282 |
Index: zaptel-1.2.18-r1.ebuild |
| 283 |
=================================================================== |
| 284 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v |
| 285 |
retrieving revision 1.2 |
| 286 |
retrieving revision 1.3 |
| 287 |
diff -u -r1.2 -r1.3 |
| 288 |
--- zaptel-1.2.18-r1.ebuild 15 Jul 2007 23:22:24 -0000 1.2 |
| 289 |
+++ zaptel-1.2.18-r1.ebuild 6 Apr 2009 14:59:26 -0000 1.3 |
| 290 |
@@ -1,6 +1,6 @@ |
| 291 |
-# Copyright 1999-2007 Gentoo Foundation |
| 292 |
+# Copyright 1999-2009 Gentoo Foundation |
| 293 |
# Distributed under the terms of the GNU General Public License v2 |
| 294 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.2 2007/07/15 23:22:24 mr_bones_ Exp $ |
| 295 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.3 2009/04/06 14:59:26 chainsaw Exp $ |
| 296 |
|
| 297 |
inherit toolchain-funcs eutils linux-mod |
| 298 |
|
| 299 |
@@ -60,21 +60,21 @@ |
| 300 |
} |
| 301 |
|
| 302 |
zconfig_disable() { |
| 303 |
- if grep -q "${1}" ${S}/zconfig.h; then |
| 304 |
+ if grep -q "${1}" "${S}/zconfig.h"; then |
| 305 |
# match a little more than ${1} so we can use zconfig_disable |
| 306 |
# to disable all echo cancellers in zconfig.h w/o calling it several times |
| 307 |
sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \ |
| 308 |
- ${S}/zconfig.h |
| 309 |
+ "${S}/zconfig.h" |
| 310 |
fi |
| 311 |
|
| 312 |
return $? |
| 313 |
} |
| 314 |
|
| 315 |
zconfig_enable() { |
| 316 |
- if grep -q "${1}" ${S}/zconfig.h; then |
| 317 |
+ if grep -q "${1}" "${S}/zconfig.h"; then |
| 318 |
sed -i -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \ |
| 319 |
-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \ |
| 320 |
- ${S}/zconfig.h |
| 321 |
+ "${S}/zconfig.h" |
| 322 |
fi |
| 323 |
|
| 324 |
return $? |
| 325 |
@@ -175,29 +175,29 @@ |
| 326 |
src_unpack() { |
| 327 |
unpack ${A} |
| 328 |
|
| 329 |
- cd ${S} |
| 330 |
- epatch ${FILESDIR}/${P}-2.6.22.diff |
| 331 |
- epatch ${FILESDIR}/${P}-gentoo.diff |
| 332 |
- epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch |
| 333 |
+ cd "${S}" |
| 334 |
+ epatch "${FILESDIR}/${P}-2.6.22.diff" |
| 335 |
+ epatch "${FILESDIR}/${P}-gentoo.diff" |
| 336 |
+ epatch "${FILESDIR}/zaptel-1.2.9.1-ar.patch" |
| 337 |
|
| 338 |
# try to apply bristuff patch |
| 339 |
if use bri; then |
| 340 |
# fix for userpriv |
| 341 |
- chmod -R a=rwX ${S_BRI} |
| 342 |
+ chmod -R a=rwX "${S_BRI}" |
| 343 |
|
| 344 |
einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})" |
| 345 |
- epatch ${S_BRI}/patches/zaptel.patch |
| 346 |
+ epatch "${S_BRI}"/patches/zaptel.patch |
| 347 |
|
| 348 |
- cd ${S_BRI} |
| 349 |
+ cd "${S_BRI}" |
| 350 |
|
| 351 |
if use florz; then |
| 352 |
einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc" |
| 353 |
|
| 354 |
# remove as soon as there's a new florz patch available |
| 355 |
sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \ |
| 356 |
- ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff |
| 357 |
+ "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff" |
| 358 |
|
| 359 |
- epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff |
| 360 |
+ epatch "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff" |
| 361 |
fi |
| 362 |
|
| 363 |
# patch includes |
| 364 |
@@ -217,7 +217,7 @@ |
| 365 |
sed -i -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \ |
| 366 |
zaphfc/Makefile |
| 367 |
|
| 368 |
- cd ${S} |
| 369 |
+ cd "${S}" |
| 370 |
fi |
| 371 |
|
| 372 |
# oslec echo canceller |
| 373 |
@@ -287,43 +287,43 @@ |
| 374 |
|
| 375 |
src_compile() { |
| 376 |
# build |
| 377 |
- make KVERS=${KV_FULL} \ |
| 378 |
- KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die |
| 379 |
+ make KVERS="${KV_FULL}" \ |
| 380 |
+ KSRC="${KV_DIR}" ARCH="$(tc-arch-kernel)" || die |
| 381 |
|
| 382 |
if use astribank; then |
| 383 |
- cd ${S}/xpp/utils |
| 384 |
+ cd "${S}"/xpp/utils |
| 385 |
make || die "make xpp utils failed" |
| 386 |
fi |
| 387 |
|
| 388 |
if use bri; then |
| 389 |
- cd ${S_BRI} |
| 390 |
+ cd "${S_BRI}" |
| 391 |
for x in cwain qozap zaphfc; do |
| 392 |
einfo "Building ${x}..." |
| 393 |
- make KVERS=${KV_FULL} \ |
| 394 |
+ make KVERS="${KV_FULL}" \ |
| 395 |
KSRC=/usr/src/linux \ |
| 396 |
- ARCH=$(tc-arch-kernel) \ |
| 397 |
- -C ${x} || die "make ${x} failed" |
| 398 |
+ ARCH="$(tc-arch-kernel)" \ |
| 399 |
+ -C "${x}" || die "make ${x} failed" |
| 400 |
done |
| 401 |
fi |
| 402 |
|
| 403 |
if use ecoslec; then |
| 404 |
cd "${S_OSLEC}" |
| 405 |
- make KVERS=${KV_FULL} \ |
| 406 |
+ make KVERS="${KV_FULL}" \ |
| 407 |
KDIR=/usr/src/linux \ |
| 408 |
- ARCH=$(tc-arch-kernel) || die "emake oslec failed" |
| 409 |
+ ARCH="$(tc-arch-kernel)" || die "emake oslec failed" |
| 410 |
fi |
| 411 |
} |
| 412 |
|
| 413 |
src_install() { |
| 414 |
# Create firmware directory |
| 415 |
- mkdir -p ${D}/lib/firmware/ |
| 416 |
+ mkdir -p "${D}/lib/firmware/" |
| 417 |
|
| 418 |
- kernel_is 2 4 && cp /etc/modules.conf ${D}/etc |
| 419 |
- make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \ |
| 420 |
- KVERS=${KV_FULL} KSRC=/usr/src/linux install || die |
| 421 |
+ kernel_is 2 4 && cp /etc/modules.conf "${D}/etc" |
| 422 |
+ make INSTALL_PREFIX="${D}" ARCH="$(tc-arch-kernel)" \ |
| 423 |
+ KVERS="${KV_FULL}" KSRC=/usr/src/linux install || die |
| 424 |
|
| 425 |
dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init |
| 426 |
- dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune |
| 427 |
+ dodoc zaptel.conf.sample zaptel.sysconfig README.fxotune |
| 428 |
|
| 429 |
# additional tools |
| 430 |
dobin ztmonitor ztspeed zttest fxotune |
| 431 |
@@ -335,12 +335,12 @@ |
| 432 |
|
| 433 |
if use bri; then |
| 434 |
einfo "Installing bri" |
| 435 |
- cd ${S_BRI} |
| 436 |
+ cd "${S_BRI}" |
| 437 |
|
| 438 |
- insinto /lib/modules/${KV_FULL}/misc |
| 439 |
- doins qozap/qozap.${KV_OBJ} |
| 440 |
- doins zaphfc/zaphfc.${KV_OBJ} |
| 441 |
- doins cwain/cwain.${KV_OBJ} |
| 442 |
+ insinto "/lib/modules/${KV_FULL}/misc" |
| 443 |
+ doins "qozap/qozap.${KV_OBJ}" |
| 444 |
+ doins "zaphfc/zaphfc.${KV_OBJ}" |
| 445 |
+ doins "cwain/cwain.${KV_OBJ}" |
| 446 |
|
| 447 |
# install example configs for octoBRI and quadBRI |
| 448 |
insinto /etc |
| 449 |
@@ -365,13 +365,13 @@ |
| 450 |
docinto bristuff/cwain |
| 451 |
dodoc cwain/TODO cwain/LICENSE |
| 452 |
|
| 453 |
- cd ${S} |
| 454 |
+ cd "${S}" |
| 455 |
fi |
| 456 |
|
| 457 |
if use ecoslec; then |
| 458 |
cd "${S_OSLEC}" |
| 459 |
- insinto /lib/modules/${KV_FULL}/misc |
| 460 |
- doins oslec.${KV_OBJ} |
| 461 |
+ insinto "/lib/modules/${KV_FULL}/misc" |
| 462 |
+ doins "oslec.${KV_OBJ}" |
| 463 |
|
| 464 |
newsbin oslec-ctrl-panel.sh oslec-ctrl-panel |
| 465 |
|
| 466 |
@@ -382,27 +382,27 @@ |
| 467 |
fi |
| 468 |
|
| 469 |
# install init script |
| 470 |
- newinitd ${FILESDIR}/zaptel.rc6 zaptel |
| 471 |
- newconfd ${FILESDIR}/zaptel.confd zaptel |
| 472 |
+ newinitd "${FILESDIR}/zaptel.rc6" zaptel |
| 473 |
+ newconfd "${FILESDIR}/zaptel.confd" zaptel |
| 474 |
|
| 475 |
# install devfsd rule file |
| 476 |
insinto /etc/devfs.d |
| 477 |
- newins ${FILESDIR}/zaptel.devfsd zaptel |
| 478 |
+ newins "${FILESDIR}/zaptel.devfsd" zaptel |
| 479 |
|
| 480 |
# install udev rule file |
| 481 |
insinto /etc/udev/rules.d |
| 482 |
- newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules |
| 483 |
+ newins "${FILESDIR}/zaptel.udevd" 10-zaptel.rules |
| 484 |
|
| 485 |
# fix permissions if there's no udev / devfs around |
| 486 |
- if [[ -d ${D}/dev/zap ]]; then |
| 487 |
- chown -R root:dialout ${D}/dev/zap |
| 488 |
- chmod -R u=rwX,g=rwX,o= ${D}/dev/zap |
| 489 |
+ if [[ -d "${D}/dev/zap" ]]; then |
| 490 |
+ chown -R root:dialout "${D}/dev/zap" |
| 491 |
+ chmod -R u=rwX,g=rwX,o= "${D}/dev/zap" |
| 492 |
fi |
| 493 |
|
| 494 |
if use astribank; then |
| 495 |
- cd ${S}/xpp/utils |
| 496 |
+ cd "${S}"/xpp/utils |
| 497 |
eval `perl '-V:installarchlib'` |
| 498 |
- make DESTDIR=${D} PERLLIBDIR=${installarchlib} install \ |
| 499 |
+ make DESTDIR="${D}" PERLLIBDIR="${installarchlib}" install \ |
| 500 |
|| die "failed xpp utils install" |
| 501 |
dosbin zt_registration xpp_sync lszaptel |
| 502 |
fi |
| 503 |
@@ -440,8 +440,8 @@ |
| 504 |
fi |
| 505 |
|
| 506 |
# fix permissions if there's no udev / devfs around |
| 507 |
- if [[ -d ${ROOT}dev/zap ]]; then |
| 508 |
- chown -R root:dialout ${ROOT}dev/zap |
| 509 |
- chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap |
| 510 |
+ if [[ -d "${ROOT}dev/zap" ]]; then |
| 511 |
+ chown -R root:dialout "${ROOT}dev/zap" |
| 512 |
+ chmod -R u=rwX,g=rwX,o= "${ROOT}dev/zap" |
| 513 |
fi |
| 514 |
} |
Archives