Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 140042 Details for
Bug 159013
asterisk-1.4.0 (and related) ebuilds
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
zaptel-1.4.7.1-gentoo.diff
zaptel-1.4.7.1-gentoo.diff (text/plain), 7.37 KB, created by
Natanael Copa
on 2008-01-04 12:52:23 UTC
(
hide
)
Description:
zaptel-1.4.7.1-gentoo.diff
Filename:
MIME Type:
Creator:
Natanael Copa
Created:
2008-01-04 12:52:23 UTC
Size:
7.37 KB
patch
obsolete
>diff -bru zaptel-1.4.7.1.orig/Makefile zaptel-1.4.7.1/Makefile >--- zaptel-1.4.7.1.orig/Makefile 2008-01-04 12:20:14 +0000 >+++ zaptel-1.4.7.1/Makefile 2008-01-04 12:35:30 +0000 >@@ -40,13 +40,24 @@ > BUILDVER:=linux26 > endif > >+# This is not related to the version that we build. Rather, to the >+# version that we runs. If we build for 2.4 using 2.4 headers on a 2.6 >+# system with udev mounted on /dev , no point in installing files to /dev >+# because they'll be wiped at next reboot. XXX: should this be a use-flag? Perhaps: noudev? >+DYNFS:=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes") >+ >+# Check for udev rules directories >+ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d)) >+ UDEVRULES=yes >+endif >+ > # Set HOTPLUG_FIRMWARE=no to override automatic building with hotplug support > # if it is enabled in the kernel. > ifeq ($(BUILDVER),linux26) >- ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d)) >- DYNFS=yes >- UDEVRULES=yes >- endif >+# ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d)) >+# DYNFS=yes >+# UDEVRULES=yes >+# endif > HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi) > else > # Hotplug firmware loading is not supported on any other version then 2.6 >@@ -139,7 +150,7 @@ > endif > > OPTFLAG=-O2 >-CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER >+CFLAGS+=-I. $(OPTFLAGS) -Iinclude -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER > ifneq (,$(findstring ppc,$(UNAME_M))) > CFLAGS_PPC:=-fsigned-char > endif >@@ -428,7 +439,7 @@ > $(UTILSO): %.o: %.c > $(CC) $(CFLAGS) -o $@ -c $< > >-install: all devices install-modules install-programs install-firmware >+install: devices install-modules install-programs install-firmware > @echo "###################################################" > @echo "###" > @echo "### Zaptel installed successfully." >@@ -442,10 +453,10 @@ > > install-utils: utils install-xpp > ifneq (,$(BINS)) >- install -d $(DESTDIR)$(BIN_DIR) >- install $(BINS) $(DESTDIR)$(BIN_DIR)/ >- install -d $(DESTDIR)$(MAN_DIR) >- install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/ >+ $(INSTALL) -d $(DESTDIR)$(BIN_DIR) >+ $(INSTALL) $(BINS) $(DESTDIR)$(BIN_DIR)/ >+ $(INSTALL) -d $(DESTDIR)$(MAN_DIR) >+ $(INSTALL) -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/ > endif > ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE))) > $(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE) >@@ -453,14 +464,16 @@ > > # Pushing those two to a separate target that is not used by default: > install-modconf: >- build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" >- @if [ -d /etc/modutils ]; then \ >- /sbin/update-modules ; \ >- fi >+ $(INSTALL) -d -m 755 $(DESTDIR)/etc/modules.d >+ build_tools/genmodconf $(BUILDVER) "$(DESTDIR)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" >+# build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)" >+# @if [ -d /etc/modutils ]; then \ >+# /sbin/update-modules ; \ >+# fi > > install-firmware: > ifeq ($(HOTPLUG_FIRMWARE),yes) >- $(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) >+ $(MAKE) -C firmware hotplug-install > endif > > install-libs: libs >@@ -468,7 +481,7 @@ > $(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER) > ifeq (,$(DESTDIR)) > if [ `id -u` = 0 ]; then \ >- /sbin/ldconfig || : ;\ >+ /sbin/ldconfig -n $(DESTDIR)/usr/lib || > fi > endif > rm -f $(DESTDIR)$(LIB_DIR)$(LTZ_SO) >@@ -516,8 +529,9 @@ > done > else # DYNFS > ifdef UDEVRULES >- install -d $(DESTDIR)/etc/udev/rules.d >- build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules >+ $(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 >@@ -548,7 +562,7 @@ > $(MAKE) -C datamods install > endif > endif >- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : >+ [ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : > > config: > ifneq (,$(COPY_INITD)) >diff -bru zaptel-1.4.7.1.orig/build_tools/genmodconf zaptel-1.4.7.1/build_tools/genmodconf >--- zaptel-1.4.7.1.orig/build_tools/genmodconf 2008-01-04 12:20:14 +0000 >+++ zaptel-1.4.7.1/build_tools/genmodconf 2008-01-04 12:21:37 +0000 >@@ -79,19 +79,19 @@ > > 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 [ "${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 "***" >diff -bru zaptel-1.4.7.1.orig/build_tools/genudevrules zaptel-1.4.7.1/build_tools/genudevrules >--- zaptel-1.4.7.1.orig/build_tools/genudevrules 2008-01-04 12:20:14 +0000 >+++ zaptel-1.4.7.1/build_tools/genudevrules 2008-01-04 12:24:21 +0000 >@@ -22,10 +22,10 @@ > > cat <<EOF > # zaptel devices with ownership/permissions for running as non-root >-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660" >-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660" >-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660" >-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660" >-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660" >-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660" >+KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660" >+KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660" >+KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660" >+KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660" >+KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660" >+KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660" > EOF >diff -bru zaptel-1.4.7.1.orig/xpp/utils/Makefile zaptel-1.4.7.1/xpp/utils/Makefile >--- zaptel-1.4.7.1.orig/xpp/utils/Makefile 2008-01-04 12:20:14 +0000 >+++ zaptel-1.4.7.1/xpp/utils/Makefile 2008-01-04 12:36:35 +0000 >@@ -90,7 +90,7 @@ > # for backward compatibility and for hotplug users: > ln -sf $(DATADIR)/xpp_fxloader $(DESTDIR)$(HOTPLUG_USB_DIR)/ > $(INSTALL) -d $(DESTDIR)$(UDEV_RULES_DIR) >- $(INSTALL_DATA) xpp.rules $(DESTDIR)$(UDEV_RULES_DIR)/ >+ $(INSTALL_DATA) -D xpp.rules $(DESTDIR)$(UDEV_RULES_DIR)/10-xpp.rules > ifneq (,$(PERLLIBDIR)) > $(INSTALL) -d $(DESTDIR)$(PERLLIBDIR) > for i in $(PERL_DIRS); \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 159013
:
105003
|
105004
|
105448
|
120258
|
120271
|
120272
|
124810
|
124811
|
124812
|
128192
|
131363
|
136200
|
136202
|
136204
|
136205
|
136207
|
136209
|
140019
|
140021
|
140038
|
140041
|
140042
|
140043
|
143656
|
143658
|
143660
|
143940
|
143941
|
143942
|
144324
|
144326
|
147840
|
147843
|
147845
|
147851
|
161232
|
161233