summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TODO6
-rw-r--r--package/Config.in31
-rw-r--r--package/asterisk/Makefile120
-rw-r--r--package/asterisk/files/asterisk.init5
-rw-r--r--package/asterisk/patches/patch-apps__moduleinfo13
-rw-r--r--package/asterisk/patches/patch-channels_chan_iax2_c20
-rw-r--r--package/asterisk/patches/patch-channels_chan_oss_c37
-rw-r--r--package/asterisk/patches/patch-codecs_gsm_Makefile66
-rw-r--r--package/asterisk/patches/patch-main_astobj2_c11
-rw-r--r--package/asterisk/patches/patch-main_translate_c11
-rw-r--r--package/asterisk/patches/patch-menuselect-tree12
-rw-r--r--package/asterisk/patches/patch-res_res_features_c11
-rwxr-xr-xpackage/base-files/extra/init2
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/gdb/Makefile4
-rw-r--r--target/linux/patches/2.6.32/startup.patch18
-rw-r--r--target/rb532/Makefile1
-rw-r--r--target/rb532/kernel.config8
18 files changed, 107 insertions, 271 deletions
diff --git a/TODO b/TODO
index 98427615c..5efbf0ec4 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,11 @@
-- group alix and wrap boards
-- tryout internal kernel device management
-- implement update for MTD devices (foxboard,rb532,ag241)
- do a make bulk for all targets
+- implement update for MTD devices (foxboard,rb532,ag241)
+- network scripts for wireless client and acess point
- add tcsh and describe new package creation procedure in wiki
- add toolchain only support for generic toolchains (mips/ppc/..)
- fix watchdog for alix1c (mfgpt timers problem)
- netbsd build
- macos x build
-- network scripts for wireless client and acess point
- update to 2.6.33
- use LZMA kernels for MIPS targets
- package drbd
diff --git a/package/Config.in b/package/Config.in
index 31867be26..41db9ecfd 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -27,21 +27,33 @@ source "package/ussp-push/Config.in"
endmenu
menu "Browser / Editor / Pager"
+source "package/elinks/Config.in"
source "package/less/Config.in"
-source "package/nano/Config.in"
-source "package/vim/Config.in"
source "package/links/Config.in"
-source "package/elinks/Config.in"
source "package/lynx/Config.in"
+source "package/nano/Config.in"
+source "package/vim/Config.in"
endmenu
-menu "Archivers / Compression"
+menu "Compression and Archivers"
source "package/bzip2/Config.in"
source "package/cpio/Config.in"
source "package/tar/Config.in"
source "package/xz/Config.in"
endmenu
+menu "Cryptography"
+source "package/cryptsetup/Config.in"
+source "package/gpg/Config.in"
+source "package/heimdal/Config.in"
+source "package/krb5/Config.in"
+source "package/openct/Config.in"
+source "package/opensc/Config.in"
+source "package/openssl/Config.in"
+source "package/openssl-pkcs11/Config.in"
+source "package/rng-tools/Config.in"
+endmenu
+
menu "Debugging / Analyzing"
source "package/exmap/Config.in"
source "package/gdb/Config.in"
@@ -121,17 +133,6 @@ source "package/mksh/Config.in"
source "package/zsh/Config.in"
endmenu
-menu "Security"
-source "package/cryptsetup/Config.in"
-source "package/gpg/Config.in"
-source "package/heimdal/Config.in"
-source "package/krb5/Config.in"
-source "package/openct/Config.in"
-source "package/opensc/Config.in"
-source "package/openssl/Config.in"
-source "package/openssl-pkcs11/Config.in"
-source "package/rng-tools/Config.in"
-endmenu
menu "Serial communications & terminal emulation"
source "package/heyu/Config.in"
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index c66f4c7e5..86d311c83 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 1.4.28
+PKG_VERSION:= 1.6.2.1
PKG_RELEASE:= 1
-PKG_MD5SUM:= e8006ce319e18ce07ce1335ad583330a
+PKG_MD5SUM:= 8fbc60f9d80e686c749ae95292e225d8
PKG_DESCR:= Open Source PBX
PKG_SECTION:= net
PKG_MULTI:= 1
@@ -24,11 +24,10 @@ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/
PKG_TARGET_DEPENDS:= !foxboard
-#PKG_DEPENDS_MAIN:= asterisk
-PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation
-PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation
-PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol
-PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator
+PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator
include $(TOPDIR)/mk/package.mk
@@ -65,27 +64,31 @@ endif
CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \
--with-ncurses=${STAGING_DIR}/usr \
--with-ssl=${STAGING_DIR}/usr \
- --without-zaptel \
+ --disable-xmldoc \
--without-tonezone \
--without-asound \
--without-curses \
- --without-gnutls \
+ --without-gtk \
+ --without-gtk2 \
--without-h323 \
--without-iksemel \
--without-imap \
- --without-kde \
--without-nbs \
--without-netsnmp \
--without-newt \
- --without-odbc \
--without-osptk \
--without-oss \
+ --without-popt \
--without-pri \
--without-pwlib \
--without-tds \
--without-termcap \
--without-tinfo \
- --without-vpb
+ --without-vpb \
+ --without-misdn \
+ --without-isdnnet \
+ --without-suppserv
+
ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},)
CONFIGURE_ARGS+= --with-gsm=internal
else
@@ -110,17 +113,9 @@ CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr
else
CONFIGURE_ARGS+= --without-postgres
endif
-ifneq (${ADK_PACKAGE_LIBPOPT},)
-CONFIGURE_ARGS+= --with-popt=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+= --without-popt
-endif
-CONFIGURE_ARGS+= --without-misdn \
- --without-isdnnet \
- --without-suppserv
+TLDFLAGS+= -lm
CONFIGURE_STYLE:= gnu
-CONFIGURE_ENV+= STRIP=${STRIP}
BUILD_STYLE:= auto
MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
ASTLDFLAGS="${TLDFLAGS}"
@@ -132,13 +127,12 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \
ALL_TARGET:= all install samples
pre-configure:
- rm ${WRKBUILD}/apps/app_followme.c
cd "$(WRKBUILD)/menuselect"; ./configure
post-build:
cd ${WRKBUILD}/sounds ; \
- tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \
- rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz
+ tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
+ rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz
@echo
@echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---"
@echo
@@ -157,8 +151,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
rm -rf mohmp3/*.mp3; \
rm -rf sounds/*; \
cd modules; \
- rm -rf *adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
- *mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
+ rm -rf *adsi* *festival* *modem* *meetme* *oss* \
+ *phone* *intercom* *mp3* *nbscat* *mysql* \
+ *postgres* *pgsql* *voicemail* *speex* \
*zapateller* *jpeg*; \
rm -f chan_bluetooth.so ; \
rm -f chan_h323.so ; \
@@ -172,80 +167,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
rm -f res_agi.so ; \
)
(cd $(IDIR_ASTERISK)/etc/asterisk; \
- rm -f *iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
- *festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
+ rm -f *iax* *odbc* *mysql* *postgres* *pgsql* \
+ *voicemail* *adsi* *oss* *alsa* \
+ *festival* *modem* *meetme* *phone* *tds* \
+ *vofr* *rpt* *vpb* \
*zapata*; \
rm -f bluetooth.conf ; \
rm -f mgcp.conf ; \
+ rm -f gtalk.conf ; \
rm -f skinny.conf ; \
rm -f dundi.conf ; \
)
${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
- $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
+ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \
+ $(WRKINST)/etc/asterisk/musiconhold.conf
asterisk-pgsql-install:
${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
- ${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+ ${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \
+ $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \
+ $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
asterisk-sounds-install:
${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
- $(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
+ $(CP) $(WRKBUILD)/sounds/* \
+ $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-*
asterisk-voicemail-install:
${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
- ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
- ${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
- ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+ ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \
+ $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
+ ${CP} $(WRKBUILD)/apps/*voicemail.so \
+ $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \
+ $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
- $(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
+ $(CP) $(WRKBUILD)/sounds/vm-*.gsm \
+ $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
asterisk-chan-mgcp-install:
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk
- ${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
+ ${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \
+ $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \
+ $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/
asterisk-chan-skinny-install:
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk
- ${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
+ ${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \
+ $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \
+ $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
asterisk-chan-iax2-install:
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk
${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules
- ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
- ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
- ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
+ ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \
+ $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf
+ ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \
+ $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf
+ ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \
+ $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/
asterisk-codec-speex-install:
${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so \
+ $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
asterisk-codec-gsm-install:
${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
- ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so \
+ $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/
asterisk-pbx-dundi-install:
${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk
- ${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
+ ${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \
+ $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \
+ $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
asterisk-res-agi-install:
${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/agi-bin
${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules
- ${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
+ ${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so \
+ $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/
asterisk-meetme-install:
${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/
${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
- ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
- ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+ ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \
+ ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
+ ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \
+ ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init
index 01a4edd51..d11a1f1b1 100644
--- a/package/asterisk/files/asterisk.init
+++ b/package/asterisk/files/asterisk.init
@@ -10,13 +10,14 @@ autostart)
exec sh $0 start
;;
start)
- [ -d /var/run ] || mkdir -p /var/run
+ [ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
[ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
/usr/sbin/asterisk
;;
stop)
- [ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+ [ -f /var/run/asterisk/asterisk.pid ] && \
+ kill $(cat /var/run/asterisk/asterisk.pid) >/dev/null 2>&1
;;
restart)
sh $0 stop
diff --git a/package/asterisk/patches/patch-apps__moduleinfo b/package/asterisk/patches/patch-apps__moduleinfo
deleted file mode 100644
index efbdcae4a..000000000
--- a/package/asterisk/patches/patch-apps__moduleinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- asterisk-1.4.24.1.orig/apps/.moduleinfo 2009-04-02 19:44:22.000000000 +0200
-+++ asterisk-1.4.24.1/apps/.moduleinfo 2009-05-12 16:07:52.000000000 +0200
-@@ -56,9 +56,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- <depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-- <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c
deleted file mode 100644
index f39c2bf5b..000000000
--- a/package/asterisk/patches/patch-channels_chan_iax2_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_iax2.c 2009-11-10 18:15:57.000000000 +0100
-+++ asterisk-1.4.27.1/channels/chan_iax2.c 2009-12-03 20:57:05.000000000 +0100
-@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2
-
- memset(&ied, 0, sizeof(ied));
- if (ies->apparent_addr)
-- bcopy(ies->apparent_addr, &new, sizeof(new));
-+ memcpy(&new, ies->apparent_addr, sizeof(new));
- if (ies->callno)
- newcall = ies->callno;
- if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
-@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_
-
- memset(&us, 0, sizeof(us));
- if (ies->apparent_addr)
-- bcopy(ies->apparent_addr, &us, sizeof(us));
-+ memcpy(&us, ies->apparent_addr, sizeof(us));
- if (ies->username)
- ast_copy_string(peer, ies->username, sizeof(peer));
- if (ies->refresh)
diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c
deleted file mode 100644
index 33e9aaad7..000000000
--- a/package/asterisk/patches/patch-channels_chan_oss_c
+++ /dev/null
@@ -1,37 +0,0 @@
---- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200
-+++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100
-@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p
- l = FRAME_SIZE - ofs;
- if (l > s->datalen - start) /* don't overflow the source */
- l = s->datalen - start;
-- bcopy(s->data + start, myframe + ofs, l * 2);
-+ memcpy(myframe + ofs, s->data + start, l * 2);
- if (0)
- ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs);
- l_sampsent += l;
-@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p
- if (l > 0) {
- if (l > FRAME_SIZE - ofs)
- l = FRAME_SIZE - ofs;
-- bcopy(silence, myframe + ofs, l * 2);
-+ memcpy(myframe + ofs, silence, l * 2);
- l_sampsent += l;
- } else { /* silence is over, restart sound if loop */
- if (s->repeat == 0) { /* last block */
- o->cursound = -1;
- o->nosound = 0; /* allow audio data */
- if (ofs < FRAME_SIZE) /* pad with silence */
-- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2);
-+ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2);
- }
- l_sampsent = 0;
- }
-@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct
-
- /* XXX can be simplified returning &ast_null_frame */
- /* prepare a NULL frame in case we don't have enough data to return */
-- bzero(f, sizeof(struct ast_frame));
-+ memset(f, 0, sizeof(struct ast_frame));
- f->frametype = AST_FRAME_NULL;
- f->src = oss_tech.type;
-
diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile
deleted file mode 100644
index 82653cc9b..000000000
--- a/package/asterisk/patches/patch-codecs_gsm_Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-disable uname -m checks
---- asterisk-1.4.26.orig/codecs/gsm/Makefile 2008-11-19 22:34:47.000000000 +0100
-+++ asterisk-1.4.26/codecs/gsm/Makefile 2009-08-21 12:29:21.450418652 +0200
-@@ -37,13 +37,13 @@ WAV49 = -DWAV49
- ######### ppro's, etc, as well as the AMD K6 and K7. The compile will
- ######### probably require gcc.
-
--ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
--ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
-+#ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-+#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-+#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-+#OPTIMIZE+=-march=$(PROC)
-+#endif
-+#endif
-+#endif
-
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
-@@ -207,13 +207,13 @@ GSM_SOURCES = $(SRC)/add.c \
- # add k6-specific code only if not on a non-k6 hardware or proc.
- # XXX Keep a space after each findstring argument
- # XXX should merge with GSM_OBJECTS
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
--GSM_SOURCES+= $(SRC)/k6opt.s
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+#GSM_SOURCES+= $(SRC)/k6opt.s
-+#endif
-+#endif
-+#endif
-
- TOAST_SOURCES = $(SRC)/toast.c \
- $(SRC)/toast_lin.c \
-@@ -259,13 +259,13 @@ GSM_OBJECTS = $(SRC)/add.o \
- $(SRC)/short_term.o \
- $(SRC)/table.o
-
--ifeq ($(OSARCH),linux-gnu)
--ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
--ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
--GSM_OBJECTS+= $(SRC)/k6opt.o
--endif
--endif
--endif
-+#ifeq ($(OSARCH),linux-gnu)
-+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+#GSM_OBJECTS+= $(SRC)/k6opt.o
-+#endif
-+#endif
-+#endif
-
- TOAST_OBJECTS = $(SRC)/toast.o \
- $(SRC)/toast_lin.o \
diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c
deleted file mode 100644
index d8aaf114b..000000000
--- a/package/asterisk/patches/patch-main_astobj2_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/astobj2.c 2009-10-06 03:16:36.000000000 +0200
-+++ asterisk-1.4.27.1/main/astobj2.c 2009-12-03 20:54:12.000000000 +0100
-@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d
- /* for safety, zero-out the astobj2 header and also the
- * first word of the user-data, which we make sure is always
- * allocated. */
-- bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) );
-+ memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) );
- free(obj);
- }
-
diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c
deleted file mode 100644
index 36d7c3058..000000000
--- a/package/asterisk/patches/patch-main_translate_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/main/translate.c 2009-10-21 18:44:49.000000000 +0200
-+++ asterisk-1.4.27.1/main/translate.c 2009-12-03 20:53:36.000000000 +0100
-@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples)
- if (option_debug)
- ast_log(LOG_DEBUG, "Resetting translation matrix\n");
-
-- bzero(tr_matrix, sizeof(tr_matrix));
-+ memset(tr_matrix, 0, sizeof(tr_matrix));
-
- /* first, compute all direct costs */
- AST_LIST_TRAVERSE(&translators, t, list) {
diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree
deleted file mode 100644
index 6bac1894d..000000000
--- a/package/asterisk/patches/patch-menuselect-tree
+++ /dev/null
@@ -1,12 +0,0 @@
---- asterisk-1.4.27.1.orig/menuselect-tree 2009-11-30 19:30:41.000000000 +0100
-+++ asterisk-1.4.27.1/menuselect-tree 2009-12-03 20:55:04.000000000 +0100
-@@ -59,9 +59,6 @@
- <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so">
- <depend>dahdi</depend>
- </member>
--<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-- <depend>chan_local</depend>
--</member>
- <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
- </member>
- <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so">
diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c
deleted file mode 100644
index a237fbf97..000000000
--- a/package/asterisk/patches/patch-res_res_features_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.27.1.orig/res/res_features.c 2009-10-20 19:46:37.000000000 +0200
-+++ asterisk-1.4.27.1/res/res_features.c 2009-12-03 20:53:57.000000000 +0100
-@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void
- ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
- ast_hangup(tobj->chan);
- ast_hangup(tobj->peer);
-- bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */
-+ memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */
- free(tobj);
- return NULL;
- }
diff --git a/package/base-files/extra/init b/package/base-files/extra/init
index e11446366..618547693 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/extra/init
@@ -1,5 +1,5 @@
#!/bin/sh
-echo "Starting system ..."
+echo "System initialization ..."
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount -nt proc proc /proc
mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 7779226a7..8481fd64f 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -56,11 +56,11 @@ else
$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
endif
+ $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
ifeq ($(ADK_DEBUG),y)
${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \
$(IDIR_BUSYBOX)/bin/busybox
endif
- $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
fake: $(TOPDIR)/.busyboxcfg do-configure do-install
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index c70345891..86152fced 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
PKG_DESCR:= GNU debugger
PKG_SECTION:= comp
-PKG_DEPENDS:= libthread-db libncurses
-PKG_BUILDDEP+= ncurses readline
+PKG_DEPENDS:= libthread-db libncurses libiconv
+PKG_BUILDDEP+= ncurses readline libiconv
PKG_TARGET_DEPENDS:= !foxboard !ag241
include ${TOPDIR}/mk/package.mk
diff --git a/target/linux/patches/2.6.32/startup.patch b/target/linux/patches/2.6.32/startup.patch
index 25302f8d9..1e50e6312 100644
--- a/target/linux/patches/2.6.32/startup.patch
+++ b/target/linux/patches/2.6.32/startup.patch
@@ -1,16 +1,16 @@
-diff -Nur linux-2.6.30.5.orig/init/main.c linux-2.6.30.5/init/main.c
---- linux-2.6.30.5.orig/init/main.c 2009-08-16 23:19:38.000000000 +0200
-+++ linux-2.6.30.5/init/main.c 2009-08-22 20:26:39.000000000 +0200
-@@ -811,7 +811,7 @@
- numa_default_policy();
-
+diff -Nur linux-2.6.32.orig/init/main.c linux-2.6.32/init/main.c
+--- linux-2.6.32.orig/init/main.c 2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/init/main.c 2010-01-31 11:01:41.154334301 +0100
+@@ -814,6 +814,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n");
+ printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n");
++
(void) sys_dup(0);
(void) sys_dup(0);
-@@ -835,6 +835,7 @@
+
+@@ -836,6 +838,7 @@
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index 77a204a11..27a070c31 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -26,7 +26,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
- @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config
index aac515061..f9ce20f75 100644
--- a/target/rb532/kernel.config
+++ b/target/rb532/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Sat Jan 30 21:07:56 2010
+# Sat Jan 30 22:33:23 2010
#
CONFIG_MIPS=y
@@ -378,7 +378,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
@@ -412,9 +413,6 @@ CONFIG_MTD_BLOCK=y
#
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_JEDECPROBE is not set
-# CONFIG_MTD_CFI_NOSWAP is not set
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
CONFIG_MTD_MAP_BANK_WIDTH_1=y
CONFIG_MTD_MAP_BANK_WIDTH_2=y
CONFIG_MTD_MAP_BANK_WIDTH_4=y
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 18:16:50 +0000