diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-24 19:19:10 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-24 19:19:10 +0200 |
| commit | e74eccf3fa0585abfbe52154646812d20f2560a2 (patch) | |
| tree | 7f8ce3c103d7fbd7a98b4749c26f10de197871d4 | |
| parent | 0f8469e5c7f3477b3c521fb7f672fca8c294c0f3 (diff) | |
| parent | d3f9368c4bc389e7838abc4077d6ce92b77b2d31 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
117 files changed, 61159 insertions, 204450 deletions
@@ -1,4 +1,7 @@ - stripping of kernel is not working for all targets +- implement a non-interactive allmodconfig for different targets + (make TARGET=foo defconfig allmodconfig) + needed for ADK buildserver - rescue initramfs image (more archs, generic kernel config ) - usb boot via stick - fix init scripts pidof? vs. killall diff --git a/mk/modules.mk b/mk/modules.mk index ca494e300..875b93c62 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -751,6 +751,10 @@ $(eval $(call KMOD_template,OCF_TALITOS,cryptodev-talitos,\ # # Filesystems # +$(eval $(call KMOD_template,AUFS_FS,fs-aufs,\ + $(MODULES_DIR)/kernel/fs/aufs/aufs \ +,30)) + $(eval $(call KMOD_template,CIFS,fs-cifs,\ $(MODULES_DIR)/kernel/fs/cifs/cifs \ ,30)) diff --git a/package/Config.in b/package/Config.in index 7dfe05a9d..f724af03a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -48,6 +48,7 @@ source "package/vim/Config.in" endmenu menu "Filesystem utilities" +source "package/aufs2-util/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/fuse/Config.in" diff --git a/package/Makefile b/package/Makefile index cb1877374..66286e1af 100644 --- a/package/Makefile +++ b/package/Makefile @@ -27,6 +27,7 @@ package-$(ADK_PACKAGE_ARPD) += arpd package-$(ADK_PACKAGE_ARPWATCH) += arpwatch package-$(ADK_PACKAGE_ASTERISK) += asterisk package-$(ADK_COMPILE_ATFTP) += atftp +package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util package-$(ADK_PACKAGE_AUTOSSH) += autossh package-$(ADK_COMPILE_AVAHI) += avahi package-$(ADK_COMPILE_AXTLS) += axtls diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index 72f8b6bca..3cac88628 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -1,5 +1,6 @@ config ADK_PACKAGE_ASTERISK bool "asterisk................... Telephony server" + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_PACKAGE_LIBCURL select ADK_PACKAGE_LIBNCURSES select ADK_PACKAGE_LIBPTHREAD diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index c3f9e0cef..e5a3609a7 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,14 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.26 +PKG_VERSION:= 1.4.26.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= f54d6685533a149a0241c3468a88e02a +PKG_MD5SUM:= 9b46f8628f43e1d3c275460ceee26646 PKG_DESCR:= Open Source PBX PKG_SECTION:= net PKG_DEPENDS:= libncurses libpthread libopenssl libcurl PKG_URL:= http://www.asterisk.org -PKG_SITES:= http://downloads.digium.com/pub/telephony/asterisk/releases/ +PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ include $(TOPDIR)/mk/package.mk @@ -40,6 +40,11 @@ SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_CODEC_GSM}+= asterisk-codec-gsm-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_PBX_DUNDI}+= asterisk-pbx-dundi-install SUB_INSTALLS-${ADK_PACKAGE_ASTERISK_RES_AGI}+= asterisk-res-agi-install +#workaround for cris and gcc 4.4, where -Os generates ICE +ifeq ($(ARCH),cris) +TARGET_OPTIMIZATION:=$(subst Os,O2,$(TARGET_OPTIMIZATION)) +endif + CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \ --with-ncurses=${STAGING_DIR}/usr \ --with-ssl=${STAGING_DIR}/usr \ @@ -100,7 +105,7 @@ CONFIGURE_ARGS+= --without-misdn \ CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= STRIP=${STRIP} BUILD_STYLE:= auto -MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} ${TCFLAGS} -DHAVE_STRTOQ" \ +MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TLDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_OPTIMIZATION}" \ diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile new file mode 100644 index 000000000..82653cc9b --- /dev/null +++ b/package/asterisk/patches/patch-codecs_gsm_Makefile @@ -0,0 +1,66 @@ +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 |