Changes - j0ke.net Open Build Service

Changes of Revision 12

[-] [+]	Changed	dahdi-linux.spec
@@ -7,11 +7,11 @@ # usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 capi4linux capisuite coreutils cpio cpp cpp41 cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gcc gcc41 gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kernel-source kernel-syms klogd less libacl libattr libcom_err libgcc41 libltdl libmudflap41 libnscd libstdc++41 libtool libvolume_id libxcrypt libzio linux-kernel-headers m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline rpm sed strace sysvinit tar tcpd texinfo timezone udev unzip util-linux vim zlib zlib-devel Name: dahdi-linux -BuildRequires: kernel-source kernel-syms udev newt-devel wget module-init-tools +BuildRequires: kernel-source kernel-syms udev newt-devel wget module-init-tools URL: http://www.asterisk.org Summary: Tools for the Zapata Telephony Interface Driver Version: 2.2.0.2 -Release: 1 +Release: 23.1 License: GNU General Public License (GPL) Group: Productivity/Telephony/Utilities PreReq: %insserv_prereq %fillup_prereq udev @@ -22,9 +22,11 @@ Source0: http://ftp.digium.com/pub/dahdi/dahdi-linux-%{version}.tar.bz2 Source1: preamble Source2: firmware.tar.bz2 -Patch0: dahdi-%{version}.patch +Patch0: dahdi.patch Patch1: dahdi-driver.patch -%suse_kernel_module_package -p %_sourcedir/preamble kdump um iseries64 ppc64 debug xen +Patch3: sles.patch + +%suse_kernel_module_package -p %_sourcedir/preamble kdump um iseries64 ppc64 debug %description This package contains configuration files, header files, and setup @@ -75,9 +77,12 @@ %{__perl} -pi -e 's\|/usr/lib\|%{_libdir}\|g' Makefile # Force mknod calls to never happen %{__perl} -pi -e 's\|mknod \|true \|g' Makefile -%patch0 -p0 +#%patch0 -p0 %patch1 -p0 -#%patch2 -p0 +%if 0%{?sles_version} == 10 +%patch3 -p0 +%endif + tar xvjf %SOURCE2 %build @@ -120,26 +125,30 @@ %post %{?fillup_and_insserv:%fillup_and_insserv} %{?run_ldconfig:%run_ldconfig} +#/sbin/chkconfig --add dahdi +#/sbin/chkconfig --level 2345 dahdi on +#ln -sf /etc/init.d/dahdi /usr/sbin/rcdahdi %postun %{?insserv_cleanup:%insserv_cleanup} %{?run_ldconfig:%run_ldconfig} /sbin/depmod -a -F /boot/System.map-%{kernel} %{kernel} &>/dev/null \|\| : +#rm -rf /usr/sbin/rcdahdi %preun %{?stop_on_removal:%stop_on_removal dahdi} %files %defattr(-,root,root,-) -%dir /usr/share/dahdi +/usr/share/dahdi /usr/share/dahdi/* /lib/firmware/* /lib/firmware/.dahdi* -%dir %{_libdir}/hotplug -%dir %{_libdir}/hotplug/firmware -%{_libdir}/hotplug/firmware/dahdi* -%{_libdir}/hotplug/firmware/.dahdi* +/usr/lib/hotplug +/usr/lib/hotplug/firmware +/usr/lib/hotplug/firmware/dahdi* +/usr/lib/hotplug/firmware/.dahdi* %files devel @@ -148,13 +157,14 @@ /usr/include/dahdi/* %changelog -n dahdi-linux -* Tue Aug 11 2009 Carsten Schoene <cs@linux-administrator.com> - 2.2.0.2-1 -- update to release 2.2.0.2 - -* Tue Feb 24 2009 Carsten Schoene <cs@linux-administrator.com> -- update to release 2.1.0.4 -* Thu Dec 25 2008 Carsten Schoene <cs@linux-administrator.com> -- update to release 2.1.0.3 +* Wed Aug 19 2009 - vittorio@vitsoft.bz +- dahdi-linux 2.2.0.2 +* Fri Jul 03 2009 - vittorio@vitsoft.bz +- dahdi-linux 2.2.0.1 +* Wed Jul 01 2009 - vittorio@vitsoft.bz +- dahdi-linux 2.2.0 +* Wed Dec 10 2008 - vittorio@vitsoft.bz +- dahdi-linux 2.1.0 * Sat Oct 04 2008 - vittorio@vitsoft.bz - dahdi-linux 2.0.0 * Mon Sep 15 2008 - vittorio@vitsoft.bz
[-] [+]	Deleted	dahdi-2.2.0.2.patch ^
@@ -1,88 +0,0 @@ ---- Makefile.orig 2009-05-12 23:57:44.000000000 +0200 -+++ Makefile 2009-08-11 20:34:37.000000000 +0200 -@@ -115,7 +115,7 @@ - - install-firmware: - ifeq ($(HOTPLUG_FIRMWARE),yes) -- $(MAKE) -C drivers/dahdi/firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) -+ $(MAKE) -C drivers/dahdi/firmware hotplug-install DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) - endif - - uninstall-firmware: ---- drivers/dahdi/firmware/Makefile.orig 2009-04-29 19:48:39.000000000 +0200 -+++ drivers/dahdi/firmware/Makefile 2009-08-11 20:43:09.000000000 +0200 -@@ -64,7 +64,7 @@ - - # Download and extract firmware tarballs - dahdi-fw-%.tar.gz: -- @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) \|\| ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.$(subst .tar.gz,,$) ] ) \|\| ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$) ] ); then \ -+ @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) \|\| ( [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ] && ! [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.$(subst .tar.gz,,$) ] ) \|\| ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$) ] ); then \ - echo "Attempting to download $@"; \ - if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; \ - if test ! -f $@; then exit 1; fi; \ -@@ -82,38 +82,38 @@ - # Create object files suitable for linking against - object-build: $(FIRMWARE) $(OBJECT_FILES) - --$(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware: -+$(DESTDIR)/$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware: - mkdir -p $@ - - # Install all downloaded firmware images for hotplug usage --hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE) --ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) -+hotplug-install: $(DESTDIR)$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE) -+ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) - @echo "Installing dahdi-fw-oct6114-064.bin to hotplug firmware directories" -- @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware -- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-* -- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) -+ @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware -+ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-* -+ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) - @install -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware - @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-* - @touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) - else - @echo "Firmware dahdi-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" - endif --ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) -+ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) - @echo "Installing dahdi-fw-oct6114-128.bin to hotplug firmware directories" -- @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware -- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-* -- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) -+ @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware -+ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-* -+ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) - @install -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware - @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-* - @touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) - else - @echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" - endif --ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) -+ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) - @echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories" -- @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware -- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-* -- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) -+ @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware -+ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-* -+ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) - @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware - @rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-* - @touch $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) -@@ -123,9 +123,9 @@ - - # Uninstall any installed dahdi firmware images from hotplug firmware directories - hotplug-uninstall: -- if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ -- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/dahdi-fw-.bin; \ -- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw; \ -+ if [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ]; then \ -+ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/dahdi-fw-.bin; \ -+ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.dahdi-fw; \ - fi - if [ -d $(DESTDIR)/lib/firmware ]; then \ - rm -f $(DESTDIR)/lib/firmware/dahdi-fw-*.bin; \
[-] [+]	Added	sles.patch ^
@@ -0,0 +1,43 @@ +--- include/dahdi/kernel.h 2008-10-27 16:14:36.000000000 +0100 ++++ include/dahdi/kernel.h.new 2008-12-11 14:36:07.000000000 +0100 +@@ -936,4 +936,40 @@ + #define kzalloc(a, b) kcalloc(1, a, b) + #endif + ++#ifndef dev_printk ++#define dev_printk(level, dev, format, arg...) \ ++ printk(level "%s %s: " format , dev_driver_string(dev) , \ ++ (dev)->bus_id , ## arg) ++#endif ++ ++#ifndef dev_emerg ++#define dev_emerg(dev, format, arg...) \ ++ dev_printk(KERN_EMERG , dev , format , ## arg) ++#endif ++#ifndef dev_alert ++#define dev_alert(dev, format, arg...) \ ++ dev_printk(KERN_ALERT , dev , format , ## arg) ++#endif ++#ifndef dev_crit ++#define dev_crit(dev, format, arg...) \ ++ dev_printk(KERN_CRIT , dev , format , ## arg) ++#endif ++#ifndef dev_err ++#define dev_err(dev, format, arg...) \ ++ dev_printk(KERN_ERR , dev , format , ## arg) ++#endif ++#ifndef dev_warn ++#define dev_warn(dev, format, arg...) \ ++ dev_printk(KERN_WARNING , dev , format , ## arg) ++#endif ++#ifndef dev_notice ++#define dev_notice(dev, format, arg...) \ ++ dev_printk(KERN_NOTICE , dev , format , ## arg) ++#endif ++#ifndef dev_info ++#define dev_info(dev, format, arg...) \ ++ dev_printk(KERN_INFO , dev , format , ## arg) ++#endif ++ ++ + #endif /* _DAHDI_KERNEL_H */
	Deleted	dahdi-linux-2.0.0.tar.bz2 ^
	Deleted	dahdi-linux-2.1.0.3.tar.bz2 ^
	Deleted	dahdi-linux-2.1.0.4.tar.bz2 ^
	Added	firmware.tar.bz2/dahdi/firmware/dahdi-fwload-vpmadt032-1.17.0.tar.gz ^