Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2011-10-17 02:40:55
|
Revision: 5198
http://astlinux.svn.sourceforge.net/astlinux/?rev=5198&view=rev
Author: abelbeck
Date: 2011-10-17 02:40:49 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
ngrep added
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/ngrep/
branches/1.0/package/ngrep/Config.in
branches/1.0/package/ngrep/ngrep.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-10-17 02:18:44 UTC (rev 5197)
+++ branches/1.0/astlinux.config 2011-10-17 02:40:49 UTC (rev 5198)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5185-dirty Configuration
-# Sun Oct 16 08:55:47 2011
+# Buildroot 2011.08-svn5194-dirty Configuration
+# Sun Oct 16 21:38:07 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -678,6 +678,7 @@
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
+BR2_PACKAGE_NGREP=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-10-17 02:18:44 UTC (rev 5197)
+++ branches/1.0/astlinux18.config 2011-10-17 02:40:49 UTC (rev 5198)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5185-dirty Configuration
-# Sun Oct 16 08:55:53 2011
+# Buildroot 2011.08-svn5194-dirty Configuration
+# Sun Oct 16 21:38:11 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -673,6 +673,7 @@
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
+BR2_PACKAGE_NGREP=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-10-17 02:18:44 UTC (rev 5197)
+++ branches/1.0/initrd.config 2011-10-17 02:40:49 UTC (rev 5198)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5185-dirty Configuration
-# Sun Oct 16 08:55:59 2011
+# Buildroot 2011.08-svn5194-dirty Configuration
+# Sun Oct 16 21:38:15 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -577,6 +577,7 @@
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
+# BR2_PACKAGE_NGREP is not set
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-10-17 02:18:44 UTC (rev 5197)
+++ branches/1.0/package/Config.in 2011-10-17 02:40:49 UTC (rev 5198)
@@ -463,6 +463,7 @@
source "package/netstat-nat/Config.in"
source "package/nfs-utils/Config.in"
source "package/ngircd/Config.in"
+source "package/ngrep/Config.in"
source "package/ntp/Config.in"
source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
Added: branches/1.0/package/ngrep/Config.in
===================================================================
--- branches/1.0/package/ngrep/Config.in (rev 0)
+++ branches/1.0/package/ngrep/Config.in 2011-10-17 02:40:49 UTC (rev 5198)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_NGREP
+ bool "ngrep"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ help
+ Apply GNU grep features to the network layer
+
+ http://ngrep.sourceforge.net/
Added: branches/1.0/package/ngrep/ngrep.mk
===================================================================
--- branches/1.0/package/ngrep/ngrep.mk (rev 0)
+++ branches/1.0/package/ngrep/ngrep.mk 2011-10-17 02:40:49 UTC (rev 5198)
@@ -0,0 +1,28 @@
+#############################################################
+#
+# ngrep
+#
+#############################################################
+
+NGREP_VERSION = 1.45
+NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
+NGREP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ngrep
+NGREP_DEPENDENCIES = libpcap
+
+NGREP_UNINSTALL_STAGING_OPT = --version
+
+NGREP_CONF_OPT += \
+ --with-pcap-includes=$(LIBPCAP_DIR) \
+ --enable-ipv6
+
+NGREP_MAKE_OPT = CC='$(TARGET_CC)' MAKEFLAGS="" -C $(@D)
+
+define NGREP_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/ngrep $(TARGET_DIR)/usr/sbin/ngrep
+endef
+
+define NGREP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/ngrep
+endef
+
+$(eval $(call AUTOTARGETS,package,ngrep))
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-10-17 02:18:44 UTC (rev 5197)
+++ branches/1.0/runnix.config 2011-10-17 02:40:49 UTC (rev 5198)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5185-dirty Configuration
-# Sun Oct 16 08:55:59 2011
+# Buildroot 2011.08-svn5194-dirty Configuration
+# Sun Oct 16 21:38:13 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -607,6 +607,7 @@
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
+# BR2_PACKAGE_NGREP is not set
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-17 04:36:22
|
Revision: 5200
http://astlinux.svn.sourceforge.net/astlinux/?rev=5200&view=rev
Author: abelbeck
Date: 2011-10-17 04:36:15 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
sudo, enable in default config
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-10-17 04:31:13 UTC (rev 5199)
+++ branches/1.0/astlinux.config 2011-10-17 04:36:15 UTC (rev 5200)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5194-dirty Configuration
-# Sun Oct 16 21:38:07 2011
+# Buildroot 2011.08-svn5199 Configuration
+# Sun Oct 16 23:32:50 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -744,7 +744,7 @@
# BR2_PACKAGE_LOCKFILE_PROGS is not set
# BR2_PACKAGE_LOGROTATE is not set
BR2_PACKAGE_SCREEN=y
-# BR2_PACKAGE_SUDO is not set
+BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_WHICH is not set
# BR2_PACKAGE_XMLSTARLET is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-10-17 04:31:13 UTC (rev 5199)
+++ branches/1.0/astlinux18.config 2011-10-17 04:36:15 UTC (rev 5200)
@@ -739,7 +739,7 @@
# BR2_PACKAGE_LOCKFILE_PROGS is not set
# BR2_PACKAGE_LOGROTATE is not set
BR2_PACKAGE_SCREEN=y
-# BR2_PACKAGE_SUDO is not set
+BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_WHICH is not set
# BR2_PACKAGE_XMLSTARLET is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-17 20:49:31
|
Revision: 5210
http://astlinux.svn.sourceforge.net/astlinux/?rev=5210&view=rev
Author: abelbeck
Date: 2011-10-17 20:49:25 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
update copyright.txt
Added Paths:
-----------
branches/1.0/docs/
branches/1.0/docs/copyright.txt
Added: branches/1.0/docs/copyright.txt
===================================================================
--- branches/1.0/docs/copyright.txt (rev 0)
+++ branches/1.0/docs/copyright.txt 2011-10-17 20:49:25 UTC (rev 5210)
@@ -0,0 +1,45 @@
+AstLinux is Copyright © 2004-2012 by Kristian Kielhofner.
+
+This program 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, version 3 of the 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.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+========================================================================
+
+The code and graphics on this website (and it's mirror sites, if any) are
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2011 The Buildroot
+developers. All rights reserved.
+
+Documents on this Web site including their graphical elements, design, and
+layout are protected by trade dress and other laws and MAY BE COPIED OR
+IMITATED IN WHOLE OR IN PART. THIS WEBSITE IS LICENSED FREE OF CHARGE, THERE
+IS NO WARRANTY FOR THE WEBSITE TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+SHOULD THIS WEBSITE PROVE DEFECTIVE, YOU MAY ASSUME THAT SOMEONE MIGHT GET
+AROUND TO SERVICING, REPAIRING OR CORRECTING IT SOMETIME WHEN THEY HAVE NOTHING
+BETTER TO DO. REGARDLESS, YOU GET TO KEEP BOTH PIECES.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
+COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THIS
+WEBSITE AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THIS WEBSITE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR
+LOSS OF HAIR, LOSS OF LIFE, LOSS OF MEMORY, LOSS OF YOUR CARKEYS, MISPLACEMENT
+OF YOUR PAYCHECK, OR COMMANDER DATA BEING RENDERED UNABLE TO ASSIST THE
+STARFLEET OFFICERS ABORD THE STARSHIP ENTERPRISE TO RECALIBRATE THE MAIN
+DEFLECTOR ARRAY, LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+WEBSITE TO OPERATE WITH YOUR WEBBROWSER), EVEN IF SUCH HOLDER OR OTHER PARTY
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You have been warned.
+
+You can contact the webmaster at <bui...@uc...> if you have some sort
+of problem with this.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-17 21:48:17
|
Revision: 5212
http://astlinux.svn.sourceforge.net/astlinux/?rev=5212&view=rev
Author: abelbeck
Date: 2011-10-17 21:48:08 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
more documentation cleanup
Added Paths:
-----------
branches/1.0/docs/BUILDROOT-CHANGES
branches/1.0/docs/BUILDROOT-COPYING
Removed Paths:
-------------
branches/1.0/CHANGES
branches/1.0/COPYING
Deleted: branches/1.0/CHANGES
===================================================================
--- branches/1.0/CHANGES 2011-10-17 21:28:50 UTC (rev 5211)
+++ branches/1.0/CHANGES 2011-10-17 21:48:08 UTC (rev 5212)
@@ -1,1170 +0,0 @@
-2011.08, Released August 31th, 2011:
-
- Fixes all over the tree.
-
- Toolchain: Fix codesourcery 2009q3 ARM download, Linux 3.0.4
- kernel headers.
-
- Updated/fixed packages: ipset, python
-
-2011.08-rc2, Released August 29th, 2011:
-
- Fixes all over the tree.
-
- Toolchain: crosstool-NG 1.12.1, use binutils 2.21 on
- mips/sh/older uClibc, disallow uClibc 0.9.32 on avr32/sh
- (broken).
-
- Defconfigs: kernel updates, fix mini2440 serial port config,
- remove old arm toolchain configs.
-
- Bootloaders: Fix grub patching, add barebox-{n,x,menuconfig}
- targets similar to linux/busybox.
-
- Updated/fixed packages: barebox, directfb, libsoup,
- libxml-parser-perl, mtd, ncurses, python, ti-utils, udev,
- usbmount, util-linux, xfont_font-misc-misc
-
- Issues resolved (http://bugs.uclibc.org):
-
- #3685: ncurses installation hangs due to old version of tic
- #4093: Grub fails to install bz2 patch after conversion to...
-
-2011.08-rc1, Released August 4th, 2011:
-
- Fixes all over the tree and new features.
-
- Toolchain: uClibc 0.9.32 / NPTL support, 0.9.29 removed,
- ext-toolchain-wrapper improvements, improved non-MMU
- support. GCC 4.3.6 / 4.6.1.
-
- GENTARGETS infrastructure extended to cover bootloaders and
- Linux kernel as well. Options to retrive Linux/U-Boot from a
- custom git repo instead of upstream tarballs.
- Support for Linux 3.x and release candidate tarballs.
- X-Loader bootloader for omap added.
-
- Make source/external-deps now also works for external
- toolchains / crosstool-ng backend.
-
- Updated/fixed packages: autoconf, berkeleydb, bind, binutils,
- bmon, bridge-utils, busybox, cmake, dbus, dbus-glib,
- e2fsprogs, ethtool, ffmpeg, gst-plugins-{bad,base,good,ugly},
- gvfs, hostapd, iproute2, iptables, iw, jpeg, lame, libarchive,
- libdnet, libdrm, libgcrypt, libgtk2, libmpeg2, libpng,
- libsoup, lighttpd, linux-fusion, lzo, midori, mtd-utils,
- nfs-utils, openvpn, oprofile, orc, pkg-config, proftpd, qt,
- ruby, samba, sdl, shared-mime-info, sudo, sqlite, squid,
- synergy, udev, usbmount, usbutils, util-linux, valgrind,
- webkit, xorg-xserver, xz, zlib
-
- New packages: acl, attr, ebtables, gnutls, inotify-tools,
- ipset, libargtable2, libiqrf, libmnl, libnspr, libnss,
- libroxml, libyaml, live555, mxml, orc, rsyslog, sredird,
- statserial, stunnel, ti-utils, uboot-tools, yajl
-
- Deprecated packages: liboil, swfdec
-
- Removed packages: hal
-
- Issues resolved (http://bugs.uclibc.org):
-
- #3559: libnspr: Add new package
- #3595: patch to add libroxml
- #3565: libnss: Add new package
- #3583: xfonts_font-adobe-100dpi fails due to missing map file
- #3649: [PATCH] Add mapdir to existing pkg-config patch
- #3907: 2011.05 - Qt 4.7.3 not building on ARM
- #3961: Nfs-utils: Remove SUSv3-function index
- #3985: "help" target's defconfig list needs sort
- #3997: bump libroxml to v2.1.0
-
-2011.05, Released May 27th, 2011:
-
- Updated/fixed packages: makedevs
-
-2011.05-rc2, Released May 24th, 2011:
-
- Fixes all over the tree.
-
- Toolchain: Code sourcery ARM 2009q1 download URL fixed /
- 2009q3 external toolchains added. Crosstool-NG bumped to
- 1.11.3, eglic/glibc configuration fixes. Linux kernel 2.6.38.x
- bumped to 2.6.38.7.
-
- Updated/fixed packages: bind, fakeroot, kbd, psmisc, qt
-
-2011.05-rc1, Released May 18th, 2011:
-
- Fixes all over the tree and new features.
-
- External toolchain improvements: We now build a binary
- toolchain wrapper and install it into HOST_DIR/usr/bin, which
- enforces the correct compiler arguments, making an external
- toolchain as easy to use outside of Buildroot as the internal
- ones are. This also brought a cleanup of CFLAGS, making the
- Buildroot build output easier to read.
-
- Rootfs device handling improvements: Choice between static
- /dev, devtmpfs and devtmpfs with either mdev or udev.
-
- Toolchain: More preconfigured codesourcery external
- toolchains, improved Crosstool-NG support, fix for GCC
- snapshot versions, GCC 4.4.6 / 4.5.3, experimental GCC 4.6.0
- support, target-GCC fixes, uClibc fixes, 0.9.32-rc3 support.
-
- Bootloaders: U-boot 2011.03, Barebox 2011.05.0
-
- Linux: support for custom kernel image targets, E.G. for
- powerpc builds with embedded device trees.
-
- Misc fixes for qemu defconfigs, ensuring correct serial
- terminal setup out of the box.
-
- Misc gentarget / autotools handling fixes.
-
- Updated/fixed packages: alsa-lib, alsa-utils, alsamixergui,
- atk, avahi, bind, bison, busybox, copas, dbus-glib, dhcp,
- dhcpdump, dnsmasq, dropbear, ethtool, fakeroot, ffmpeg, file,
- gamin, gnuconfig, gst-ffmpeg, gst-plugins-good, gtk2-engines,
- haserl, hostapd, icu, imagemagick, iproute2, iw, kismet, less,
- libcap, libdnet, libglade, libglib2, libgtk2, libnl, libpng,
- libxml2, libxml2, libxslt, lighttpd, lockfile-progs, makedevs,
- midori, mpg123, mpc, mpd, mpfr, mplayer, mtd-utils, ncurses,
- netsnmp, openssh, openssl, openvpn, pango, pkg-config, popt,
- procps, proftpd, qt, quagga, readline, rsync, samba, sdl,
- socat, squashfs, squid, sudo, tslib, udev, usbutils, webkit,
- wpa_supplicant, xerces, xfont_font-misc-misc, xlib_libX11,
- xlib_libXfont, xlib_xtrans, xorg-server, xterm, xz
-
- New packages: bonnie++, can-utils, gdisk, htop,
- input-event-daemon, libexif, libraw, libv4l, ngircd
-
- Removed packages: festival
-
- Issues resolved (http://bugs.uclibc.org):
-
- #2131: Add OpenMP support to the toolchain
- #3379: New Package: bonnie++
- #3445: Not working openssl-10.0.0d on 386sx
- #3451: fakeroot package: wrong FAKEROOT_SITE variable
- #3457: alsamixergui: broken URL
- #3475: Calling sync on large filesystems when not always necessary
- #3511: make busybox-menuconfig does not download busybox package
- #3541: Quotes in the top Makefile:217 break buildroot/kernel config...
- #3571: u-boot: fw_printenv does not build
- #3643: popt source url is not responding
- #3733: dropbear: make zlib optional
- #3757: Buildroot can't build mplayer with libmad
-
-2011.02, Released February 28th, 2011:
-
- Fixes all over the tree.
-
- Updated/fixed packages: alsamixergui, avahi, ffmpeg, icu, mpd,
- nuttcp, qt, slang, squashfs, sylpheed, synergy, xerces
-
- Deprecated packages: devmem2, webif
-
- Issues resolved (http://bugs.uclibc.org):
-
- #2911: Qt: Disable qt3support-option, if gui-module isn't selected
- #3259: Unable to build webkit (on arm)
- #3295: slang fails to build on mipsel
- #3325: ffmpeg fails to build
-
-2011.02-rc2, Released February 24th, 2011:
-
- Fixes all over the tree.
-
- Festival packages marked as broken. Unless someone steps up
- to support them, they will be removed during the 2011.05
- development cycle.
-
- Updated/fixed packages: atk, avahi, bind, cairo, dbus,
- enchant, fakeroot, gmpc, gpsd, gvfs, iperf, jpeg, libarchive,
- libcgicc, libdaemon, libdrm, libevent, libgail, libglib2,
- libgpg-error, libmicrohttpd, librsvg, libsoup, libxcp,
- makedevs, matchbox-fakekey, matchbox-startup-monitor, mdadm,
- metacity, mpd, nasm, nfs-utils, olsr, openssl, popt,
- pthread-stubs, quagga, rpm, samba, sdl, sdl_gfx, sdl_image,
- sdl_mixer, sdl_sound, sdl_ttf, squashfs, synergy, taglib,
- tcpreplay, tiff, wpa_supplicant, xcb-util,
- xdriver_xf86-input-{acepad,aiptek,evdev,joystick,keyboard},
- xdriver_xf86-input-{mouse,synaptics,void},
- xdriver_xf86-video-{chips,dummy,geode,glide,intel,nv,wsfb},
- xlib_lib{ICE,SM,XScrnSaver,Xau,Xcursor,Xdmcp,Xi,Xinerama},
- xlib_lib{Xrandr,Xt,Xtst,Xxf86dga,Xxf86vm,dmx,fontenc,pciaccess},
- xserver_xorg-server, xz
-
- Removed packages: ace_of_penguins, vlc
-
- Issues resolved (http://bugs.uclibc.org):
-
- #3205: Failing chmod when running "make" in buildroot (openssl)...
- #3277: quagga fails to build with SNMP support
- #3283: See why nfs-utils needs fakeroot, and convert to autotools
- #3307: synergy fails to build due to missing XTest library
-
-2011.02-rc1, Released February 14th, 2011:
-
- Fixes all over the tree and new features.
-
- External toolchain improvements: clarification of the options,
- and introduction of the toolchain profile concept, for
- well-known toolchains. Buildroot is now capable of
- automatically downloading and extracting well-known toolchains
- (for the moment, CodeSourcery ARM, PowerPC, MIPS and SuperH
- toolchains are supported). Crosstool-NG backend updated and
- improved.
-
- Complete rework of how hardware boards are supported.
- Each board now only has a single defconfig file, and all
- board-specific options have been removed. See
- docs/buildroot.html#board_support for details.
-
- Added support for the following boards: Mini2440, Qemu ARM
- Versatile, Qemu MIPSel Malta, Qemu PowerPC G3beige, Qemu SH4
- r2d and Qemu x86. The Qemu boards support allows to easily
- build systems that are known to work under Qemu.
-
- Initial support for Blackfin processors.
-
- Staging directory moved into $(O)/host/usr/<tuple>/sysroot, in
- preparation for support of SDK. For the same reason, the
- toolchain binaries (cross-compiler and other related tools)
- are now installed in $(O)/host/usr/bin/. The cross pkg-config
- now also automatically returns correct values for cross
- compilation, without needing any environment variables to be
- set.
-
- Ccache support reworked. Now used for both host and target
- compilation, and cache is stored in ~/.buildroot-ccache.
-
- Toolchain: uClibc 0.9.32-rc2, several components moved to
- normal AUTOTARGET packages.
-
- Generic cmake infrastructure, similar to the existing
- GENTARGETS/AUTOTARGETS.
-
- Support for bzr downloads, next to the existing git/svn support.
-
- Kconfig infrastructure rebased against 2.6.38-rc3, bringing
- misc fixes. 'xconfig' now uses Qt4 rather than Qt3.
-
- EXT2 file system size handling improved, UBI image support, fs
- configuration options cleanup, U-Boot/Barebox version bumps.
-
- Updated/fixed packages: alsa-utils, at, autoconf, automake,
- bash, binutils, bison, busybox, bzip2, cdrkit, cloop, cmake,
- coreutils, cups, dbus, dbus-python, dhcp, directfb,
- direcfb-examples, dmalloc, dnsmasq, dosfstools, e2fsprogs, ed,
- fbset, ffmpeg, findutils, flac, freetype, gdk-pixbuf, gmp,
- grep, gperf, gst-ffmpeg, gst-plugins-bad, gst-plugins-base,
- gst-plugins-good, gst-plugins-ugly, gstreamer, gvfs, hdparm,
- hostapd, i2c-tools, icu, imagemagick, input-tools, iproute2,
- iptables, iw, jpeg, kexec, libaio, libart, libcap, libconfig,
- libfuse, libglib2, libidn, libmad, libogg, libpcap, libpng,
- libsndfile, libtheora, libtool, libusb-compat, libvorbis,
- libxcb, libxml2, libxslt, links, linux-fusion, lm-sensors,
- lsof, ltp-testsuite, ltrace, lvm2, lzo, m4, makedevs,
- memtester, mesa3d, mii-diag, mpc, mpfr, mpg123, mplayer,
- mrouted, mtd-utils, nano, netperf, netplug, ntfs-3g, ntp,
- openssh, openssl, openvpn, oprofile, pango, patch, pciutils,
- php, pkgconfig, portmap, psmisc, python, qt, rsync, ruby,
- sawman, screen, sdl_gfx, sdl_sound, smartmontools, socat,
- sqlite, squid, sshfs, sstrip, sysklogd, sysstat, sysvinit,
- tar, tcpdump, tslib, udev, usbutils, vim, vtun, webkit, wipe,
- x11vnc, xapp_xlogo, xcb-proto, xfont_font-util,
- xkeyboard-config, xlib_libX11, xz, zlib
-
- New packages: dhrystone, dsp-tools, faad2, fbgrab, gst-dsp,
- gst-omapfb, irda-utils, lame, libao, libcue, libcuefile,
- libffi, libhid, libreplaygain, libsamplerate, libsigc++,
- lsuio, mpd, musepack, python-mad, python-serial, rsh-redone,
- sdparm, tidsp-binaries, vorbis-tools, wavpack, whetstone,
- xl2tp, xmlstarlet
-
- Removed packages: hotplug, l2tp, libfloat, microcom,
- ng-spice-rework
-
- Issues resolved (http://bugs.uclibc.org):
-
- #267: The make target: cross fails because toolchain_build_...
- #415: Berkeley DB: mut_pthread.o: relocation R_X86_64_32 against...
- #561: ltp-testsuite failed to install
- #1447: Installing gfortran on PowerPC
- #1651: Build fail caused by ccache in module-init-tools
- #1681: Cross-compiled binaries shouldn't be installed into staging
- #1723: [PATCH] axel: convert to generic package infrastructure and...
- #1735: [PATCH] mplayer: convert to autotools infrastructure
- #2551: [PATCH] native toolchain in the target filesystem fails
- #2623: buildroot-snapshot-20100922 fails when compiling development...
- #2647: makedevs package lacks support for 16-bit major/minor numbers
- #2371: QT MYSQL Module does not build when MySQL installed on the host
- #2839: compile fails in various packages with a odd message "error:...
- #2887: tar "buffer overflow detected" error
- #2893: Broken "make source" with external toolchain
- #2905: Qt: Speed up compilation, if gui-module isn't selected
- #2929: genext2fs: couldn't allocate a block (no free space)
- #2935: Ntpdate isn't installed
- #2965: Broken linkage to xkbcomp (blocking X server startup)
- #2983: xlib_libX11 build failed
- #3007: kexec doesn't build: Missing regdef.h file
- #3085: Init scripts are not compatible with sysVinit (when busybox...
- #3103: make external-deps wants to download gcc-.tar.bz2 when...
- #3109: abnormal `make busybox-menuconfig`
- #3115: How about board specific makefiles?
- #3169: python patch has typo, aborts build in scenario
- #3181: dhcp.mk copies S80dhcp-server to etc/init.d, not etc/init.d/
-
-2010.11, Released November 30th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: libgcrypt, qt, squid, sysstat, tcpdump,
- xserver-xorg
-
- Issues resolved (http://bugs.uclibc.org):
-
- #2773: squid with openssl support needs openssl on the host
- #2857: OBJDUMP definition is missing from TARGET_CONFIGURE_OPTS
-
-2010.11-rc2, Released November 25th, 2010:
-
- Fixes all over the tree.
-
- Add support for LEON Sparc architecture variants. Fix make
- source/external-deps for host packages.
-
- Updated/fixed packages: bash, bind, busybox, dialog, gpsd,
- libglib2, libcurl, libmad, lrzsz, midori, module-init-tools,
- mtd-utils, openssh, openssl, pciutils, php, qt, sqlite,
- sysstat, webkit, zlib
-
- Issues resolved (http://bugs.uclibc.org):
-
- #759: Sysstat build broken without libintl
- #2479: host-module-init-tools 3.11 fails to build
- #2725: Buildroot overrides kernel config
- #2785: mtd-utils build fails due to missing libmtd
- #2791: Added PHP-Process Control to the PHP-Package
- #2797: pciutils dependencies on zlib not taken into account
- #2809: failed to compile libglib2
- #2821: [PATCH] Patch for JavaScriptCore in QtWebKit module
- #2827: qt-4.7.0-pthread_getattr_np.patch invalid for qt 4.6...
- #2833: Failed to compile webkit without X11
-
-2010.11-rc1, Released November 8th, 2010:
-
- Fixes all over the tree and new features.
-
- Kconfig infrastructure rebased against 2.6.36-rc1, bringing
- misc fixes + nconfig and savedefconfig targets.
-
- Toolchain: ARM cortex A9 support, experimental crosstool-ng
- backend, GCC 4.5.x.
-
- Fs: Squashfs 4.1 with lzo support
-
- Old-style package hooks (*_HOOK_POST_*) removed. Use the more
- generic new-style ones instead.
-
- Download handling reworked and support for git/svn downloads
- added.
-
- Removed experimental shared config.cache support, as it is
- too unreliable.
-
- A convenience Makefile wrapper is created when using
- out-of-tree building, similar to how it is done for the kernel.
-
- Alpha, Cris, IA64 and Sparc64 architecture support removed.
-
- New packages: argp-standalone, gdk-pixbuf, gpsd, gst-ffmpeg,
- libmpeg2, kbd, librsvg, nuttcp, rng-tools, rrdtool, xz
-
- Updated/fixed packages: acpid, alsa-lib, argus, at, autoconf,
- automake, avahi, axel, beecrypt, berkeleydb, bind, bmon, boa,
- bootutils, bridge-utils, bsdiff, busybox, cvs, dbus, directfb,
- dmraid, docker, dosfstools, dropbear, e2fsprogs, ethtool,
- expat, ezxml, fbset, fconfig, ffmpeg, freetype, gadgetfs-test,
- gamin, gawk, genext2fs, gperf, gst-plugins-base,
- gst-plugins-ugly, gtk2-themes, gtkperf, gvfs, haserl, hdparm,
- hostapd, hwdata, ifplugd, imagemagick, iperf, ipsec-tools,
- iproute2, iptables, iw, jpeg, kexec, kismet, less, libcgi,
- libcurl, libdaemon, libdnet, liberation, libevent, libeXosip2,
- libglade, libgtk2, libiconv, libidn, libintl, libmms, libmpd,
- libnl, liboil, libosip2, libpcap, libpng, libtool, libungif,
- libxml2, libxslt, lighttpd, lite, lm-sensors, lockfile-progs,
- logrotate, m4, matchbox, mdadm, mesa3d, metacity, mplayer,
- mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf,
- netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, openssh,
- openssl, openvpn, oprofile, pango, patch, pcre, php,
- pkg-config, portmap, pppd, pptp-linux, prboom, proftpd, radvd,
- rdesktop, readline, rp-pppoe, ruby, qt, quagga, samba, sawman,
- sdl_mixer, sdl_sound, sed, setserial, shared-mime-info, slang,
- speex, sqlite, squashfs, startup-notification, strace,
- sylpheed, sysstat, taglib, tcpdump, thttpd, tiff, tn5250,
- torsmo, tslib, udev, udpcast, usbmount, usbutils, vsftpd,
- vtun, which, wireless-tools, wpa_supplicant, xapp_twm,
- xapp_xbacklight, xapp_xcursorgen, xapp_xinit, xapp_xinput,
- xapp_xmore,
- xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
- xdriver-xf86-input-{mouse,synaptics,vmmouse,void},
- xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},
- xdriver-xf86-video-{geode,glide,glint,i128,i740,intel,mach64},
- xdriver-xf86-video-{mga,neomagic,newport,nv,openchrome,r128},
- xdriver-xf86-video-{rendition,s3,s3virge,savage,siliconmotion},
- xdriver-xf86-video-{sis,sisusb,suncg3,suncg6,suncg14,sunffb},
- xdriver-xf86-video-{sunleo,suntcx,tdfx,tga,trident,v4l,vesa},
- xdriver-xf86-video-{vmware,voodeo,wsfb,xgi,xgixp},
- xkeyboard-config, xlib_libX11, xserver_xorg-server, xstroke,
- xterm, xvkbd, zlib
-
- Deprecated packages: hotplug, lzma, ng-spice-rework, sfdisk
-
- Removed packages: dillo, libglib12, libgtk12, microwin,
- pcmcia
-
- Issues resolved (http://bugs.uclibc.org):
-
- #901: new package: gpsd
- #2389: Generate a Makefile wrapper in $(O)
- #2461: wireless_tools: install shared library if needed
- #2521: Can't compile sdl_mixer, mikmod.h can't be found
- #2533: xserver_xorg-server: Enable glx, if mesa3d is built
- #2563: [PATCH] cairo: Expose the configure option to disable some...
- #2581: libmms: Update to 0.6, and patch to work on architectures...
- #2707: Can't compile linux kernel using buildroot + crosstool-ng
- #2731: Build order
- #2737: buildroot configuration tool crashing when the path exceeds...
- #2767: Build for lsof broken in buildroot-2010.08
-
-2010.08: Released August 31th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: atk, xstroke
-
- Removed packages: lxdoom
-
-2010.08-rc2, Released August 30th, 2010:
-
- Fixes all over the tree.
-
- Mark the combination of uClibc 0.9.31, gcc 4.2.x, C++ and
- locale support as broken. Remove deprecated GCC 4.2.[1-3]
- versions.
-
- Mark CRIS architecture as deprecated, as it is discontinued
- upstream.
-
- Marked shared config.cache as experimental and disabled by
- default as it is known to break with certain package
- combinations.
-
- Toolchain: fixed gcc 4.2.x build after uClibc NPTL support got
- added.
-
- fs: old-style squashfs for big endian archs fixed.
-
- Updated/fixed packages: busybox, gst-plugins-base,
- imagemagick, kismet, libgail, libglib2, libgtk2, lua,
- luafilesystem, lzo, ncurses, netcat, pango, php, pppd,
- proftpd, qt, samba, startup-notification, swfdec, sysvinit,
- util-linux
-
- Removed packages: stunnel
-
- Issues resolved (http://bugs.uclibc.org):
-
- #635: util-linux fails to build in 2009.08
- #2239: netcat package installs its binary to target as avr32-linux...
- #2395: libglib2-2.24.1 and libxml2-2.7.7 fails build on MIPS because...
- #2443: Initramfs: Don't overwrite $(TARGET_DIR)/init if it exists
- #2449: Minor fixes for squashfs makefile and correct PowerPC e500 ...
-
-2010.08-rc1, Released July 30th, 2010:
-
- Fixes all over the tree and new features.
-
- Toolchain: GCC 4.3.5, older 4.3.x versions removed. GCC 4.1.2
- and non-sysroot support removed. Added support for (snapshot)
- NPTL in uClibc, 0.9.28.3 removed,
-
- Bootloaders: Various cleanups, moved to boot/, added Barebox,
- removed yaboot. Support building u-boot from custom tarball,
- u-boot 2010.06.
-
- New GTK-based configurator, usable using 'make gconfig'.
-
- Java packages marked as broken. Unless someone steps up to
- support this, they will be removed during the 2010.11
- development cycle.
-
- Alpha, IA64 and Sparc64 architectures marked as deprecated.
- GTK+ on DirectFB has also been marked as deprecated, as it is
- not supported in recent GTK+ versions, and more and more
- packages depends on the new versions.
- Unless someone steps up to support them, they will be removed
- during the 2010.11 development cycle.
-
- New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny,
- libgail, luafilesystem, luasocket, rings, wsapi, xavante, xterm
-
- Updated/fixed packages: alsa-lib, alsamixergui, at, atk,
- avahi, berkeleydb, bash, blackbox, busybox, bzip2, cairo,
- cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc, dmalloc,
- dnsmasq, dropbear, e2fsprogs, fbv, file, flex, fontconfig,
- gawk, gmpc, gnuchess, gst-plugins-base, gst-plugins-good,
- gstreamer, gzip, icu, intltool, iostat, ipsec-tools, iptables,
- iw, libart, libcgi, libcurl, libdrm, libeXosip, libfuse,
- libglib2, libgpg-error, libiconv, libidn, liblockfile, libpng,
- libsoup, lighttpd, links, linux-fusion, lmbench, lrzsz,
- ltrace, make, midori, module-init-tools, mplayer,
- mysql_client, nbd, ncurses, neon, netcat, netperf, netsnmp,
- ntfsprogs, openssl, oprofile, pango, php, qt, quagga, samba,
- setserial, sdl, sdl_mixer, sdl_sound, sdl_ttf, speech-tools,
- sqlite, squashfs, swfdec, tftpd, thttpd, tn5250, tremor,
- usbutils, webif, webkit, wireless_tools, xerces,
- xkeyboard-config, xserver_xorg-server, xvkbd, zlib
-
- Removed packages: modutils, portage, rxvt
-
- Deprecated packages: dillo, libglib12, libgtk12, microwin, pcmcia
-
- Issues resolved (http://bugs.uclibc.org):
-
- #321: alsa-lib uses host include files for python which breaks ...
- #361: linux kernel configuration choice works incorrectly
- #387: Tremor not installed to toolchain
- #401: new package: ffmpeg
- #475: uImage target for U-boot failed generating
- #543: ATK requires X11 on DirectFB target
- #575: webkit: Buildroot Libtool Patch Fails
- #583: build fails with external x86_64 toolchain
- #729: sstrip creates corrupted headers
- #829: Webkit r44552 needs libXt
- #835: Package Dataflashboot-1.05 does not compile with buildroot...
- #847: Compiling target-gcc v4.4 fails with "libc.so.0: cannot open...
- #859: Add (head of) nptl branch to list of uClibc versions
- #949: compile with debug info
- #955: Grub fails to build with External Toolchain
- #1051: Webkit doesn't compile (Linuxthreads new, x86)
- #1213: Move .config into output directory
- #1225: Buildroot fails to account for "nof" subdirectory (no float...
- #1231: (sparc) Linux kernel fails to build
- #1261: The getline() in output/build/linux-2.6.28/scripts/unifdef.c...
- #1339: Busybox needs -fno-strict-aliasing to compile cleanly
- #1393: neon config fails libxml/parser.h: libxml2 requires, but not ...
- #1405: WebKit fails to build because pthread_getattr_np is not impl...
- #1675: GMP Error during buildroot make process
- #1741: external toolchain linking error
- #1753: lmbench: convert to generic package infrastructure
- #1771: Fakeroot and the target/generic/device_table.txt create bad...
- #1807: LZMA 4.32.7, Required header file(s) are missing
- #1813: xkeyboard-config fails to build because of intltool problem
- #1879: Bump iptables to 1.4.8
- #1885: Add a bunch of lua modules
- #1897: Bump libusb to 1.0.7
- #1903: Bump tn5250 to 0.17.4 and migrate to autotargets
- #1909: netperf-2.4.5 fails to build because of undeclared SOCK_DCCP
- #1927: Bump file to 5.03 and migrate to autotargets
- #1933: Bump gawk to 3.1.8 and migrate to autotargets
- #1945: PHP: add sqlite3 dependency when using external lib
- #1951: Bump openssl to 0.9.8o
- #1957: Bump sqlite to 3.6.23.1
- #1975: Package removal/deprecation
- #1981: zlib: bump to 1.2.5
- #1987: intltool: Fix spelling mistake
- #1993: Bump bash to 4.1.7(1) and migrate to autotargets
- #1999: Typo in path checking
- #2005: Bump dnsmasq to 2.55 and migrate to gentargets
- #2035: ipsec-tools-0.7.2 fails to build with gcc-4.4.x
- #2038: Bump ncurses to 5.7
- #2095: make gconfig: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
- #2101: blackbox depends on locale support
- #2119: Tries to build kernel, although disabled in config
- #2125: libXfont build fail
- #2143: buildroot compiler generates segfaulting statically linked exe..
- #2149: xterm build failure
- #2155: Compression lzo don't set for ubifs
- #2161: [SECURITY] Update libpng to 1.2.44
- #2167: Bump busybox to 1.17.0, convert to gentargets, drop 1.12, ...
- #2181: pixman can't apply pixman-0.10.0-no-tests.patch
- #2191: linux-fusion build fail
- #2221: Qt does not compile (dependencies not taken into account?)
- #2233: Atmel atstk target skeletons have /etc/mtab as a file, not ...
- #2245: Netcat does not work due to incorrect assumptions about signed..
- #2251: directory output/build after make *_defconfig not found
- #2257: Convert netsnmp package to autotargets
- #2263: Bump samba to 3.3.13
- #2269: setserial causes make error
-
-2010.05, Released May 30th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: coreutils, hal, libcap,
- lockfile-progs, ncftp, xserver_xorg-server
-
- Issues resolved (http://bugs.uclibc.org):
-
- #1789: binutils fails to build for i386
- #1843: Fix libcap build failure
- #1855: XORG Keyboard driver fails to compile
-
-2010.05-rc3, Released May 27th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: aumix, atk, avahi, bmon, busybox, cairo,
- cdrkit, dbus-glib, dbus-python, docker, enchant, fltk, gamin,
- gettext, gmpc, gob2, grep, gstreamer, gst-plugins-bad,
- gst-plugins-base, gvfs, hal, iconv, icu, iperf, libcgicc,
- libdvdnav, libdvdread, libglade, libglib2, libgtk2, libidn,
- libmms, libmpd, libpcap, libsoup, lmbench, lsof, ltrace, lvm2,
- make, metacity, microperl, mtd-utils, mutt, nbd, netsnmp,
- ntfsprogs, ntp, olsr, pango, pciutils, pcmanfm, php,
- pkg-config, psmisc, qt, samba, shared-mime-info, squashfs,
- squashfs3, sshfs, startup-notification, swfdec, sylpheed,
- uemacs, util-linux, valgrind, vpnc, vsftpd, webkit, xstroke
-
- Issues resolved (http://bugs.uclibc.org):
-
- #75: arm buildroot "unrecognized option" error
- #699: Buildroot fails to copy libstdc++ to target when using external...
- #1693: NTP trys IPV6 even if not configured error: 'IPV6_MULTICAST...
- #1729: alsamixergui fails to build
- #1801: Avahi-autoipd doesn't create TARGET_DIR/var/lib
- #1819: pciutils small bugs
- #2065: Internal toolchain: bump gcc 4.3.x series to 4.3.5
-
-2010.05-rc2, Released May 11th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: busybox, customize, gawk, gnuchess,
- hal, hostapd, less, libgcrypt, libnl, libxcb, linux-fusion,
- ltp-testsuite, mplayer, netplug, pciutils, php, sed,
- shared-mime-info usb_modeswitch, usbutils, vlc wpa_supplicant,
- xapp_bdftopcf, xapp_mkfontdir, xdriver_xf86-video-openchrome,
- xfont_encodings, xlib_libX11, xlib_libXfont, xlib_xtrans,
- xproto_fontcacheproto, xproto_fontsproto, xvkbd
-
- Removed packages: vice
-
- Issues resolved (http://bugs.uclibc.org):
-
- #849: "customize" package copies files to wrong place in target tree
- #985: Bump usb_modeswitch package to 1.1.0
- #1135: Package customize. Wrong copying
- #1525: Package hal deletes a whole <target>/etc/rc.d directory
- #1531: libxcb 1.5 build fails, due to missing xcbgen Python module
- #1669: Busybox failed to compile when using an external toolchain
- #1699: Fix usbutils dependencies and bump
- #1705: Fix pciutils broken cross compiling
- #1717: External toolchain fixes for hostapd & wpa_supplicant
-
-2010.05-rc1, Released May 3rd, 2010:
-
- Cleaned up / restructured package menu.
-
- Toolchain: uClibc 0.9.30.3 / 0.9.31, older 0.9.30.x removed.
- 2.6.33 kernel headers, binutils 2.20.1, GCC 4.4.4,
- removed broken nios2 support, ppc e300cX/e500mc support,
- improved external toolchain support, GDB 7.x support.
-
- X.org updated to 7.5.
-
- New packages: cdrkit, cramfs, genext2fs, genromfs,
- libatomic_ops, librsync, libusb-compat, lmbench, netperf,
- squashfs, squashfs3, squid
-
- Updated/fixed packages: alsa-utils, argus, autoconf, bison,
- busybox, bzip2, directfb, dnsmasq, dosfstools, e2fsprogs,
- eeprog, fakeroot, fbv, findutils, freetype, haserl, hostapd,
- iperf, iptables, iw, less, libaio, libcgi, libcgicc, libdrm,
- libgcrypt, libglib2, libid3tag, libmad, liboil, libosip2,
- libpng, libraw1394, libsysfs, libxml2, libxslt, linux-fusion,
- ltrace, lua, lzma, madplay, makedevs, matchbox, mdadm,
- memstat, mesa3d, mtd-utils, nano, ncurses, openssl, patch,
- pciutils, php, pixman, portage, pppd, pthread-stubs, python,
- qt, radvd, samba, setserial, smartmontools, tar, tslib,
- udpcast, usb_modeswith, vtun, wget, xdata_xcursor-themes,
- xdriver_xf86-video-intel, xkeyboard-config, xlib_libX11,
- xlib_libXaw, xlib_libXfont, xlib_libXfontcache,
- xlib_libXxf86misc, xlib_libXtst, xlib_libpciaccess,
- xproto_dri2proto, xproto_eviext, xproto_fontcacheproto,
- xproto_xf86miscproto, xserver_xorg-server
-
- Removed packages: xapp_xtrap, xlib_libXTrap, xlib_libXevie,
- xlib_libXxf86misc, xxproto_evieext, proto_trapproto,
- xproto_xf86miscproto
-
- Issues resolved (http://bugs.uclibc.org):
-
- #513: Add new squid package
- #661: lmbench: new package
- #719: Add lua option to haserl
- #800: [PATCH] iperf update to 2.0.4
- #803: [PATCH] lua - add shared library patch and config option for...
- #805: [PATCH] mdadm - version update
- #817: integrator926_defconfig uses unsupported uboot board name
- #851: Add option to specify --sysroot value for external toolchain
- #1093: Upgrade libusb to v1.0.3 and add new libusb-compat
- package for compatibility with old packages that expect
- the pre-1.0 API.
- #1105: Add new netperf package
- #1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
- #1117: Bump nano to 2.2.3 and migrate to Makefile.autotools.in
- #1123: Bump less to 436 and migrate to Makefile.autotools.in
- #1129: Bump memstat to 0.8 and migrate to Makefile.package.in
- #1189: Wrong u-boot configuration name for integrator926 target
- #1219: kernel headers not correctly installed into toolchain/staging
- #1267: Wrong BR2_EXTRA_VERSION
- #1273: BR2_INET_IPV6 does not enable IPv6 in pppd
- #1303: Add librsync package
- #1321: Busybox link fails due to lack of --sysroot option
- #1327: mtd-utils compile failure due to lack of --sysroot in CFLAGS
- #1345: Bump pppd to 2.4.5 and convert to Makefile.autotools.in
- #1369: cannot build radvd (flex problem)
- #1387: xlib_libX11-1.3.2 can't find libjpeg
- #1411: [SECURITY] Update openssl package to 0.9.8n
- #1417: Bump iptables to 1.4.7
- #1423: Bump e2fsprogs to 1.41.11
- #1429: [SECURITY] Update php to 5.2.13
- #1441: Add binutils 2.20.1
- #1447: Package installation on target with debug symbols is broken
- #1459: Misc QA fixes
- #1489: radvd update to 1.6
- #1513: Enable powerpc e300c2, e300c3 and e500mc optimization
- #1537: dev entries not created anymore
- #1555: Fix default uclibc-0.9.31 configuration
- #1561: [SECURITY] Update samba to 3.3.12
- #1567: openssl0.9.8n fails to compile
- #1573: Alsa-utils alsactl/init/* not installed to target
- #1591: portmap fails to compile
- #1615: Convert eeprog package to gentargets
- #1645: Bump hostapd package to 0.7.2
-
-2010.02, Release February 26th, 2010:
-
- Fixes all over the tree.
-
- Updated/fixed packages: avahi, busybox, cramfs, ipsec-tools, libcgicc,
- libgtk2, libraw1394, madplay, netsnmp, pango, squashfs, sylpheed, qt,
- xfont_font-util
-
- Removed packages: hostap, openmotif, xpdf
-
- Issues resolved (http://bugs.uclibc.org):
-
- #165: openmotif does not build
- #1147: Remove obsolete hostap package
- #1183: make source fails to download gmp, mpfr and patches
-
-2010.02-rc2, Released February 23th, 2010:
-
- Fixes all over the tree and new features.
-
- New packages: intltool
-
- Updated/fixed packages: ace_of_penguins, alsa-lib, alsa-utils, argus,
- at, automake, ccache, dosfstools, e2fsprogs, flex, gob2, gmpc,
- gst-plugins-good, imagemagick, iw, kexec, libeXosip, libgtk2,
- libpcap, libpng, libsoup, libxcb, libxml-parser-perl, libxml2,
- libxslt, lvm2, matchbox, mplayer, rsync, rubix, shared-mime-info,
- tcl, webkit, xapp_mkfontscale, xfont_encodings, xfont_font-util,
- xlib_libfontenc, xproto_trapproto, zlib
-
- Removed package: xboard
-
- Issues resolved (http://bugs.uclibc.org):
-
- #335: atk looks for the path to the gnome library on the host
- #355: Please update WebKit - it doesn't compile!
- #453: libglib2 autoreconf
- #457: e2fsprogs link problem
- #459: libgtk2 autoreconf
- #469: build of libgtk2 for host incorrectly assumes that X.org ...
- #671: Bash fails to build when building buildront on Ubuntu 9.04
- #711: WebKit host dependencies problems
- #821: cp: illegal operation
- #1039: Not compiled on ubuntu karmic
- #1069: [PATCH] The AT91BOOTSTRAP makefile contains a typo
-
-2010.02-rc1, Released February 9th, 2010:
-
- Fixes all over the tree and new features.
-
- Generalized autotools infrastructure to be usable for
- non-autotools packages, see package/Makefile.package.in for
- details.
-
- Cleaned up avr32 toolchain config, external source-based
- toolchain support is gone.
-
- Dependency checks: Also check for makeinfo, only print output
- on errors.
-
- Toolchain: uClibc 0.9.30.2, gcc 4.4.3
-
- New packages: libcdaudio, libdvdnav, libdvdread, hostapd, ser2net,
- tcpreplay
-
- Updated/fixed packages: alsa-lib, alsa-utils, at, autoconf, bash,
- bind, binutils, bootutils, busybox, dbus, directfb, dnsmasq,
- e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, fbdump, flex,
- hal, iptables, iw, jpeg, kismet, libfuse, libglib2, liboil, libpcap,
- libungif, libxml2, libxslt, lighttpd, mesa, mpg123, mtd-utils, nbd,
- neon, netstat-nat, newt, openvpn, pcre, php, qt, rdesktop, readline,
- rpm, sawman, sdl, sdl_ttf, sqlite, sshfs, tremor, u-boot,
- usb_modeswitch, usbutils, webkit, wpa_supplicant, xfsprogs, zlib
-
- Removed package: asterisk, openswan
-
- Issues resolved (http://bugs.uclibc.org):
-
- #515: tcpreplay: new package
- #553: Wrong DirectFB ps2mouse limitation
- #559: mesa3d build fails
- #679: Autoconf cannot find M4
- #739: New/updated hostapd package
- #749: Bump usbutils package to version 0.86
- #751: Kernel 2.6 snapshot fetch fail
- #753: Bump lighttpd package to 1.4.25
- #757: U-Boot: mkimage cannot be installed using external toolchain
- #761: Add binutils 2.20 to toolchain options
- #763: [SECURITY] Update pcre to 7.9
- #765: Add buildroot branding to gcc
- #767: Bump iw package to 0.9.18
- #773: [SECURITY] Update bind to 9.5.2-P1
- #795: Minor edits to fix typos, grammar, spelling, usage in documen...
- #813: Drop not very useful generic package selection options ...
- #823: Editor backup files (~) is copied from the target_skeleton
- #827: Bump mtd-utils package to version 1.2.0
- #841: Build error
- #913: Bump iptables to 1.4.6
- #919: Bump usb_modeswitch package to 1.0.7
- #925: Bump wpa_supplicant package to 0.6.10
- #931: Bump kismet package to 2010-01-R1
- #937: Bump openvpn package to 2.1.1
- #943: Bump sqlite package to 3.6.22
- #961: Bump dnsmasq to 2.52
- #967: Bump netstat-nat to 1.4.10
- #973: Bump iw to 0.9.19
- #1003: DHCP options disabled with busybox-1.16.0
- #1009: [SECURITY] Bump php to 5.2.12
- #1015: [SECURITY] Bump bind to 9.5.1-P2
- #1027: Busybox flash commands conflict with those from mtd-utils
- #1063: [SECURITY] Update lighttpd to 1.4.26
-
-2009.11, Released December 1st, 2009:
-
- Additional fixes and cleanups.
-
- Updated/fixed packages: alsamixergui, autoconf, coreutils, fltk,
- microperl, ncurses, vim
-
- Issues resolved (http://bugs.uclibc.org):
-
- #707: Cant configure fltk-1.1.7. configure: error: Configure could ...
-
-2009.11-rc2, Released November 29th, 2009:
-
- Additional fixes and cleanups.
-
- Updated/fixed packages: busybox, dbus, fltk, gvfs, ltrace
-
-2009.11-rc1, Released November 23rd, 2009:
-
- Fixes all over the tree and new features.
-
- Cleaned up / Simplified build directory layout. Refer to
- docs/buildroot.html#using for details.
-
- Target defconfig files moved to configs/ and listed in 'make help'
- output.
-
- Fixed *clean targets. Now clean removes everything generated,
- so you can do a fresh rebuild. Distclean furthermore removes
- kbuild tools and .config, bringing the source tree back in a
- pristine state.
-
- Toolchain: ARM cortex A8 support, GCC 4.4.2, sensible default
- soft / hardfloat setting for architecture, ensure target-ldd
- gets installed.
-
- New packages: divine, gvfs, libarchive, libmicrohttpd,
- sdl_sound, swfdec, sysstat
-
- Updated/fixed packages: alsa-lib, alsamixergui, autoconf, bootutils,
- busybox, gcc, directfb, dnsmasq, e2fsprogs, festival, gamin, gperf,
- gqview, gstreamer, gst-plugins-bad, gst-plugins-base, gst-plugins-good,
- imagemagick, ipkg, iptables, iw, kernel-headers, kismet, leafpad,
- libelf, libevent, libglib2, libidn, liblockfile, libmad, libpcap,
- libupnp, libuuid, libxml2, lighttpd, ltrace, lua, lzma, magiccube4d,
- matchbox, mdadm, nbd, ncftp, ncurses, netkittelnet, netsnmp,
- ng-spice-rework, ntfs-3g, openntp, openssl, pcmanfm, php, psmisc,
- python, quagga, radvd, rpm, rsync, rubix, samba, sawman, sdl, sdl_image,
- shared-mime-info, sfdisk, spawn-fcgi, speech-tools, sqlite, squashfs,
- synergy, syslinux, sysklogd, target-binutils, tcpdump, torsmo, u-boot,
- udpcast, util-linux, valgrind, vsftpd, wipe, wpa-supplicant, x11vnc,
- xdata_xcursor-themes, xboard, xfsprogs, xstroke, zlib[5~
-
- Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4, vice
-
- Issues resolved (http://bugs.uclibc.org):
-
- #301: allow to install libsmbclient
- #303: add gvfs package
- #477: Add sdl_sound package
- #487: Make kismet package sexier
- #511: New package usb_modeswitch
- #527: misc fixes for dnsmasq package
- #565: libevent: Bump version and clean up makefile
- #587: Use iptables multipurpose binaries and bump to 1.4.4
- #593: Missing early check for patch(1)
- #597: (REOP) Selecting busybox in buildroot's config clobbers ar ...
- #609: libmicrohttpd: New package
- #615: python: Don't delete .py files unless asked
- #617: netkit/inetd requires RPC and fails to build if RPC is disabled
- #619: netkittelnet requires netkitbase to install, but there's no ...
- #645: allow to build nbd-server with NBD package
- #653: [SECURITY] Update php package to version 5.2.11
- #655: Update sqlite package to version 3.6.18
- #657: Bug in imagemagick-clean target
- #663: Add option for NAND flash with 512B Page and 16 kB erasesize ...
- #665: [PATCH] Samba package
- #667: [PATCH] e2fsprogs
- #683: SDL-dfb does not select directfb
- #701: make install problem with unstripped binaries
- #703: [SECURITY] Update openssl package to 0.9.8l
- #705: Bump spawn-fcgi package to 1.6.3
- #709: Bump lighttpd package to 1.4.24
- #713: Migrate openntpd package to Makefile.autotools.in
- #715: Bump libidn package to 1.15 and other fixes
- #717: Bump dnsmasq to 2.51 and introduce new IDN option
- #731: Bump iw package to 0.9.17
-
-2009.08, Released August 31th, 2009:
-
- Additional fixes and cleanups.
-
- Updated/fixed packages: ctorrent, saveconfig/getconfig,
- sdl_net, util-linux.
-
- Issues resolved (http://bugs.uclibc.org):
-
- #529: util-linux doesn't find headers and include libs correctly
- #557: Build ctorrent with SSL support if available
-
-2009.08-rc3, Released August 26th, 2009:
-
- Additional fixes and cleanups.
-
- Updated/fixed packages: alsa-utils, berkeleydb, busybox, dbus,
- directfb, enchant, kernel headers.
-
- Issues resolved (http://bugs.uclibc.org):
-
- #471: Allow directfb compilation with debug
- #541: Removal of CVS directories in target filesystem broken
- #547: berkeleydb: Update config.{sub, guess}
- #549: enchant: Fix dependencies.
- #569: Fix alsa-utils build for x86 on x86-64
-
-2009.08-rc2, Released August 6th, 2009:
-
- Additional fixes and new features.
-
- New packages: libuuid, gcc 4.3.4.
-
- Updated/fixed packages: busybox, classpath, gzip, ipsec-tools,
- jamvm, libusb, microperl, neon, popt, sed, webkit.
-
- Fixed issue with 'make oldconfig'
-
- Issues resolved (http://bugs.uclibc.org):
-
- #525: sed broken with external toolchain
- #537: Fix gzip build with recent glibc
-
-2009.08-rc1, Released August 2nd, 2009:
-
- Fixes all over the tree and new features.
-
- Improvement of external toolchain support:
- - Support for glibc toolchains.
- - The toolchain configuration announced to Buildroot is
- verified against the real toolchain configuration.
- - Fixes, documentation.
-
- Cleanup X.org support: clarified configuration options, and
- removed mandatory dependency on useless libraries such as
- libXt or libXaw.
-
- New QT-based configurator, usable using 'make xconfig'.
-
- Support for the Xtensa architecture.
-
- Toolchain: GCC 4.4.1, 2.6.30 kernel headers, removed < 2.6.26
- headers.
-
- New packages: bmon, ctorrent, dosfstools, enchant,
- gst-plugins-bad, iw, libmms, libnl, netstat-nat, ntfsprogs,
- sdl_gfx, spawn-fcgi.
-
- Updated packages: bind, busybox, coreutils, sqlite, directfb,
- expat, gamin, gnuconfig, haserl, ipsec-tools, classpath,
- libcurl, libglib2, liblockfile, libpng, libsoup, libxml2,
- lighttpd, ltp-testsuite, lvm2, matchbox, memstat,
- gst-plugins-good, gstreamer, libogg, libvorbis, mplayer,
- neon, openssl, pciutils, php, qt, ruby, sawman, webkit,
- wpa-supplicant, xdriver_xf86-input-synaptics,
- xdriver_xf86-video-intel, xlib_libXfont, xlib_libXft,
- xlib_libXt, xproto_xproto, xserver-xorg, xutil_makedepend,
- xutil_util-macros.
-
- Issues resolved (http://bugs.uclibc.org):
-
- #83: liblockfile fails to compile due to eaccess redefinition
- #163: Xtensa architecture port
- #171: xorg-server / kernel headers 2.6.26 - vm86.c compilation issue
- #241: device mapper + lvm2: build together
- #243: ctorrent: new package
- #247: ntfsprogs: new package
- #271: Library 'libgcc_s.so.1' not installed in search path
- #287: New package libnl
- #289: New package iw
- #331: Update MPlayer to version 1.0rc2
- #333: Bump sqlite package to 3.6.15
- #349: update libsoup to version 2.26.2
- #357: New package netstat-nat
- #359,#413: Upgrade openvpn to Makefile.autotools.in
- #367: linux kernel compile error for arm926t
- #369: Add SDL_gfx package
- #373: Support for building gstreamer without libxml
- #379: update DirectFB to version 1.4.0
- #383: gst-plugins-good: Allow soup plugin to be configured
- #385: neon: Fix pkgconfig dependency
- #387: Tremor not installed to toolchain
- #389: New package bmon
- #391: gstreamer: Bump version to 0.10.23
- #393: gst-plugins-base: Bump version to 0.10.23
- #395: gst-plugins-bad: New package
- #403: Error while building iso9660 image
- #409: Bump php package to 5.2.10
- #411: ipsec-tools: Bump version to 0.7.2
- #417: New package spawn-fcgi
- #419: Bump lighttpd package to 1.4.23
- #421: toolchain: Clean up toolchain locale support menu
- #427: webkit: Update to WebKit svn r44552
- #437: ltp-testsuite: Bump version to 20090630
- #451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
- #467: DirectFB 1.4.1
- #473: memstat_0.5.tar.gz has install with -D and that fails "make"
- #491: libxml2: Bump version to 0.7.3
- #495: Bump bind package to 9.5.1-P3 (security)
- #497: OpenSSL RSA key generation hangs on x86_64
- #509: Bump sqlite package to 3.6.16
- #523: pciutils broken with external toolchain
- #533: Update gamin to 0.1.10 to fix compilation
-
-2009.05, Released June 1st, 2009:
-
- Fixes for dropbear & diffutils, bump linux-advanced 2.6.29.x
- version and marked ubifsroot as broken.
-
-2009.05-rc3, Released May 27th, 2009:
-
- Fixes for toolchain (gcc arm pr37436), stable kernel versions,
- busybox, curl, libusb, readline, python and strace.
-
- Issues resolved (http://bugs.uclibc.org):
-
- #345: libcurl package needs a urandom fix
-
-2009.05-rc2, Released May 19th, 2009:
-
- Fixes for toolchain (gcc w/softfloat on ppc, 3.4.6 buildfix
- for newer hosts), stable kernel versions, busybox, cups,
- dmraid, docker, mesa3d, rsync and updated defconfigs.
-
- xserver marked as broken on AVR32 and atngw100-expanded
- config removed.
-
- Issues resolved (http://bugs.uclibc.org):
-
- #167: metacity does not build
- #295: gamin installs python support even if python is disabled
- #323: gen_matypes fails to execute during build of Mesa when us...
-
-2009.05-rc1, Released May 5th, 2009:
-
- Fixes all over the tree, further conversion of packages to
- Makefile.autotools.in and we now build host versions of
- packages where needed for build time dependencies instead of
- relying on the correct versions being available on the build
- host. Ancient toolchain / busybox versions have furthermore
- been removed as announced in the 2009.02 release notes.
-
- New packages: flac, gob2, lzop, taglib, wpa_supplicant
-
- Updated packages: avahi, bind, binutils, busybox, dbus, dbus-glib,
- directfb, dnsmasq, freetype, gcc, gmp, gstreamer, iptables, kernel
- headers, kexec, libglib2, libpng, libsndfile, lua, mpfr, ntfs-3g,
- openssl, php, qtopia4, rsync, samba, sqlite, tar, uboot, uclibc,
- util-linux, xorg7, xerces
-
- Issues resolved (http://bugs.uclibc.org):
-
- #5,#77,#141,#143: Convert php package to Makefile.autotools.in
- and a ton of other improvements
- #19: page.h missing by util-linux
- #37: update libglib2 to version 2.18.4
- #61: tslib puts staging_dir into pkgconfig file
- #69: tar refuses to build
- #71,#175: ./wchar.h:41:12: error: empty filename in #include
- #73: Bump openssl package to the latest version
- #81: New package wpa_supplicant
- #99: new package: flac
- #101: update gstreamer packages
- #105,#313: menuconfig segfaults on tinyx if wchar is not
- selected
- #107: convert libvorbis to Makefile.autotools.in
- #109: Make pppd package avoid bsd err
- #111: binutils 2.17 fails to build when texinfo >= 4.10
- #133: Modify ncurses5-config to get correct include path
- #137: Bump php to version 5.2.9
- #139: Bump sqlite to 3.6.11 and convert to
- Makefile.autotools.in
- #145: Bump bind package to 9.5.1-P1 (security)
- #147: buildroot toolchain fails to build w/binutils-2.19.1
- #151: openssl package trivial fixes
- #161: vim fails on patching with errors in configure.patch
- #169: blackbox-0.70.1 does not build
- #177: xdriver_xf86-input-keyboard does not build
- #179: Upgrade dropbear to Makefile.autotools.in
- #181: Update to Xorg 7.4
- #187: ntfs-3g: could not build cross
- #191: alsa-lib ARM binaries always built with EABI
- #213: Bump wpa_supplicant package to version 0.6.9
- #217: Bump openssl package to 0.9.8k (security)
- #219: Toolchain build fails on m4
- #225: m4 macros are out of place
- #233: make ipv6 optional in iptables
- #237: ncftp: convert to Makefile.autotools.in
- #239: ntfs-3g: convert to Makefile.autotools.in
- #245: lzop: new package
- #271: Bump bind package to 9.5.1-P2 (security)
- #277: Bump sqlite package to 3.6.16
- #279: update libglib2 to version 2.20.1
- #281: update DirectFB to version 1.2.8
- #283: add taglib
- #285: compilation of samba fails if IPV6 support is missing
- #293: update samba to version 3.3.3
- #299: add shared-mime-info package
- #307: make openssl package respect build flags
Deleted: branches/1.0/COPYING
===================================================================
--- branches/1.0/COPYING 2011-10-17 21:28:50 UTC (rev 5211)
+++ branches/1.0/COPYING 2011-10-17 21:48:08 UTC (rev 5212)
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distributi...
[truncated message content] |
|
From: <abe...@us...> - 2011-10-18 18:11:15
|
Revision: 5215
http://astlinux.svn.sourceforge.net/astlinux/?rev=5215&view=rev
Author: abelbeck
Date: 2011-10-18 18:11:08 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
freeswitch, initial checkin, does not yet build
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/freeswitch/
branches/1.0/package/freeswitch/Config.in
branches/1.0/package/freeswitch/freeswitch-modules.conf
branches/1.0/package/freeswitch/freeswitch.init
branches/1.0/package/freeswitch/freeswitch.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-10-18 15:21:29 UTC (rev 5214)
+++ branches/1.0/astlinux.config 2011-10-18 18:11:08 UTC (rev 5215)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5199 Configuration
-# Sun Oct 16 23:32:50 2011
+# Buildroot 2011.08-svn5214-dirty Configuration
+# Tue Oct 18 13:04:07 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -171,6 +171,7 @@
BR2_PACKAGE_DAHDI_OSLEC=y
# BR2_PACKAGE_DAHDI_ZAPHFC is not set
BR2_PACKAGE_DAHDI_TOOLS=y
+# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-10-18 15:21:29 UTC (rev 5214)
+++ branches/1.0/astlinux18.config 2011-10-18 18:11:08 UTC (rev 5215)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5194-dirty Configuration
-# Sun Oct 16 21:38:11 2011
+# Buildroot 2011.08-svn5214-dirty Configuration
+# Tue Oct 18 13:04:09 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -166,6 +166,7 @@
BR2_PACKAGE_DAHDI_OSLEC=y
# BR2_PACKAGE_DAHDI_ZAPHFC is not set
BR2_PACKAGE_DAHDI_TOOLS=y
+# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-10-18 15:21:29 UTC (rev 5214)
+++ branches/1.0/initrd.config 2011-10-18 18:11:08 UTC (rev 5215)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5194-dirty Configuration
-# Sun Oct 16 21:38:15 2011
+# Buildroot 2011.08-svn5214-dirty Configuration
+# Tue Oct 18 13:04:14 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -157,6 +157,7 @@
# Asterisk, FreeSWITCH and telephony applications
#
# BR2_PACKAGE_ASTERISK is not set
+# BR2_PACKAGE_FREESWITCH is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-10-18 15:21:29 UTC (rev 5214)
+++ branches/1.0/package/Config.in 2011-10-18 18:11:08 UTC (rev 5215)
@@ -14,6 +14,7 @@
source "package/asterisk-gui/Config.in"
source "package/dahdi-linux/Config.in"
source "package/dahdi-tools/Config.in"
+source "package/freeswitch/Config.in"
source "package/rhino/Config.in"
source "package/wanpipe/Config.in"
endmenu
Added: branches/1.0/package/freeswitch/Config.in
===================================================================
--- branches/1.0/package/freeswitch/Config.in (rev 0)
+++ branches/1.0/package/freeswitch/Config.in 2011-10-18 18:11:08 UTC (rev 5215)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_FREESWITCH
+ bool "freeswitch"
+ default n
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_LIBPCAP
+ help
+ Open source telephony platform
+
+ http://www.freeswitch.org/
+
+config BR2_PACKAGE_FREESWITCH_SOUNDS
+ bool "freeswitch sounds"
+ default n
+ depends on BR2_PACKAGE_FREESWITCH
+ help
+ Install FreeSWITCH sounds and MOH
+
Added: branches/1.0/package/freeswitch/freeswitch-modules.conf
===================================================================
--- branches/1.0/package/freeswitch/freeswitch-modules.conf (rev 0)
+++ branches/1.0/package/freeswitch/freeswitch-modules.conf 2011-10-18 18:11:08 UTC (rev 5215)
@@ -0,0 +1,73 @@
+loggers/mod_console
+loggers/mod_logfile
+loggers/mod_syslog
+applications/mod_commands
+applications/mod_conference
+applications/mod_dptools
+applications/mod_enum
+applications/mod_fifo
+#applications/mod_fax
+applications/mod_voicemail
+#applications/mod_lcr
+applications/mod_limit
+applications/mod_expr
+applications/mod_esf
+#applications/mod_easyroute
+applications/mod_fsv
+#applications/mod_soundtouch
+#applications/mod_rss
+applications/mod_snom
+applications/mod_vmd
+#asr_tts/mod_flite
+#asr_tts/mod_pocketsphinx
+#asr_tts/mod_cepstral
+codecs/mod_g723_1
+codecs/mod_amr
+codecs/mod_g729
+codecs/mod_h26x
+codecs/mod_voipcodecs
+codecs/mod_ilbc
+codecs/mod_speex
+#codecs/mod_siren
+#codecs/mod_celt
+#dialplans/mod_dialplan_directory
+dialplans/mod_dialplan_xml
+dialplans/mod_dialplan_asterisk
+#directories/mod_ldap
+#endpoints/mod_dingaling
+endpoints/mod_iax
+#endpoints/mod_portaudio
+endpoints/mod_sofia
+endpoints/mod_loopback
+#endpoints/mod_alsa
+#endpoints/mod_opal
+#../../libs/openzap/mod_openzap
+event_handlers/mod_event_multicast
+event_handlers/mod_event_socket
+event_handlers/mod_cdr_csv
+#event_handlers/mod_radius_cdr
+formats/mod_native_file
+formats/mod_sndfile
+#formats/mod_shout
+formats/mod_local_stream
+formats/mod_tone_stream
+#languages/mod_python
+#languages/mod_spidermonkey
+#languages/mod_spidermonkey_teletone
+#languages/mod_spidermonkey_core_db
+#languages/mod_spidermonkey_socket
+#languages/mod_spidermonkey_odbc
+languages/mod_lua
+#languages/mod_perl
+#languages/mod_yaml
+xml_int/mod_xml_rpc
+xml_int/mod_xml_curl
+xml_int/mod_xml_cdr
+#xml_int/mod_xml_ldap
+say/mod_say_en
+#say/mod_say_de
+#say/mod_say_es
+#say/mod_say_fr
+#say/mod_say_it
+#say/mod_say_nl
+#say/mod_say_zh
Added: branches/1.0/package/freeswitch/freeswitch.init
===================================================================
--- branches/1.0/package/freeswitch/freeswitch.init (rev 0)
+++ branches/1.0/package/freeswitch/freeswitch.init 2011-10-18 18:11:08 UTC (rev 5215)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+ :
+}
+
+start () {
+
+ if [ -z "$FSARGS" ]; then
+ FSARGS="-nc"
+ fi
+
+ if [ -w /usr/local/freeswitch/log ]; then
+ echo "Starting freeswitch..."
+ ulimit -s unlimited
+ freeswitch "$FSARGS"
+ fi
+}
+
+stop () {
+
+ if [ -f /usr/local/freeswitch/log/freeswitch.pid ]; then
+ echo "Stopping freeswitch..."
+ freeswitch -stop
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Added: branches/1.0/package/freeswitch/freeswitch.mk
===================================================================
--- branches/1.0/package/freeswitch/freeswitch.mk (rev 0)
+++ branches/1.0/package/freeswitch/freeswitch.mk 2011-10-18 18:11:08 UTC (rev 5215)
@@ -0,0 +1,110 @@
+#############################################################
+#
+# freeswitch
+#
+##############################################################
+
+# Manual snapshots generated from:
+# git clone git://git.freeswitch.org/freeswitch.git
+#
+FREESWITCH_SITE := http://files.astlinux.org
+FREESWITCH_VERSION := 2011-10-18
+FREESWITCH_SOURCE := freeswitch-$(FREESWITCH_VERSION).tar.gz
+FREESWITCH_DIR := $(BUILD_DIR)/freeswitch-$(FREESWITCH_VERSION)
+FREESWITCH_INSTALL_DIR := /usr/local/freeswitch
+FREESWITCH_BINARY := .libs/freeswitch
+FREESWITCH_TARGET_BINARY := $(FREESWITCH_INSTALL_DIR)/bin/freeswitch
+
+$(DL_DIR)/$(FREESWITCH_SOURCE):
+ $(WGET) -P $(DL_DIR) $(FREESWITCH_SITE)/$(FREESWITCH_SOURCE)
+
+$(FREESWITCH_DIR)/.source: $(DL_DIR)/$(FREESWITCH_SOURCE)
+ zcat $(DL_DIR)/$(FREESWITCH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(FREESWITCH_DIR) package/freeswitch/ freeswitch\*.patch
+ touch $@
+
+$(FREESWITCH_DIR)/configure: $(FREESWITCH_DIR)/.source
+ (cd $(FREESWITCH_DIR); \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ config_BUILD_CC=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./bootstrap.sh \
+ )
+
+$(FREESWITCH_DIR)/.configured: $(FREESWITCH_DIR)/configure | libpcap openssl zlib
+ (cd $(FREESWITCH_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ config_BUILD_CC=$(HOSTCC) \
+ config_TARGET_CC=$(TARGET_CC) \
+ config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+ config_TARGET_LINK=$(TARGET_CC) \
+ BUILD_CC=$(HOSTCC) \
+ ac_cv_file__dev_zero=yes \
+ ac_cv_func_setpgrp_void=yes \
+ apr_cv_tcp_nodelay_with_cork=yes \
+ ac_cv_file_dbd_apr_dbd_mysql_c=no \
+ ac_cv_file___dev_urandom_=yes \
+ ac_cv_va_copy=C99 \
+ ac_cv_sizeof_ssize_t=4 \
+ ac_cv_func_malloc_0_nonnull=yes \
+ apr_cv_mutex_recursive=yes \
+ ac_cv_func_pthread_rwlock_init=yes \
+ apr_cv_type_rwlock_t=yes \
+ ac_cv_pcap_where_inc=$(STAGING_DIR)/include \
+ ac_cv_pcap_where_lib=$(STAGING_DIR)/lib \
+ with_ssl=$(STAGING_DIR) \
+ ac_cv_file__dev_urandom=yes \
+ ac_cv_dev_urandom=yes \
+ ac_cv_file__dev_random=no \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=$(FREESWITCH_INSTALL_DIR) \
+ )
+ cp -f package/freeswitch/freeswitch-modules.conf $(FREESWITCH_DIR)/modules.conf
+ touch $@
+
+$(FREESWITCH_DIR)/$(FREESWITCH_BINARY): $(FREESWITCH_DIR)/.configured
+ $(MAKE1) -C $(FREESWITCH_DIR) $(TARGET_CONFIGURE_OPTS)
+
+$(TARGET_DIR)/$(FREESWITCH_TARGET_BINARY): $(FREESWITCH_DIR)/$(FREESWITCH_BINARY)
+ $(MAKE1) -C $(FREESWITCH_DIR) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) install
+ifeq ($(strip $(BR2_PACKAGE_FREESWITCH_SOUNDS)),y)
+ $(MAKE1) -C $(FREESWITCH_DIR) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
+ sounds-install moh-install
+endif
+ rm -rf $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/mod/*.la \
+ $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/mod/*.a $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/lib/*.la \
+ $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/lib/*.a $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/include
+ # Hack for now
+ cp -a $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR)/lib/* $(TARGET_DIR)/usr/lib/
+ # Links to some FS bins in PATH
+ ln -sf $(FREESWITCH_INSTALL_DIR)/bin/freeswitch $(TARGET_DIR)/usr/sbin/freeswitch
+ ln -sf $(FREESWITCH_INSTALL_DIR)/bin/fs_cli $(TARGET_DIR)/usr/sbin/fs_cli
+ $(INSTALL) -D -m 0755 package/freeswitch/freeswitch.init $(TARGET_DIR)/etc/init.d/freeswitch
+
+freeswitch: $(TARGET_DIR)/$(FREESWITCH_TARGET_BINARY)
+
+freeswitch-source: $(DL_DIR)/$(FREESWITCH_SOURCE)
+
+freeswitch-unpack: $(FREESWITCH_DIR)/.source
+
+freeswitch-clean:
+ -$(MAKE1) -C $(FREESWITCH_DIR) clean
+ rm -rf $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR) $(TARGET_DIR)/usr/lib/libfreeswitch.so* \
+ $(TARGET_DIR)/usr/sbin/freeswitch $(TARGET_DIR)/usr/sbin/fs_cli \
+ $(TARGET_DIR)/etc/init.d/freeswitch
+
+freeswitch-dirclean:
+ rm -rf $(FREESWITCH_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_FREESWITCH)),y)
+TARGETS+=freeswitch
+endif
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-10-18 15:21:29 UTC (rev 5214)
+++ branches/1.0/runnix.config 2011-10-18 18:11:08 UTC (rev 5215)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5194-dirty Configuration
-# Sun Oct 16 21:38:13 2011
+# Buildroot 2011.08-svn5214-dirty Configuration
+# Tue Oct 18 13:04:11 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
# BR2_PACKAGE_ASTERISK is not set
# BR2_PACKAGE_DAHDI_LINUX is not set
# BR2_PACKAGE_DAHDI_TOOLS is not set
+# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_RHINO is not set
# BR2_PACKAGE_WANPIPE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-19 19:46:40
|
Revision: 5220
http://astlinux.svn.sourceforge.net/astlinux/?rev=5220&view=rev
Author: abelbeck
Date: 2011-10-19 19:46:33 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
scripts/build, check for the crosstool-ng toolchain and display instructions if missing
Modified Paths:
--------------
branches/1.0/scripts/build
Added Paths:
-----------
branches/1.0/crosstool-ng-src/README
Added: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README (rev 0)
+++ branches/1.0/crosstool-ng-src/README 2011-10-19 19:46:33 UTC (rev 5220)
@@ -0,0 +1,24 @@
+#########################################################################
+## Crosstool-NG
+## http://crosstool-ng.org
+##
+## Building the eglibc toolchain for AstLinux 1.x using Buildroot 2011-08
+## The resulting toolchain is output to $HOME/astlinux/x-tools
+## Make sure you have a $HOME/astlinux/ directory.
+##
+# mkdir ~/source-control # used as example folder for these configs
+cd ~/source-control
+wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.12.3.tar.bz2 | tar xj
+cd crosstool-ng-1.12.3
+./configure
+make
+sudo make install
+cd ~/source-control
+mkdir ctng
+cd ctng
+# copy the "crosstool-ng-src/ct-ng.config" file here in the SVN to "~/source-control/ctng/.config"
+ct-ng menuconfig
+# leave as configured, then
+ct-ng build
+# takes 40-60 min.
+#########################################################################
Modified: branches/1.0/scripts/build
===================================================================
--- branches/1.0/scripts/build 2011-10-19 18:54:18 UTC (rev 5219)
+++ branches/1.0/scripts/build 2011-10-19 19:46:33 UTC (rev 5220)
@@ -131,6 +131,11 @@
esac
+if [ ! -d "$HOME/astlinux/x-tools" ]; then
+ cat "crosstool-ng-src/README"
+ exit_error "Toolchain not found, see instructions above."
+fi
+
error=0
for i in $REQUIRED_CMDS; do
if ! which $i >/dev/null 2>&1; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-22 18:49:11
|
Revision: 5226
http://astlinux.svn.sourceforge.net/astlinux/?rev=5226&view=rev
Author: abelbeck
Date: 2011-10-22 18:49:05 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
e1000 and e1000e packages added, override the linux kernel dirvers with newer, stable versions.
Fixes an issue with the net5501 and e1000 driver in kernel 2.6.35
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/e1000/
branches/1.0/package/e1000/Config.in
branches/1.0/package/e1000/e1000.mk
branches/1.0/package/e1000e/
branches/1.0/package/e1000e/Config.in
branches/1.0/package/e1000e/e1000e.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-10-22 12:15:45 UTC (rev 5225)
+++ branches/1.0/astlinux.config 2011-10-22 18:49:05 UTC (rev 5226)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5214-dirty Configuration
-# Tue Oct 18 13:04:07 2011
+# Buildroot 2011.08-svn5225-dirty Configuration
+# Sat Oct 22 13:40:30 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -326,6 +326,8 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+BR2_PACKAGE_E1000=y
+BR2_PACKAGE_E1000E=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-10-22 12:15:45 UTC (rev 5225)
+++ branches/1.0/astlinux18.config 2011-10-22 18:49:05 UTC (rev 5226)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5214-dirty Configuration
-# Tue Oct 18 13:04:09 2011
+# Buildroot 2011.08-svn5225-dirty Configuration
+# Sat Oct 22 13:40:30 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -321,6 +321,8 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+BR2_PACKAGE_E1000=y
+BR2_PACKAGE_E1000E=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-10-22 12:15:45 UTC (rev 5225)
+++ branches/1.0/initrd.config 2011-10-22 18:49:05 UTC (rev 5226)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5214-dirty Configuration
-# Tue Oct 18 13:04:14 2011
+# Buildroot 2011.08-svn5225-dirty Configuration
+# Sat Oct 22 13:40:30 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-10-22 12:15:45 UTC (rev 5225)
+++ branches/1.0/package/Config.in 2011-10-22 18:49:05 UTC (rev 5226)
@@ -175,6 +175,8 @@
endif
source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
+source "package/e1000/Config.in"
+source "package/e1000e/Config.in"
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
source "package/fconfig/Config.in"
Added: branches/1.0/package/e1000/Config.in
===================================================================
--- branches/1.0/package/e1000/Config.in (rev 0)
+++ branches/1.0/package/e1000/Config.in 2011-10-22 18:49:05 UTC (rev 5226)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_E1000
+ bool "e1000"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Newer stable e1000 Intel PRO/1000 Linux driver
+
+ http://sourceforge.net/projects/e1000/
+
Added: branches/1.0/package/e1000/e1000.mk
===================================================================
--- branches/1.0/package/e1000/e1000.mk (rev 0)
+++ branches/1.0/package/e1000/e1000.mk 2011-10-22 18:49:05 UTC (rev 5226)
@@ -0,0 +1,38 @@
+#############################################################
+#
+# e1000
+#
+#############################################################
+
+E1000_VERSION = 8.0.35
+E1000_SOURCE:=e1000-$(E1000_VERSION).tar.gz
+E1000_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/e1000/e1000%20stable/$(E1000_VERSION)
+E1000_DEPENDENCIES = linux
+E1000_SUBDIR = src
+
+E1000_UNINSTALL_STAGING_OPT = --version
+
+E1000_MAKE_OPT += \
+ CC=$(TARGET_CC) \
+ LD=$(TARGET_LD) \
+ BUILD_KERNEL=$(LINUX_VERSION_PROBED) \
+ KSRC=$(LINUX_DIR) \
+ VERSION_FILE=$(LINUX_DIR)/include/generated/utsrelease.h \
+ CONFIG_FILE=$(LINUX_DIR)/include/generated/autoconf.h \
+ ARCH=$(KERNEL_ARCH)
+
+define E1000_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+define E1000_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 644 -D $(@D)/src/e1000.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000/e1000.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+define E1000_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000/e1000.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+$(eval $(call AUTOTARGETS,package,e1000))
Added: branches/1.0/package/e1000e/Config.in
===================================================================
--- branches/1.0/package/e1000e/Config.in (rev 0)
+++ branches/1.0/package/e1000e/Config.in 2011-10-22 18:49:05 UTC (rev 5226)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_E1000E
+ bool "e1000e"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Newer stable e1000e Intel PRO/1000 Linux driver
+
+ http://sourceforge.net/projects/e1000/
+
Added: branches/1.0/package/e1000e/e1000e.mk
===================================================================
--- branches/1.0/package/e1000e/e1000e.mk (rev 0)
+++ branches/1.0/package/e1000e/e1000e.mk 2011-10-22 18:49:05 UTC (rev 5226)
@@ -0,0 +1,38 @@
+#############################################################
+#
+# e1000e
+#
+#############################################################
+
+E1000E_VERSION = 1.6.3
+E1000E_SOURCE:=e1000e-$(E1000E_VERSION).tar.gz
+E1000E_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/e1000/e1000e%20stable/$(E1000E_VERSION)
+E1000E_DEPENDENCIES = linux
+E1000E_SUBDIR = src
+
+E1000E_UNINSTALL_STAGING_OPT = --version
+
+E1000E_MAKE_OPT += \
+ CC=$(TARGET_CC) \
+ LD=$(TARGET_LD) \
+ BUILD_KERNEL=$(LINUX_VERSION_PROBED) \
+ KSRC=$(LINUX_DIR) \
+ VERSION_FILE=$(LINUX_DIR)/include/generated/utsrelease.h \
+ CONFIG_FILE=$(LINUX_DIR)/include/generated/autoconf.h \
+ ARCH=$(KERNEL_ARCH)
+
+define E1000E_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+define E1000E_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 644 -D $(@D)/src/e1000e.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000e/e1000e.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+define E1000E_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000e/e1000e.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+$(eval $(call AUTOTARGETS,package,e1000e))
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-10-22 12:15:45 UTC (rev 5225)
+++ branches/1.0/runnix.config 2011-10-22 18:49:05 UTC (rev 5226)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5214-dirty Configuration
-# Tue Oct 18 13:04:11 2011
+# Buildroot 2011.08-svn5225-dirty Configuration
+# Sat Oct 22 13:40:30 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -325,6 +325,8 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+# BR2_PACKAGE_E1000 is not set
+# BR2_PACKAGE_E1000E is not set
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-23 14:23:08
|
Revision: 5228
http://astlinux.svn.sourceforge.net/astlinux/?rev=5228&view=rev
Author: abelbeck
Date: 2011-10-23 14:23:01 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
fully integrate zabbix
Modified Paths:
--------------
branches/1.0/package/zabbix/zabbix.init
branches/1.0/package/zabbix/zabbix.mk
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/passwd
branches/1.0/project/astlinux/target_skeleton/etc/services
branches/1.0/project/astlinux/target_skeleton/etc/shadow
branches/1.0/project/astlinux/target_skeleton/etc/shadow-
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01zabbix
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S98zabbix
Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/package/zabbix/zabbix.init 2011-10-23 14:23:01 UTC (rev 5228)
@@ -3,29 +3,80 @@
. /etc/rc.conf
init () {
+ local server="" IFS
- if [ ! -x /usr/bin/zabbix_agentd ]; then
- echo "zabbix_agentd not installed."
+ if [ -z "$ZABBIX_SERVER" ]; then
+ if [ -f /tmp/etc/zabbix_agentd.conf ]; then
+ rm /tmp/etc/zabbix_agentd.conf
+ fi
exit
fi
- if [ ! -f /etc/zabbix/zabbix_agentd.conf ]; then
- echo "No zabbix config file found."
- echo "Please create a zabbix_agentd.conf file in /etc/zabbix."
+ if [ ! -x /usr/bin/zabbix_agentd ]; then
+ echo "zabbix: zabbix_agentd not installed."
exit
fi
+
+ # Allow space/comma in ZABBIX_SERVER, but zabbix requires comma's
+ IFS=' ,'
+ for i in $ZABBIX_SERVER; do
+ server="$server${server:+,}$i"
+ done
+ unset IFS
+
+ serverport="${ZABBIX_SERVER_PORT:-10051}"
+ hostname="${ZABBIX_HOSTNAME:-$HOSTNAME}"
+ listenport="${ZABBIX_LISTENPORT:-10050}"
+ startagents="${ZABBIX_STARTAGENTS:-3}"
+ debuglevel="${ZABBIX_DEBUGLEVEL:-3}"
+ timeout="${ZABBIX_TIMEOUT:-3}"
+
+ # Generate /etc/zabbix_agentd.conf configuration file
+ if [ -f /mnt/kd/zabbix_agentd.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/zabbix_agentd.conf file.
+" >/tmp/etc/zabbix_agentd.conf
+ cat /mnt/kd/zabbix_agentd.conf >>/tmp/etc/zabbix_agentd.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated zabbix_agentd config will use /mnt/kd/zabbix_agentd.conf if it exists.
+Server=$server
+ServerPort=$serverport
+Hostname=$hostname
+ListenPort=$listenport
+StartAgents=$startagents
+DebugLevel=$debuglevel
+Timeout=$timeout
+PidFile=/var/run/zabbix_agentd.pid
+LogFile=/var/log/zabbix_agentd.log
+AllowRoot=0
+" >/tmp/etc/zabbix_agentd.conf
+ fi
+ chown zabbix:zabbix /tmp/etc/zabbix_agentd.conf
+
+ touch /var/log/zabbix_agentd.log
+ chown zabbix:zabbix /var/log/zabbix_agentd.log
}
start () {
- echo "Starting Zabbix Agent Daemon..."
- /usr/bin/zabbix_agentd
+ if [ -f /etc/zabbix_agentd.conf ]; then
+ echo "Starting Zabbix Agent Daemon..."
+
+ touch /var/run/zabbix_agentd.pid
+ chown zabbix:zabbix /var/run/zabbix_agentd.pid
+
+ zabbix_agentd -c /etc/zabbix_agentd.conf
+ fi
}
stop () {
- echo "Stopping Zabbix Agent Daemon..."
- killall zabbix_agentd
+ if [ -f /var/run/zabbix_agentd.pid ]; then
+ echo "Stopping Zabbix Agent Daemon..."
+
+ kill $(cat /var/run/zabbix_agentd.pid) >/dev/null 2>&1
+ rm -f /var/run/zabbix_agentd.pid
+ fi
}
case $1 in
@@ -55,4 +106,3 @@
esac
-
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/package/zabbix/zabbix.mk 2011-10-23 14:23:01 UTC (rev 5228)
@@ -28,10 +28,13 @@
define ZABBIX_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/src/zabbix_agent/zabbix_agentd $(TARGET_DIR)/usr/bin/zabbix_agentd
+ $(INSTALL) -m 0755 -D package/zabbix/zabbix.init $(TARGET_DIR)/etc/init.d/zabbix
+ ln -sf /tmp/etc/zabbix_agentd.conf $(TARGET_DIR)/etc/zabbix_agentd.conf
endef
define ZABBIX_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/bin/zabbix_agentd
+ rm -f $(TARGET_DIR)/etc/init.d/zabbix
endef
$(eval $(call AUTOTARGETS,package,zabbix))
Modified: branches/1.0/project/astlinux/target_skeleton/etc/group
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/group 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/group 2011-10-23 14:23:01 UTC (rev 5228)
@@ -12,4 +12,5 @@
audio:x:29:
video:x:44:
users:x:100:
+zabbix:x:906:
nobody:x:65535:
Modified: branches/1.0/project/astlinux/target_skeleton/etc/passwd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/passwd 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/passwd 2011-10-23 14:23:01 UTC (rev 5228)
@@ -1,4 +1,5 @@
root:x:0:0:root:/root:/bin/sh
sshd:x:22:22:sshd:/dev/null:/bin/false
ftp:x:21:21:ftp user:/home/ftp:/bin/false
+zabbix:x:906:906:Zabbix User:/dev/null:/bin/false
nobody:x:1000:1000:no one:/dev/null:/bin/false
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01zabbix
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01zabbix (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01zabbix 2011-10-23 14:23:01 UTC (rev 5228)
@@ -0,0 +1 @@
+link ../../init.d/zabbix
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K01zabbix
___________________________________________________________________
Added: svn:special
+ *
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S98zabbix
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S98zabbix (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S98zabbix 2011-10-23 14:23:01 UTC (rev 5228)
@@ -0,0 +1 @@
+link ../../init.d/zabbix
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S98zabbix
___________________________________________________________________
Added: svn:special
+ *
Modified: branches/1.0/project/astlinux/target_skeleton/etc/services
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/services 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/services 2011-10-23 14:23:01 UTC (rev 5228)
@@ -348,6 +348,8 @@
tproxy 8081/tcp # Transparent Proxy
tproxy 8081/udp # Transparent Proxy
mandelspawn 9359/udp mandelbrot # network mandelbrot
+zabbix_agent 10050/tcp # Zabbix Agent
+zabbix_trap 10051/tcp # Zabbix Trap
amanda 10080/udp # amanda backup services
kamanda 10081/tcp # amanda backup services (Kerberos)
kamanda 10081/udp # amanda backup services (Kerberos)
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow 2011-10-23 14:23:01 UTC (rev 5228)
@@ -1,4 +1,5 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+zabbix:!:0:99999:7:::
nobody:!:0:99999:7:::
Modified: branches/1.0/project/astlinux/target_skeleton/etc/shadow-
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/shadow- 2011-10-23 14:23:01 UTC (rev 5228)
@@ -1,4 +1,5 @@
root:$1$$axJeFIpwicqOTwFpuoUAs1:12215:0:99999:7:::
sshd:!:0:0:99999:7:::
ftp:!:0:0:99999:7:::
+zabbix:!:0:99999:7:::
nobody:!:0:99999:7:::
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-10-22 18:52:40 UTC (rev 5227)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-10-23 14:23:01 UTC (rev 5228)
@@ -909,6 +909,16 @@
## best module for you and load it automatically.
#ASTG729="auto"
+## Zabbix Agent Daemon
+## Zabbix is enabled if ZABBIX_SERVER is defined.
+#ZABBIX_SERVER="" # Comma/space separated list of IP addresses or hostnames for zabbix servers
+#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data
+#ZABBIX_HOSTNAME="" # Unique, case sensitive hostname, required for active checks
+#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally
+#ZABBIX_STARTAGENTS="3" # Number of pre-forked instances of zabbix_agentd, must be between 1-16
+#ZABBIX_DEBUGLEVEL="3" # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
+#ZABBIX_TIMEOUT="3" # Processing limit in seconds, must be between 1-30
+
## NFSROOTPATH
## For diskless clients, the path to use for a root filesystem.
#NFSROOTPATH="$INTIP:/mnt/kd/nfsroot"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-10-24 20:56:45
|
Revision: 5235
http://astlinux.svn.sourceforge.net/astlinux/?rev=5235&view=rev
Author: abelbeck
Date: 2011-10-24 20:56:38 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
r8168 package added, common RealTek PCI-e NIC's not found in linux 2.6.35
Revision Links:
--------------
http://astlinux.svn.sourceforge.net/astlinux/?rev=8168&view=rev
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/r8168/
branches/1.0/package/r8168/Config.in
branches/1.0/package/r8168/r8168.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-10-24 14:52:54 UTC (rev 5234)
+++ branches/1.0/astlinux.config 2011-10-24 20:56:38 UTC (rev 5235)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5225-dirty Configuration
-# Sat Oct 22 13:40:30 2011
+# Buildroot 2011.08-svn5234-dirty Configuration
+# Mon Oct 24 15:47:31 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -388,6 +388,7 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
BR2_PACKAGE_PCIUTILS=y
+BR2_PACKAGE_R8168=y
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-10-24 14:52:54 UTC (rev 5234)
+++ branches/1.0/astlinux18.config 2011-10-24 20:56:38 UTC (rev 5235)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5225-dirty Configuration
-# Sat Oct 22 13:40:30 2011
+# Buildroot 2011.08-svn5234-dirty Configuration
+# Mon Oct 24 15:47:40 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -383,6 +383,7 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
BR2_PACKAGE_PCIUTILS=y
+BR2_PACKAGE_R8168=y
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-10-24 14:52:54 UTC (rev 5234)
+++ branches/1.0/initrd.config 2011-10-24 20:56:38 UTC (rev 5235)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5225-dirty Configuration
-# Sat Oct 22 13:40:30 2011
+# Buildroot 2011.08-svn5234-dirty Configuration
+# Mon Oct 24 15:47:50 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-10-24 14:52:54 UTC (rev 5234)
+++ branches/1.0/package/Config.in 2011-10-24 20:56:38 UTC (rev 5235)
@@ -210,6 +210,7 @@
source "package/ntfs-3g/Config.in"
source "package/ntfsprogs/Config.in"
source "package/pciutils/Config.in"
+source "package/r8168/Config.in"
source "package/rng-tools/Config.in"
source "package/sdparm/Config.in"
source "package/setserial/Config.in"
Added: branches/1.0/package/r8168/Config.in
===================================================================
--- branches/1.0/package/r8168/Config.in (rev 0)
+++ branches/1.0/package/r8168/Config.in 2011-10-24 20:56:38 UTC (rev 5235)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_R8168
+ bool "r8168"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Linux NIC device driver r8168 released for RealTek RTL8168B/8111B,
+ RTL8168C/8111C, RTL8168CP/8111CP, RTL8168D/8111D, RTL8168DP/8111DP,
+ and RTL8168E/8111E
+
+ Gigabit Ethernet controllers with PCI-Express interface.
+
+ http://www.realtek.com.tw/downloads/
+
Added: branches/1.0/package/r8168/r8168.mk
===================================================================
--- branches/1.0/package/r8168/r8168.mk (rev 0)
+++ branches/1.0/package/r8168/r8168.mk 2011-10-24 20:56:38 UTC (rev 5235)
@@ -0,0 +1,39 @@
+#############################################################
+#
+# r8168
+#
+#############################################################
+
+R8168_VERSION = 8.025.00
+R8168_SOURCE:=r8168-$(R8168_VERSION).tar.bz2
+R8168_SITE = http://files.astlinux.org
+R8168_DEPENDENCIES = linux
+R8168_SUBDIR = src
+
+R8168_UNINSTALL_STAGING_OPT = --version
+
+R8168_MAKE_OPT += \
+ CC=$(TARGET_CC) \
+ LD=$(TARGET_LD) \
+ KVER=$(LINUX_VERSION_PROBED) \
+ KDIR=$(LINUX_DIR) \
+ PWD=$(@D) \
+ KEXT=ko \
+ KFLAG=26x \
+ modules
+
+define R8168_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+define R8168_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 644 -D $(@D)/src/r8168.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/r8168.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+define R8168_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/r8168.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+$(eval $(call AUTOTARGETS,package,r8168))
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-10-24 14:52:54 UTC (rev 5234)
+++ branches/1.0/runnix.config 2011-10-24 20:56:38 UTC (rev 5235)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5225-dirty Configuration
-# Sat Oct 22 13:40:30 2011
+# Buildroot 2011.08-svn5234-dirty Configuration
+# Mon Oct 24 15:47:49 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -378,6 +378,7 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_R8168 is not set
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-03 21:34:07
|
Revision: 5247
http://astlinux.svn.sourceforge.net/astlinux/?rev=5247&view=rev
Author: abelbeck
Date: 2011-11-03 21:34:01 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
add net6501 board type
Modified Paths:
--------------
branches/1.0/scripts/master-build
Added Paths:
-----------
branches/1.0/project/astlinux/board/net6501/
branches/1.0/project/astlinux/board/net6501/runnix.conf
branches/1.0/project/astlinux/board/net6501/target_skeleton/
branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/
branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/rc.modules
Added: branches/1.0/project/astlinux/board/net6501/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/net6501/runnix.conf (rev 0)
+++ branches/1.0/project/astlinux/board/net6501/runnix.conf 2011-11-03 21:34:01 UTC (rev 5247)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astimg=ASTVER.run astlinux=net6501 astkd=auto asturw=auto astlive ide_core.nodma=0.0 ide_core.nodma=0.1 ide_core.nodma=1.0 ide_core.nodma=1.1 console=ttyS0,19200n8"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab (rev 0)
+++ branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab 2011-11-03 21:34:01 UTC (rev 5247)
@@ -0,0 +1,12 @@
+#
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown
Property changes on: branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/inittab
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/rc.modules (rev 0)
+++ branches/1.0/project/astlinux/board/net6501/target_skeleton/etc/rc.modules 2011-11-03 21:34:01 UTC (rev 5247)
@@ -0,0 +1,22 @@
+# These modules get modprobe'd when the system starts up.
+rtc
+#Comment out the modules you don't need, and change the order to
+#move eth0 to eth1, etc.
+#Ethernet support
+#10/100 first, then Gigabit
+#3c59x
+#typhoon
+#tulip
+#eepro100
+#natsemi
+#via-rhine
+#forcedeth
+#8139cp
+#8139too
+#pcnet32
+#acenic
+#e1000
+e1000e
+#ns83820
+#r8169
+#tg3
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2011-11-03 21:16:53 UTC (rev 5246)
+++ branches/1.0/scripts/master-build 2011-11-03 21:34:01 UTC (rev 5247)
@@ -5,7 +5,7 @@
FAT_SIZE=192
-BOARDS="geni586 geni586-serial net5501 alix via via-serial viac7 viac7-serial net4801 wrap"
+BOARDS="geni586 geni586-serial net6501 net5501 alix via via-serial viac7 viac7-serial net4801 wrap"
RUNFS_DIR="output/build/runfs"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-08 02:40:03
|
Revision: 5255
http://astlinux.svn.sourceforge.net/astlinux/?rev=5255&view=rev
Author: abelbeck
Date: 2011-11-08 02:39:57 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
standard configs, specify linux kernel from a working mirror
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/runnix.config
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-08 02:23:13 UTC (rev 5254)
+++ branches/1.0/astlinux.config 2011-11-08 02:39:57 UTC (rev 5255)
@@ -839,7 +839,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.free.fr/mirrors/ftp.kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-08 02:23:13 UTC (rev 5254)
+++ branches/1.0/astlinux18.config 2011-11-08 02:39:57 UTC (rev 5255)
@@ -834,7 +834,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.free.fr/mirrors/ftp.kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-11-08 02:23:13 UTC (rev 5254)
+++ branches/1.0/runnix.config 2011-11-08 02:39:57 UTC (rev 5255)
@@ -766,7 +766,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.free.fr/mirrors/ftp.kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-14 23:12:15
|
Revision: 5257
http://astlinux.svn.sourceforge.net/astlinux/?rev=5257&view=rev
Author: abelbeck
Date: 2011-11-14 23:12:08 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------
nmap package added from 0.7 for Michael, not enabled as before
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/nmap/
branches/1.0/package/nmap/Config.in
branches/1.0/package/nmap/nmap.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-08 02:59:39 UTC (rev 5256)
+++ branches/1.0/astlinux.config 2011-11-14 23:12:08 UTC (rev 5257)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5234-dirty Configuration
-# Mon Oct 24 15:47:31 2011
+# Buildroot 2011.08-svn5256-dirty Configuration
+# Mon Nov 14 15:56:55 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -683,6 +683,7 @@
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
+# BR2_PACKAGE_NMAP is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-08 02:59:39 UTC (rev 5256)
+++ branches/1.0/astlinux18.config 2011-11-14 23:12:08 UTC (rev 5257)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5234-dirty Configuration
-# Mon Oct 24 15:47:40 2011
+# Buildroot 2011.08-svn5256-dirty Configuration
+# Mon Nov 14 15:56:57 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -678,6 +678,7 @@
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
+# BR2_PACKAGE_NMAP is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-11-08 02:59:39 UTC (rev 5256)
+++ branches/1.0/initrd.config 2011-11-14 23:12:08 UTC (rev 5257)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5234-dirty Configuration
-# Mon Oct 24 15:47:50 2011
+# Buildroot 2011.08-svn5256-dirty Configuration
+# Mon Nov 14 15:57:02 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -579,6 +579,7 @@
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
# BR2_PACKAGE_NGREP is not set
+# BR2_PACKAGE_NMAP is not set
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-11-08 02:59:39 UTC (rev 5256)
+++ branches/1.0/package/Config.in 2011-11-14 23:12:08 UTC (rev 5257)
@@ -468,6 +468,7 @@
source "package/nfs-utils/Config.in"
source "package/ngircd/Config.in"
source "package/ngrep/Config.in"
+source "package/nmap/Config.in"
source "package/ntp/Config.in"
source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
Added: branches/1.0/package/nmap/Config.in
===================================================================
--- branches/1.0/package/nmap/Config.in (rev 0)
+++ branches/1.0/package/nmap/Config.in 2011-11-14 23:12:08 UTC (rev 5257)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_NMAP
+ bool "nmap"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ select BR2_PACKAGE_OPENSSL
+ help
+ THE security scanner
+
+ http://nmap.org/
+
+config BR2_PACKAGE_NMAP_DB
+ depends on BR2_PACKAGE_NMAP
+ bool "nmap-db"
+ default "n"
+ help
+ Various "DBs" for nmap:
+ - OS Detection
+ - OUI lookup table for MAC vendor detection
Added: branches/1.0/package/nmap/nmap.mk
===================================================================
--- branches/1.0/package/nmap/nmap.mk (rev 0)
+++ branches/1.0/package/nmap/nmap.mk 2011-11-14 23:12:08 UTC (rev 5257)
@@ -0,0 +1,74 @@
+#############################################################
+#
+# nmap
+#
+#############################################################
+
+NMAP_VER:=4.76
+NMAP_DIR:=$(BUILD_DIR)/nmap-$(NMAP_VER)
+NMAP_SITE:=http://nmap.org/dist
+NMAP_SOURCE:=nmap-$(NMAP_VER).tar.bz2
+NMAP_CAT:=bzcat
+
+$(DL_DIR)/$(NMAP_SOURCE):
+ $(WGET) -P $(DL_DIR) $(NMAP_SITE)/$(NMAP_SOURCE)
+
+nmap-source: $(NMAP_DIR)/.unpacked
+
+$(NMAP_DIR)/.unpacked: $(DL_DIR)/$(NMAP_SOURCE)
+ $(NMAP_CAT) $(DL_DIR)/$(NMAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(NMAP_DIR) package/nmap/ nmap\*.patch
+ touch $@
+
+$(NMAP_DIR)/.configured: $(NMAP_DIR)/.unpacked | libpcap openssl
+ ( \
+ cd $(NMAP_DIR) ; \
+ autoconf ; \
+ BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS='$(TARGET_CFLAGS)' \
+ ac_cv_linux_vers=2 \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --libdir=$(STAGING_DIR)/lib \
+ --prefix=/usr \
+ --includedir=$(STAGING_DIR)/include \
+ --with-liblua=included \
+ --without-zenmap \
+ --with-libpcap=included \
+ --with-pcap=linux \
+ )
+ touch $@
+
+$(NMAP_DIR)/nmap: $(NMAP_DIR)/.configured
+ $(MAKE) CC="$(TARGET_CC)" -C $(NMAP_DIR)
+
+$(TARGET_DIR)/usr/sbin/nmap: $(NMAP_DIR)/nmap
+ $(INSTALL) -D -m 0755 $(NMAP_DIR)/nmap $(TARGET_DIR)/usr/sbin/nmap
+ifeq ($(strip $(BR2_PACKAGE_NMAP_DB)),y)
+ mkdir -p $(TARGET_DIR)/usr/share/nmap
+ $(INSTALL) -D -m 0644 $(NMAP_DIR)/nmap-os-db $(NMAP_DIR)/nmap-mac-prefixes \
+ $(NMAP_DIR)/nmap-services $(NMAP_DIR)/nmap-service-probes \
+ $(NMAP_DIR)/nmap-protocols $(NMAP_DIR)/nmap-rpc $(TARGET_DIR)/usr/share/nmap
+endif
+
+nmap: $(TARGET_DIR)/usr/sbin/nmap
+
+nmap-clean:
+ rm -f $(TARGET_DIR)/usr/sbin/nmap
+ rm -rf $(TARGET_DIR)/usr/share/nmap
+ -$(MAKE) -C $(NMAP_DIR) clean
+
+nmap-dirclean:
+ rm -rf $(NMAP_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_NMAP)),y)
+TARGETS+=nmap
+endif
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-11-08 02:59:39 UTC (rev 5256)
+++ branches/1.0/runnix.config 2011-11-14 23:12:08 UTC (rev 5257)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5234-dirty Configuration
-# Mon Oct 24 15:47:49 2011
+# Buildroot 2011.08-svn5256-dirty Configuration
+# Mon Nov 14 15:56:59 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -612,6 +612,7 @@
# BR2_PACKAGE_NFS_UTILS is not set
# BR2_PACKAGE_NGIRCD is not set
# BR2_PACKAGE_NGREP is not set
+# BR2_PACKAGE_NMAP is not set
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-19 00:50:27
|
Revision: 5262
http://astlinux.svn.sourceforge.net/astlinux/?rev=5262&view=rev
Author: abelbeck
Date: 2011-11-19 00:50:21 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
asterisk, add a selector for Asterisk 10
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/astlinux.config 2011-11-19 00:50:21 UTC (rev 5262)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:56:55 2011
+# Buildroot 2011.08-svn5261-dirty Configuration
+# Fri Nov 18 18:36:58 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
BR2_PACKAGE_ASTERISK_v1_4=y
# BR2_PACKAGE_ASTERISK_v1_6 is not set
# BR2_PACKAGE_ASTERISK_v1_8 is not set
+# BR2_PACKAGE_ASTERISK_v10_0 is not set
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/astlinux18.config 2011-11-19 00:50:21 UTC (rev 5262)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:56:57 2011
+# Buildroot 2011.08-svn5261-dirty Configuration
+# Fri Nov 18 18:37:39 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
# BR2_PACKAGE_ASTERISK_v1_4 is not set
# BR2_PACKAGE_ASTERISK_v1_6 is not set
BR2_PACKAGE_ASTERISK_v1_8=y
+# BR2_PACKAGE_ASTERISK_v10_0 is not set
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
BR2_PACKAGE_ASTERISK_GUI=y
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/package/asterisk/Config.in 2011-11-19 00:50:21 UTC (rev 5262)
@@ -30,6 +30,11 @@
bool "Asterisk v1.8.x"
help
Asterisk Long Term Stable Release.
+
+ config BR2_PACKAGE_ASTERISK_v10_0
+ bool "Asterisk v10.0.x"
+ help
+ Asterisk Standard Release.
endchoice
config BR2_PACKAGE_ASTERISK_CHANMISDN
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/package/asterisk/asterisk.mk 2011-11-19 00:50:21 UTC (rev 5262)
@@ -9,7 +9,11 @@
ifeq ($(BR2_PACKAGE_ASTERISK_v1_6),y)
ASTERISK_VERSION := 1.6.2.20
else
+ ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
ASTERISK_VERSION := 1.8.7.1
+ else
+ASTERISK_VERSION := 10.0.0-rc2
+ endif
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -66,11 +70,13 @@
endif
ifeq ($(strip $(BR2_PACKAGE_LIBSRTP)),y)
- ifeq ($(strip $(BR2_PACKAGE_ASTERISK_v1_8)),y)
+ ifneq ($(ASTERISK_VERSION_TUPLE),1.4)
+ ifneq ($(ASTERISK_VERSION_TUPLE),1.6)
ASTERISK_EXTRAS+=libsrtp
ASTERISK_CONFIGURE_ARGS+= \
--with-srtp="$(STAGING_DIR)/usr"
endif
+ endif
endif
ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
@@ -246,9 +252,11 @@
$(INSTALL) -D -m 0755 package/asterisk/safe_asterisk $(TARGET_DIR)/usr/sbin/safe_asterisk
$(INSTALL) -D -m 0755 package/asterisk/asterisk-sip-monitor $(TARGET_DIR)/usr/sbin/asterisk-sip-monitor
$(INSTALL) -D -m 0755 package/asterisk/asterisk-sip-monitor-ctrl $(TARGET_DIR)/usr/sbin/asterisk-sip-monitor-ctrl
-ifeq ($(ASTERISK_VERSION_TUPLE),1.8)
+ifneq ($(ASTERISK_VERSION_TUPLE),1.4)
+ifneq ($(ASTERISK_VERSION_TUPLE),1.6)
$(INSTALL) -D -m 0755 $(ASTERISK_DIR)/contrib/scripts/ast_tls_cert $(TARGET_DIR)/usr/sbin/ast_tls_cert
endif
+endif
mkdir -p $(TARGET_DIR)/stat/var/lib/asterisk
mv $(TARGET_DIR)/var/lib/asterisk/* $(TARGET_DIR)/stat/var/lib/asterisk/
rmdir $(TARGET_DIR)/var/lib/asterisk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-22 12:45:46
|
Revision: 5266
http://astlinux.svn.sourceforge.net/astlinux/?rev=5266&view=rev
Author: abelbeck
Date: 2011-11-22 12:45:35 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
ntpd, version bump to 4.2.6p4, change setting initial clock from 'ntpd -gq' to 'sntp -s' to fix an issue where 'ntpd -gq' could hang for up to three minutes in some cases
Note: BR2_PACKAGE_NTP_SNTP=y is now required, devs make that change in your custom .configs
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/ntp/ntp.mk
branches/1.0/package/ntp/ntpd.init
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/astlinux.config 2011-11-22 12:45:35 UTC (rev 5266)
@@ -686,7 +686,7 @@
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
+BR2_PACKAGE_NTP_SNTP=y
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
# BR2_PACKAGE_NTP_NTP_WAIT is not set
BR2_PACKAGE_NTP_NTPD=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/astlinux18.config 2011-11-22 12:45:35 UTC (rev 5266)
@@ -681,7 +681,7 @@
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
+BR2_PACKAGE_NTP_SNTP=y
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
# BR2_PACKAGE_NTP_NTP_WAIT is not set
BR2_PACKAGE_NTP_NTPD=y
Modified: branches/1.0/package/ntp/ntp.mk
===================================================================
--- branches/1.0/package/ntp/ntp.mk 2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/package/ntp/ntp.mk 2011-11-22 12:45:35 UTC (rev 5266)
@@ -3,7 +3,7 @@
# ntp
#
#############################################################
-NTP_VERSION = 4.2.4p8
+NTP_VERSION = 4.2.6p4
NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
Modified: branches/1.0/package/ntp/ntpd.init
===================================================================
--- branches/1.0/package/ntp/ntpd.init 2011-11-21 20:02:58 UTC (rev 5265)
+++ branches/1.0/package/ntp/ntpd.init 2011-11-22 12:45:35 UTC (rev 5266)
@@ -3,6 +3,10 @@
. /etc/rc.conf
init () {
+
+ # So sntp doesn't complain
+ touch /var/db/ntp-kod
+
if [ -f /mnt/kd/ntpd.conf ]; then
ln -sf /mnt/kd/ntpd.conf /tmp/etc/ntpd.conf
else
@@ -59,10 +63,13 @@
if nslookup $first >/dev/null; then
# Set the clock (large change) and exit
- ntpd $NTPAF -g -q -c /etc/ntpd.conf
+ sntp $NTPAF -s -t4 $first
+ if [ $? -eq 0 -a -r /dev/rtc ]; then
+ hwclock -wu --noadjfile 2>/dev/null
+ fi
sleep 1
# Maintain the clock (small changes)
- ntpd $NTPAF -c /etc/ntpd.conf
+ ntpd $NTPAF -g -c /etc/ntpd.conf
fi
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-28 17:44:38
|
Revision: 5275
http://astlinux.svn.sourceforge.net/astlinux/?rev=5275&view=rev
Author: abelbeck
Date: 2011-11-28 17:44:31 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
iksemel package added, required for Jabber/GTalk, disabled for now
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
Added Paths:
-----------
branches/1.0/package/iksemel/
branches/1.0/package/iksemel/Config.in
branches/1.0/package/iksemel/iksemel.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-27 01:54:53 UTC (rev 5274)
+++ branches/1.0/astlinux.config 2011-11-28 17:44:31 UTC (rev 5275)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5261-dirty Configuration
-# Fri Nov 18 18:36:58 2011
+# Buildroot 2011.08-svn5274-dirty Configuration
+# Mon Nov 28 11:40:38 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -603,6 +603,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_IKSEMEL is not set
# BR2_PACKAGE_LIBROXML is not set
BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-27 01:54:53 UTC (rev 5274)
+++ branches/1.0/astlinux18.config 2011-11-28 17:44:31 UTC (rev 5275)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5261-dirty Configuration
-# Fri Nov 18 18:37:39 2011
+# Buildroot 2011.08-svn5274-dirty Configuration
+# Mon Nov 28 11:40:45 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -598,6 +598,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_IKSEMEL is not set
# BR2_PACKAGE_LIBROXML is not set
BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-11-27 01:54:53 UTC (rev 5274)
+++ branches/1.0/package/Config.in 2011-11-28 17:44:31 UTC (rev 5275)
@@ -392,6 +392,7 @@
menu "JSON/XML"
source "package/expat/Config.in"
source "package/ezxml/Config.in"
+source "package/iksemel/Config.in"
source "package/libroxml/Config.in"
source "package/libxml-parser-perl/Config.in"
source "package/libxml2/Config.in"
Added: branches/1.0/package/iksemel/Config.in
===================================================================
--- branches/1.0/package/iksemel/Config.in (rev 0)
+++ branches/1.0/package/iksemel/Config.in 2011-11-28 17:44:31 UTC (rev 5275)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_IKSEMEL
+ bool "iksemel"
+ default n
+ depends on BR2_PACKAGE_OPENSSL
+ help
+ iksemel is an XML (eXtensible Markup Language) parser library
+ designed for Jabber applications.
+
+ http://code.google.com/p/iksemel/
+
Added: branches/1.0/package/iksemel/iksemel.mk
===================================================================
--- branches/1.0/package/iksemel/iksemel.mk (rev 0)
+++ branches/1.0/package/iksemel/iksemel.mk 2011-11-28 17:44:31 UTC (rev 5275)
@@ -0,0 +1,32 @@
+#############################################################
+#
+# iksemel
+#
+#############################################################
+IKSEMEL_VERSION = 1.5-pre1
+IKSEMEL_SOURCE = iksemel-$(IKSEMEL_VERSION).tar.gz
+#IKSEMEL_SITE = http://iksemel.googlecode.com/files
+IKSEMEL_SITE = http://files.astlinux.org
+IKSEMEL_DEPENDENCIES = openssl
+
+IKSEMEL_INSTALL_STAGING = YES
+
+IKSEMEL_CONF_OPT = \
+ --disable-python
+
+define IKSEMEL_CONFIGURE_PREFLIGHT
+ ( cd $(@D) ; \
+ ./autogen.sh ; \
+ )
+endef
+IKSEMEL_PRE_CONFIGURE_HOOKS += IKSEMEL_CONFIGURE_PREFLIGHT
+
+define IKSEMEL_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libiksemel.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define IKSEMEL_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libiksemel.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,iksemel))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-11-28 22:18:36
|
Revision: 5276
http://astlinux.svn.sourceforge.net/astlinux/?rev=5276&view=rev
Author: abelbeck
Date: 2011-11-28 22:18:30 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
asterisk, enable iksemel lib, create Asterisk res_jabber and chan_gtalk, additionally Asterisk 1.6.2 and 1.8 chan_jingle
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/project/astlinux/asterisk.makeopts
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-11-28 17:44:31 UTC (rev 5275)
+++ branches/1.0/astlinux.config 2011-11-28 22:18:30 UTC (rev 5276)
@@ -603,7 +603,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_IKSEMEL is not set
+BR2_PACKAGE_IKSEMEL=y
# BR2_PACKAGE_LIBROXML is not set
BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-11-28 17:44:31 UTC (rev 5275)
+++ branches/1.0/astlinux18.config 2011-11-28 22:18:30 UTC (rev 5276)
@@ -598,7 +598,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_IKSEMEL is not set
+BR2_PACKAGE_IKSEMEL=y
# BR2_PACKAGE_LIBROXML is not set
BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2011-11-28 17:44:31 UTC (rev 5275)
+++ branches/1.0/package/asterisk/asterisk.mk 2011-11-28 22:18:30 UTC (rev 5276)
@@ -63,6 +63,12 @@
endif
endif
+ifeq ($(strip $(BR2_PACKAGE_IKSEMEL)),y)
+ASTERISK_EXTRAS+=iksemel
+ASTERISK_CONFIGURE_ARGS+= \
+ --with-iksemel="$(STAGING_DIR)/usr"
+endif
+
ifeq ($(strip $(BR2_PACKAGE_LIBPRI)),y)
ASTERISK_EXTRAS+=libpri
ASTERISK_CONFIGURE_ARGS+= \
Modified: branches/1.0/project/astlinux/asterisk.makeopts
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts 2011-11-28 17:44:31 UTC (rev 5275)
+++ branches/1.0/project/astlinux/asterisk.makeopts 2011-11-28 22:18:30 UTC (rev 5276)
@@ -1,11 +1,11 @@
MENUSELECT_APPS=app_ivrdemo app_osplookup app_rpt app_skel
MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds
-MENUSELECT_CHANNELS=chan_alsa chan_features chan_gtalk chan_h323 chan_nbs chan_vpb
+MENUSELECT_CHANNELS=chan_alsa chan_features chan_h323 chan_nbs chan_vpb
MENUSELECT_CODECS=codec_speex
MENUSELECT_FORMATS=format_ogg_vorbis
MENUSELECT_FUNCS=func_odbc
MENUSELECT_PBX=pbx_gtkconsole
-MENUSELECT_RES=res_config_odbc res_config_pgsql res_jabber res_odbc res_snmp
+MENUSELECT_RES=res_config_odbc res_config_pgsql res_odbc res_snmp
MENUSELECT_OPTS_app_voicemail=
MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_EMBED=
@@ -20,7 +20,6 @@
MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
@@ -29,6 +28,5 @@
MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-04 00:48:30
|
Revision: 5280
http://astlinux.svn.sourceforge.net/astlinux/?rev=5280&view=rev
Author: abelbeck
Date: 2011-12-04 00:48:24 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
shellinabox, new package, tie into lighttpd as proxy server, and add access logging variables for lighttpd
Special thanks for David Kerr for laying the groundwork
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/shellinabox/
branches/1.0/package/shellinabox/Config.in
branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch
branches/1.0/package/shellinabox/shellinabox.mk
branches/1.0/package/shellinabox/shellinaboxd.init
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15shellinaboxd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S75shellinaboxd
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/astlinux.config 2011-12-04 00:48:24 UTC (rev 5280)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5274-dirty Configuration
-# Mon Nov 28 11:40:38 2011
+# Buildroot 2011.08-svn5279-dirty Configuration
+# Sat Dec 3 17:23:02 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -718,6 +718,7 @@
BR2_PACKAGE_RSYNC=y
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
+BR2_PACKAGE_SHELLINABOX=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/astlinux18.config 2011-12-04 00:48:24 UTC (rev 5280)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5274-dirty Configuration
-# Mon Nov 28 11:40:45 2011
+# Buildroot 2011.08-svn5279-dirty Configuration
+# Sat Dec 3 17:23:03 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -713,6 +713,7 @@
BR2_PACKAGE_RSYNC=y
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
+BR2_PACKAGE_SHELLINABOX=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/package/Config.in 2011-12-04 00:48:24 UTC (rev 5280)
@@ -489,6 +489,7 @@
source "package/rsync/Config.in"
source "package/samba/Config.in"
source "package/ser2net/Config.in"
+source "package/shellinabox/Config.in"
source "package/socat/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/squid/Config.in"
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2011-12-04 00:48:24 UTC (rev 5280)
@@ -2,9 +2,10 @@
server.modules = (
"mod_access",
+ "mod_accesslog",
"mod_auth",
"mod_fastcgi",
- "mod_accesslog" )
+ "mod_proxy" )
server.document-root = "@HTTPDIR@"
server.errorlog-use-syslog = "enable"
@@ -68,7 +69,7 @@
"" => "application/octet-stream",
)
-accesslog.filename = "/var/log/lighttpd/access.log"
+accesslog.filename = "@HTTP_ACCESSLOG@"
url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPCGI@ )
dir-listing.activate = "@HTTP_LISTING@"
static-file.exclude-extensions = ( ".php" )
@@ -80,14 +81,14 @@
ssl.engine = "enable"
ssl.pemfile = "@HTTPSCERT@"
server.document-root = "/var/www"
- accesslog.filename = "/var/log/lighttpd/ssl-access.log"
+ accesslog.filename = "@HTTPS_ACCESSLOG@"
url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )
dir-listing.activate = "@HTTPS_LISTING@"
}
@IPV6@$SERVER["socket"] == "[::]:80" {
@IPV6@ server.document-root = "@HTTPDIR@"
-@IPV6@ accesslog.filename = "/var/log/lighttpd/access.log"
+@IPV6@ accesslog.filename = "@HTTP_ACCESSLOG@"
@IPV6@ url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPCGI@ )
@IPV6@ dir-listing.activate = "@HTTP_LISTING@"
@IPV6@}
@@ -96,7 +97,7 @@
@IPV6@ ssl.engine = "enable"
@IPV6@ ssl.pemfile = "@HTTPSCERT@"
@IPV6@ server.document-root = "/var/www"
-@IPV6@ accesslog.filename = "/var/log/lighttpd/ssl-access.log"
+@IPV6@ accesslog.filename = "@HTTPS_ACCESSLOG@"
@IPV6@ url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )
@IPV6@ dir-listing.activate = "@HTTPS_LISTING@"
@IPV6@}
@@ -126,3 +127,15 @@
"require" => "valid-user"
)
)
+
+@CLI_PROXY_SERVER@$HTTP["scheme"] == "https" {
+@CLI_PROXY_SERVER@ proxy.server = ( "/admin/cli/" =>
+@CLI_PROXY_SERVER@ ( "localhost" =>
+@CLI_PROXY_SERVER@ (
+@CLI_PROXY_SERVER@ "host" => "127.0.0.1",
+@CLI_PROXY_SERVER@ "port" => "4200"
+@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@ )
+@CLI_PROXY_SERVER@}
+
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/package/lighttpd/lighttpd.init 2011-12-04 00:48:24 UTC (rev 5280)
@@ -41,6 +41,16 @@
else
https_listing="enable"
fi
+ if [ "$HTTP_ACCESSLOG" = "yes" ]; then
+ http_accesslog="/var/log/lighttpd/access.log"
+ else
+ http_accesslog="/dev/null"
+ fi
+ if [ "$HTTPS_ACCESSLOG" = "yes" ]; then
+ https_accesslog="/var/log/lighttpd/ssl-access.log"
+ else
+ https_accesslog="/dev/null"
+ fi
if [ "$HTTPCGI" = "yes" ]; then
httpcgi=""
else
@@ -56,15 +66,23 @@
else
ipv6="#"
fi
+ if [ "$CLI_PROXY_SERVER" = "shellinaboxd" ]; then
+ cli_proxy_server=""
+ else
+ cli_proxy_server="#"
+ fi
sed -i -e "s|@HOSTNAME@|${HOSTNAME}|g" \
-e "s|@HTTPDIR@|${httpdir}|g" \
-e "s|@HTTPSCERT@|${httpscert}|g" \
-e "s|@HTTP_LISTING@|${http_listing}|g" \
-e "s|@HTTPS_LISTING@|${https_listing}|g" \
+ -e "s|@HTTP_ACCESSLOG@|${http_accesslog}|g" \
+ -e "s|@HTTPS_ACCESSLOG@|${https_accesslog}|g" \
-e "s|@HTTPCGI@|${httpcgi}|g" \
-e "s|@HTTPSCGI@|${httpscgi}|g" \
-e "s|@IPV6@|${ipv6}|g" \
+ -e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
/tmp/etc/lighttpd.conf
}
Added: branches/1.0/package/shellinabox/Config.in
===================================================================
--- branches/1.0/package/shellinabox/Config.in (rev 0)
+++ branches/1.0/package/shellinabox/Config.in 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SHELLINABOX
+ bool "shellinabox"
+ default n
+ depends on BR2_PACKAGE_LIGHTTPD
+ help
+ Shell In A Box implements a web server that can export arbitrary
+ command line tools to a web based terminal emulator. This
+ emulator is accessible to any JavaScript and CSS enabled web
+ browser and does not require any additional browser plugins.
+
+ http://code.google.com/p/shellinabox/
+
Added: branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch
===================================================================
--- branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch (rev 0)
+++ branches/1.0/package/shellinabox/shellinabox-ios-vt100.patch 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1,24 @@
+--- shellinabox-239/shellinabox/vt100.js.orig 2011-11-30 22:55:50.000000000 -0600
++++ shellinabox-239/shellinabox/vt100.js 2011-11-30 22:59:20.000000000 -0600
+@@ -289,6 +289,10 @@
+ this.signature = Math.floor(16807*this.signature + 1) %
+ ((1 << 31) - 1);
+ }
++ var isMobile = navigator.userAgent.match(/iPad|iPhone|iPod/i) != null;
++ if (isMobile) {
++ this.softKeyboard = true;
++ }
+ if (typeof userCSSList != 'undefined') {
+ for (var i = 0; i < userCSSList.length; ++i) {
+ var label = userCSSList[i][0];
+@@ -971,6 +971,10 @@
+ document.documentElement.clientWidth ||
+ document.body.clientWidth) -
+ marginRight != x + this.container.offsetWidth;
++ var isMobile = navigator.userAgent.match(/iPad|iPhone|iPod/i) != null;
++ if (isMobile) {
++ this.isEmbedded = false;
++ }
+ if (!this.isEmbedded) {
+ // Some browsers generate resize events when the terminal is first
+ // shown. Disable showing the size indicator until a little bit after
Added: branches/1.0/package/shellinabox/shellinabox.mk
===================================================================
--- branches/1.0/package/shellinabox/shellinabox.mk (rev 0)
+++ branches/1.0/package/shellinabox/shellinabox.mk 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1,22 @@
+#############################################################
+#
+# shellinabox
+#
+#############################################################
+SHELLINABOX_VERSION = 239
+SHELLINABOX_SOURCE = shellinabox-$(SHELLINABOX_VERSION).tar.gz
+#SHELLINABOX_SITE = http://shellinabox.googlecode.com/files
+SHELLINABOX_SITE = http://files.astlinux.org
+SHELLINABOX_DEPENDENCIES = openssl
+
+define SHELLINABOX_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/shellinaboxd $(TARGET_DIR)/usr/bin/shellinaboxd
+ $(INSTALL) -D -m 0755 package/shellinabox/shellinaboxd.init $(TARGET_DIR)/etc/init.d/shellinaboxd
+endef
+
+define SHELLINABOX_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/shellinaboxd
+ rm -f $(TARGET_DIR)/etc/init.d/shellinaboxd
+endef
+
+$(eval $(call AUTOTARGETS,package,shellinabox))
Added: branches/1.0/package/shellinabox/shellinaboxd.init
===================================================================
--- branches/1.0/package/shellinabox/shellinaboxd.init (rev 0)
+++ branches/1.0/package/shellinabox/shellinaboxd.init 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+ :
+}
+
+start () {
+
+ if [ "$CLI_PROXY_SERVER" = "shellinaboxd" ]; then
+ echo "Starting shellinaboxd..."
+
+ shellinaboxd -u root -g nobody --no-beep --background=/var/run/shellinaboxd.pid \
+ --disable-ssl --localhost-only --service=/admin/cli/:nobody:nobody:/:/bin/login
+ fi
+}
+
+stop () {
+
+ if [ -f /var/run/shellinaboxd.pid ]; then
+ echo "Stopping shellinaboxd..."
+
+ kill $(cat /var/run/shellinaboxd.pid) >/dev/null 2>&1
+ rm -f /var/run/shellinaboxd.pid
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15shellinaboxd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15shellinaboxd (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15shellinaboxd 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1 @@
+link ../../init.d/shellinaboxd
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K15shellinaboxd
___________________________________________________________________
Added: svn:special
+ *
Added: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S75shellinaboxd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S75shellinaboxd (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S75shellinaboxd 2011-12-04 00:48:24 UTC (rev 5280)
@@ -0,0 +1 @@
+link ../../init.d/shellinaboxd
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S75shellinaboxd
___________________________________________________________________
Added: svn:special
+ *
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-12-03 15:43:02 UTC (rev 5279)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-12-04 00:48:24 UTC (rev 5280)
@@ -287,9 +287,15 @@
## tftpd package is not installed.
TFTPD=dnsmasq
+## CLI (Command Line Interface) Proxy Server (shellinaboxd)
+## Provides a 'login' prompt via the URL, https://pbx/admin/cli/
+## To start shellinaboxd, set to 'shellinaboxd'. Disabled by default.
+CLI_PROXY_SERVER=""
+
## HTTPS Server
HTTPSDIR="/stat/var/www" # Define the location to serve HTTPS from
HTTPS_LISTING="yes" # Allow directory listing if no index.* file exists
+HTTPS_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/ssl-access.log
HTTPSCGI="yes" # Define yes|no to enable CGI
HTTPSCERT="/etc/ssl/mini_httpd.pem" # Path to the https certificate
HTTPSUSER="root" # deprecated
@@ -298,6 +304,7 @@
## If you set HTTPDIR, serve files from that directory.
HTTPDIR="/tftpboot"
HTTP_LISTING="yes"
+HTTP_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/access.log
HTTPCGI="no"
HTTPUSER="nobody" # deprecated
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2011-12-06 20:20:45
|
Revision: 5287
http://astlinux.svn.sourceforge.net/astlinux/?rev=5287&view=rev
Author: krisk84
Date: 2011-12-06 20:20:38 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
add runnix-uclibc config and support to change configs in build script
Modified Paths:
--------------
branches/1.0/scripts/build-runnix
Added Paths:
-----------
branches/1.0/runnix-uclibc.config
Added: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config (rev 0)
+++ branches/1.0/runnix-uclibc.config 2011-12-06 20:20:38 UTC (rev 5287)
@@ -0,0 +1,778 @@
+#
+# Automatically generated make config: don't edit
+# Buildroot 2011.08-svn5256-dirty Configuration
+# Mon Nov 14 15:56:59 2011
+#
+BR2_HAVE_DOT_CONFIG=y
+# BR2_arm is not set
+# BR2_armeb is not set
+# BR2_avr32 is not set
+# BR2_bfin is not set
+BR2_i386=y
+# BR2_mips is not set
+# BR2_mipsel is not set
+# BR2_powerpc is not set
+# BR2_sh is not set
+# BR2_sh64 is not set
+# BR2_sparc is not set
+# BR2_x86_64 is not set
+# BR2_xtensa is not set
+# BR2_x86_i386 is not set
+# BR2_x86_i486 is not set
+BR2_x86_i586=y
+# BR2_x86_i686 is not set
+# BR2_x86_pentiumpro is not set
+# BR2_x86_pentium_mmx is not set
+# BR2_x86_pentium_m is not set
+# BR2_x86_pentium2 is not set
+# BR2_x86_pentium3 is not set
+# BR2_x86_pentium4 is not set
+# BR2_x86_prescott is not set
+# BR2_x86_nocona is not set
+# BR2_x86_core2 is not set
+# BR2_x86_k6 is not set
+# BR2_x86_k6_2 is not set
+# BR2_x86_athlon is not set
+# BR2_x86_athlon_4 is not set
+# BR2_x86_opteron is not set
+# BR2_x86_opteron_sse3 is not set
+# BR2_x86_barcelona is not set
+# BR2_x86_geode is not set
+# BR2_x86_c3 is not set
+# BR2_x86_c32 is not set
+# BR2_x86_winchip_c6 is not set
+# BR2_x86_winchip2 is not set
+BR2_ARCH="i586"
+BR2_ENDIAN="LITTLE"
+BR2_GCC_TARGET_TUNE="i586"
+BR2_GCC_TARGET_ARCH="i586"
+
+#
+# Build options
+#
+
+#
+# Commands
+#
+BR2_WGET="toolchain/getter_script.sh"
+BR2_SVN="svn"
+BR2_BZR="bzr"
+BR2_GIT="git"
+BR2_ZCAT="gzip -d -c"
+BR2_BZCAT="bzcat"
+BR2_XZCAT="xzcat"
+BR2_TAR_OPTIONS=""
+BR2_DL_DIR="$(TOPDIR)/dl"
+BR2_HOST_DIR="$(BASE_DIR)/host"
+
+#
+# Mirrors and Download locations
+#
+BR2_PRIMARY_SITE=""
+BR2_BACKUP_SITE=""
+BR2_SOURCEFORGE_MIRROR="softlayer"
+BR2_KERNEL_MIRROR="http://mirror.nexcess.net/kernel.org"
+BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
+BR2_DEBIAN_MIRROR="http://ftp.debian.org"
+BR2_JLEVEL=1
+# BR2_CCACHE is not set
+# BR2_DEPRECATED is not set
+# BR2_ENABLE_DEBUG is not set
+BR2_STRIP_strip=y
+# BR2_STRIP_sstrip is not set
+# BR2_STRIP_none is not set
+# BR2_OPTIMIZE_0 is not set
+# BR2_OPTIMIZE_1 is not set
+# BR2_OPTIMIZE_2 is not set
+# BR2_OPTIMIZE_3 is not set
+BR2_OPTIMIZE_S=y
+# BR2_PREFER_STATIC_LIB is not set
+# BR2_HAVE_DOCUMENTATION is not set
+# BR2_HAVE_DEVFILES is not set
+
+#
+# Toolchain
+#
+# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_EXTERNAL=y
+# BR2_TOOLCHAIN_CTNG is not set
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
+# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC is not set
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+
+#
+# Gdb Options
+#
+# BR2_PACKAGE_GDB is not set
+# BR2_PACKAGE_GDB_SERVER is not set
+BR2_LARGEFILE=y
+BR2_INET_IPV6=y
+BR2_INET_RPC=y
+BR2_USE_WCHAR=y
+BR2_ENABLE_LOCALE=y
+BR2_INSTALL_LIBSTDCPP=y
+BR2_TOOLCHAIN_HAS_THREADS=y
+BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
+BR2_ENABLE_LOCALE_PURGE=y
+BR2_ENABLE_LOCALE_WHITELIST=""
+BR2_USE_MMU=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_TARGET_LDFLAGS=""
+
+#
+# System configuration
+#
+BR2_TARGET_GENERIC_HOSTNAME=""
+BR2_TARGET_GENERIC_ISSUE=""
+BR2_ROOTFS_DEVICE_CREATION_STATIC=y
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV is not set
+BR2_ROOTFS_DEVICE_TABLE="project/runnix/device_table.txt"
+BR2_ROOTFS_STATIC_DEVICE_TABLE="project/runnix/device_table_dev.txt"
+# BR2_ROOTFS_SKELETON_DEFAULT is not set
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/runnix/target_skeleton"
+BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/runnix-post-build"
+
+#
+# Package Selection for the target
+#
+BR2_PACKAGE_BUSYBOX=y
+# BR2_BUSYBOX_VERSION_1_16_X is not set
+# BR2_BUSYBOX_VERSION_1_17_X is not set
+BR2_BUSYBOX_VERSION_1_18_X=y
+# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
+BR2_BUSYBOX_VERSION="1.18.5"
+BR2_PACKAGE_BUSYBOX_CONFIG="project/runnix/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+# BR2_PACKAGE_CUSTOMIZE is not set
+
+#
+# Asterisk, FreeSWITCH and telephony applications
+#
+# BR2_PACKAGE_ASTERISK is not set
+# BR2_PACKAGE_DAHDI_LINUX is not set
+# BR2_PACKAGE_DAHDI_TOOLS is not set
+# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_RHINO is not set
+# BR2_PACKAGE_WANPIPE is not set
+
+#
+# Audio and video libraries and applications
+#
+# BR2_PACKAGE_ALSA_LIB is not set
+# BR2_PACKAGE_ALSA_UTILS is not set
+# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FAAD2 is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_FFMPEG is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LAME is not set
+# BR2_PACKAGE_LIBAO is not set
+# BR2_PACKAGE_LIBCDAUDIO is not set
+# BR2_PACKAGE_LIBCUE is not set
+# BR2_PACKAGE_LIBCUEFILE is not set
+# BR2_PACKAGE_LIBDVDREAD is not set
+# BR2_PACKAGE_LIBDVDNAV is not set
+# BR2_PACKAGE_LIBID3TAG is not set
+# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMMS is not set
+# BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBMPEG2 is not set
+# BR2_PACKAGE_LIBOGG is not set
+# BR2_PACKAGE_LIBREPLAYGAIN is not set
+# BR2_PACKAGE_LIBSAMPLERATE is not set
+# BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
+# BR2_PACKAGE_LIVE555 is not set
+# BR2_PACKAGE_MADPLAY is not set
+# BR2_PACKAGE_MPD is not set
+# BR2_PACKAGE_MPG123 is not set
+# BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_MUSEPACK is not set
+# BR2_PACKAGE_SOX is not set
+# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_TAGLIB is not set
+# BR2_PACKAGE_TREMOR is not set
+# BR2_PACKAGE_VORBIS_TOOLS is not set
+# BR2_PACKAGE_WAVPACK is not set
+
+#
+# Compressors and decompressors
+#
+# BR2_PACKAGE_BZIP2 is not set
+# BR2_PACKAGE_GZIP is not set
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_XZ is not set
+
+#
+# Debugging, profiling and benchmark
+#
+# BR2_PACKAGE_BONNIE is not set
+# BR2_PACKAGE_DHRYSTONE is not set
+# BR2_PACKAGE_DMALLOC is not set
+BR2_PACKAGE_KEXEC=y
+# BR2_PACKAGE_KEXEC_ZLIB is not set
+# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LSOF is not set
+# BR2_PACKAGE_LTP_TESTSUITE is not set
+# BR2_PACKAGE_LTRACE is not set
+# BR2_PACKAGE_MEMSTAT is not set
+# BR2_PACKAGE_NETPERF is not set
+# BR2_PACKAGE_STRACE is not set
+# BR2_PACKAGE_WHETSTONE is not set
+# BR2_PACKAGE_VALGRIND is not set
+
+#
+# Development tools
+#
+# BR2_PACKAGE_AUTOCONF is not set
+# BR2_PACKAGE_AUTOMAKE is not set
+# BR2_PACKAGE_BISON is not set
+# BR2_PACKAGE_BSDIFF is not set
+# BR2_PACKAGE_CCACHE is not set
+# BR2_PACKAGE_COREUTILS is not set
+# BR2_PACKAGE_CVS is not set
+# BR2_PACKAGE_DIFFUTILS is not set
+# BR2_PACKAGE_DISTCC is not set
+# BR2_PACKAGE_FINDUTILS is not set
+# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_GAWK is not set
+# BR2_PACKAGE_GMP is not set
+# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_GREP is not set
+# BR2_PACKAGE_MAKE is not set
+# BR2_PACKAGE_MPC is not set
+# BR2_PACKAGE_MPFR is not set
+# BR2_PACKAGE_LIBTOOL is not set
+# BR2_PACKAGE_M4 is not set
+# BR2_PACKAGE_PATCH is not set
+# BR2_PACKAGE_PKG_CONFIG is not set
+# BR2_PACKAGE_SED is not set
+# BR2_PACKAGE_SSTRIP is not set
+# BR2_PACKAGE_TAR is not set
+
+#
+# Games
+#
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_PRBOOM is not set
+
+#
+# Graphic libraries and applications (graphic/text)
+#
+
+#
+# Graphic applications
+#
+# BR2_PACKAGE_RRDTOOL is not set
+
+#
+# graphic libraries
+#
+# BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_FBDUMP is not set
+# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBSET is not set
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_SDL is not set
+
+#
+# other GUIs
+#
+# BR2_PACKAGE_QT is not set
+
+#
+# X libraries and helper libraries
+#
+# BR2_PACKAGE_LIBERATION is not set
+
+#
+# X Window managers
+#
+
+#
+# X applications
+#
+# BR2_PACKAGE_GOB2 is not set
+
+#
+# midori requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
+# Hardware handling
+#
+# BR2_PACKAGE_ACPID is not set
+# BR2_PACKAGE_BFDETECT is not set
+# BR2_PACKAGE_CDRKIT is not set
+# BR2_PACKAGE_CRAMFS is not set
+
+#
+# dbus not available (need expat or libxml2)
+#
+# BR2_PACKAGE_DMRAID is not set
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
+BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
+BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
+# BR2_PACKAGE_E1000 is not set
+# BR2_PACKAGE_E1000E is not set
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
+BR2_PACKAGE_E2FSPROGS_CHATTR=y
+# BR2_PACKAGE_E2FSPROGS_DEBUGFS is not set
+BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2FREEFRAG=y
+BR2_PACKAGE_E2FSPROGS_E2FSCK=y
+# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
+BR2_PACKAGE_E2FSPROGS_E2LABEL=y
+BR2_PACKAGE_E2FSPROGS_E2UNDO=y
+BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
+BR2_PACKAGE_E2FSPROGS_FINDFS=y
+BR2_PACKAGE_E2FSPROGS_FSCK=y
+BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
+BR2_PACKAGE_E2FSPROGS_LSATTR=y
+BR2_PACKAGE_E2FSPROGS_MKE2FS=y
+BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
+# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
+BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
+BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
+BR2_PACKAGE_E2FSPROGS_UUIDD=y
+# BR2_PACKAGE_EEPROG is not set
+# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FXLOAD is not set
+# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_GDISK is not set
+# BR2_PACKAGE_GENEXT2FS is not set
+# BR2_PACKAGE_GENROMFS is not set
+# BR2_PACKAGE_GPSD is not set
+# BR2_PACKAGE_GVFS is not set
+# BR2_PACKAGE_HDPARM is not set
+# BR2_PACKAGE_HWDATA is not set
+# BR2_PACKAGE_I2C_TOOLS is not set
+# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
+# BR2_PACKAGE_INPUT_TOOLS is not set
+# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_IRDA_UTILS is not set
+# BR2_PACKAGE_KBD is not set
+# BR2_PACKAGE_LIBV4L is not set
+# BR2_PACKAGE_LM_SENSORS is not set
+# BR2_PACKAGE_LSUIO is not set
+# BR2_PACKAGE_LVM2 is not set
+# BR2_PACKAGE_MAKEDEVS is not set
+# BR2_PACKAGE_MDADM is not set
+BR2_PACKAGE_MEMTEST=y
+# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MTD is not set
+# BR2_PACKAGE_NTFS_3G is not set
+# BR2_PACKAGE_NTFSPROGS is not set
+# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_R8168 is not set
+# BR2_PACKAGE_RNG_TOOLS is not set
+# BR2_PACKAGE_SDPARM is not set
+# BR2_PACKAGE_SETSERIAL is not set
+# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_SQUASHFS is not set
+# BR2_PACKAGE_SREDIRD is not set
+# BR2_PACKAGE_SSHFS is not set
+# BR2_PACKAGE_STATSERIAL is not set
+# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_TI_UTILS is not set
+# BR2_PACKAGE_UBOOT_TOOLS is not set
+
+#
+# udev requires /dev mgmnt set to udev under System configuration
+#
+# BR2_PACKAGE_USB_MODESWITCH is not set
+# BR2_PACKAGE_USBUTILS is not set
+# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XFSPROGS is not set
+# BR2_PACKAGE_ZABBIX is not set
+
+#
+# Interpreter languages and scripting
+#
+# BR2_PACKAGE_BC is not set
+# BR2_PACKAGE_HASERL is not set
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PHP is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
+
+#
+# Libraries
+#
+
+#
+# Compression and decompression
+#
+# BR2_PACKAGE_LIBARCHIVE is not set
+# BR2_PACKAGE_LZO is not set
+# BR2_PACKAGE_SPANDSP is not set
+BR2_PACKAGE_ZLIB=y
+
+#
+# Crypto
+#
+# BR2_PACKAGE_BEECRYPT is not set
+# BR2_PACKAGE_GNUTLS is not set
+# BR2_PACKAGE_LIBGCRYPT is not set
+# BR2_PACKAGE_LIBGPG_ERROR is not set
+# BR2_PACKAGE_LIBNSS is not set
+# BR2_PACKAGE_OPENSSL is not set
+# BR2_PACKAGE_LIBSRTP is not set
+
+#
+# Database
+#
+# BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+# BR2_PACKAGE_SQLITE is not set
+
+#
+# Filesystem
+#
+# BR2_PACKAGE_GAMIN is not set
+# BR2_PACKAGE_LIBCONFIG is not set
+# BR2_PACKAGE_LIBCONFUSE is not set
+# BR2_PACKAGE_LIBFUSE is not set
+# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBSYSFS is not set
+
+#
+# Graphics
+#
+# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
+# BR2_PACKAGE_FONTCONFIG is not set
+# BR2_PACKAGE_FREETYPE is not set
+# BR2_PACKAGE_JPEG is not set
+# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_LIBEXIF is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
+# BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBRAW is not set
+# BR2_PACKAGE_LIBSVGTINY is not set
+# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_PANGO is not set
+# BR2_PACKAGE_PIXMAN is not set
+# BR2_PACKAGE_TIFF is not set
+
+#
+# webkit requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
+# Hardware handling
+#
+# BR2_PACKAGE_LIBAIO is not set
+# BR2_PACKAGE_LIBRAW1394 is not set
+# BR2_PACKAGE_TSLIB is not set
+# BR2_PACKAGE_LIBHID is not set
+# BR2_PACKAGE_LIBIQRF is not set
+# BR2_PACKAGE_LIBUSB is not set
+
+#
+# Networking
+#
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_LIBEXOSIP2 is not set
+# BR2_PACKAGE_LIBIDN is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+# BR2_PACKAGE_NEON is not set
+# BR2_PACKAGE_LIBMNL is not set
+# BR2_PACKAGE_LIBNL is not set
+# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBOSIP2 is not set
+# BR2_PACKAGE_LIBRSYNC is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LINUX_ATM is not set
+
+#
+# Other
+#
+# BR2_PACKAGE_LIBARGTABLE2 is not set
+# BR2_PACKAGE_ARGP_STANDALONE is not set
+# BR2_PACKAGE_LIBATOMIC_OPS is not set
+# BR2_PACKAGE_LIBCAP is not set
+# BR2_PACKAGE_LIBDAEMON is not set
+# BR2_PACKAGE_LIBELF is not set
+# BR2_PACKAGE_LIBEVENT is not set
+# BR2_PACKAGE_LIBFFI is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBNSPR is not set
+# BR2_PACKAGE_LIBSIGC is not set
+# BR2_PACKAGE_ORC is not set
+
+#
+# Text and terminal handling
+#
+# BR2_PACKAGE_ENCHANT is not set
+# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_NCURSES=y
+# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
+# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
+# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+# BR2_PACKAGE_NEWT is not set
+# BR2_PACKAGE_PCRE is not set
+# BR2_PACKAGE_POPT is not set
+# BR2_PACKAGE_READLINE is not set
+# BR2_PACKAGE_SLANG is not set
+
+#
+# JSON/XML
+#
+# BR2_PACKAGE_EXPAT is not set
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_LIBROXML is not set
+# BR2_PACKAGE_LIBXML2 is not set
+# BR2_PACKAGE_LIBXSLT is not set
+# BR2_PACKAGE_LIBYAML is not set
+# BR2_PACKAGE_MXML is not set
+# BR2_PACKAGE_XERCES is not set
+# BR2_PACKAGE_YAJL is not set
+
+#
+# Miscellaneous
+#
+# BR2_PACKAGE_HTPASSWD is not set
+# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
+# BR2_PACKAGE_ZONEINFO is not set
+
+#
+# Networking applications
+#
+# BR2_PACKAGE_APCUPSD is not set
+# BR2_PACKAGE_ARGUS is not set
+# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_AVAHI is not set
+# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BOA is not set
+# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
+# BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_BWM_NG is not set
+# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CTORRENT is not set
+# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DHCP is not set
+# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DNSMASQ is not set
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_DROPBEAR_SMALL=y
+# BR2_PACKAGE_EBTABLES is not set
+# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IFTOP is not set
+# BR2_PACKAGE_INADYN is not set
+# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
+# BR2_PACKAGE_IPSET is not set
+# BR2_PACKAGE_IPTABLES is not set
+# BR2_PACKAGE_IW is not set
+# BR2_PACKAGE_KISMET is not set
+# BR2_PACKAGE_XL2TP is not set
+# BR2_PACKAGE_LIGHTTPD is not set
+# BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MDNSRESPONDER is not set
+# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MROUTED is not set
+# BR2_PACKAGE_MSMTP is not set
+# BR2_PACKAGE_MUTT is not set
+# BR2_PACKAGE_NBD is not set
+# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETCAT is not set
+# BR2_PACKAGE_NETKITBASE is not set
+# BR2_PACKAGE_NETKITTELNET is not set
+# BR2_PACKAGE_NETPLUG is not set
+# BR2_PACKAGE_NETSNMP is not set
+# BR2_PACKAGE_NETSTAT_NAT is not set
+# BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
+# BR2_PACKAGE_NGREP is not set
+# BR2_PACKAGE_NMAP is not set
+# BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_NUTTCP is not set
+# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENSSH is not set
+# BR2_PACKAGE_OPENVPN is not set
+# BR2_PACKAGE_P910ND is not set
+# BR2_PACKAGE_PORTMAP is not set
+# BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
+# BR2_PACKAGE_PPTP_LINUX is not set
+# BR2_PACKAGE_PPTPD is not set
+# BR2_PACKAGE_PROFTPD is not set
+# BR2_PACKAGE_QUAGGA is not set
+# BR2_PACKAGE_RSH_REDONE is not set
+# BR2_PACKAGE_RSYNC is not set
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SOCAT is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
+# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STUNNEL is not set
+# BR2_PACKAGE_TCPDUMP is not set
+# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TFTPD is not set
+# BR2_PACKAGE_THTTPD is not set
+# BR2_PACKAGE_TINYHTTPD is not set
+# BR2_PACKAGE_TN5250 is not set
+# BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UW_IMAP is not set
+# BR2_PACKAGE_VPNC is not set
+# BR2_PACKAGE_VSFTPD is not set
+# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WGET is not set
+# BR2_PACKAGE_WIRELESS_TOOLS is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
+
+#
+# Package managers
+#
+# BR2_PACKAGE_IPKG is not set
+
+#
+# rpm requires libneon with SSL, XML and ZLIB support
+#
+
+#
+# Shell and utilities
+#
+# BR2_PACKAGE_AT is not set
+# BR2_PACKAGE_BASH is not set
+# BR2_PACKAGE_DASH is not set
+BR2_PACKAGE_DIALOG=y
+# BR2_PACKAGE_FILE is not set
+# BR2_PACKAGE_INOTIFY_TOOLS is not set
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LOGROTATE is not set
+# BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SUDO is not set
+# BR2_PACKAGE_WHICH is not set
+# BR2_PACKAGE_XMLSTARLET is not set
+
+#
+# System tools
+#
+# BR2_PACKAGE_ACL is not set
+# BR2_PACKAGE_ATTR is not set
+# BR2_PACKAGE_BOOTUTILS is not set
+# BR2_PACKAGE_HTOP is not set
+# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
+# BR2_PACKAGE_PROCPS is not set
+# BR2_PACKAGE_PSMISC is not set
+# BR2_PACKAGE_RSYSLOG is not set
+# BR2_PACKAGE_SYSKLOGD is not set
+# BR2_PACKAGE_SYSVINIT is not set
+BR2_PACKAGE_UTIL_LINUX=y
+# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
+# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
+# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
+BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
+# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
+# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
+# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
+# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
+# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
+# BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_WALL is not set
+# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
+# BR2_PACKAGE_UTIL_LINUX_INIT is not set
+# BR2_PACKAGE_UTIL_LINUX_KILL is not set
+# BR2_PACKAGE_UTIL_LINUX_LAST is not set
+# BR2_PACKAGE_UTIL_LINUX_MESG is not set
+# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
+# BR2_PACKAGE_UTIL_LINUX_RAW is not set
+# BR2_PACKAGE_UTIL_LINUX_RESET is not set
+# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
+
+#
+# Text editors and viewers
+#
+# BR2_PACKAGE_ED is not set
+# BR2_PACKAGE_EX_VI is not set
+# BR2_PACKAGE_LESS is not set
+# BR2_PACKAGE_NANO is not set
+# BR2_PACKAGE_UEMACS is not set
+# BR2_PACKAGE_VIM is not set
+
+#
+# Filesystem images
+#
+# BR2_TARGET_ROOTFS_CRAMFS is not set
+# BR2_TARGET_ROOTFS_CLOOP is not set
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
+BR2_TARGET_ROOTFS_EXT2_INODES=0
+BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
+# BR2_TARGET_ROOTFS_EXT2_NONE is not set
+BR2_TARGET_ROOTFS_EXT2_GZIP=y
+# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
+# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
+# BR2_TARGET_ROOTFS_JFFS2 is not set
+# BR2_TARGET_ROOTFS_UBIFS is not set
+# BR2_TARGET_ROOTFS_SQUASHFS is not set
+# BR2_TARGET_ROOTFS_TAR is not set
+# BR2_TARGET_ROOTFS_CPIO is not set
+# BR2_TARGET_ROOTFS_ISO9660 is not set
+# BR2_TARGET_ROOTFS_INITRAMFS is not set
+# BR2_TARGET_ROOTFS_ROMFS is not set
+
+#
+# Bootloaders
+#
+# BR2_TARGET_BAREBOX is not set
+# BR2_TARGET_GRUB is not set
+BR2_TARGET_SYSLINUX=y
+# BR2_TARGET_SYSLINUX_ISOLINUX is not set
+# BR2_TARGET_SYSLINUX_PXELINUX is not set
+# BR2_TARGET_RUNNIX is not set
+# BR2_TARGET_UBOOT is not set
+
+#
+# Kernel
+#
+BR2_LINUX_KERNEL=y
+# BR2_LINUX_KERNEL_2_6_39 is not set
+# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_VERSION="custom"
+BR2_LINUX_KERNEL_PATCH=""
+# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/runnix/geni586/linux.config"
+BR2_LINUX_KERNEL_BZIMAGE=y
+# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
+# BR2_LINUX_KERNEL_INSTALL_TARGET is not set
Modified: branches/1.0/scripts/build-runnix
===================================================================
--- branches/1.0/scripts/build-runnix 2011-12-06 20:19:48 UTC (rev 5286)
+++ branches/1.0/scripts/build-runnix 2011-12-06 20:20:38 UTC (rev 5287)
@@ -15,6 +15,8 @@
MEMTEST_DIR="output/build/memtest86+-${MEMTEST_VER// /}"
+CONFIG="runnix.config"
+
make_release_version()
{
RUNBASE="0.4"
@@ -53,7 +55,7 @@
save_state()
{
cp -p .config .config.runnix.save
- cp -p runnix.config .config
+ cp -p ${CONFIG} .config
if [ -d "output" ]; then
mv output output.runnix.save
@@ -81,8 +83,8 @@
PATH=/sbin:/usr/sbin:$PATH
-if [ ! -f "runnix.config" ]; then
- echo "The runnix.config file does not exist, exiting."
+if [ ! -f "$CONFIG" ]; then
+ echo "The $CONFIG file does not exist, exiting."
exit 1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-07 00:55:51
|
Revision: 5293
http://astlinux.svn.sourceforge.net/astlinux/?rev=5293&view=rev
Author: abelbeck
Date: 2011-12-07 00:55:44 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
beep, a new package, the goal is to optionally play a ditty when AstLinux is up, removed old beep script
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/multimedia/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/multimedia/beep/
branches/1.0/package/multimedia/beep/Config.in
branches/1.0/package/multimedia/beep/beep.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/usr/sbin/beep
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/astlinux.config 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5279-dirty Configuration
-# Sat Dec 3 17:23:02 2011
+# Buildroot 2011.08-svn5291-dirty Configuration
+# Tue Dec 6 18:41:04 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -182,6 +182,7 @@
# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_ALSA_UTILS is not set
# BR2_PACKAGE_AUMIX is not set
+BR2_PACKAGE_BEEP=y
# BR2_PACKAGE_FAAD2 is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FFMPEG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/astlinux18.config 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5279-dirty Configuration
-# Sat Dec 3 17:23:03 2011
+# Buildroot 2011.08-svn5291-dirty Configuration
+# Tue Dec 6 18:41:07 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -177,6 +177,7 @@
# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_ALSA_UTILS is not set
# BR2_PACKAGE_AUMIX is not set
+BR2_PACKAGE_BEEP=y
# BR2_PACKAGE_FAAD2 is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FFMPEG is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/initrd.config 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:57:02 2011
+# Buildroot 2011.08-svn5291-dirty Configuration
+# Tue Dec 6 18:41:17 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -165,6 +165,7 @@
# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_ALSA_UTILS is not set
# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_BEEP is not set
# BR2_PACKAGE_FAAD2 is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FFMPEG is not set
Modified: branches/1.0/package/multimedia/Config.in
===================================================================
--- branches/1.0/package/multimedia/Config.in 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/package/multimedia/Config.in 2011-12-07 00:55:44 UTC (rev 5293)
@@ -2,6 +2,7 @@
source "package/multimedia/alsa-lib/Config.in"
source "package/multimedia/alsa-utils/Config.in"
source "package/multimedia/aumix/Config.in"
+source "package/multimedia/beep/Config.in"
source "package/multimedia/faad2/Config.in"
source "package/multimedia/flac/Config.in"
source "package/multimedia/ffmpeg/Config.in"
Added: branches/1.0/package/multimedia/beep/Config.in
===================================================================
--- branches/1.0/package/multimedia/beep/Config.in (rev 0)
+++ branches/1.0/package/multimedia/beep/Config.in 2011-12-07 00:55:44 UTC (rev 5293)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_BEEP
+ bool "beep"
+ default n
+ help
+ beep allows the user to control the pc-speaker with precision, allowing
+ different sounds to indicate different events.
+
+ http://www.johnath.com/beep/
Added: branches/1.0/package/multimedia/beep/beep.mk
===================================================================
--- branches/1.0/package/multimedia/beep/beep.mk (rev 0)
+++ branches/1.0/package/multimedia/beep/beep.mk 2011-12-07 00:55:44 UTC (rev 5293)
@@ -0,0 +1,25 @@
+#############################################################
+#
+# beep
+#
+#############################################################
+
+BEEP_VERSION = 1.3
+BEEP_SOURCE:=beep-$(BEEP_VERSION).tar.gz
+BEEP_SITE = http://www.johnath.com/beep
+
+define BEEP_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+BEEP_MAKE_OPT = CC='$(TARGET_CC)' LD='$(TARGET_LD)' -C $(@D) beep
+
+define BEEP_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/beep $(TARGET_DIR)/usr/bin/beep
+endef
+
+define BEEP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/beep
+endef
+
+$(eval $(call AUTOTARGETS,package,beep))
Deleted: branches/1.0/project/astlinux/target_skeleton/usr/sbin/beep
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/beep 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/beep 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "-h" ]; then
- echo "Usage:
-$0 [number of beeps] [pause in microseconds]"
- exit
-fi
-
-if [ ! -r /dev/audio ]; then
- echo "Warning: No beep device node" 1>&2
- exit 1
-fi
-
-if [ -z "$1" ]; then
- BEEPS=1
-else
- BEEPS="$1"
-fi
-
-if [ "$BEEPS" = "0" ]; then
- echo "Tricky tricky - 0 beeps is no beeps" 1>&2
- exit 1
-fi
-
-if [ "$BEEPS" != "1" -a -z "$2" ]; then
- echo "Error: If you have more than one beep I need a pause argument" 1>&2
- exit 1
-fi
-
-# Make noise
-for i in `seq 1 $BEEPS`; do
- if ! echo -e "\a" >/dev/audio 2>/dev/null; then
- echo "Error: Beeping isn't supported on this machine" 1>&2
- exit 1
- fi
-
- if [ -n "$2" ]; then
- echo "Sleeping for $2 microseconds"
- usleep $2
- fi
-done
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/runnix-uclibc.config 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5285-dirty Configuration
-# Tue Dec 6 14:31:20 2011
+# Buildroot 2011.08-svn5292-dirty Configuration
+# Tue Dec 6 18:51:06 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -230,6 +230,7 @@
# alsa-utils requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_BEEP is not set
# BR2_PACKAGE_FAAD2 is not set
# BR2_PACKAGE_FLAC is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2011-12-06 21:46:59 UTC (rev 5292)
+++ branches/1.0/runnix.config 2011-12-07 00:55:44 UTC (rev 5293)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:56:59 2011
+# Buildroot 2011.08-svn5291-dirty Configuration
+# Tue Dec 6 18:41:11 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -169,6 +169,7 @@
# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_ALSA_UTILS is not set
# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_BEEP is not set
# BR2_PACKAGE_FAAD2 is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FFMPEG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-08 15:52:21
|
Revision: 5296
http://astlinux.svn.sourceforge.net/astlinux/?rev=5296&view=rev
Author: abelbeck
Date: 2011-12-08 15:52:15 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
cleanup, remove mISDN configs
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init 2011-12-07 19:24:00 UTC (rev 5295)
+++ branches/1.0/package/asterisk/asterisk.init 2011-12-08 15:52:15 UTC (rev 5296)
@@ -66,24 +66,7 @@
start () {
echo "Starting Asterisk..."
- if [ -n "$ISDN_MODPROBE" -o -n "$MISDN" ]; then
- echo "Starting mISDN"
- if [ -f /mnt/kd/misdn-init.conf ]; then
- ln -sf /mnt/kd/misdn-init.conf /tmp/etc/misdn-init.conf
- echo "/mnt/kd/misdn-init.conf exists, skipping config."
- else
- # Make /etc/misdn-init.conf point to /mnt/kd/misdn-init.conf if configs exist
- if [ -d /mnt/kd/rc.conf.d -o -f /mnt/kd/rc.conf ]; then
- ln -sf /mnt/kd/misdn-init.conf /tmp/etc/misdn-init.conf
- fi
- /usr/sbin/misdn-init scan
- /usr/sbin/misdn-init config
- fi
- /usr/sbin/misdn-init start
- sleep 2
- fi
-
if ! find /var/lib/asterisk/sounds -name 'vm-*' | grep -q '/vm-'; then
echo "
WARNING! No core asterisk sounds are installed.
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-12-07 19:24:00 UTC (rev 5295)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2011-12-08 15:52:15 UTC (rev 5296)
@@ -678,18 +678,6 @@
## Define which sounds should be generated, space separated, disabled by default.
#ALERT_SOUNDS="startup shutdown"
-## ISDN Configuration
-## If this variable exists I will try to load the proper modules, but you
-## need to tell me how you want to setup your card.
-## Documentation can be found at: http://www.beronet.com/download/card_installation_guide_en.pdf
-## More can be found at: http://home.foni.net/~jolly1/download/PBX4Linux-2.5.html
-## Don't forget to edit misdn.conf and modules.conf in /etc/asterisk.
-## Examples:
-#ISDN_MODPROBE="hfcpci protocol=0x2 layermask=0xf"
-#ISDN_MODPROBE="hfcmulti type=0x08 protocol=0x12,0x12,0x12,0x12,0x2,0x2,0x2,0x2 layermask=0x3,0x3,0x3,0x3,0xf,0xf,0xf,0xf"
-#ISDN_MODPROBE="hfcmulti type=0x04 protocol=0x12,0x12,0x2,0x2 layermask=0x3,0x3,0xf,0xf"
-#ISDN_MODPROBE="avmfritz protocol=0x2 layermask=0xf debug=0x0"
-
## IDE Drive configuration
## From 0.2.5.6 onwards, DMA is disabled on the GRUB command line.
## I was having too many problems with motherboards detecting CF's
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-13 23:38:05
|
Revision: 5306
http://astlinux.svn.sourceforge.net/astlinux/?rev=5306&view=rev
Author: abelbeck
Date: 2011-12-13 23:37:59 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
php, add 'curl' extension support, disabled by default, Thanks David.
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/php/Config.ext
branches/1.0/package/php/php.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-12-13 22:41:14 UTC (rev 5305)
+++ branches/1.0/astlinux.config 2011-12-13 23:37:59 UTC (rev 5306)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5291-dirty Configuration
-# Tue Dec 6 18:41:04 2011
+# Buildroot 2011.08-svn5305-dirty Configuration
+# Tue Dec 13 17:31:51 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -435,6 +435,7 @@
# BR2_PACKAGE_PHP_EXT_SPL is not set
BR2_PACKAGE_PHP_EXT_SESSION=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
+# BR2_PACKAGE_PHP_EXT_CURL is not set
# BR2_PACKAGE_PHP_EXT_LIBXML2 is not set
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
# BR2_PACKAGE_PHP_EXT_ZLIB is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-12-13 22:41:14 UTC (rev 5305)
+++ branches/1.0/astlinux18.config 2011-12-13 23:37:59 UTC (rev 5306)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5291-dirty Configuration
-# Tue Dec 6 18:41:07 2011
+# Buildroot 2011.08-svn5305-dirty Configuration
+# Tue Dec 13 17:31:54 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -430,6 +430,7 @@
# BR2_PACKAGE_PHP_EXT_SPL is not set
BR2_PACKAGE_PHP_EXT_SESSION=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
+# BR2_PACKAGE_PHP_EXT_CURL is not set
# BR2_PACKAGE_PHP_EXT_LIBXML2 is not set
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
# BR2_PACKAGE_PHP_EXT_ZLIB is not set
Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext 2011-12-13 22:41:14 UTC (rev 5305)
+++ branches/1.0/package/php/Config.ext 2011-12-13 23:37:59 UTC (rev 5306)
@@ -36,6 +36,12 @@
help
openssl support
+config BR2_PACKAGE_PHP_EXT_CURL
+ bool "curl"
+ select BR2_PACKAGE_LIBCURL
+ help
+ curl support
+
config BR2_PACKAGE_PHP_EXT_LIBXML2
bool "xml2"
select BR2_PACKAGE_LIBXML2
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2011-12-13 22:41:14 UTC (rev 5305)
+++ branches/1.0/package/php/php.mk 2011-12-13 23:37:59 UTC (rev 5306)
@@ -59,6 +59,11 @@
PHP_DEPENDENCIES += openssl
endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
+ PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += libcurl
+endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
PHP_CONF_OPT += --enable-libxml \
--with-libxml-dir=${STAGING_DIR}/usr \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-14 20:12:04
|
Revision: 5308
http://astlinux.svn.sourceforge.net/astlinux/?rev=5308&view=rev
Author: abelbeck
Date: 2011-12-14 20:11:56 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
asterisk, add iLBC CODEC to asterisk and default configs, Thanks David
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
Added Paths:
-----------
branches/1.0/package/asterisk/ilbc-codec.tar.gz
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2011-12-14 00:25:06 UTC (rev 5307)
+++ branches/1.0/astlinux.config 2011-12-14 20:11:56 UTC (rev 5308)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5305-dirty Configuration
-# Tue Dec 13 17:31:51 2011
+# Buildroot 2011.08-svn5307-dirty Configuration
+# Wed Dec 14 14:06:30 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -161,6 +161,7 @@
# BR2_PACKAGE_ASTERISK_v1_8 is not set
# BR2_PACKAGE_ASTERISK_v10_0 is not set
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
+BR2_PACKAGE_ASTERISK_ILBC=y
BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
BR2_PACKAGE_ASTERISK_APP_NVFAX=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2011-12-14 00:25:06 UTC (rev 5307)
+++ branches/1.0/astlinux18.config 2011-12-14 20:11:56 UTC (rev 5308)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5305-dirty Configuration
-# Tue Dec 13 17:31:54 2011
+# Buildroot 2011.08-svn5307-dirty Configuration
+# Wed Dec 14 14:06:35 2011
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -161,6 +161,7 @@
BR2_PACKAGE_ASTERISK_v1_8=y
# BR2_PACKAGE_ASTERISK_v10_0 is not set
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
+BR2_PACKAGE_ASTERISK_ILBC=y
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
BR2_PACKAGE_ASTERISK_GUI=y
BR2_PACKAGE_DAHDI_LINUX=y
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2011-12-14 00:25:06 UTC (rev 5307)
+++ branches/1.0/package/asterisk/Config.in 2011-12-14 20:11:56 UTC (rev 5308)
@@ -44,3 +44,12 @@
help
Run interactive menuselect to select custom Asterisk options
+config BR2_PACKAGE_ASTERISK_ILBC
+ bool "Asterisk iLBC CODEC"
+ default n
+ depends on BR2_PACKAGE_ASTERISK
+ help
+ iLBC CODEC for Asterisk
+
+ http://www.ietf.org/rfc/rfc3951.txt
+
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2011-12-14 00:25:06 UTC (rev 5307)
+++ branches/1.0/package/asterisk/asterisk.mk 2011-12-14 20:11:56 UTC (rev 5308)
@@ -158,6 +158,12 @@
endif
endif
+ifeq ($(strip $(BR2_PACKAGE_ASTERISK_ILBC)),y)
+ zcat package/asterisk/ilbc-codec.tar.gz | tar -C $(ASTERISK_DIR) $(TAR_OPTIONS) -
+ $(SED) 's:<defaultenabled>no</defaultenabled>:<defaultenabled>yes</defaultenabled>:' \
+ $(ASTERISK_DIR)/codecs/codec_ilbc.c
+endif
+
cp -p package/asterisk/Makefile.module $(ASTERISK_DIR)/Makefile.module
touch $@
Added: branches/1.0/package/asterisk/ilbc-codec.tar.gz
===================================================================
(Binary files differ)
Property changes on: branches/1.0/package/asterisk/ilbc-codec.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2011-12-21 20:11:04
|
Revision: 5323
http://astlinux.svn.sourceforge.net/astlinux/?rev=5323&view=rev
Author: abelbeck
Date: 2011-12-21 20:10:57 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
ide disk handling, change from the deprecated CONFIG_IDE=y to the newer CONFIG_PATA_xxx=y
Changes to runnix and both AstLinux kernels, do not use for production until further testing.
Modified Paths:
--------------
branches/1.0/boot/runnix/runnix.mk
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/runnix/geni586/linux.config
Modified: branches/1.0/boot/runnix/runnix.mk
===================================================================
--- branches/1.0/boot/runnix/runnix.mk 2011-12-21 03:26:02 UTC (rev 5322)
+++ branches/1.0/boot/runnix/runnix.mk 2011-12-21 20:10:57 UTC (rev 5323)
@@ -3,9 +3,10 @@
# runnix
#
#############################################################
-RUNNIX_VER:=0.4-5259
+RUNNIX_VER:=0.4-5322
RUNNIX_SOURCE:=runnix-$(RUNNIX_VER).tar.gz
-RUNNIX_SITE:=http://mirror.astlinux.org/runnix4
+#RUNNIX_SITE:=http://mirror.astlinux.org/runnix4
+RUNNIX_SITE:=http://lonnie.abelbeck.com/runnix4
RUNNIX_DIR:=$(BUILD_DIR)/runnix-$(RUNNIX_VER)
RUNNIX_CAT:=zcat
RUNFS_DIR:=$(BUILD_DIR)/runfs
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2011-12-21 03:26:02 UTC (rev 5322)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2011-12-21 20:10:57 UTC (rev 5323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.13
-# Sun Nov 6 09:16:20 2011
+# Wed Dec 21 10:53:16 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -927,74 +927,9 @@
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_CB710_CORE is not set
CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_TC86C001 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
# SCSI device support
#
CONFIG_SCSI_MOD=y
@@ -1152,13 +1087,13 @@
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_OLDPIIX=y
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
+CONFIG_PATA_SC1200=y
CONFIG_PATA_SCH=y
CONFIG_PATA_SERVERWORKS=y
CONFIG_PATA_SIL680=y
@@ -1175,7 +1110,7 @@
CONFIG_PATA_MPIIX=y
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_PLATFORM=y
# CONFIG_PATA_RZ1000 is not set
#
@@ -1183,7 +1118,7 @@
#
# CONFIG_PATA_ACPI is not set
CONFIG_ATA_GENERIC=y
-# CONFIG_PATA_LEGACY is not set
+CONFIG_PATA_LEGACY=y
# CONFIG_MD is not set
# CONFIG_FUSION is not set
@@ -2243,7 +2178,6 @@
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2011-12-21 03:26:02 UTC (rev 5322)
+++ branches/1.0/project/astlinux/geni586/linux.config 2011-12-21 20:10:57 UTC (rev 5323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.13
-# Fri Nov 4 15:13:42 2011
+# Wed Dec 21 10:53:16 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -917,74 +917,9 @@
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_CB710_CORE is not set
CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEACPI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_TC86C001 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
# SCSI device support
#
CONFIG_SCSI_MOD=y
@@ -1142,13 +1077,13 @@
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_OLDPIIX=y
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
+CONFIG_PATA_SC1200=y
CONFIG_PATA_SCH=y
CONFIG_PATA_SERVERWORKS=y
CONFIG_PATA_SIL680=y
@@ -1165,7 +1100,7 @@
CONFIG_PATA_MPIIX=y
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_PLATFORM=y
# CONFIG_PATA_RZ1000 is not set
#
@@ -1173,7 +1108,7 @@
#
# CONFIG_PATA_ACPI is not set
CONFIG_ATA_GENERIC=y
-# CONFIG_PATA_LEGACY is not set
+CONFIG_PATA_LEGACY=y
# CONFIG_MD is not set
# CONFIG_FUSION is not set
@@ -2233,7 +2168,6 @@
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_NETDEV=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2011-12-21 03:26:02 UTC (rev 5322)
+++ branches/1.0/project/runnix/geni586/linux.config 2011-12-21 20:10:57 UTC (rev 5323)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.13
-# Sat Oct 1 14:57:38 2011
+# Wed Dec 21 08:16:56 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -100,31 +100,25 @@
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
# CONFIG_RELAY is not set
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
+# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_LZO=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
+# CONFIG_PCSPKR_PLATFORM is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -274,6 +268,7 @@
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_TSC=y
CONFIG_X86_MINIMUM_CPU_FAMILY=4
+# CONFIG_PROCESSOR_SELECT is not set
CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_CYRIX_32=y
CONFIG_CPU_SUP_AMD=y
@@ -303,6 +298,11 @@
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_3G_OPT is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
+# CONFIG_VMSPLIT_1G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
@@ -394,8 +394,6 @@
# CONFIG_SCx200 is not set
# CONFIG_OLPC is not set
CONFIG_K8_NB=y
-# CONFIG_PCCARD is not set
-# CONFIG_HOTPLUG_PCI is not set
#
# Executable file formats / Emulations
@@ -502,8 +500,6 @@
#
# Generic Driver Options
#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
@@ -548,87 +544,9 @@
# CONFIG_BLK_DEV_HD is not set
# CONFIG_MISC_DEVICES is not set
CONFIG_HAVE_IDE=y
-CONFIG_IDE=y
+# CONFIG_IDE is not set
#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_AEC62XX is not set
-# CONFIG_BLK_DEV_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_BLK_DEV_ATIIXP=y
-# CONFIG_BLK_DEV_CMD64X is not set
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-# CONFIG_BLK_DEV_CS5535 is not set
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_HPT366 is not set
-# CONFIG_BLK_DEV_JMICRON is not set
-CONFIG_BLK_DEV_SC1200=y
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_IT8172 is not set
-# CONFIG_BLK_DEV_IT8213 is not set
-# CONFIG_BLK_DEV_IT821X is not set
-# CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-# CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_TC86C001 is not set
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
# SCSI device support
#
CONFIG_SCSI_MOD=y
@@ -762,7 +680,7 @@
# SATA SFF controllers with BMDMA
#
CONFIG_ATA_PIIX=y
-# CONFIG_SATA_MV is not set
+CONFIG_SATA_MV=y
CONFIG_SATA_NV=y
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SIL=y
@@ -776,15 +694,15 @@
# PATA SFF controllers with BMDMA
#
# CONFIG_PATA_ALI is not set
-# CONFIG_PATA_AMD is not set
+CONFIG_PATA_AMD=y
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_ATP867X is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
+CONFIG_PATA_CS5530=y
# CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
+CONFIG_PATA_CS5536=y
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
# CONFIG_PATA_HPT366 is not set
@@ -798,29 +716,30 @@
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NINJA32 is not set
# CONFIG_PATA_NS87415 is not set
-# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_OLDPIIX=y
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RDC is not set
-# CONFIG_PATA_SC1200 is not set
-# CONFIG_PATA_SCH is not set
-# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_SIL680 is not set
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
CONFIG_PATA_SIS=y
# CONFIG_PATA_TOSHIBA is not set
# CONFIG_PATA_TRIFLEX is not set
-# CONFIG_PATA_VIA is not set
+CONFIG_PATA_VIA=y
# CONFIG_PATA_WINBOND is not set
#
# PIO-only SFF controllers
#
# CONFIG_PATA_CMD640_PCI is not set
-# CONFIG_PATA_MPIIX is not set
+CONFIG_PATA_MPIIX=y
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
+CONFIG_PATA_PLATFORM=y
# CONFIG_PATA_QDI is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_WINBOND_VLB is not set
@@ -828,8 +747,8 @@
#
# Generic fallback / legacy drivers
#
-# CONFIG_ATA_GENERIC is not set
-# CONFIG_PATA_LEGACY is not set
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
# CONFIG_MD is not set
# CONFIG_FUSION is not set
@@ -1049,7 +968,6 @@
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
-CONFIG_INPUT_PCSPKR=y
# CONFIG_INPUT_WISTRON_BTNS is not set
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -1215,27 +1133,24 @@
# Special HID drivers
#
# CONFIG_HID_3M_PCT is not set
-CONFIG_HID_A4TECH=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
# CONFIG_HID_CANDO is not set
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
# CONFIG_HID_EGALAX is not set
-CONFIG_HID_EZKEY=y
-CONFIG_HID_KYE=y
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KYE is not set
# CONFIG_HID_GYRATION is not set
# CONFIG_HID_TWINHAN is not set
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_LOGITECH=y
-# CONFIG_LOGITECH_FF is not set
-# CONFIG_LOGIRUMBLEPAD2_FF is not set
-# CONFIG_LOGIG940_FF is not set
-CONFIG_HID_MICROSOFT=y
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MOSART is not set
-CONFIG_HID_MONTEREY=y
+# CONFIG_HID_MONTEREY is not set
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
@@ -1268,6 +1183,8 @@
CONFIG_USB_DEVICEFS=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_MON is not set
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
@@ -1590,7 +1507,7 @@
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
CONFIG_RCU_CPU_STALL_DETECTOR=y
@@ -1775,11 +1692,7 @@
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
-CONFIG_LZO_DECOMPRESS=y
CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-01-10 19:08:54
|
Revision: 5366
http://astlinux.svn.sourceforge.net/astlinux/?rev=5366&view=rev
Author: abelbeck
Date: 2012-01-10 19:08:46 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
added dahdi_hfcs support, DAHDI 2.6.x is required to test. Replaces zaphfc with DAHDI 2.4.x
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/dahdi-linux/Config.in
branches/1.0/package/dahdi-linux/dahdi-linux.mk
branches/1.0/package/dahdi-tools/dahdi.init
Added Paths:
-----------
branches/1.0/package/dahdi-linux/hfcs/
branches/1.0/package/dahdi-linux/hfcs/Kbuild
branches/1.0/package/dahdi-linux/hfcs/base.c
branches/1.0/package/dahdi-linux/hfcs/dahdi_hfcs.h
branches/1.0/package/dahdi-linux/hfcs/fifo.c
branches/1.0/package/dahdi-linux/hfcs/fifo.h
branches/1.0/package/dahdi-linux/hfcs-dahdi-2.6.0-Kbuild.patch
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-01-10 16:26:40 UTC (rev 5365)
+++ branches/1.0/astlinux.config 2012-01-10 19:08:46 UTC (rev 5366)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5307-dirty Configuration
-# Wed Dec 14 14:06:30 2011
+# Buildroot 2011.08-svn5365-dirty Configuration
+# Tue Jan 10 12:48:59 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -172,6 +172,7 @@
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
# BR2_PACKAGE_DAHDI_ZAPHFC is not set
+# BR2_PACKAGE_DAHDI_HFCS is not set
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_RHINO=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-01-10 16:26:40 UTC (rev 5365)
+++ branches/1.0/astlinux18.config 2012-01-10 19:08:46 UTC (rev 5366)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5307-dirty Configuration
-# Wed Dec 14 14:06:35 2011
+# Buildroot 2011.08-svn5365-dirty Configuration
+# Tue Jan 10 12:49:08 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -167,6 +167,7 @@
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
BR2_PACKAGE_DAHDI_ZAPHFC=y
+# BR2_PACKAGE_DAHDI_HFCS is not set
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_RHINO=y
Modified: branches/1.0/package/dahdi-linux/Config.in
===================================================================
--- branches/1.0/package/dahdi-linux/Config.in 2012-01-10 16:26:40 UTC (rev 5365)
+++ branches/1.0/package/dahdi-linux/Config.in 2012-01-10 19:08:46 UTC (rev 5366)
@@ -26,6 +26,18 @@
help
Adds zaphfc driver (single port HFC BRI cards)
Note: Requires chan_dahdi in asterisk 1.6 and newer.
+ Note: Requires DAHDI 2.4.x
http://code.google.com/p/zaphfc/
+config BR2_PACKAGE_DAHDI_HFCS
+ bool "dahdi_hfcs"
+ default n
+ depends on BR2_PACKAGE_DAHDI_LINUX
+ help
+ Adds dahdi_hfcs driver (single port HFC BRI cards)
+ Note: Requires chan_dahdi in asterisk 1.6 and newer.
+ Note: Requires DAHDI 2.6+
+
+ http://sourceforge.net/projects/dahdi-hfcs/
+
Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk 2012-01-10 16:26:40 UTC (rev 5365)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk 2012-01-10 19:08:46 UTC (rev 5366)
@@ -29,6 +29,11 @@
cp -a package/dahdi-linux/zaphfc/* $(DAHDI_LINUX_DIR)/drivers/dahdi/zaphfc
toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ zaphfc\*.patch
endif
+ifeq ($(strip $(BR2_PACKAGE_DAHDI_HFCS)),y)
+ mkdir -p $(DAHDI_LINUX_DIR)/drivers/dahdi/hfcs
+ cp -a package/dahdi-linux/hfcs/* $(DAHDI_LINUX_DIR)/drivers/dahdi/hfcs
+ toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ hfcs\*.patch
+endif
toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ dahdi-linux\*.patch
touch $@
Added: branches/1.0/package/dahdi-linux/hfcs/Kbuild
===================================================================
--- branches/1.0/package/dahdi-linux/hfcs/Kbuild (rev 0)
+++ branches/1.0/package/dahdi-linux/hfcs/Kbuild 2012-01-10 19:08:46 UTC (rev 5366)
@@ -0,0 +1,10 @@
+obj-m += dahdi_hfcs.o
+
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
+
+dahdi_hfcs-objs := base.o fifo.o
+
+$(obj)/base.o: $(src)/dahdi_hfcs.h
+$(obj)/fifo.o: $(src)/fifo.h
+
+
Added: branches/1.0/package/dahdi-linux/hfcs/base.c
===================================================================
--- branches/1.0/package/dahdi-linux/hfcs/base.c (rev 0)
+++ branches/1.0/package/dahdi-linux/hfcs/base.c 2012-01-10 19:08:46 UTC (rev 5366)
@@ -0,0 +1,1753 @@
+/*
+ * dahdi_hfcs.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
+ *
+ * Dahdi rewrite in hardhdlc mode
+ * Jose A. Deniz <od...@ho...>
+ *
+ * Copyright (C) 2011, Raoul Bönisch
+ * Copyright (C) 2009, Jose A. Deniz
+ * Copyright (C) 2006, headiisue GmbH; Jens Wilke
+ * Copyright (C) 2004 Daniele Orlandi
+ * Copyright (C) 2002, 2003, 2004, Junghanns.NET GmbH
+ *
+ * Jens Wilke <jw_...@he...>
+ *
+ * Original author of this code is
+ * Daniele "Vihai" Orlandi <da...@or...>
+ *
+ * Major rewrite of the driver made by
+ * Klaus-Peter Junghanns <kp...@ju...>
+ *
+ * This program is free software and may be modified and
+ * distributed under the terms of the GNU Public License.
+ *
+ * Please read the README file for important infos.
+ */
+
+#include <linux/spinlock.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32))
+#include <linux/sched.h>
+#endif
+#ifdef CONFIG_PROC_FS
+#include <linux/proc_fs.h>
+#endif /* CONFIG_PROC_FS */
+#include <linux/if_arp.h>
+
+#include <dahdi/kernel.h>
+
+#include "dahdi_hfcs.h"
+#include "fifo.h"
+
+#if CONFIG_PCI
+
+#define DAHDI_B1 0
+#define DAHDI_B2 1
+#define DAHDI_D 2
+
+#define D 0
+#define B1 1
+#define B2 2
+
+/*
+ * Mode Te for all
+ */
+static int modes;
+static int nt_modes[hfc_MAX_BOARDS];
+static int nt_modes_count;
+static int force_l1_up;
+#ifdef CONFIG_PROC_FS
+static struct proc_dir_entry *hfc_proc_dahdi_hfcs_dir;
+#endif /* CONFIG_PROC_FS */
+
+#define DEBUG
+#ifdef DEBUG
+int debug_level;
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE (!FALSE)
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#define SET_PROC_DIRENTRY_OWNER(p) do { (p)->owner = THIS_MODULE; } while(0);
+#else
+#define SET_PROC_DIRENTRY_OWNER(p) do { } while(0);
+#endif
+
+static DEFINE_PCI_DEVICE_TABLE(hfc_pci_ids) = {
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_3069,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, hfc_pci_ids);
+
+static int __devinit hfc_probe(struct pci_dev *dev
+ , const struct pci_device_id *ent);
+static void __devexit hfc_remove(struct pci_dev *dev);
+
+static struct pci_driver hfc_driver = {
+ .name = hfc_DRIVER_NAME,
+ .id_table = hfc_pci_ids,
+ .probe = hfc_probe,
+ .remove = __devexit_p(hfc_remove),
+};
+
+/******************************************
+ * HW routines
+ ******************************************/
+
+static void hfc_softreset(struct hfc_card *card)
+{
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "resetting\n",
+ card->cardnum);
+
+/*
+ * Softreset procedure. Put it on, wait and off again
+ */
+ hfc_outb(card, hfc_CIRM, hfc_CIRM_RESET);
+ udelay(6);
+ hfc_outb(card, hfc_CIRM, 0);
+
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout((hfc_RESET_DELAY * HZ) / 1000);
+}
+
+static void hfc_resetCard(struct hfc_card *card)
+{
+ card->regs.m1 = 0;
+ hfc_outb(card, hfc_INT_M1, card->regs.m1);
+
+ card->regs.m2 = 0;
+ hfc_outb(card, hfc_INT_M2, card->regs.m2);
+
+ hfc_softreset(card);
+
+ card->regs.trm = 0;
+ hfc_outb(card, hfc_TRM, card->regs.trm);
+
+ /*
+ * Select the non-capacitive line mode for the S/T interface
+ */
+ card->regs.sctrl = hfc_SCTRL_NONE_CAP;
+
+ if (card->nt_mode) {
+ /*
+ * ST-Bit delay for NT-Mode
+ */
+ hfc_outb(card, hfc_CLKDEL, hfc_CLKDEL_NT);
+
+ card->regs.sctrl |= hfc_SCTRL_MODE_NT;
+ } else {
+ /*
+ * ST-Bit delay for TE-Mode
+ */
+ hfc_outb(card, hfc_CLKDEL, hfc_CLKDEL_TE);
+
+ card->regs.sctrl |= hfc_SCTRL_MODE_TE;
+ }
+
+ hfc_outb(card, hfc_SCTRL, card->regs.sctrl);
+
+ /*
+ * S/T Auto awake
+ */
+ card->regs.sctrl_e = hfc_SCTRL_E_AUTO_AWAKE;
+ hfc_outb(card, hfc_SCTRL_E, card->regs.sctrl_e);
+
+ /*
+ * No B-channel enabled at startup
+ */
+ card->regs.sctrl_r = 0;
+ hfc_outb(card, hfc_SCTRL_R, card->regs.sctrl_r);
+
+ /*
+ * HFC Master Mode
+ */
+ hfc_outb(card, hfc_MST_MODE, hfc_MST_MODE_MASTER);
+
+ /*
+ * Connect internal blocks
+ */
+ card->regs.connect =
+ hfc_CONNECT_B1_HFC_from_ST |
+ hfc_CONNECT_B1_ST_from_HFC |
+ hfc_CONNECT_B1_GCI_from_HFC |
+ hfc_CONNECT_B2_HFC_from_ST |
+ hfc_CONNECT_B2_ST_from_HFC |
+ hfc_CONNECT_B2_GCI_from_HFC;
+ hfc_outb(card, hfc_CONNECT, card->regs.connect);
+
+ /*
+ * All bchans are HDLC by default, not useful, actually
+ * since mode is set during open()
+ */
+ hfc_outb(card, hfc_CTMT, 0);
+
+ /*
+ * bit order
+ */
+ hfc_outb(card, hfc_CIRM, 0);
+
+ /*
+ * Enable D-rx FIFO. At least one FIFO must be enabled (by specs)
+ */
+ card->regs.fifo_en = hfc_FIFOEN_DRX;
+ hfc_outb(card, hfc_FIFO_EN, card->regs.fifo_en);
+
+ card->late_irqs = 0;
+
+ /*
+ * Clear already pending ints
+ */
+ hfc_inb(card, hfc_INT_S1);
+ hfc_inb(card, hfc_INT_S2);
+
+ /*
+ * Enable IRQ output
+ */
+ card->regs.m1 = hfc_INTS_DREC | hfc_INTS_L1STATE | hfc_INTS_TIMER;
+ hfc_outb(card, hfc_INT_M1, card->regs.m1);
+
+ card->regs.m2 = hfc_M2_IRQ_ENABLE;
+ hfc_outb(card, hfc_INT_M2, card->regs.m2);
+
+ /*
+ * Unlocks the states machine
+ */
+ hfc_outb(card, hfc_STATES, 0);
+
+ /*
+ * There's no need to explicitly activate L1 now.
+ * Activation is managed inside the interrupt routine.
+ */
+}
+
+static void hfc_update_fifo_state(struct hfc_card *card)
+{
+ /*
+ * I'm not sure if irqsave is needed but there could be a race
+ * condition since hfc_update_fifo_state could be called from
+ * both the IRQ handler and the *_(open|close) functions
+ */
+
+ unsigned long flags;
+ spin_lock_irqsave(&card->chans[B1].lock, flags);
+ if (!card->fifo_suspended &&
+ (card->chans[B1].status == open_framed ||
+ card->chans[B1].status == open_voice)) {
+
+ if (!(card->regs.fifo_en & hfc_FIFOEN_B1RX)) {
+ card->regs.fifo_en |= hfc_FIFOEN_B1RX;
+ hfc_clear_fifo_rx(&card->chans[B1].rx);
+ }
+
+ if (!(card->regs.fifo_en & hfc_FIFOEN_B1TX)) {
+ card->regs.fifo_en |= hfc_FIFOEN_B1TX;
+ hfc_clear_fifo_tx(&card->chans[B1].tx);
+ }
+ } else {
+ if (card->regs.fifo_en & hfc_FIFOEN_B1RX)
+ card->regs.fifo_en &= ~hfc_FIFOEN_B1RX;
+ if (card->regs.fifo_en & hfc_FIFOEN_B1TX)
+ card->regs.fifo_en &= ~hfc_FIFOEN_B1TX;
+ }
+ spin_unlock_irqrestore(&card->chans[B1].lock, flags);
+
+ spin_lock_irqsave(&card->chans[B2].lock, flags);
+ if (!card->fifo_suspended &&
+ (card->chans[B2].status == open_framed ||
+ card->chans[B2].status == open_voice ||
+ card->chans[B2].status == sniff_aux)) {
+
+ if (!(card->regs.fifo_en & hfc_FIFOEN_B2RX)) {
+ card->regs.fifo_en |= hfc_FIFOEN_B2RX;
+ hfc_clear_fifo_rx(&card->chans[B2].rx);
+ }
+
+ if (!(card->regs.fifo_en & hfc_FIFOEN_B2TX)) {
+ card->regs.fifo_en |= hfc_FIFOEN_B2TX;
+ hfc_clear_fifo_tx(&card->chans[B2].tx);
+ }
+ } else {
+ if (card->regs.fifo_en & hfc_FIFOEN_B2RX)
+ card->regs.fifo_en &= ~hfc_FIFOEN_B2RX;
+ if (card->regs.fifo_en & hfc_FIFOEN_B2TX)
+ card->regs.fifo_en &= ~hfc_FIFOEN_B2TX;
+ }
+ spin_unlock_irqrestore(&card->chans[B2].lock, flags);
+
+ spin_lock_irqsave(&card->chans[D].lock, flags);
+ if (!card->fifo_suspended &&
+ card->chans[D].status == open_framed) {
+
+ if (!(card->regs.fifo_en & hfc_FIFOEN_DTX)) {
+ card->regs.fifo_en |= hfc_FIFOEN_DTX;
+
+ card->chans[D].tx.ugly_framebuf_size = 0;
+ card->chans[D].tx.ugly_framebuf_off = 0;
+ }
+ } else {
+ if (card->regs.fifo_en & hfc_FIFOEN_DTX)
+ card->regs.fifo_en &= ~hfc_FIFOEN_DTX;
+ }
+ spin_unlock_irqrestore(&card->chans[D].lock, flags);
+
+ hfc_outb(card, hfc_FIFO_EN, card->regs.fifo_en);
+}
+
+static inline void hfc_suspend_fifo(struct hfc_card *card)
+{
+ card->fifo_suspended = TRUE;
+
+ hfc_update_fifo_state(card);
+
+ /*
+ * When L1 goes down D rx receives garbage; it is nice to
+ * clear it to avoid a CRC error on reactivation
+ * udelay is needed because the FIFO deactivation happens
+ * in 250us
+ */
+ udelay(250);
+ hfc_clear_fifo_rx(&card->chans[D].rx);
+
+#ifdef DEBUG
+ if (debug_level >= 3) {
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "FIFOs suspended\n",
+ card->cardnum);
+ }
+#endif
+}
+
+static inline void hfc_resume_fifo(struct hfc_card *card)
+{
+ card->fifo_suspended = FALSE;
+
+ hfc_update_fifo_state(card);
+
+#ifdef DEBUG
+ if (debug_level >= 3) {
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "FIFOs resumed\n",
+ card->cardnum);
+ }
+#endif
+}
+
+static void hfc_check_l1_up(struct hfc_card *card)
+{
+ if ((!card->nt_mode && card->l1_state != 7)
+ || (card->nt_mode && card->l1_state != 3)) {
+
+ hfc_outb(card, hfc_STATES, hfc_STATES_DO_ACTION |
+ hfc_STATES_ACTIVATE|
+ hfc_STATES_NT_G2_G3);
+
+ /*
+ * 0 because this is quite verbose when an inferface is unconnected, jaw
+ */
+#if 0
+ if (debug_level >= 1) {
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "L1 is down, bringing up L1.\n",
+ card->cardnum);
+ }
+#endif
+ }
+}
+
+
+/*******************
+ * Dahdi interface *
+ *******************/
+
+static int hfc_dahdi_open(struct dahdi_chan *dahdi_chan)
+{
+ struct hfc_chan_duplex *chan = dahdi_chan->pvt;
+ struct hfc_card *card = chan->card;
+
+ spin_lock(&chan->lock);
+
+ switch (chan->number) {
+ case D:
+ if (chan->status != free &&
+ chan->status != open_framed) {
+ spin_unlock(&chan->lock);
+ return -EBUSY;
+ }
+ chan->status = open_framed;
+ break;
+
+ case B1:
+ case B2:
+ if (chan->status != free) {
+ spin_unlock(&chan->lock);
+ return -EBUSY;
+ }
+ chan->status = open_voice;
+ break;
+ }
+
+ chan->open_by_dahdi = TRUE;
+ try_module_get(THIS_MODULE);
+ spin_unlock(&chan->lock);
+
+ switch (chan->number) {
+ case D:
+ break;
+
+ case B1:
+ card->regs.m2 |= hfc_M2_PROC_TRANS;
+ /*
+ * Enable transparent mode
+ */
+ card->regs.ctmt |= hfc_CTMT_TRANSB1;
+ /*
+ * Reversed bit order
+ */
+ card->regs.cirm |= hfc_CIRM_B1_REV;
+ /*
+ * Enable transmission
+ */
+ card->regs.sctrl |= hfc_SCTRL_B1_ENA;
+ /*
+ * Enable reception
+ */
+ card->regs.sctrl_r |= hfc_SCTRL_R_B1_ENA;
+ break;
+
+ case B2:
+ card->regs.m2 |= hfc_M2_PROC_TRANS;
+ card->regs.ctmt |= hfc_CTMT_TRANSB2;
+ card->regs.cirm |= hfc_CIRM_B2_REV;
+ card->regs.sctrl |= hfc_SCTRL_B2_ENA;
+ card->regs.sctrl_r |= hfc_SCTRL_R_B2_ENA;
+ break;
+
+ }
+
+ /*
+ * If not already enabled, enable processing transition (8KHz)
+ * interrupt
+ */
+ hfc_outb(card, hfc_INT_M2, card->regs.m2);
+ hfc_outb(card, hfc_CTMT, card->regs.ctmt);
+ hfc_outb(card, hfc_CIRM, card->regs.cirm);
+ hfc_outb(card, hfc_SCTRL, card->regs.sctrl);
+ hfc_outb(card, hfc_SCTRL_R, card->regs.sctrl_r);
+
+ hfc_update_fifo_state(card);
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "chan %s opened as %s.\n",
+ card->cardnum,
+ chan->name,
+ dahdi_chan->name);
+
+ return 0;
+}
+
+static int hfc_dahdi_close(struct dahdi_chan *dahdi_chan)
+{
+ struct hfc_chan_duplex *chan = dahdi_chan->pvt;
+ struct hfc_card *card = chan->card;
+
+ if (!card) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "hfc_dahdi_close called with NULL card\n");
+ return -1;
+ }
+
+ spin_lock(&chan->lock);
+
+ if (chan->status == free) {
+ spin_unlock(&chan->lock);
+ return -EINVAL;
+ }
+
+ chan->status = free;
+ chan->open_by_dahdi = FALSE;
+
+ spin_unlock(&chan->lock);
+
+ switch (chan->number) {
+ case D:
+ break;
+
+ case B1:
+ card->regs.ctmt &= ~hfc_CTMT_TRANSB1;
+ card->regs.cirm &= ~hfc_CIRM_B1_REV;
+ card->regs.sctrl &= ~hfc_SCTRL_B1_ENA;
+ card->regs.sctrl_r &= ~hfc_SCTRL_R_B1_ENA;
+ break;
+
+ case B2:
+ card->regs.ctmt &= ~hfc_CTMT_TRANSB2;
+ card->regs.cirm &= ~hfc_CIRM_B2_REV;
+ card->regs.sctrl &= ~hfc_SCTRL_B2_ENA;
+ card->regs.sctrl_r &= ~hfc_SCTRL_R_B2_ENA;
+ break;
+ }
+
+ if (card->chans[B1].status == free &&
+ card->chans[B2].status == free)
+ card->regs.m2 &= ~hfc_M2_PROC_TRANS;
+
+ hfc_outb(card, hfc_INT_M2, card->regs.m2);
+ hfc_outb(card, hfc_CTMT, card->regs.ctmt);
+ hfc_outb(card, hfc_CIRM, card->regs.cirm);
+ hfc_outb(card, hfc_SCTRL, card->regs.sctrl);
+ hfc_outb(card, hfc_SCTRL_R, card->regs.sctrl_r);
+
+ hfc_update_fifo_state(card);
+
+ module_put(THIS_MODULE);
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "chan %s closed as %s.\n",
+ card->cardnum,
+ chan->name,
+ dahdi_chan->name);
+
+ return 0;
+}
+
+static int hfc_dahdi_rbsbits(struct dahdi_chan *chan, int bits)
+{
+ return 0;
+}
+
+static int hfc_dahdi_ioctl(struct dahdi_chan *chan,
+ unsigned int cmd, unsigned long data)
+{
+ switch (cmd) {
+
+ default:
+ return -ENOTTY;
+ }
+
+ return 0;
+}
+
+static void hfc_hdlc_hard_xmit(struct dahdi_chan *d_chan)
+{
+ struct hfc_chan_duplex *chan = d_chan->pvt;
+ struct hfc_card *card = chan->card;
+ struct dahdi_hfc *hfccard = card->dahdi_dev;
+
+ atomic_inc(&hfccard->hdlc_pending);
+
+}
+
+static int hfc_dahdi_startup(struct file *file, struct dahdi_span *span)
+{
+ struct dahdi_hfc *dahdi_hfcs = dahdi_hfc_from_span(span);
+ struct hfc_card *hfctmp = dahdi_hfcs->card;
+ int alreadyrunning;
+
+ if (!hfctmp) {
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "no card for span at startup!\n",
+ hfctmp->cardnum);
+ }
+
+ alreadyrunning = span->flags & DAHDI_FLAG_RUNNING;
+
+ if (!alreadyrunning)
+ span->flags |= DAHDI_FLAG_RUNNING;
+
+ return 0;
+}
+
+static int hfc_dahdi_shutdown(struct dahdi_span *span)
+{
+ return 0;
+}
+
+static int hfc_dahdi_maint(struct dahdi_span *span, int cmd)
+{
+ return 0;
+}
+
+static int hfc_dahdi_chanconfig(struct file *file, struct dahdi_chan *d_chan, int sigtype)
+{
+ struct hfc_chan_duplex *chan = d_chan->pvt;
+ struct hfc_card *card = chan->card;
+ struct dahdi_hfc *hfccard = card->dahdi_dev;
+
+ if ((sigtype == DAHDI_SIG_HARDHDLC) && (hfccard->sigchan == d_chan)) {
+ hfccard->sigactive = 0;
+ atomic_set(&hfccard->hdlc_pending, 0);
+ }
+
+ return 0;
+}
+
+static int hfc_dahdi_spanconfig(struct file *file, struct dahdi_span *span,
+ struct dahdi_lineconfig *lc)
+{
+ span->lineconfig = lc->lineconfig;
+
+ return 0;
+}
+
+static const struct dahdi_span_ops hfc_dahdi_span_ops = {
+ .owner = THIS_MODULE,
+ .chanconfig = hfc_dahdi_chanconfig,
+ .spanconfig = hfc_dahdi_spanconfig,
+ .startup = hfc_dahdi_startup,
+ .shutdown = hfc_dahdi_shutdown,
+ .maint = hfc_dahdi_maint,
+ .rbsbits = hfc_dahdi_rbsbits,
+ .open = hfc_dahdi_open,
+ .close = hfc_dahdi_close,
+ .ioctl = hfc_dahdi_ioctl,
+ .hdlc_hard_xmit = hfc_hdlc_hard_xmit
+};
+
+static int hfc_dahdi_initialize(struct dahdi_hfc *hfccard)
+{
+ struct hfc_card *hfctmp = hfccard->card;
+ int i;
+
+ hfccard->ddev = dahdi_create_device();
+ if (!hfccard->ddev)
+ return -ENOMEM;
+
+ memset(&hfccard->span, 0x0, sizeof(struct dahdi_span));
+
+ /*
+ * ZTHFC
+ *
+ * Cards' and channels' names shall contain "ZTHFC"
+ * as the dahdi-tools look for this string to guess framing.
+ * We don't want to modify dahdi-tools only in order to change this.
+ *
+ * So we choose for a span name: DAHDI HFC-S formerly known as ZTHFC. :-)
+ */
+
+ sprintf(hfccard->span.name, "DAHDI_HFCS_FKA_ZTHFC%d", hfctmp->cardnum + 1);
+ sprintf(hfccard->span.desc,
+ "HFC-S PCI A ISDN card %d [%s] ",
+ hfctmp->cardnum,
+ hfctmp->nt_mode ? "NT" : "TE");
+ hfccard->span.spantype = hfctmp->nt_mode ? "NT" : "TE";
+ hfccard->ddev->manufacturer = "Cologne Chips";
+ hfccard->span.flags = 0;
+ hfccard->span.ops = &hfc_dahdi_span_ops;
+ hfccard->ddev->devicetype = kasprintf(GFP_KERNEL, "HFC-S PCI-A ISDN");
+ hfccard->ddev->location = kasprintf(GFP_KERNEL, "PCI Bus %02d Slot %02d",
+ hfctmp->pcidev->bus->number,
+ PCI_SLOT(hfctmp->pcidev->devfn) + 1);
+ hfccard->span.chans = hfccard->_chans;
+ hfccard->span.channels = 3;
+ for (i = 0; i < hfccard->span.channels; i++)
+ hfccard->_chans[i] = &hfccard->chans[i];
+ hfccard->span.deflaw = DAHDI_LAW_ALAW;
+ hfccard->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
+ hfccard->span.offset = 0;
+
+ for (i = 0; i < hfccard->span.channels; i++) {
+ memset(&hfccard->chans[i], 0x0, sizeof(struct dahdi_chan));
+
+ sprintf(hfccard->chans[i].name,
+ "DAHDI_HFCS_FKA_ZTHFC%d/%d/%d",
+ hfctmp->cardnum + 1, 0, i + 1);
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "registered %s\n",
+ hfctmp->cardnum,
+ hfccard->chans[i].name);
+
+ if (i == hfccard->span.channels - 1) {
+ hfccard->chans[i].sigcap = DAHDI_SIG_HARDHDLC;
+ hfccard->sigchan = &hfccard->chans[DAHDI_D];
+ hfccard->sigactive = 0;
+ atomic_set(&hfccard->hdlc_pending, 0);
+ } else {
+ hfccard->chans[i].sigcap =
+ DAHDI_SIG_CLEAR | DAHDI_SIG_DACS;
+ }
+
+ hfccard->chans[i].chanpos = i + 1;
+ }
+
+ hfccard->chans[DAHDI_D].readchunk =
+ hfctmp->chans[D].rx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_D].writechunk =
+ hfctmp->chans[D].tx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_D].pvt = &hfctmp->chans[D];
+
+ hfccard->chans[DAHDI_B1].readchunk =
+ hfctmp->chans[B1].rx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_B1].writechunk =
+ hfctmp->chans[B1].tx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_B1].pvt = &hfctmp->chans[B1];
+
+ hfccard->chans[DAHDI_B2].readchunk =
+ hfctmp->chans[B2].rx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_B2].writechunk =
+ hfctmp->chans[B2].tx.dahdi_buffer;
+
+ hfccard->chans[DAHDI_B2].pvt = &hfctmp->chans[B2];
+
+ list_add_tail(&hfccard->span.device_node, &hfccard->ddev->spans);
+ if (dahdi_register_device(hfccard->ddev, &hfccard->card->pcidev->dev)) {
+ printk(KERN_NOTICE "Unable to register device with DAHDI\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static void hfc_dahdi_transmit(struct hfc_chan_simplex *chan)
+{
+ hfc_fifo_put(chan, chan->dahdi_buffer, DAHDI_CHUNKSIZE);
+}
+
+static void hfc_dahdi_receive(struct hfc_chan_simplex *chan)
+{
+ hfc_fifo_get(chan, chan->dahdi_buffer, DAHDI_CHUNKSIZE);
+}
+
+/******************************************
+ * Interrupt Handler
+ ******************************************/
+
+static void hfc_handle_timer_interrupt(struct hfc_card *card);
+static void hfc_handle_state_interrupt(struct hfc_card *card);
+static void hfc_handle_processing_interrupt(struct hfc_card *card);
+static void hfc_frame_arrived(struct hfc_chan_duplex *chan);
+static void hfc_handle_voice(struct hfc_card *card);
+
+#if (KERNEL_VERSION(2, 6, 24) < LINUX_VERSION_CODE)
+static irqreturn_t hfc_interrupt(int irq, void *dev_id)
+#else
+static irqreturn_t hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+{
+ struct hfc_card *card = dev_id;
+ unsigned long flags;
+ u8 status, s1, s2;
+
+ if (!card) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "spurious interrupt (IRQ %d)\n",
+ irq);
+ return IRQ_NONE;
+ }
+
+ spin_lock_irqsave(&card->lock, flags);
+ status = hfc_inb(card, hfc_STATUS);
+ if (!(status & hfc_STATUS_ANYINT)) {
+ /*
+ * maybe we are sharing the irq
+ */
+ spin_unlock_irqrestore(&card->lock, flags);
+ return IRQ_NONE;
+ }
+
+ /* We used to ingore the IRQ when the card was in processing
+ * state but apparently there is no restriction to access the
+ * card in such state:
+ *
+ * Joerg Ciesielski wrote:
+ * > There is no restriction for the IRQ handler to access
+ * > HFC-S PCI during processing phase. A IRQ latency of 375 us
+ * > is also no problem since there are no interrupt sources in
+ * > HFC-S PCI which must be handled very fast.
+ * > Due to its deep fifos the IRQ latency can be several ms with
+ * > out the risk of loosing data. Even the S/T state interrupts
+ * > must not be handled with a latency less than <5ms.
+ * >
+ * > The processing phase only indicates that HFC-S PCI is
+ * > processing the Fifos as PCI master so that data is read and
+ * > written in the 32k memory window. But there is no restriction
+ * > to access data in the memory window during this time.
+ *
+ * // if (status & hfc_STATUS_PCI_PROC) {
+ * // return IRQ_HANDLED;
+ * // }
+ */
+
+ s1 = hfc_inb(card, hfc_INT_S1);
+ s2 = hfc_inb(card, hfc_INT_S2);
+
+ if (s1 != 0) {
+ if (s1 & hfc_INTS_TIMER) {
+ /*
+ * timer (bit 7)
+ */
+ hfc_handle_timer_interrupt(card);
+ }
+
+ if (s1 & hfc_INTS_L1STATE) {
+ /*
+ * state machine (bit 6)
+ */
+ hfc_handle_state_interrupt(card);
+ }
+
+ if (s1 & hfc_INTS_DREC) {
+ /*
+ * D chan RX (bit 5)
+ */
+ hfc_frame_arrived(&card->chans[D]);
+ }
+
+ if (s1 & hfc_INTS_B1REC) {
+ /*
+ * B1 chan RX (bit 3)
+ */
+ hfc_frame_arrived(&card->chans[B1]);
+ }
+
+ if (s1 & hfc_INTS_B2REC) {
+ /*
+ * B2 chan RX (bit 4)
+ */
+ hfc_frame_arrived(&card->chans[B2]);
+ }
+
+ if (s1 & hfc_INTS_DTRANS) {
+ /*
+ * D chan TX (bit 2)
+ */
+ }
+
+ if (s1 & hfc_INTS_B1TRANS) {
+ /*
+ * B1 chan TX (bit 0)
+ */
+ }
+
+ if (s1 & hfc_INTS_B2TRANS) {
+ /*
+ * B2 chan TX (bit 1)
+ */
+ }
+
+ }
+
+ if (s2 != 0) {
+ if (s2 & hfc_M2_PMESEL) {
+ /*
+ * kaboom irq (bit 7)
+ *
+ * CologneChip says:
+ *
+ * the meaning of this fatal error bit is that HFC-S
+ * PCI as PCI master could not access the PCI bus
+ * within 125us to finish its data processing. If this
+ * happens only very seldom it does not cause big
+ * problems but of course some B-channel or D-channel
+ * data will be corrupted due to this event.
+ *
+ * Unfortunately this bit is only set once after the
+ * problem occurs and can only be reseted by a
+ * software reset. That means it is not easily
+ * possible to check how often this fatal error
+ * happens.
+ *
+ */
+
+ if (!card->sync_loss_reported) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "sync lost, pci performance too low!\n",
+ card->cardnum);
+
+ card->sync_loss_reported = TRUE;
+ }
+ }
+
+ if (s2 & hfc_M2_GCI_MON_REC) {
+ /*
+ * RxR monitor channel (bit 2)
+ */
+ }
+
+ if (s2 & hfc_M2_GCI_I_CHG) {
+ /*
+ * GCI I-change (bit 1)
+ */
+ }
+
+ if (s2 & hfc_M2_PROC_TRANS) {
+ /*
+ * processing/non-processing transition (bit 0)
+ */
+ hfc_handle_processing_interrupt(card);
+ }
+
+ }
+
+ spin_unlock_irqrestore(&card->lock, flags);
+
+ return IRQ_HANDLED;
+}
+
+static void hfc_handle_timer_interrupt(struct hfc_card *card)
+{
+ if (card->ignore_first_timer_interrupt) {
+ card->ignore_first_timer_interrupt = FALSE;
+ return;
+ }
+
+ if ((card->nt_mode && card->l1_state == 3) ||
+ (!card->nt_mode && card->l1_state == 7)) {
+
+ card->regs.ctmt &= ~hfc_CTMT_TIMER_MASK;
+ hfc_outb(card, hfc_CTMT, card->regs.ctmt);
+
+ hfc_resume_fifo(card);
+ }
+}
+
+static void hfc_handle_state_interrupt(struct hfc_card *card)
+{
+ u8 new_state = hfc_inb(card, hfc_STATES) & hfc_STATES_STATE_MASK;
+
+#ifdef DEBUG
+ if (debug_level >= 1) {
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "layer 1 state = %c%d\n",
+ card->cardnum,
+ card->nt_mode ? 'G' : 'F',
+ new_state);
+ }
+#endif
+
+ if (card->nt_mode) {
+ /*
+ * NT mode
+ */
+
+ if (new_state == 3) {
+ /*
+ * fix to G3 state (see specs)
+ */
+ hfc_outb(card, hfc_STATES, hfc_STATES_LOAD_STATE | 3);
+ }
+
+ if (new_state == 3 && card->l1_state != 3)
+ hfc_resume_fifo(card);
+
+ if (new_state != 3 && card->l1_state == 3)
+ hfc_suspend_fifo(card);
+
+ } else {
+ if (new_state == 3) {
+ /*
+ * Keep L1 up... zaptel & libpri expects
+ * a always up L1...
+ * Enable only when using an unpatched libpri
+ *
+ * Are we still using unpatched libpri? Is this tested at runtime???
+ * Does it only affect zaptel or DAHDI, too?
+ */
+
+ if (force_l1_up) {
+ hfc_outb(card, hfc_STATES,
+ hfc_STATES_DO_ACTION |
+ hfc_STATES_ACTIVATE|
+ hfc_STATES_NT_G2_G3);
+ }
+ }
+
+ if (new_state == 7 && card->l1_state != 7) {
+ /*
+ * TE is now active, schedule FIFO activation after
+ * some time, otherwise the first frames are lost
+ */
+
+ card->regs.ctmt |= hfc_CTMT_TIMER_50 |
+ hfc_CTMT_TIMER_CLEAR;
+ hfc_outb(card, hfc_CTMT, card->regs.ctmt);
+
+ /*
+ * Activating the timer firest an
+ * interrupt immediately, we
+ * obviously need to ignore it
+ */
+ card->ignore_first_timer_interrupt = TRUE;
+ }
+
+ if (new_state != 7 && card->l1_state == 7) {
+ /*
+ * TE has become inactive, disable FIFO
+ */
+ hfc_suspend_fifo(card);
+ }
+ }
+
+ card->l1_state = new_state;
+}
+
+static void hfc_handle_processing_interrupt(struct hfc_card *card)
+{
+ int available_bytes = 0;
+
+ /*
+ * Synchronize with the first enabled channel
+ */
+ if (card->regs.fifo_en & hfc_FIFOEN_B1RX)
+ available_bytes = hfc_fifo_used_rx(&card->chans[B1].rx);
+ if (card->regs.fifo_en & hfc_FIFOEN_B2RX)
+ available_bytes = hfc_fifo_used_rx(&card->chans[B2].rx);
+ else
+ available_bytes = -1;
+
+ if ((available_bytes == -1 && card->ticks == 8) ||
+ available_bytes >= DAHDI_CHUNKSIZE + hfc_RX_FIFO_PRELOAD) {
+ card->ticks = 0;
+
+ if (available_bytes > DAHDI_CHUNKSIZE*2 + hfc_RX_FIFO_PRELOAD) {
+ card->late_irqs++;
+ /*
+ * we are out of sync, clear fifos, jaw
+ */
+ hfc_clear_fifo_rx(&card->chans[B1].rx);
+ hfc_clear_fifo_tx(&card->chans[B1].tx);
+ hfc_clear_fifo_rx(&card->chans[B2].rx);
+ hfc_clear_fifo_tx(&card->chans[B2].tx);
+
+#ifdef DEBUG
+ if (debug_level >= 4) {
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "late IRQ, %d bytes late\n",
+ card->cardnum,
+ available_bytes -
+ (DAHDI_CHUNKSIZE +
+ hfc_RX_FIFO_PRELOAD));
+ }
+#endif
+ } else {
+ hfc_handle_voice(card);
+ }
+ }
+
+ card->ticks++;
+}
+
+
+static void hfc_handle_voice(struct hfc_card *card)
+{
+ struct dahdi_hfc *hfccard = card->dahdi_dev;
+ int frame_left, res;
+ unsigned char buf[hfc_HDLC_BUF_LEN];
+ unsigned int size = sizeof(buf) / sizeof(buf[0]);
+
+
+ if (card->chans[B1].status != open_voice &&
+ card->chans[B2].status != open_voice)
+ return;
+
+ dahdi_transmit(&hfccard->span);
+
+ if (card->regs.fifo_en & hfc_FIFOEN_B1TX)
+ hfc_dahdi_transmit(&card->chans[B1].tx);
+ if (card->regs.fifo_en & hfc_FIFOEN_B2TX)
+ hfc_dahdi_transmit(&card->chans[B2].tx);
+
+ /*
+ * dahdi hdlc frame tx
+ */
+
+ if (atomic_read(&hfccard->hdlc_pending)) {
+ hfc_check_l1_up(card);
+ res = dahdi_hdlc_getbuf(hfccard->sigchan, buf, &size);
+ if (size > 0) {
+ hfccard->sigactive = 1;
+ memcpy(card->chans[D].tx.ugly_framebuf +
+ card->chans[D].tx.ugly_framebuf_size,
+ buf, size);
+ card->chans[D].tx.ugly_framebuf_size += size;
+ if (res != 0) {
+ hfc_fifo_put_frame(&card->chans[D].tx,
+ card->chans[D].tx.ugly_framebuf,
+ card->chans[D].tx.ugly_framebuf_size);
+ ++hfccard->frames_out;
+ hfccard->sigactive = 0;
+ card->chans[D].tx.ugly_framebuf_size
+ = 0;
+ atomic_dec(&hfccard->hdlc_pending);
+ }
+ }
+ }
+ /*
+ * dahdi hdlc frame tx done
+ */
+
+ if (card->regs.fifo_en & hfc_FIFOEN_B1RX)
+ hfc_dahdi_receive(&card->chans[B1].rx);
+ else
+ memset(&card->chans[B1].rx.dahdi_buffer, 0x7f,
+ sizeof(card->chans[B1].rx.dahdi_buffer));
+
+ if (card->regs.fifo_en & hfc_FIFOEN_B2RX)
+ hfc_dahdi_receive(&card->chans[B2].rx);
+ else
+ memset(&card->chans[B2].rx.dahdi_buffer, 0x7f,
+ sizeof(card->chans[B1].rx.dahdi_buffer));
+
+ /*
+ * Echo cancellation
+ */
+ dahdi_ec_chunk(&hfccard->chans[DAHDI_B1],
+ card->chans[B1].rx.dahdi_buffer,
+ card->chans[B1].tx.dahdi_buffer);
+ dahdi_ec_chunk(&hfccard->chans[DAHDI_B2],
+ card->chans[B2].rx.dahdi_buffer,
+ card->chans[B2].tx.dahdi_buffer);
+
+ /*
+ * dahdi hdlc frame rx
+ */
+ if (hfc_fifo_has_frames(&card->chans[D].rx))
+ hfc_frame_arrived(&card->chans[D]);
+
+ if (card->chans[D].rx.ugly_framebuf_size) {
+ frame_left = card->chans[D].rx.ugly_framebuf_size -
+ card->chans[D].rx.ugly_framebuf_off ;
+ if (frame_left > hfc_HDLC_BUF_LEN) {
+ dahdi_hdlc_putbuf(hfccard->sigchan,
+ card->chans[D].rx.ugly_framebuf +
+ card->chans[D].rx.ugly_framebuf_off,
+ hfc_HDLC_BUF_LEN);
+ card->chans[D].rx.ugly_framebuf_off +=
+ hfc_HDLC_BUF_LEN;
+ } else {
+ dahdi_hdlc_putbuf(hfccard->sigchan,
+ card->chans[D].rx.ugly_framebuf +
+ card->chans[D].rx.ugly_framebuf_off,
+ frame_left);
+ dahdi_hdlc_finish(hfccard->sigchan);
+ card->chans[D].rx.ugly_framebuf_size = 0;
+ card->chans[D].rx.ugly_framebuf_off = 0;
+ }
+ }
+ /*
+ * dahdi hdlc frame rx done
+ */
+
+ if (hfccard->span.flags & DAHDI_FLAG_RUNNING)
+ dahdi_receive(&hfccard->span);
+
+}
+
+static void hfc_frame_arrived(struct hfc_chan_duplex *chan)
+{
+ struct hfc_card *card = chan->card;
+ int antiloop = 16;
+ struct sk_buff *skb;
+
+ while (hfc_fifo_has_frames(&chan->rx) && --antiloop) {
+ int frame_size = hfc_fifo_get_frame_size(&chan->rx);
+
+ if (frame_size < 3) {
+#ifdef DEBUG
+ if (debug_level >= 2)
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "chan %s: "
+ "invalid frame received, "
+ "just %d bytes\n",
+ card->cardnum,
+ chan->name,
+ frame_size);
+#endif
+
+ hfc_fifo_drop_frame(&chan->rx);
+
+
+ continue;
+ } else if (frame_size == 3) {
+#ifdef DEBUG
+ if (debug_level >= 2)
+ printk(KERN_DEBUG hfc_DRIVER_PREFIX
+ "card %d: "
+ "chan %s: "
+ "empty frame received\n",
+ card->cardnum,
+ chan->name);
+#endif
+
+ hfc_fifo_drop_frame(&chan->rx);
+
+
+ continue;
+ }
+
+ if (chan->open_by_dahdi &&
+ card->chans[D].rx.ugly_framebuf_size) {
+
+ /*
+ * We have to wait for Dahdi to transmit the
+ * frame... wait for next time
+ */
+
+ break;
+ }
+
+ skb = dev_alloc_skb(frame_size - 3);
+
+ if (!skb) {
+ printk(KERN_ERR hfc_DRIVER_PREFIX
+ "card %d: "
+ "chan %s: "
+ "cannot allocate skb: frame dropped\n",
+ card->cardnum,
+ chan->name);
+
+ hfc_fifo_drop_frame(&chan->rx);
+
+
+ continue;
+ }
+
+
+ /*
+ * HFC does the checksum
+ */
+#ifndef CHECKSUM_HW
+ skb->ip_summed = CHECKSUM_COMPLETE;
+#else
+ skb->ip_summed = CHECKSUM_HW;
+#endif
+
+ if (chan->open_by_dahdi) {
+ card->chans[D].rx.ugly_framebuf_size = frame_size - 1;
+
+ if (hfc_fifo_get_frame(&card->chans[D].rx,
+ card->chans[D].rx.ugly_framebuf,
+ frame_size - 1) == -1) {
+ dev_kfree_skb(skb);
+ continue;
+ }
+
+ memcpy(skb_put(skb, frame_size - 3),
+ card->chans[D].rx.ugly_framebuf,
+ frame_size - 3);
+ } else {
+ if (hfc_fifo_get_frame(&chan->rx,
+ skb_put(skb, frame_size - 3),
+ frame_size - 3) == -1) {
+ dev_kfree_skb(skb);
+ continue;
+ }
+ }
+ }
+
+ if (!antiloop)
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "Infinite loop detected\n",
+ card->cardnum);
+}
+
+/******************************************
+ * Module initialization and cleanup
+ ******************************************/
+
+static int __devinit hfc_probe(struct pci_dev *pci_dev,
+ const struct pci_device_id *ent)
+{
+ static int cardnum;
+ int err;
+ int i;
+
+ struct hfc_card *card = NULL;
+ struct dahdi_hfc *dahdi_hfcs = NULL;
+ card = kmalloc(sizeof(struct hfc_card), GFP_KERNEL);
+ if (!card) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "unable to kmalloc!\n");
+ err = -ENOMEM;
+ goto err_alloc_hfccard;
+ }
+
+ memset(card, 0x00, sizeof(struct hfc_card));
+ card->cardnum = cardnum;
+ card->pcidev = pci_dev;
+ spin_lock_init(&card->lock);
+
+ pci_set_drvdata(pci_dev, card);
+
+ err = pci_enable_device(pci_dev);
+ if (err)
+ goto err_pci_enable_device;
+
+ err = pci_set_dma_mask(pci_dev, PCI_DMA_32BIT);
+ if (err) {
+ printk(KERN_ERR hfc_DRIVER_PREFIX
+ "card %d: "
+ "No suitable DMA configuration available.\n",
+ card->cardnum);
+ goto err_pci_set_dma_mask;
+ }
+
+ pci_write_config_word(pci_dev, PCI_COMMAND, PCI_COMMAND_MEMORY);
+ err = pci_request_regions(pci_dev, hfc_DRIVER_NAME);
+ if (err) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "cannot request I/O memory region\n",
+ card->cardnum);
+ goto err_pci_request_regions;
+ }
+
+ pci_set_master(pci_dev);
+
+ if (!pci_dev->irq) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "no irq!\n",
+ card->cardnum);
+ err = -ENODEV;
+ goto err_noirq;
+ }
+
+ card->io_bus_mem = pci_resource_start(pci_dev, 1);
+ if (!card->io_bus_mem) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "no iomem!\n",
+ card->cardnum);
+ err = -ENODEV;
+ goto err_noiobase;
+ }
+
+ card->io_mem = ioremap(card->io_bus_mem, hfc_PCI_MEM_SIZE);
+ if (!(card->io_mem)) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "cannot ioremap I/O memory\n",
+ card->cardnum);
+ err = -ENODEV;
+ goto err_ioremap;
+ }
+
+ /*
+ * pci_alloc_consistent guarantees alignment
+ * (Documentation/DMA-mapping.txt)
+ */
+ card->fifo_mem = pci_alloc_consistent(pci_dev,
+ hfc_FIFO_SIZE, &card->fifo_bus_mem);
+ if (!card->fifo_mem) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "unable to allocate FIFO DMA memory!\n",
+ card->cardnum);
+ err = -ENOMEM;
+ goto err_alloc_fifo;
+ }
+
+ memset(card->fifo_mem, 0x00, hfc_FIFO_SIZE);
+
+ card->fifos = card->fifo_mem;
+
+ pci_write_config_dword(card->pcidev, hfc_PCI_MWBA, card->fifo_bus_mem);
+
+ err = request_irq(card->pcidev->irq, &hfc_interrupt,
+
+#if (KERNEL_VERSION(2, 6, 23) < LINUX_VERSION_CODE)
+ IRQF_SHARED, hfc_DRIVER_NAME, card);
+#else
+ SA_SHIRQ, hfc_DRIVER_NAME, card);
+#endif
+
+ if (err) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "card %d: "
+ "unable to register irq\n",
+ card->cardnum);
+ goto err_request_irq;
+ }
+
+ card->nt_mode = FALSE;
+
+ if (modes & (1 << card->cardnum))
+ card->nt_mode = TRUE;
+
+ for (i = 0; i < nt_modes_count; i++) {
+ if (nt_modes[i] == card->cardnum)
+ card->nt_mode = TRUE;
+ }
+
+ /*
+ * D Channel
+ */
+ card->chans[D].card = card;
+ card->chans[D].name = "D";
+ card->chans[D].status = free;
+ card->chans[D].number = D;
+ spin_lock_init(&card->chans[D].lock);
+
+ card->chans[D].rx.chan = &card->chans[D];
+ card->chans[D].rx.fifo_base = card->fifos + 0x4000;
+ card->chans[D].rx.z_base = card->fifos + 0x4000;
+ card->chans[D].rx.z1_base = card->fifos + 0x6080;
+ card->chans[D].rx.z2_base = card->fifos + 0x6082;
+ card->chans[D].rx.z_min = 0x0000;
+ card->chans[D].rx.z_max = 0x01FF;
+ card->chans[D].rx.f_min = 0x10;
+ card->chans[D].rx.f_max = 0x1F;
+ card->chans[D].rx.f1 = card->fifos + 0x60a0;
+ card->chans[D].rx.f2 = card->fifos + 0x60a1;
+ card->chans[D].rx.fifo_size = card->chans[D].rx.z_max
+ - card->chans[D].rx.z_min + 1;
+ card->chans[D].rx.f_num = card->chans[D].rx.f_max
+ - card->chans[D].rx.f_min + 1;
+
+ card->chans[D].tx.chan = &card->chans[D];
+ card->chans[D].tx.fifo_base = card->fifos + 0x0000;
+ card->chans[D].tx.z_base = card->fifos + 0x0000;
+ card->chans[D].tx.z1_base = card->fifos + 0x2080;
+ card->chans[D].tx.z2_base = card->fifos + 0x2082;
+ card->chans[D].tx.z_min = 0x0000;
+ card->chans[D].tx.z_max = 0x01FF;
+ card->chans[D].tx.f_min = 0x10;
+ card->chans[D].tx.f_max = 0x1F;
+ card->chans[D].tx.f1 = card->fifos + 0x20a0;
+ card->chans[D].tx.f2 = card->fifos + 0x20a1;
+ card->chans[D].tx.fifo_size = card->chans[D].tx.z_max -
+ card->chans[D].tx.z_min + 1;
+ card->chans[D].tx.f_num = card->chans[D].tx.f_max -
+ card->chans[D].tx.f_min + 1;
+
+ /*
+ * B1 Channel
+ */
+ card->chans[B1].card = card;
+ card->chans[B1].name = "B1";
+ card->chans[B1].status = free;
+ card->chans[B1].number = B1;
+ card->chans[B1].protocol = 0;
+ spin_lock_init(&card->chans[B1].lock);
+
+ card->chans[B1].rx.chan = &card->chans[B1];
+ card->chans[B1].rx.fifo_base = card->fifos + 0x4200;
+ card->chans[B1].rx.z_base = card->fifos + 0x4000;
+ card->chans[B1].rx.z1_base = card->fifos + 0x6000;
+ card->chans[B1].rx.z2_base = card->fifos + 0x6002;
+ card->chans[B1].rx.z_min = 0x0200;
+ card->chans[B1].rx.z_max = 0x1FFF;
+ card->chans[B1].rx.f_min = 0x00;
+ card->chans[B1].rx.f_max = 0x1F;
+ card->chans[B1].rx.f1 = card->fifos + 0x6080;
+ card->chans[B1].rx.f2 = card->fifos + 0x6081;
+ card->chans[B1].rx.fifo_size = card->chans[B1].rx.z_max -
+ card->chans[B1].rx.z_min + 1;
+ card->chans[B1].rx.f_num = card->chans[B1].rx.f_max -
+ card->chans[B1].rx.f_min + 1;
+
+ card->chans[B1].tx.chan = &card->chans[B1];
+ card->chans[B1].tx.fifo_base = card->fifos + 0x0200;
+ card->chans[B1].tx.z_base = card->fifos + 0x0000;
+ card->chans[B1].tx.z1_base = card->fifos + 0x2000;
+ card->chans[B1].tx.z2_base = card->fifos + 0x2002;
+ card->chans[B1].tx.z_min = 0x0200;
+ card->chans[B1].tx.z_max = 0x1FFF;
+ card->chans[B1].tx.f_min = 0x00;
+ card->chans[B1].tx.f_max = 0x1F;
+ card->chans[B1].tx.f1 = card->fifos + 0x2080;
+ card->chans[B1].tx.f2 = card->fifos + 0x2081;
+ card->chans[B1].tx.fifo_size = card->chans[B1].tx.z_max -
+ card->chans[B1].tx.z_min + 1;
+ card->chans[B1].tx.f_num = card->chans[B1].tx.f_max -
+ card->chans[B1].tx.f_min + 1;
+
+ /*
+ * B2 Channel
+ */
+ card->chans[B2].card = card;
+ card->chans[B2].name = "B2";
+ card->chans[B2].status = free;
+ card->chans[B2].number = B2;
+ card->chans[B2].protocol = 0;
+ spin_lock_init(&card->chans[B2].lock);
+
+ card->chans[B2].rx.chan = &card->chans[B2];
+ card->chans[B2].rx.fifo_base = card->fifos + 0x6200,
+ card->chans[B2].rx.z_base = card->fifos + 0x6000;
+ card->chans[B2].rx.z1_base = card->fifos + 0x6100;
+ card->chans[B2].rx.z2_base = card->fifos + 0x6102;
+ card->chans[B2].rx.z_min = 0x0200;
+ card->chans[B2].rx.z_max = 0x1FFF;
+ card->chans[B2].rx.f_min = 0x00;
+ card->chans[B2].rx.f_max = 0x1F;
+ card->chans[B2].rx.f1 = card->fifos + 0x6180;
+ card->chans[B2].rx.f2 = card->fifos + 0x6181;
+ card->chans[B2].rx.fifo_size = card->chans[B2].rx.z_max -
+ card->chans[B2].rx.z_min + 1;
+ card->chans[B2].rx.f_num = card->chans[B2].rx.f_max -
+ card->chans[B2].rx.f_min + 1;
+
+ card->chans[B2].tx.chan = &card->chans[B2];
+ card->chans[B2].tx.fifo_base = card->fifos + 0x2200;
+ card->chans[B2].tx.z_base = card->fifos + 0x2000;
+ card->chans[B2].tx.z1_base = card->fifos + 0x2100;
+ card->chans[B2].tx.z2_base = card->fifos + 0x2102;
+ card->chans[B2].tx.z_min = 0x0200;
+ card->chans[B2].tx.z_max = 0x1FFF;
+ card->chans[B2].tx.f_min = 0x00;
+ card->chans[B2].tx.f_max = 0x1F;
+ card->chans[B2].tx.f1 = card->fifos + 0x2180;
+ card->chans[B2].tx.f2 = card->fifos + 0x2181;
+ card->chans[B2].tx.fifo_size = card->chans[B2].tx.z_max -
+ card->chans[B2].tx.z_min + 1;
+ card->chans[B2].tx.f_num = card->chans[B2].tx.f_max -
+ card->chans[B2].tx.f_min + 1;
+
+ /*
+ * All done
+ */
+
+ dahdi_hfcs = kmalloc(sizeof(struct dahdi_hfc), GFP_KERNEL);
+ if (!dahdi_hfcs) {
+ printk(KERN_CRIT hfc_DRIVER_PREFIX
+ "unable to kmalloc!\n");
+ goto err_request_irq;
+ }
+ memset(dahdi_hfcs, 0x0, sizeof(struct dahdi_hfc));
+
+ dahdi_hfcs->card = card;
+ hfc_dahdi_initialize(dahdi_hfcs);
+ card->dahdi_dev = dahdi_hfcs;
+
+#ifdef CONFIG_PROC_FS
+ snprintf(card->proc_dir_name,
+ sizeof(card->proc_dir_name),
+ "%d", card->cardnum);
+ card->proc_dir = proc_mkdir(card->proc_dir_name, hfc_proc_dahdi_hfcs_dir);
+ SET_PROC_DIRENTRY_OWNER(card->proc_dir);
+#endif /* CONFIG_PROC_FS */
+
+ hfc_resetCard(card);
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d configured for %s mode at mem %#lx (0x%p) IRQ %u\n",
+ card->cardnum,
+ card->nt_mode ? "NT" : "TE",
+ card->io_bus_mem,
+ card->io_mem,
+ card->pcidev->irq);
+
+ cardnum++;
+
+ return 0;
+
+err_request_irq:
+ pci_free_consistent(pci_dev, hfc_FIFO_SIZE,
+ card->fifo_mem, card->fifo_bus_mem);
+err_alloc_fifo:
+ iounmap(card->io_mem);
+err_ioremap:
+err_noiobase:
+err_noirq:
+ pci_release_regions(pci_dev);
+err_pci_request_regions:
+err_pci_set_dma_mask:
+err_pci_enable_device:
+ kfree(card);
+err_alloc_hfccard:
+ return err;
+}
+
+static void __devexit hfc_remove(struct pci_dev *pci_dev)
+{
+ struct hfc_card *card = pci_get_drvdata(pci_dev);
+
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ "card %d: "
+ "shutting down card at %p.\n",
+ card->cardnum,
+ card->io_mem);
+
+ if (!card) {
+ return;
+ }
+
+ hfc_softreset(card);
+
+ dahdi_unregister_device(card->dahdi_dev->ddev);
+
+
+ /*
+ * disable memio and bustmaster
+ */
+ pci_write_config_word(pci_dev, PCI_COMMAND, 0);
+
+#ifdef CONFIG_PROC_FS
+/*
+BUG: these proc entries just cause Call traces, so removed.
+ remove_proc_entry("bufs", card->proc_dir);
+ remove_proc_entry("fifos", card->proc_dir);
+ remove_proc_entry("info", card->proc_dir);
+*/
+ remove_proc_entry(card->proc_dir_name, hfc_proc_dahdi_hfcs_dir);
+#endif /* CONFIG_PROC_FS */
+
+ free_irq(pci_dev->irq, card);
+
+ pci_free_consistent(pci_dev, hfc_FIFO_SIZE,
+ card->fifo_mem, card->fifo_bus_mem);
+
+ iounmap(card->io_mem);
+
+ pci_release_regions(pci_dev);
+
+ pci_disable_device(pci_dev);
+
+ kfree(card);
+}
+
+/******************************************
+ * Module stuff
+ ******************************************/
+
+static int __init hfc_init_module(void)
+{
+ int ret;
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ hfc_DRIVER_STRING " loading\n");
+#ifdef DEBUG
+printk(KERN_INFO hfc_DRIVER_PREFIX "Check /var/log/kern-debug.log for debugging output level %d.", debug_level);
+printk(KERN_DEBUG hfc_DRIVER_PREFIX "base.c is debugging.");
+#endif
+
+#ifdef CONFIG_PROC_FS
+#if (KERNEL_VERSION(2, 6, 26) <= LINUX_VERSION_CODE)
+ hfc_proc_dahdi_hfcs_dir = proc_mkdir(hfc_DRIVER_NAME, NULL);
+#else
+ hfc_proc_dahdi_hfcs_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver);
+#endif
+#endif /* CONFIG_PROC_FS */
+
+ ret = dahdi_pci_module(&hfc_driver);
+ return ret;
+}
+
+module_init(hfc_init_module);
+
+static void __exit hfc_module_exit(void)
+{
+ pci_unregister_driver(&hfc_driver);
+
+#ifdef CONFIG_PROC_FS
+#if (KERNEL_VERSION(2, 6, 26) <= LINUX_VERSION_CODE)
+ remove_proc_entry(hfc_DRIVER_NAME, NULL);
+#else
+ remove_proc_entry(hfc_DRIVER_NAME, proc_root_driver);
+#endif
+#endif /* CONFIG_PROC_FS */
+
+ printk(KERN_INFO hfc_DRIVER_PREFIX
+ hfc_DRIVER_STRING " unloaded\n");
+}
+
+module_exit(hfc_module_exit);
+
+#endif
+
+MODULE_DESCRIPTION(hfc_DRIVER_DESCR);
+MODULE_AUTHOR("Jens Wilke <jw_...@he...>, "
+ "Daniele (Vihai) Orlandi <da...@or...>, "
+ "Jose A. Deniz <od...@ho...>");
+MODULE_ALIAS("dahdi_hfcs");
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
+
+
+module_param(modes, int, 0444);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
+module_param_array(nt_modes, int, &nt_modes_count, 0444);
+#else
+module_param_array(nt_modes, int, nt_modes_count, 0444);
+#endif
+
+module_param(force_l1_up, int, 0444);
+#ifdef DEBUG
+module_param(debug_level, int, 0444);
+#endif
+
+MODULE_PARM_DESC(modes, "[Deprecated] bit-mask to configure NT mode");
+MODULE_PARM_DESC(nt_modes,
+ "Comma-separated list of card IDs to configure in NT mode");
+MODULE_PARM_DESC(force_l1_up, "Don't allow L1 to go down");
+#ifdef DEBUG
+MODULE_PARM_DESC(debug_level, "Debug verbosity level");
+#endif
Added: branches/1.0/package/dahdi-linux/hfcs/dahdi_hfcs.h
===================================================================
--- branches/1.0/package/dahdi-linux/hfcs/dahdi_hfcs.h (rev 0)
+++ branches/1.0/package/dahdi-linux/hfcs/dahdi_hfcs.h 2012-01-10 19:08:46 UTC (rev 5366)
@@ -0,0 +1,424 @@
+/*
+ * dahdi_hfcs.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
+ *
+ * Dahdi port by Jose A. Deniz <od...@ho...>
+ *
+ * Copyright (C) 2009 Jose A. Deniz
+ * Copyright (C) 2006 headissue GmbH; Jens Wilke
+ * Copyright (C) 2004 Daniele Orlandi
+ * Copyright (C) 2002, 2003, 2004, Junghanns.NET GmbH
+ *
+ * Jens Wilke <jw_...@he...>
+ *
+ * Orginal author of this code is
+ * Daniele "Vihai" Orlandi <da...@or...>
+ *
+ * Major rewrite of the driver made by
+ * Klaus-Peter Junghanns <kp...@ju...>
+ *
+ * This program is free software and may be modified and
+ * distributed under the terms of the GNU Public License.
+ *
+ */
+
+#ifndef _HFC_ZAPHFC_H
+#define _HFC_ZAPHFC_H
+
+#include <asm/io.h>
+
+#define hfc_DRIVER_NAME "dahdi_hfcs"
+#define hfc_DRIVER_PREFIX hfc_DRIVER_NAME ": "
+#define hfc_DRIVER_DESCR "HFC-S PCI A ISDN"
+#define hfc_DRIVER_VERSION "1.42"
+#define hfc_DRIVER_STRING hfc_DRIVER_DESCR " (V" hfc_DRIVER_VERSION ")"
+
+#define hfc_MAX_BOARDS 32
+
+#ifndef PCI_DMA_32BIT
+#define PCI_DMA_32BIT 0x00000000ffffffffULL
+#endif
+
+#ifndef PCI_VENDOR_ID_SITECOM
+#define PCI_VENDOR_ID_SITECOM 0x182D
+#endif
+
+#ifndef PCI_DEVICE_ID_SITECOM_3069
+#define PCI_DEVICE_ID_SITECOM_3069 0x3069
+#endif
+
+#define hfc_RESET_DELAY 20
+
+#define hfc_CLKDEL_TE 0x0f /* CLKDEL in TE mode */
+#define hfc_CLKDEL_NT 0x6c /* CLKDEL in NT mode */
+
+/* PCI memory mapped I/O */
+
+#define hfc_PCI_MEM_SIZE 0x0100
+#define hfc_PCI_MWBA 0x80
+
+/* GCI/IOM bus monitor registers */
+
+#define hfc_C_I 0x08
+#define hfc_TRxR 0x0C
+#define hfc_MON1_D 0x28
+#define hfc_MON2_D 0x2C
+
+
+/* GCI/IOM bus timeslot registers */
+
+#define hfc_B1_SSL 0x80
+#define hfc_B2_SSL 0x84
+#define hfc_AUX1_SSL 0x88
+#define hfc_AUX2_SSL 0x8C
+#define hfc_B1_RSL 0x90
+#define hfc_B2_RSL 0x94
+#define hfc_AUX1_RSL 0x98
+#define hfc_AUX2_RSL 0x9C
+
+/* GCI/IOM bus data registers */
+
+#define hfc_B1_D 0xA0
+#define hfc_B2_D 0xA4
+#define hfc_AUX1_D 0xA8
+#define hfc_AUX2_D 0xAC
+
+/* GCI/IOM bus configuration registers */
+
+#define hfc_MST_EMOD 0xB4
+#define hfc_MST_MODE 0xB8
+#define hfc_CONNECT 0xBC
+
+
+/* Interrupt and status registers */
+
+#define hfc_FIFO_EN 0x44
+#define hfc_TRM 0x48
+#define hfc_B_MODE 0x4C
+#define hfc_CHIP_ID 0x58
+#define hfc_CIRM 0x60
+#define hfc_CTMT 0x64
+#define hfc_INT_M1 0x68
+#define hfc_INT_M2 0x6C
+#define hfc_INT_S1 0x78
+#define hfc_INT_S2 0x7C
+#define hfc_STATUS 0x70
+
+/* S/T section registers */
+
+#define hfc_STATES 0xC0
+#define hfc_SCTRL 0xC4
+#define hfc_SCTRL_E 0xC8
+#define hfc_SCTRL_R 0xCC
+#define hfc_SQ 0xD0
+#define hfc_CLKDEL 0xDC
+#define hfc_B1_REC 0xF0
+#define hfc_B1_SEND 0xF0
+#define hfc_B2_REC 0xF4
+#define hfc_B2_SEND 0xF4
+#define hfc_D_REC 0xF8
+#define hfc_D_SEND 0xF8
+#define hfc_E_REC 0xFC
+
+/* Bits and values in various HFC PCI registers */
+
+/* bits in status register (READ) */
+#define hfc_STATUS_PCI_PROC 0x02
+#define hfc_STATUS_NBUSY 0x04
+#define hfc_STATUS_TIMER_ELAP 0x10
+#define hfc_STATUS_STATINT 0x20
+#define hfc_STATUS_FRAMEINT 0x40
+#define hfc_STATUS_ANYINT 0x80
+
+/* bits in CTMT (Write) */
+#define hfc_CTMT_TRANSB1 0x01
+#define hfc_CTMT_TRANSB2 0x02
+#define hfc_CTMT_TIMER_CLEAR 0x80
+#define hfc_CTMT_TIMER_MASK 0x1C
+#define hfc_CTMT_TIMER_3_125 (0x01 << 2)
+#define hfc_CTMT_TIMER_6_25 (0x02 << 2)
+#define hfc_CTMT_TIMER_12_5 (0x03 << 2)
+#define hfc_CTMT_TIMER_25 (0x04 << 2)
+#define hfc_CTMT_TIMER_50 (0x05 << 2)
+#define hfc_CTMT_TIMER_400 (0x06 << 2)
+#define hfc_CTMT_TIMER_800 (0x07 << 2)
+#define hfc_CTMT_AUTO_TIMER 0x20
+
+/* bits in CIRM (Write) */
+#define hfc_CIRM_AUX_MSK 0x07
+#define hfc_CIRM_RESET 0x08
+#define hfc_CIRM_B1_REV 0x40
+#define hfc_CIRM_B2_REV 0x80
+
+/* bits in INT_M1 and INT_S1 */
+#define hfc_INTS_B1TRANS 0x01
+#define hfc_INTS_B2TRANS 0x02
+#define hfc_INTS_DTRANS 0x04
+#define hfc_INTS_B1REC 0x08
+#define hfc_INTS_B2REC 0x10
+#define hfc_INTS_DREC 0x20
+#define hfc_INTS_L1STATE 0x40
+#define hfc_INTS_TIMER 0x80
+
+/* bits in INT_M2 */
+#define hfc_M2_PROC_TRANS 0x01
+#define hfc_M2_GCI_I_CHG 0x02
+#define hfc_M2_GCI_MON_REC 0x04
+#define hfc_M2_IRQ_ENABLE 0x08
+#define hfc_M2_PMESEL 0x80
+
+/* bits in STATES */
+#define hfc_STATES_STATE_MASK 0x0F
+#define hfc_STATES_LOAD_STATE 0x10
+#define hfc_STATES_ACTIVATE 0x20
+#define hfc_STATES_DO_ACTION 0x40
+#define hfc_STATES_NT_G2_G3 0x80
+
+/* bits in HFCD_MST_MODE */
+#define hfc_MST_MODE_MASTER 0x01
+#define hfc_MST_MODE_SLAVE 0x00
+/* remaining bits are for codecs control */
+
+/* bits in HFCD_SCTRL */
+#define hfc_SCTRL_B1_ENA 0x01
+#define hfc_SCTRL_B2_ENA 0x02
+#define hfc_SCTRL_MODE_TE 0x00
+#define hfc_SCTRL_MODE_NT 0x04
+#define hfc_SCTRL_LOW_PRIO 0x08
+#define hfc_SCTRL_SQ_ENA 0x10
+#define hfc_SCTRL_TEST 0x20
+#define hfc_SCTRL_NONE_CAP 0x40
+#define hfc_SCTRL_PWR_DOWN 0x80
+
+/* bits in SCTRL_E */
+#define hfc_SCTRL_E_AUTO_AWAKE 0x01
+#define hfc_SCTRL_E_DBIT_1 0x04
+#define hfc_SCTRL_E_IGNORE_COL 0x08
+#define hfc_SCTRL_E_CHG_B1_B2 0x80
+
+/* bits in SCTRL_R */
+#define hfc_SCTRL_R_B1_ENA 0x01
+#define hfc_SCTRL_R_B2_ENA 0x02
+
+/* bits in FIFO_EN register */
+#define hfc_FIFOEN_B1TX 0x01
+#define hfc_FIFOEN_B1RX 0x02
+#define hfc_FIFOEN_B2TX 0x04
+#define hfc_FIFOEN_B2RX 0x08
+#define hfc_FIFOEN_DTX 0x10
+#define hfc_FIFOEN_DRX 0x20
+
+#define hfc_FIFOEN_B1 (hfc_FIFOEN_B1TX|hfc_FIFOEN_B1RX)
+#define hfc_FIFOEN_B2 (hfc_FIFOEN_B2TX|hfc_FIFOEN_B2RX)
+#define hfc_FIFOEN_D (hfc_FIFOEN_DTX|hfc_FIFOEN_DRX)
+
+/* bits in the CONNECT register */
+#define hfc_CONNECT_B1_HFC_from_ST 0x00
+#define hfc_CONNECT_B1_HFC_from_GCI 0x01
+#define hfc_CONNECT_B1_ST_from_HFC 0x00
+#define hfc_CONNECT_B1_ST_from_GCI 0x02
+#define hfc_CONNECT_B1_GCI_from_HFC 0x00
+#define hfc_CONNECT_B1_GCI_from_ST 0x04
+
+#define hfc_CONNECT_B2_HFC_from_ST 0x00
+#define hfc_CONNECT_B2_HFC_from_GCI 0x08
+#define hfc_CONNECT_B2_ST_from_HFC 0x00
+#define hfc_CONNECT_B2_ST_from_GCI 0x10
+#define hfc_CONNECT_B2_GCI_from_HFC 0x00
+#define hfc_CONNECT_B2_GCI_from_ST 0x20
+
+/* bits in the TRM register */
+#define hfc_TRM_TRANS_INT_00 0x00
+#define hfc_TRM_TRANS_INT_01 0x01
+#define hfc_TRM_TRANS_INT_10 0x02
+#define hfc_TRM_TRANS_INT_11 0x04
+#define hfc_TRM_ECHO 0x20
+#define hfc_TRM_B1_PLUS_B2 0x40
+#define hfc_TRM_IOM_TEST_LOOP 0x80
+
+/* bits in the __SSL and __RSL registers */
+#define hfc_SRSL_STIO 0x40
+#define hfc_SRSL_ENABLE 0x80
+#define hfc_SRCL_SLOT_MASK 0x1f
+
+/* FIFO memory definitions */
+
+#define hfc_FIFO_SIZE 0x8000
+
+#define hfc_UGLY_FRAMEBUF 0x2000
+
+#define hfc_TX_FIFO_PRELOAD (DAHDI_CHUNKSIZE + 2)
+#define hfc_RX_FIFO_PRELOAD 4
+
+/* HDLC STUFF */
+#define hfc_HDLC_BUF_LEN 32
+/* arbitrary, just the max # of byts we will send to DAHDI per call */
+
+
+/* NOTE: FIFO pointers are not declared volatile because accesses to the
+ * FIFOs are inherently safe.
+ */
+
+#ifdef DEBUG
+extern int debug_level;
+#endif
+
+struct hfc_chan;
+
+struct hfc_chan_simplex {
+ struct hfc_chan_duplex *chan;
+
+ u8 dahdi_buffer[DAHDI_CHUNKSIZE];
+
+ u8 ugly_framebuf[hfc_UGLY_FRAMEBUF];
+ int ugly_framebuf_size;
+ u16 ugly_framebuf_off;
+
+ void *z1_base, *z2_base;
+ void *fifo_base;
+ void *z_base;
+ u16 z_min;
+ u16 z_max;
+ u16 fifo_size;
+
+ u8 *f1, *f2;
+ u8 f_min;
+ u8 f_max;
+ u8 f_num;
+
+ unsigned long long frames;
+ unsigned long long bytes;
+ unsigned long long fifo_full;
+ unsigned long long crc;
+ unsigned long long fifo_underrun;
+};
+
+enum hfc_chan_status {
+ free,
+ open_framed,
+ open_voice,
+ sniff_aux,
+ loopback,
+};
+
+struct hfc_chan_duplex {
+ struct hfc_card *card;
+
+ char *name;
+ int number;
+
+ enum hfc_chan_status status;
+ int open_by_netdev;
+ int open_by_dahdi;
+
+ unsigned short protocol;
+
+ spinlock_t lock;
+
+ struct hfc_chan_simplex rx;
+ struct hfc_chan_simplex tx;
+
+};
+
+typedef struct hfc_card {
+ int cardnum;
+ struct pci_dev *pcidev;
+ struct dahdi_hfc *dahdi_dev;
+#ifdef CONFIG_PROC_FS
+ struct proc_dir_entry *proc_dir;
+ char proc_dir_name[32];
+
+/*
+BUG: These have been removed.
+ struct proc_dir_entry *proc_info;
+ struct proc_dir_entry *proc_fifos;
+ struct proc_dir_entry *proc_bufs;
+*/
+#endif /* CONFIG_PROC_FS */
+
+ unsigned long io_bus_mem;
+ void __iomem *io_mem;
+
+ dma_addr_t fifo_bus_mem;
+ void *fifo_mem;
+ void *fifos;
+
+ int nt_mode;
+ int sync_loss_reported;
+ int late_irqs;
+
+ u8 l1_state;
+ int fifo_suspended;
+ int ignore_first_timer_interrupt;
+
+ struct {
+ u8 m1;
+ u8 m2;
+ u8 fifo_en;
+ u8 trm;
+ u8 connect;
+ u8 sctrl;
+ u8 sctrl_r;
+ u8 sctrl_e;
+ u8 ctmt;
+ u8 cirm;
+ } regs;
+
+ struct hfc_chan_duplex chans[3];
+ int echo_enabled;
+
+
+
+ int debug_event;
+
+ spinlock_t lock;
+ unsigned int irq;
+ unsigned int iomem;
+ int ticks;
+ int clicks;
+ unsigned char *pci_io;
+ void *fifomem; /* start of the shared mem */
+
+ unsigned int pcibus;
+ unsigned int pcidevfn;
+
+ int drecinframe;
+
+ unsigned char cardno;
+ struct hfc_card *next;
+
+} hfc_card;
+
+typedef struct dahdi_hfc {
+ unsigned int usecount;
+ struct dahdi_device *ddev;
+ struct dahdi_span span;
+ struct dahdi_chan chans[3];
+ struct dahdi_chan *_chans[3];
+ struct hfc_card *card;
+
+ /* pointer to the signalling channel for this span */
+ struct dahdi_chan *sigchan;
+ /* nonzero means we're in the middle of sending an HDLC frame */
+ int sigactive;
+ /* hdlc_hard_xmit() increments, hdlc_tx_frame() decrements */
+ atomic_t hdlc_pending;
+ int frames_out;
+ int frames_in;
+
+} dahdi_hfc;
+
+static inline struct dahdi_hfc* dahdi_hfc_from_span(struct dahdi_span *span) {
+ return container_of(span, struct dahdi_hfc, span);
+}
+
+static inline u8 hfc_inb(struct hfc_card *card, int offset)
+{
+ return readb(card->io_mem + offset);
+}
+
+static inline void hfc_outb(struct hfc_card *card, int offset, u8 value)
+{
+ writeb(value, card->io_mem + offset);
+}
+
+#endif
Added: branches/1.0/package/dahdi-linux/hfcs/fifo.c
===================================================================
--- branches/1.0/package/dahdi-linux/hfcs/fifo.c (rev 0)
+++ branches/1.0/package/dahdi-linux/hfcs/fifo.c 2012-01-10 19:08:46 UTC (rev 5366)
@@ -0,0 +1,380 @@
+/*
+ * fifo.c - HFC FIFO management routines
+ *
+ * Copyright (C) 2006 headissue GmbH; Jens Wilke
+ * Copyright (C) 2004 Daniele Orlandi
+ * Copyright (C) 2002, 2003, 2004, Junghanns.NET GmbH
+ *
+ * Original author of this code is
+ * Daniele "Vihai" Orlandi <da...@or...>
+ *
+ * This program is free software and may be modified and
+ * dist...
[truncated message content] |
|
From: <abe...@us...> - 2012-01-29 03:02:08
|
Revision: 5421
http://astlinux.svn.sourceforge.net/astlinux/?rev=5421&view=rev
Author: abelbeck
Date: 2012-01-29 03:02:02 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
dnsmasq, add LOCALDNS_LOCAL_DOMAIN rc.conf variable to enable/disable local-only lookups for DOMAIN
Modified Paths:
--------------
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2012-01-28 04:33:18 UTC (rev 5420)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2012-01-29 03:02:02 UTC (rev 5421)
@@ -93,6 +93,8 @@
createDNSMASQbasic()
{
+ local local_domain
+
# DHCP options
if [ "$1" = "dhcp" ]; then
echo "dhcp-authoritative
@@ -108,11 +110,17 @@
fi
fi
+ if [ "$LOCALDNS_LOCAL_DOMAIN" = "no" ]; then
+ local_domain="#"
+ else
+ local_domain=""
+ fi
+
# DNS options
echo "no-negcache
domain-needed
-bogus-priv
-local=/$DOMAIN/
+${local_domain}bogus-priv
+${local_domain}local=/$DOMAIN/
expand-hosts
domain=$DOMAIN
resolv-file=/etc/resolv-extern.conf
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-01-28 04:33:18 UTC (rev 5420)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-01-29 03:02:02 UTC (rev 5421)
@@ -99,6 +99,13 @@
## for DNS resolution on THIS machine.
## By default this is enabled provided dnsmasq is started, disable by setting to "no".
#LOCALDNS=no
+##
+## By default the DNS lookup for DOMAIN is local-only, recommended with local interfaces and/or
+## a unique local DOMAIN. If there are no local interfaces defined, it may be useful
+## to define DOMAIN the same as an upstream DNS server, in that case
+## disabling LOCALDNS_LOCAL_DOMAIN would be desirable.
+## By default this is enabled providing local-only lookups for DOMAIN, disable by setting to "no".
+#LOCALDNS_LOCAL_DOMAIN=no
## You don't have to use DHCP with all of your internal interfaces.
## Here you can specify a list of interfaces that will not have a DHCP range
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X