summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/alsa-lib/Makefile2
-rw-r--r--package/alsa-lib/patches/patch-configure17
-rw-r--r--package/alsa-lib/patches/patch-configure_ac19
-rw-r--r--package/apr-util/Makefile2
-rw-r--r--package/apr/patches/patch-Makefile_in26
-rw-r--r--package/gcc/Makefile1
-rw-r--r--package/qemu/Makefile4
-rw-r--r--package/qemu/patches/patch-linux-user_syscall_c35
-rw-r--r--package/qemu/patches/patch-util_qemu-openpty_c11
-rw-r--r--package/tntnet/Makefile2
-rw-r--r--package/tntnet/files/tntnet.conf49
-rw-r--r--package/tntnet/files/tntnet.xml49
-rw-r--r--package/u-boot-imx6/Makefile2
13 files changed, 101 insertions, 118 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 8e101e0d9..6461e02f4 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
PKG_VERSION:= 1.0.28
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= c9e21b88a2b3e6e12ea7ba0f3b271fc3
PKG_DESCR:= sound library
PKG_SECTION:= libs/audio
diff --git a/package/alsa-lib/patches/patch-configure b/package/alsa-lib/patches/patch-configure
deleted file mode 100644
index 35b1c2569..000000000
--- a/package/alsa-lib/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- alsa-lib-1.0.28.orig/configure 2014-06-17 14:34:47.000000000 +0200
-+++ alsa-lib-1.0.28/configure 2014-06-28 22:00:55.656322468 +0200
-@@ -11929,14 +11929,6 @@ $as_echo "major $SND_LIB_MAJOR minor $SN
-
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
--if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
--cat <<EOF
-- Please, do not try to compile static and shared libraries together.
-- See INSTALL file for more details (do not use --enable-shared=yes with
-- --enable-static=yes).
--EOF
-- exit 1
--fi
-
-
- # Check whether --with-configdir was given.
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
new file mode 100644
index 000000000..631869f5c
--- /dev/null
+++ b/package/alsa-lib/patches/patch-configure_ac
@@ -0,0 +1,19 @@
+--- alsa-lib-1.0.28.orig/configure.ac 2014-06-17 14:34:19.000000000 +0200
++++ alsa-lib-1.0.28/configure.ac 2014-08-19 21:19:11.000000000 +0200
+@@ -72,16 +72,6 @@ AC_SUBST(LIBTOOL_VERSION_INFO)
+
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+
+-dnl Do not build static and shared libraries together
+-if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
+-cat <<EOF
+- Please, do not try to compile static and shared libraries together.
+- See INSTALL file for more details (do not use --enable-shared=yes with
+- --enable-static=yes).
+-EOF
+- exit 1
+-fi
+-
+ dnl ALSA configuration directory
+ AC_ARG_WITH(configdir,
+ AS_HELP_STRING([--with-configdir=dir],
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 9c27ef7b8..38dd3998a 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -6,7 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= apr-util
PKG_VERSION:= 1.5.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 05939f9a3ae0a4b314e4f8e467082019
+PKG_MD5SUM:= 71a11d037240b292f824ba1eb537b4e3
PKG_DESCR:= apache portable runtime utility library
PKG_SECTION:= libs/misc
PKG_DEPENDS:= libexpat apr
diff --git a/package/apr/patches/patch-Makefile_in b/package/apr/patches/patch-Makefile_in
new file mode 100644
index 000000000..9aa6768f7
--- /dev/null
+++ b/package/apr/patches/patch-Makefile_in
@@ -0,0 +1,26 @@
+--- apr-1.5.1.orig/Makefile.in 2014-03-17 16:10:26.000000000 +0100
++++ apr-1.5.1/Makefile.in 2014-08-15 22:13:18.000000000 +0200
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+- tools/gen_test_char.o tools/gen_test_char.lo \
+ include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+ etags `find . -name '*.[ch]'`
+
+-make_tools_dir:
+- $(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ $(APR_MKDIR) include/private
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 3311e12e6..345841962 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -67,6 +67,7 @@ CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \
--disable-libsanitizer \
--disable-libitm \
--disable-install-libiberty \
+ --enable-dependency-tracking \
--enable-cxx-flags="${TARGET_LDFLAGS}"
# disable honour cflags stuff
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 4ec4365d3..e1e04c72b 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= qemu
-PKG_VERSION:= 2.0.0
+PKG_VERSION:= 2.1.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= 2790f44fd76da5de5024b4aafeb594c2
+PKG_MD5SUM:= 6726977292b448cbc7f89998fac6983b
PKG_DESCR:= cpu and system emulator
PKG_SECTION:= sys/misc
PKG_DEPENDS:= zlib glib
diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c
deleted file mode 100644
index 11188ca90..000000000
--- a/package/qemu/patches/patch-linux-user_syscall_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100
-+++ qemu-1.7.1/linux-user/syscall.c 2014-04-04 16:51:08.292546548 +0200
-@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch
- //#include <sys/user.h>
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
-+#include <linux/version.h>
- #include <linux/wireless.h>
- #include <linux/icmp.h>
- #include "qemu-common.h"
-@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch
- #include <linux/utsname.h>
- #include <linux/cdrom.h>
- #include <linux/hdreg.h>
-+#ifdef NATIVE
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0)
- #include <linux/soundcard.h>
-+#else
-+#include <linux/soundcard.h.oss3>
-+#endif
-+#else
-+#include <linux/soundcard.h>
-+#endif
- #include <linux/kd.h>
- #include <linux/mtio.h>
- #include <linux/fs.h>
-@@ -400,7 +409,7 @@ static int sys_inotify_init1(int flags)
- #endif
- #define __NR_sys_ppoll __NR_ppoll
- _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
-- struct timespec *, timeout, const __sigset_t *, sigmask,
-+ struct timespec *, timeout, const sigset_t *, sigmask,
- size_t, sigsetsize)
- #endif
-
diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c
deleted file mode 100644
index ed524628a..000000000
--- a/package/qemu/patches/patch-util_qemu-openpty_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu-1.7.0.orig/util/qemu-openpty.c 2013-11-27 23:15:55.000000000 +0100
-+++ qemu-1.7.0/util/qemu-openpty.c 2014-03-14 09:05:17.280258135 +0100
-@@ -35,7 +35,7 @@
- #include "config-host.h"
- #include "qemu-common.h"
-
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- # include <pty.h>
- #elif defined CONFIG_BSD
- # include <termios.h>
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 8ba5332b5..1b4032854 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -54,7 +54,7 @@ tntnet-install:
${INSTALL_DIR} ${IDIR_TNTNET}/etc/tntnet
${INSTALL_DIR} ${IDIR_TNTNET}/usr/bin
${INSTALL_DIR} ${IDIR_TNTNET}/usr/lib/tntnet
- ${INSTALL_DATA} ./files/tntnet.{conf,properties} \
+ ${INSTALL_DATA} ./files/tntnet.{xml,properties} \
${IDIR_TNTNET}/etc/tntnet
${INSTALL_DATA} ./files/mime.conf \
${IDIR_TNTNET}/etc/tntnet
diff --git a/package/tntnet/files/tntnet.conf b/package/tntnet/files/tntnet.conf
deleted file mode 100644
index c51c47bc2..000000000
--- a/package/tntnet/files/tntnet.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# tntnet.conf
-
-PropertyFile /etc/tntnet/tntnet.properties
-Listen 0.0.0.0 80
-#SslListen 0.0.0.0 443 /etc/tntnet/tntnet.pem
-
-Daemon 1
-User tntnet
-Group tntnet
-CompPath /usr/lib/tntnet
-
-# set some limit to prevent DoS-attacks
-MaxRequestSize 1048576 # 1 MB
-
-#Dir /
-#Chroot /var/safedir
-PidFile /var/run/tntnet.pid
-MinThreads 2
-MaxThreads 4
-#ThreadStartDelay 0 # in ms
-#QueueSize 100
-#CompPath path
-#Load webapp # preload webapplication
-#BufferSize 16384
-#SocketReadTimeout 200
-#SocketWriteTimeout 10000
-#KeepAliveTimeout 15000
-#KeepAliveMax 100
-#SessionTimeout 300
-#CompLifetime 10
-#MaxRequestTime 600
-#ReportStateTime 1200
-
-#include /etc/tntnet.d/*.conf
-include /etc/tntnet/mime.conf
-
-# make demos callable
-#MapUrl ^/demos/controls$ redirect@tntnet /demos/controls/
-#MapUrl ^/demos/controls/(.+)\..* $1@controls
-#MapUrl ^/demos/controls/$ index@controls index
-#MapUrl ^/demos/controls/(.+) index@controls $1
-#MapUrl ^/demos/(.+)\..* $1@$1 $1
-#MapUrl ^/demos/(.+) $1@$1
-#MapUrl ^/demos/tntnet.jpg tntnet@hello
-
-# configure tntnet as a simple webserver
-DocumentRoot /www
-MapUrl (.*)/$ static@tntnet /$1/index.html
-MapUrl ^/(.*)$ static@tntnet /$1
diff --git a/package/tntnet/files/tntnet.xml b/package/tntnet/files/tntnet.xml
new file mode 100644
index 000000000..2d4f160d1
--- /dev/null
+++ b/package/tntnet/files/tntnet.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tntnet>
+ <mappings>
+ <mapping>
+ <target>static@tntnet</target>
+ <url>(.*)/$</url>
+ <pathinfo>/$1/index.html</pathinfo>
+ </mapping>
+ <mapping>
+ <target>static@tntnet</target>
+ <url>^/(.*)$</url>
+ <pathinfo>/$1</pathinfo>
+ </mapping>
+ </mappings>
+
+ <listeners>
+ <listener>
+ <ip>0.0.0.0</ip>
+ <port>80</port>
+ </listener>
+ </listeners>
+
+ <daemon>1</daemon>
+ <user>tntnet</user>
+ <group>tntnet</group>
+ <maxRequestSize>1048576</maxRequestSize>
+ <pidFile>/var/run/tntnet.pid</pidFile>
+ <minThreads>2</minThreads>
+ <maxThreads>4</maxThreads>
+ <documentRoot>/www</documentRoot>
+ <compPath>
+ <entry>/usr/lib/tntnet</entry>
+ </compPath>
+ <logging>
+ <rootlogger>INFO</rootlogger>
+ <loggers>
+ <logger>
+ <category>tntnet</category>
+ <level>INFO</level>
+ </logger>
+ </loggers>
+ <!-- <file>tntnet.log</file> --> <!--uncomment if you want to log to a file -->
+ <!-- <maxfilesize>1MB</maxfilesize> -->
+ <!-- <maxbackupindex>2</maxbackupindex> -->
+ <!-- <host>localhost:1234</host> --> <!-- # send log-messages with udp -->
+ </logging>
+
+ <include>/etc/tntnet/mime.conf</include>
+</tntnet>
diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile
index e54f9472a..43cb028e1 100644
--- a/package/u-boot-imx6/Makefile
+++ b/package/u-boot-imx6/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= base/boot
PKG_URL:= https://github.com/SolidRun/u-boot-imx6.git
PKG_SITES:= http://openadk.org/distfiles/
-PKG_SYSTEM_DEPENDS:= cubox-i hummingboard
+PKG_SYSTEM_DEPENDS:= solidrun-imx6
include $(ADK_TOPDIR)/mk/package.mk
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 02:53:28 +0000