Attachment #141120 for bug #205975

View | Details | Raw Unified | Return to bug 205975
Collapse All | Expand All





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:"





INSTALL_PREFIX	:= /usr

CFLAGS+=-I. -O4 -g -Wall
ifneq (,$(findstring ppc,$(MACHINE)))
  CFLAGS	+= -fsigned-char
  KFLAGS	+= -msoft-float -fsigned-char
endif
ifneq (,$(findstring x86_64,$(MACHINE)))
  CFLAGS	+= -m64 -fPIC
  KFLAGS	+= -mcmodel=kernel
endif
KFLAGS:=-I$(KINCLUDES) -O6

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

	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)$(LIBDIR) || : 
	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)

Lines 31-35 Link Here

(-)zaptel-1.2.23/build_tools/genudevrules (-1 / +1 lines)
31	KERNEL${match}"zap[0-9]*", NAME="zap/%n"	31	KERNEL${match}"zap[0-9]*", NAME="zap/%n"
32		32
33	# zaptel devices with ownership/permissions for running as non-root	33	# zaptel devices with ownership/permissions for running as non-root
34	SUBSYSTEM=="zaptel", OWNER="asterisk", GROUP="asterisk", MODE="0660"	34	SUBSYSTEM=="zaptel", OWNER="asterisk", GROUP="dialout", MODE="0660"
35	EOF	35	EOF

Return to bug 205975

Lines 79-98 Link Here

(-)zaptel-1.2.23/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:"

Lines 108-120 Link Here

(-)zaptel-1.2.23/Makefile (-5 / +4 lines)
108		108
109	INSTALL_PREFIX := /usr	109	INSTALL_PREFIX := /usr
110		110
111	CFLAGS+=-I. -O4 -g -fPIC -Wall	111	CFLAGS+=-I. -O4 -g -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
115	endif	115	endif
116	ifneq (,$(findstring x86_64,$(MACHINE)))	116	ifneq (,$(findstring x86_64,$(MACHINE)))
117	CFLAGS += -m64	117	CFLAGS += -m64 -fPIC
118	KFLAGS += -mcmodel=kernel	118	KFLAGS += -mcmodel=kernel
119	endif	119	endif
120	KFLAGS:=-I$(KINCLUDES) -O6	120	KFLAGS:=-I$(KINCLUDES) -O6
Lines 394-400 Link Here
394	else # DYNFS	394	else # DYNFS
395	ifdef UDEVRULES	395	ifdef UDEVRULES
396	install -d $(DESTDIR)/etc/udev/rules.d	396	install -d $(DESTDIR)/etc/udev/rules.d
397	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules	397	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
398	else # !UDEVRULES	398	else # !UDEVRULES
399	@echo "**** Dynamic filesystem detected -- not creating device nodes"	399	@echo "**** Dynamic filesystem detected -- not creating device nodes"
400	endif	400	endif
Lines 464-474 Link Here
464	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o	464	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
465	endif	465	endif
466	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o	466	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
467	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) \|\| :
468		467
469	install-libs: libs	468	install-libs: libs
470	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)	469	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
471	[ `id -u` = 0 ] && /sbin/ldconfig \|\| :	470	[ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) \|\| :
472	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)	471	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
473	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \	472	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
474	$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)	473	$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)