From: <ppr...@us...> - 2008-04-13 20:31:45
|
Revision: 1723 http://astlinux.svn.sourceforge.net/astlinux/?rev=1723&view=rev Author: pprindeville Date: 2008-04-13 13:31:46 -0700 (Sun, 13 Apr 2008) Log Message: ----------- Turn off UPnP but enable SIP helpering in Arnofw Modified Paths: -------------- trunk/package/arno-fw/arnofw.mk trunk/package/iptables/iptables.mk Modified: trunk/package/arno-fw/arnofw.mk =================================================================== --- trunk/package/arno-fw/arnofw.mk 2008-04-13 05:46:14 UTC (rev 1722) +++ trunk/package/arno-fw/arnofw.mk 2008-04-13 20:31:46 UTC (rev 1723) @@ -58,6 +58,10 @@ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_DIR)/ $(INSTALL) -D -m 0644 $(ARNOFW_DIR)$(ARNOFW_PLUGIN_DIR)/*.conf \ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_DIR)/ + $(SED) 's:^ENABLED=1:ENABLED=0:' \ + $(ARNOFW_DIR)$(ARNOFW_PLUGIN_DIR)/linuxigd.conf + $(SED) 's:^ENABLED=0:ENABLED=1:' \ + $(ARNOFW_DIR)$(ARNOFW_PLUGIN_DIR)/sip-voip.conf arnofw: linux iptables $(TARGET_DIR)$(ARNOFW_TARGET_BINARY) @@ -69,6 +73,8 @@ arnofw-dirclean: rm -rf $(ARNOFW_DIR) +arnofw-source: $(ARNOFW_DIR)/.patched + ############################################################# # # Toplevel Makefile options Modified: trunk/package/iptables/iptables.mk =================================================================== --- trunk/package/iptables/iptables.mk 2008-04-13 05:46:14 UTC (rev 1722) +++ trunk/package/iptables/iptables.mk 2008-04-13 20:31:46 UTC (rev 1723) @@ -11,7 +11,7 @@ ASTFW_BIN:=/usr/sbin/astfw $(DL_DIR)/$(IPTABLES_SOURCE): - $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) + $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)$(IPTABLES_SOURCE) $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) bzcat $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2006-11-02 21:59:07
|
Revision: 439 http://svn.sourceforge.net/astlinux/?rev=439&view=rev Author: krisk84 Date: 2006-11-02 13:58:18 -0800 (Thu, 02 Nov 2006) Log Message: ----------- fix libusb/usbutils to use STAGING_DIR where necessary Modified Paths: -------------- trunk/package/libusb/libusb.mk trunk/package/usbutils/usbutils.mk Modified: trunk/package/libusb/libusb.mk =================================================================== --- trunk/package/libusb/libusb.mk 2006-11-02 18:40:31 UTC (rev 438) +++ trunk/package/libusb/libusb.mk 2006-11-02 21:58:18 UTC (rev 439) @@ -38,6 +38,7 @@ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LIBUSB_DIR) $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY): $(LIBUSB_DIR)/$(LIBUSB_BINARY) + make -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install make -C $(LIBUSB_DIR) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/usr/lib/libusb*.a $(TARGET_DIR)/usr/lib/libusb*.la Modified: trunk/package/usbutils/usbutils.mk =================================================================== --- trunk/package/usbutils/usbutils.mk 2006-11-02 18:40:31 UTC (rev 438) +++ trunk/package/usbutils/usbutils.mk 2006-11-02 21:58:18 UTC (rev 439) @@ -22,8 +22,8 @@ $(USBUTILS_DIR)/.configured: $(USBUTILS_DIR)/.unpacked (cd $(USBUTILS_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ - CFLAGS="$(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" \ - LDFLAGS="-L$(TARGET_DIR)/usr/lib" \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ --target=$(GNU_TARGET_NAME) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2006-11-17 17:19:10
|
Revision: 462 http://svn.sourceforge.net/astlinux/?rev=462&view=rev Author: krisk84 Date: 2006-11-17 09:19:05 -0800 (Fri, 17 Nov 2006) Log Message: ----------- include userspace ALSA support Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/alsa-lib/ trunk/package/alsa-lib/Config.in trunk/package/alsa-lib/alsa-lib-libonly.patch trunk/package/alsa-lib/alsa-lib.mk trunk/package/alsa-utils/ trunk/package/alsa-utils/Config.in trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch trunk/package/alsa-utils/alsa-utils.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2006-11-15 20:36:16 UTC (rev 461) +++ trunk/package/Config.in 2006-11-17 17:19:05 UTC (rev 462) @@ -34,6 +34,8 @@ source "package/digiumg729/Config.in" source "package/chan_misdn/Config.in" source "package/vm-messenger/Config.in" +source "package/alsa-lib/Config.in" +source "package/alsa-utils/Config.in" source "package/apcupsd/Config.in" source "package/appweb/Config.in" source "package/astmanproxy/Config.in" Added: trunk/package/alsa-lib/Config.in =================================================================== --- trunk/package/alsa-lib/Config.in (rev 0) +++ trunk/package/alsa-lib/Config.in 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,7 @@ +config BR2_PACKAGE_ALSA-LIB + bool "alsa-lib" + default n + help + Install the alsa-lib package + http://www.alsa-project.org/ + Added: trunk/package/alsa-lib/alsa-lib-libonly.patch =================================================================== --- trunk/package/alsa-lib/alsa-lib-libonly.patch (rev 0) +++ trunk/package/alsa-lib/alsa-lib-libonly.patch 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,13 @@ +diff -ur alsa-lib-1.0.13.orig/Makefile.in alsa-lib-1.0.13/Makefile.in +--- alsa-lib-1.0.13.orig/Makefile.in 2006-09-29 07:44:07.000000000 -0400 ++++ alsa-lib-1.0.13/Makefile.in 2006-11-17 12:12:37.000000000 -0500 +@@ -253,8 +253,7 @@ + target_cpu = @target_cpu@ + target_os = @target_os@ + target_vendor = @target_vendor@ +-SUBDIRS = doc include src modules $(am__append_1) $(am__append_2) test \ +- utils ++SUBDIRS = include src $(am__append_1) $(am__append_2) + EXTRA_DIST = ChangeLog INSTALL TODO NOTES configure hgcompile libtool depcomp version MEMORY-LEAK + AUTOMAKE_OPTIONS = foreign + INCLUDES = -I$(top_srcdir)/include Added: trunk/package/alsa-lib/alsa-lib.mk =================================================================== --- trunk/package/alsa-lib/alsa-lib.mk (rev 0) +++ trunk/package/alsa-lib/alsa-lib.mk 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,100 @@ +############################################################# +# +# ALSA lib +# +############################################################# + +ALSA_LIB_VERSION:=1.0.13 +ALSA_LIB_SOURCE:=alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 +ALSA_LIB_SITE:=ftp://ftp.alsa-project.org/pub/lib/ +ALSA_LIB_CAT:=bzcat +ALSA_LIB_DIR:=$(BUILD_DIR)/${shell basename $(ALSA_LIB_SOURCE) .tar.bz2} +ALSA_LIB_BINARY:=libasound.so.2.0.0 + +$(DL_DIR)/$(ALSA_LIB_SOURCE): + $(WGET) -P $(DL_DIR) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE) + +$(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE) + $(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(ALSA_LIB_DIR) package/alsa-lib alsa-lib*.patch* + touch $(ALSA_LIB_DIR)/.unpacked + +# Install ALSA libraries to /usr/lib. +# TODO: Install configuration files to /etc/alsa instead of /usr/share/alsa. +$(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked + (cd $(ALSA_LIB_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + LDFLAGS="-L$(STAGING_DIR)/lib" \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=$(STAGING_DIR)/usr \ + --exec-prefix=$(STAGING_DIR)/usr \ + --bindir=$(STAGING_DIR)/usr/bin \ + --sbindir=$(STAGING_DIR)/usr/sbin \ + --libexecdir=$(STAGING_DIR)/usr/lib \ + --sysconfdir=$(STAGING_DIR)/etc \ + --datadir=$(STAGING_DIR)/usr/share \ + --localstatedir=$(STAGING_DIR)/var \ + --mandir=$(STAGING_DIR)/usr/man \ + --infodir=$(STAGING_DIR)/usr/info \ + --with-pic \ + --disable-static \ + --disable-aload \ + --disable-rawmidi \ + --disable-hwdep \ + --disable-seq \ + --disable-instr \ + ); + touch $(ALSA_LIB_DIR)/.configured + +# TODO: check against specific binary. +$(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/.configured $(TARGET_CC) + $(MAKE) CC=$(TARGET_CC) -C $(ALSA_LIB_DIR) + +# Install into staging dir, for other packages to build against. +$(STAGING_DIR)/lib/$(ALSA_LIB_BINARY): $(ALSA_LIB_DIR)/src/.libs/$(ALSA_LIB_BINARY) + $(MAKE) \ + prefix=$(STAGING_DIR) \ + exec_prefix=$(STAGING_DIR) \ + bindir=$(STAGING_DIR)/bin \ + sbindir=$(STAGING_DIR)/sbin \ + libexecdir=$(STAGING_DIR)/lib \ + datadir=$(STAGING_DIR)/usr/share \ + sysconfdir=$(STAGING_DIR)/etc \ + localstatedir=$(STAGING_DIR)/var \ + libdir=$(STAGING_DIR)/lib \ + infodir=$(STAGING_DIR)/info \ + mandir=$(STAGING_DIR)/man \ + includedir=$(STAGING_DIR)/include \ + -C $(ALSA_LIB_DIR) install +# Install into target dir, for utils using shared libraries on target. +$(TARGET_DIR)/lib/$(ALSA_LIB_BINARY): $(STAGING_DIR)/lib/$(ALSA_LIB_BINARY) + install -D -m 0644 $< $@ + $(STRIP) $@ + (cd $(TARGET_DIR)/lib; \ + rm -f libasound.so libasound.so.2 libasound.so.2.0; \ + ln -s libasound.so.2.0.0 libasound.so; \ + ln -s libasound.so.2.0.0 libasound.so.2.0; \ + ln -s libasound.so.2.0.0 libasound.so.2) + +alsa-lib: uclibc $(TARGET_DIR)/lib/$(ALSA_LIB_BINARY) + +alsa-lib-clean: + $(MAKE) -C $(ALSA_LIB_DIR) distclean + rm $(ALSA_LIB_DIR)/.configured + +alsa-lib-dirclean: + rm -rf $(ALSA_LIB_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_ALSA_LIB)),y) +TARGETS+=alsa-lib +endif + Added: trunk/package/alsa-utils/Config.in =================================================================== --- trunk/package/alsa-utils/Config.in (rev 0) +++ trunk/package/alsa-utils/Config.in 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ALSA-UTILS + bool "alsa-utils" + select BR2_PACKAGE_ALSA-LIB + default n + help + Install the alsa-utils package + http://www.alsa-project.org/ + Added: trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch =================================================================== --- trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch (rev 0) +++ trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,12 @@ +diff -ur alsa-utils-1.0.13.orig/Makefile.in alsa-utils-1.0.13/Makefile.in +--- alsa-utils-1.0.13.orig/Makefile.in 2006-09-29 07:54:55.000000000 -0400 ++++ alsa-utils-1.0.13/Makefile.in 2006-11-17 12:15:23.000000000 -0500 +@@ -185,7 +185,7 @@ + INCLUDES = -I$(top_srcdir)/include + @ALSAMIXER_FALSE@ALSAMIXER_DIR = + @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer +-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po ++SUBDIRS = include amixer aplay + EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp + AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I m4 Added: trunk/package/alsa-utils/alsa-utils.mk =================================================================== --- trunk/package/alsa-utils/alsa-utils.mk (rev 0) +++ trunk/package/alsa-utils/alsa-utils.mk 2006-11-17 17:19:05 UTC (rev 462) @@ -0,0 +1,70 @@ +############################################################# +# +# ALSA utils +# +############################################################# +ALSA_UTILS_VERSION:=1.0.13 +ALSA_UTILS_SOURCE:=alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 +ALSA_UTILS_SITE:=ftp://ftp.alsa-project.org/pub/utils +ALSA_UTILS_DIR:=$(BUILD_DIR)/${shell basename $(ALSA_UTILS_SOURCE) .tar.bz2} +ALSA_UTILS_WORKDIR:=$(BUILD_DIR)/alsa-utils-$(ALSA_UTILS_VERSION) +ALSA_UTILS_BINARY:=aplay + +# TODO: Not necessary for new buildroot? +TAR_OPTIONS:=$(TAR_OPTIONS) + +$(DL_DIR)/$(ALSA_UTILS_SOURCE): + $(WGET) -P $(DL_DIR) $(ALSA_UTILS_SITE)/$(ALSA_UTILS_SOURCE) + +$(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE) + bzcat $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/alsa-utils alsa-utils*.patch* + touch $(ALSA_UTILS_DIR)/.unpacked + +# TODO: Check if ncurses is available -- if so, build alsamixer. +$(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked + (cd $(ALSA_UTILS_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --disable-alsatest \ + --disable-alsamixer \ + --with-alsa-prefix=$(STAGING_DIR)/lib \ + --with-alsa-inc-prefix=$(STAGING_DIR)/include \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + ); + touch $(ALSA_UTILS_DIR)/.configured + +$(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY)/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(ALSA_UTILS_WORKDIR) + +# TODO: Only one target -- is that bad? +$(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY)/$(ALSA_UTILS_BINARY) + for i in aplay amixer;do \ + install -D -m 0755 $(ALSA_UTILS_DIR)/$$i/$$i $(TARGET_DIR)/usr/bin/$$i; \ + $(STRIP) $(TARGET_DIR)/usr/bin/$$i; \ + done + (cd $(TARGET_DIR)/usr/bin;rm -f arecord;ln -s aplay arecord) + +alsa-utils: alsa-lib $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY) + +alsa-utils-clean: + $(MAKE) -C $(ALSA_UTILS_DIR) distclean + rm $(ALSA_UTILS_DIR)/.configured + +alsa-utils-dirclean: + rm -rf $(ALSA_UTILS_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_ALSA_UTILS)),y) +TARGETS+=alsa-utils +endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2006-11-18 10:13:15
|
Revision: 469 http://svn.sourceforge.net/astlinux/?rev=469&view=rev Author: krisk84 Date: 2006-11-18 02:13:15 -0800 (Sat, 18 Nov 2006) Log Message: ----------- fix ALSA configure consistency Modified Paths: -------------- trunk/package/alsa-lib/Config.in trunk/package/alsa-utils/Config.in Modified: trunk/package/alsa-lib/Config.in =================================================================== --- trunk/package/alsa-lib/Config.in 2006-11-17 20:45:25 UTC (rev 468) +++ trunk/package/alsa-lib/Config.in 2006-11-18 10:13:15 UTC (rev 469) @@ -1,4 +1,4 @@ -config BR2_PACKAGE_ALSA-LIB +config BR2_PACKAGE_ALSA_LIB bool "alsa-lib" default n help Modified: trunk/package/alsa-utils/Config.in =================================================================== --- trunk/package/alsa-utils/Config.in 2006-11-17 20:45:25 UTC (rev 468) +++ trunk/package/alsa-utils/Config.in 2006-11-18 10:13:15 UTC (rev 469) @@ -1,6 +1,6 @@ -config BR2_PACKAGE_ALSA-UTILS +config BR2_PACKAGE_ALSA_UTILS bool "alsa-utils" - select BR2_PACKAGE_ALSA-LIB + select BR2_PACKAGE_ALSA_LIB default n help Install the alsa-utils package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2006-11-18 10:55:49
|
Revision: 470 http://svn.sourceforge.net/astlinux/?rev=470&view=rev Author: krisk84 Date: 2006-11-18 02:55:49 -0800 (Sat, 18 Nov 2006) Log Message: ----------- ALSA cleanup Modified Paths: -------------- trunk/package/alsa-lib/alsa-lib.mk trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch trunk/package/alsa-utils/alsa-utils.mk Modified: trunk/package/alsa-lib/alsa-lib.mk =================================================================== --- trunk/package/alsa-lib/alsa-lib.mk 2006-11-18 10:13:15 UTC (rev 469) +++ trunk/package/alsa-lib/alsa-lib.mk 2006-11-18 10:55:49 UTC (rev 470) @@ -30,16 +30,16 @@ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --prefix=$(STAGING_DIR)/usr \ - --exec-prefix=$(STAGING_DIR)/usr \ - --bindir=$(STAGING_DIR)/usr/bin \ - --sbindir=$(STAGING_DIR)/usr/sbin \ - --libexecdir=$(STAGING_DIR)/usr/lib \ - --sysconfdir=$(STAGING_DIR)/etc \ - --datadir=$(STAGING_DIR)/usr/share \ - --localstatedir=$(STAGING_DIR)/var \ - --mandir=$(STAGING_DIR)/usr/man \ - --infodir=$(STAGING_DIR)/usr/info \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ --with-pic \ --disable-static \ --disable-aload \ @@ -71,6 +71,7 @@ includedir=$(STAGING_DIR)/include \ -C $(ALSA_LIB_DIR) install cp -a $(STAGING_DIR)/include/alsa $(STAGING_DIR)/usr/include/ + cp -a $(STAGING_DIR)/usr/share/alsa $(TARGET_DIR)/usr/share/alsa # Install into target dir, for utils using shared libraries on target. $(TARGET_DIR)/lib/$(ALSA_LIB_BINARY): $(STAGING_DIR)/lib/$(ALSA_LIB_BINARY) install -D -m 0644 $< $@ Modified: trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch =================================================================== --- trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch 2006-11-18 10:13:15 UTC (rev 469) +++ trunk/package/alsa-utils/alsa-utils-aplay-amixer-only.patch 2006-11-18 10:55:49 UTC (rev 470) @@ -6,7 +6,7 @@ @ALSAMIXER_FALSE@ALSAMIXER_DIR = @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer -SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po -+SUBDIRS = include amixer aplay ++SUBDIRS = include $(ALSAMIXER_DIR) amixer aplay EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 Modified: trunk/package/alsa-utils/alsa-utils.mk =================================================================== --- trunk/package/alsa-utils/alsa-utils.mk 2006-11-18 10:13:15 UTC (rev 469) +++ trunk/package/alsa-utils/alsa-utils.mk 2006-11-18 10:55:49 UTC (rev 470) @@ -31,7 +31,7 @@ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --disable-alsatest \ - --disable-alsamixer \ + --disable-rpath \ --with-alsa-prefix=$(STAGING_DIR)/lib \ --with-alsa-inc-prefix=$(STAGING_DIR)/include \ $(DISABLE_NLS) \ @@ -44,13 +44,13 @@ # TODO: Only one target -- is that bad? $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY)/$(ALSA_UTILS_BINARY) - for i in aplay amixer;do \ + for i in aplay amixer alsamixer;do \ install -D -m 0755 $(ALSA_UTILS_DIR)/$$i/$$i $(TARGET_DIR)/usr/bin/$$i; \ $(STRIP) $(TARGET_DIR)/usr/bin/$$i; \ done (cd $(TARGET_DIR)/usr/bin;rm -f arecord;ln -s aplay arecord) -alsa-utils: alsa-lib $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY) +alsa-utils: uclibc ncurses alsa-lib $(TARGET_DIR)/usr/bin/$(ALSA_UTILS_BINARY) alsa-utils-clean: $(MAKE) -C $(ALSA_UTILS_DIR) distclean This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2006-12-21 19:19:22
|
Revision: 497 http://svn.sourceforge.net/astlinux/?rev=497&view=rev Author: krisk84 Date: 2006-12-21 11:19:21 -0800 (Thu, 21 Dec 2006) Log Message: ----------- package updates for 2.6.19.1 Modified Paths: -------------- trunk/package/astmanproxy/astmanproxy.mk trunk/package/lmsensors/lmsensors.mk trunk/package/madwifi/madwifi.mk trunk/package/zaptel/zaptel.mk Modified: trunk/package/astmanproxy/astmanproxy.mk =================================================================== --- trunk/package/astmanproxy/astmanproxy.mk 2006-12-21 16:43:42 UTC (rev 496) +++ trunk/package/astmanproxy/astmanproxy.mk 2006-12-21 19:19:21 UTC (rev 497) @@ -11,7 +11,7 @@ ASTMANPROXY_BINARY:=astmanproxy ASTMANPROXY_TARGET_BINARY:=usr/sbin/$(ASTMANPROXY_BINARY) -LINUX_VER=2.6.18 +LINUX_VER=2.6.19.1 $(DL_DIR)/$(ASTMANPROXY_SOURCE): $(WGET) -P $(DL_DIR) $(ASTMANPROXY_SITE)/$(ASTMANPROXY_SOURCE) Modified: trunk/package/lmsensors/lmsensors.mk =================================================================== --- trunk/package/lmsensors/lmsensors.mk 2006-12-21 16:43:42 UTC (rev 496) +++ trunk/package/lmsensors/lmsensors.mk 2006-12-21 19:19:21 UTC (rev 497) @@ -10,7 +10,7 @@ LMSENSORS_BINARY := prog/sensors/sensors LMSENSORS_TARGET_BINARY := usr/bin/sensors -LINUX_VER=2.6.18 +LINUX_VER=2.6.19.1 $(DL_DIR)/$(LMSENSORS_SOURCE): $(WGET) -P $(DL_DIR) $(LMSENSORS_SITE)/$(LMSENSORS_SOURCE) Modified: trunk/package/madwifi/madwifi.mk =================================================================== --- trunk/package/madwifi/madwifi.mk 2006-12-21 16:43:42 UTC (rev 496) +++ trunk/package/madwifi/madwifi.mk 2006-12-21 19:19:21 UTC (rev 497) @@ -10,7 +10,7 @@ MADWIFI_BINARY := tools/wlanconfig MADWIFI_TARGET_BINARY := usr/bin/wlanconfig -LINUX_VER=2.6.18 +LINUX_VER=2.6.19.1 $(DL_DIR)/$(MADWIFI_SOURCE): $(WGET) -P $(DL_DIR) $(MADWIFI_SITE)/$(MADWIFI_SOURCE) Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2006-12-21 16:43:42 UTC (rev 496) +++ trunk/package/zaptel/zaptel.mk 2006-12-21 19:19:21 UTC (rev 497) @@ -18,7 +18,7 @@ #LINUX_VER=$(subst ",, $(strip $(BR2_PACKAGE_LINUX_VERSION))) #" -LINUX_VER=2.6.18 +LINUX_VER=2.6.19.1 ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-01-18 15:34:33
|
Revision: 504 http://svn.sourceforge.net/astlinux/?rev=504&view=rev Author: krisk84 Date: 2007-01-18 07:34:30 -0800 (Thu, 18 Jan 2007) Log Message: ----------- various make clean fixes Modified Paths: -------------- trunk/package/appconference/appconference.mk trunk/package/arno-fw/arnofw.mk trunk/package/digiumg729/digiumg729.mk Modified: trunk/package/appconference/appconference.mk =================================================================== --- trunk/package/appconference/appconference.mk 2007-01-03 20:57:11 UTC (rev 503) +++ trunk/package/appconference/appconference.mk 2007-01-18 15:34:30 UTC (rev 504) @@ -37,7 +37,7 @@ appconference-clean: -$(MAKE) -C $(APPCONFERENCE_DIR) clean - rm $(APPCONFERENCE_TARGET_BINARY) + -rm $(APPCONFERENCE_TARGET_BINARY) appconference-dirclean: rm -rf $(APPCONFERENCE_DIR) Modified: trunk/package/arno-fw/arnofw.mk =================================================================== --- trunk/package/arno-fw/arnofw.mk 2007-01-03 20:57:11 UTC (rev 503) +++ trunk/package/arno-fw/arnofw.mk 2007-01-18 15:34:30 UTC (rev 504) @@ -13,8 +13,8 @@ arnofw: uclibc linux iptables $(ARNOFW_TARGET_BINARY) arnofw-clean: - rm $(ARNOFW_TARGET_BINARY) - rm $(TARGET_DIR)/stat/etc/arno-iptables-firewall.conf + -rm $(ARNOFW_TARGET_BINARY) + -rm $(TARGET_DIR)/stat/etc/arno-iptables-firewall.conf arnofw-dirclean: echo "Nothing to do" Modified: trunk/package/digiumg729/digiumg729.mk =================================================================== --- trunk/package/digiumg729/digiumg729.mk 2007-01-03 20:57:11 UTC (rev 503) +++ trunk/package/digiumg729/digiumg729.mk 2007-01-18 15:34:30 UTC (rev 504) @@ -13,8 +13,8 @@ digiumg729: uclibc linux asterisk $(DIGIUMG729_TARGET_BINARY) digiumg729-clean: - rm $(DIGIUMG729_TARGET_BINARY) - rm $(TARGET_DIR)/usr/sbin/g729register + -rm $(DIGIUMG729_TARGET_BINARY) + -rm $(TARGET_DIR)/usr/sbin/g729register digiumg729-dirclean: echo "Nothing to do" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-01-23 18:53:58
|
Revision: 510 http://svn.sourceforge.net/astlinux/?rev=510&view=rev Author: krisk84 Date: 2007-01-23 10:53:54 -0800 (Tue, 23 Jan 2007) Log Message: ----------- add support for nistnet Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/nistnet/ trunk/package/nistnet/Config.in trunk/package/nistnet/nistnet.mk trunk/package/nistnet/nistnet.patch Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-01-22 19:11:14 UTC (rev 509) +++ trunk/package/Config.in 2007-01-23 18:53:54 UTC (rev 510) @@ -124,6 +124,7 @@ source "package/netkittelnet/Config.in" source "package/netsnmp/Config.in" source "package/newt/Config.in" +source "package/nistnet/Config.in" source "package/nocatsplash/Config.in" source "package/ntp/Config.in" source "package/openntpd/Config.in" Added: trunk/package/nistnet/Config.in =================================================================== --- trunk/package/nistnet/Config.in (rev 0) +++ trunk/package/nistnet/Config.in 2007-01-23 18:53:54 UTC (rev 510) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_NISTNET + bool "nistnet" + default n + help + nistnet - nistnet is a network emulation package that runs on Linux + + http://www-x.antd.nist.gov/nistnet/ + Added: trunk/package/nistnet/nistnet.mk =================================================================== --- trunk/package/nistnet/nistnet.mk (rev 0) +++ trunk/package/nistnet/nistnet.mk 2007-01-23 18:53:54 UTC (rev 510) @@ -0,0 +1,66 @@ +############################################################# +# +# nistnet +# +############################################################## +LINUX_VER=2.6.19.1 +NISTNET_VERSION := 3.0a +NISTNET_SOURCE := nistnet.2.0.12c.tar.gz +NISTNET_SITE := http://www-x.antd.nist.gov/nistnet/dist +NISTNET_DIR := $(BUILD_DIR)/nistnet-$(NISTNET_VERSION) +NISTNET_BINARY := kernel/nistnet.ko +NISTNET_TARGET_BINARY := lib/modules/$(LINUX_VER)/misc/nistnet.ko + +$(DL_DIR)/$(NISTNET_SOURCE): + $(WGET) -P $(DL_DIR) $(NISTNET_SITE)/$(NISTNET_SOURCE) + +$(NISTNET_DIR)/.source: $(DL_DIR)/$(NISTNET_SOURCE) + zcat $(DL_DIR)/$(NISTNET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(NISTNET_DIR) package/nistnet/ nistnet\*.patch + touch $(NISTNET_DIR)/.source + +$(NISTNET_DIR)/.configured: $(NISTNET_DIR)/.source + touch $(NISTNET_DIR)/.configured + +$(NISTNET_DIR)/$(NISTNET_BINARY): $(NISTNET_DIR)/.configured + $(MAKE1) -C $(NISTNET_DIR) CC=$(TARGET_CC) TOPDIR=$(BUILD_DIR)/linux KDIR=$(BUILD_DIR)/linux \ + $(TARGET_CONFIGURE_OPTS) SUB_DIRS="math lib cli kernel" HOSTCC=gcc + +$(TARGET_DIR)/$(NISTNET_TARGET_BINARY): $(NISTNET_DIR)/$(NISTNET_BINARY) + $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/cnistnet $(TARGET_DIR)/usr/bin/cnistnet + $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/hitbox $(TARGET_DIR)/usr/bin/hitbox + $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/mungebox $(TARGET_DIR)/usr/bin/mungebox + $(INSTALL) -D -m 0755 $(NISTNET_DIR)/cli/nistspy $(TARGET_DIR)/usr/bin/nistspy + -$(STRIP) $(TARGET_DIR)/usr/bin/cnistnet + -$(STRIP) $(TARGET_DIR)/usr/bin/hitbox + -$(STRIP) $(TARGET_DIR)/usr/bin/mungebox + -$(STRIP) $(TARGET_DIR)/usr/bin/nistspy + $(INSTALL) -D -m 0644 $(NISTNET_DIR)/$(NISTNET_BINARY) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) + # -$(STRIP) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) + /sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER) + touch -c $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) + +nistnet: uclibc linux $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) + +nistnet-source: $(DL_DIR)/$(NISTNET_SOURCE) + +nistnet-clean: + -rm $(TARGET_DIR)/usr/bin/cnistnet + -rm $(TARGET_DIR)/usr/bin/hitbox + -rm $(TARGET_DIR)/usr/bin/mungebox + -rm $(TARGET_DIR)/usr/bin/nistspy + -rm $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) + /sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER) + -$(MAKE) -C $(NISTNET_DIR) clean + +nistnet-dirclean: + rm -rf $(NISTNET_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_NISTNET)),y) +TARGETS+=nistnet +endif Added: trunk/package/nistnet/nistnet.patch =================================================================== --- trunk/package/nistnet/nistnet.patch (rev 0) +++ trunk/package/nistnet/nistnet.patch 2007-01-23 18:53:54 UTC (rev 510) @@ -0,0 +1,213 @@ +diff -ur nistnet-3.0a.orig/Config nistnet-3.0a/Config +--- nistnet-3.0a.orig/Config 2005-06-17 11:53:19.000000000 -0400 ++++ nistnet-3.0a/Config 2007-01-23 11:39:43.000000000 -0500 +@@ -7,7 +7,7 @@ + .EXPORT_ALL_VARIABLES: + + # 1. This should point to the top of the Linux kernel source tree: +-TOPDIR = /lib/modules/2.6.10-1.771_FC2smp/build ++TOPDIR = /lib/modules/2.6.9-34.0.2.ELsmp/build + HPATH = $(TOPDIR)/include + + # 2. Device node names and major numbers -- edit here and recompile if needed +@@ -46,7 +46,7 @@ + # since you can just rmmod rtc before starting NIST Net. But for + # 2.0 and 2.2 kernels, there's really not much choice if the rtc has + # been compiled into the kernel (which is usually the case). +-RTC_HANDLING = -DCONFIG_RTC_AGGRESSIVE ++# RTC_HANDLING = -DCONFIG_RTC_AGGRESSIVE + + # d. Which delay distribtuion to use? By default, it's experimental. + # With the new version, this will be expanded to cover other delay +diff -ur nistnet-3.0a.orig/include/kincludes.h nistnet-3.0a/include/kincludes.h +--- nistnet-3.0a.orig/include/kincludes.h 2005-06-17 11:46:39.000000000 -0400 ++++ nistnet-3.0a/include/kincludes.h 2007-01-23 12:01:54.000000000 -0500 +@@ -12,7 +12,7 @@ + */ + #include <linux/types.h> + #include <linux/version.h> +-#include <linux/config.h> ++#include <linux/autoconf.h> + /* #include <net/checksum.h> */ + + #ifndef KERNEL_VERSION +diff -ur nistnet-3.0a.orig/kernel/knistnet.c nistnet-3.0a/kernel/knistnet.c +--- nistnet-3.0a.orig/kernel/knistnet.c 2004-09-29 18:32:24.000000000 -0400 ++++ nistnet-3.0a/kernel/knistnet.c 2007-01-23 11:57:32.000000000 -0500 +@@ -867,10 +867,10 @@ + OtherNistnetMunger = DefaultNistnetMunger; + } + +-#define munge_finish(string) {LinUnlock(string); if (skb2) (void) rcv_packet_munge(skb2, dev, ptype);/* recursively process dup */ } ++#define munge_finish(string) {LinUnlock(string); if (skb2) (void) rcv_packet_munge(skb2, dev, ptype, NULL);/* recursively process dup */ } + + int +-rcv_packet_munge(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype) ++rcv_packet_munge(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *dev2) + { + unsigned long pre_flags; + +@@ -913,7 +913,7 @@ + if (!tableme) { /* not intercepting */ + global_stats(STATS_UNPROCESS); + LinUnlock("global_stats2"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + + /* Assume we will queue until we find otherwise */ +@@ -958,7 +958,7 @@ + + global_stats(STATS_PROCESS); + munge_finish("no delay"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + + screamer = fast_alloc(GFP_ATOMIC); +@@ -969,7 +969,7 @@ + packet_stats(skb, hitme); + global_stats(STATS_PROCESS); + munge_finish("fast_alloc failed"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + hpi = (struct nistnet_packetinfo *)screamer->data; + +@@ -1000,7 +1000,7 @@ + return 0; + } else { + LinUnlock("ippt->func"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + } + +diff -ur nistnet-3.0a.orig/kernel/knistspy.c nistnet-3.0a/kernel/knistspy.c +--- nistnet-3.0a.orig/kernel/knistspy.c 2004-09-29 18:32:24.000000000 -0400 ++++ nistnet-3.0a/kernel/knistspy.c 2007-01-23 11:57:32.000000000 -0500 +@@ -366,7 +366,7 @@ + iph->check = 0; + iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl); + /* Send ourselves the munged copy */ +- ippt->func(skb, dev, ippt); ++ ippt->func(skb, dev, ippt, NULL); + + return 1; + } +diff -ur nistnet-3.0a.orig/kernel/kstats.c nistnet-3.0a/kernel/kstats.c +--- nistnet-3.0a.orig/kernel/kstats.c 2004-09-29 18:32:24.000000000 -0400 ++++ nistnet-3.0a/kernel/kstats.c 2007-01-23 11:57:32.000000000 -0500 +@@ -260,10 +260,10 @@ + OtherNistnetMunger = DefaultNistnetMunger; + } + +-#define munge_finish(string) {LinUnlock(string); if (skb2) (void) rcv_packet_munge(skb2, dev, ptype);/* recursively process dup */ } ++#define munge_finish(string) {LinUnlock(string); if (skb2) (void) rcv_packet_munge(skb2, dev, ptype, NULL);/* recursively process dup */ } + + int +-rcv_packet_munge(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype) ++rcv_packet_munge(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *dev2) + { + unsigned long pre_flags; + +@@ -306,7 +306,7 @@ + if (!tableme) { /* not intercepting */ + global_stats(STATS_UNPROCESS); + LinUnlock("global_stats2"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + + /* Assume we will queue until we find otherwise */ +@@ -351,7 +351,7 @@ + + global_stats(STATS_PROCESS); + munge_finish("no delay"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + + screamer = fast_alloc(GFP_ATOMIC); +@@ -362,7 +362,7 @@ + packet_stats(skb, hitme); + global_stats(STATS_PROCESS); + munge_finish("fast_alloc failed"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + hpi = (struct nistnet_packetinfo *)screamer->data; + +@@ -393,7 +393,7 @@ + return 0; + } else { + LinUnlock("ippt->func"); +- return ippt->func(skb, dev, ippt); ++ return ippt->func(skb, dev, ippt, NULL); + } + } + +diff -ur nistnet-3.0a.orig/kernel/linmunge.c nistnet-3.0a/kernel/linmunge.c +--- nistnet-3.0a.orig/kernel/linmunge.c 2004-09-29 18:32:24.000000000 -0400 ++++ nistnet-3.0a/kernel/linmunge.c 2007-01-23 11:57:32.000000000 -0500 +@@ -423,7 +423,7 @@ + void + runpacket(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct lin_hitbox *hitme) + { +- (void) ptype->func(skb, dev, ptype); ++ (void) ptype->func(skb, dev, ptype, NULL); + } + + void +Only in nistnet-3.0a/kernel: Module.symvers +diff -ur nistnet-3.0a.orig/kernel/nistnet_table.c nistnet-3.0a/kernel/nistnet_table.c +--- nistnet-3.0a.orig/kernel/nistnet_table.c 2004-09-29 18:32:24.000000000 -0400 ++++ nistnet-3.0a/kernel/nistnet_table.c 2007-01-23 12:23:20.000000000 -0500 +@@ -27,7 +27,6 @@ + #ifndef TRUE + #define TRUE 1 + #define FALSE 0 +-typedef enum {false = FALSE, true = TRUE} boolean; + #endif + + /* OK, as defined, each table entry+pointers amounts to 56 bytes (14 words). +diff -ur nistnet-3.0a.orig/math/Makefile nistnet-3.0a/math/Makefile +--- nistnet-3.0a.orig/math/Makefile 2005-06-17 11:44:50.000000000 -0400 ++++ nistnet-3.0a/math/Makefile 2007-01-23 11:49:31.000000000 -0500 +@@ -67,27 +67,27 @@ + -rm -f makemutable makesigtable + + normal: normal.c +- $(CC) $(CFLAGS) -o normal normal.c -lm ++ $(HOSTCC) $(CFLAGS) -o normal normal.c -lm + + pareto: pareto.c +- $(CC) $(CFLAGS) $(ALPHA) -o pareto pareto.c -lm ++ $(HOSTCC) $(CFLAGS) $(ALPHA) -o pareto pareto.c -lm + + paretonormal: paretonormal.c +- $(CC) $(CFLAGS) $(ALPHA) -o paretonormal paretonormal.c -lm ++ $(HOSTCC) $(CFLAGS) $(ALPHA) -o paretonormal paretonormal.c -lm + + stats: stats.c +- $(CC) $(CFLAGS) -o stats stats.c -lm ++ $(HOSTCC) $(CFLAGS) -o stats stats.c -lm + + maketable: maketable.c +- $(CC) $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -o maketable maketable.c -lm ++ $(HOSTCC) $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -o maketable maketable.c -lm + + makesigtable: makesigtable.c random.o libstats.o # unsigmacortabledist.o - hide dependence +- $(CC) -DNO_SIGMA_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -USIGMA_CORR -o unsigmacortabledist.o -c tabledist.c +- $(CC) -DNO_SIGMA_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -USIGMA_CORR -o makesigtable makesigtable.c unsigmacortabledist.o random.o libstats.o -lm ++ $(HOSTCC) -DNO_SIGMA_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -USIGMA_CORR -o unsigmacortabledist.o -c tabledist.c ++ $(HOSTCC) -DNO_SIGMA_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -USIGMA_CORR -o makesigtable makesigtable.c unsigmacortabledist.o random.o libstats.o -lm + + makemutable: makemutable.c random.o libstats.o # unmucortabledist.o +- $(CC) -DNO_MU_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -UMU_CORR -o unmucortabledist.o -c tabledist.c +- $(CC) -DNO_MU_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -UMU_CORR -o makemutable makemutable.c unmucortabledist.o random.o libstats.o -lm ++ $(HOSTCC) -DNO_MU_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -UMU_CORR -o unmucortabledist.o -c tabledist.c ++ $(HOSTCC) -DNO_MU_CORR $(CFLAGS) $(DODISTRIBUTION) $(ALPHA) -UMU_CORR -o makemutable makemutable.c unmucortabledist.o random.o libstats.o -lm + + clean: + -rm -f *.o stats maketable makesigtable makemutable normal pareto paretonormal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-01-24 18:21:12
|
Revision: 522 http://svn.sourceforge.net/astlinux/?rev=522&view=rev Author: krisk84 Date: 2007-01-24 10:21:04 -0800 (Wed, 24 Jan 2007) Log Message: ----------- add nistnet to the web interface Modified Paths: -------------- trunk/package/minihttpd/www.tar.gz trunk/package/nistnet/nistnet.mk Added Paths: ----------- trunk/package/nistnet/nistnet.php Modified: trunk/package/minihttpd/www.tar.gz =================================================================== (Binary files differ) Modified: trunk/package/nistnet/nistnet.mk =================================================================== --- trunk/package/nistnet/nistnet.mk 2007-01-24 17:45:35 UTC (rev 521) +++ trunk/package/nistnet/nistnet.mk 2007-01-24 18:21:04 UTC (rev 522) @@ -38,6 +38,9 @@ $(INSTALL) -D -m 0644 $(NISTNET_DIR)/$(NISTNET_BINARY) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) $(INSTALL) -D -m 0755 package/nistnet/nistnet.init $(TARGET_DIR)/etc/init.d/nistnet # -$(STRIP) $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) +ifeq ($(strip $(BR2_PACKAGE_MINIHTTPD)),y) + $(INSTALL) -D -m 0755 package/nistnet/nistnet.php $(TARGET_DIR)/stat/var/www/admin/nistnet.php +endif /sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER) touch -c $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) @@ -53,6 +56,9 @@ -rm $(TARGET_DIR)/$(NISTNET_TARGET_BINARY) -rm $(TARGET_DIR)/etc/init.d/nistnet /sbin/depmod -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER) +ifeq ($(strip $(BR2_PACKAGE_MINIHTTPD)),y) + -rm $(TARGET_DIR)/stat/var/www/admin/nistnet.php +endif -$(MAKE) -C $(NISTNET_DIR) clean nistnet-dirclean: Added: trunk/package/nistnet/nistnet.php =================================================================== --- trunk/package/nistnet/nistnet.php (rev 0) +++ trunk/package/nistnet/nistnet.php 2007-01-24 18:21:04 UTC (rev 522) @@ -0,0 +1,167 @@ +<? +include "header.php"; + + + +//we've set a hidden variable to see if we've been submitted -- +if(isset($_POST['submitted'])) { + + switch($_POST['submit']) { + case "Status": + + $src = (isset($_POST['src'])) ? $_POST['src'] : "0.0.0.0"; + $dst = (isset($_POST['dst'])) ? $_POST['dst'] : "0.0.0.0"; + + $src = preg_replace('/[^0-9.]/', '', $src); + $dst = preg_replace('/[^0-9.]/', '', $dst); + + echo "<p class=\"alert\">Current Status:</p>"; + // system("/usr/sbin/cnistnet -s $src $dst"); + system("/usr/sbin/cnistnet -R"); + echo "<BR><BR>"; + break; + case "Clear": + + $src = (isset($_POST['src'])) ? $_POST['src'] : "0.0.0.0"; + $dst = (isset($_POST['dst'])) ? $_POST['dst'] : "0.0.0.0"; + + $src = preg_replace('/[^0-9.]/', '', $src); + $dst = preg_replace('/[^0-9.]/', '', $dst); + + exec("/usr/sbin/cnistnet -r $src $dst"); + + echo "<p class=\"alert\">Existing rules removed</p>"; + + break; + + case "Enable": + + system("/usr/sbin/cnistnet -u"); + + echo "<p class=\"alert\">Simulator enabled</p>"; + break; + + case "Disable": + + system("/usr/sbin/cnistnet -d"); + + echo "<p class=\"alert\">Simulator disabled</p>"; + break; + + case "Set": + //initialize our three vars (either via post, or set to 0) + $bandwidth = (isset($_POST['bandwidth'])) ? $_POST['bandwidth'] : "0"; + $latency = (isset($_POST['latency'])) ? $_POST['latency'] : "0"; + $packetloss = (isset($_POST['packetloss'])) ? $_POST['packetloss'] : "0"; + + //get our source and dest IP + $src = (isset($_POST['src'])) ? $_POST['src'] : "0.0.0.0"; + $dst = (isset($_POST['dst'])) ? $_POST['dst'] : "0.0.0.0"; + + //clean the source and IP (numeric, plus a ".") + $src = preg_replace('/[^0-9.]/', '', $src); + $dst = preg_replace('/[^0-9.]/', '', $dst); + + + //each of the three can take an "other" as a value. If that's set, check the corresponding text input for the value we should use + //for bandwidth, we need to divide by 8 (bps -> Bps) + + if($bandwidth == "other") { + $bandwidth = (isset($_POST['bandwidth_other'])) ? $_POST['bandwidth_other'] : "0"; + $bandwidth = round($bandwidth / 8); + } + + //finally, strip all non-numeric stuff from the variable + + $bandwidth = preg_replace('/[^0-9]/', '', $bandwidth); + + //and repeat for latency and packetloss + + if($latency == "other") { + $latency = (isset($_POST['latency_other'])) ? $_POST['latency_other'] : "0"; + } + $latency = preg_replace('/[^0-9]/', '', $latency); + + if($packetloss == "other") { + $packetloss = (isset($_POST['packetloss_other'])) ? $_POST['packetloss_other'] : "0"; + } + $packetloss = preg_replace('/[^0-9]/', '', $packetloss); + + //exec whatever our command is -- + + exec("/usr/sbin/cnistnet -a $src $dst --delay $latency --bandwidth $bandwidth --drop $packetloss --drd 79 80 0"); + + echo "<p class=\"alert\">Traffic shaper set to:<br> bandwidth: $bandwidth Bps<br> latency: $latency ms<br> packetloss: $packetloss %</p>"; + break; + } + +} +?> + + +<form action="<? echo $_SERVER['PHP_SELF']; ?>" method="POST"> + +<table> + <tr style="vertical-align: top;"> + <td> + <h2>Bandwidth</h2> + <p> + <input type="radio" name="bandwidth" value="1875000" checked> 15mb<br> + <input type="radio" name="bandwidth" value="1250000"> 10mb<br> + <input type="radio" name="bandwidth" value="625000"> 5mb<br> + <input type="radio" name="bandwidth" value="250000"> 2mb<br> + <input type="radio" name="bandwidth" value="125000"> 1mb<br> + <input type="radio" name="bandwidth" value="64000"> 512kb<br> + <input type="radio" name="bandwidth" value="other"> Other: <input type="text" name="bandwidth_other" size="10">bps<br> + </p> + </td> + <td> + <h2>Latency</h2> + <p> + <input type="radio" name="latency" value="10" checked> 10ms<br> + <input type="radio" name="latency" value="20"> 20ms<br> + <input type="radio" name="latency" value="40"> 40ms<br> + <input type="radio" name="latency" value="60"> 60ms<br> + <input type="radio" name="latency" value="80"> 80ms<br> + <input type="radio" name="latency" value="100"> 100ms<br> + <input type="radio" name="latency" value="120"> 120ms<br> + <input type="radio" name="latency" value="140"> 140ms<br> + <input type="radio" name="latency" value="160"> 160ms<br> + <input type="radio" name="latency" value="180"> 180ms<br> + <input type="radio" name="latency" value="200"> 200ms<br> + <input type="radio" name="latency" value="other"> Other: <input type="text" name="latency_other" size="3">ms<br> + </p> + </td> + </tr> + <tr> + <td> + <h2>Packet Loss</h2> + <p> + <input type="radio" name="packetloss" value="0" checked> 0%<br> + <input type="radio" name="packetloss" value="5"> 5%<br> + <input type="radio" name="packetloss" value="10"> 10%<br> + <input type="radio" name="packetloss" value="15"> 15%<br> + <input type="radio" name="packetloss" value="20"> 20%<br> + <input type="radio" name="packetloss" value="other"> Other: <input type="text" name="packetloss_other" size="3">%<br> + </p> + </td> + + <td> + <p><b>Source IP:</b> <input type="text" name="src" value="0.0.0.0" size="12"></p> + <p><b>Destination IP:</b> <input type="text" name="dst" value="0.0.0.0" size="12"></p> + <input type="hidden" name="submitted" value="true"> + <input type="submit" name="submit" value="Set"> + <input type="submit" name="submit" value="Clear"> + <input type="submit" name="submit" value="Status"><br> + <input type="submit" name="submit" value="Enable"> + <input type="submit" name="submit" value="Disable"> + </td> + </tr> +</table> + +</form> + +<?php +include "footer.php"; +?> + Property changes on: trunk/package/nistnet/nistnet.php ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dha...@us...> - 2007-02-06 22:52:49
|
Revision: 537 http://svn.sourceforge.net/astlinux/?rev=537&view=rev Author: dhartman Date: 2007-02-06 14:45:06 -0800 (Tue, 06 Feb 2007) Log Message: ----------- correct recursive package selection for iaxmodem and efax Modified Paths: -------------- trunk/package/efax/Config.in trunk/package/iaxmodem/Config.in Modified: trunk/package/efax/Config.in =================================================================== --- trunk/package/efax/Config.in 2007-02-06 18:14:50 UTC (rev 536) +++ trunk/package/efax/Config.in 2007-02-06 22:45:06 UTC (rev 537) @@ -1,6 +1,7 @@ config BR2_PACKAGE_EFAX bool "efax" default n + select BR2_PACKAGE_IAXMODEM help efax - fax software, can be used e.g. together with iaxmodem Modified: trunk/package/iaxmodem/Config.in =================================================================== --- trunk/package/iaxmodem/Config.in 2007-02-06 18:14:50 UTC (rev 536) +++ trunk/package/iaxmodem/Config.in 2007-02-06 22:45:06 UTC (rev 537) @@ -1,7 +1,9 @@ config BR2_PACKAGE_IAXMODEM bool "iaxmodem" default n + select BR2_PACKAGE_LIBTIFF help iaxmodem - IAX Modem for Asterisk (works with Hylafax, efax, sendfax) http://mesh.dl.sourceforge.net/sourceforge/iaxmodem/iaxmodem-0.1.14.tar.gz + http://iaxmodem.sourceforge.net This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-02-07 07:50:20
|
Revision: 542 http://svn.sourceforge.net/astlinux/?rev=542&view=rev Author: krisk84 Date: 2007-02-06 23:50:19 -0800 (Tue, 06 Feb 2007) Log Message: ----------- fix redundant LINUX_VER definitions Modified Paths: -------------- trunk/package/astmanproxy/astmanproxy.mk trunk/package/lmsensors/lmsensors.mk trunk/package/madwifi/madwifi.mk trunk/package/mqueue-isdn/mqueue-isdn.mk trunk/package/nistnet/nistnet.mk trunk/package/unionfs/unionfs.mk trunk/package/wanpipe/wanpipe.mk trunk/package/zaptel/zaptel.mk Modified: trunk/package/astmanproxy/astmanproxy.mk =================================================================== --- trunk/package/astmanproxy/astmanproxy.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/astmanproxy/astmanproxy.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -11,7 +11,7 @@ ASTMANPROXY_BINARY:=astmanproxy ASTMANPROXY_TARGET_BINARY:=usr/sbin/$(ASTMANPROXY_BINARY) -LINUX_VER=2.6.19.1 +LINUX_VER=$(LINUX_VERSION) $(DL_DIR)/$(ASTMANPROXY_SOURCE): $(WGET) -P $(DL_DIR) $(ASTMANPROXY_SITE)/$(ASTMANPROXY_SOURCE) Modified: trunk/package/lmsensors/lmsensors.mk =================================================================== --- trunk/package/lmsensors/lmsensors.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/lmsensors/lmsensors.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -10,7 +10,7 @@ LMSENSORS_BINARY := prog/sensors/sensors LMSENSORS_TARGET_BINARY := usr/bin/sensors -LINUX_VER=2.6.19.1 +LINUX_VER=$(LINUX_VERSION) $(DL_DIR)/$(LMSENSORS_SOURCE): $(WGET) -P $(DL_DIR) $(LMSENSORS_SITE)/$(LMSENSORS_SOURCE) Modified: trunk/package/madwifi/madwifi.mk =================================================================== --- trunk/package/madwifi/madwifi.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/madwifi/madwifi.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -10,7 +10,7 @@ MADWIFI_BINARY := tools/wlanconfig MADWIFI_TARGET_BINARY := usr/bin/wlanconfig -LINUX_VER=2.6.19.1 +LINUX_VER=$(LINUX_VERSION) $(DL_DIR)/$(MADWIFI_SOURCE): $(WGET) -P $(DL_DIR) $(MADWIFI_SITE)/$(MADWIFI_SOURCE) Modified: trunk/package/mqueue-isdn/mqueue-isdn.mk =================================================================== --- trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -37,7 +37,7 @@ touch $(MQUEUEISDN_DIR)/.built1 $(MQUEUEISDN_DIR)/.installed1: $(MQUEUEISDN_DIR)/.built1 - $(MAKE) LINUX_VER=$(LINUX_VER) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \ + $(MAKE) LINUX_VER=$(LINUX_VERSION) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \ INSTALL_PREFIX=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) -C $(MQUEUEISDN_DIR)/mISDN install mkdir -p $(STAGING_DIR)/usr/include/linux rm -rf $(TARGET_DIR)/etc/modprobe.d Modified: trunk/package/nistnet/nistnet.mk =================================================================== --- trunk/package/nistnet/nistnet.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/nistnet/nistnet.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -3,7 +3,7 @@ # nistnet # ############################################################## -LINUX_VER=2.6.19.1 +LINUX_VER=$(LINUX_VERSION) NISTNET_VERSION := 3.0a NISTNET_SOURCE := nistnet.2.0.12c.tar.gz NISTNET_SITE := http://www-x.antd.nist.gov/nistnet/dist Modified: trunk/package/unionfs/unionfs.mk =================================================================== --- trunk/package/unionfs/unionfs.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/unionfs/unionfs.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -3,7 +3,7 @@ # unionfs # ############################################################## -LINUX_VER=2.6.19.1 +LINUX_VER=$(LINUX_VERSION) UNIONFS_VERSION := 1.5pre-cvs200701241713 UNIONFS_SOURCE := unionfs-$(UNIONFS_VERSION).tar.gz Modified: trunk/package/wanpipe/wanpipe.mk =================================================================== --- trunk/package/wanpipe/wanpipe.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/wanpipe/wanpipe.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -12,7 +12,7 @@ WANPIPE_TARGET_DIR:=usr/sbin WANPIPE_TARGET_BINARY:=$(WANPIPE_TARGET_DIR)/wancfg -LINUX_VER=2.6.18 +LINUX_VER=$(LINUX_VERSION) $(DL_DIR)/$(WANPIPE_SOURCE): $(WGET) -P $(DL_DIR) $(WANPIPE_SITE)/$(WANPIPE_SOURCE) Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2007-02-07 07:40:30 UTC (rev 541) +++ trunk/package/zaptel/zaptel.mk 2007-02-07 07:50:19 UTC (rev 542) @@ -15,11 +15,8 @@ RHINO_PKG := rhino-$(RHINO_VER)_$(RHINO_ZVER).tar.gz RHINO_DIR=$(BUILD_DIR)/rhino-$(RHINO_VER)_$(RHINO_ZVER) -#LINUX_VER=$(subst ",, $(strip $(BR2_PACKAGE_LINUX_VERSION))) -#" +LINUX_VER=$(LINUX_VERSION) -LINUX_VER=2.6.19.1 - ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <isc...@us...> - 2007-02-08 13:50:29
|
Revision: 554 http://svn.sourceforge.net/astlinux/?rev=554&view=rev Author: ischraub Date: 2007-02-08 05:50:26 -0800 (Thu, 08 Feb 2007) Log Message: ----------- mqueue-isdn update to latest stuff; we use now a specific version of chan_misdn; misdn startup procedure improved, keep created conf file Modified Paths: -------------- trunk/package/asterisk/asterisk.init trunk/package/chan_misdn/chan_misdn.mk trunk/package/mqueue-isdn/i4lmake.patch trunk/package/mqueue-isdn/mqueue-isdn-make.patch trunk/package/mqueue-isdn/mqueue-isdn.mk trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch Removed Paths: ------------- trunk/package/mqueue-isdn/mqueue-isdn-config.patch Modified: trunk/package/asterisk/asterisk.init =================================================================== --- trunk/package/asterisk/asterisk.init 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/asterisk/asterisk.init 2007-02-08 13:50:26 UTC (rev 554) @@ -84,7 +84,17 @@ if [ "$ISDN_MODPROBE" -o "$MISDN" ] then echo "Starting mISDN" +if [ -d /mnt/kd ] +then +ln -s /mnt/kd/misdn-init.conf /tmp/etc/misdn-init.conf +fi +if [ -r /mnt/kd/misdn-init.conf ] +then +echo "misdn-init.conf already exists on /mnt/kd, skipping config." +else +/usr/sbin/misdn-init scan /usr/sbin/misdn-init config +fi /usr/sbin/misdn-init start # Not needed #mknod /dev/mISDN c 46 0 Modified: trunk/package/chan_misdn/chan_misdn.mk =================================================================== --- trunk/package/chan_misdn/chan_misdn.mk 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/chan_misdn/chan_misdn.mk 2007-02-08 13:50:26 UTC (rev 554) @@ -3,9 +3,9 @@ # chan_misdn # ############################################################# -CHANMISDN_VER:=030 -CHANMISDN_SOURCE:=chan_misdn.tar.gz -CHANMISDN_SITE:=http://www.beronet.com/downloads/chan_misdn/stable/ +CHANMISDN_VER:=0.3.1-rc29 +CHANMISDN_SOURCE:=chan_misdn-$(CHANMISDN_VER).tar.gz +CHANMISDN_SITE:=http://www.beronet.com/downloads/chan_misdn/stable/candidates CHANMISDN_DIR:=$(BUILD_DIR)/chan_misdn CHANMISDN_CAT:=zcat CHANMISDN_TARGET_DIR=$(TARGET_DIR)/usr/lib/asterisk/modules/ @@ -24,7 +24,7 @@ $(CHANMISDN_DIR)/.built: $(CHANMISDN_DIR)/.configured $(MAKE) MISDNUSERLIB=$(TARGET_DIR)/usr/lib CFLAGS+=-I$(BUILD_DIR)/asterisk/include CFLAGS+=-I$(CHANMISDN_DIR)/misdn CFLAGS+=-I$(STAGING_DIR)/include CFLAGS+=-I$(STAGING_DIR)/usr/include CC=$(TARGET_CC) -C $(CHANMISDN_DIR) - install -m 644 $(CHANMISDN_DIR)/chan_misdn.so $(TARGET_DIR)/usr/lib/asterisk/modules/ + $(INSTALL) -m 644 $(CHANMISDN_DIR)/chan_misdn.so $(TARGET_DIR)/usr/lib/asterisk/modules/ $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/chan_misdn.so cp $(CHANMISDN_DIR)/misdn.conf $(TARGET_DIR)/stat/etc/asterisk/ touch $(CHANMISDN_DIR)/.built Modified: trunk/package/mqueue-isdn/i4lmake.patch =================================================================== --- trunk/package/mqueue-isdn/i4lmake.patch 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/mqueue-isdn/i4lmake.patch 2007-02-08 13:50:26 UTC (rev 554) @@ -1,11 +1,11 @@ ---- i4lnet/Makefile.orig 2006-08-16 17:37:11.000000000 -0400 -+++ i4lnet/Makefile 2006-10-09 11:08:40.000000000 -0400 -@@ -10,7 +10,7 @@ - manager.o tone.o bchannel.o g711.o +--- i4lnet/Makefile.orig 2006-12-21 10:25:22.000000000 +0100 ++++ i4lnet/Makefile 2007-01-12 14:52:45.000000000 +0100 +@@ -28,7 +28,7 @@ + $(RANLIB) $@ - libisdnnet.so: $(ISDNNETOBJ) -- $(CC) -shared -Xlinker -x -o $@ $^ -+ $(CC) -shared -Xlinker -x -o $@ $^ ../lib/libmISDN.so + libisdnnet.so: $(ISDNNET_OBJ) +- $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^ ++ $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^ ../lib/libmISDN.so - libisdnnet.a: $(ISDNNETOBJ) - ar cr $@ $^ + .c.o: + $(CC) $(CFLAGS) -o $@ -c $< Deleted: trunk/package/mqueue-isdn/mqueue-isdn-config.patch =================================================================== --- trunk/package/mqueue-isdn/mqueue-isdn-config.patch 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/mqueue-isdn/mqueue-isdn-config.patch 2007-02-08 13:50:26 UTC (rev 554) @@ -1,251 +0,0 @@ -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c 2006-12-20 14:26:06.000000000 -0500 -@@ -8,7 +8,6 @@ - * This file is (c) under GNU PUBLIC LICENSE - * - */ --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #ifdef NEW_ISAPNP -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/core.c mISDN/drivers/isdn/hardware/mISDN/core.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/core.c 2006-08-07 19:35:59.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/core.c 2006-12-20 14:26:06.000000000 -0500 -@@ -8,7 +8,6 @@ - - #include <linux/types.h> - #include <linux/stddef.h> --#include <linux/config.h> - #include <linux/module.h> - #include <linux/spinlock.h> - #include "core.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN/drivers/isdn/hardware/mISDN/dsp_core.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2006-09-06 13:24:22.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/dsp_core.c 2006-12-20 14:26:06.000000000 -0500 -@@ -172,7 +172,6 @@ - const char *dsp_revision = "$Revision: 1.24 $"; - - #include <linux/delay.h> --#include <linux/config.h> - #include <linux/module.h> - #include <linux/vmalloc.h> - #include "layer1.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c mISDN/drivers/isdn/hardware/mISDN/dtmf.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/dtmf.c 2006-12-20 14:26:06.000000000 -0500 -@@ -15,7 +15,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include "layer1.h" - #include "helper.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c mISDN/drivers/isdn/hardware/mISDN/faxl3.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c 2006-03-23 08:11:43.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/faxl3.c 2006-12-20 14:26:06.000000000 -0500 -@@ -11,7 +11,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include "layer1.h" - #include "m_capi.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2006-09-13 11:53:01.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c 2006-12-20 14:26:06.000000000 -0500 -@@ -93,7 +93,6 @@ - /* debug using register map (never use this, it will flood your system log) */ - //#define HFC_REGISTER_MAP - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2006-06-29 04:52:39.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c 2006-12-20 14:26:06.000000000 -0500 -@@ -25,7 +25,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c 2006-12-20 14:26:06.000000000 -0500 -@@ -49,7 +49,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - #include <asm/timex.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-08-15 05:38:07.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-12-20 14:26:06.000000000 -0500 -@@ -28,7 +28,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - #include <linux/usb.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c 2006-03-23 08:11:43.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c 2006-12-20 14:26:06.000000000 -0500 -@@ -10,7 +10,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/isdnif.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c mISDN/drivers/isdn/hardware/mISDN/l1oip.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c 2006-03-23 08:11:43.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/l1oip.c 2006-12-20 14:26:06.000000000 -0500 -@@ -207,7 +207,6 @@ - */ - - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c mISDN/drivers/isdn/hardware/mISDN/layer1.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/layer1.c 2006-12-20 14:26:06.000000000 -0500 -@@ -10,7 +10,6 @@ - - static char *l1_revision = "$Revision: 1.17 $"; - --#include <linux/config.h> - #include <linux/module.h> - #include "layer1.h" - #include "helper.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/loop.c mISDN/drivers/isdn/hardware/mISDN/loop.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/loop.c 2006-03-23 08:11:43.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/loop.c 2006-12-20 14:26:06.000000000 -0500 -@@ -25,7 +25,6 @@ - - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c mISDN/drivers/isdn/hardware/mISDN/memdbg.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c 2006-03-06 07:52:07.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/memdbg.c 2006-12-20 14:26:06.000000000 -0500 -@@ -1,5 +1,4 @@ - #include <linux/stddef.h> --#include <linux/config.h> - #include <linux/module.h> - #include <linux/list.h> - #include <linux/slab.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN/drivers/isdn/hardware/mISDN/netjet.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c 2006-08-07 07:53:02.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/netjet.c 2006-12-20 14:26:06.000000000 -0500 -@@ -7,7 +7,6 @@ - * Based on HiSax NETJet driver by Karsten Keil - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-06-29 05:11:08.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-12-20 14:26:06.000000000 -0500 -@@ -26,7 +26,6 @@ - * the firmware onto the card. - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/socket.c mISDN/drivers/isdn/hardware/mISDN/socket.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/socket.c 2006-03-06 07:58:31.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/socket.c 2006-12-20 14:26:06.000000000 -0500 -@@ -22,7 +22,6 @@ - - - #include <linux/vmalloc.h> --#include <linux/config.h> - #include <linux/in.h> - #include <net/sock.h> - -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c mISDN/drivers/isdn/hardware/mISDN/udevice.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c 2006-08-01 07:25:10.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/udevice.c 2006-12-20 14:26:06.000000000 -0500 -@@ -8,7 +8,6 @@ - #include <linux/stddef.h> - #include <linux/poll.h> - #include <linux/vmalloc.h> --#include <linux/config.h> - #include <linux/timer.h> - #ifdef CONFIG_DEVFS_FS - #include <linux/devfs_fs_kernel.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN/drivers/isdn/hardware/mISDN/w6692.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/w6692.c 2006-12-20 14:26:06.000000000 -0500 -@@ -21,7 +21,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/pci.h> - #include <linux/delay.h> -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c mISDN/drivers/isdn/hardware/mISDN/x25_dte.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c 2006-06-28 14:03:52.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/x25_dte.c 2006-12-20 14:26:06.000000000 -0500 -@@ -12,7 +12,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include "x25_l3.h" - #include "helper.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c mISDN/drivers/isdn/hardware/mISDN/x25_l3.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c 2006-08-07 19:35:59.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/x25_l3.c 2006-12-20 14:26:06.000000000 -0500 -@@ -12,7 +12,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include "x25_l3.h" - #include "helper.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c 2006-03-17 02:43:41.000000000 -0500 -+++ mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c 2006-12-20 14:26:06.000000000 -0500 -@@ -21,7 +21,6 @@ - * - */ - --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - #include "xhfc_su.h" -diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c ---- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2006-09-11 07:44:02.000000000 -0400 -+++ mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c 2006-12-20 14:26:06.000000000 -0500 -@@ -51,7 +51,6 @@ - */ - - #include <linux/mISDNif.h> --#include <linux/config.h> - #include <linux/module.h> - #include <linux/delay.h> - #include <linux/pci.h> Modified: trunk/package/mqueue-isdn/mqueue-isdn-make.patch =================================================================== --- trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2007-02-08 13:50:26 UTC (rev 554) @@ -1,9 +1,12 @@ ---- mISDN/Makefile.orig 2006-05-29 14:30:35.000000000 +0200 -+++ mISDN/Makefile 2006-05-29 14:28:40.000000000 +0200 -@@ -1,16 +1,17 @@ +--- mISDN/Makefile.orig 2006-12-21 10:21:05.000000000 +0100 ++++ mISDN/Makefile 2007-01-12 14:37:35.000000000 +0100 +@@ -1,4 +1,4 @@ -BASEDIR=$(shell pwd) -+# BASEDIR=$(shell pwd) ++#BASEDIR=$(shell pwd) + MAJOR=1 + MINOR=0 +@@ -6,14 +6,15 @@ INSTALL_PREFIX := / export INSTALL_PREFIX @@ -13,59 +16,52 @@ #LINUX=/usr/src/linux -MODS=/lib/modules/$(shell uname -r) -LINUX=$(MODS)/build -+# MODS=/lib/modules/$(shell uname -r) ++#MODS=/lib/modules/$(shell uname -r) +LINUX=$(MODS)/linux LINUX_SOURCE=$(MODS)/source -UPDATE_MODULES=$(shell which update-modules) -MODULES_UPDATE=$(shell which modules-update) -+# UPDATE_MODULES=$(shell which update-modules) -+# MODULES_UPDATE=$(shell which modules-update) ++#UPDATE_MODULES=$(shell which update-modules) ++#MODULES_UPDATE=$(shell which modules-update) DEPMOD=$(shell which depmod) -@@ -39,7 +40,7 @@ +@@ -42,20 +43,19 @@ MINCLUDES+=-I$(MISDNDIR)/include -all: test_old_misdn +all: - @echo - @echo "Makeing mISDN" - @echo "=============" -@@ -51,21 +52,20 @@ + cp $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile.v2.6 $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile + export MINCLUDES=$(MISDNDIR)/include ; make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS) - install: all + install: all modules-install misdn-init +- $(DEPMOD) +- $(UPDATE_MODULES) +- $(MODULES_UPDATE) ++ $(DEPMOD) -ae -F $(MODS)/linux/System.map -b $(MODS)/root -r $(LINUX_VER) + make -C config install + + modules-install: cd $(LINUX) ; make INSTALL_MOD_PATH=$(INSTALL_PREFIX) SUBDIRS=$(MISDN_SRC) modules_install - mkdir -p $(INSTALL_PREFIX)/usr/include/linux/ - cp $(MISDNDIR)/include/linux/*.h $(INSTALL_PREFIX)/usr/include/linux/ + cd $(LINUX) ; make INSTALL_MOD_PATH=$(MODS)/root SUBDIRS=$(MISDN_SRC) modules_install + mkdir -p $(INSTALL_BUILD)/usr/include/linux/ + cp $(MISDNDIR)/include/linux/*.h $(INSTALL_BUILD)/usr/include/linux/ - mkdir -p $(INSTALL_PREFIX)/usr/sbin/ - install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/ - if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \ - if [ -e $(INSTALL_PREFIX)/etc/init.d/misdn-init ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/misdn-init; fi; \ - ln -s $(INSTALL_PREFIX)/usr/sbin/misdn-init $(INSTALL_PREFIX)/etc/init.d/misdn-init; \ - fi - mkdir -p $(INSTALL_PREFIX)/etc/modprobe.d - cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modprobe.d/mISDN - mkdir -p $(INSTALL_PREFIX)/etc/modules.d - cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modules.d/mISDN -- $(DEPMOD) -- $(UPDATE_MODULES) -- $(MODULES_UPDATE) -+ $(DEPMOD) -ae -F $(MODS)/linux/System.map -b $(MODS)/root -r $(LINUX_VER) - test_old_misdn: - @if echo -ne "#include <linux/mISDNif.h>" | gcc -C -E - 2>/dev/null 1>/dev/null ; then \ -@@ -87,8 +87,8 @@ + misdn-init: + mkdir -p $(INSTALL_PREFIX)/usr/sbin/ +@@ -89,9 +89,9 @@ rm -f /usr/include/linux/isdn_compat.h clean: - rm -rf drivers/isdn/hardware/mISDN/*.o - rm -rf drivers/isdn/hardware/mISDN/*.ko +- rm -rf *~ + rm -rf $(INSTALL_PREFIX)/drivers/isdn/hardware/mISDN/*.o + rm -rf $(INSTALL_PREFIX)/drivers/isdn/hardware/mISDN/*.ko - rm -rf *~ ++ rm -rf $(INSTALL_PREFIX)/*~ find . -iname ".*.cmd" -exec rm -rf {} \; find . -iname ".*.d" -exec rm -rf {} \; + find . -iname "*.mod.c" -exec rm -rf {} \; Modified: trunk/package/mqueue-isdn/mqueue-isdn.mk =================================================================== --- trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-08 13:50:26 UTC (rev 554) @@ -5,8 +5,8 @@ # mISDNuser # ############################################################# -MQUEUEISDN_ISDN_VER:=CVS-2006-09-16 -MQUEUEISDN_USER_VER:=CVS-2006-08-17 +MQUEUEISDN_ISDN_VER:=CVS-2007-01-26 +MQUEUEISDN_USER_VER:=CVS-2006-12-29 MQUEUEISDN_ISDN_SOURCE:=mISDN-$(MQUEUEISDN_ISDN_VER).tar.bz2 MQUEUEISDN_USER_SOURCE:=mISDNuser-$(MQUEUEISDN_USER_VER).tar.bz2 MQUEUEISDN_SITE:=ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots @@ -30,6 +30,7 @@ toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDN package/mqueue-isdn/ mqueue-isdn\*.patch toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDNuser package/mqueue-isdn/ mqueue-user-isdn\*.patch toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDNuser/i4lnet package/mqueue-isdn/ i4lmake.patch + touch $(BUILD_DIR)/linux/include/linux/config.h touch $(MQUEUEISDN_DIR)/.configured $(MQUEUEISDN_DIR)/.built1: $(MQUEUEISDN_DIR)/.configured @@ -37,7 +38,7 @@ touch $(MQUEUEISDN_DIR)/.built1 $(MQUEUEISDN_DIR)/.installed1: $(MQUEUEISDN_DIR)/.built1 - $(MAKE) LINUX_VER=$(LINUX_VERSION) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \ + $(MAKE) LINUX_VER=$(LINUX_VER) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \ INSTALL_PREFIX=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) -C $(MQUEUEISDN_DIR)/mISDN install mkdir -p $(STAGING_DIR)/usr/include/linux rm -rf $(TARGET_DIR)/etc/modprobe.d @@ -62,6 +63,9 @@ cp $(MQUEUEISDN_DIR)/mISDNuser/include/*.h $(STAGING_DIR)/usr/include/mISDNuser cp $(MQUEUEISDN_DIR)/mISDNuser/i4lnet/*.h $(STAGING_DIR)/usr/include/mISDNuser ln -sf ../../usr/sbin/misdn-init $(TARGET_DIR)/etc/init.d/misdn-init + rm -f $(TARGET_DIR)/usr/lib/libmISDN*.a + rm -f $(TARGET_DIR)/usr/lib/libisdn*.a + rm -f $(TARGET_DIR)/usr/lib/libsuppserv*.a touch $(MQUEUEISDN_DIR)/.installed2 mqueue_misdn: uclibc linux asterisk bc bash pciutils usbutils $(MQUEUEISDN_DIR)/.installed2 Modified: trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch =================================================================== --- trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2007-02-07 18:46:41 UTC (rev 553) +++ trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2007-02-08 13:50:26 UTC (rev 554) @@ -1,15 +1,14 @@ ---- mISDNuser/Makefile.orig 2006-08-15 14:57:31.000000000 -0400 -+++ mISDNuser/Makefile 2006-10-09 11:05:39.000000000 -0400 -@@ -1,7 +1,7 @@ +--- mISDNuser/Makefile.orig 2006-12-21 10:25:22.000000000 +0100 ++++ mISDNuser/Makefile 2007-01-12 14:46:34.000000000 +0100 +@@ -6,20 +6,20 @@ # # Set this to your local copy of mISDN # -MISDNDIR := /usr/src/mqueue/mISDN -+# MISDNDIR := /usr/src/mqueue/mISDN ++#MISDNDIR := /usr/src/mqueue/mISDN - PWD=$(shell pwd) -@@ -9,13 +9,13 @@ + # # Change this to create an install prefix for the shared libs, programms and # includes # @@ -25,15 +24,16 @@ export mISDN_DIR INCLUDEDIR := $(mISDN_DIR)/include -@@ -23,16 +23,18 @@ +@@ -32,17 +32,19 @@ + CFLAGS+= -D CLOSE_REPORT=1 - CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR) - CFLAGS+= -D CLOSE_REPORT=1 + #disable this if your system does not support PIC (position independent code) -ifeq ($(shell uname -m),x86_64) +#ifeq ($(shell uname -m),x86_64) - CFLAGS += -fPIC + CFLAGS += -fPIC -endif +#endif + export CFLAGS -mISDNLIB := $(PWD)/lib/libmISDN.a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dha...@us...> - 2007-02-14 18:57:08
|
Revision: 584 http://svn.sourceforge.net/astlinux/?rev=584&view=rev Author: dhartman Date: 2007-02-14 10:57:03 -0800 (Wed, 14 Feb 2007) Log Message: ----------- add iftop package Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/iftop/ trunk/package/iftop/Config.in trunk/package/iftop/iftop.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-02-14 16:04:42 UTC (rev 583) +++ trunk/package/Config.in 2007-02-14 18:57:03 UTC (rev 584) @@ -70,6 +70,7 @@ source "package/hostap/Config.in" source "package/hotplug/Config.in" source "package/iaxmodem/Config.in" +source "package/iftop/Config.in" source "package/inadyn/Config.in" source "package/iostat/Config.in" source "package/iproute2/Config.in" Added: trunk/package/iftop/Config.in =================================================================== --- trunk/package/iftop/Config.in (rev 0) +++ trunk/package/iftop/Config.in 2007-02-14 18:57:03 UTC (rev 584) @@ -0,0 +1,12 @@ +config BR2_PACKAGE_IFTOP + bool "iftop" + default n + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_NCURSES + help + iftop does for network usage what top(1) does for CPU usage. + It listens to network traffic on a named interface and displays + a table of current bandwidth usage by pairs of hosts. Handy for + answering the question "why is our ADSL link so slow?". + + http://www.ex-parrot.com/~pdw/iftop/ Added: trunk/package/iftop/iftop.mk =================================================================== --- trunk/package/iftop/iftop.mk (rev 0) +++ trunk/package/iftop/iftop.mk 2007-02-14 18:57:03 UTC (rev 584) @@ -0,0 +1,54 @@ +############################################################# +# +# iftop +# +############################################################# +IFTOP_VER:=0.17 +IFTOP_SOURCE:=iftop-$(IFTOP_VER).tar.gz +IFTOP_SITE:=http://www.ex-parrot.com/~pdw/iftop/download +IFTOP_DIR:=$(BUILD_DIR)/iftop-$(IFTOP_VER) +IFTOP_CAT:=zcat +IFTOP_BINARY:=iftop +IFTOP_TARGET_BINARY:=usr/bin/iftop + +$(DL_DIR)/$(IFTOP_SOURCE): + $(WGET) -P $(DL_DIR) $(IFTOP_SITE)/$(IFTOP_SOURCE) + +$(IFTOP_DIR)/.unpacked: $(DL_DIR)/$(IFTOP_SOURCE) + $(IFTOP_CAT) $(DL_DIR)/$(IFTOP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(IFTOP_DIR)/.unpacked + +$(IFTOP_DIR)/.configured: $(IFTOP_DIR)/.unpacked + (cd $(IFTOP_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/ \ + ); + touch $(IFTOP_DIR)/.configured + +$(IFTOP_DIR)/$(IFTOP_BINARY): $(IFTOP_DIR)/.configured + $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(IFTOP_DIR) + +$(TARGET_DIR)/$(IFTOP_TARGET_BINARY): $(IFTOP_DIR)/$(IFTOP_BINARY) + install -D $(IFTOP_DIR)/$(IFTOP_BINARY) $(TARGET_DIR)/$(IFTOP_TARGET_BINARY) + +iftop: uclibc ncurses libpcap $(TARGET_DIR)/$(IFTOP_TARGET_BINARY) + +iftop-clean: + rm -f $(TARGET_DIR)/$(IFTOP_TARGET_BINARY) + -$(MAKE) -C $(IFTOP_DIR) clean + +iftop-dirclean: + rm -rf $(IFTOP_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IFTOP)),y) +TARGETS+=iftop +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-02-19 06:09:09
|
Revision: 601 http://svn.sourceforge.net/astlinux/?rev=601&view=rev Author: krisk84 Date: 2007-02-18 22:09:09 -0800 (Sun, 18 Feb 2007) Log Message: ----------- still slightly broken libftdi support Modified Paths: -------------- trunk/package/Config.in trunk/package/libusb/libusb.mk Added Paths: ----------- trunk/package/libftdi/ trunk/package/libftdi/Config.in trunk/package/libftdi/libftdi.mk trunk/package/libusb/libusb-config Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-02-19 05:25:57 UTC (rev 600) +++ trunk/package/Config.in 2007-02-19 06:09:09 UTC (rev 601) @@ -84,6 +84,7 @@ source "package/libcgicc/Config.in" source "package/libelf/Config.in" source "package/libfloat/Config.in" +source "package/libftdi/Config.in" source "package/libglib12/Config.in" source "package/libmad/Config.in" source "package/libpcap/Config.in" Added: trunk/package/libftdi/Config.in =================================================================== --- trunk/package/libftdi/Config.in (rev 0) +++ trunk/package/libftdi/Config.in 2007-02-19 06:09:09 UTC (rev 601) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBFTDI + bool "libftdi" + default n + help + A library (using libusb) to talk to FTDI's + FT232BM, FT245BM and FT2232C type chips + + http://www.intra2net.com/de/produkte/opensource/ftdi/ Added: trunk/package/libftdi/libftdi.mk =================================================================== --- trunk/package/libftdi/libftdi.mk (rev 0) +++ trunk/package/libftdi/libftdi.mk 2007-02-19 06:09:09 UTC (rev 601) @@ -0,0 +1,59 @@ +############################################################# +# +# libftdi +# +############################################################# +LIBFTDI_VER:=0.9 +LIBFTDI_SOURCE:=libftdi-$(LIBFTDI_VER).tar.gz +LIBFTDI_SITE:=http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/$(LIBFTDI_SOURCE) +LIBFTDI_DIR:=$(BUILD_DIR)/libftdi-$(LIBFTDI_VER) +LIBFTDI_CAT:=zcat +LIBFTDI_BINARY:=src/libftdi.la +LIBFTDI_TARGET_BINARY:=usr/lib/libftdi.so.$(LIBFTDI_VER).0 + +$(DL_DIR)/$(LIBFTDI_SOURCE): + $(WGET) -P $(DL_DIR) $(LIBFTDI_SITE)/$(LIBFTDI_SOURCE) + +libftdi-unpacked: $(LIBFTDI_DIR)/.unpacked +$(LIBFTDI_DIR)/.unpacked: $(DL_DIR)/$(LIBFTDI_SOURCE) + $(LIBFTDI_CAT) $(DL_DIR)/$(LIBFTDI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(LIBFTDI_DIR)/.unpacked + +$(LIBFTDI_DIR)/.configured: $(LIBFTDI_DIR)/.unpacked + (cd $(LIBFTDI_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \ + CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" \ + LDFLAGS="-L $(STAGING_DIR)/usr/lib/libusb.so" \ + ac_cv_path_HAVELIBUSB=$(STAGING_DIR)/usr/bin/libusb-config \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=$(STAGING_DIR)/usr \ + ); + touch $(LIBFTDI_DIR)/.configured + +$(LIBFTDI_DIR)/$(LIBFTDI_BINARY): $(LIBFTDI_DIR)/.configured + $(TARGET_CONFIGURE_OPTS) $(MAKE1) CC=$(TARGET_CC) -C $(LIBFTDI_DIR) + +$(TARGET_DIR)/$(LIBFTDI_TARGET_BINARY): $(LIBFTDI_DIR)/$(LIBFTDI_BINARY) + $(MAKE1) -C $(LIBFTDI_DIR) DESTDIR=$(STAGING_DIR) install + cp -a $(STAGING_DIR)/usr/lib/libftdi.so* $(TARGET_DIR)/usr/lib/ + $(STRIP) $(TARGET_DIR)/$(LIBFTDI_TARGET_BINARY) + +libftdi: uclibc libusb $(TARGET_DIR)/$(LIBFTDI_TARGET_BINARY) + +libftdi-clean: + -rm -f $(TARGET_DIR)/usr/lib/libftdi.so* + -$(MAKE) -C $(LIBFTDI_DIR) clean + +libftdi-dirclean: + rm -rf $(LIBFTDI_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LIBFTDI)),y) +TARGETS+=libftdi +endif Added: trunk/package/libusb/libusb-config =================================================================== --- trunk/package/libusb/libusb-config (rev 0) +++ trunk/package/libusb/libusb-config 2007-02-19 06:09:09 UTC (rev 601) @@ -0,0 +1,11 @@ +#!/bin/sh + +case $1 in + +--libs) +echo "-L$BPREFIX/usr/lib -lusb";; + +*) +$BPREFIX/usr/bin/libusb-config.orig $1;; + +esac Property changes on: trunk/package/libusb/libusb-config ___________________________________________________________________ Name: svn:executable + * Modified: trunk/package/libusb/libusb.mk =================================================================== --- trunk/package/libusb/libusb.mk 2007-02-19 05:25:57 UTC (rev 600) +++ trunk/package/libusb/libusb.mk 2007-02-19 06:09:09 UTC (rev 601) @@ -39,6 +39,9 @@ $(TARGET_DIR)/$(LIBUSB_TARGET_BINARY): $(LIBUSB_DIR)/$(LIBUSB_BINARY) make -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install + mv $(STAGING_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/libusb-config.orig + export BPREFIX=$(STAGING_DIR) + $(INSTALL) -D -m 0755 package/libusb/libusb-config $(STAGING_DIR)/usr/bin/libusb-config make -C $(LIBUSB_DIR) DESTDIR=$(TARGET_DIR) install rm -f $(TARGET_DIR)/usr/lib/libusb*.a $(TARGET_DIR)/usr/lib/libusb*.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-02-23 20:10:47
|
Revision: 652 http://svn.sourceforge.net/astlinux/?rev=652&view=rev Author: krisk84 Date: 2007-02-23 12:10:48 -0800 (Fri, 23 Feb 2007) Log Message: ----------- asterisk and zaptel version updates Modified Paths: -------------- trunk/package/asterisk/asterisk.mk trunk/package/zaptel/zaptel.mk Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2007-02-23 19:44:32 UTC (rev 651) +++ trunk/package/asterisk/asterisk.mk 2007-02-23 20:10:48 UTC (rev 652) @@ -3,7 +3,7 @@ # asterisk # ############################################################## -ASTERISK_VERSION := 1.2.14 +ASTERISK_VERSION := 1.2.15 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk/releases ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION) Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2007-02-23 19:44:32 UTC (rev 651) +++ trunk/package/zaptel/zaptel.mk 2007-02-23 20:10:48 UTC (rev 652) @@ -3,7 +3,7 @@ # zaptel # ############################################################## -ZAPTEL_VERSION := 1.2.13 +ZAPTEL_VERSION := 1.2.14 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-01 15:36:12
|
Revision: 680 http://svn.sourceforge.net/astlinux/?rev=680&view=rev Author: krisk84 Date: 2007-03-01 07:36:10 -0800 (Thu, 01 Mar 2007) Log Message: ----------- add libnet package Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/libnet/ trunk/package/libnet/Config.in trunk/package/libnet/libnet-configure.patch trunk/package/libnet/libnet.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-01 05:25:37 UTC (rev 679) +++ trunk/package/Config.in 2007-03-01 15:36:10 UTC (rev 680) @@ -88,6 +88,7 @@ source "package/libftdi/Config.in" source "package/libglib12/Config.in" source "package/libmad/Config.in" +source "package/libnet/Config.in" source "package/libpcap/Config.in" source "package/libpng/Config.in" source "package/libpq/Config.in" Added: trunk/package/libnet/Config.in =================================================================== --- trunk/package/libnet/Config.in (rev 0) +++ trunk/package/libnet/Config.in 2007-03-01 15:36:10 UTC (rev 680) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBNET + bool "libnet" + default n + help + Libnet is a high-level API (toolkit) allowing the application programmer + to construct and inject network packets. + + http://www.packetfactory.net/libnet/ Added: trunk/package/libnet/libnet-configure.patch =================================================================== --- trunk/package/libnet/libnet-configure.patch (rev 0) +++ trunk/package/libnet/libnet-configure.patch 2007-03-01 15:36:10 UTC (rev 680) @@ -0,0 +1,22 @@ +--- libnet.orig/configure 2004-03-01 15:02:37.000000000 -0500 ++++ libnet/configure 2007-03-01 10:21:22.000000000 -0500 +@@ -3552,7 +3552,9 @@ + done + + +- ++if test "${ac_cv_libnet_endianess+set}" = set; then ++echo $ECHO_N "checking machine endianess... (cached) $ECHO_C" >&6 ++else + echo "$as_me:$LINENO: checking machine endianess" >&5 + echo $ECHO_N "checking machine endianess... $ECHO_C" >&6 + +@@ -3606,7 +3608,7 @@ + fi + fi + rm -f conftest* core core.conftest +- ++fi + echo "$as_me:$LINENO: result: $ac_cv_libnet_endianess" >&5 + echo "${ECHO_T}$ac_cv_libnet_endianess" >&6 + Added: trunk/package/libnet/libnet.mk =================================================================== --- trunk/package/libnet/libnet.mk (rev 0) +++ trunk/package/libnet/libnet.mk 2007-03-01 15:36:10 UTC (rev 680) @@ -0,0 +1,81 @@ +############################################################# +# +# libnet +# +############################################################# + +LIBNET_VER:=current +LIBNET_DIR:=$(BUILD_DIR)/libnet +LIBNET_SITE:=http://www.packetfactory.net/libnet/dist +LIBNET_SOURCE:=libnet.tar.gz +LIBNET_CAT:=zcat + +LIBNET_ENDIANNESS=lil +ifeq ($(strip $(BR2_armeb)),y) +LIBNET_ENDIANNESS=big +endif +ifeq ($(strip $(BR2_mips)),y) +LIBNET_ENDIANNESS=big +endif +ifeq ($(strip $(BR2_powerpc)),y) +LIBNET_ENDIANNESS=big +endif +ifeq ($(strip $(BR2_sh3eb)),y) +LIBNET_ENDIANNESS=big +endif +ifeq ($(strip $(BR2_sh4eb)),y) +LIBNET_ENDIANNESS=big +endif +ifeq ($(strip $(BR2_sparc)),y) +LIBNET_ENDIANNESS=big +endif + +$(DL_DIR)/$(LIBNET_SOURCE): + $(WGET) -P $(DL_DIR) $(LIBNET_SITE)/$(LIBNET_SOURCE) + +libnet-source: $(DL_DIR)/$(LIBNET_SOURCE) + +$(LIBNET_DIR)/.unpacked: $(DL_DIR)/$(LIBNET_SOURCE) + $(LIBNET_CAT) $(DL_DIR)/$(LIBNET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(LIBNET_DIR) package/libnet/ *.patch + touch $(LIBNET_DIR)/.unpacked + +$(LIBNET_DIR)/.configured: $(LIBNET_DIR)/.unpacked + (cd $(LIBNET_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_libnet_have_packet_socket=yes \ + ac_cv_lbl_unaligned_fail=no \ + ac_cv_libnet_endianess=$(LIBNET_ENDIANNESS) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --enable-shared \ + ) + touch $(LIBNET_DIR)/.configured + +$(LIBNET_DIR)/libnet.a: $(LIBNET_DIR)/.configured + $(MAKE1) CC="$(TARGET_CC)" -C $(LIBNET_DIR) + +$(STAGING_DIR)/lib/libnet.a: $(LIBNET_DIR)/libnet.a + $(MAKE1) -C $(LIBNET_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) \ + bindir=$(STAGING_DIR)/bin datadir=$(STAGING_DIR)/share install + +libnet: uclibc $(STAGING_DIR)/lib/libnet.a + +libnet-clean: + rm -f $(STAGING_DIR)/include/libnet*.h $(STAGING_DIR)/lib/libnet.a + -$(MAKE) -C $(LIBNET_DIR) clean + +libnet-dirclean: + rm -rf $(LIBNET_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LIBNET)),y) +TARGETS+=libnet +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-01 23:44:33
|
Revision: 684 http://svn.sourceforge.net/astlinux/?rev=684&view=rev Author: krisk84 Date: 2007-03-01 15:44:33 -0800 (Thu, 01 Mar 2007) Log Message: ----------- remove unionfs - now built into the 2.6.20 kernel Modified Paths: -------------- trunk/package/Config.in Removed Paths: ------------- trunk/package/unionfs/ Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-01 23:44:01 UTC (rev 683) +++ trunk/package/Config.in 2007-03-01 23:44:33 UTC (rev 684) @@ -180,7 +180,6 @@ source "package/ttcp/Config.in" source "package/udev/Config.in" source "package/udhcp/Config.in" -source "package/unionfs/Config.in" source "package/usbutils/Config.in" source "package/util-linux/Config.in" source "package/valgrind/Config.in" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-02 22:29:39
|
Revision: 693 http://svn.sourceforge.net/astlinux/?rev=693&view=rev Author: krisk84 Date: 2007-03-02 14:29:39 -0800 (Fri, 02 Mar 2007) Log Message: ----------- add cdp-send support for CDP Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/cdp-send/ trunk/package/cdp-send/Config.in trunk/package/cdp-send/cdp-send-vvlan.patch trunk/package/cdp-send/cdp-send.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-02 20:01:49 UTC (rev 692) +++ trunk/package/Config.in 2007-03-02 22:29:39 UTC (rev 693) @@ -50,6 +50,7 @@ source "package/bluez/Config.in" source "package/boa/Config.in" source "package/bridge/Config.in" +source "package/cdp-send/Config.in" source "package/chansccp/Config.in" source "package/customize/Config.in" source "package/dhcp/Config.in" Added: trunk/package/cdp-send/Config.in =================================================================== --- trunk/package/cdp-send/Config.in (rev 0) +++ trunk/package/cdp-send/Config.in 2007-03-02 22:29:39 UTC (rev 693) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CDP-SEND + bool "cdp-send" + default n + help + cdp-send from the cdp-tools package + With AstLinux patches for voice VLAN support + + http://gpl.internetconnection.net/ Added: trunk/package/cdp-send/cdp-send-vvlan.patch =================================================================== --- trunk/package/cdp-send/cdp-send-vvlan.patch (rev 0) +++ trunk/package/cdp-send/cdp-send-vvlan.patch 2007-03-02 22:29:39 UTC (rev 693) @@ -0,0 +1,115 @@ +diff -ur cdp-tools.orig/cdp-send.c cdp-tools/cdp-send.c +--- cdp-tools.orig/cdp-send.c 2006-10-26 14:04:33.000000000 -0400 ++++ cdp-tools/cdp-send.c 2007-02-28 17:13:35.000000000 -0500 +@@ -2,6 +2,8 @@ + * cdp-send is part of cdp-tools. + * cdp-tools is (c) 2003-2006 Internet Connection, Inc. + * ++ * Voice VLAN support by Kristian Kielhofner <kr...@kr...> ++ * + * cdp-send is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) +@@ -37,6 +39,8 @@ + + static unsigned int use_vlanid = 0; + ++static unsigned int use_voiceid = 0; ++ + static unsigned char *use_ip_prefix = 0; + static unsigned int use_ip_prefix_len = 0; + +@@ -178,7 +182,7 @@ + + buffer+=sizeof(struct cdp_header); + +- buffer[0]=0x1; /* cdp version */ ++ buffer[0]=0x2; /* cdp version */ + buffer[1]=0xb4; /* cdp holdtime, 180 sec by default */ + buffer[2]=buffer[3]=0; /* checksum - will calculate later */ + +@@ -299,7 +303,7 @@ + if (duplex == 0) return 0; + if (len < 5) return 0; + sx_write_short(buffer,htons(0x000b)); /* type=port duplex */ +- sx_write_short(buffer+2,htons(1)); ++ sx_write_short(buffer+2,htons(5)); /* totallength*/ + buffer[4] = (duplex == 1 ? 1 : 0); + return 5; + } +@@ -309,11 +313,23 @@ + { + if (len < 6) return 0; + sx_write_short(buffer,htons(0x000a)); /* type=vlan id */ +- sx_write_short(buffer+2,htons(2)); ++ sx_write_short(buffer+2,htons(6)); /* totallength*/ + sx_write_short(buffer+4,htons(use_vlanid)); + return 6; + } + ++int ++cdp_add_voiceid(unsigned char* buffer, int len) ++{ ++ if (len < 7) return 0; ++ sx_write_short(buffer,htons(0x000e)); /* type=voice vlan id */ ++ sx_write_short(buffer+2,htons(7)); /* totallength*/ ++ sx_write_short(buffer+4,htons(0x1)); /*PAD*/ ++ sx_write_short(buffer+5,htons(use_voiceid)); ++ return 7; ++} ++ ++ + + unsigned short + cdp_checksum(unsigned char *ptr, int length) { +@@ -346,6 +362,7 @@ + " -d enable debugging output\n" + " -D dom specify VTP management domain (octal escapes ok)\n" + " -L vlan specify native VLAN (vlanid)\n" ++" -V vlan specify voice VLAN (voiceid)\n" + " -m mach specify machine/platform to advertise (e.g. \"%s\")\n" + " -n name specify a hostname\n" + " -p name override port name (default: interface)\n" +@@ -435,11 +452,12 @@ + struct cdp_interface *ifaces=NULL; + int specify_duplex = 0; + int specified_vlan = 0; ++ int specified_vvlan = 0; + int didcap = 0; + char *q; + + uname(&myuname); +- while((c=getopt(argc,argv,"a:c:dD:L:m:n:op:P:s:S:t:"))!=EOF) { ++ while((c=getopt(argc,argv,"a:c:dD:L:V:m:n:op:P:s:S:t:"))!=EOF) { + switch(c) { + case 'a': + if (inet_aton(optarg, &iaddr)) { +@@ -518,6 +536,15 @@ + specified_vlan=1; + use_vlanid = i; + break; ++ case 'V': ++ i = strtod(optarg, &q); ++ if ((q && *q) || i < 0 || i > 65535) { ++ fprintf(stderr, "Voice VLAN ID is an unsigned 16-bit integer\n"); ++ exit(1); ++ } ++ specified_vvlan=1; ++ use_voiceid = i; ++ break; + case 'm': + use_machine = strdup(optarg); + if (!use_machine) { +@@ -673,7 +700,11 @@ + if (specified_vlan) { + offset+=cdp_add_vlanid(buffer+offset, sizeof(buffer)-offset); + } +- ++ ++ if (specified_vvlan) { ++ offset+=cdp_add_voiceid(buffer+offset, sizeof(buffer)-offset); ++ } ++ + ((struct cdp_header*)buffer)->length=htons(offset-14); + + *(u_short*)(buffer+sizeof(struct cdp_header)+2)=cdp_checksum( Added: trunk/package/cdp-send/cdp-send.mk =================================================================== --- trunk/package/cdp-send/cdp-send.mk (rev 0) +++ trunk/package/cdp-send/cdp-send.mk 2007-03-02 22:29:39 UTC (rev 693) @@ -0,0 +1,49 @@ +############################################################# +# +# cdp-send support +# +############################################################# +CDP-SEND_SOURCE=cdp-tools.tar.gz +CDP-SEND_CAT:=zcat +CDP-SEND_SITE:=http://gpl.internetconnection.net/files +CDP-SEND_DIR=$(BUILD_DIR)/cdp-tools + +$(DL_DIR)/$(CDP-SEND_SOURCE): + $(WGET) -P $(DL_DIR) $(CDP-SEND_SITE)/$(CDP-SEND_SOURCE) + +$(CDP-SEND_DIR)/.patched: $(DL_DIR)/$(CDP-SEND_SOURCE) + $(CDP-SEND_CAT) $(DL_DIR)/$(CDP-SEND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(CDP-SEND_DIR) package/cdp-send/ cdp-send\*.patch + touch $@ + +$(CDP-SEND_DIR)/cdp-send: $(CDP-SEND_DIR)/.patched + # We don't use the cdp-tools Makefile because it isn't worth it... + $(TARGET_CC) $(TARGET_CFLAGS) -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H \ + -I$(STAGING_DIR)/include -c -o $(CDP-SEND_DIR)/cdp-send.o $(CDP-SEND_DIR)/cdp-send.c + $(TARGET_CC) $(TARGET_CFLAGS) -o $(CDP-SEND_DIR)/cdp-send $(CDP-SEND_DIR)/cdp-send.o \ + $(STAGING_DIR)/lib/libnet.a + touch -c $(CDP-SEND_DIR)/cdp-send + +$(TARGET_DIR)/usr/sbin/cdp-send: $(CDP-SEND_DIR)/cdp-send + $(INSTALL) -D -m 0755 $(CDP-SEND_DIR)/cdp-send $(TARGET_DIR)/usr/sbin/cdp-send + -$(STRIP) $(TARGET_DIR)/usr/sbin/cdp-send + touch -c $(TARGET_DIR)/usr/sbin/cdp-send + +cdp-send: uclibc libnet $(TARGET_DIR)/usr/sbin/cdp-send + +cdp-send-source: $(DL_DIR)/$(CDP-SEND_SOURCE) + +cdp-send-clean: + rm -f $(TARGET_DIR)/usr/sbin/cdp-send + -$(MAKE) -C $(CDP-SEND_DIR) clean + +cdp-send-dirclean: + rm -rf $(CDP-SEND_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_CDP-SEND)),y) +TARGETS+=cdp-send +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dha...@us...> - 2007-03-04 19:46:15
|
Revision: 698 http://svn.sourceforge.net/astlinux/?rev=698&view=rev Author: dhartman Date: 2007-03-04 11:45:08 -0800 (Sun, 04 Mar 2007) Log Message: ----------- asterisk and zaptel version bumps Modified Paths: -------------- trunk/package/asterisk/asterisk.mk trunk/package/zaptel/zaptel-makefile0.patch trunk/package/zaptel/zaptel.mk Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2007-03-04 19:39:58 UTC (rev 697) +++ trunk/package/asterisk/asterisk.mk 2007-03-04 19:45:08 UTC (rev 698) @@ -3,7 +3,7 @@ # asterisk # ############################################################## -ASTERISK_VERSION := 1.2.15 +ASTERISK_VERSION := 1.2.16 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz ASTERISK_SITE := ftp://ftp.digium.com/pub/asterisk/releases ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION) Modified: trunk/package/zaptel/zaptel-makefile0.patch =================================================================== --- trunk/package/zaptel/zaptel-makefile0.patch 2007-03-04 19:39:58 UTC (rev 697) +++ trunk/package/zaptel/zaptel-makefile0.patch 2007-03-04 19:45:08 UTC (rev 698) @@ -1,5 +1,5 @@ ---- zaptel/Makefile.orig 2007-02-26 10:34:21.000000000 -0600 -+++ zaptel/Makefile 2007-02-26 10:35:28.000000000 -0600 +--- zaptel/Makefile.orig 2007-03-02 16:29:04.000000000 -0600 ++++ zaptel/Makefile 2007-03-04 12:51:27.000000000 -0600 @@ -6,6 +6,7 @@ # @@ -8,8 +8,8 @@ ifeq ($(MAKELEVEL),0) PWD:=$(shell pwd) -@@ -141,7 +142,7 @@ LIBTONEZONE_SO_MINOR_VER:=0 - MOD_DESTDIR:=zaptel +@@ -143,7 +144,7 @@ LIBTONEZONE_SO_MAJOR_VER:=1 + LIBTONEZONE_SO_MINOR_VER:=0 BINS=ztcfg torisatool makefw ztmonitor ztspeed zttest fxotune -ifneq (,$(wildcard /usr/include/newt.h)) @@ -17,7 +17,7 @@ BINS+=zttool endif -@@ -224,13 +225,13 @@ torisatool: torisatool.o +@@ -226,13 +227,13 @@ torisatool: torisatool.o $(CC) -o $@ $^ tones.h: gendigits @@ -34,7 +34,7 @@ gendigits: gendigits.o $(CC) -o $@ $^ -lm -@@ -344,13 +345,13 @@ b410p: +@@ -346,13 +347,13 @@ b410p: $(MAKE) -C mISDNuser install install: all devices firmware @@ -52,7 +52,7 @@ ifeq ($(BUILDVER),linux26) for x in $(MODULESKO); do \ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \ -@@ -366,25 +367,18 @@ endif +@@ -368,25 +369,18 @@ endif rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \ fi; \ rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o @@ -74,7 +74,7 @@ - install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8 - [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || : - [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE) -- build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp,$(MODULES)) $(MODULE_ALIASES)" +- build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)" - @if [ -d /etc/modutils ]; then \ - /sbin/update-modules ; \ - fi Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2007-03-04 19:39:58 UTC (rev 697) +++ trunk/package/zaptel/zaptel.mk 2007-03-04 19:45:08 UTC (rev 698) @@ -3,7 +3,7 @@ # zaptel # ############################################################## -ZAPTEL_VERSION := 1.2.14 +ZAPTEL_VERSION := 1.2.15 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-07 16:10:42
|
Revision: 716 http://svn.sourceforge.net/astlinux/?rev=716&view=rev Author: krisk84 Date: 2007-03-07 08:10:33 -0800 (Wed, 07 Mar 2007) Log Message: ----------- add support for samba Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/samba/ trunk/package/samba/Config.in trunk/package/samba/init-samba trunk/package/samba/samba-getgrouplist.patch trunk/package/samba/samba-remove-legacy-index.patch trunk/package/samba/samba.mk trunk/package/samba/simple.conf Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-07 15:47:19 UTC (rev 715) +++ trunk/package/Config.in 2007-03-07 16:10:33 UTC (rev 716) @@ -156,6 +156,7 @@ source "package/rsync/Config.in" source "package/ruby/Config.in" source "package/rxvt/Config.in" +source "package/samba/Config.in" source "package/schedutils/Config.in" source "package/screen/Config.in" source "package/sdl/Config.in" Added: trunk/package/samba/Config.in =================================================================== --- trunk/package/samba/Config.in (rev 0) +++ trunk/package/samba/Config.in 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,181 @@ +config BR2_PACKAGE_SAMBA + bool "samba" + default n + help + Provides print services to all manner of SMB/CIFS clients, + including the numerous versions of Microsoft Windows + operating systems. + + http://www.samba.org/ + + NOTE: A complete Samba install takes close to 40MB of space, + so choose only the components you need. + +menu "Samba tools selection" + depends BR2_PACKAGE_SAMBA + +config BR2_PACKAGE_SAMBA_CIFS + bool "cifs" + default y + depends on BR2_PACKAGE_SAMBA + help + Support CIFS + +config BR2_PACKAGE_SAMBA_EVENTLOGADM + bool "eventlogadm" + default y + depends on BR2_PACKAGE_SAMBA + help + Write Eventlog records to a tdb or perform other eventlog functions + +config BR2_PACKAGE_SAMBA_NET + bool "net" + default y + depends on BR2_PACKAGE_SAMBA + help + Distributed SMB/CIFS Server Management Utility + +config BR2_PACKAGE_SAMBA_NMBD + bool "nmbd" + default y + depends on BR2_PACKAGE_SAMBA + help + NetBIOS name server to provide NetBIOS over IP naming services + to clients + +config BR2_PACKAGE_SAMBA_NMBLOOKUP + bool "nmblookup" + default y + depends on BR2_PACKAGE_SAMBA + help + Query NetBIOS names and map them to IP addresses in a network + using NetBIOS over TCP/IP queries + +config BR2_PACKAGE_SAMBA_NTLM_AUTH + bool "ntlm_auth" + default y + depends on BR2_PACKAGE_SAMBA + help + Helper utility that authenticates users using NT/LM authentication + +config BR2_PACKAGE_SAMBA_PDBEDIT + bool "pdbedit" + default y + depends on BR2_PACKAGE_SAMBA + help + Manage the SAM database (Database of Samba Users) + +config BR2_PACKAGE_SAMBA_PROFILES + bool "profiles" + default y + depends on BR2_PACKAGE_SAMBA + help + Utility that reports and changes SIDs in Windows NT registry files + +config BR2_PACKAGE_SAMBA_RPCCLIENT + bool "rpcclient" + default y + depends on BR2_PACKAGE_SAMBA + help + Tool for executing client side MS-RPC functions using RPC + calls from a UNIX workstation. + +config BR2_PACKAGE_SAMBA_SMBCACLS + bool "smbcacls" + default y + depends on BR2_PACKAGE_SAMBA + help + Set or get ACLs on an NT file or directory names + +config BR2_PACKAGE_SAMBA_SMBCLIENT + bool "smbclient" + default y + depends on BR2_PACKAGE_SAMBA + help + ftp-like client to access SMB/CIFS resources on servers + +config BR2_PACKAGE_SAMBA_SMBCONTROL + bool "smbcontrol" + default y + depends on BR2_PACKAGE_SAMBA + help + Send messages to smbd, nmbd or winbindd processes + +config BR2_PACKAGE_SAMBA_SMBCQUOTAS + bool "smbcquotas" + default y + depends on BR2_PACKAGE_SAMBA + help + Set or get QUOTAs of NTFS 5 shares + +config BR2_PACKAGE_SAMBA_SMBGET + bool "smbget" + default y + depends on BR2_PACKAGE_SAMBA + help + wget-like utility for download files over SMB + +config BR2_PACKAGE_SAMBA_SMBPASSWD + bool "smbpasswd" + default y + depends on BR2_PACKAGE_SAMBA + help + Change a user's SMB passwd + +config BR2_PACKAGE_SAMBA_SMBSPOOL + bool "smbspool" + default y + depends on BR2_PACKAGE_SAMBA + help + Send a print file to an SMB printer + +config BR2_PACKAGE_SAMBA_SMBSTATUS + bool "smbstatus" + default y + depends on BR2_PACKAGE_SAMBA + help + Report on current Samba connections + +config BR2_PACKAGE_SAMBA_SMBTREE + bool "smbtree" + default y + depends on BR2_PACKAGE_SAMBA + help + A text based smb network browser + +config BR2_PACKAGE_SAMBA_SWAT + bool "swat" + default y + depends on BR2_PACKAGE_SAMBA + help + Samba Web Administration Tool + +config BR2_PACKAGE_SAMBA_TDB + bool "tdb" + default y + depends on BR2_PACKAGE_SAMBA + help + Tools to operate on the .tdb database files + +config BR2_PACKAGE_SAMBA_TESTPARM + bool "testparm" + default y + depends on BR2_PACKAGE_SAMBA + help + Check an smb.conf configuration file for internal correctness + +config BR2_PACKAGE_SAMBA_WINBINDD + bool "winbindd" + default y + depends on BR2_PACKAGE_SAMBA + help + Name Service Switch daemon for resolving names from NT servers + +config BR2_PACKAGE_SAMBA_WBINFO + bool "wbinfo" + default y + depends on BR2_PACKAGE_SAMBA_WINBINDD + help + Query information from winbind daemon + +endmenu Added: trunk/package/samba/init-samba =================================================================== --- trunk/package/samba/init-samba (rev 0) +++ trunk/package/samba/init-samba 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,79 @@ +#!/bin/sh +# +# Stolen from RedHat FC5. +# + +# Check that smb.conf exists. +[ -f /etc/samba/smb.conf ] || exit 0 + +# Make directories. +mkdir -p /var/cache/samba +mkdir -p /var/log/samba + +RETVAL=0 + +start() { + echo -n "Starting SMB services: " + smbd -D + RETVAL=$? + echo "done" + + echo -n "Starting NMB services: " + nmbd -D + RETVAL2=$? + echo "done" + + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \ + RETVAL=1 + return $RETVAL +} + +stop() { + echo -n "Shutting down SMB services: " + kill -9 `pidof smbd` + RETVAL=$? + rm -f /var/run/smbd.pid + echo "done" + + echo -n "Shutting down NMB services: " + kill -9 `pidof nmbd` + RETVAL2=$? + rm -f /var/run/nmbd.pid + + [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb + echo "done" + return $RETVAL +} + +restart() { + stop + start +} + +reload() { + echo -n "Reloading smb.conf file: " + kill -HUP `pidof smbd` + RETVAL=$? + echo "done" + return $RETVAL +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + restart + ;; + reload) + reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac + +exit $? Property changes on: trunk/package/samba/init-samba ___________________________________________________________________ Name: svn:executable + * Added: trunk/package/samba/samba-getgrouplist.patch =================================================================== --- trunk/package/samba/samba-getgrouplist.patch (rev 0) +++ trunk/package/samba/samba-getgrouplist.patch 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,42 @@ +diff -ur samba-3.0.23c/source/configure.in samba-3.0.23c-patched/source/configure.in +--- samba-3.0.23c/source/configure.in 2006-07-21 11:22:57.000000000 -0500 ++++ samba-3.0.23c-patched/source/configure.in 2006-11-09 10:23:26.000000000 -0600 +@@ -1399,38 +1399,6 @@ + AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[]) + + # +-# +-# +-case "$host_os" in +- *linux*) +- # glibc <= 2.3.2 has a broken getgrouplist +- AC_TRY_RUN([ +-#include <unistd.h> +-#include <sys/utsname.h> +-main() { +- /* glibc up to 2.3 has a broken getgrouplist */ +-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) +- int libc_major = __GLIBC__; +- int libc_minor = __GLIBC_MINOR__; +- +- if (libc_major < 2) +- exit(1); +- if ((libc_major == 2) && (libc_minor <= 3)) +- exit(1); +-#endif +- exit(0); +-} +-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no]) +- if test x"$linux_getgrouplist_ok" = x"yes"; then +- AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist]) +- fi +- ;; +- *) +- AC_CHECK_FUNCS(getgrouplist) +- ;; +-esac +- +-# + # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX + # + Added: trunk/package/samba/samba-remove-legacy-index.patch =================================================================== --- trunk/package/samba/samba-remove-legacy-index.patch (rev 0) +++ trunk/package/samba/samba-remove-legacy-index.patch 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,22 @@ +diff -ur samba-3.0.23d/source/registry/reg_perfcount.c samba-3.0.23d-patched/source/registry/reg_perfcount.c +--- samba-3.0.23d/source/registry/reg_perfcount.c 2006-07-10 11:27:54.000000000 -0500 ++++ samba-3.0.23d-patched/source/registry/reg_perfcount.c 2007-01-20 23:12:23.456180669 -0600 +@@ -614,15 +614,15 @@ + obj = NULL; + memset(buf, 0, PERFCOUNT_MAX_LEN); + memcpy(buf, data.dptr, data.dsize); +- begin = index(buf, '['); +- end = index(buf, ']'); ++ begin = strchr(buf, '['); ++ end = strchr(buf, ']'); + if(begin == NULL || end == NULL) + return False; + start = begin+1; + + while(start < end) + { +- stop = index(start, ','); ++ stop = strchr(start, ','); + if(stop == NULL) + stop = end; + *stop = '\0'; Added: trunk/package/samba/samba.mk =================================================================== --- trunk/package/samba/samba.mk (rev 0) +++ trunk/package/samba/samba.mk 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,122 @@ +############################################################# +# +# samba +# +############################################################# +SAMBA_VER:=3.0.24 +SAMBA_SOURCE:=samba-$(SAMBA_VER).tar.gz +SAMBA_SITE:=http://us4.samba.org/samba/ftp/stable +SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VER)/source +SAMBA_CAT:=zcat +SAMBA_BINARY:=bin/smbd +SAMBA_TARGET_BINARY:=usr/sbin/smbd + +$(DL_DIR)/$(SAMBA_SOURCE): + $(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE) + +samba-source: $(DL_DIR)/$(SAMBA_SOURCE) + +$(SAMBA_DIR)/.unpacked: $(DL_DIR)/$(SAMBA_SOURCE) + $(SAMBA_CAT) $(DL_DIR)/$(SAMBA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh `dirname $(SAMBA_DIR)` package/samba/ samba\*.patch + touch $(SAMBA_DIR)/.unpacked + +$(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked + (cd $(SAMBA_DIR); rm -rf config.cache; \ + ./autogen.sh; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \ + samba_cv_USE_SETREUID=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --with-lockdir=/var/cache/samba \ + --with-piddir=/var/run \ + --with-privatedir=/etc/samba \ + --with-logfilebase=/var/log/samba \ + --with-configdir=/etc/samba \ + --without-ldap \ + --with-included-popt \ + --with-included-iniparser \ + --disable-cups \ + --disable-static \ + ); + touch $(SAMBA_DIR)/.configured + +$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured + $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR) proto + $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(SAMBA_DIR) + +SAMBA_TARGETS_ := +SAMBA_TARGETS_y := + +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs \ + usr/sbin/umount.cifs +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP) += usr/bin/nmblookup +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NTLM_AUTH) += usr/bin/ntlm_auth +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PDBEDIT) += usr/bin/pdbedit +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PROFILES) += usr/bin/profiles +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_RPCCLIENT) += usr/bin/rpcclient +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCACLS) += usr/bin/smbcacls +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCLIENT) += usr/bin/smbclient +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCONTROL) += usr/bin/smbcontrol +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCQUOTAS) += usr/bin/smbcquotas +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBGET) += usr/bin/smbget +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup \ + usr/bin/tdbdump \ + usr/bin/tdbtool +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TESTPARM) += usr/bin/testparm +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD) += usr/sbin/winbindd +SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO) += usr/bin/wbinfo + +$(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY) + $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) \ + prefix="${TARGET_DIR}/usr" \ + BASEDIR="${TARGET_DIR}/usr" \ + SBINDIR="${TARGET_DIR}/usr/sbin" \ + LOCKDIR="${TARGET_DIR}/var/cache/samba" \ + PRIVATEDIR="${TARGET_DIR}/etc/samba" \ + CONFIGDIR="${TARGET_DIR}/etc/samba" \ + VARDIR="${TARGET_DIR}/var/log/samba" \ + -C $(SAMBA_DIR) installservers installbin installcifsmount + for file in $(SAMBA_TARGETS_) ; do \ + rm -f $(TARGET_DIR)/$$file; \ + done + $(INSTALL) -m 0755 -D package/samba/init-samba $(TARGET_DIR)/etc/init.d/samba + @if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \ + $(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \ + fi; + rm -rf $(TARGET_DIR)/var/cache/samba + rm -rf $(TARGET_DIR)/var/lib/samba + +samba: uclibc $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) + +samba-clean: + rm -f $(TARGET_DIR)/$(SAMBA_TARGET_BINARY) + for file in $(SAMBA_TARGETS_y) ; do \ + rm -f $(TARGET_DIR)/$$file; \ + done + rm -f $(TARGET_DIR)/etc/init.d/samba + rm -rf $(TARGET_DIR)/etc/samba + -$(MAKE) -C $(SAMBA_DIR) clean + +samba-dirclean: + rm -rf $(SAMBA_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_SAMBA)),y) +TARGETS+=samba +endif Added: trunk/package/samba/simple.conf =================================================================== --- trunk/package/samba/simple.conf (rev 0) +++ trunk/package/samba/simple.conf 2007-03-07 16:10:33 UTC (rev 716) @@ -0,0 +1,25 @@ +#======================= Global Settings ===================================== +[global] +workgroup = MYGROUP +server string = MYDATA +max log size = 50 +security = share +encrypt passwords = yes +smb passwd file = /etc/samba/smbpasswd +log file = /var/log/samba/log.smbd +hosts allow = 127. +interfaces = eth0 192.168.0.1/255.255.255.0 +socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 + +#============================ Share Definitions ============================== +idmap uid = 16777216-33554431 +idmap gid = 16777216-33554431 +template shell = /bin/false +winbind use default domain = no + +[data] +path = /data +public = yes +only guest = yes +writable = yes +printable = no This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-07 20:06:46
|
Revision: 718 http://svn.sourceforge.net/astlinux/?rev=718&view=rev Author: krisk84 Date: 2007-03-07 12:06:28 -0800 (Wed, 07 Mar 2007) Log Message: ----------- add netplug support Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/netplug/ trunk/package/netplug/Config.in trunk/package/netplug/init-netplug trunk/package/netplug/netplug-script trunk/package/netplug/netplug.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-07 17:41:56 UTC (rev 717) +++ trunk/package/Config.in 2007-03-07 20:06:28 UTC (rev 718) @@ -127,6 +127,7 @@ source "package/ncurses/Config.in" source "package/netkitbase/Config.in" source "package/netkittelnet/Config.in" +source "package/netplug/Config.in" source "package/netsnmp/Config.in" source "package/newt/Config.in" source "package/nistnet/Config.in" Added: trunk/package/netplug/Config.in =================================================================== --- trunk/package/netplug/Config.in (rev 0) +++ trunk/package/netplug/Config.in 2007-03-07 20:06:28 UTC (rev 718) @@ -0,0 +1,8 @@ +config BR2_PACKAGE_NETPLUG + bool "netplug" + default n + help + A Linux daemon that manages network interfaces in + response to network cables being plugged in and out. + + http://www.red-bean.com/~bos/ Added: trunk/package/netplug/init-netplug =================================================================== --- trunk/package/netplug/init-netplug (rev 0) +++ trunk/package/netplug/init-netplug 2007-03-07 20:06:28 UTC (rev 718) @@ -0,0 +1,69 @@ +#!/bin/sh +# +# netplugd This shell script takes care of starting and stopping +# the network plug management daemon. +# +# chkconfig: - 11 89 +# description: netplugd is a daemon for managing non-static network \ +# interfaces. +# processname: netplugd +# pidfile: /var/run/netplugd.pid + +# Copyright 2003 Key Research, Inc. + +# Source function library. +if [ -f /etc/init.d/functions ]; then + . /etc/init.d/functions +elif [ -f /etc/rc.d/init.d/functions ]; then + . /etc/rc.d/init.d/functions +fi + +# Source networking configuration. +if [ -f /etc/sysconfig/network ]; then + . /etc/sysconfig/network + + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 +elif [ ! -f /etc/network/interfaces ]; then + # No network support + exit 0 +fi + +[ -x /sbin/netplugd ] || exit 0 + +if [ -f /etc/sysconfig/netplugd ]; then + . /etc/sysconfig/netplugd +fi + +# See how we were called. +case "$1" in + start) + # Start daemon. + echo -n $"Starting network plug daemon: " + start-stop-daemon --start --quiet --pidfile /var/run/netplugd.pid --exec /sbin/netplugd ${NETPLUGDARGS} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd + ;; + stop) + # Stop daemon. + echo -n $"Shutting down network plug daemon: " + start-stop-daemon --stop --name netplugd + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd + ;; + restart|reload) + $0 stop + $0 start + ;; + condrestart) + [ -f /var/lock/subsys/netplugd ] && $0 restart || : + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + RETVAL=1 + ;; +esac + +exit $RETVAL Property changes on: trunk/package/netplug/init-netplug ___________________________________________________________________ Name: svn:executable + * Added: trunk/package/netplug/netplug-script =================================================================== --- trunk/package/netplug/netplug-script (rev 0) +++ trunk/package/netplug/netplug-script 2007-03-07 20:06:28 UTC (rev 718) @@ -0,0 +1,57 @@ +#!/bin/sh +# +# netplug - policy agent for netplugd +# +# Copyright 2003 Key Research, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License, version 2, as +# published by the Free Software Foundation. You are forbidden from +# redistributing or modifying it under the terms of any other license, +# including other versions of the GNU General Public License. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + + +PATH=/usr/bin:/bin:/usr/sbin:/sbin +export PATH + +dev="$1" +action="$2" + +case "$action" in +in) + if [ -x /sbin/ifup ]; then + exec /sbin/ifup $dev + else + echo "Please teach me how to plug in an interface!" 1>&2 + exit 1 + fi + ;; +out) + if [ -x /sbin/ifdown ]; then + # At least on Fedora Core 1, the call to ip addr flush infloops + # /sbin/ifdown $dev && exec /sbin/ip addr flush $dev + exec /sbin/ifdown $dev + else + echo "Please teach me how to unplug an interface!" 1>&2 + exit 1 + fi + ;; +probe) + # exec /sbin/ip link set $dev up >/dev/null 2>&1 + if [ -x /sbin/ifconfig ]; then + exec /sbin/ifconfig $dev up >/dev/null 2>&1 + else + echo "Failed to probe an interface!" 1>&2 + exit 1 + fi + ;; +*) + echo "I have been called with a funny action of '%s'!" 1>&2 + exit 1 + ;; +esac Property changes on: trunk/package/netplug/netplug-script ___________________________________________________________________ Name: svn:executable + * Added: trunk/package/netplug/netplug.mk =================================================================== --- trunk/package/netplug/netplug.mk (rev 0) +++ trunk/package/netplug/netplug.mk 2007-03-07 20:06:28 UTC (rev 718) @@ -0,0 +1,53 @@ +############################################################# +# +# netplug +# +############################################################# +NETPLUG_VER=1.2.9 +NETPLUG_SOURCE=netplug-$(NETPLUG_VER).tar.bz2 +NETPLUG_SITE=http://www.red-bean.com/~bos/netplug +NETPLUG_DIR=$(BUILD_DIR)/netplug-$(NETPLUG_VER) +NETPLUG_CAT:=bzcat +NETPLUG_BINARY:=netplugd +NETPLUG_TARGET_BINARY:=sbin/netplugd + +$(DL_DIR)/$(NETPLUG_SOURCE): + $(WGET) -P $(DL_DIR) $(NETPLUG_SITE)/$(NETPLUG_SOURCE) + +netplug-source: $(DL_DIR)/$(NETPLUG_SOURCE) + +$(NETPLUG_DIR)/.unpacked: $(DL_DIR)/$(NETPLUG_SOURCE) + $(NETPLUG_CAT) $(DL_DIR)/$(NETPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(NETPLUG_DIR) package/netplug/ netplug\*.patch + touch $(NETPLUG_DIR)/.unpacked + +$(NETPLUG_DIR)/$(NETPLUG_BINARY): $(NETPLUG_DIR)/.unpacked + $(MAKE) CC=$(TARGET_CC) -C $(NETPLUG_DIR) + $(STRIP) $(NETPLUG_DIR)/$(NETPLUG_BINARY) + +$(TARGET_DIR)/$(NETPLUG_TARGET_BINARY): $(NETPLUG_DIR)/$(NETPLUG_BINARY) + $(INSTALL) -m 644 -D $(NETPLUG_DIR)/etc/netplugd.conf $(TARGET_DIR)/etc/netplug/netplugd.conf + $(INSTALL) -m 755 -D package/netplug/netplug-script $(TARGET_DIR)/etc/netplug-script + $(INSTALL) -m 755 -D package/netplug/init-netplug $(TARGET_DIR)/etc/init.d/netplug + $(INSTALL) -m 755 -D $(NETPLUG_DIR)/$(NETPLUG_BINARY) $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) + touch -c $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) + +netplug: uclibc $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) + +netplug-clean: + rm -f $(TARGET_DIR)/$(NETPLUG_TARGET_BINARY) + rm -rf $(TARGET_DIR)/etc/netplug* + rm -f $(TARGET_DIR)/etc/init.d/netplug + -$(MAKE) -C $(NETPLUG_DIR) clean + +netplug-dirclean: + rm -rf $(NETPLUG_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_NETPLUG)),y) +TARGETS+=netplug +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-08 19:00:22
|
Revision: 730 http://svn.sourceforge.net/astlinux/?rev=730&view=rev Author: krisk84 Date: 2007-03-08 11:00:20 -0800 (Thu, 08 Mar 2007) Log Message: ----------- add mpfr package for fortran dependency Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/mpfr/ trunk/package/mpfr/Config.in trunk/package/mpfr/mpfr.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-08 18:55:46 UTC (rev 729) +++ trunk/package/Config.in 2007-03-08 19:00:20 UTC (rev 730) @@ -89,6 +89,7 @@ source "package/libftdi/Config.in" source "package/libglib12/Config.in" source "package/libmad/Config.in" +source "package/libmpfr/Config.in" source "package/libnet/Config.in" source "package/libpcap/Config.in" source "package/libpng/Config.in" Added: trunk/package/mpfr/Config.in =================================================================== --- trunk/package/mpfr/Config.in (rev 0) +++ trunk/package/mpfr/Config.in 2007-03-08 19:00:20 UTC (rev 730) @@ -0,0 +1,20 @@ +config BR2_PACKAGE_LIBMPFR + bool "mpfr" + default n + default y if BR2_INSTALL_FORTRAN + select BR2_PACKAGE_LIBGMP + help + C library for multiple-precision floating-point computations + with exact rounding. + + http://www.mpfr.org/ + + +config BR2_PACKAGE_LIBMPFR_HEADERS + bool "mpfr headers for target" + default n + depends on BR2_PACKAGE_LIBMPFR + select BR2_PACKAGE_LIBGMP_HEADERS + help + Install the mpfr headers for the target. + Added: trunk/package/mpfr/mpfr.mk =================================================================== --- trunk/package/mpfr/mpfr.mk (rev 0) +++ trunk/package/mpfr/mpfr.mk 2007-03-08 19:00:20 UTC (rev 730) @@ -0,0 +1,143 @@ +############################################################# +# +# mpfr +# +############################################################# +MPFR_VERSION:=2.2.1 +#MPFR_PATCH:=patches +MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2 +MPFR_CAT:=bzcat +MPFR_SITE:=http://www.mpfr.org/mpfr-current/ +MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION) +MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION) +MPFR_BINARY:=libmpfr.so +MPFR_LIBVERSION:=1.0.1 + +ifeq ($(BR2_ENDIAN),"BIG") +MPFR_BE:=yes +else +MPFR_BE:=no +endif + +$(DL_DIR)/$(MPFR_SOURCE): + $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE) + + +libmpfr-source: $(DL_DIR)/$(MPFR_SOURCE) + +$(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) + $(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(MPFR_DIR) package/mpfr/ \*.patch + $(CONFIG_UPDATE) $(MPFR_DIR) +ifneq ($(MPFR_PATCH),) + $(WGET) -P $(MPFR_DIR) $(MPFR_SITE)/$(MPFR_PATCH) + ( cd $(MPFR_DIR) ; patch -p1 < $(MPFR_PATCH) ; ) +endif + touch $@ + +$(MPFR_TARGET_DIR)/.configured: $(MPFR_DIR)/.unpacked $(STAGING_DIR)/lib/$(GMP_BINARY) + mkdir -p $(MPFR_TARGET_DIR) + (cd $(MPFR_TARGET_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_c_bigendian=$(MPFR_BE) \ + $(MPFR_DIR)/configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libdir=/lib \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --includedir=/include \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --enable-shared \ + --with-gmp=$(STAGING_DIR) \ + $(DISABLE_NLS) \ + ); + touch $@ + +$(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(MPFR_TARGET_DIR) + +$(STAGING_DIR)/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY) + $(MAKE) prefix=$(STAGING_DIR) \ + exec_prefix=$(STAGING_DIR) \ + bindir=$(STAGING_DIR)/bin \ + sbindir=$(STAGING_DIR)/sbin \ + libexecdir=$(STAGING_DIR)/bin \ + datadir=$(STAGING_DIR)/share \ + sysconfdir=$(STAGING_DIR)/etc \ + sharedstatedir=$(STAGING_DIR)/com \ + localstatedir=$(STAGING_DIR)/var \ + libdir=$(STAGING_DIR)/lib \ + includedir=$(STAGING_DIR)/include \ + oldincludedir=$(STAGING_DIR)/include \ + infodir=$(STAGING_DIR)/info \ + mandir=$(STAGING_DIR)/man \ + -C $(MPFR_TARGET_DIR) install; + $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libmpfr.{so*,a} + +$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/lib/libmpfr.a: $(STAGING_DIR)/lib/$(MPFR_BINARY) + cp -dpf $(STAGING_DIR)/lib/libmpfr.so* $(STAGING_DIR)/lib/libmpfr.a \ + $(TARGET_DIR)/lib/ +ifeq ($(BR2_PACKAGE_LIBMPFR_HEADERS),y) + cp -dpf $(STAGING_DIR)/include/mpfr.h $(STAGING_DIR)/include/mpf2mpfr.h \ + $(TARGET_DIR)/usr/include/ +endif + +libmpfr: uclibc $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) +stage-libmpfr: uclibc $(STAGING_DIR)/lib/$(MPFR_BINARY) + +libmpfr-clean: + rm -f $(TARGET_DIR)/lib/$(MPFR_BINARY) $(TARGET_DIR)/lib/libmpfr.so* \ + $(TARGET_DIR)/usr/include/mpfr.h \ + $(TARGET_DIR)/usr/include/mpf2mpfr.h + -$(MAKE) -C $(MPFR_TARGET_DIR) clean + +libmpfr-dirclean: + rm -rf $(MPFR_TARGET_DIR) + +MPFR_DIR2:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)-host +MPFR_HOST_DIR:=$(TOOL_BUILD_DIR)/mpfr +$(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_BINARY) + mkdir -p $(MPFR_DIR2) + (cd $(MPFR_DIR2); \ + CC="$(HOSTCC)" CC_FOR_BUILD="$(HOSTCC)" \ + CXX="$(HOSTCXX)" \ + $(MPFR_DIR)/configure \ + --prefix="$(MPFR_HOST_DIR)" \ + --build=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --enable-shared \ + --enable-static \ + --with-gmp=$(GMP_HOST_DIR) \ + $(DISABLE_NLS) \ + ); + touch $@ + +$(MPFR_HOST_DIR)/lib/$(MPFR_BINARY): $(MPFR_DIR2)/.configured + $(MAKE) -C $(MPFR_DIR2) install + +host-libmpfr: $(MPFR_HOST_DIR)/lib/$(MPFR_BINARY) +host-libmpfr-clean: + rm -rf $(MPFR_HOST_DIR) + -$(MAKE) -C $(MPFR_DIR2) clean +host-libmpfr-dirclean: + rm -rf $(MPFR_HOST_DIR) $(MPFR_DIR2) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LIBMPFR)),y) +TARGETS+=libmpfr +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-03-08 19:03:56
|
Revision: 732 http://svn.sourceforge.net/astlinux/?rev=732&view=rev Author: krisk84 Date: 2007-03-08 11:03:55 -0800 (Thu, 08 Mar 2007) Log Message: ----------- add gmp for mpfr Modified Paths: -------------- trunk/package/Config.in Added Paths: ----------- trunk/package/gmp/ trunk/package/gmp/Config.in trunk/package/gmp/gmp.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-03-08 19:01:29 UTC (rev 731) +++ trunk/package/Config.in 2007-03-08 19:03:55 UTC (rev 732) @@ -68,6 +68,7 @@ source "package/flite/Config.in" source "package/freetype/Config.in" source "package/gettext/Config.in" +source "package/gmp/Config.in" source "package/gzip/Config.in" source "package/hostap/Config.in" source "package/hotplug/Config.in" Added: trunk/package/gmp/Config.in =================================================================== --- trunk/package/gmp/Config.in (rev 0) +++ trunk/package/gmp/Config.in 2007-03-08 19:03:55 UTC (rev 732) @@ -0,0 +1,16 @@ +config BR2_PACKAGE_LIBGMP + bool "gmp" + default n + help + GNU Multiple Precision Arithmetic Library. + + http://www.swox.com/gmp/ + + +config BR2_PACKAGE_LIBGMP_HEADERS + bool "gmp headers for target" + default n + depends on BR2_PACKAGE_LIBGMP + help + Install the gmp.h for the target. + Added: trunk/package/gmp/gmp.mk =================================================================== --- trunk/package/gmp/gmp.mk (rev 0) +++ trunk/package/gmp/gmp.mk 2007-03-08 19:03:55 UTC (rev 732) @@ -0,0 +1,134 @@ +############################################################# +# +# gmp +# +############################################################# +GMP_VERSION:=4.2.1 +GMP_SOURCE:=gmp-$(GMP_VERSION).tar.bz2 +GMP_SITE:=http://ftp.sunet.se/pub/gnu/gmp/ +GMP_CAT:=bzcat +GMP_DIR:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION) +GMP_TARGET_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION) +GMP_BINARY:=libgmp.so +GMP_LIBVERSION:=3.4.1 + +ifeq ($(BR2_ENDIAN),"BIG") +GMP_BE:=yes +else +GMP_BE:=no +endif + +$(DL_DIR)/$(GMP_SOURCE): + $(WGET) -P $(DL_DIR) $(GMP_SITE)/$(GMP_SOURCE) + +libgmp-source: $(DL_DIR)/$(GMP_SOURCE) + +$(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE) + $(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch + $(CONFIG_UPDATE) $(GMP_DIR) + touch $@ + +$(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked + mkdir -p $(GMP_TARGET_DIR) + (cd $(GMP_TARGET_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ac_cv_c_bigendian=$(GMP_BE) \ + $(GMP_DIR)/configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libdir=/lib \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --includedir=/include \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --enable-shared \ + $(DISABLE_NLS) \ + ); + touch $@ + +$(GMP_TARGET_DIR)/.libs/$(GMP_BINARY): $(GMP_TARGET_DIR)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(GMP_TARGET_DIR) + +$(STAGING_DIR)/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY) + $(MAKE) prefix=$(STAGING_DIR) \ + exec_prefix=$(STAGING_DIR) \ + bindir=$(STAGING_DIR)/bin \ + sbindir=$(STAGING_DIR)/sbin \ + libexecdir=$(STAGING_DIR)/bin \ + datadir=$(STAGING_DIR)/share \ + sysconfdir=$(STAGING_DIR)/etc \ + sharedstatedir=$(STAGING_DIR)/com \ + localstatedir=$(STAGING_DIR)/var \ + libdir=$(STAGING_DIR)/lib \ + includedir=$(STAGING_DIR)/include \ + oldincludedir=$(STAGING_DIR)/include \ + infodir=$(STAGING_DIR)/info \ + mandir=$(STAGING_DIR)/man \ + -C $(GMP_TARGET_DIR) install + $(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libgmp.{so*,a} + +$(TARGET_DIR)/lib/libgmp.so $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/lib/libgmp.a: $(STAGING_DIR)/lib/$(GMP_BINARY) + cp -dpf $(STAGING_DIR)/lib/libgmp.so* $(STAGING_DIR)/lib/libgmp.a \ + $(TARGET_DIR)/lib/ +ifeq ($(BR2_PACKAGE_LIBGMP_HEADERS),y) + test -d $(TARGET_DIR)/usr/include || mkdir -p $(TARGET_DIR)/usr/include + cp -dpf $(STAGING_DIR)/include/gmp.h $(TARGET_DIR)/usr/include/ +endif + +libgmp: uclibc $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) +stage-libgmp: uclibc $(STAGING_DIR)/lib/$(GMP_BINARY) + +libgmp-clean: + rm -f $(TARGET_DIR)/lib/$(GMP_BINARY) $(TARGET_DIR)/lib/libgmp.so* \ + $(TARGET_DIR)/usr/include/gmp.h + -$(MAKE) -C $(GMP_TARGET_DIR) clean + +libgmp-dirclean: + rm -rf $(GMP_TARGET_DIR) $(GMP_DIR) + +GMP_DIR2:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)-host +GMP_HOST_DIR:=$(TOOL_BUILD_DIR)/gmp +$(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked + mkdir -p $(GMP_DIR2) + (cd $(GMP_DIR2); \ + CC_FOR_BUILD="$(HOSTCC)" \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + $(GMP_DIR)/configure \ + --prefix="$(GMP_HOST_DIR)" \ + --build=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --enable-shared \ + --enable-static \ + $(DISABLE_NLS) \ + ); + touch $@ + +$(GMP_HOST_DIR)/lib/$(GMP_BINARY): $(GMP_DIR2)/.configured + $(MAKE) -C $(GMP_DIR2) install + +host-libgmp: $(GMP_HOST_DIR)/lib/$(GMP_BINARY) +host-libgmp-clean: + rm -rf $(GMP_HOST_DIR) + -$(MAKE) -C $(GMP_DIR2) clean +host-libgmp-dirclean: + rm -rf $(GMP_HOST_DIR) $(GMP_DIR2) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_LIBGMP)),y) +TARGETS+=libgmp +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-04-02 15:39:47
|
Revision: 819 http://svn.sourceforge.net/astlinux/?rev=819&view=rev Author: krisk84 Date: 2007-04-02 08:39:42 -0700 (Mon, 02 Apr 2007) Log Message: ----------- move rhino out of zaptel and into standalone package Modified Paths: -------------- trunk/package/Config.in trunk/package/zaptel/Config.in trunk/package/zaptel/zaptel.mk Added Paths: ----------- trunk/package/rhino/ trunk/package/rhino/Config.in trunk/package/rhino/rhino.mk Modified: trunk/package/Config.in =================================================================== --- trunk/package/Config.in 2007-04-01 20:02:46 UTC (rev 818) +++ trunk/package/Config.in 2007-04-02 15:39:42 UTC (rev 819) @@ -156,6 +156,7 @@ source "package/raidtools/Config.in" source "package/readline/Config.in" source "package/resconv/Config.in" +source "package/rhino/Config.in" source "package/rp-pppoe/Config.in" source "package/rsync/Config.in" source "package/ruby/Config.in" Added: trunk/package/rhino/Config.in =================================================================== --- trunk/package/rhino/Config.in (rev 0) +++ trunk/package/rhino/Config.in 2007-04-02 15:39:42 UTC (rev 819) @@ -0,0 +1,9 @@ +config BR2_PACKAGE_RHINO + bool "rhino" + default n + depends on BR2_PACKAGE_ZAPTEL + help + Rhino - Support for Rhino analog and digital PCI cards + + http://www.rhinoequipment.com + Added: trunk/package/rhino/rhino.mk =================================================================== --- trunk/package/rhino/rhino.mk (rev 0) +++ trunk/package/rhino/rhino.mk 2007-04-02 15:39:42 UTC (rev 819) @@ -0,0 +1,56 @@ +############################################################# +# +# rhino +# +############################################################# +RHINO_VER:=0.0.2b2 +RHINO_SOURCE:=rhino-$(RHINO_VER).tbz2 +RHINO_SITE:= ftp://ftp.rhinoequipment.com/.beta/ +RHINO_DIR:=$(BUILD_DIR)/rhino-$(RHINO_VER) +RHINO_CAT:=bzcat +RHINO_TARGET_BINARY := lib/modules/$(LINUX_VERS)/misc/r1t1.ko +RHINO_MODULES := r1t1 r4fxo rxt1 rcbfx + +$(DL_DIR)/$(RHINO_SOURCE): + $(WGET) -P $(DL_DIR) $(RHINO_SITE)/$(RHINO_SOURCE) + +$(RHINO_DIR)/.unpacked: $(DL_DIR)/$(RHINO_SOURCE) + $(RHINO_CAT) $(DL_DIR)/$(RHINO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(RHINO_DIR)/.unpacked + +$(RHINO_DIR)/.configured: $(RHINO_DIR)/.unpacked +#None, but you never know when it will come in handy + toolchain/patch-kernel.sh $(RHINO_DIR) package/rhino/ rhino\*.patch + touch $(RHINO_DIR)/.configured + +$(RHINO_DIR)/.built: $(RHINO_DIR)/.configured + $(MAKE1) KVER=$(LINUX_VERSION) KDIR=$(LINUX_DIR) KINSTDIR=lib/modules/$(LINUX_VERSION)/kernel \ + ZAPDIR=$(ZAPTEL_DIR) PWD=$(RHINO_DIR) $(TARGET_CONFIGURE_OPTS) INSTALLPREFIX=$(TARGET_DIR) \ + KSRC=$(LINUX_DIR) MODULES=$(RHINO_MODULES) HOTPLUG_FIRMWARE=no \ + KMOD=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) ARCH=$(ZAPTEL_TARGET_ARCH) -C $(RHINO_DIR) + touch $(RHINO_DIR)/.built + +$(TARGET_DIR)/$(RHINO_TARGET_BINARY): $(RHINO_DIR)/.built + $(MAKE1) KVER=$(LINUX_VERSION) KDIR=$(LINUX_DIR) KINSTDIR=lib/modules/$(LINUX_VERSION)/kernel \ + ZAPDIR=$(ZAPTEL_DIR) PWD=$(RHINO_DIR) $(TARGET_CONFIGURE_OPTS) INSTALLPREFIX=$(TARGET_DIR) \ + KSRC=$(LINUX_DIR) MODULES=$(RHINO_MODULES) HOTPLUG_FIRMWARE=no \ + KMOD=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) -C $(RHINO_DIR) ARCH=$(ZAPTEL_TARGET_ARCH) install + $(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERS) + +rhino: uclibc linux zaptel flex $(TARGET_DIR)/$(RHINO_TARGET_BINARY) + +rhino-clean: + -$(MAKE1) -C $(RHINO_DIR) INSTALLPREFIX=$(TARGET_DIR) clean + -rm $(RHINO_DIR)/.built + +rhino-dirclean: + -rm -rf $(RHINO_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_RHINO)),y) +TARGETS+=rhino +endif Modified: trunk/package/zaptel/Config.in =================================================================== --- trunk/package/zaptel/Config.in 2007-04-01 20:02:46 UTC (rev 818) +++ trunk/package/zaptel/Config.in 2007-04-02 15:39:42 UTC (rev 819) @@ -8,12 +8,3 @@ for use with Asterisk: http://www.asterisk.org - -config BR2_PACKAGE_ZAPTEL_RHINO - bool "Rhino PCI Card Support" - default n - depends on BR2_PACKAGE_ZAPTEL - help - Rhino - Linux drivers for Rhino OST PCI cards - - http://www.rhinoequipment.com Modified: trunk/package/zaptel/zaptel.mk =================================================================== --- trunk/package/zaptel/zaptel.mk 2007-04-01 20:02:46 UTC (rev 818) +++ trunk/package/zaptel/zaptel.mk 2007-04-02 15:39:42 UTC (rev 819) @@ -9,11 +9,6 @@ ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION) ZAPTEL_BINARY := ztcfg ZAPTEL_TARGET_BINARY := sbin/ztcfg -RHINO_SITE := ftp://ftp.rhinoequipment.com/.dist -RHINO_VER=1.0 -RHINO_ZVER=1.2.7 -RHINO_PKG := rhino-$(RHINO_VER)_$(RHINO_ZVER).tar.gz -RHINO_DIR=$(BUILD_DIR)/rhino-$(RHINO_VER)_$(RHINO_ZVER) LINUX_VER=$(LINUX_VERSION) @@ -37,9 +32,6 @@ $(DL_DIR)/$(ZAPTEL_SOURCE): $(WGET) -P $(DL_DIR) $(ZAPTEL_SITE)/$(ZAPTEL_SOURCE) -ifeq ($(BR2_PACKAGE_ZAPTEL_RHINO),y) - $(WGET) -P $(DL_DIR) $(RHINO_SITE)/$(RHINO_PKG) -endif $(ZAPTEL_DIR)/.source: $(DL_DIR)/$(ZAPTEL_SOURCE) zcat $(DL_DIR)/$(ZAPTEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - @@ -48,11 +40,6 @@ toolchain/patch-kernel.sh $(ZAPTEL_DIR) package/zaptel/ rt\*.patch endif toolchain/patch-kernel.sh $(ZAPTEL_DIR) package/zaptel/ zaptel\*.patch -ifeq ($(BR2_PACKAGE_ZAPTEL_RHINO),y) - zcat $(DL_DIR)/$(RHINO_PKG) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(ZAPTEL_DIR) $(RHINO_DIR)/ rhino-\*.patch - cp $(RHINO_DIR)/* $(ZAPTEL_DIR)/ -endif touch $(ZAPTEL_DIR)/.source $(ZAPTEL_DIR)/.configured: $(ZAPTEL_DIR)/.source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kr...@us...> - 2007-04-18 21:15:13
|
Revision: 868 http://svn.sourceforge.net/astlinux/?rev=868&view=rev Author: krisk84 Date: 2007-04-18 14:15:15 -0700 (Wed, 18 Apr 2007) Log Message: ----------- merge compile fixes from s2s branch Modified Paths: -------------- trunk/package/asterisk/asterisk.mk trunk/package/minihttpd/minihttpd.mk Modified: trunk/package/asterisk/asterisk.mk =================================================================== --- trunk/package/asterisk/asterisk.mk 2007-04-18 21:14:12 UTC (rev 867) +++ trunk/package/asterisk/asterisk.mk 2007-04-18 21:15:15 UTC (rev 868) @@ -112,8 +112,8 @@ -rm $(TARGET_DIR)/stat/var/lib/asterisk/mohmp3/* ifneq ($(wildcard package/asterisk/config/extensions.conf),) mkdir -p $(TARGET_DIR)/stat/etc/asterisk - cp -a package/asterisk/config/* $(TARGET_DIR)/stat/etc/asterisk - else + rsync -a --exclude=".svn" package/asterisk/config/* $(TARGET_DIR)/stat/etc/asterisk +else mv $(TARGET_DIR)/etc/asterisk $(TARGET_DIR)/stat/etc/ endif $(INSTALL) -D -m 0755 package/asterisk/logger.conf $(TARGET_DIR)/stat/etc/asterisk/logger.conf @@ -145,6 +145,9 @@ rm -f $(TARGET_DIR)/etc/init.d/asterisk rm -f $(TARGET_DIR)/usr/sbin/stereorize rm -f $(TARGET_DIR)/usr/sbin/streamplayer + rm -Rf $(TARGET_DIR)/stat/var/lib/asterisk + rm -Rf $(TARGET_DIR)/stat/var/spool/asterisk + rm -Rf $(TARGET_DIR)/stat/etc/asterisk -$(MAKE) -C $(ASTERISK_DIR) clean -rm $(BUILD_DIR)/asterisk Modified: trunk/package/minihttpd/minihttpd.mk =================================================================== --- trunk/package/minihttpd/minihttpd.mk 2007-04-18 21:14:12 UTC (rev 867) +++ trunk/package/minihttpd/minihttpd.mk 2007-04-18 21:15:15 UTC (rev 868) @@ -33,7 +33,7 @@ $(INSTALL) -D $(MINIHTTPD_DIR)/$(MINIHTTPD_BINARY) $(TARGET_DIR)/usr/$(MINIHTTPD_TARGET_BINARY) $(INSTALL) -D $(MINIHTTPD_DIR)/htpasswd $(TARGET_DIR)/usr/bin/htpasswd mkdir -p $(TARGET_DIR)/stat/var - cp -a package/minihttpd/www $(TARGET_DIR)/stat/var/ + rsync -a --exclude=".svn" package/minihttpd/www $(TARGET_DIR)/stat/var/ $(INSTALL) -D -m 0755 package/minihttpd/mini_httpd.init $(TARGET_DIR)/etc/init.d/mini_httpd ln -sf /tmp/etc/mini_httpd.conf $(TARGET_DIR)/etc/mini_httpd.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |