diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-20 18:41:11 +0100 |
| commit | 272b9fb572a6b1f585cf6f4f4150b07f1c1537bf (patch) | |
| tree | 5ede8c935478f6db39bf8efc7ea14919e58d6aa1 /package | |
| parent | bde68f551d953927d476dc4f5ccd1c89ca001539 (diff) | |
| parent | ed95e17c2e88caff425eca534a794ea0c489fc5c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
109 files changed, 851 insertions, 592 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile index e5a910fac..a857cb6e2 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi -PKG_VERSION:= 0.6.30 -PKG_RELEASE:= 2 -PKG_MD5SUM:= e4db89a2a403ff4c47d66ac66fad1f43 +PKG_VERSION:= 0.6.31 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5c5329a9a..d9b7878b3 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 61 +PKG_RELEASE:= 62 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -72,6 +72,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_MICROBLAZE),y) + $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL),y) + $(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab +endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/package/binutils/patches/musl.patch b/package/binutils/patches/musl.patch deleted file mode 100644 index 4ea53c18f..000000000 --- a/package/binutils/patches/musl.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur binutils-2.22.orig/config.sub binutils-2.22/config.sub ---- binutils-2.22.orig/config.sub 2011-06-06 12:36:06.000000000 +0200 -+++ binutils-2.22/config.sub 2013-08-11 14:40:22.308115171 +0200 -@@ -126,6 +126,7 @@ - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1334,7 +1335,7 @@ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -linux-newlib* | -linux-uclibc* | -linux-musl* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/package/binutils/patches/patch-ld_Makefile_in b/package/binutils/patches/patch-ld_Makefile_in deleted file mode 100644 index ff1eeb88f..000000000 --- a/package/binutils/patches/patch-ld_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- binutils-2.21.orig/ld/Makefile.in 2010-11-05 11:34:22.000000000 +0100 -+++ binutils-2.21/ld/Makefile.in 2011-01-10 21:57:49.000000000 +0100 -@@ -422,7 +422,7 @@ TEXI2DVI = texi2dvi -I $(srcdir) -I $(BF - -I $(top_srcdir)/../libiberty - - AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ -- @INCINTL@ $(HDEFINES) $(CFLAGS) $(PLUGIN_CFLAGS) \ -+ @INCINTL@ $(HDEFINES) $(PLUGIN_CFLAGS) \ - -DLOCALEDIR="\"$(datadir)/locale\"" - - BFDLIB = ../bfd/libbfd.la -@@ -850,7 +850,7 @@ ld_new_LDADD = $(EMULATION_OFILES) $(EMU - # - @ENABLE_PLUGINS_TRUE@noinst_LTLIBRARIES = libldtestplug.la - @ENABLE_PLUGINS_TRUE@libldtestplug_la_SOURCES = testplug.c --@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = -g -O2 -+@ENABLE_PLUGINS_TRUE@libldtestplug_la_CFLAGS = - @ENABLE_PLUGINS_TRUE@libldtestplug_la_LDFLAGS = -no-undefined -rpath /nowhere - MAINTAINERCLEANFILES = configdoc.texi ld.1 ld.info - diff --git a/package/binutils/patches/patch-ltmain_sh b/package/binutils/patches/patch-ltmain_sh deleted file mode 100644 index 18a178908..000000000 --- a/package/binutils/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- binutils-2.21.orig/ltmain.sh 2010-01-09 22:11:32.000000000 +0100 -+++ binutils-2.21/ltmain.sh 2011-01-14 19:07:08.000000000 +0100 -@@ -4980,7 +4980,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/bison/patches/patch-Makefile_in.orig b/package/bison/patches/patch-Makefile_in.orig deleted file mode 100644 index c427a7033..000000000 --- a/package/bison/patches/patch-Makefile_in.orig +++ /dev/null @@ -1,13 +0,0 @@ ---- bison-3.0.1.orig/Makefile.in 2013-11-12 14:57:09.000000000 +0100 -+++ bison-3.0.1/Makefile.in 2013-11-27 18:39:58.000000000 +0100 -@@ -5134,8 +5134,8 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $( - doc/refcard.pdf: doc/refcard.tex - $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex - $(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 -+ bison$(EXEEXT) --version >doc/bison.help.tmp -+ bison$(EXEEXT) --help >>doc/bison.help.tmp - $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@ - - # Depend on configure to get version number changes. diff --git a/package/cairo/Makefile b/package/cairo/Makefile index a1015c603..30894cab5 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.10.2 -PKG_RELEASE:= 3 -PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f +PKG_VERSION:= 1.12.16 +PKG_RELEASE:= 1 +PKG_MD5SUM:= a1304edcdc99282f478b995ee5f8f854 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman @@ -17,7 +17,7 @@ PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ PKG_OPTS:= dev -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz |