Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2014-10-03 17:38:19
|
Revision: 6745
http://sourceforge.net/p/astlinux/code/6745
Author: abelbeck
Date: 2014-10-03 17:38:12 +0000 (Fri, 03 Oct 2014)
Log Message:
-----------
bash, add build option BR2_PACKAGE_BASH_DEFAULT_SHELL=y whether to link /bin/sh to bash
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/bash/Config.in
branches/1.0/package/bash/bash.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/astlinux-ast11.config 2014-10-03 17:38:12 UTC (rev 6745)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:48 2014
+# Buildroot 2011.08-svn6744-dirty Configuration
+# Fri Oct 3 12:31:36 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -807,6 +807,7 @@
#
# BR2_PACKAGE_AT is not set
BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BASH_DEFAULT_SHELL=y
BR2_PACKAGE_DIALOG=y
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_INOTIFY_TOOLS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/astlinux18.config 2014-10-03 17:38:12 UTC (rev 6745)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:47 2014
+# Buildroot 2011.08-svn6744-dirty Configuration
+# Fri Oct 3 12:31:33 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -807,6 +807,7 @@
#
# BR2_PACKAGE_AT is not set
BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BASH_DEFAULT_SHELL=y
BR2_PACKAGE_DIALOG=y
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_INOTIFY_TOOLS is not set
Modified: branches/1.0/package/bash/Config.in
===================================================================
--- branches/1.0/package/bash/Config.in 2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/package/bash/Config.in 2014-10-03 17:38:12 UTC (rev 6745)
@@ -5,3 +5,13 @@
The standard GNU Bourne again shell.
http://tiswww.case.edu/php/chet/bash/bashtop.html
+
+if BR2_PACKAGE_BASH
+
+config BR2_PACKAGE_BASH_DEFAULT_SHELL
+ bool "bash default shell"
+ default y
+ help
+ Link /bin/sh to bash
+
+endif
Modified: branches/1.0/package/bash/bash.mk
===================================================================
--- branches/1.0/package/bash/bash.mk 2014-10-03 15:39:17 UTC (rev 6744)
+++ branches/1.0/package/bash/bash.mk 2014-10-03 17:38:12 UTC (rev 6745)
@@ -18,22 +18,27 @@
BASH_DEPENDENCIES += busybox
endif
+ifeq ($(BR2_PACKAGE_BASH_DEFAULT_SHELL),y)
+define BASH_DEFAULT_SHELL
+ if [ -e $(TARGET_DIR)/bin/sh ]; then \
+ mv -f $(TARGET_DIR)/bin/sh $(TARGET_DIR)/bin/sh.prebash; \
+ fi
+ ln -sf bash $(TARGET_DIR)/bin/sh
+endef
+endif
+
# Save the old sh file/link if there is one and symlink bash->sh
define BASH_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
DESTDIR=$(TARGET_DIR) exec_prefix=/ install
rm -f $(TARGET_DIR)/bin/bashbug
- if [ -e $(TARGET_DIR)/bin/sh ]; then \
- mv -f $(TARGET_DIR)/bin/sh $(TARGET_DIR)/bin/sh.prebash; \
- fi
- ln -sf bash $(TARGET_DIR)/bin/sh
+ $(BASH_DEFAULT_SHELL)
endef
# Restore the old shell file/link if there was one
define BASH_UNINSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) \
-C $(BASH_DIR) exec_prefix=/ uninstall
- rm -f $(TARGET_DIR)/bin/sh
if [ -e $(TARGET_DIR)/bin/sh.prebash ]; then \
mv -f $(TARGET_DIR)/bin/sh.prebash $(TARGET_DIR)/bin/sh; \
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-10-22 20:07:01
|
Revision: 6775
http://sourceforge.net/p/astlinux/code/6775
Author: abelbeck
Date: 2014-10-22 20:06:49 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
fop2, version bump to 2.28, add 'service fop2 test' and automaticaly copy any fop2.lic file
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/package/asterisk-fop2/fop2.init
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2014-10-22 20:06:49 UTC (rev 6775)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.27
+ASTERISK_FOP2_VERSION = 2.28
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
@@ -13,6 +13,8 @@
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/buttons.cfg $(TARGET_DIR)/stat/etc/fop2/buttons.cfg
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/users.cfg $(TARGET_DIR)/stat/etc/fop2/users.cfg
+ mkdir -p $(TARGET_DIR)/usr/local
+ ln -snf /stat/var/packages/fop2/server $(TARGET_DIR)/usr/local/fop2
ln -snf /tmp/etc/fop2 $(TARGET_DIR)/etc/fop2
ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/S98fop2
ln -sf ../../init.d/fop2 $(TARGET_DIR)/etc/runlevels/default/K00fop2
Modified: branches/1.0/package/asterisk-fop2/fop2.init
===================================================================
--- branches/1.0/package/asterisk-fop2/fop2.init 2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/package/asterisk-fop2/fop2.init 2014-10-22 20:06:49 UTC (rev 6775)
@@ -63,6 +63,25 @@
fi
}
+dotest () {
+ local restart
+
+ if [ -f $PIDFILE ]; then
+ restart=1
+ stop
+ else
+ restart=0
+ init
+ fi
+ if [ -f /etc/fop2/fop2.cfg ]; then
+ echo "Testing Asterisk FOP2..."
+ $FOP2_SERVER --test -c /etc/fop2
+ fi
+ if [ $restart -eq 1 ]; then
+ start
+ fi
+}
+
case $1 in
start)
@@ -88,8 +107,12 @@
reload
;;
+test)
+ dotest
+ ;;
+
*)
- echo "Usage: start|stop|restart|reload"
+ echo "Usage: start|stop|restart|reload|test"
;;
esac
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2014-10-20 18:57:06 UTC (rev 6774)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2014-10-22 20:06:49 UTC (rev 6775)
@@ -95,6 +95,21 @@
fi
}
+upgrade_config() {
+ local file IFS
+
+ case $PKG in
+ fop2)
+ unset IFS
+ for file in server/fop2.lic; do
+ if [ -f "$BASE/$PKG-OLD/$file" ] && [ ! -f "$BASE/$PKG/$file" ]; then
+ cp "$BASE/$PKG-OLD/$file" "$BASE/$PKG/$file"
+ fi
+ done
+ ;;
+ esac
+}
+
revert() {
if [ ! -d $BASE/$PKG ]; then
@@ -196,7 +211,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="http://files.astlinux.org/fop2-2.27-debian-i386.tgz"
+ SRC_URL="http://files.astlinux.org/fop2-2.28-debian-i386.tgz"
;;
show)
@@ -220,6 +235,7 @@
SRC_URL=$2
fi
upgrade
+ upgrade_config
finish $GREEN "Successful package '$PKG' upgrade, '$PKG' is not running."
;;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-10-27 23:19:07
|
Revision: 6784
http://sourceforge.net/p/astlinux/code/6784
Author: abelbeck
Date: 2014-10-27 23:19:02 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
smartmontools, now enabled but only install 'smartctl'
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/smartmontools/smartmontools.mk
branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
Added Paths:
-----------
branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/astlinux-ast11.config 2014-10-27 23:19:02 UTC (rev 6784)
@@ -413,7 +413,7 @@
# 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_SMARTMONTOOLS=y
# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SREDIRD is not set
# BR2_PACKAGE_SSHFS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/astlinux18.config 2014-10-27 23:19:02 UTC (rev 6784)
@@ -413,7 +413,7 @@
# 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_SMARTMONTOOLS=y
# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SREDIRD is not set
# BR2_PACKAGE_SSHFS is not set
Added: branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch
===================================================================
--- branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch (rev 0)
+++ branches/1.0/package/smartmontools/smartmontools-sandisk-u110-db.patch 2014-10-27 23:19:02 UTC (rev 6784)
@@ -0,0 +1,20 @@
+--- smartmontools-6.3/drivedb.h.orig 2014-10-27 10:51:52.000000000 -0500
++++ smartmontools-6.3/drivedb.h 2014-10-27 10:55:26.000000000 -0500
+@@ -1003,7 +1003,8 @@
+ "SanDisk iSSD P4 [0-9]*GB|" // tested with SanDisk iSSD P4 16GB/SSD 9.14
+ "SanDisk SDSSDP[0-9]*G|" // tested with SanDisk SDSSDP064G/1.0.0, SDSSDP128G/2.0.0
+ "SanDisk SSD i100 [0-9]*GB|" // tested with SanDisk SSD i100 8GB/11.56.04, 24GB/11.56.04
+- "SanDisk SSD U100 ([0-9]*GB|SMG2)", // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04
++ "SanDisk SSD U100 ([0-9]*GB|SMG2)|" // tested with SanDisk SSD U100 8GB/10.56.00, 256GB/10.01.02, SMG2/10.56.04
++ "SanDisk SSD U110 [0-9]*GB", // tested with SanDisk SSD U110 32GB/U221000
+ "", "",
+ //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+ //"-v 9,raw24(raw8),Power_On_Hours "
+@@ -1008,6 +1008,7 @@
+ //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+ //"-v 9,raw24(raw8),Power_On_Hours "
+ //"-v 12,raw48,Power_Cycle_Count "
++ "-v 165,raw48,Total_Write_Erase_Count "
+ "-v 171,raw48,Program_Fail_Count "
+ "-v 172,raw48,Erase_Fail_Count "
+ "-v 173,raw48,Avg_Write_Erase_Ct "
Modified: branches/1.0/package/smartmontools/smartmontools.mk
===================================================================
--- branches/1.0/package/smartmontools/smartmontools.mk 2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/package/smartmontools/smartmontools.mk 2014-10-27 23:19:02 UTC (rev 6784)
@@ -4,7 +4,17 @@
#
#############################################################
-SMARTMONTOOLS_VERSION = 5.40
-SMARTMONTOOLS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/smartmontools
+SMARTMONTOOLS_VERSION = 6.3
+SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
+define SMARTMONTOOLS_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/smartctl $(TARGET_DIR)/usr/sbin/smartctl
+ ln -sf /tmp/etc/smart_drivedb.h $(TARGET_DIR)/etc/smart_drivedb.h
+endef
+
+define SMARTMONTOOLS_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/smartctl
+ rm -f $(TARGET_DIR)/etc/smart_drivedb.h
+endef
+
$(eval $(call AUTOTARGETS,package,smartmontools))
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2014-10-25 14:20:00 UTC (rev 6783)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2014-10-27 23:19:02 UTC (rev 6784)
@@ -23,6 +23,11 @@
if [ -n "$NETISSUE" ]; then
echo "$NETISSUE" > /tmp/etc/issue.net
fi
+
+ # local smartmontools drive database for smartctl
+ if [ -f /mnt/kd/smart_drivedb.h ]; then
+ ln -sf /mnt/kd/smart_drivedb.h /tmp/etc/smart_drivedb.h
+ fi
}
start () {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-11-04 21:01:12
|
Revision: 6799
http://sourceforge.net/p/astlinux/code/6799
Author: abelbeck
Date: 2014-11-04 21:01:04 +0000 (Tue, 04 Nov 2014)
Log Message:
-----------
consistency, use ':' where we previously used, echo -n ''
Modified Paths:
--------------
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/usr/bin/wall
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2014-11-04 20:33:14 UTC (rev 6798)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2014-11-04 21:01:04 UTC (rev 6799)
@@ -226,7 +226,7 @@
fi
fi
- echo -n > /tmp/etc/resolv-static.conf
+ : > /tmp/etc/resolv-static.conf
for h in $DNS; do
get_numeric_ip_version "$h"
case $? in
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2014-11-04 20:33:14 UTC (rev 6798)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2014-11-04 21:01:04 UTC (rev 6799)
@@ -138,8 +138,8 @@
if [ -n "$IFRENAME" ]; then
#clear existing iftabs
- echo -n > /tmp/etc/iftab
- echo -n > /tmp/etc/iftab.init
+ : > /tmp/etc/iftab
+ : > /tmp/etc/iftab.init
#set COUNT
COUNT=10
@@ -201,7 +201,7 @@
SYS_gen_etc_hosts > /tmp/etc/hosts
- echo -n "" > /tmp/etc/ethers
+ : > /tmp/etc/ethers
if [ -f /stat/etc/ethers ]; then
cat /stat/etc/ethers >> /tmp/etc/ethers
Modified: branches/1.0/project/astlinux/target_skeleton/usr/bin/wall
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/bin/wall 2014-11-04 20:33:14 UTC (rev 6798)
+++ branches/1.0/project/astlinux/target_skeleton/usr/bin/wall 2014-11-04 21:01:04 UTC (rev 6799)
@@ -1,4 +1,3 @@
#!/bin/sh
-#wrapper script for wall
-#/dev/null everything for now
-echo -n ""
+# Null wrapper script for wall
+:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-12 23:28:53
|
Revision: 6850
http://sourceforge.net/p/astlinux/code/6850
Author: abelbeck
Date: 2014-12-12 23:28:45 +0000 (Fri, 12 Dec 2014)
Log Message:
-----------
monit, add new package, not enabled
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/monit/
branches/1.0/package/monit/Config.in
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit.init
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/astlinux-ast11.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6744-dirty Configuration
-# Fri Oct 3 12:31:36 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:43 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -406,6 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/astlinux18.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6744-dirty Configuration
-# Fri Oct 3 12:31:33 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:42 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -406,6 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/initrd.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:53 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -364,6 +364,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/package/Config.in 2014-12-12 23:28:45 UTC (rev 6850)
@@ -219,6 +219,7 @@
source "package/mdadm/Config.in"
source "package/memtest/Config.in"
source "package/memtester/Config.in"
+source "package/monit/Config.in"
source "package/mtd/Config.in"
source "package/ntfs-3g/Config.in"
source "package/ntfsprogs/Config.in"
Added: branches/1.0/package/monit/Config.in
===================================================================
--- branches/1.0/package/monit/Config.in (rev 0)
+++ branches/1.0/package/monit/Config.in 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_MONIT
+ bool "monit"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_MMU # fork()
+ help
+ Monit is a free open source utility for managing and
+ monitoring, processes, programs, files, directories and
+ filesystems on a UNIX system. Monit conducts automatic
+ maintenance and repair and can execute meaningful causal
+ actions in error situations.
+
+ http://mmonit.com/monit/
+
+comment "monit needs a toolchain w/ threads"
+ depends on BR2_USE_MMU
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
Added: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch (rev 0)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,21 @@
+Do not force building a statically-linked binary
+
+Statically-linked binary do not work well with glibc, because it
+still dlopen()s the NSS libraries.
+
+Reported-by: Peter Kümmel <syn...@gm...>
+Signed-off-by: "Yann E. MORIN" <yan...@fr...>
+
+diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
+--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
++++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
+@@ -88,7 +88,7 @@
+ src/process/sysdep_@ARCH@.c
+
+ monit_LDADD = libmonit/libmonit.la
+-monit_LDFLAGS = -static $(EXTLDFLAGS)
++monit_LDFLAGS = $(EXTLDFLAGS)
+
+ man_MANS = monit.1
+
+
Added: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init (rev 0)
+++ branches/1.0/package/monit/monit.init 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/monit.pid"
+
+STATEFILE="/var/db/monit.state"
+
+init ()
+{
+ if [ -d /mnt/kd/monit ]; then
+ ln -snf /mnt/kd/monit /tmp/etc/monit
+ fi
+}
+
+start ()
+{
+ if [ -f /etc/monit/monitrc ]; then
+ echo "Starting monit..."
+ chmod 600 /etc/monit/monitrc
+ monit -c /etc/monit/monitrc -p $PIDFILE -s $STATEFILE
+ fi
+}
+
+stop ()
+{
+ if [ -f $PIDFILE ]; then
+ echo "Stopping monit..."
+
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+
+ # Wait for monit to stop
+ cnt=5
+ while [ $cnt -gt 0 ] && [ -f $PIDFILE ]; do
+ cnt=$((cnt - 1))
+ sleep 1
+ done
+ rm -f $PIDFILE
+ fi
+}
+
+case $1 in
+
+init)
+ init
+ start
+ ;;
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart" >&2
+ exit 1
+ ;;
+
+esac
Added: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk (rev 0)
+++ branches/1.0/package/monit/monit.mk 2014-12-12 23:28:45 UTC (rev 6850)
@@ -0,0 +1,52 @@
+################################################################################
+#
+# monit
+#
+################################################################################
+
+MONIT_VERSION = 5.10
+MONIT_SITE = http://mmonit.com/monit/dist
+#
+# Touching Makefile.am:
+MONIT_AUTORECONF = YES
+
+MONIT_CONF_ENV = \
+ libmonit_cv_setjmp_available=yes \
+ libmonit_cv_vsnprintf_c99_conformant=yes
+
+MONIT_CONF_OPT += \
+ --sysconfdir=/etc/monit \
+ --without-pam
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+MONIT_CONF_OPT += --with-ssl-dir=$(STAGING_DIR)/usr
+MONIT_DEPENDENCIES += openssl
+else
+MONIT_CONF_OPT += --without-ssl
+endif
+
+ifeq ($(BR2_LARGEFILE),y)
+MONIT_CONF_OPT += --with-largefiles
+else
+MONIT_CONF_OPT += --without-largefiles
+endif
+
+define MONIT_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/monit $(TARGET_DIR)/usr/sbin/monit
+ $(INSTALL) -m 0600 -D $(@D)/monitrc $(TARGET_DIR)/stat/etc/monit/monitrc
+ $(INSTALL) -m 0755 -D package/monit/monit.init $(TARGET_DIR)/etc/init.d/monit
+ ln -sf /tmp/etc/monit $(TARGET_DIR)/etc/monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S98monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/K01monit
+endef
+
+define MONIT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/monit
+ rm -rf $(TARGET_DIR)/stat/etc/monit
+ rm -f $(TARGET_DIR)/etc/init.d/monit
+ rm -f $(TARGET_DIR)/etc/monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S98monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K01monit
+endef
+
+$(eval $(call AUTOTARGETS,package,monit))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/runnix-uclibc.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:51 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:53 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -549,6 +549,7 @@
#
# memtester requires a toolchain with LARGEFILE support
#
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-12-10 22:39:14 UTC (rev 6849)
+++ branches/1.0/runnix.config 2014-12-12 23:28:45 UTC (rev 6850)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6663-dirty Configuration
-# Tue Aug 26 07:57:49 2014
+# Buildroot 2011.08-svn6849-dirty Configuration
+# Fri Dec 12 17:25:44 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -388,6 +388,7 @@
# BR2_PACKAGE_MDADM is not set
BR2_PACKAGE_MEMTEST=y
# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-16 00:32:54
|
Revision: 6853
http://sourceforge.net/p/astlinux/code/6853
Author: abelbeck
Date: 2014-12-16 00:32:46 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
monit, restructure file layout, change runlevels to match darkstat, add MONIT_ rc.conf variables
Modified Paths:
--------------
branches/1.0/package/monit/monit.init
branches/1.0/package/monit/monit.mk
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2014-12-14 23:03:01 UTC (rev 6852)
+++ branches/1.0/package/monit/monit.init 2014-12-16 00:32:46 UTC (rev 6853)
@@ -6,18 +6,73 @@
STATEFILE="/var/db/monit.state"
+gen_monitrc()
+{
+ local i IFS
+
+ echo "set daemon 60
+set idfile /mnt/kd/monit/monit.id
+set logfile syslog facility log_daemon
+set mailserver localhost
+
+set httpd port 2812 and
+ use address localhost
+ allow localhost
+"
+
+ unset IFS
+ for i in $MONIT_NOTIFY; do
+ echo "set alert $i not on { instance, action }"
+ done
+
+ if [ -n "$MONIT_NOTIFY_FROM" ]; then
+ echo "set mail-format { from: $MONIT_NOTIFY_FROM }"
+ fi
+
+ echo "
+include /etc/monit/monit.d/*"
+}
+
init ()
{
- if [ -d /mnt/kd/monit ]; then
- ln -snf /mnt/kd/monit /tmp/etc/monit
+ if [ "$MONIT_SERVER" != "yes" ]; then
+ if [ -f /tmp/etc/monit/monitrc ]; then
+ rm /tmp/etc/monit/monitrc
+ fi
+ exit
fi
+
+ if [ ! -d /mnt/kd/monit ]; then
+ mkdir /mnt/kd/monit
+ if [ -d /stat/etc/monit ]; then
+ cp -a /stat/etc/monit/* /mnt/kd/monit/
+ fi
+ fi
+
+ if [ ! -d /tmp/etc/monit ]; then
+ mkdir /tmp/etc/monit
+ ln -snf /mnt/kd/monit/monit.d /tmp/etc/monit/monit.d
+ fi
+
+ if [ -f /mnt/kd/monit/monitrc ]; then
+ echo "## Autogenerated. Edit /mnt/kd/monit/monitrc file.
+" >/tmp/etc/monit/monitrc
+ cat /mnt/kd/monit/monitrc >>/tmp/etc/monit/monitrc
+ else
+ # Autogenerate /etc/monit/monitrc
+ echo "## Autogenerated. Do not edit.
+## A manually generated /etc/monit/monitrc config will use /mnt/kd/monit/monitrc if it exists.
+" >/tmp/etc/monit/monitrc
+ gen_monitrc >>/tmp/etc/monit/monitrc
+ fi
+ chmod 600 /tmp/etc/monit/monitrc
}
start ()
{
if [ -f /etc/monit/monitrc ]; then
echo "Starting monit..."
- chmod 600 /etc/monit/monitrc
+
monit -c /etc/monit/monitrc -p $PIDFILE -s $STATEFILE
fi
}
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2014-12-14 23:03:01 UTC (rev 6852)
+++ branches/1.0/package/monit/monit.mk 2014-12-16 00:32:46 UTC (rev 6853)
@@ -33,11 +33,14 @@
define MONIT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/monit $(TARGET_DIR)/usr/sbin/monit
- $(INSTALL) -m 0600 -D $(@D)/monitrc $(TARGET_DIR)/stat/etc/monit/monitrc
+ $(INSTALL) -m 0600 -D $(@D)/monitrc $(TARGET_DIR)/stat/etc/monit/monit.d/services
+ $(SED) '1,/^## Services/ d' \
+ -e '/^## Includes/,$$ d' \
+ $(TARGET_DIR)/stat/etc/monit/monit.d/services
$(INSTALL) -m 0755 -D package/monit/monit.init $(TARGET_DIR)/etc/init.d/monit
ln -sf /tmp/etc/monit $(TARGET_DIR)/etc/monit
- ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S98monit
- ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/K01monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/S75monit
+ ln -sf ../../init.d/monit $(TARGET_DIR)/etc/runlevels/default/K15monit
endef
define MONIT_UNINSTALL_TARGET_CMDS
@@ -45,8 +48,8 @@
rm -rf $(TARGET_DIR)/stat/etc/monit
rm -f $(TARGET_DIR)/etc/init.d/monit
rm -f $(TARGET_DIR)/etc/monit
- rm -f $(TARGET_DIR)/etc/runlevels/default/S98monit
- rm -f $(TARGET_DIR)/etc/runlevels/default/K01monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S75monit
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K15monit
endef
$(eval $(call AUTOTARGETS,package,monit))
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-12-14 23:03:01 UTC (rev 6852)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-12-16 00:32:46 UTC (rev 6853)
@@ -1081,6 +1081,12 @@
#ZABBIX_PROXY_HOSTNAME="" # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
#ZABBIX_PROXY_LISTENPORT="10051" # TCP port that zabbix_proxy listens on locally
+## Monit Daemon
+## Enable Monit server by setting MONIT_SERVER="yes"
+#MONIT_SERVER="yes"
+#MONIT_NOTIFY="no...@my..." # Notify via email, space separate multiple email addresses
+#MONIT_NOTIFY_FROM="mo...@my..." # Optional, From: email address
+
## BOOTPFILE
## For diskless clients, the image to use for booting.
#BOOTPFILE="/pxelinux.0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-17 22:25:36
|
Revision: 6858
http://sourceforge.net/p/astlinux/code/6858
Author: abelbeck
Date: 2014-12-17 22:25:32 +0000 (Wed, 17 Dec 2014)
Log Message:
-----------
Enable monit for default builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-12-17 16:19:22 UTC (rev 6857)
+++ branches/1.0/astlinux-ast11.config 2014-12-17 22:25:32 UTC (rev 6858)
@@ -406,7 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MONIT is not set
+BR2_PACKAGE_MONIT=y
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-12-17 16:19:22 UTC (rev 6857)
+++ branches/1.0/astlinux18.config 2014-12-17 22:25:32 UTC (rev 6858)
@@ -406,7 +406,7 @@
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
-# BR2_PACKAGE_MONIT is not set
+BR2_PACKAGE_MONIT=y
# BR2_PACKAGE_MTD is not set
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-12-18 18:20:12
|
Revision: 6860
http://sourceforge.net/p/astlinux/code/6860
Author: abelbeck
Date: 2014-12-18 18:20:01 +0000 (Thu, 18 Dec 2014)
Log Message:
-----------
monit, add rc.conf variable MONIT_CHECK_INTERVAL
Modified Paths:
--------------
branches/1.0/package/monit/monit.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/monit/monit.init
===================================================================
--- branches/1.0/package/monit/monit.init 2014-12-18 16:26:03 UTC (rev 6859)
+++ branches/1.0/package/monit/monit.init 2014-12-18 18:20:01 UTC (rev 6860)
@@ -10,13 +10,14 @@
{
local i IFS
- echo "set daemon 60
+ echo "set daemon ${MONIT_CHECK_INTERVAL:-60}
set idfile /mnt/kd/monit/monit.id
set logfile syslog facility log_daemon
set mailserver localhost
-set httpd port 2812 and
- use address localhost
+set httpd
+ port 2812
+ address localhost
allow localhost
"
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-12-18 16:26:03 UTC (rev 6859)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-12-18 18:20:01 UTC (rev 6860)
@@ -1084,6 +1084,7 @@
## Monit Daemon
## Enable Monit server by setting MONIT_SERVER="yes"
#MONIT_SERVER="yes"
+#MONIT_CHECK_INTERVAL="60" # Check interval in seconds, defaults to 60 seconds
#MONIT_NOTIFY="no...@my..." # Notify via email, space separate multiple email addresses
#MONIT_NOTIFY_FROM="mo...@my..." # Optional, From: email address
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-02 18:09:18
|
Revision: 6894
http://sourceforge.net/p/astlinux/code/6894
Author: abelbeck
Date: 2015-01-02 18:09:16 +0000 (Fri, 02 Jan 2015)
Log Message:
-----------
liburiparser, new package, optional for Asterisk 13
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/liburiparser/
branches/1.0/package/liburiparser/Config.in
branches/1.0/package/liburiparser/liburiparser.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/astlinux-ast11.config 2015-01-02 18:09:16 UTC (rev 6894)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6849-dirty Configuration
-# Fri Dec 12 17:25:43 2014
+# Buildroot 2011.08-svn6893-dirty Configuration
+# Fri Jan 2 12:05:53 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -613,6 +613,7 @@
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LIBURIPARSER is not set
BR2_PACKAGE_LINUX_ATM=y
#
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/astlinux18.config 2015-01-02 18:09:16 UTC (rev 6894)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6849-dirty Configuration
-# Fri Dec 12 17:25:42 2014
+# Buildroot 2011.08-svn6893-dirty Configuration
+# Fri Jan 2 12:05:51 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -613,6 +613,7 @@
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LIBURIPARSER is not set
BR2_PACKAGE_LINUX_ATM=y
#
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/initrd.config 2015-01-02 18:09:16 UTC (rev 6894)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6849-dirty Configuration
-# Fri Dec 12 17:25:55 2014
+# Buildroot 2011.08-svn6893-dirty Configuration
+# Fri Jan 2 12:05:59 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -495,6 +495,7 @@
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LIBURIPARSER is not set
# BR2_PACKAGE_LINUX_ATM is not set
#
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/package/Config.in 2015-01-02 18:09:16 UTC (rev 6894)
@@ -377,6 +377,7 @@
source "package/librsync/Config.in"
source "package/libsoup/Config.in"
source "package/libupnp/Config.in"
+source "package/liburiparser/Config.in"
source "package/linux-atm/Config.in"
endmenu
Added: branches/1.0/package/liburiparser/Config.in
===================================================================
--- branches/1.0/package/liburiparser/Config.in (rev 0)
+++ branches/1.0/package/liburiparser/Config.in 2015-01-02 18:09:16 UTC (rev 6894)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBURIPARSER
+ bool "liburiparser"
+ help
+ uriparser is a strictly RFC 3986 compliant URI parsing and handling
+ library written in C.
+
+ http://uriparser.sourceforge.net
+
Added: branches/1.0/package/liburiparser/liburiparser.mk
===================================================================
--- branches/1.0/package/liburiparser/liburiparser.mk (rev 0)
+++ branches/1.0/package/liburiparser/liburiparser.mk 2015-01-02 18:09:16 UTC (rev 6894)
@@ -0,0 +1,20 @@
+################################################################################
+#
+# liburiparser
+#
+################################################################################
+
+LIBURIPARSER_VERSION = 0.8.1
+LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
+LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION)
+LIBURIPARSER_INSTALL_STAGING = YES
+
+LIBURIPARSER_CONF_OPT = \
+ --disable-test \
+ --disable-doc
+
+ifeq ($(BR2_USE_WCHAR),)
+LIBURIPARSER_CONF_OPT += --disable-wchar_t
+endif
+
+$(eval $(call AUTOTARGETS,package,liburiparser))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/runnix-uclibc.config 2015-01-02 18:09:16 UTC (rev 6894)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6849-dirty Configuration
-# Fri Dec 12 17:25:53 2014
+# Buildroot 2011.08-svn6893-dirty Configuration
+# Fri Jan 2 12:05:55 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -745,6 +745,7 @@
#
# libupnp requires a toolchain with LARGEFILE support
#
+# BR2_PACKAGE_LIBURIPARSER is not set
# BR2_PACKAGE_LINUX_ATM is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-02 17:50:42 UTC (rev 6893)
+++ branches/1.0/runnix.config 2015-01-02 18:09:16 UTC (rev 6894)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6849-dirty Configuration
-# Fri Dec 12 17:25:44 2014
+# Buildroot 2011.08-svn6893-dirty Configuration
+# Fri Jan 2 12:05:54 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -521,6 +521,7 @@
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LIBURIPARSER is not set
# BR2_PACKAGE_LINUX_ATM is not set
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-02 18:31:45
|
Revision: 6895
http://sourceforge.net/p/astlinux/code/6895
Author: abelbeck
Date: 2015-01-02 18:31:43 +0000 (Fri, 02 Jan 2015)
Log Message:
-----------
jansson, new package, required for Asterisk 13
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/jansson/
branches/1.0/package/jansson/Config.in
branches/1.0/package/jansson/jansson.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/astlinux-ast11.config 2015-01-02 18:31:43 UTC (rev 6895)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6893-dirty Configuration
-# Fri Jan 2 12:05:53 2015
+# Buildroot 2011.08-svn6894-dirty Configuration
+# Fri Jan 2 12:28:29 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -655,6 +655,7 @@
BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
BR2_PACKAGE_IKSEMEL=y
+# BR2_PACKAGE_JANSSON 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 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/astlinux18.config 2015-01-02 18:31:43 UTC (rev 6895)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6893-dirty Configuration
-# Fri Jan 2 12:05:51 2015
+# Buildroot 2011.08-svn6894-dirty Configuration
+# Fri Jan 2 12:28:27 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -655,6 +655,7 @@
BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
BR2_PACKAGE_IKSEMEL=y
+# BR2_PACKAGE_JANSSON is not set
# BR2_PACKAGE_LIBROXML is not set
BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/initrd.config 2015-01-02 18:31:43 UTC (rev 6895)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6893-dirty Configuration
-# Fri Jan 2 12:05:59 2015
+# Buildroot 2011.08-svn6894-dirty Configuration
+# Fri Jan 2 12:28:39 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -533,6 +533,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_JANSSON is not set
# BR2_PACKAGE_LIBROXML is not set
# BR2_PACKAGE_LIBXML2 is not set
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/package/Config.in 2015-01-02 18:31:43 UTC (rev 6895)
@@ -416,6 +416,7 @@
source "package/expat/Config.in"
source "package/ezxml/Config.in"
source "package/iksemel/Config.in"
+source "package/jansson/Config.in"
source "package/libroxml/Config.in"
source "package/libxml-parser-perl/Config.in"
source "package/libxml2/Config.in"
Added: branches/1.0/package/jansson/Config.in
===================================================================
--- branches/1.0/package/jansson/Config.in (rev 0)
+++ branches/1.0/package/jansson/Config.in 2015-01-02 18:31:43 UTC (rev 6895)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_JANSSON
+ bool "jansson"
+ help
+ Jansson is a C library for encoding, decoding and manipulating JSON
+ data.
+
+ http://www.digip.org/jansson/
+
Added: branches/1.0/package/jansson/jansson.mk
===================================================================
--- branches/1.0/package/jansson/jansson.mk (rev 0)
+++ branches/1.0/package/jansson/jansson.mk 2015-01-02 18:31:43 UTC (rev 6895)
@@ -0,0 +1,13 @@
+################################################################################
+#
+# jansson
+#
+################################################################################
+
+JANSSON_VERSION = 2.7
+JANSSON_SITE = http://www.digip.org/jansson/releases
+JANSSON_INSTALL_STAGING = YES
+
+JANSSON_CONF_ENV = LIBS="-lm"
+
+$(eval $(call AUTOTARGETS,package,jansson))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/runnix-uclibc.config 2015-01-02 18:31:43 UTC (rev 6895)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6893-dirty Configuration
-# Fri Jan 2 12:05:55 2015
+# Buildroot 2011.08-svn6894-dirty Configuration
+# Fri Jan 2 12:28:35 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -805,6 +805,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_JANSSON is not set
# BR2_PACKAGE_LIBROXML is not set
# BR2_PACKAGE_LIBXML2 is not set
# BR2_PACKAGE_LIBXSLT is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-02 18:09:16 UTC (rev 6894)
+++ branches/1.0/runnix.config 2015-01-02 18:31:43 UTC (rev 6895)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6893-dirty Configuration
-# Fri Jan 2 12:05:54 2015
+# Buildroot 2011.08-svn6894-dirty Configuration
+# Fri Jan 2 12:28:32 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -562,6 +562,7 @@
#
# BR2_PACKAGE_EXPAT is not set
# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_JANSSON is not set
# BR2_PACKAGE_LIBROXML is not set
# BR2_PACKAGE_LIBXML2 is not set
# BR2_PACKAGE_LIBXSLT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-03 04:40:31
|
Revision: 6896
http://sourceforge.net/p/astlinux/code/6896
Author: abelbeck
Date: 2015-01-03 04:40:20 +0000 (Sat, 03 Jan 2015)
Log Message:
-----------
asterisk, add Asterisk 13 support, more work to do
Modified Paths:
--------------
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/asterisk-codec-silk/Config.in
branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk
Added Paths:
-----------
branches/1.0/astlinux-ast13.config
branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/project/astlinux/asterisk.makeopts-1
branches/1.0/project/astlinux/asterisk.makeopts-11
branches/1.0/project/astlinux/asterisk.makeopts-13
Removed Paths:
-------------
branches/1.0/project/astlinux/asterisk.makeopts
branches/1.0/project/astlinux/asterisk.makeopts-10
Added: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config (rev 0)
+++ branches/1.0/astlinux-ast13.config 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,921 @@
+#
+# Automatically generated make config: don't edit
+# Buildroot 2011.08-svn6895-dirty Configuration
+# Fri Jan 2 19:55:53 2015
+#
+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="colocrossing"
+BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
+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-1.19.0-3.2/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 is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
+BR2_ROOTFS_DEVICE_TABLE="project/astlinux/device_table.txt"
+# BR2_ROOTFS_SKELETON_DEFAULT is not set
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/astlinux/target_skeleton"
+BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/astlinux-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 is not set
+BR2_BUSYBOX_VERSION_1_19_X=y
+# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
+BR2_BUSYBOX_VERSION="1.19.4"
+BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
+# BR2_PACKAGE_CUSTOMIZE is not set
+
+#
+# Asterisk, XMPP and telephony applications
+#
+BR2_PACKAGE_ASTERISK=y
+# BR2_PACKAGE_ASTERISK_v1_8 is not set
+# BR2_PACKAGE_ASTERISK_v11 is not set
+BR2_PACKAGE_ASTERISK_v13=y
+
+#
+# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
+#
+
+#
+# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
+#
+# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
+BR2_PACKAGE_ASTERISK_CODEC_SILK=y
+BR2_PACKAGE_ASTERISK_FOP2=y
+BR2_PACKAGE_ASTERISK_GUI=y
+BR2_PACKAGE_PHONEPROV_TOOLS=y
+BR2_PACKAGE_DAHDI_LINUX=y
+BR2_PACKAGE_DAHDI_OSLEC=y
+BR2_PACKAGE_DAHDI_HFCS=y
+# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
+BR2_PACKAGE_DAHDI_TOOLS=y
+# BR2_PACKAGE_FONULATOR is not set
+# BR2_PACKAGE_FREESWITCH is not set
+BR2_PACKAGE_CLIX=y
+# BR2_PACKAGE_KAMAILIO is not set
+# BR2_PACKAGE_OPENSIPS is not set
+BR2_PACKAGE_PROSODY=y
+# BR2_PACKAGE_RTPPROXY is not set
+BR2_PACKAGE_RHINO=y
+BR2_PACKAGE_WANPIPE=y
+
+#
+# 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_BEEP=y
+# 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=y
+# 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=y
+BR2_PACKAGE_SOX_LIBMAD=y
+# 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_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=y
+# 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_CVS is not set
+# BR2_PACKAGE_DISTCC is not set
+BR2_PACKAGE_FLEX=y
+BR2_PACKAGE_FLEX_LIBFL=y
+# BR2_PACKAGE_GMP is not set
+# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_MAKE is not set
+# BR2_PACKAGE_MPC is not set
+# BR2_PACKAGE_MPFR is not set
+BR2_PACKAGE_LIBTOOL=y
+# BR2_PACKAGE_M4 is not set
+# BR2_PACKAGE_PKG_CONFIG is not set
+# BR2_PACKAGE_SSTRIP 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_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
+#
+
+#
+# Network Interface Kernel Drivers
+#
+BR2_PACKAGE_E1000E=y
+BR2_PACKAGE_IGB=y
+BR2_PACKAGE_R8168=y
+BR2_PACKAGE_TG3=y
+
+#
+# Other Hardware
+#
+BR2_PACKAGE_ACPID=y
+BR2_PACKAGE_BFDETECT=y
+# BR2_PACKAGE_CDRKIT is not set
+# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
+# 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_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_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_EEPROG is not set
+# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
+BR2_PACKAGE_FXLOAD=y
+# 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_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=y
+
+#
+# lm-sensors tools
+#
+BR2_PACKAGE_LM_SENSORS_SENSORS=y
+# BR2_PACKAGE_LM_SENSORS_FANCONTROL is not set
+# BR2_PACKAGE_LM_SENSORS_ISADUMP is not set
+# BR2_PACKAGE_LM_SENSORS_ISASET is not set
+# BR2_PACKAGE_LM_SENSORS_PWMCONFIG is not set
+# BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT 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 is not set
+# BR2_PACKAGE_MEMTESTER is not set
+BR2_PACKAGE_MONIT=y
+# BR2_PACKAGE_MTD is not set
+# BR2_PACKAGE_NTFS_3G is not set
+# BR2_PACKAGE_NTFSPROGS is not set
+BR2_PACKAGE_PCIUTILS=y
+# BR2_PACKAGE_RNG_TOOLS is not set
+# BR2_PACKAGE_SDPARM is not set
+# BR2_PACKAGE_SETSERIAL is not set
+BR2_PACKAGE_SMARTMONTOOLS=y
+# BR2_PACKAGE_SQUASHFS is not set
+# BR2_PACKAGE_SREDIRD is not set
+# BR2_PACKAGE_SSHFS is not set
+BR2_PACKAGE_STATSERIAL=y
+# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_TI_UTILS is not set
+# BR2_PACKAGE_UBOOT_TOOLS is not set
+BR2_PACKAGE_UDEV=y
+# BR2_PACKAGE_UDEV_ALL_EXTRAS is not set
+# BR2_PACKAGE_USB_MODESWITCH is not set
+# BR2_PACKAGE_USBMOUNT is not set
+BR2_PACKAGE_USBUTILS=y
+# BR2_PACKAGE_USBUTILS_ZLIB is not set
+# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XFSPROGS is not set
+BR2_PACKAGE_ZABBIX=y
+BR2_PACKAGE_ZABBIX_PROXY=y
+
+#
+# Interpreter languages and scripting
+#
+BR2_PACKAGE_BC=y
+# BR2_PACKAGE_HASERL is not set
+BR2_PACKAGE_LUA=y
+
+#
+# LUA libraries/modules
+#
+# BR2_PACKAGE_CGILUA is not set
+# BR2_PACKAGE_COPAS is not set
+# BR2_PACKAGE_COXPCALL is not set
+BR2_PACKAGE_LUAEXPAT=y
+BR2_PACKAGE_LUAFILESYSTEM=y
+BR2_PACKAGE_LUASEC=y
+BR2_PACKAGE_LUASOCKET=y
+# BR2_PACKAGE_WSAPI is not set
+# BR2_PACKAGE_XAVANTE is not set
+BR2_PACKAGE_PERL=y
+BR2_PACKAGE_PHP=y
+BR2_PACKAGE_PHP_CGI=y
+# BR2_PACKAGE_PHP_SAPI_CLI is not set
+BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
+# BR2_PACKAGE_PHP_FASTCGI is not set
+
+#
+# PHP Extensions
+#
+BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
+# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
+BR2_PACKAGE_PHP_EXT_POSIX=y
+# 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=y
+BR2_PACKAGE_PHP_EXT_XMLPARSER=y
+BR2_PACKAGE_PHP_EXT_SIMPLEXML=y
+BR2_PACKAGE_PHP_EXT_ZLIB=y
+# BR2_PACKAGE_PHP_EXT_EXIF is not set
+# BR2_PACKAGE_PHP_EXT_FTP is not set
+# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
+# BR2_PACKAGE_PHP_EXT_GMP is not set
+BR2_PACKAGE_PHP_EXT_JSON=y
+# BR2_PACKAGE_PHP_EXT_READLINE is not set
+# BR2_PACKAGE_PHP_EXT_NCURSES is not set
+BR2_PACKAGE_PHP_EXT_PCRE=y
+# BR2_PACKAGE_PHP_EXT_PCNTL is not set
+# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
+# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
+# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
+BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_FILTER=y
+# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
+
+#
+# Database extensions
+#
+# BR2_PACKAGE_PHP_EXT_SQLITE is not set
+BR2_PACKAGE_PHP_EXT_PDO=y
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
+# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
+BR2_PACKAGE_WEBINTERFACE=y
+# BR2_PACKAGE_WEBINTERFACE_v1 is not set
+BR2_PACKAGE_WEBINTERFACE_v2=y
+
+#
+# Libraries
+#
+
+#
+# Compression and decompression
+#
+# BR2_PACKAGE_LIBARCHIVE is not set
+BR2_PACKAGE_LZO=y
+BR2_PACKAGE_SPANDSP=y
+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=y
+BR2_PACKAGE_OPENSSL_BIN=y
+BR2_PACKAGE_OPENSSL_ENGINES=y
+# BR2_PACKAGE_OPENSSL_OCF is not set
+BR2_PACKAGE_LIBSODIUM=y
+BR2_PACKAGE_LIBSRTP=y
+
+#
+# Database
+#
+# BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+BR2_PACKAGE_SQLITE=y
+BR2_PACKAGE_SQLITE_READLINE=y
+BR2_PACKAGE_SQLITEODBC=y
+BR2_PACKAGE_UNIXODBC=y
+
+#
+# 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=y
+
+#
+# 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=y
+# 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=y
+
+#
+# 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=y
+BR2_PACKAGE_LIBUSB_COMPAT=y
+
+#
+# Networking
+#
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_LIBEXOSIP2 is not set
+BR2_PACKAGE_LIBIDN=y
+# BR2_PACKAGE_LIBIDN_BINARY is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+BR2_PACKAGE_NEON=y
+BR2_PACKAGE_NEON_ZLIB=y
+BR2_PACKAGE_NEON_SSL=y
+# BR2_PACKAGE_NEON_NOXML is not set
+# BR2_PACKAGE_NEON_EXPAT is not set
+BR2_PACKAGE_NEON_LIBXML2=y
+# BR2_PACKAGE_LIBMNL is not set
+# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNL is not set
+BR2_PACKAGE_LIBPCAP=y
+# BR2_PACKAGE_LIBOSIP2 is not set
+BR2_PACKAGE_LIBPRI=y
+# BR2_PACKAGE_LIBRSYNC is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
+BR2_PACKAGE_LIBURIPARSER=y
+BR2_PACKAGE_LINUX_ATM=y
+
+#
+# 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=y
+# BR2_PACKAGE_LIBEVENT is not set
+# BR2_PACKAGE_LIBFB is not set
+# BR2_PACKAGE_LIBFFI is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+BR2_PACKAGE_LIBICAL=y
+# 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=y
+BR2_PACKAGE_PCRE=y
+BR2_PACKAGE_POPT=y
+BR2_PACKAGE_READLINE=y
+BR2_PACKAGE_SLANG=y
+
+#
+# JSON/XML
+#
+BR2_PACKAGE_EXPAT=y
+# BR2_PACKAGE_EZXML is not set
+BR2_PACKAGE_IKSEMEL=y
+BR2_PACKAGE_JANSSON=y
+# BR2_PACKAGE_LIBROXML is not set
+BR2_PACKAGE_LIBXML2=y
+# 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=y
+BR2_PACKAGE_MAC2VENDOR=y
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
+BR2_PACKAGE_ZONEINFO=y
+
+#
+# Networking applications
+#
+# BR2_PACKAGE_APCUPSD is not set
+# BR2_PACKAGE_ARGUS is not set
+BR2_PACKAGE_ARNOFW=y
+# BR2_PACKAGE_AVAHI is not set
+# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
+# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
+BR2_PACKAGE_BRIDGE=y
+# 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_DARKSTAT=y
+BR2_PACKAGE_DHCPDUMP=y
+BR2_PACKAGE_DNSCRYPT_PROXY=y
+BR2_PACKAGE_DNSMASQ=y
+BR2_PACKAGE_DNSMASQ_TFTP=y
+BR2_PACKAGE_DNSMASQ_DHCP=y
+# BR2_PACKAGE_DNSMASQ_IDN is not set
+# BR2_PACKAGE_DROPBEAR is not set
+# BR2_PACKAGE_EBTABLES is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_FPING=y
+# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IFPLUGD is not set
+BR2_PACKAGE_IFTOP=y
+BR2_PACKAGE_INADYN=y
+BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPSEC_TOOLS=y
+BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
+BR2_PACKAGE_IPSEC_TOOLS_NATT=y
+BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
+# BR2_PACKAGE_IPSEC_TOOLS_STATS is not set
+# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
+BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
+# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
+# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
+# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPTABLES=y
+# BR2_PACKAGE_IW is not set
+# BR2_PACKAGE_KISMET is not set
+# BR2_PACKAGE_XL2TP is not set
+BR2_PACKAGE_LIGHTTPD=y
+BR2_PACKAGE_LIGHTTPD_OPENSSL=y
+# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
+# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
+BR2_PACKAGE_LIGHTTPD_PCRE=y
+# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
+BR2_PACKAGE_LINKS=y
+# BR2_PACKAGE_LINKS_GRAPHICS is not set
+# BR2_PACKAGE_LRZSZ is not set
+BR2_PACKAGE_MDNSRESPONDER=y
+# BR2_PACKAGE_MII_DIAG is not set
+BR2_PACKAGE_MINIUPNPD=y
+# BR2_PACKAGE_MROUTED is not set
+BR2_PACKAGE_MSMTP=y
+BR2_PACKAGE_MTR=y
+# BR2_PACKAGE_MUTT is not set
+# BR2_PACKAGE_NBD is not set
+# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETPLUG is not set
+BR2_PACKAGE_NETSNMP=y
+# 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_NMAP is not set
+BR2_PACKAGE_NTP=y
+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
+# BR2_PACKAGE_NTP_NTPDATE is not set
+# BR2_PACKAGE_NTP_NTPDC is not set
+BR2_PACKAGE_NTP_NTPQ=y
+# BR2_PACKAGE_NTP_NTPTRACE is not set
+# BR2_PACKAGE_NTP_TICKADJ is not set
+BR2_PACKAGE_NUT=y
+# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
+# BR2_PACKAGE_NUTTCP is not set
+# BR2_PACKAGE_OLSR is not set
+BR2_PACKAGE_OPENLDAP=y
+BR2_PACKAGE_OPENLDAP_SERVER=y
+# BR2_PACKAGE_OPENNTPD is not set
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_OPENVPN=y
+BR2_PACKAGE_OPENVPN_LZO=y
+BR2_PACKAGE_OPENVPN_OPENSSL=y
+BR2_PACKAGE_P910ND=y
+# BR2_PACKAGE_PORTMAP is not set
+BR2_PACKAGE_PPPD=y
+# BR2_PACKAGE_PPPD_FILTER is not set
+# BR2_PACKAGE_PPPD_RADIUS is not set
+BR2_PACKAGE_RADVD=y
+BR2_PACKAGE_RP_PPPOE=y
+# BR2_PACKAGE_PPTP_LINUX is not set
+BR2_PACKAGE_PPTPD=y
+# BR2_PACKAGE_PROFTPD is not set
+# BR2_PACKAGE_QUAGGA is not set
+# BR2_PACKAGE_RSH_REDONE is not set
+BR2_PACKAGE_RSYNC=y
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
+BR2_PACKAGE_SHELLINABOX=y
+BR2_PACKAGE_SIPGREP=y
+# BR2_PACKAGE_SOCAT is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
+# BR2_PACKAGE_SQUID is not set
+BR2_PACKAGE_STUNNEL=y
+BR2_PACKAGE_TCPDUMP=y
+# BR2_PACKAGE_TCPDUMP_SMB is not set
+# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TINYPROXY 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=y
+# BR2_PACKAGE_VTUN 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
+
+#
+# Shell and utilities
+#
+# BR2_PACKAGE_AT is not set
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_BASH_DEFAULT_SHELL=y
+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=y
+BR2_PACKAGE_SCREEN=y
+BR2_PACKAGE_SUDO=y
+# 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_HTOP is not set
+BR2_PACKAGE_MODULE_INIT_TOOLS=y
+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=y
+# 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=y
+# BR2_PACKAGE_JOE is not set
+BR2_PACKAGE_NANO=y
+# BR2_PACKAGE_UEMACS 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=y
+# BR2_TARGET_ROOTFS_EXT2_GZIP is not set
+# 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=y
+BR2_TARGET_ROOTFS_SQUASHFS4=y
+BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
+# BR2_TARGET_ROOTFS_SQUASHFS4_LZMA is not set
+# BR2_TARGET_ROOTFS_SQUASHFS4_LZO is not set
+# BR2_TARGET_ROOTFS_SQUASHFS4_XZ 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 is not set
+BR2_TARGET_RUNNIX=y
+BR2_TARGET_RUNNIX_NDEV=""
+# 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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
+BR2_LINUX_KERNEL_VERSION="custom"
+BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
+# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/astlinux/geni586/linux.config"
+BR2_LINUX_KERNEL_BZIMAGE=y
+# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/package/asterisk/Config.in 2015-01-03 04:40:20 UTC (rev 6896)
@@ -27,6 +27,11 @@
bool "Asterisk v11.x"
help
Asterisk Long Term Release.
+
+ config BR2_PACKAGE_ASTERISK_v13
+ bool "Asterisk v13.x"
+ help
+ Asterisk Long Term Release.
endchoice
comment "cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)"
Added: branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-anonymous-semaphores.patch 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,18 @@
+--- asterisk-13.1.0/configure.ac.orig 2015-01-02 12:41:14.000000000 -0600
++++ asterisk-13.1.0/configure.ac 2015-01-02 12:43:39.000000000 -0600
+@@ -877,14 +877,7 @@
+ )
+
+ # Some platforms define sem_init(), but only support sem_open(). joyous.
+-AC_MSG_CHECKING(for working unnamed semaphores)
+-AC_RUN_IFELSE(
+- [AC_LANG_PROGRAM([#include <semaphore.h>],
+- [sem_t sem; return sem_init(&sem, 0, 0);])],
+- AC_MSG_RESULT(yes)
+- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
+- AC_MSG_RESULT(no)
+-)
++AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
Added: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,16 @@
+--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
++++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
+@@ -2487,11 +2487,13 @@
+ AC_OUTPUT
+
+ ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
++if test "${cross_compiling}" = "no"; then
+ if test "x${ac_cv_path_CMP}" = "x:"; then
+ ( cd `pwd`/menuselect && ./configure )
+ else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
+ ( cd `pwd`/menuselect && ./configure )
+ fi ; fi
++fi
+
+ rm makeopts.acbak makeopts.acbak2
+
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-01-03 04:40:20 UTC (rev 6896)
@@ -6,7 +6,11 @@
ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
ASTERISK_VERSION := 1.8.32.1
else
+ ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
ASTERISK_VERSION := 11.15.0
+ else
+ASTERISK_VERSION := 13.1.0
+ endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
ASTERISK_SITE := http://downloads.asterisk.org/pub/telephony/asterisk/releases
@@ -28,11 +32,7 @@
ASTERISK_VERSION_TUPLE := $(call ndots,1,2,$(ASTERISK_VERSION))
ASTERISK_VERSION_TRIPLE := $(call ndots,1,3,$(ASTERISK_VERSION))
-ifeq ($(ASTERISK_VERSION_SINGLE),1)
-ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts
-else
-ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts-10
-endif
+ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts-$(ASTERISK_VERSION_SINGLE)
ASTERISK_CONFIGURE_ENV += \
USE_GETIFADDRS=yes
@@ -161,6 +161,33 @@
endif
endif
+ifneq ($(ASTERISK_VERSION_SINGLE),1)
+ifneq ($(ASTERISK_VERSION_SINGLE),11)
+
+ifeq ($(strip $(BR2_PACKAGE_JANSSON)),y)
+ASTERISK_EXTRAS+=jansson
+ASTERISK_CONFIGURE_ARGS+= \
+ --with-jansson="$(STAGING_DIR)/usr"
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_LIBURIPARSER)),y)
+ASTERISK_EXTRAS+=liburiparser
+ASTERISK_CONFIGURE_ARGS+= \
+ --with-uriparser="$(STAGING_DIR)/usr"
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_LIBXSLT)),y)
+ASTERISK_EXTRAS+=libxslt
+ASTERISK_CONFIGURE_ARGS+= \
+ --with-libxslt="$(STAGING_DIR)/usr"
+else
+ASTERISK_CONFIGURE_ARGS+= \
+ --without-libxslt
+endif
+
+endif
+endif
+
$(DL_DIR)/$(ASTERISK_SOURCE):
$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)
@@ -201,7 +228,10 @@
CPPFLAGS='$(TARGET_CFLAGS)' \
LIBS='$(ASTERISK_LIBS)' \
)
- PATH=$(STAGING_DIR)/bin:$$PATH \
+ (cd $(ASTERISK_DIR)/menuselect; rm -rf config.cache configure; \
+ ./bootstrap.sh; \
+ ./configure \
+ )
$(MAKE) -C $(ASTERISK_DIR)/menuselect menuselect
ifeq ($(strip $(BR2_PACKAGE_ASTERISK_MENUSELECT)),y)
PATH=$(STAGING_DIR)/bin:$$PATH \
Modified: branches/1.0/package/asterisk-codec-silk/Config.in
===================================================================
--- branches/1.0/package/asterisk-codec-silk/Config.in 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/package/asterisk-codec-silk/Config.in 2015-01-03 04:40:20 UTC (rev 6896)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ASTERISK_CODEC_SILK
bool "asterisk-codec-silk"
default n
- depends on BR2_PACKAGE_ASTERISK && BR2_PACKAGE_ASTERISK_v11
+ depends on BR2_PACKAGE_ASTERISK && ( ! BR2_PACKAGE_ASTERISK_v1_8 )
help
SILK CODEC developed by Skype (owned by Microsoft)
License supplied by Digium in x86 binary form.
Modified: branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk
===================================================================
--- branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk 2015-01-03 04:40:20 UTC (rev 6896)
@@ -3,7 +3,7 @@
# asterisk-codec-silk
#
##############################################################
-ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
+ifneq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
ASTERISK_CODEC_SILK_VERSION := 11.0_1.0.0-i686_32
ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-11.0/x86-32
endif
Deleted: branches/1.0/project/astlinux/asterisk.makeopts
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/project/astlinux/asterisk.makeopts 2015-01-03 04:40:20 UTC (rev 6896)
@@ -1,32 +0,0 @@
-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_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_odbc res_snmp
-MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM -CORE-SOUNDS-EN-ULAW -CORE-SOUNDS-EN-G729
-MENUSELECT_MOH=-MOH-OPSOUND-ULAW -MOH-OPSOUND-G729 -MOH-OPSOUND-WAV
-MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
-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_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
Copied: branches/1.0/project/astlinux/asterisk.makeopts-1 (from rev 6895, branches/1.0/project/astlinux/asterisk.makeopts)
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-1 (rev 0)
+++ branches/1.0/project/astlinux/asterisk.makeopts-1 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,31 @@
+MENUSELECT_APPS=app_ivrdemo app_osplookup app_skel
+MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds
+MENUSELECT_CHANNELS=chan_alsa chan_h323 chan_nbs chan_vpb
+MENUSELECT_CODECS=codec_speex
+MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_FUNCS=func_odbc
+MENUSELECT_RES=res_config_odbc res_config_pgsql res_odbc res_snmp
+MENUSELECT_OPTS_app_voicemail=
+MENUSELECT_CFLAGS=LOADABLE_MODULES
+MENUSELECT_EMBED=
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM -CORE-SOUNDS-EN-ULAW -CORE-SOUNDS-EN-G729
+MENUSELECT_MOH=-MOH-OPSOUND-ULAW -MOH-OPSOUND-G729 -MOH-OPSOUND-WAV
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
+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_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
Deleted: branches/1.0/project/astlinux/asterisk.makeopts-10
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-10 2015-01-02 18:31:43 UTC (rev 6895)
+++ branches/1.0/project/astlinux/asterisk.makeopts-10 2015-01-03 04:40:20 UTC (rev 6896)
@@ -1,84 +0,0 @@
-MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql app_saycountpl cdr_mysql
-MENUSELECT_APPS=app_page app_skel app_fax app_ivrdemo app_jack app_osplookup app_saycounted app_dahdibarge app_meetme app_readfile app_setcallerid
-MENUSELECT_BRIDGES=
-MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite
-MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds
-MENUSELECT_CHANNELS=chan_alsa chan_console chan_jingle chan_misdn chan_nbs chan_vpb chan_h323
-MENUSELECT_CODECS=codec_speex
-MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_FUNCS=func_odbc func_speex
-MENUSELECT_PBX=pbx_lua
-MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_config_ldap res_config_pgsql res_config_sqlite res_pktccops res_snmp res_timing_kqueue
-MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils
-MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
-MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb
-MENUSELECT_AGIS=
-MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
-MENUSELECT_MOH=-MOH-OPSOUND-WAV
-MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_api
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
-MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
Copied: branches/1.0/project/astlinux/asterisk.makeopts-11 (from rev 6895, branches/1.0/project/astlinux/asterisk.makeopts-10)
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-11 (rev 0)
+++ branches/1.0/project/astlinux/asterisk.makeopts-11 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,84 @@
+MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql app_saycountpl cdr_mysql
+MENUSELECT_APPS=app_page app_skel app_fax app_ivrdemo app_jack app_osplookup app_saycounted app_dahdibarge app_meetme app_readfile app_setcallerid
+MENUSELECT_BRIDGES=
+MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite
+MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds
+MENUSELECT_CHANNELS=chan_alsa chan_console chan_jingle chan_misdn chan_nbs chan_vpb chan_h323
+MENUSELECT_CODECS=codec_speex
+MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_FUNCS=func_odbc func_speex
+MENUSELECT_PBX=pbx_lua
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_config_ldap res_config_pgsql res_config_sqlite res_pktccops res_snmp res_timing_kqueue
+MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils
+MENUSELECT_CFLAGS=LOADABLE_MODULES
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
+MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb
+MENUSELECT_AGIS=
+MENUSELECT_EMBED=
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
+MENUSELECT_MOH=-MOH-OPSOUND-WAV
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
+MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
Added: branches/1.0/project/astlinux/asterisk.makeopts-13
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-13 (rev 0)
+++ branches/1.0/project/astlinux/asterisk.makeopts-13 2015-01-03 04:40:20 UTC (rev 6896)
@@ -0,0 +1,83 @@
+MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql cdr_mysql
+MENUSELECT_APPS=app_page app_skel app_fax app_ivrdemo app_jack app_osplookup app_saycounted app_meetme app_setcallerid
+MENUSELECT_BRIDGES=
+MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite
+MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds
+MENUSELECT_CHANNELS=chan_alsa chan_console chan_misdn chan_nbs chan_vpb
+MENUSELECT_CODECS=codec_speex
+MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_FUNCS=func_odbc func_speex
+MENUSELECT_PBX=pbx_lua
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_config_ldap res_config_pgsql res_config_sqlite res_pktccops res_snmp res_timing_kqueue
+MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils
+MENUSELECT_CFLAGS=LOADABLE_MODULES
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
+MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb
+MENUSELECT_AGIS=
+MENUSELECT_EMBED=
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
+MENUSELECT_MOH=-MOH-OPSOUND-WAV
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
+MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-03 17:09:00
|
Revision: 6898
http://sourceforge.net/p/astlinux/code/6898
Author: abelbeck
Date: 2015-01-03 17:08:52 +0000 (Sat, 03 Jan 2015)
Log Message:
-----------
pjsip, new package for Asterisk 13, version 2.3
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/pjsip/
branches/1.0/package/pjsip/Config.in
branches/1.0/package/pjsip/pjsip.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/astlinux-ast11.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6894-dirty Configuration
-# Fri Jan 2 12:28:29 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:37 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
BR2_PACKAGE_ASTERISK=y
# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
+# BR2_PACKAGE_ASTERISK_v13 is not set
#
# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
@@ -608,6 +609,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
+# BR2_PACKAGE_PJSIP is not set
# BR2_PACKAGE_LIBOSIP2 is not set
BR2_PACKAGE_LIBPRI=y
# BR2_PACKAGE_LIBRSYNC is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/astlinux-ast13.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6895-dirty Configuration
-# Fri Jan 2 19:55:53 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:43 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -609,6 +609,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
+BR2_PACKAGE_PJSIP=y
# BR2_PACKAGE_LIBOSIP2 is not set
BR2_PACKAGE_LIBPRI=y
# BR2_PACKAGE_LIBRSYNC is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/astlinux18.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6894-dirty Configuration
-# Fri Jan 2 12:28:27 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:34 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
BR2_PACKAGE_ASTERISK=y
BR2_PACKAGE_ASTERISK_v1_8=y
# BR2_PACKAGE_ASTERISK_v11 is not set
+# BR2_PACKAGE_ASTERISK_v13 is not set
#
# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
@@ -608,6 +609,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
+# BR2_PACKAGE_PJSIP is not set
# BR2_PACKAGE_LIBOSIP2 is not set
BR2_PACKAGE_LIBPRI=y
# BR2_PACKAGE_LIBRSYNC is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/initrd.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6894-dirty Configuration
-# Fri Jan 2 12:28:39 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:55 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -491,6 +491,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_PJSIP is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/package/Config.in 2015-01-03 17:08:52 UTC (rev 6898)
@@ -372,6 +372,7 @@
source "package/libnet/Config.in"
source "package/libnl/Config.in"
source "package/libpcap/Config.in"
+source "package/pjsip/Config.in"
source "package/libosip2/Config.in"
source "package/libpri/Config.in"
source "package/librsync/Config.in"
Added: branches/1.0/package/pjsip/Config.in
===================================================================
--- branches/1.0/package/pjsip/Config.in (rev 0)
+++ branches/1.0/package/pjsip/Config.in 2015-01-03 17:08:52 UTC (rev 6898)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PJSIP
+ bool "pjsip"
+ select BR2_PACKAGE_LIBSRTP
+ help
+ PJSIP is a free and open source multimedia communication library
+ written in C language implementing standard based protocols such as:
+ SIP, SDP, RTP, STUN, TURN, and ICE.
+
+ http://www.pjsip.org
+
Added: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk (rev 0)
+++ branches/1.0/package/pjsip/pjsip.mk 2015-01-03 17:08:52 UTC (rev 6898)
@@ -0,0 +1,26 @@
+################################################################################
+#
+# pjsip
+#
+################################################################################
+
+PJSIP_VERSION = 2.3
+PJSIP_SOURCE = pjproject-$(PJSIP_VERSION).tar.bz2
+PJSIP_SITE = http://www.pjsip.org/release/$(PJSIP_VERSION)
+PJSIP_INSTALL_STAGING = YES
+
+PJSIP_DEPENDENCIES = libsrtp
+
+PJSIP_CONF_ENV = \
+ CFLAGS="$(TARGET_CFLAGS) -O2 -DPJ_HAS_IPV6=1 -DNDEBUG" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ LD="$(TARGET_CC)"
+
+PJSIP_CONF_OPT = \
+ --with-external-srtp \
+ --disable-sound \
+ --disable-resample \
+ --disable-video \
+ --disable-opencore-amr
+
+$(eval $(call AUTOTARGETS,package,pjsip))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/runnix-uclibc.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6894-dirty Configuration
-# Fri Jan 2 12:28:35 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:50 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -735,6 +735,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_PJSIP is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBRSYNC is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-03 14:15:52 UTC (rev 6897)
+++ branches/1.0/runnix.config 2015-01-03 17:08:52 UTC (rev 6898)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6894-dirty Configuration
-# Fri Jan 2 12:28:32 2015
+# Buildroot 2011.08-svn6897-dirty Configuration
+# Sat Jan 3 11:05:47 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -517,6 +517,7 @@
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_PJSIP is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-04 01:09:12
|
Revision: 6900
http://sourceforge.net/p/astlinux/code/6900
Author: abelbeck
Date: 2015-01-04 01:09:07 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
asterisk, disable the SILK codec for Asterisk 13 until a binary is available.
Ref: https://issues.asterisk.org/jira/browse/ASTERISK-24658
Modified Paths:
--------------
branches/1.0/astlinux-ast13.config
branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-03 17:30:12 UTC (rev 6899)
+++ branches/1.0/astlinux-ast13.config 2015-01-04 01:09:07 UTC (rev 6900)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:43 2015
+# Buildroot 2011.08-svn6899-dirty Configuration
+# Sat Jan 3 18:34:03 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -169,7 +169,7 @@
# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-BR2_PACKAGE_ASTERISK_CODEC_SILK=y
+# BR2_PACKAGE_ASTERISK_CODEC_SILK is not set
BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
BR2_PACKAGE_PHONEPROV_TOOLS=y
Modified: branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk
===================================================================
--- branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk 2015-01-03 17:30:12 UTC (rev 6899)
+++ branches/1.0/package/asterisk-codec-silk/asterisk-codec-silk.mk 2015-01-04 01:09:07 UTC (rev 6900)
@@ -8,8 +8,8 @@
ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-11.0/x86-32
endif
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_CODEC_SILK_VERSION := 12.0_1.0.0-i686_32
-ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-12.0/x86-32
+ASTERISK_CODEC_SILK_VERSION := 13.0_1.0.0-i686_32
+ASTERISK_CODEC_SILK_SITE := http://downloads.digium.com/pub/telephony/codec_silk/asterisk-13.0/x86-32
endif
ASTERISK_CODEC_SILK_SOURCE := codec_silk-$(ASTERISK_CODEC_SILK_VERSION).tar.gz
ASTERISK_CODEC_SILK_DIR := $(BUILD_DIR)/codec_silk-$(ASTERISK_CODEC_SILK_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-09 17:37:42
|
Revision: 6917
http://sourceforge.net/p/astlinux/code/6917
Author: abelbeck
Date: 2015-01-09 17:37:39 +0000 (Fri, 09 Jan 2015)
Log Message:
-----------
host-flex, version bump to 2.5.37 and cleanup
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/flex/Config.in
branches/1.0/package/flex/flex.mk
Added Paths:
-----------
branches/1.0/package/flex/flex-prog-ar.patch
Removed Paths:
-------------
branches/1.0/package/flex/flex-2.5.33-prog-ar.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux-ast11.config 2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:37 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan 9 10:34:36 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -267,7 +267,6 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux-ast13.config 2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6899-dirty Configuration
-# Sat Jan 3 18:34:03 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan 9 10:34:36 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -267,7 +267,6 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/astlinux18.config 2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:34 2015
+# Buildroot 2011.08-svn6916-dirty Configuration
+# Fri Jan 9 10:34:36 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -267,7 +267,6 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FLEX_LIBFL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/package/flex/Config.in
===================================================================
--- branches/1.0/package/flex/Config.in 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/Config.in 2015-01-09 17:37:39 UTC (rev 6917)
@@ -4,12 +4,5 @@
A fast lexical analyser generator. A tool for generating
programs that perform pattern-matching on text.
- http://www.gnu.org/software/flex/
+ http://flex.sourceforge.net/
-config BR2_PACKAGE_FLEX_LIBFL
- bool "Install libfl.a under staging_dir/usr/lib"
- default y
- depends on BR2_PACKAGE_FLEX
- help
- Install libfl.a under staging_dir/usr/lib for further development
- on a host machine.
Deleted: branches/1.0/package/flex/flex-2.5.33-prog-ar.patch
===================================================================
--- branches/1.0/package/flex/flex-2.5.33-prog-ar.patch 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/flex-2.5.33-prog-ar.patch 2015-01-09 17:37:39 UTC (rev 6917)
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in 2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in 2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- "$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
Copied: branches/1.0/package/flex/flex-prog-ar.patch (from rev 6916, branches/1.0/package/flex/flex-2.5.33-prog-ar.patch)
===================================================================
--- branches/1.0/package/flex/flex-prog-ar.patch (rev 0)
+++ branches/1.0/package/flex/flex-prog-ar.patch 2015-01-09 17:37:39 UTC (rev 6917)
@@ -0,0 +1,10 @@
+--- flex-2.5.37/Makefile.in.orig 2015-01-09 10:26:23.000000000 -0600
++++ flex-2.5.37/Makefile.in 2015-01-09 10:26:48.000000000 -0600
+@@ -119,7 +119,6 @@
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(docdir)" "$(DESTDIR)$(includedir)"
+ LIBRARIES = $(lib_LIBRARIES)
+-AR = ar
+ ARFLAGS = cru
+ libfl_a_AR = $(AR) $(ARFLAGS)
+ libfl_a_LIBADD =
Modified: branches/1.0/package/flex/flex.mk
===================================================================
--- branches/1.0/package/flex/flex.mk 2015-01-09 05:34:02 UTC (rev 6916)
+++ branches/1.0/package/flex/flex.mk 2015-01-09 17:37:39 UTC (rev 6917)
@@ -3,42 +3,26 @@
# flex
#
#############################################################
-FLEX_VERSION:=2.5.35
-FLEX_PATCH_VERSION:=10
-FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
-FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
-FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
-FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_VERSION = 2.5.37
+FLEX_SOURCE = flex-$(FLEX_VERSION).tar.gz
+FLEX_SITE = http://download.sourceforge.net/project/flex
FLEX_INSTALL_STAGING=YES
-FLEX_DEPENDENCIES = \
- $(if $(BR2_PACKAGE_GETTEXT),gettext) \
- $(if $(BR2_PACKAGE_LIBINTL),libintl)
+FLEX_DEPENDENCIES = host-m4
+HOST_FLEX_DEPENDENCIES = host-m4
-# lex -> flex
-define FLEX_INSTALL_LEX
-cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
-endef
+FLEX_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4
+HOST_FLEX_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4
-define FLEX_UNINSTALL_LEX
--rm $(TARGET_DIR)/usr/bin/lex
+define FLEX_DISABLE_PROGRAM
+ $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
endef
+FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LEX
-
-# libfl installation
-ifeq ($(BR2_PACKAGE_FLEX_LIBFL),y)
-define FLEX_INSTALL_LIBFL
-install -D $(FLEX_DIR)/libfl.a $(STAGING_DIR)/usr/lib/libfl.a
+# flex++ symlink is broken when flex binary is not installed
+define FLEX_REMOVE_BROKEN_SYMLINK
+ rm -f $(TARGET_DIR)/usr/bin/flex++
endef
+FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
-define FLEX_UNINSTALL_LIBFL
--rm $(STAGING_DIR)/lib/libfl.a
-endef
-
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LIBFL
-FLEX_POST_CLEAN_HOOKS += FLEX_UNINSTALL_LIBFL
-endif
-
$(eval $(call AUTOTARGETS,package,flex))
$(eval $(call AUTOTARGETS,package,flex,host))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-13 19:23:50
|
Revision: 6931
http://sourceforge.net/p/astlinux/code/6931
Author: abelbeck
Date: 2015-01-13 19:23:42 +0000 (Tue, 13 Jan 2015)
Log Message:
-----------
retire radvd, use dnsmasq for IPv6 router advertisements
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/package/radvd/Config.in
branches/1.0/package/radvd/radvd.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux-ast11.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:58 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux-ast13.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:59 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux18.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:58 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-01-13 19:23:42 UTC (rev 6931)
@@ -6,6 +6,27 @@
. /etc/init.d/functions.d/network
. /etc/init.d/functions.d/misc
+addr_to_prefix64()
+{
+ local cnt=1 prefix="" next
+
+ if [ -n "$1" ]; then
+ while [ $cnt -le 4 ]; do
+ next="$(echo "$1" | cut -s -d':' -f$cnt)"
+ if [ -z "$next" ]; then
+ break
+ fi
+ prefix="${prefix}${prefix:+:}${next}"
+ cnt=$((cnt + 1))
+ done
+ if [ -n "$prefix" ]; then
+ prefix="${prefix}::"
+ fi
+ fi
+
+ echo "$prefix"
+}
+
dnscrypt_proxy_check()
{
if [ -f /etc/init.d/dnscrypt ]; then
@@ -78,6 +99,47 @@
no-dhcp-interface=$1"
}
+addIPV6net()
+{
+ # args: IF, tag
+ local interface="$1" tag="$2" prefix="" iname IFS
+
+ unset IFS
+ for iname in $IPV6_AUTOCONF; do
+ case $iname in
+ INTIF)
+ if [ "$tag" = "lan" ]; then
+ prefix="$(addr_to_prefix64 "$INTIPV6")"
+ break
+ fi
+ ;;
+ INT2IF)
+ if [ "$tag" = "lan2" ]; then
+ prefix="$(addr_to_prefix64 "$INT2IPV6")"
+ break
+ fi
+ ;;
+ INT3IF)
+ if [ "$tag" = "lan3" ]; then
+ prefix="$(addr_to_prefix64 "$INT3IPV6")"
+ break
+ fi
+ ;;
+ DMZIF)
+ if [ "$tag" = "dmz" ]; then
+ prefix="$(addr_to_prefix64 "$DMZIPV6")"
+ break
+ fi
+ ;;
+ esac
+ done
+
+ if [ -n "$prefix" ]; then
+ echo "
+dhcp-range=$tag,$prefix,ra-only,64,24h"
+ fi
+}
+
addDNSMASQnet()
{
# args: IF, IP, NM, tag
@@ -98,6 +160,10 @@
ipstart=$(($ipbase + $dstart))
ipend=$(($ipbase + $dend))
trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
+
+ if [ "$IPV6" = "yes" ]; then
+ addIPV6net $1 $4
+ fi
else
falseDNSMASQnet $1
fi
@@ -151,6 +217,11 @@
echo "enable-tftp
tftp-root=/tftpboot"
fi
+
+ # IPv6 Options
+ if [ "$IPV6" = "yes" ]; then
+ echo "quiet-ra"
+ fi
}
addDHCPhosts_options()
@@ -275,7 +346,7 @@
ln -sf /mnt/kd/dnsmasq.conf /tmp/etc/dnsmasq.conf
return
fi
-
+
if is_DHCP_active || is_EXTDHCP_active; then
createDNSMASQbasic dhcp >> /tmp/etc/dnsmasq.conf
Modified: branches/1.0/package/radvd/Config.in
===================================================================
--- branches/1.0/package/radvd/Config.in 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/radvd/Config.in 2015-01-13 19:23:42 UTC (rev 6931)
@@ -2,6 +2,7 @@
bool "radvd"
select BR2_PACKAGE_FLEX
depends on BR2_INET_IPV6
+ depends on !BR2_PACKAGE_DNSMASQ
help
IPv6 Router Advertisement Daemon.
Modified: branches/1.0/package/radvd/radvd.mk
===================================================================
--- branches/1.0/package/radvd/radvd.mk 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/radvd/radvd.mk 2015-01-13 19:23:42 UTC (rev 6931)
@@ -13,8 +13,17 @@
define RADVD_INSTALL_INITSCRIPT
$(INSTALL) -D -m 0755 package/radvd/radvd.init $(TARGET_DIR)/etc/init.d/radvd
ln -sf /tmp/etc/radvd.conf $(TARGET_DIR)/etc/radvd.conf
+ ln -sf ../../init.d/radvd $(TARGET_DIR)/etc/runlevels/default/S92radvd
+ ln -sf ../../init.d/radvd $(TARGET_DIR)/etc/runlevels/default/K05radvd
endef
RADVD_POST_INSTALL_TARGET_HOOKS += RADVD_INSTALL_INITSCRIPT
+define RADVD_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/radvd
+ rm -f $(TARGET_DIR)/etc/radvd.conf
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S92radvd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K05radvd
+endef
+
$(eval $(call AUTOTARGETS,package,radvd))
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1 +0,0 @@
-link ../../init.d/radvd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1 +0,0 @@
-link ../../init.d/radvd
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-26 02:43:47
|
Revision: 6942
http://sourceforge.net/p/astlinux/code/6942
Author: abelbeck
Date: 2015-01-26 02:43:37 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
host-bison, version bump to 3.0.3
Modified Paths:
--------------
branches/1.0/package/bison/Config.in
branches/1.0/package/bison/bison.mk
branches/1.0/runnix-uclibc.config
Removed Paths:
-------------
branches/1.0/package/bison/bison-01-no-docs-regen.patch
Modified: branches/1.0/package/bison/Config.in
===================================================================
--- branches/1.0/package/bison/Config.in 2015-01-25 21:41:05 UTC (rev 6941)
+++ branches/1.0/package/bison/Config.in 2015-01-26 02:43:37 UTC (rev 6942)
@@ -1,6 +1,5 @@
config BR2_PACKAGE_BISON
bool "bison"
- depends on BR2_USE_WCHAR
help
General-purpose parser generator that converts a
grammar description for an LALR context-free grammar into a C
@@ -8,5 +7,5 @@
http://www.gnu.org/software/bison/
-comment "bison requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ **HOST Only**
+
Deleted: branches/1.0/package/bison/bison-01-no-docs-regen.patch
===================================================================
--- branches/1.0/package/bison/bison-01-no-docs-regen.patch 2015-01-25 21:41:05 UTC (rev 6941)
+++ branches/1.0/package/bison/bison-01-no-docs-regen.patch 2015-01-26 02:43:37 UTC (rev 6942)
@@ -1,53 +0,0 @@
-bison regenerates the docs to see if they changed which requires running
-the recently built bison. This obviously doesn't work for cross compiles
-hence breaks for many target bison builds.
-Just disable it.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
-
-diff -Nura bison-3.0.orig/doc/local.mk bison-3.0/doc/local.mk
---- bison-3.0.orig/doc/local.mk 2013-10-02 16:52:48.711890121 -0300
-+++ bison-3.0/doc/local.mk 2013-10-02 17:14:59.329341143 -0300
-@@ -38,15 +38,6 @@
- CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
- CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
- $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
--# Create $@~ which is the previous contents. Don't use 'mv' here so
--# that even if we are interrupted, the file is still available for
--# diff in the next run. Note that $@ might not exist yet.
-- $(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
-- $(AM_V_at)test ! -f $@.tmp || rm -f $@.tmp
-- $(AM_V_at)src/bison$(EXEEXT) --help | \
-- $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >$@.tmp
-- $(AM_V_at)diff -u $@~ $@.tmp || true
-- $(AM_V_at)mv $@.tmp $@
- MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
-
- ## ---------- ##
-@@ -87,9 +78,6 @@
- EXTRA_DIST += $(top_srcdir)/doc/bison.help
- MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
-- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
-- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp
-- $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
-
-
- ## ----------- ##
-@@ -107,16 +95,6 @@
-
- # Depend on configure to get version number changes.
- $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
-- $(AM_V_GEN)$(HELP2MAN) \
-- --include=$(top_srcdir)/doc/bison.x \
-- --output=$@.t src/bison$(EXEEXT)
-- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \
-- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
-- touch $@; \
-- else \
-- mv $@.t $@; \
-- fi
-- $(AM_V_at)rm -f $@*.t
-
- if ENABLE_YACC
- nodist_man_MANS = doc/yacc.1
Modified: branches/1.0/package/bison/bison.mk
===================================================================
--- branches/1.0/package/bison/bison.mk 2015-01-25 21:41:05 UTC (rev 6941)
+++ branches/1.0/package/bison/bison.mk 2015-01-26 02:43:37 UTC (rev 6942)
@@ -4,23 +4,11 @@
#
#############################################################
-BISON_VERSION = 3.0.2
+BISON_VERSION = 3.0.3
BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_AUTORECONF = YES
-HOST_BISON_AUTORECONF = YES
-BISON_DEPENDENCIES = m4
-BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
-
HOST_BISON_DEPENDENCIES = host-m4
HOST_BISON_CONF_ENV = ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4
-define BISON_DISABLE_EXAMPLES
- echo 'all install:' > $(@D)/examples/Makefile
-endef
-
-BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
-
-$(eval $(call AUTOTARGETS,package,bison))
$(eval $(call AUTOTARGETS,package,bison,host))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-25 21:41:05 UTC (rev 6941)
+++ branches/1.0/runnix-uclibc.config 2015-01-26 02:43:37 UTC (rev 6942)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:50 2015
+# Buildroot 2011.08-svn6941-dirty Configuration
+# Sun Jan 25 20:23:34 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -353,10 +353,7 @@
# BR2_PACKAGE_AUTOCONF is not set
# BR2_PACKAGE_AUTOMAKE is not set
# BR2_PACKAGE_BINUTILS is not set
-
-#
-# bison requires a toolchain with WCHAR support
-#
+# BR2_PACKAGE_BISON is not set
# BR2_PACKAGE_BSDIFF is not set
# BR2_PACKAGE_CCACHE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-26 02:58:01
|
Revision: 6943
http://sourceforge.net/p/astlinux/code/6943
Author: abelbeck
Date: 2015-01-26 02:57:55 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
remove gob2 target, host-gob2 only, we don't use it but removes remaining bison dependence
Modified Paths:
--------------
branches/1.0/package/gob2/Config.in
branches/1.0/package/gob2/gob2.mk
branches/1.0/runnix-uclibc.config
Modified: branches/1.0/package/gob2/Config.in
===================================================================
--- branches/1.0/package/gob2/Config.in 2015-01-26 02:43:37 UTC (rev 6942)
+++ branches/1.0/package/gob2/Config.in 2015-01-26 02:57:55 UTC (rev 6943)
@@ -1,14 +1,9 @@
config BR2_PACKAGE_GOB2
bool "gob2"
- depends on BR2_USE_WCHAR # glib2
- select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_FLEX
- select BR2_PACKAGE_BISON
help
GOB (GTK+ Object Builder) is a preprocessor which simplifies
the writing of GObjects in C.
http://www.jirka.org/gob.html
-comment "gob2 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ **HOST Only**
Modified: branches/1.0/package/gob2/gob2.mk
===================================================================
--- branches/1.0/package/gob2/gob2.mk 2015-01-26 02:43:37 UTC (rev 6942)
+++ branches/1.0/package/gob2/gob2.mk 2015-01-26 02:57:55 UTC (rev 6943)
@@ -6,13 +6,9 @@
GOB2_VERSION = 2.0.15
GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz
GOB2_SITE = http://ftp.5z.com/pub/gob/
-IPERF_CONF_ENV = ac_cv_lib_lex=-lfl
-GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
-
HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2
-$(eval $(call AUTOTARGETS,package,gob2))
$(eval $(call AUTOTARGETS,package,gob2,host))
# gob2 for the host
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-26 02:43:37 UTC (rev 6942)
+++ branches/1.0/runnix-uclibc.config 2015-01-26 02:57:55 UTC (rev 6943)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6941-dirty Configuration
-# Sun Jan 25 20:23:34 2015
+# Buildroot 2011.08-svn6942-dirty Configuration
+# Sun Jan 25 20:52:21 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -456,12 +456,9 @@
#
# X applications
#
+# BR2_PACKAGE_GOB2 is not set
#
-# gob2 requires a toolchain with WCHAR support
-#
-
-#
# midori requires C++, WCHAR in toolchain and libgtk2
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-26 03:10:11
|
Revision: 6944
http://sourceforge.net/p/astlinux/code/6944
Author: abelbeck
Date: 2015-01-26 03:10:09 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
remove m4 target, host-m4 only
Modified Paths:
--------------
branches/1.0/package/m4/Config.in
branches/1.0/package/m4/m4.mk
branches/1.0/runnix-uclibc.config
Modified: branches/1.0/package/m4/Config.in
===================================================================
--- branches/1.0/package/m4/Config.in 2015-01-26 02:57:55 UTC (rev 6943)
+++ branches/1.0/package/m4/Config.in 2015-01-26 03:10:09 UTC (rev 6944)
@@ -1,10 +1,8 @@
config BR2_PACKAGE_M4
bool "m4"
- depends on BR2_USE_WCHAR
help
An implementation of the traditional Unix macro processor.
http://www.gnu.org/software/m4/m4.html
-comment "m4 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ **HOST Only**
Modified: branches/1.0/package/m4/m4.mk
===================================================================
--- branches/1.0/package/m4/m4.mk 2015-01-26 02:57:55 UTC (rev 6943)
+++ branches/1.0/package/m4/m4.mk 2015-01-26 03:10:09 UTC (rev 6944)
@@ -7,13 +7,6 @@
M4_SOURCE = m4-$(M4_VERSION).tar.bz2
M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
-
-ifneq ($(BR2_USE_WCHAR),y)
-M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
-endif
-
HOST_M4_CONF_OPT = --disable-static
-$(eval $(call AUTOTARGETS,package,m4))
$(eval $(call AUTOTARGETS,package,m4,host))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-26 02:57:55 UTC (rev 6943)
+++ branches/1.0/runnix-uclibc.config 2015-01-26 03:10:09 UTC (rev 6944)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6942-dirty Configuration
-# Sun Jan 25 20:52:21 2015
+# Buildroot 2011.08-svn6943-dirty Configuration
+# Sun Jan 25 21:06:44 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -388,12 +388,9 @@
# BR2_PACKAGE_MPC is not set
# BR2_PACKAGE_MPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
+# BR2_PACKAGE_M4 is not set
#
-# m4 requires a toolchain with WCHAR support
-#
-
-#
# patch needs a toolchain with WCHAR support
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-01-28 23:34:14
|
Revision: 6949
http://sourceforge.net/p/astlinux/code/6949
Author: abelbeck
Date: 2015-01-28 23:34:11 +0000 (Wed, 28 Jan 2015)
Log Message:
-----------
system updates, Linux Kernel 3.2.66, crosstool-ng 1.20.0 configured with eglibc 2.18 and gcc 4.8.3. Security fix: CVE-2015-0235 (GHOST: glibc gethostbyname buffer overflow)
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/README
branches/1.0/initrd.config
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/package/busybox/busybox-sys-resource.patch
Removed Paths:
-------------
branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/astlinux-ast11.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/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
@@ -909,7 +909,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.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/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/astlinux-ast13.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/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
@@ -909,7 +909,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.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 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/astlinux18.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/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
@@ -909,7 +909,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.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/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/crosstool-ng-src/README 2015-01-28 23:34:11 UTC (rev 6949)
@@ -1,18 +1,18 @@
#########################################################################
-## Crosstool-NG 1.19.0
+## Crosstool-NG 1.20.0
## http://crosstool-ng.org
##
## Building the eglibc toolchain for AstLinux 1.x using Buildroot
-## The resulting toolchain is output to $HOME/astlinux/x-tools-1.19.0
+## The resulting toolchain is output to $HOME/astlinux/x-tools-1.20.0-3.2
## Make sure you have a $HOME/astlinux/ directory.
##
-## Note: If "crosstool-ng-1.19.0" is already installed, jump to "## Build toolchain ##"
+## Note: If "crosstool-ng-1.20.0" is already installed, jump to "## Build toolchain ##"
##
## Install crosstool-ng ##
# 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.19.0.tar.bz2 | tar xj
-cd crosstool-ng-1.19.0
+wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.20.0.tar.bz2 | tar xj
+cd crosstool-ng-1.20.0
./configure
# Note: the 'gperf' package may need to be added to your system.
make
@@ -20,14 +20,14 @@
##
## Build toolchain ##
cd ~/source-control
-mkdir ctng-1.19.0-3.2
-cd ctng-1.19.0-3.2
-# then copy the "crosstool-ng-src/ct-ng-1.19.0-3.2.config" file from the SVN to ".config" here
-cp ~/astlinux/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config .config
+mkdir ctng-1.20.0-3.2
+cd ctng-1.20.0-3.2
+# then copy the "crosstool-ng-src/ct-ng-1.20.0-3.2.config" file from the SVN to ".config" here
+cp ~/astlinux/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config .config
# leave as configured, just look, don't make any changes
ct-ng menuconfig
# then install linux kernel for the header includes
-wget http://files.astlinux.org/linux-3.2.62.tar.gz
+wget http://files.astlinux.org/linux-3.2.66.tar.gz
# finally, start the toolchain build process
ct-ng build
# takes 50-70 min.
Deleted: branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -1,475 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# crosstool-NG 1.19.0 Configuration
-# Wed Jan 22 05:59:57 2014
-#
-CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_cvs=y
-CT_CONFIGURE_has_svn=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.19.0-3.2/${CT_TARGET}"
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-CT_INSTALL_DIR_RO=y
-CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=1
-CT_LOAD=""
-CT_USE_PIPES=y
-CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_LDFLAGS_FOR_BUILD=""
-CT_EXTRA_CFLAGS_FOR_HOST=""
-CT_EXTRA_LDFLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-CT_LOG_INFO=y
-# CT_LOG_EXTRA is not set
-# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="INFO"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=y
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="x86"
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH="i586"
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-# CT_ARCH_arm is not set
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-CT_ARCH_x86=y
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_microblaze_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-CT_ARCH_SUFFIX=""
-
-#
-# Generic target options
-#
-# CT_MULTILIB is not set
-CT_ARCH_USE_MMU=y
-
-#
-# Target optimisations
-#
-CT_ARCH_FLOAT=""
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-# CT_STATIC_TOOLCHAIN is not set
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-# CT_CANADIAN is not set
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-CT_KERNEL_VERSION="custom"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-# CT_KERNEL_windows is not set
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_V_3_10 is not set
-# CT_KERNEL_V_3_9 is not set
-# CT_KERNEL_V_3_8 is not set
-# CT_KERNEL_V_3_7 is not set
-# CT_KERNEL_V_3_6 is not set
-# CT_KERNEL_V_3_5 is not set
-# CT_KERNEL_V_3_4 is not set
-# CT_KERNEL_V_3_3 is not set
-# CT_KERNEL_V_3_2 is not set
-# CT_KERNEL_V_3_1 is not set
-# CT_KERNEL_V_3_0 is not set
-# CT_KERNEL_V_2_6_39 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37 is not set
-# CT_KERNEL_V_2_6_36 is not set
-# CT_KERNEL_V_2_6_33 is not set
-# CT_KERNEL_V_2_6_32 is not set
-# CT_KERNEL_V_2_6_31 is not set
-# CT_KERNEL_V_2_6_27 is not set
-CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.62.tar.gz"
-CT_KERNEL_windows_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-CT_BINUTILS="binutils"
-CT_BINUTILS_binutils=y
-
-#
-# GNU binutils
-#
-# CT_BINUTILS_V_2_22 is not set
-# CT_BINUTILS_V_2_21_53 is not set
-# CT_BINUTILS_V_2_21_1a is not set
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_HAS_HASH_STYLE=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_FORCE_LD_BFD=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# binutils other options
-#
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.4.7"
-CT_CC_CORE_PASSES_NEEDED=y
-CT_CC_gcc=y
-# CT_CC_GCC_SHOW_LINARO is not set
-# CT_CC_V_4_8_1 is not set
-# CT_CC_V_4_8_0 is not set
-# CT_CC_V_4_7_3 is not set
-# CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_7_1 is not set
-# CT_CC_V_4_7_0 is not set
-# CT_CC_V_4_6_4 is not set
-# CT_CC_V_4_6_3 is not set
-# CT_CC_V_4_6_2 is not set
-# CT_CC_V_4_6_1 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_4_5_3 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-CT_CC_V_4_4_7=y
-# CT_CC_V_4_4_6 is not set
-# CT_CC_V_4_4_5 is not set
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_USE_GRAPHITE=y
-# CT_CC_GCC_USE_LTO is not set
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_USE_GMP_MPFR=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
-CT_CC_STATIC_LIBSTDCXX=y
-# CT_CC_GCC_SYSTEM_ZLIB is not set
-
-#
-# Optimisation features
-#
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-
-#
-# Misc. obscure options.
-#
-# CT_CC_CXA_ATEXIT is not set
-CT_CC_GCC_DISABLE_PCH=y
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-
-#
-# C-library
-#
-CT_LIBC="eglibc"
-CT_LIBC_VERSION="2_15"
-CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_17 is not set
-# CT_LIBC_EGLIBC_V_2_16 is not set
-CT_LIBC_EGLIBC_V_2_15=y
-# CT_LIBC_EGLIBC_V_2_14 is not set
-# CT_LIBC_EGLIBC_V_2_13 is not set
-# CT_LIBC_EGLIBC_V_2_12 is not set
-# CT_LIBC_EGLIBC_V_2_11 is not set
-# CT_LIBC_EGLIBC_V_2_10 is not set
-# CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_TRUNK is not set
-CT_EGLIBC_REVISION="HEAD"
-# CT_EGLIBC_HTTP is not set
-# CT_EGLIBC_CHECKOUT is not set
-CT_EGLIBC_OPT_SIZE=y
-# CT_EGLIBC_CUSTOM_CONFIG is not set
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-CT_LIBC_XLDD=y
-
-#
-# eglibc other options
-#
-CT_LIBC_glibc_familly=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_LIBC_GLIBC_CONFIGPARMS=""
-CT_LIBC_GLIBC_EXTRA_CFLAGS=""
-CT_LIBC_EXTRA_CC_ARGS=""
-# CT_LIBC_DISABLE_VERSIONING is not set
-CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
-# CT_LIBC_GLIBC_USE_PORTS is not set
-CT_LIBC_ADDONS_LIST=""
-# CT_LIBC_LOCALES is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-# CT_GMP_V_5_1_1 is not set
-# CT_GMP_V_5_0_2 is not set
-# CT_GMP_V_5_0_1 is not set
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-# CT_MPFR_V_3_1_2 is not set
-# CT_MPFR_V_3_1_0 is not set
-# CT_MPFR_V_3_0_1 is not set
-# CT_MPFR_V_3_0_0 is not set
-CT_MPFR_V_2_4_2=y
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-CT_PPL_NEEDS_FPERMISSIVE=y
-CT_CLOOG_V_0_15_11=y
-# CT_CLOOG_V_0_15_10 is not set
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.11"
-CT_CLOOG_0_15_1x=y
-CT_CLOOG_NEEDS_AUTORECONF=y
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
Added: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config (rev 0)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -0,0 +1,533 @@
+#
+# Automatically generated make config: don't edit
+# crosstool-NG 1.20.0 Configuration
+# Wed Jan 28 11:32:51 2015
+#
+CT_CONFIGURE_has_make381=y
+CT_CONFIGURE_has_xz=y
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR=""
+CT_WORK_DIR="${CT_TOP_DIR}/.build"
+CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.20.0-3.2/${CT_TARGET}"
+CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
+CT_REMOVE_DOCS=y
+CT_INSTALL_DIR_RO=y
+CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
+
+#
+# Downloading
+#
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+CT_CONNECT_TIMEOUT=10
+# CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+
+#
+# Build behavior
+#
+CT_PARALLEL_JOBS=1
+CT_LOAD=""
+CT_USE_PIPES=y
+CT_EXTRA_CFLAGS_FOR_BUILD=""
+CT_EXTRA_LDFLAGS_FOR_BUILD=""
+CT_EXTRA_CFLAGS_FOR_HOST=""
+CT_EXTRA_LDFLAGS_FOR_HOST=""
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+CT_LOG_INFO=y
+# CT_LOG_EXTRA is not set
+# CT_LOG_ALL is not set
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="INFO"
+# CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_PROGRESS_BAR=y
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+
+#
+# Target options
+#
+CT_ARCH="x86"
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_DEFAULT_32=y
+CT_ARCH_ARCH="i586"
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_32=y
+# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=32
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
+# CT_ARCH_arm is not set
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_m68k is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+CT_ARCH_x86=y
+CT_ARCH_alpha_AVAILABLE=y
+CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_SUFFIX=""
+
+#
+# Generic target options
+#
+# CT_MULTILIB is not set
+CT_ARCH_USE_MMU=y
+
+#
+# Target optimisations
+#
+CT_ARCH_FLOAT=""
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+CT_WANTS_STATIC_LINK=y
+# CT_STATIC_TOOLCHAIN is not set
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="unknown"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+CT_CROSS=y
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
+#
+# Operating System
+#
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="custom"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
+# CT_KERNEL_windows is not set
+CT_KERNEL_bare_metal_AVAILABLE=y
+CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_V_3_15 is not set
+# CT_KERNEL_V_3_14 is not set
+# CT_KERNEL_V_3_13 is not set
+# CT_KERNEL_V_3_12 is not set
+# CT_KERNEL_V_3_11 is not set
+# CT_KERNEL_V_3_10 is not set
+# CT_KERNEL_V_3_9 is not set
+# CT_KERNEL_V_3_8 is not set
+# CT_KERNEL_V_3_7 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5 is not set
+# CT_KERNEL_V_3_4 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2 is not set
+# CT_KERNEL_V_3_1 is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37 is not set
+# CT_KERNEL_V_2_6_36 is not set
+# CT_KERNEL_V_2_6_33 is not set
+# CT_KERNEL_V_2_6_32 is not set
+# CT_KERNEL_V_2_6_31 is not set
+# CT_KERNEL_V_2_6_27 is not set
+CT_KERNEL_LINUX_CUSTOM=y
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.66.tar.gz"
+CT_KERNEL_windows_AVAILABLE=y
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+CT_BINUTILS="binutils"
+CT_BINUTILS_binutils=y
+
+#
+# GNU binutils
+#
+CT_BINUTILS_V_2_22=y
+# CT_BINUTILS_V_2_21_53 is not set
+# CT_BINUTILS_V_2_21_1a is not set
+# CT_BINUTILS_V_2_20_1a is not set
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.22"
+CT_BINUTILS_2_22_or_later=y
+CT_BINUTILS_2_21_or_later=y
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
+CT_BINUTILS_HAS_GOLD=y
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PLUGINS=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
+CT_BINUTILS_FORCE_LD_BFD=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+# CT_BINUTILS_LINKER_GOLD_LD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
+# CT_BINUTILS_PLUGINS is not set
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
+
+#
+# binutils other options
+#
+
+#
+# C-library
+#
+CT_LIBC="eglibc"
+CT_LIBC_VERSION="2_18"
+CT_LIBC_eglibc=y
+# CT_LIBC_glibc is not set
+# CT_LIBC_musl is not set
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
+CT_THREADS="nptl"
+CT_LIBC_EGLIBC_V_2_18=y
+# CT_LIBC_EGLIBC_V_2_17 is not set
+# CT_LIBC_EGLIBC_V_2_16 is not set
+# CT_LIBC_EGLIBC_V_2_15 is not set
+# CT_LIBC_EGLIBC_V_2_14 is not set
+# CT_LIBC_EGLIBC_V_2_13 is not set
+# CT_LIBC_EGLIBC_V_2_12 is not set
+# CT_LIBC_EGLIBC_V_2_11 is not set
+# CT_LIBC_EGLIBC_V_2_10 is not set
+# CT_LIBC_EGLIBC_V_2_9 is not set
+# CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_LIBC_EGLIBC_2_16_or_later=y
+CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_HTTP is not set
+# CT_EGLIBC_CHECKOUT is not set
+CT_EGLIBC_OPT_SIZE=y
+# CT_EGLIBC_CUSTOM_CONFIG is not set
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_musl_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_THREADS_NATIVE=y
+
+#
+# Common C library options
+#
+CT_THREADS_NATIVE=y
+CT_LIBC_XLDD=y
+
+#
+# eglibc other options
+#
+# CT_LIBC_GLIBC_PORTS_EXTERNAL is not set
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
+CT_LIBC_GLIBC_CONFIGPARMS=""
+CT_LIBC_GLIBC_EXTRA_CFLAGS=""
+CT_LIBC_EXTRA_CC_ARGS=""
+# CT_LIBC_DISABLE_VERSIONING is not set
+CT_LIBC_OLDEST_ABI=""
+CT_LIBC_GLIBC_FORCE_UNWIND=y
+# CT_LIBC_GLIBC_USE_PORTS is not set
+CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_LOCALES is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
+CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
+
+#
+# C compiler
+#
+CT_CC="gcc"
+CT_CC_VERSION="4.8.3"
+CT_CC_CORE_PASSES_NEEDED=y
+CT_CC_CORE_PASS_1_NEEDED=y
+CT_CC_CORE_PASS_2_NEEDED=y
+CT_CC_gcc=y
+# CT_CC_GCC_SHOW_LINARO is not set
+# CT_CC_V_4_9_1 is not set
+# CT_CC_V_4_9_0 is not set
+CT_CC_V_4_8_3=y
+# CT_CC_V_4_8_2 is not set
+# CT_CC_V_4_8_1 is not set
+# CT_CC_V_4_8_0 is not set
+# CT_CC_V_4_7_4 is not set
+# CT_CC_V_4_7_3 is not set
+# CT_CC_V_4_7_2 is not set
+# CT_CC_V_4_7_1 is not set
+# CT_CC_V_4_7_0 is not set
+# CT_CC_V_4_6_4 is not set
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+# CT_CC_V_4_4_7 is not set
+# CT_CC_V_4_4_6 is not set
+# CT_CC_V_4_4_5 is not set
+# CT_CC_V_4_4_4 is not set
+# CT_CC_V_4_4_3 is not set
+# CT_CC_V_4_4_2 is not set
+# CT_CC_V_4_4_1 is not set
+# CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
+# CT_CC_V_4_3_5 is not set
+# CT_CC_V_4_3_4 is not set
+# CT_CC_V_4_3_3 is not set
+# CT_CC_V_4_3_2 is not set
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_2_4 is not set
+# CT_CC_V_4_2_2 is not set
+CT_CC_GCC_4_2_or_later=y
+CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6_or_later=y
+CT_CC_GCC_4_7_or_later=y
+CT_CC_GCC_4_8=y
+CT_CC_GCC_4_8_or_later=y
+CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
+# CT_CC_GCC_USE_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
+CT_CC_GCC_HAS_LNK_HASH_STYLE=y
+CT_CC_GCC_USE_GMP_MPFR=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
+CT_CC_GCC_HAS_LIBSANITIZER=y
+# CT_CC_LANG_FORTRAN is not set
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_JAVA=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+CT_CC_SUPPORT_GOLANG=y
+
+#
+# Additional supported languages:
+#
+CT_CC_LANG_CXX=y
+# CT_CC_LANG_JAVA is not set
+
+#
+# gcc other options
+#
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_SYSTEM_ZLIB is not set
+
+#
+# Optimisation features
+#
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
+# CT_CC_GCC_LIBSANITIZER is not set
+
+#
+# Misc. obscure options.
+#
+# CT_CC_CXA_ATEXIT is not set
+CT_CC_GCC_DISABLE_PCH=y
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
+CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y
+# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set
+# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set
+# CT_CC_GCC_LNK_HASH_STYLE_BOTH is not set
+CT_CC_GCC_LNK_HASH_STYLE=""
+CT_CC_GCC_DEC_FLOAT_AUTO=y
+# CT_CC_GCC_DEC_FLOAT_BID is not set
+# CT_CC_GCC_DEC_FLOAT_DPD is not set
+# CT_CC_GCC_DEC_FLOATS_NO is not set
+
+#
+# Debug facilities
+#
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
+# CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
+
+#
+# Companion libraries
+#
+CT_COMPLIBS_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_ISL_NEEDED=y
+CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
+CT_COMPLIBS=y
+CT_GMP=y
+CT_MPFR=y
+CT_ISL=y
+CT_CLOOG=y
+CT_MPC=y
+CT_GMP_V_5_1_3=y
+# CT_GMP_V_5_1_1 is not set
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
+# CT_GMP_V_4_3_2 is not set
+# CT_GMP_V_4_3_1 is not set
+# CT_GMP_V_4_3_0 is not set
+CT_GMP_VERSION="5.1.3"
+CT_MPFR_V_3_1_2=y
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
+# CT_MPFR_V_3_0_0 is not set
+# CT_MPFR_V_2_4_2 is not set
+# CT_MPFR_V_2_4_1 is not set
+# CT_MPFR_V_2_4_0 is not set
+CT_MPFR_VERSION="3.1.2"
+CT_ISL_V_0_12_2=y
+# CT_ISL_V_0_11_1 is not set
+CT_ISL_VERSION="0.12.2"
+CT_CLOOG_V_0_18_1=y
+# CT_CLOOG_V_0_18_0 is not set
+CT_CLOOG_VERSION="0.18.1"
+CT_CLOOG_0_18_or_later=y
+CT_MPC_V_1_0_2=y
+# CT_MPC_V_1_0_1 is not set
+# CT_MPC_V_1_0 is not set
+# CT_MPC_V_0_9 is not set
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="1.0.2"
+
+#
+# Companion libraries common options
+#
+# CT_COMPLIBS_CHECK is not set
+
+#
+# Companion tools
+#
+
+#
+# READ HELP before you say 'Y' below !!!
+#
+# CT_COMP_TOOLS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/initrd.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/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
Added: branches/1.0/package/busybox/busybox-sys-resource.patch
===================================================================
--- branches/1.0/package/busybox/busybox-sys-resource.patch (rev 0)
+++ branches/1.0/package/busybox/busybox-sys-resource.patch 2015-01-28 23:34:11 UTC (rev 6949)
@@ -0,0 +1,122 @@
+From 5a5dfcad6ba96d12d68bd7b39279215a8fee70d3 Mon Sep 17 00:00:00 2001
+From: Tias Guns <ti...@ul...>
+Date: Sun, 10 Jun 2012 14:19:01 +0200
+Subject: [PATCH] inetd: fix build failure in Android
+
+Signed-off-by: Tias Guns <ti...@ul...>
+Signed-off-by: Denys Vlasenko <vda...@go...>
+(cherry picked from commit 64f763b42a43cbf36e401690ff6767c25575e520)
+---
+ networking/inetd.c | 1 +
+ 1 file changed, 1 insertion(+)
+--
+1.7.12
+
+From 246ea72843d5b7e9d4cd902dc5e9d71359196303 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <va...@ge...>
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header. This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <va...@ge...>
+(cherry picked from commit c5fe9f7b723f949457263ef8e22ab807d5b549ce)
+---
+ loginutils/passwd.c | 1 +
+ miscutils/time.c | 1 +
+ networking/inetd.c | 1 +
+ networking/ntpd.c | 1 +
+ networking/ntpd_simple.c | 1 +
+ runit/chpst.c | 1 +
+ shell/shell_common.c | 1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage: "\n -v Verbose"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+
+ /* Information on the resources used by a child process. */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,8 @@
+ //usage: "\n (default: 0 - disabled)"
+
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
++#include <sys/socket.h> /* un.h may need this */
+ #include <sys/un.h>
+
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 603801e..b885215 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+ */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage: "\n a SIGXCPU after N seconds"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+ */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+
+--
+1.7.12
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.62 Kernel Configuration
+# Linux/i386 3.2.66 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -335,6 +335,7 @@
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_VM86=y
+# CONFIG_X86_16BIT is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_REBOOTFIXUPS=y
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/project/astlinux/geni586/linux.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.62 Kernel Configuration
+# Linux/i386 3.2.66 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -325,6 +325,7 @@
# CONFIG_X86_MCE_INJECT is not set
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_VM86=y
+# CONFIG_X86_16BIT is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_REBOOTFIXUPS=y
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-27 00:36:08 UTC (rev 6948)
+++ branches/1.0/runnix.config 2015-01-28 23:34:11 UTC (rev 6949)
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/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
@@ -800,7 +800,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.66.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...> - 2015-01-30 00:12:43
|
Revision: 6955
http://sourceforge.net/p/astlinux/code/6955
Author: abelbeck
Date: 2015-01-30 00:12:41 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
dropbear, version bump to 2015.67 for RUNNUX use
Modified Paths:
--------------
branches/1.0/package/dropbear/Config.in
branches/1.0/package/dropbear/dropbear.mk
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix/target_skeleton/runnix
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Removed Paths:
-------------
branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch
Modified: branches/1.0/package/dropbear/Config.in
===================================================================
--- branches/1.0/package/dropbear/Config.in 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/Config.in 2015-01-30 00:12:41 UTC (rev 6955)
@@ -6,9 +6,10 @@
http://matt.ucc.asn.au/dropbear/dropbear.html
+if BR2_PACKAGE_DROPBEAR
+
config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS
bool "disable reverse DNS lookups"
- depends on BR2_PACKAGE_DROPBEAR
help
Disable reverse DNS lookups on connection. This can be handy
on systems without working DNS, as connections otherwise
@@ -17,9 +18,10 @@
config BR2_PACKAGE_DROPBEAR_SMALL
bool "optimize for size"
default y
- depends on BR2_PACKAGE_DROPBEAR
help
Compile dropbear for the smallest possible binary size.
Tradeoffs are slower hashes and ciphers, and disabling of the
blowfish cipher and zlib.
+
+endif
Deleted: branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch
===================================================================
--- branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch 2015-01-30 00:12:41 UTC (rev 6955)
@@ -1,11 +0,0 @@
-diff -ur dropbear-0.48/includes.h dropbear-0.48-patched/includes.h
---- dropbear-0.48/includes.h 2006-03-09 09:06:02.000000000 -0600
-+++ dropbear-0.48-patched/includes.h 2006-03-15 22:36:12.000000000 -0600
-@@ -35,6 +35,7 @@
- #include <sys/param.h> /* required for BSD4_4 define */
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#define _GNU_SOURCE
- #include <sys/time.h>
- #include <sys/un.h>
- #include <sys/wait.h>
Modified: branches/1.0/package/dropbear/dropbear.mk
===================================================================
--- branches/1.0/package/dropbear/dropbear.mk 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/dropbear.mk 2015-01-30 00:12:41 UTC (rev 6955)
@@ -4,12 +4,13 @@
#
#############################################################
-DROPBEAR_VERSION = 2012.55
-DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
+DROPBEAR_VERSION = 2015.67
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
- PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
+DROPBEAR_MAKE = \
+ $(MAKE) MULTI=1 SCPPROGRESS=1 \
+ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
ifeq ($(BR2_PREFER_STATIC_LIB),y)
DROPBEAR_MAKE += STATIC=1
@@ -21,21 +22,23 @@
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
-define DROPBEAR_DISABLE_REVERSE_DNS
- $(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
+define DROPBEAR_ENABLE_REVERSE_DNS
+ $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
endef
define DROPBEAR_BUILD_SMALL
- echo "#define DROPBEAR_SMALL_CODE" >>$(@D)/options.h
- echo "#define NO_FAST_EXPTMOD" >>$(@D)/options.h
+ $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
endef
define DROPBEAR_BUILD_FEATURED
- echo "#define DROPBEAR_BLOWFISH" >>$(@D)/options.h
+ $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
endef
-ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
+ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
endif
ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
@@ -55,12 +58,13 @@
for f in $(DROPBEAR_TARGET_BINS); do \
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \
done
+ ln -snf /tmp/etc/dropbear $(TARGET_DIR)/etc/dropbear
endef
define DROPBEAR_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/dropbear
+ rm -f $(TARGET_DIR)/etc/dropbear
rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(DROPBEAR_TARGET_BINS))
- rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
endef
$(eval $(call AUTOTARGETS,package,dropbear))
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/project/runnix/geni586/linux.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.62 Kernel Configuration
+# Linux/i386 3.2.66 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -312,6 +312,7 @@
# CONFIG_X86_ANCIENT_MCE is not set
# CONFIG_X86_MCE_INJECT is not set
CONFIG_VM86=y
+# CONFIG_X86_16BIT is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_REBOOTFIXUPS=y
Modified: branches/1.0/project/runnix/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix/target_skeleton/runnix 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/project/runnix/target_skeleton/runnix 2015-01-30 00:12:41 UTC (rev 6955)
@@ -62,15 +62,18 @@
if [ -n "$SSHPORT" ]; then
mount -t devpts devpts /dev/pts
+ mkdir /tmp/etc/dropbear
+
echo "Generating keys..."
- dropbearkey -t rsa -f /tmp/rsa_key -s 1024
- dropbearkey -t dss -f /tmp/dss_key -s 1024
+ dropbearkey -t rsa -f /tmp/etc/dropbear/dropbear_rsa_host_key -s 1024
+ dropbearkey -t dss -f /tmp/etc/dropbear/dropbear_dss_host_key -s 1024
+ dropbearkey -t ecdsa -f /tmp/etc/dropbear/dropbear_ecdsa_host_key
touch /var/log/lastlog
touch /var/log/wtmp
echo "Starting SSH..."
- dropbear -d /tmp/dss_key -r /tmp/rsa_key -E -P /tmp/dropbear.pid -p $SSHPORT
+ dropbear -E -P /tmp/dropbear.pid -p $SSHPORT
myipv4="$(ip -o addr show dev "$NDEV" 2>/dev/null | awk '$3 == "inet" { split($4, field, "/"); print field[1]; }')"
if [ -n "$myipv4" ]; then
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/runnix-uclibc.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -855,7 +855,7 @@
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
BR2_PACKAGE_DROPBEAR_SMALL=y
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/runnix.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -603,7 +603,7 @@
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
BR2_PACKAGE_DROPBEAR_SMALL=y
# BR2_PACKAGE_EBTABLES is not set
# BR2_PACKAGE_ETHTOOL is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-08 01:09:41
|
Revision: 6966
http://sourceforge.net/p/astlinux/code/6966
Author: abelbeck
Date: 2015-02-08 01:09:32 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
php, major version bump to 5.5.21
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/lighttpd/php.ini.conf
branches/1.0/package/php/Config.ext
branches/1.0/package/php/Config.in
branches/1.0/package/php/php.mk
Added Paths:
-----------
branches/1.0/package/php/php-0000-gcc-version-test.patch
branches/1.0/package/php/php-0001-no-iconv-search.patch
branches/1.0/package/php/php-0002-dlopen.patch
branches/1.0/package/php/php-0003-disable-pharcmd.patch
Removed Paths:
-------------
branches/1.0/package/php/php-gcc-version-test.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux-ast11.config 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:58 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb 7 17:51:44 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -455,19 +455,19 @@
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
#
# PHP Extensions
#
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
# BR2_PACKAGE_PHP_EXT_GMP is not set
BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
# BR2_PACKAGE_PHP_EXT_PCNTL is not set
# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
BR2_PACKAGE_PHP_EXT_FILTER=y
# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
#
# Database extensions
#
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux-ast13.config 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:59 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb 7 17:52:06 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -455,19 +455,19 @@
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
#
# PHP Extensions
#
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
# BR2_PACKAGE_PHP_EXT_GMP is not set
BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
# BR2_PACKAGE_PHP_EXT_PCNTL is not set
# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
BR2_PACKAGE_PHP_EXT_FILTER=y
# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
#
# Database extensions
#
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux18.config 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:58 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb 7 17:51:39 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -455,19 +455,19 @@
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
#
# PHP Extensions
#
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
# BR2_PACKAGE_PHP_EXT_GMP is not set
BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
# BR2_PACKAGE_PHP_EXT_PCNTL is not set
# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
BR2_PACKAGE_PHP_EXT_FILTER=y
# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
#
# Database extensions
#
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY is not set
Modified: branches/1.0/package/lighttpd/php.ini.conf
===================================================================
--- branches/1.0/package/lighttpd/php.ini.conf 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/lighttpd/php.ini.conf 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,6 +1,6 @@
display_errors = Off
display_startup_errors = Off
-error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED
+error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT
log_errors = Off
error_log = syslog
@@ -14,6 +14,3 @@
date.timezone = @TIMEZONE@
-; Required for PHP 5.3 and earlier
-magic_quotes_gpc = Off
-
Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/Config.ext 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,12 +1,5 @@
menu "PHP Extensions"
-config BR2_PACKAGE_PHP_CONFIG
- string "PHP configuration file to use"
- default "$(PHP_DIR)/php.ini-dist"
- help
- If you want to use a different php.ini file define it here.
- Otherwise it'll just copy the default php.ini-dist from PHP.
-
config BR2_PACKAGE_PHP_EXT_SOCKETS
bool "socket"
help
@@ -18,18 +11,18 @@
help
POSIX support
-config BR2_PACKAGE_PHP_EXT_SPL
- bool "SPL"
- default y
- help
- Standard PHP library support
-
config BR2_PACKAGE_PHP_EXT_SESSION
bool "Session"
default y
help
Session support
+config BR2_PACKAGE_PHP_EXT_HASH
+ bool "hash"
+ default y
+ help
+ HASH message digest framework
+
config BR2_PACKAGE_PHP_EXT_OPENSSL
bool "openssl"
select BR2_PACKAGE_OPENSSL
@@ -99,23 +92,19 @@
help
JavaScript Object Serialization support
+config BR2_PACKAGE_PHP_EXT_TOKENIZER
+ bool "tokenizer"
+ default y
+ help
+ Tokenizer functions support
+
config BR2_PACKAGE_PHP_EXT_READLINE
bool "readline"
- depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_READLINE
help
readline support
-config BR2_PACKAGE_PHP_EXT_NCURSES
- bool "ncurses"
- depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
- help
- ncurses support
-
-config BR2_PACKAGE_PHP_EXT_PCRE
- bool "PCRE"
- help
- Perl Compatible Regular Expressions support
-
config BR2_PACKAGE_PHP_EXT_PCNTL
bool "PCNTL"
help
@@ -141,9 +130,14 @@
help
Zip read/write support
+config BR2_PACKAGE_PHP_EXT_CTYPE
+ bool "ctype"
+ default y
+ help
+ Character type checking support
+
config BR2_PACKAGE_PHP_EXT_FILTER
bool "filter"
- select BR2_PACKAGE_PHP_EXT_PCRE
help
Input filter support
@@ -154,17 +148,6 @@
comment "Database extensions"
-config BR2_PACKAGE_PHP_EXT_SQLITE
- bool "SQLite"
- help
- Legacy SQLite2 support
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
- bool "sqlite UTF8 support"
- depends on BR2_PACKAGE_PHP_EXT_SQLITE
- help
- UTF8 Support for sqlite
-
config BR2_PACKAGE_PHP_EXT_PDO
bool "PDO"
help
@@ -173,16 +156,10 @@
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
bool "PDO_SQLite"
depends on BR2_PACKAGE_PHP_EXT_PDO
+ select BR2_PACKAGE_SQLITE
help
SQLite driver for PDO
-config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
- bool "PDO_SQLite external"
- depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE
- select BR2_PACKAGE_SQLITE
- help
- Use external sqlite3 library
-
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
bool "PDO_MySQL"
depends on BR2_PACKAGE_PHP_EXT_PDO
Modified: branches/1.0/package/php/Config.in
===================================================================
--- branches/1.0/package/php/Config.in 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/Config.in 2015-02-08 01:09:32 UTC (rev 6966)
@@ -10,44 +10,53 @@
if BR2_PACKAGE_PHP
config BR2_PACKAGE_PHP_CLI
- bool
+ bool
config BR2_PACKAGE_PHP_CGI
- bool
+ bool
+config BR2_PACKAGE_PHP_FPM
+ bool
+
choice
- prompt "PHP interface"
- default BR2_PACKAGE_PHP_SAPI_CGI
- help
- Select the PHP interface(s).
+ prompt "PHP interface"
+ default BR2_PACKAGE_PHP_SAPI_CGI
+ help
+ Select the PHP interface(s).
+config BR2_PACKAGE_PHP_SAPI_CGI
+ bool "cgi interface"
+ select BR2_PACKAGE_PHP_CGI
+ help
+ Common Gateway Interface
+
config BR2_PACKAGE_PHP_SAPI_CLI
- bool "cli interface"
+ bool "cli interface"
select BR2_PACKAGE_PHP_CLI
- help
- Command line interface for PHP.
+ help
+ Command Line Interface
-config BR2_PACKAGE_PHP_SAPI_CGI
- bool "cgi interface"
- select BR2_PACKAGE_PHP_CGI
- help
- CGI interface for PHP.
+config BR2_PACKAGE_PHP_SAPI_FPM
+ bool "fpm interface"
+ select BR2_PACKAGE_PHP_FPM
+ help
+ PHP-FPM (FastCGI Process Manager)
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
- bool "cli and cgi interfaces"
+ bool "cli and cgi interfaces"
select BR2_PACKAGE_PHP_CLI
select BR2_PACKAGE_PHP_CGI
help
- Command line and CGI interfaces for PHP.
+ Command line and Common gateway interfaces
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+ bool "cli and fpm interfaces"
+ select BR2_PACKAGE_PHP_CLI
+ select BR2_PACKAGE_PHP_FPM
+ help
+ Command line and PHP-FPM (FastCGI Process Manager)
+
endchoice
-config BR2_PACKAGE_PHP_FASTCGI
- bool "fastcgi"
- depends on BR2_PACKAGE_PHP_CGI
- default y
- help
- fast cgi interface for php
-
source "package/php/Config.ext"
endif
Added: branches/1.0/package/php/php-0000-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-0000-gcc-version-test.patch (rev 0)
+++ branches/1.0/package/php/php-0000-gcc-version-test.patch 2015-02-08 01:09:32 UTC (rev 6966)
@@ -0,0 +1,11 @@
+--- php-5.3.22/configure.orig 2013-03-17 14:56:49.000000000 -0500
++++ php-5.3.22/configure 2013-03-17 14:58:16.000000000 -0500
+@@ -5454,7 +5454,7 @@
+ GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'`
+ ;;
+ *)
+- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'`
++ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
+ ;;
+ esac
+ if test $GCC_MAJOR_VERSION -ge 4; then
Added: branches/1.0/package/php/php-0001-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0001-no-iconv-search.patch (rev 0)
+++ branches/1.0/package/php/php-0001-no-iconv-search.patch 2015-02-08 01:09:32 UTC (rev 6966)
@@ -0,0 +1,65 @@
+Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
+PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
+test instead of AC_TRY_LINK to find headers which is bad,
+specially when adding /usr and /usr/local to the mix.
+Do basically the same with ext/iconv/config.m4 by tweaking
+PHP_ICONV_H_PATH which, again, uses test and absolute paths.
+And all this directly in configure since autoreconf isn't
+happy with php.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
+--- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300
++++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300
+@@ -45929,12 +45929,6 @@
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "INCLUDEPATH$unique=set"
+
+- if test ""; then
+- INCLUDES="-I$ai_p $INCLUDES"
+- else
+- INCLUDES="$INCLUDES -I$ai_p"
+- fi
+-
+ fi
+
+ fi
+@@ -45964,14 +45958,7 @@
+ PHP_ICONV_PREFIX="$ICONV_DIR"
+ fi
+
+- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+-
+- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
+- else
+- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
+- fi
++ PHP_ICONV_H_PATH="iconv.h"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
+ $as_echo_n "checking if iconv is glibc's... " >&6; }
+@@ -46369,8 +46356,6 @@
+ ext_builddir=ext/iconv
+ ext_srcdir=$abs_srcdir/ext/iconv
+
+- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
+-
+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+ PHP_ICONV_SHARED=no
+
+@@ -97595,12 +97580,6 @@
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "INCLUDEPATH$unique=set"
+
+- if test ""; then
+- INCLUDES="-I$ai_p $INCLUDES"
+- else
+- INCLUDES="$INCLUDES -I$ai_p"
+- fi
+-
+ fi
+
+ fi
Added: branches/1.0/package/php/php-0002-dlopen.patch
===================================================================
--- branches/1.0/package/php/php-0002-dlopen.patch (rev 0)
+++ branches/1.0/package/php/php-0002-dlopen.patch 2015-02-08 01:09:32 UTC (rev 6966)
@@ -0,0 +1,25 @@
+PHP can't be AUTORECONF with any modern autotools and the dl tests are
+pretty bad for cross-compilation, so just kill the needed ac_cv value unsets
+so they can flow through from the package makefile.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.5.8.orig/configure php-5.5.8/configure
+--- php-5.5.8.orig/configure 2014-01-28 17:41:33.943851727 -0300
++++ php-5.5.8/configure 2014-01-28 17:42:53.785493795 -0300
+@@ -17153,7 +17153,6 @@
+
+
+
+- unset ac_cv_func_dlopen
+ unset ac_cv_func___dlopen
+ unset found
+
+@@ -17181,7 +17180,6 @@
+
+ *)
+
+- unset ac_cv_lib_dl_dlopen
+ unset ac_cv_lib_dl___dlopen
+ unset found
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
Added: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch (rev 0)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch 2015-02-08 01:09:32 UTC (rev 6966)
@@ -0,0 +1,26 @@
+Disable the 'phar' command-line tool build/installation since it requires
+php to run and pack up phar itself in phar format. This would require
+a host-php instance and really probably nobody needs the phar tool
+on the target.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.5.14.orig/configure php-5.5.14/configure
+--- php-5.5.14.orig/configure 2014-07-08 09:52:52.657753194 -0300
++++ php-5.5.14/configure 2014-07-08 09:53:07.610243933 -0300
+@@ -113130,13 +113130,8 @@
+ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
+ CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
+
+-if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
+- pharcmd=pharcmd
+- pharcmd_install=install-pharcmd
+-else
+- pharcmd=
+- pharcmd_install=
+-fi;
++pharcmd=
++pharcmd_install=
+
+ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+ install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
Deleted: branches/1.0/package/php/php-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-gcc-version-test.patch 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/php-gcc-version-test.patch 2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,11 +0,0 @@
---- php-5.3.22/configure.orig 2013-03-17 14:56:49.000000000 -0500
-+++ php-5.3.22/configure 2013-03-17 14:58:16.000000000 -0500
-@@ -3200,7 +3200,7 @@
- GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'`
- ;;
- *)
-- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'`
-+ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
- ;;
- esac
- if test $GCC_MAJOR_VERSION -ge 4; then
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/php.mk 2015-02-08 01:09:32 UTC (rev 6966)
@@ -4,56 +4,62 @@
#
#############################################################
-PHP_VERSION = 5.3.29
-PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
+PHP_VERSION = 5.5.21
PHP_SITE = http://www.php.net/distributions
+PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
-PHP_LIBTOOL_PATCH = NO
-PHP_CONF_OPT = --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --disable-all \
- --without-pear \
- --without-iconv \
- --without-gd \
- --enable-ctype \
- --enable-hash \
- --enable-tokenizer \
- --with-config-file-path=/etc \
- --localstatedir=/var
+PHP_DEPENDENCIES = host-pkg-config
+PHP_CONF_OPT = \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-all \
+ --without-pear \
+ --without-iconv \
+ --with-config-file-path=/etc \
+ --localstatedir=/var \
+ --disable-rpath
-PHP_CFLAGS = $(TARGET_CFLAGS)
+PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
-ifneq ($(BR2_PACKAGE_PHP_CLI),y)
- PHP_CONF_OPT += --disable-cli
+ifeq ($(BR2_ENDIAN),"BIG")
+PHP_CONF_ENV += ac_cv_c_bigendian_php=yes
else
- PHP_CONF_OPT += --enable-cli
+PHP_CONF_ENV += ac_cv_c_bigendian_php=no
endif
-ifneq ($(BR2_PACKAGE_PHP_CGI),y)
- PHP_CONF_OPT += --disable-cgi
-else
- PHP_CONF_OPT += --enable-cgi
-endif
+PHP_CFLAGS = $(TARGET_CFLAGS)
-### Extensions
-ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
- PHP_CONF_OPT += --enable-sockets
-endif
+# We need to force dl "detection"
+PHP_CONF_ENV += ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes
+PHP_EXTRA_LIBS += -ldl
-ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
- PHP_CONF_OPT += --enable-posix
-endif
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
-ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
- PHP_CONF_OPT += --enable-spl
-endif
+### Extensions
+PHP_CONF_OPT += \
+ $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+ $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
+ $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
+ $(if $(BR2_PACKAGE_PHP_EXT_XMLPARSER),--enable-xml) \
+ $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
+ $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
+ $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
+ $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
+ $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
+ $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
+ $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+ $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
+ $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
+ $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar)
-ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
- PHP_CONF_OPT += --enable-session
-endif
-
ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += openssl
@@ -70,27 +76,11 @@
PHP_DEPENDENCIES += libxml2
endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_XMLPARSER),y)
- PHP_CONF_OPT += --enable-xml
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
- PHP_CONF_OPT += --enable-simplexml
-endif
-
ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += zlib
endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
- PHP_CONF_OPT += --enable-exif
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
- PHP_CONF_OPT += --enable-ftp
-endif
-
ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
@@ -101,73 +91,17 @@
PHP_DEPENDENCIES += gmp
endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
- PHP_CONF_OPT += --enable-json
-endif
-
ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += readline
endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
- PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr
- PHP_DEPENDENCIES += ncurses
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y)
- PHP_CONF_OPT += --enable-pcntl
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
- PHP_CONF_OPT += --enable-sysvmsg
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
- PHP_CONF_OPT += --enable-sysvsem
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
- PHP_CONF_OPT += --enable-sysvshm
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
- PHP_CONF_OPT += --enable-zip
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
- PHP_CONF_OPT += --enable-filter
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y)
- PHP_CONF_OPT += --enable-calendar
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y)
- PHP_CONF_OPT += --with-pcre-regex
-endif
-
-### Legacy sqlite2 support
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
- PHP_CONF_OPT += --with-sqlite
-ifneq ($(BR2_LARGEFILE),y)
- PHP_CFLAGS += -DSQLITE_DISABLE_LFS
-endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
- PHP_CONF_OPT += --enable-sqlite-utf8
-endif
-endif
-
### PDO
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
PHP_CONF_OPT += --enable-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
-ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += sqlite
-else
- PHP_CONF_OPT += --with-pdo-sqlite
-endif
PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
ifneq ($(BR2_LARGEFILE),y)
PHP_CFLAGS += -DSQLITE_DISABLE_LFS
@@ -179,6 +113,12 @@
endif
endif
+### Use external PCRE if it's available
+ifeq ($(BR2_PACKAGE_PCRE),y)
+ PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr
+ PHP_DEPENDENCIES += pcre
+endif
+
### LDAP
ifeq ($(BR2_PACKAGE_OPENLDAP),y)
PHP_CONF_OPT += --with-ldap=$(STAGING_DIR)/usr
@@ -190,6 +130,10 @@
$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
-e 's%^exec_prefix="/usr"%exec_prefix="$(STAGING_DIR)/usr"%' \
$(STAGING_DIR)/usr/bin/php-config
+ $(SED) "/prefix/ s:/usr:$(STAGING_DIR)/usr:" \
+ $(STAGING_DIR)/usr/bin/phpize
+ $(SED) "/extension_dir/ s:/usr:$(TARGET_DIR)/usr:" \
+ $(STAGING_DIR)/usr/bin/php-config
endef
PHP_POST_INSTALL_STAGING_HOOKS += PHP_FIXUP_PHP_CONFIG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-08 01:46:37
|
Revision: 6967
http://sourceforge.net/p/astlinux/code/6967
Author: abelbeck
Date: 2015-02-08 01:46:34 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
Fix for PHP scripts called via the command line that use 'argv' super-global variable, a bug added after PHP 5.3 seems to not properly setup if a super-global variable is not referenced (even not executed). The problem occurs when 'getopt' is used and 'argv' is required, the fix is a good general solution.
Ref: http://stackoverflow.com/questions/23911924/override-argv-for-getopt
Modified Paths:
--------------
branches/1.0/package/openldap/scripts/ldap-phone-name-lookup
branches/1.0/package/openldap/scripts/ldap-phone-num-lookup
branches/1.0/package/openldap/vcard-export
branches/1.0/project/astlinux/target_skeleton/bin/ldate
Modified: branches/1.0/package/openldap/scripts/ldap-phone-name-lookup
===================================================================
--- branches/1.0/package/openldap/scripts/ldap-phone-name-lookup 2015-02-08 01:09:32 UTC (rev 6966)
+++ branches/1.0/package/openldap/scripts/ldap-phone-name-lookup 2015-02-08 01:46:34 UTC (rev 6967)
@@ -1,5 +1,8 @@
#!/usr/bin/php -qC
<?php
+if (! isset($argv)) {
+ $argv = $_SERVER['argv'];
+}
// Function: LDAP_Client
//
Modified: branches/1.0/package/openldap/scripts/ldap-phone-num-lookup
===================================================================
--- branches/1.0/package/openldap/scripts/ldap-phone-num-lookup 2015-02-08 01:09:32 UTC (rev 6966)
+++ branches/1.0/package/openldap/scripts/ldap-phone-num-lookup 2015-02-08 01:46:34 UTC (rev 6967)
@@ -1,5 +1,8 @@
#!/usr/bin/php -qC
<?php
+if (! isset($argv)) {
+ $argv = $_SERVER['argv'];
+}
// Function: LDAP_Client
//
Modified: branches/1.0/package/openldap/vcard-export
===================================================================
--- branches/1.0/package/openldap/vcard-export 2015-02-08 01:09:32 UTC (rev 6966)
+++ branches/1.0/package/openldap/vcard-export 2015-02-08 01:46:34 UTC (rev 6967)
@@ -1,5 +1,8 @@
#!/usr/bin/php -qC
<?php
+if (! isset($argv)) {
+ $argv = $_SERVER['argv'];
+}
//AstLinux// Adapted for AstLinux - 10-11-2013 by Lonnie Abelbeck
//AstLinux// Single shared file vcard-parse-convert.php, use name "vcard-export"
Modified: branches/1.0/project/astlinux/target_skeleton/bin/ldate
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/bin/ldate 2015-02-08 01:09:32 UTC (rev 6966)
+++ branches/1.0/project/astlinux/target_skeleton/bin/ldate 2015-02-08 01:46:34 UTC (rev 6967)
@@ -1,5 +1,8 @@
#!/usr/bin/php -qC
<?php
+if (! isset($argv)) {
+ $argv = $_SERVER['argv'];
+}
$loc_file = '/usr/lib/locale/.locale';
$format = '%c';
$date_string = '';
@@ -63,7 +66,7 @@
echo "$usage\n";
exit(0);
} elseif ($argv[$i] === '--version') {
- echo "ldate: v1.0.0\n";
+ echo "ldate: v1.0.1\n";
exit(0);
} elseif ($argv[$i] === '-d' && isset($argv[$i+1])) {
$date_string = $argv[++$i];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-02-27 17:48:52
|
Revision: 6990
http://sourceforge.net/p/astlinux/code/6990
Author: abelbeck
Date: 2015-02-27 17:48:43 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
miniupnpd, version bump to 1.9.20141209
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/miniupnpd/Config.in
branches/1.0/package/miniupnpd/miniupnpd.init
branches/1.0/package/miniupnpd/miniupnpd.mk
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/libnfnetlink/
branches/1.0/package/libnfnetlink/Config.in
branches/1.0/package/libnfnetlink/libnfnetlink.mk
Removed Paths:
-------------
branches/1.0/package/miniupnpd/miniupnpd-config.patch
branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast11.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:51:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux-ast13.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:52:06 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:11 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
BR2_PACKAGE_PJSIP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/astlinux18.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6965-dirty Configuration
-# Sat Feb 7 17:51:39 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:10 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -604,6 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+BR2_PACKAGE_LIBNFNETLINK=y
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/initrd.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:55 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:56 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -489,6 +489,7 @@
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -370,6 +370,7 @@
source "package/neon/Config.in"
source "package/libmnl/Config.in"
source "package/libnet/Config.in"
+source "package/libnfnetlink/Config.in"
source "package/libnl/Config.in"
source "package/libpcap/Config.in"
source "package/pjsip/Config.in"
Added: branches/1.0/package/libnfnetlink/Config.in
===================================================================
--- branches/1.0/package/libnfnetlink/Config.in (rev 0)
+++ branches/1.0/package/libnfnetlink/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBNFNETLINK
+ bool "libnfnetlink"
+ help
+ libnfnetlink is the low-level library for netfilter related
+ kernel/userspace communication.
+ It provides a generic messaging infrastructure for in-kernel
+ netfilter subsystems (such as nfnetlink_log, nfnetlink_queue,
+ nfnetlink_conntrack) and their respective users
+ and/or management tools in userspace.
+
+ http://www.netfilter.org/projects/libnfnetlink/
+
Added: branches/1.0/package/libnfnetlink/libnfnetlink.mk
===================================================================
--- branches/1.0/package/libnfnetlink/libnfnetlink.mk (rev 0)
+++ branches/1.0/package/libnfnetlink/libnfnetlink.mk 2015-02-27 17:48:43 UTC (rev 6990)
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libnfnetlink
+#
+################################################################################
+
+LIBNFNETLINK_VERSION = 1.0.1
+LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
+LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
+LIBNFNETLINK_AUTORECONF = YES
+LIBNFNETLINK_INSTALL_STAGING = YES
+
+$(eval $(call AUTOTARGETS,package,libnfnetlink))
Modified: branches/1.0/package/miniupnpd/Config.in
===================================================================
--- branches/1.0/package/miniupnpd/Config.in 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/Config.in 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,8 +1,9 @@
config BR2_PACKAGE_MINIUPNPD
bool "miniupnpd"
depends on BR2_LINUX_KERNEL
- depends on BR2_PACKAGE_IPTABLES
+ select BR2_PACKAGE_IPTABLES
+ select BR2_PACKAGE_LIBNFNETLINK
help
- Implements UPnP and NAT-PMP protocols.
+ Implements UPnP and NAT-PMP/PCP protocols.
http://miniupnp.free.fr/
Deleted: branches/1.0/package/miniupnpd/miniupnpd-config.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-config.patch 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-config.patch 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,27 +0,0 @@
---- miniupnpd-1.6.20120509-orig/genconfig.sh 2012-05-09 06:40:34.000000000 -0400
-+++ miniupnpd-1.6.20120509/genconfig.sh 2012-05-24 21:13:04.412605721 -0400
-@@ -56,6 +56,12 @@
- OS_VERSION=$(cat ./os.openwrt)
- fi
-
-+# AstLinux special case
-+if [ -f ./os.astlinux ]; then
-+ OS_NAME=AstLinux
-+ OS_VERSION=$(cat ./os.astlinux)
-+fi
-+
- # Tomato USB special case
- if [ -f ../shared/tomato_version ]; then
- OS_NAME=Tomato
-@@ -223,6 +229,11 @@
- echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
- FW=netfilter
- ;;
-+ AstLinux)
-+ OS_URL=http://www.astlinux.org/
-+ echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
-+ FW=netfilter
-+ ;;
- Tomato)
- OS_NAME=UPnP
- OS_URL=http://tomatousb.org/
Deleted: branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd-portinuse.patch 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,268 +0,0 @@
-diff -rupN miniupnpd-1.7-orig/Makefile.linux miniupnpd-1.7/Makefile.linux
---- miniupnpd-1.7-orig/Makefile.linux 2012-05-23 04:46:14.000000000 -0400
-+++ miniupnpd-1.7/Makefile.linux 2012-07-06 15:42:39.000000000 -0400
-@@ -41,7 +41,7 @@ SBININSTALLDIR = $(INSTALLPREFIX)/sbin
- ETCINSTALLDIR = $(PREFIX)/etc/miniupnpd
-
- BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
-- upnpreplyparse.o minixml.o \
-+ upnpreplyparse.o minixml.o portinuse.o \
- upnpredirect.o getifaddr.o daemonize.o upnpglobalvars.o \
- options.o upnppermissions.o minissdp.o natpmp.o \
- upnpevents.o upnputils.o getconnstatus.o \
-@@ -191,7 +191,7 @@ upnpreplyparse.o: upnpreplyparse.h minix
- minixml.o: minixml.h
- upnpredirect.o: macros.h config.h upnpredirect.h upnpglobalvars.h
- upnpredirect.o: upnppermissions.h miniupnpdtypes.h upnpevents.h
--upnpredirect.o: netfilter/iptcrdr.h commonrdr.h
-+upnpredirect.o: netfilter/iptcrdr.h commonrdr.h portinuse.h
- getifaddr.o: config.h getifaddr.h
- daemonize.o: daemonize.h config.h
- upnpglobalvars.o: config.h upnpglobalvars.h upnppermissions.h
-@@ -203,7 +203,7 @@ minissdp.o: config.h upnpdescstrings.h m
- minissdp.o: upnpglobalvars.h upnppermissions.h miniupnpdtypes.h minissdp.h
- minissdp.o: upnputils.h codelength.h
- natpmp.o: macros.h config.h natpmp.h upnpglobalvars.h upnppermissions.h
--natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h
-+natpmp.o: miniupnpdtypes.h getifaddr.h upnpredirect.h commonrdr.h portinuse.h
- upnpevents.o: config.h upnpevents.h miniupnpdpath.h upnpglobalvars.h
- upnpevents.o: upnppermissions.h miniupnpdtypes.h upnpdescgen.h upnputils.h
- upnputils.o: config.h upnputils.h
-diff -rupN miniupnpd-1.7-orig/natpmp.c miniupnpd-1.7/natpmp.c
---- miniupnpd-1.7-orig/natpmp.c 2012-05-27 19:12:51.000000000 -0400
-+++ miniupnpd-1.7/natpmp.c 2012-07-07 08:32:14.087915642 -0400
-@@ -23,9 +23,11 @@
- #include "upnpredirect.h"
- #include "commonrdr.h"
- #include "upnputils.h"
-+#include "portinuse.h"
-
- #ifdef ENABLE_NATPMP
-
-+
- int OpenAndConfNATPMPSocket(in_addr_t addr)
- {
- int snatpmp;
-@@ -267,6 +269,12 @@ void ProcessIncomingNATPMPPacket(int s)
- continue;
- }
- }
-+ if (port_in_use(ext_if_name, eport, proto, senderaddrstr, iport)) {
-+ syslog(LOG_INFO, "port %hu protocol %s already in use", eport, (proto==IPPROTO_TCP)?"tcp":"udp");
-+ eport++;
-+ r = 0;
-+ continue;
-+ }
- { /* do the redirection */
- char desc[64];
- #if 0
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.c miniupnpd-1.7/netfilter/iptcrdr.c
---- miniupnpd-1.7-orig/netfilter/iptcrdr.c 2012-05-01 05:11:16.000000000 -0400
-+++ miniupnpd-1.7/netfilter/iptcrdr.c 2012-07-06 22:07:34.537558699 -0400
-@@ -238,6 +238,18 @@ get_redirect_rule(const char * ifname, u
- unsigned int * timestamp,
- u_int64_t * packets, u_int64_t * bytes)
- {
-+ return get_nat_redirect_rule(miniupnpd_nat_chain, ifname, eport, proto, iaddr, iaddrlen, iport,
-+ desc, desclen, rhost, rhostlen,timestamp, packets, bytes);
-+}
-+
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+ char * iaddr, int iaddrlen, unsigned short * iport,
-+ char * desc, int desclen,
-+ char * rhost, int rhostlen,
-+ unsigned int * timestamp,
-+ u_int64_t * packets, u_int64_t * bytes)
-+{
- int r = -1;
- IPTC_HANDLE h;
- const struct ipt_entry * e;
-@@ -254,18 +266,18 @@ get_redirect_rule(const char * ifname, u
- iptc_strerror(errno));
- return -1;
- }
-- if(!iptc_is_chain(miniupnpd_nat_chain, h))
-+ if(!iptc_is_chain(nat_chain_name, h))
- {
-- syslog(LOG_ERR, "chain %s not found", miniupnpd_nat_chain);
-+ syslog(LOG_ERR, "chain %s not found", nat_chain_name);
- }
- else
- {
- #ifdef IPTABLES_143
-- for(e = iptc_first_rule(miniupnpd_nat_chain, h);
-+ for(e = iptc_first_rule(nat_chain_name, h);
- e;
- e = iptc_next_rule(e, h))
- #else
-- for(e = iptc_first_rule(miniupnpd_nat_chain, &h);
-+ for(e = iptc_first_rule(nat_chain_name, &h);
- e;
- e = iptc_next_rule(e, &h))
- #endif
-diff -rupN miniupnpd-1.7-orig/netfilter/iptcrdr.h miniupnpd-1.7/netfilter/iptcrdr.h
---- miniupnpd-1.7-orig/netfilter/iptcrdr.h 2012-03-05 15:37:14.000000000 -0500
-+++ miniupnpd-1.7/netfilter/iptcrdr.h 2012-07-06 22:03:25.000000000 -0400
-@@ -25,6 +25,14 @@ add_filter_rule2(const char * ifname,
- int
- delete_redirect_and_filter_rules(unsigned short eport, int proto);
-
-+int
-+get_nat_redirect_rule(const char * nat_chain_name, const char * ifname, unsigned short eport, int proto,
-+ char * iaddr, int iaddrlen, unsigned short * iport,
-+ char * desc, int desclen,
-+ char * rhost, int rhostlen,
-+ unsigned int * timestamp,
-+ u_int64_t * packets, u_int64_t * bytes);
-+
- /* for debug */
- int
- list_redirect_rule(const char * ifname);
-diff -rupN miniupnpd-1.7-orig/portinuse.c miniupnpd-1.7/portinuse.c
---- miniupnpd-1.7-orig/portinuse.c 1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.c 2012-07-07 08:46:20.000000000 -0400
-@@ -0,0 +1,95 @@
-+/* */
-+/* MiniUPnP project
-+ * (c) 2007-2012 Thomas Bernard
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <syslog.h>
-+#include <errno.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+
-+#include "macros.h"
-+#include "config.h"
-+#include "upnpglobalvars.h"
-+#include "getifaddr.h"
-+#include "portinuse.h"
-+
-+/* Hardcoded for now. Ideally would come from .conf file */
-+char *chains_to_check[] = { "PREROUTING" , 0 };
-+
-+int port_in_use(const char *if_name, unsigned eport, int proto, const char *iaddr, unsigned iport)
-+{
-+ char line[256];
-+ FILE *f;
-+ int found = 0;
-+ char ip_addr_str[INET_ADDRSTRLEN];
-+ struct in_addr ip_addr = { .s_addr = 0 };
-+ const char tcpfile[] = "/proc/net/tcp";
-+ const char udpfile[] = "/proc/net/udp";
-+
-+ f = fopen((proto==IPPROTO_TCP)?tcpfile:udpfile, "r");
-+ if (!f) return 0;
-+
-+ if(getifaddr(if_name, ip_addr_str, INET_ADDRSTRLEN) == 0)
-+ ip_addr.s_addr = inet_addr(ip_addr_str);
-+
-+ syslog(LOG_DEBUG, "Check protocol %s for port %d on ext_if %s %s, %8X",
-+ (proto==IPPROTO_TCP)?"tcp":"udp", eport, if_name, ip_addr_str, (unsigned)ip_addr.s_addr);
-+
-+ while (fgets(line, 255, f)) {
-+ char eaddr[68];
-+ unsigned tmp_port;
-+ if (sscanf(line, "%*d: %64[0-9A-Fa-f]:%x %*x:%*x %*x %*x:%*x "
-+ "%*x:%*x %*x %*d %*d %*llu",
-+ eaddr, &tmp_port) == 2
-+ ) {
-+ /* TODO add IPV6 support if enabled
-+ * Presently assumes IPV4 */
-+ // syslog(LOG_DEBUG, "port_in_use check port %d and address %s", tmp_port, eaddr);
-+ if (tmp_port == eport) {
-+ char tmp_addr[4];
-+ struct in_addr *tmp_ip_addr = (struct in_addr *)tmp_addr;
-+ if (sscanf(eaddr,"%2hhx%2hhx%2hhx%2hhx",
-+ &tmp_addr[3],&tmp_addr[2],&tmp_addr[1],&tmp_addr[0]) == 4)
-+ {
-+ if (tmp_ip_addr->s_addr == 0 || tmp_ip_addr->s_addr == ip_addr.s_addr)
-+ {
-+ found++;
-+ break; /* don't care how many, just that we found at least one */
-+ }
-+ }
-+ }
-+ }
-+ }
-+ fclose(f);
-+
-+ if (!found) {
-+ char iaddr_old[16];
-+ unsigned short iport_old;
-+ int i = 0;
-+ while (chains_to_check[i]) {
-+ if (get_nat_redirect_rule(chains_to_check[i], if_name, eport, proto,
-+ iaddr_old, sizeof(iaddr_old),&iport_old,
-+ 0, 0, 0, 0, 0, 0, 0) == 0)
-+ {
-+ syslog(LOG_DEBUG, "port_in_use check port %d on nat chain %s redirected to %s port %d", eport,
-+ chains_to_check[i], iaddr_old, iport_old);
-+ if (!(strcmp(iaddr, iaddr_old)==0 && iport==iport_old)) {
-+ /* only "in use" if redirected to somewhere else */
-+ found++;
-+ break; /* don't care how many, just that we found at least one */
-+ }
-+ }
-+ i++;
-+ }
-+ }
-+ return found;
-+}
-+
-diff -rupN miniupnpd-1.7-orig/portinuse.h miniupnpd-1.7/portinuse.h
---- miniupnpd-1.7-orig/portinuse.h 1969-12-31 19:00:00.000000000 -0500
-+++ miniupnpd-1.7/portinuse.h 2012-07-07 08:31:27.479918032 -0400
-@@ -0,0 +1,19 @@
-+/* */
-+/* MiniUPnP project
-+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
-+ * (c) 2006-2011 Thomas Bernard
-+ * This software is subject to the conditions detailed
-+ * in the LICENCE file provided within the distribution */
-+
-+#ifndef __PORTINUSE_H__
-+#define __PORTINUSE_H__
-+
-+/* portinuse()
-+ * determine wither a port is already in use
-+ * on a given interface.
-+ * returns: 0 not in use, 1 in use */
-+int
-+port_in_use(const char *if_name, unsigned port, int proto, const char *iaddr, unsigned iport);
-+
-+#endif
-+
-diff -rupN miniupnpd-1.7-orig/upnpredirect.c miniupnpd-1.7/upnpredirect.c
---- miniupnpd-1.7-orig/upnpredirect.c 2012-05-01 16:11:50.000000000 -0400
-+++ miniupnpd-1.7/upnpredirect.c 2012-07-07 08:47:44.000000000 -0400
-@@ -23,6 +23,7 @@
- #include "upnpredirect.h"
- #include "upnpglobalvars.h"
- #include "upnpevents.h"
-+#include "portinuse.h"
- #if defined(USE_NETFILTER)
- #include "netfilter/iptcrdr.h"
- #endif
-@@ -294,7 +295,12 @@ upnp_redirect(const char * rhost, unsign
- eport, protocol, iaddr_old, iport_old);
- return -2;
- }
-- } else {
-+ }
-+ else if (port_in_use(ext_if_name, eport, proto, iaddr, iport)) {
-+ syslog(LOG_INFO, "port %hu protocol %s already in use", eport, protocol);
-+ return -2;
-+ }
-+ else {
- timestamp = (leaseduration > 0) ? time(NULL) + leaseduration : 0;
- syslog(LOG_INFO, "redirecting port %hu to %s:%hu protocol %s for: %s",
- eport, iaddr, iport, protocol, desc);
Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.init 2015-02-27 17:48:43 UTC (rev 6990)
@@ -169,7 +169,6 @@
notify_interval=60
clean_ruleset_interval=600
uuid=$UUID
-friendly_name=AstLinux Router
serial=000001
model_number=$(cat /etc/astlinux-release)" >> $MINIUPNPD_CONF
if [ -n "$UPNP_ALLOW" ]; then
Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2015-02-27 17:48:43 UTC (rev 6990)
@@ -4,10 +4,10 @@
#
#############################################################
-MINIUPNPD_VERSION = 1.7
+MINIUPNPD_VERSION = 1.9.20141209
MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
MINIUPNPD_SITE = http://miniupnp.free.fr/files
-MINIUPNPD_DEPENDENCIES = linux iptables
+MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables libnfnetlink
define MINIUPNPD_IPTABLES_PATH_FIX
$(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \
@@ -17,18 +17,13 @@
MINIUPNPD_POST_PATCH_HOOKS += MINIUPNPD_IPTABLES_PATH_FIX
define MINIUPNPD_CONFIGURE_CMDS
-# add this to make for IPv6... CONFIG_OPTIONS="--ipv6"
echo "$(LINUX_VERSION_PROBED)" >$(@D)/os.astlinux
- CONFIG_OPTIONS="--leasefile" \
- $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \
- -f Makefile.linux -C $(@D) config.h
endef
define MINIUPNPD_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
- CFLAGS="$(TARGET_CFLAGS) -I$(BUILD_DIR)/iptables-$(IPTABLES_VERSION)/include/ -DIPTABLES_143" \
- LIBS="$(STAGING_DIR)/usr/lib/libiptc.so $(STAGING_DIR)/usr/lib/libip4tc.so $(STAGING_DIR)/usr/lib/libip6tc.so" \
- -f Makefile.linux -C $(@D) miniupnpd
+ $(TARGET_CONFIGURE_OPTS) \
+ CONFIG_OPTIONS="--leasefile --portinuse" \
+ $(MAKE) -f Makefile.linux -C $(@D) miniupnpd
endef
define MINIUPNPD_INSTALL_TARGET_CMDS
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix-uclibc.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6943-dirty Configuration
-# Sun Jan 25 21:06:44 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:53 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -724,6 +724,7 @@
# libmnl requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
@@ -889,6 +890,7 @@
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_MDNSRESPONDER is not set
# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MSMTP is not set
# BR2_PACKAGE_MTR is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-02-27 14:21:12 UTC (rev 6989)
+++ branches/1.0/runnix.config 2015-02-27 17:48:43 UTC (rev 6990)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6897-dirty Configuration
-# Sat Jan 3 11:05:47 2015
+# Buildroot 2011.08-svn6989-dirty Configuration
+# Fri Feb 27 10:53:49 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -515,6 +515,7 @@
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBPCAP is not set
# BR2_PACKAGE_PJSIP is not set
@@ -625,6 +626,7 @@
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_MDNSRESPONDER is not set
# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MINIUPNPD is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MSMTP is not set
# BR2_PACKAGE_MTR is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-03-08 16:49:32
|
Revision: 7000
http://sourceforge.net/p/astlinux/code/7000
Author: abelbeck
Date: 2015-03-08 16:49:24 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
sox, remove unused BR2_PACKAGE_SOX_LIBMAD option
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/multimedia/sox/Config.in
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-03-08 16:40:05 UTC (rev 6999)
+++ branches/1.0/astlinux-ast11.config 2015-03-08 16:49:24 UTC (rev 7000)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:10 2015
+# Buildroot 2011.08-svn6998-dirty Configuration
+# Sun Mar 8 11:46:55 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -224,7 +224,6 @@
# BR2_PACKAGE_MPLAYER is not set
# BR2_PACKAGE_MUSEPACK is not set
BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_TAGLIB is not set
# BR2_PACKAGE_TREMOR is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-03-08 16:40:05 UTC (rev 6999)
+++ branches/1.0/astlinux-ast13.config 2015-03-08 16:49:24 UTC (rev 7000)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:11 2015
+# Buildroot 2011.08-svn6998-dirty Configuration
+# Sun Mar 8 11:46:55 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -224,7 +224,6 @@
# BR2_PACKAGE_MPLAYER is not set
# BR2_PACKAGE_MUSEPACK is not set
BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_TAGLIB is not set
# BR2_PACKAGE_TREMOR is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-03-08 16:40:05 UTC (rev 6999)
+++ branches/1.0/astlinux18.config 2015-03-08 16:49:24 UTC (rev 7000)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:10 2015
+# Buildroot 2011.08-svn6998-dirty Configuration
+# Sun Mar 8 11:46:55 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -224,7 +224,6 @@
# BR2_PACKAGE_MPLAYER is not set
# BR2_PACKAGE_MUSEPACK is not set
BR2_PACKAGE_SOX=y
-BR2_PACKAGE_SOX_LIBMAD=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_TAGLIB is not set
# BR2_PACKAGE_TREMOR is not set
Modified: branches/1.0/package/multimedia/sox/Config.in
===================================================================
--- branches/1.0/package/multimedia/sox/Config.in 2015-03-08 16:40:05 UTC (rev 6999)
+++ branches/1.0/package/multimedia/sox/Config.in 2015-03-08 16:49:24 UTC (rev 7000)
@@ -2,12 +2,11 @@
bool "sox"
default n
help
- SoX - The Swiss Army Knife of sound
+ SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line
+ utility that can convert various formats of computer audio files
+ into other formats.
+ It can also apply various effects to these sound files, and, as an
+ added bonus, SoX can play and record audio files on most platforms.
-config BR2_PACKAGE_SOX_LIBMAD
- bool "SoX MP3 Decode Support"
- default n
- depends on BR2_PACKAGE_SOX
- select BR2_PACKAGE_LIBMAD
- help
- Compile SoX with MP3 decoding support via libmad
+ http://sox.sourceforge.net/
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-05-16 17:32:49
|
Revision: 7067
http://sourceforge.net/p/astlinux/code/7067
Author: abelbeck
Date: 2015-05-16 17:32:46 +0000 (Sat, 16 May 2015)
Log Message:
-----------
asterisk-gui, move tmp /var/tmp/asterisk-gui creation to asterisk.init and make it conditional on asterisk-gui being installed
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.init
branches/1.0/project/astlinux/target_skeleton/etc/rc
Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init 2015-05-16 16:46:34 UTC (rev 7066)
+++ branches/1.0/package/asterisk/asterisk.init 2015-05-16 17:32:46 UTC (rev 7067)
@@ -31,6 +31,11 @@
mkdir -p /var/tmp/asterisk/agi-bin
+ # Asterisk-GUI tmp directory
+ if [ -L /stat/var/lib/asterisk/static-http/config/tmp ]; then
+ mkdir -p -m 0700 /var/tmp/asterisk-gui
+ fi
+
if [ ! -d /var/log/asterisk ]; then
mkdir /var/log/asterisk
fi
Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc 2015-05-16 16:46:34 UTC (rev 7066)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2015-05-16 17:32:46 UTC (rev 7067)
@@ -172,7 +172,6 @@
mkdir /var/empty /var/lock /var/db /var/run /var/racoon
touch /var/run/utmp
mkdir /var/run/screen /var/state /var/tmp /tmp/bin
- mkdir -m 0700 /var/tmp/asterisk-gui
/sbin/udevd --daemon
# Trigger udev USB subsystem in case USB events occured before udev was started.
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