Attachment #139869 for bug #204057





INSTALL_PREFIX	:= /usr

CFLAGS+=-I. -Iinclude -g -fPIC -Wall
ifneq (,$(findstring ppc,$(MACHINE)))
  CFLAGS	+= -fsigned-char
  KFLAGS	+= -msoft-float -fsigned-char

else # DYNFS
  ifdef UDEVRULES
	install -d $(DESTDIR)/etc/udev/rules.d
	build_tools/genudevrules > zaptel.rules
	install -D -m 644 zaptel.rules $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
  else # !UDEVRULES
	@echo "**** Dynamic filesystem detected -- not creating device nodes"
  endif

	tar -zxf mISDNuser.tar.gz
	$(MAKE) -C mISDNuser install

install: devices install-modules install-programs firmware
	@echo "###################################################"
	@echo "###"
	@echo "### Zaptel installed successfully."

	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
endif
	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :

install-libs: libs
	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
	[ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)/usr/lib || :
	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
		$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)





echo Building ${target}...

if [ "${1}" = "linux24" ]; then
    for mod in ${3}; do
	if ! grep -q "post-install ${mod} " ${target}; then
	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
	fi
    done
elif [ "${1}" = "linux26" ]; then
    for mod in ${3}; do
	if ! grep -q "install ${mod} " ${target}; then
	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
	fi
    done
fi

if [ -z "${combined}" ]; then
    echo "***"
    echo "*** WARNING:"

Lines 22-31 Link Here

(-)zaptel-1.2.22.1/build_tools/genudevrules (-6 / +6 lines)
22		22
23	cat <<EOF	23	cat <<EOF
24	# zaptel devices with ownership/permissions for running as non-root	24	# zaptel devices with ownership/permissions for running as non-root
25	KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"	25	KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
26	KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"	26	KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
27	KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"	27	KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
28	KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"	28	KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
29	KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"	29	KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660"
30	KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"	30	KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
31	EOF	31	EOF

Return to bug 204057

Lines 108-114 Link Here

(-)zaptel-1.2.22.1/Makefile (-5 / +5 lines)
108		108
109	INSTALL_PREFIX := /usr	109	INSTALL_PREFIX := /usr
110		110
111	CFLAGS+=-I. -O4 -g -fPIC -Wall	111	CFLAGS+=-I. -Iinclude -g -fPIC -Wall
112	ifneq (,$(findstring ppc,$(MACHINE)))	112	ifneq (,$(findstring ppc,$(MACHINE)))
113	CFLAGS += -fsigned-char	113	CFLAGS += -fsigned-char
114	KFLAGS += -msoft-float -fsigned-char	114	KFLAGS += -msoft-float -fsigned-char
Lines 391-397 Link Here
391	else # DYNFS	391	else # DYNFS
392	ifdef UDEVRULES	392	ifdef UDEVRULES
393	install -d $(DESTDIR)/etc/udev/rules.d	393	install -d $(DESTDIR)/etc/udev/rules.d
394	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules	394	build_tools/genudevrules > zaptel.rules
		395	install -D -m 644 zaptel.rules $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
395	else # !UDEVRULES	396	else # !UDEVRULES
396	@echo "**** Dynamic filesystem detected -- not creating device nodes"	397	@echo "**** Dynamic filesystem detected -- not creating device nodes"
397	endif	398	endif
Lines 406-412 Link Here
406	tar -zxf mISDNuser.tar.gz	407	tar -zxf mISDNuser.tar.gz
407	$(MAKE) -C mISDNuser install	408	$(MAKE) -C mISDNuser install
408		409
409	install: all devices install-modules install-programs firmware	410	install: devices install-modules install-programs firmware
410	@echo "###################################################"	411	@echo "###################################################"
411	@echo "###"	412	@echo "###"
412	@echo "### Zaptel installed successfully."	413	@echo "### Zaptel installed successfully."
Lines 460-470 Link Here
460	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o	461	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
461	endif	462	endif
462	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o	463	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
463	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) \|\| :
464		464
465	install-libs: libs	465	install-libs: libs
466	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)	466	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
467	[ `id -u` = 0 ] && /sbin/ldconfig \|\| :	467	[ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)/usr/lib \|\| :
468	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)	468	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
469	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \	469	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
470	$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)	470	$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)

Lines 79-98 Link Here

(-)zaptel-1.2.22.1/build_tools/genmodconf (-14 lines)
79		79
80	echo Building ${target}...	80	echo Building ${target}...
81		81
82	if [ "${1}" = "linux24" ]; then
83	for mod in ${3}; do
84	if ! grep -q "post-install ${mod} " ${target}; then
85	echo "post-install ${mod} /sbin/ztcfg" >> ${target}
86	fi
87	done
88	elif [ "${1}" = "linux26" ]; then
89	for mod in ${3}; do
90	if ! grep -q "install ${mod} " ${target}; then
91	echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
92	fi
93	done
94	fi
95
96	if [ -z "${combined}" ]; then	82	if [ -z "${combined}" ]; then
97	echo "***"	83	echo "***"
98	echo "*** WARNING:"	84	echo "*** WARNING:"