diff options
70 files changed, 17289 insertions, 2860 deletions
@@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ - test -n "$$__limit" && ulimit -Sd $$__limit; + test -n "$$__limit" && ulimit -Sd $$__limit; ulimit -n 1024; all: checkreloc .prereq_done @${_UNLIMIT} ${GMAKE_INV} all @@ -16,7 +16,6 @@ help: @echo ' config - Update current config utilising a line-oriented program' @echo ' menuconfig - Update current config utilising a menu based program' @echo ' (default when .config does not exist)' - @echo ' guiconfig - Update current config utilising a gui based program' @echo ' oldconfig - Update current config utilising a provided .configs base' @echo ' allmodconfig - New config selecting all packages as modules when possible' @echo ' allconfig - New config selecting all packages when possible' @@ -129,9 +128,6 @@ image_clean imageclean cleanimage: .prereq_done menuconfig: .prereq_done @${GMAKE_INV} menuconfig -guiconfig: .prereq_done - @${GMAKE_INV} guiconfig - defconfig: .prereq_done @${GMAKE_INV} defconfig diff --git a/mk/build.mk b/mk/build.mk index 8c1e73743..8efd7becc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -80,7 +80,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ - guiconfig \ _config \ _mconfig \ distclean \ @@ -506,15 +505,6 @@ menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -guiconfig: $(CONFIG)/gconf defconfig .menu package/Config.in.auto - @${BASH} ${TOPDIR}/scripts/update-sys - @${BASH} ${TOPDIR}/scripts/update-pkg - @if [ ! -f .config ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi - @$(CONFIG)/gconf $(CONFIG_CONFIG_IN) - ${POSTCONFIG} - _config: $(CONFIG)/conf .menu package/Config.in.auto -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) @@ -561,7 +551,7 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel i686 x86_64;do \ + for arch in arm mips mipsel mips64 mips64el ppc ppc64 sparc sparc64 i686 x86_64;do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 964c417df..051ad3ea3 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk PKG_VERSION:= 1.8.20.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 99204257de80a42c4e287fc93dfe714a PKG_DESCR:= Open Source PBX PKG_SECTION:= phone @@ -101,7 +101,7 @@ endif INSTALL_STYLE:= manual -TARGET_LDFLAGS+= -lm -ltinfo +TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS}" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ diff --git a/package/avahi/Makefile b/package/avahi/Makefile index fa8c56fe1..bd203e79e 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi PKG_VERSION:= 0.6.31 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp -PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus +PKG_BUILDDEP:= autotool libdaemon expat gdbm glib gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ PKG_NEED_CXX:= 1 @@ -33,6 +33,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-gtk2 \ --enable-libdaemon \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am new file mode 100644 index 000000000..ff5160336 --- /dev/null +++ b/package/avahi/patches/patch-Makefile_am @@ -0,0 +1,12 @@ +--- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 ++++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 +@@ -75,8 +75,7 @@ SUBDIRS = \ + avahi-compat-howl \ + avahi-autoipd \ + avahi-ui \ +- avahi-ui-sharp \ +- po ++ avahi-ui-sharp + + DX_INPUT = \ + $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am new file mode 100644 index 000000000..c1744d9d0 --- /dev/null +++ b/package/avahi/patches/patch-avahi-ui_Makefile_am @@ -0,0 +1,19 @@ +--- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 ++++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 +@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE + endif + + bin_PROGRAMS = bssh +-desktop_DATA += bssh.desktop bvnc.desktop +-@INTLTOOL_DESKTOP_RULE@ +- + bssh_SOURCES = bssh.c + + if HAVE_GTK3 +@@ -108,6 +105,4 @@ endif # HAVE_GLIB + endif + endif + +-@INTLTOOL_DESKTOP_RULE@ +- + CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac new file mode 100644 index 000000000..c610da2cd --- /dev/null +++ b/package/avahi/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.000000000 +0100 ++++ avahi-0.6.31/configure.ac 2014-03-04 08:05:14.000000000 +0100 +@@ -412,7 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then + AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) + fi + +-IT_PROG_INTLTOOL([0.35.0]) + GETTEXT_PACKAGE=avahi + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh index c83acd926..e3bcd4083 100644 --- a/package/avahi/patches/patch-ltmain_sh +++ b/package/avahi/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- avahi-0.6.30.orig/ltmain.sh 2011-04-04 00:10:35.000000000 +0200 -+++ avahi-0.6.30/ltmain.sh 2011-05-12 12:30:44.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- avahi-0.6.31.orig/ltmain.sh 2012-02-14 23:36:26.000000000 +0100 ++++ avahi-0.6.31/ltmain.sh 2014-03-04 07:44:03.000000000 +0100 +@@ -5853,7 +5853,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ad09f8d3d..9323b25ad 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -75,6 +75,12 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y) $(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4),y) + $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4EB),y) + $(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab +endif ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y) $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab endif diff --git a/package/fbset/Makefile b/package/fbset/Makefile index bd8186ceb..d9b51e299 100644 --- a/package/fbset/Makefile +++ b/package/fbset/Makefile @@ -5,9 +5,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fbset PKG_VERSION:= 2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e547cfcbb8c1a4f2a6b8ba4acb8b7164 PKG_DESCR:= framebuffer utility +PKG_DEPENDS:= bison-host flex-host PKG_SECTION:= utils PKG_SITES:= http://users.telenet.be/geertu/Linux/fbdev/ @@ -22,8 +23,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - (cd ${WRKSRC} && bison -d modes.y) - (cd ${WRKSRC} && flex modes.l) + (cd ${WRKSRC} && PATH='${HOST_PATH}' bison -d modes.y) + (cd ${WRKSRC} && PATH='${HOST_PATH}' flex modes.l) ${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \ ${WRKBUILD}/modes.tab.o ${WRKSRC}/modes.tab.c ${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \ diff --git a/package/rdate/Makefile b/package/rdate/Makefile index 1dd8d0222..a37cbdfbc 100644 --- a/package/rdate/Makefile +++ b/package/rdate/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rdate PKG_VERSION:= 20070817 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 9a6489d7de4311678a3fab001bb503df PKG_DESCR:= A small rdate and NTP client PKG_SECTION:= ntp diff --git a/package/rdate/patches/patch-arc4random_c b/package/rdate/patches/patch-arc4random_c new file mode 100644 index 000000000..e84a77832 --- /dev/null +++ b/package/rdate/patches/patch-arc4random_c @@ -0,0 +1,41 @@ +--- rdate.orig/arc4random.c 2007-05-15 00:15:12.000000000 +0200 ++++ rdate/arc4random.c 2014-03-03 07:27:38.000000000 +0100 +@@ -30,7 +30,6 @@ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> +@@ -97,30 +96,6 @@ arc4_stir(struct arc4_stream *as) + if (fd != -1) { + read(fd, rdat.rnd, sizeof(rdat.rnd)); + close(fd); +- } else { +- /* /dev/urandom failed? Maybe we're in a chroot. */ +-//#if defined(CTL_KERN) && defined(KERN_RANDOM) && defined(RANDOM_UUID) +-#ifdef _LINUX_SYSCTL_H +- /* XXX this is for Linux, which uses enums */ +- +- int mib[3]; +- size_t i, len; +- +- mib[0] = CTL_KERN; +- mib[1] = KERN_RANDOM; +- mib[2] = RANDOM_UUID; +- +- for (i = 0; i < sizeof(rdat.rnd) / sizeof(u_int); i ++) { +- len = sizeof(u_int); +- if (sysctl(mib, 3, &rdat.rnd[i], &len, NULL, 0) == -1) { +- fprintf(stderr, "warning: no entropy source\n"); +- break; +- } +- } +-#else +- /* XXX kFreeBSD doesn't seem to have KERN_ARND or so */ +- ; +-#endif + } + + arc4_stir_pid = getpid(); diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 68a89e31e..df46bc896 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,18 +4,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9a77cb477aec1123720332a091255f25 +PKG_MD5SUM:= e3defd29cc464cc1a1dfa0eebaca53b1 PKG_DESCR:= X keyboard config PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xkbcomp -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_BUILDDEP:= autotool util-macros xkbcomp +PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + xkeyboard-config-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb ${CP} ${WRKINST}/usr/share/X11/xkb/* \ diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am new file mode 100644 index 000000000..91f90f91b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/Makefile.am 2013-10-19 18:02:53.000000000 +0200 ++++ xkeyboard-config-2.11/Makefile.am 2014-03-04 14:43:40.000000000 +0100 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = compat geometry keycodes po rules symbols types docs man ++SUBDIRS = compat geometry keycodes rules symbols types + + pkgconfigdir = $(datadir)/pkgconfig + pkgconfig_DATA = xkeyboard-config.pc diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac new file mode 100644 index 000000000..2cb7cc7db --- /dev/null +++ b/package/xkeyboard-config/patches/patch-configure_ac @@ -0,0 +1,13 @@ +--- xkeyboard-config-2.11.orig/configure.ac 2014-01-29 21:08:27.000000000 +0100 ++++ xkeyboard-config-2.11/configure.ac 2014-03-04 14:43:26.000000000 +0100 +@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x + # **** + # i18n + # **** +-AC_PROG_INTLTOOL(0.30) +- +-AM_GNU_GETTEXT_VERSION([0.18.1]) +-AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE=xkeyboard-config + AC_SUBST(GETTEXT_PACKAGE) diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am new file mode 100644 index 000000000..ac07e510b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100 ++++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100 +@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x + rulesdir = $(xkb_base)/rules + xmldir = $(rulesdir) + +-@INTLTOOL_XML_NOMERGE_RULE@ ++# remove intltool-merge dependency ++%.xml: %.xml.in ++ cp $< $@ diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in new file mode 100644 index 000000000..beb2b7a9d --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in @@ -0,0 +1,855 @@ +--- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100 ++++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100 +@@ -1,4 +1,4 @@ +-<?xml version="1.0" encoding="utf-8"?> ++<?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd"> + <xkbConfigRegistry> + <modelList/> +@@ -6,8 +6,8 @@ + <layout> + <configItem> + <name>apl</name> +- <_shortDescription>apl</_shortDescription> +- <_description>APL keyboard symbols</_description> ++ <shortDescription>apl</shortDescription> ++ <description>APL keyboard symbols</description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList> +@@ -58,29 +58,29 @@ + <layout> + <configItem> + <name>ca</name> +- <_shortDescription>fr</_shortDescription> +- <_description>French (Canada)</_description> ++ <shortDescription>fr</shortDescription> ++ <description>French (Canada)</description> + <languageList><iso639Id>fra</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>kut</name> +- <_shortDescription>kut</_shortDescription> +- <_description>Kutenai</_description> ++ <shortDescription>kut</shortDescription> ++ <description>Kutenai</description> + </configItem> + </variant> + <variant> + <configItem> + <name>shs</name> +- <_shortDescription>shs</_shortDescription> +- <_description>Secwepemctsin</_description> ++ <shortDescription>shs</shortDescription> ++ <description>Secwepemctsin</description> + </configItem> + </variant> + <variant> + <configItem> + <name>sun_type6</name> +- <_description>Multilingual (Canada, Sun Type 6/7)</_description> ++ <description>Multilingual (Canada, Sun Type 6/7)</description> + </configItem> + </variant> + </variantList> +@@ -88,8 +88,8 @@ + <layout> + <configItem> + <name>de</name> +- <_shortDescription>de</_shortDescription> +- <_description>German</_description> ++ <shortDescription>de</shortDescription> ++ <description>German</description> + <languageList> + <iso639Id>ger</iso639Id> + </languageList> +@@ -98,7 +98,7 @@ + <variant> + <configItem> + <name>us</name> +- <_description>German (US keyboard with German letters)</_description> ++ <description>German (US keyboard with German letters)</description> + <languageList> + <iso639Id>eng</iso639Id> + </languageList> +@@ -107,7 +107,7 @@ + <variant> + <configItem> + <name>hu</name> +- <_description>German (with Hungarian letters and no dead keys)</_description> ++ <description>German (with Hungarian letters and no dead keys)</description> + <languageList> + <iso639Id>ger</iso639Id> + <iso639Id>hun</iso639Id> +@@ -117,7 +117,7 @@ + <variant> + <configItem> + <name>sun_type6</name> +- <_description>German (Sun Type 6/7)</_description> ++ <description>German (Sun Type 6/7)</description> + </configItem> + </variant> + </variantList> +@@ -125,15 +125,15 @@ + <layout> + <configItem> + <name>ir</name> +- <_shortDescription>fa</_shortDescription> +- <_description>Persian</_description> ++ <shortDescription>fa</shortDescription> ++ <description>Persian</description> + <languageList><iso639Id>per</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>ave</name> +- <_description>Avestan</_description> ++ <description>Avestan</description> + <languageList><iso639Id>ave</iso639Id></languageList> + </configItem> + </variant> +@@ -142,21 +142,21 @@ + <layout> + <configItem> + <name>lt</name> +- <_shortDescription>lt</_shortDescription> +- <_description>Lithuanian</_description> |