diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-22 19:27:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-22 19:27:18 +0100 |
| commit | 3becf571f6137f47f15ac3dfcbb64c5a4f4b3852 (patch) | |
| tree | 8b446cb5ed95bd078b2b7be13ae62c29e202d657 | |
| parent | f4704ae1ec6a30b3dde6424f317e5315757a65f0 (diff) | |
| parent | c7b25f4c5726394f2cc57b924bb7913a3882255e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
57 files changed, 509 insertions, 130 deletions
@@ -1 +1,3 @@ - uclibc N64 ABI on mips64{,el} targets does not work, nptl fork problem +- microblaze big endian: network card emulation fails +- microblaze: qemu reboot not working diff --git a/mk/build.mk b/mk/build.mk index 9242cc27a..86bb4bfcb 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -22,6 +22,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ diff --git a/mk/modules.mk b/mk/modules.mk index bb84317de..62d1abd45 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\ ,24)) $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\ + $(MODULES_DIR)/kernel/lib/oid_registry \ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \ ,25)) @@ -1106,7 +1107,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\ ifneq ($(ADK_KERNEL_NFS_FS),y) $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ $(MODULES_DIR)/kernel/fs/nfs/nfs \ -,30)) +,30, kmod-sunrpc)) endif #$(eval $(call KMOD_template,EXPORTFS,exportfs,\ diff --git a/mk/package.mk b/mk/package.mk index 24ef42594..da04288c1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -49,6 +49,7 @@ INSTALL_TARGET?= install MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 71f91f564..b5e9d119f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -28,9 +28,13 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) include $(TOPDIR)/mk/python.mk + ifeq ($(ADK_HOST_DARWIN),y) PYTHON:=/opt/local/bin/python2.7 endif +ifeq ($(ADK_HOST_OPENBSD),y) +PYTHON:=/usr/local/bin/python2.7 +endif ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 721c5757d..e2311e221 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,9 +5,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.27.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 -PKG_DESCR:= ALSA mixer utility +PKG_DESCR:= ALSA mixer/player utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread libgcc librt PKG_BUILDDEP:= alsa-lib @@ -35,7 +35,7 @@ endif alsa-utils-install: ${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin - ${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin + ${CP} ${WRKINST}/usr/bin/{aplay,amixer} ${IDIR_ALSA_UTILS}/usr/bin ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) ${INSTALL_BIN} ${WRKINST}/usr/bin/alsamixer \ ${IDIR_ALSA_UTILS}/usr/bin diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7f68bad96..f1e0d0666 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:= 62 +PKG_RELEASE:= 63 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index ed55ccc88..df2c493d7 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -10,12 +10,10 @@ touch /var/log/lastlog touch /var/log/wtmp ln -s /tmp /var/tmp -echo 0 > /proc/sys/kernel/printk - HOSTNAME= [[ -s /etc/hostname ]] && HOSTNAME=$(cat /etc/hostname) HOSTNAME=${HOSTNAME%%.*} -echo ${HOSTNAME:=linux} >/proc/sys/kernel/hostname +echo ${HOSTNAME:=openadk} >/proc/sys/kernel/hostname chown 0:0 /tmp; chmod 1777 /tmp diff --git a/package/base-files/src/init b/package/base-files/src/init index 003808452..ad519e96d 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -3,6 +3,7 @@ echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1 mount -nt proc proc /proc +echo 0 > /proc/sys/kernel/printk mount -o nosuid,nodev,noexec -t sysfs sysfs /sys [ ! -f /etc/notmpfs ] && { size=$(cat /etc/tmpfs 2>/dev/null) diff --git a/package/bc/Makefile b/package/bc/Makefile index d4af2f264..2a5c59900 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 PKG_DESCR:= An arbitrary precision calculator language PKG_SECTION:= utils -PKG_BUILDDEP:= flex-host +PKG_BUILDDEP:= m4-host flex-host PKG_URL:= http://www.gnu.org/software/bc/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ diff --git a/package/bison/Makefile b/package/bison/Makefile index 16c31b94e..ee268b641 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 032a7b7b9f1a6e278ccde73f82cec5c2 PKG_DESCR:= GNU parser generator PKG_SECTION:= lang -PKG_BUILDDEP:= flex-host bison-host +PKG_BUILDDEP:= m4-host flex-host bison-host PKG_URL:= http://www.gnu.org/software/bison/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in index 98e7f3de3..cf6ade9c5 100644 --- a/package/bison/patches/patch-Makefile_in +++ b/package/bison/patches/patch-Makefile_in @@ -6,8 +6,8 @@ $(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 ++ echo "3.0.1" >doc/bison.help.tmp ++ echo "no 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/dbus/Makefile b/package/dbus/Makefile index bb06e25d4..31596f56d 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b02e9c95027a416987b81f9893831061 PKG_DESCR:= DBUS daemon PKG_SECTION:= misc -PKG_DEPENDS:= libdbus +PKG_DEPENDS:= libdbus libexpat PKG_BUILDDEP:= expat util-linux PKG_URL:= http://dbus.freedesktop.org/ PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 13f8c1b20..4bce0928c 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 164df78f6f0093578a20bdd00335845f PKG_DESCR:= udev device manager PKG_SECTION:= utils +PKG_BUILDDEP:= gperf-host glib +PKG_DEPENDS:= glib PKG_URL:= http://www.gentoo.org/proj/en/eudev/ PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ PKG_LIBNAME:= libudev diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index 240249145..1c995edb9 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ PKG_CXX:= GMEDIASERVER +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 88160db91..5d7077306 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -8,7 +8,7 @@ PKG_NAME:= gmp PKG_DESCR:= GNU multiprecision arithmetic library PKG_SECTION:= libs PKG_URL:= http://gmplib.org/ -PKG_BUILDDEP:= flex-host bison-host m4-host +PKG_BUILDDEP:= m4-host flex-host bison-host PKG_LIBNAME:= libgmp PKG_OPTS:= dev diff --git a/package/json-c/Makefile b/package/json-c/Makefile new file mode 100644 index 000000000..de4f0e04e --- /dev/null +++ b/package/json-c/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= json-c +PKG_VERSION:= 0.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= aa02367d2f7a830bf1e3376f77881e98 +PKG_DESCR:= JSON library +PKG_SECTION:= libs +PKG_URL:= https://github.com/json-c/json-c/wiki +PKG_SITES:= https://s3.amazonaws.com/json-c_releases/releases/ +PKG_OPTS:= dev +PKG_NOPARALLEL:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,JSON_C,json-c,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +json-c-install: + $(INSTALL_DIR) $(IDIR_JSON_C)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjson*.so* \ + $(IDIR_JSON_C)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/knock/Makefile b/package/knock/Makefile index 91bd34739..04129c01b 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= knock -PKG_VERSION:= 0.5 +PKG_VERSION:= 0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= ca09d61458974cff90a700aba6120891 +PKG_MD5SUM:= e6e486be75b0d6433bac22a7de0e11f5 PKG_DESCR:= A port-knocking client PKG_SECTION:= firewall PKG_BUILDDEP:= libpcap @@ -22,6 +22,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_KNOCKD},${PKGSD_KNOCKD},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE CONFIGURE_ENV+= ac_cv_lib_pcap_pcap_open_live=yes knock-install: diff --git a/package/knock/patches/patch-Makefile_in b/package/knock/patches/patch-Makefile_in deleted file mode 100644 index ec90372ec..000000000 --- a/package/knock/patches/patch-Makefile_in +++ /dev/null @@ -1,24 +0,0 @@ ---- knock-0.5.orig/Makefile.in 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/Makefile.in 2009-06-13 09:49:14.000000000 +0200 -@@ -68,11 +68,16 @@ dist: distclean - (cd ..; tar czvf knock-$(VERSION).tar.gz knock-$(VERSION)) - - install: all -- $(INSTALL) -D -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd -- $(INSTALL) -D -m0755 knock $(DESTDIR)$(BINDIR)/knock -- $(INSTALL) -D -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1 -- $(INSTALL) -D -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1 -- $(INSTALL) -D -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf -+ $(INSTALL) -d -m0755 $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -d -m0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -d -m0755 $(DESTDIR)$(MANDIR)/man1 -+ $(INSTALL) -d -m0755 $(DESTDIR)/etc -+ $(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock -+ $(INSTALL) -m0755 knockd $(DESTDIR)$(SBINDIR)/knockd -+ $(INSTALL) -m0755 knock $(DESTDIR)$(BINDIR)/knock -+ $(INSTALL) -m0644 $(MANSRC)knockd.1 $(DESTDIR)$(MANDIR)/man1/knockd.1 -+ $(INSTALL) -m0644 $(MANSRC)knock.1 $(DESTDIR)$(MANDIR)/man1/knock.1 -+ $(INSTALL) -m0644 knockd.conf $(DESTDIR)/etc/knockd.conf - - clean: - rm -f *~ $(OBJDIR)*.o $(MANSRC)*.1 diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c index 7d8512c96..e3a2d2955 100644 --- a/package/knock/patches/patch-src_knockd_c +++ b/package/knock/patches/patch-src_knockd_c @@ -1,20 +1,23 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- knock-0.5.orig/src/knockd.c 2005-06-27 07:11:34.000000000 +0200 -+++ knock-0.5/src/knockd.c 2009-06-01 21:43:53.000000000 +0200 -@@ -46,6 +46,7 @@ - #include <syslog.h> - #include <pcap.h> - #include <errno.h> -+#include <linux/limits.h> - #include "list.h" - - static char version[] = "0.5"; -@@ -1064,7 +1065,7 @@ char* get_ip(const char* iface, char *bu - return(NULL); - } - -- bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name)); -+ memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name)); - strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1); - ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; - if(ioctl(s, SIOCGIFADDR, &ifr)) { +--- knock-0.6.orig/src/knockd.c 2013-04-08 20:11:56.000000000 +0200 ++++ knock-0.6/src/knockd.c 2014-01-16 16:59:04.000000000 +0100 +@@ -28,8 +28,8 @@ + #include <ctype.h> + #include <string.h> + #include <fcntl.h> +-#if defined(__FreeBSD__) || defined(__APPLE__) + #include <limits.h> ++#if defined(__FreeBSD__) || defined(__APPLE__) + #include <sys/socket.h> + #include <netinet/in_systm.h> + #endif +@@ -40,10 +40,6 @@ + #include <netinet/udp.h> + #include <netinet/ip_icmp.h> + #include <net/if.h> +-#if !defined(__FreeBSD__) && !defined(__APPLE__) +-#include <bits/time.h> +-#include <linux/limits.h> +-#endif + #include <sys/types.h> + #include <sys/wait.h> + #include <sys/ioctl.h> diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile index aadcd7a17..e4adff641 100644 --- a/package/libIDL/Makefile +++ b/package/libIDL/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 531fbc1b40b80dd1d6f3b5e76b99067c PKG_DESCR:= libraries for Interface Definition Language files PKG_SECTION:= libs PKG_DEPENDS:= glib -PKG_BUILDDEP:= glib-host glib flex-host bison-host libIDL-host +PKG_BUILDDEP:= glib-host glib m4-host flex-host bison-host libIDL-host PKG_URL:= http://www.gnome.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/ PKG_LIBNAME:= libidl diff --git a/package/libjson/Makefile b/package/libjson/Makefile new file mode 100644 index 000000000..6520bd419 --- /dev/null +++ b/package/libjson/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libjson +PKG_VERSION:= 7.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 82f3fcbf9f8cf3c4e25e1bdd77d65164 +PKG_DESCR:= JSON library +PKG_SECTION:= libs +PKG_URL:= http://sourceforge.net/projects/libjson/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjson/} +PKG_OPTS:= dev + +PKG_NOPARALLEL:= 1 + +DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.zip +WRKDIST= ${WRKDIR}/${PKG_NAME} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBJSON,libjson,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +MAKE_FILE:= makefile +FAKE_FLAGS+= prefix=${WRKINST}/usr +CONFIG_STYLE:= manual + +libjson-install: + $(INSTALL_DIR) $(IDIR_LIBJSON)/usr/lib + $(CP) $(WRKINST)/usr/lib/libjson*.so* \ + $(IDIR_LIBJSON)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libjson/patches/patch-makefile b/package/libjson/patches/patch-makefile new file mode 100644 index 000000000..919c6308c --- /dev/null +++ b/package/libjson/patches/patch-makefile @@ -0,0 +1,50 @@ +--- libjson.orig/makefile 2014-01-17 20:38:29.584543459 +0100 ++++ libjson/makefile 2014-01-17 20:38:14.372460375 +0100 +@@ -128,7 +128,7 @@ objects = internalJSONNode.o JSON + JSONDebug.o JSONIterators.o JSONMemory.o JSONNode.o \ + JSONNode_Mutex.o JSONPreparse.o JSONStream.o JSONValidator.o \ + JSONWorker.o JSONWriter.o libjson.o +-OS=$(shell uname) ++OS=Linux + + # Defaults + ifeq ($(OS), Darwin) +@@ -158,8 +158,7 @@ srcdir ?= _internal/Source + CXX ?= c++ + AR ?= ar + PIC ?= PIC +-BUILD_TYPE ?= "default" +-SHARED ?= "1" ++SHARED ?= 1 + + + # Internal Variables +@@ -237,18 +236,16 @@ endif + + # Compile object files + $(objdir)/%.o: $(srcdir)/%.cpp +- $(CXX) $< -o $@ -c $(CXXFLAGS) ++ $(CXX) $< -o $@ -c $(CPPFLAGS) $(CXXFLAGS) + + ifeq ($(SHARED),1) + install: banner install_headers $(lib_target) + @echo "Install shared library" ++ mkdir -p $(inst_path) + cp -f ./$(lib_target) $(inst_path) + cd $(inst_path) ; \ + ln -sf $(lib_target) $(libname_shared_major_version) ; \ + ln -sf $(libname_shared_major_version) $(libname_shared) +-ifneq ($(OS),Darwin) +- ldconfig +-endif + @echo "Install shared library: Done." + else + install: banner install_headers $(lib_target) +@@ -266,7 +263,6 @@ install_headers: banner + cp -r ./$(srcdir)/JSONDefs $(include_path)/$(libname_hdr)/$(srcdir) + chmod -R a+r $(include_path)/$(libname_hdr) + find $(include_path)/$(libname_hdr) -type d -exec chmod a+x {} \; +- cp -rv $(srcdir)/Dependencies/ $(include_path)/$(libname_hdr)/$(srcdir) + @echo "Install header files: Done." + + clean: banner diff --git a/package/libnl/Makefile b/package/libnl/Makefile index e96cfe686..45b24cca2 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= 2e1c889494d274aca24ce5f6a748e66e PKG_DESCR:= Netlink library PKG_SECTION:= libs -PKG_BUILDDEP:= flex-host +PKG_BUILDDEP:= m4-host flex-host PKG_URL:= http://www.infradead.org/~tgr/libnl/ PKG_SITES:= http://www.infradead.org/~tgr/libnl/files/ PKG_NOPARALLEL:= 1 diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 44d6126ef..51b470aae 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 33ba2f10f3a402cb5d34f5e2a904794a PKG_DESCR:= a low-level packet capture library PKG_SECTION:= libs -PKG_BUILDDEP:= flex-host bison-host libnl +PKG_BUILDDEP:= m4-host flex-host bison-host libnl PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ PKG_OPTS:= dev diff --git a/package/libsndfile/Makefile b/package/libsndfile/Makefile new file mode 100644 index 000000000..b1663a23c --- /dev/null +++ b/package/libsndfile/Makefile @@ -0,0 +1,25 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libsndfile +PKG_VERSION:= 1.0.25 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e2b7bb637e01022c7d20f95f9c3990a2 +PKG_DESCR:= reading and writing files containing sampled sound +PKG_SECTION:= libs +PKG_URL:= http://www.mega-nerd.com/libsndfile/ +PKG_SITES:= http://www.mega-nerd.com/libsndfile/files/ +PKG_OPTS:= dev + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSNDFILE,libsndfile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +libsndfile-install: + $(INSTALL_DIR) $(IDIR_LIBSNDFILE)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsndfile*.so* \ + $(IDIR_LIBSNDFILE)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtool/Makefile b/package/libtool/Makefile index adfd6f4cc..4d4c8c4c8 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 3 PKG_MD5SUM:= d2f3b7d4627e69e13514a40e72a24d50 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= lang -PKG_BUILDDEP:= libtool-host +PKG_BUILDDEP:= m4-host libtool-host PKG_URL:= http://www.gnu.org/software/libtool/ PKG_SITES:= ${MASTER_SITE_GNU:=libtool/} PKG_LIBNAME:= libltdl diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 4b01731bc..18eda96b6 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libupnp -PKG_VERSION:= 1.6.6 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 8918dcf7428cd119d0c8275765ff2833 +PKG_VERSION:= 1.6.19 +PKG_RELEASE:= 1 +PKG_MD5SUM:= ee16e5d33a3ea7506f38d71facc057dd PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library PKG_SECTION:= libs PKG_BUILDDEP:= autotool diff --git a/package/libx264/Makefile b/package/libx264/Makefile index 1936ad533..de7c6a56f 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -4,16 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libx264 -# actually is snapshot x264-snapshot-20131010-2245 -PKG_VERSION:= 1.0 -PKG_RELEASE:= 3 -PKG_MD5SUM:= e6718029b4bc955f1dbb9bdafeed3ac0 +# actually is git checkout from 22.01.2014 +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304 PKG_DESCR:= H264 encoding library PKG_SECTION:= libs PKG_URL:= http://www.videolan.org/developers/x264.html PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_BUILDDEP_IBM_X40:= yasm-host + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile index e82e9bf2d..cd8a9f198 100644 --- a/package/libx264/patches/patch-Makefile +++ b/package/libx264/patches/patch-Makefile @@ -1,6 +1,6 @@ ---- libx264-1.0.orig/Makefile 2013-10-10 22:45:04.000000000 +0200 -+++ libx264-1.0/Makefile 2013-10-12 17:50:05.000000000 +0200 -@@ -118,7 +118,7 @@ endif +--- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100 ++++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100 +@@ -117,7 +117,7 @@ endif # NEON optims ifeq ($(ARCH),ARM) diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure index dd0097aeb..3fdcd36fd 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -1,6 +1,6 @@ ---- libx264-1.0.orig/configure 2013-10-10 22:45:04.000000000 +0200 -+++ libx264-1.0/configure 2013-10-12 17:49:39.000000000 +0200 -@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then +--- libx264-1.0.1.orig/configure 2014-01-22 11:20:21.000000000 +0100 ++++ libx264-1.0.1/configure 2014-01-22 11:29:13.000000000 +0100 +@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then elif [ $ARCH = ARM ]; then # arm-gcc-4.2 produces incorrect output with -ffast-math # and it doesn't save any speed anyway on 4.4, so disable it @@ -12,7 +12,7 @@ fi if cc_check '' -fno-tree-vectorize ; then -@@ -1125,6 +1125,7 @@ bindir=$bindir +@@ -1147,6 +1147,7 @@ bindir=$bindir libdir=$libdir includedir=$includedir ARCH=$ARCH @@ -20,12 +20,3 @@ SYS=$SYS CC=$CC CFLAGS=$CFLAGS -@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264 - AR=$AR - RANLIB=$RANLIB - STRIP=$STRIP --AS=$AS -+AS=$CC - ASFLAGS=$ASFLAGS - RC=$RC - RCFLAGS=$RCFLAGS diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 684c08f27..da3e2e334 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.18.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia @@ -23,7 +23,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_OPUS +PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -112,6 +112,13 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y) PKG_FDEPENDS+= libopus endif +PKGFD_WITH_PULSE:= enable PULSE support +PKGFS_WITH_PULSE:= pulseaudio +PKGFB_WITH_PULSE:= pulseaudio +ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y) +PKG_FDEPENDS+= pulseaudio +endif + PKGFD_WITH_HTTPD:= enable HTTP output include ${TOPDIR}/mk/package.mk @@ -123,7 +130,6 @@ TARGET_CFLAGS+= -std=gnu99 CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --disable-jack \ --disable-fifo \ - --disable-pulse \ --disable-oss \ --disable-bzip2 \ --disable-libwrap \ @@ -142,6 +148,12 @@ else CONFIGURE_ARGS+= --disable-httpd-output endif +ifneq (${ADK_PACKAGE_MPD_WITH_PULSE},) +CONFIGURE_ARGS+= --enable-pulse +else +CONFIGURE_ARGS+= --disable-pulse +endif + ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) CONFIGURE_ARGS+= --enable-alsa else diff --git a/package/mpdbox/Makefile b/package/mpdbox/Makefile new file mode 100644 index 000000000..fd164e8ad --- /dev/null +++ b/package/mpdbox/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= mpdbox +PKG_VERSION:= 1.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= ac0dc1cc7141c1eca66d8ddd98574e0b +PKG_DESCR:= MPD web interface +PKG_SECTION:= multimedia +PKG_URL:= http://www.openadk.org/cgi-bin/gitweb.cgi?p=mpdbox.git;a=summary +PKG_SITES:= http://www.openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MPDBOX,mpdbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +mpdbox-install: + $(INSTALL_DIR) $(IDIR_MPDBOX)/srv/www/htdocs + $(CP) $(WRKBUILD)/* \ + $(IDIR_MPDBOX)/srv/www/htdocs + $(CP) $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc.example \ + $(IDIR_MPDBOX)/srv/www/htdocs/inc/config.inc + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 7303c86e7..d1baa41e4 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mt-daapd PKG_VERSION:= 0.2.4.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 67bef9fb14d487693b0dfb792c3f1b05 PKG_DESCR:= a multi-threaded DAAP daemon PKG_SECTION:= multimedia diff --git a/package/mt-daapd/patches/patch-src_mp3-scanner_c b/package/mt-daapd/patches/patch-src_mp3-scanner_c new file mode 100644 index 000000000..e5defb78f --- /dev/null +++ b/package/mt-daapd/patches/patch-src_mp3-scanner_c @@ -0,0 +1,10 @@ +--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c 2008-04-19 21:17:23.000000000 +0200 ++++ mt-daapd-0.2.4.2/src/mp3-scanner.c 2014-01-20 12:19:42.000000000 +0100 +@@ -40,6 +40,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + + #include <netinet/in.h> /* htons and friends */ + #include <sys/stat.h> diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index 5e044ded4..b82b4ebb8 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -4,14 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ndisc6 -PKG_VERSION:= 0.9.8 +PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= cb8d70564b8d40aae95e19592c6be183 +PKG_MD5SUM:= 50cb4c19606cf6ff2b7388e71832f579 PKG_DESCR:= ICMPv6 Neighbour Discovery tools PKG_SECTION:= ipv6 PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/ndisc6/ +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + PKG_SUBPKGS:= NDISC6 RDISC6 TCPTRACEROUTE6 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 18845a0a5..ec7cb4377 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.8 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fb48630b7c145fb9d6602a79c6eaab11 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs -PKG_DEPENDS:= kmod-nfsd keyutils libtirpc rpcbind libdevmapper libpthread +PKG_DEPENDS:= keyutils libtirpc rpcbind libdevmapper libpthread PKG_FDEPENDS:= $(PKG_DEPENDS) PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs @@ -20,6 +20,12 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_LIBC_DEPENDS:= uclibc eglibc glibc +PKG_SUBPKGS:= NFS_UTILS NFS_UTILS_CLIENT NFS_UTILS_SERVER +PKGSS_NFS_UTILS_CLIENT:=kmod-nfs-fs +PKGSD_NFS_UTILS_CLIENT:=NFS client utilities (mount) +PKGSS_NFS_UTILS_SERVER:=kmod-nfsd +PKGSD_NFS_UTILS_SERVER:=NFS server daemons and utilities + PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) PKGFS_WITH_KERBEROS:= libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss @@ -34,6 +40,8 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION})) ifeq ($(ADK_NATIVE),) KRB5INC:= ${STAGING_TARGET_DIR}/usr @@ -63,26 +71,31 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ --with-tirpcinclude=${TIRPCINC} \ --disable-uuid -nfs-utils-install: - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin - ${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin - ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc +nfs-utils-client-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS_CLIENT}/sbin + ${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS_CLIENT}/sbin + +nfs-utils-server-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS_SERVER}/usr/sbin ${IDIR_NFS_UTILS_SERVER}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \ - ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ + ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS_SERVER}/etc/exports ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) - ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc + ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS_SERVER}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \ - ${IDIR_NFS_UTILS}/usr/sbin/ + ${IDIR_NFS_UTILS_SERVER}/usr/sbin/ endif +nfs-utils-install: + ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc + ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 2a2e957dd..07ae9cc1a 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PPTPD,pptpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile new file mode 100644 index 000000000..eba650096 --- /dev/null +++ b/package/pulseaudio/Makefile @@ -0,0 +1,70 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pulseaudio +PKG_VERSION:= 4.0 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 591f211db2790a7e4d222f2dc6858db3 +PKG_DESCR:= a sound system for POSIX OSes +PKG_SECTION:= multimedia +PKG_DEPENDS:= libltdl json-c libsndfile libudev libspeex libncurses +PKG_DEPENDS+= libflac libvorbis libogg libuuid libsndfile dbus +PKG_DEPENDS+= libgcc libpthread librt alsa-lib libsamplerate +PKG_BUILDDEP:= libtool json-c libsndfile eudev speex libsndfile +PKG_BUILDDEP+= flac libvorbis libogg util-linux dbus ncurses alsa-lib +PKG_BUILDDEP+= libsamplerate +PKG_URL:= http://www.freedesktop.org/wiki/Software/PulseAudio/ +PKG_SITES:= http://freedesktop.org/software/pulseaudio/releases/ +PKG_OPTS:= dev + +PKG_LIBC_DEPENDS:= uclibc eglibc glibc + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PULSEAUDIO,pulseaudio,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE +CONFIGURE_ARGS+= --disable-systemd \ + --disable-manpages \ + --disable-neon-opt \ + --disable-x11 \ + --disable-avahi \ + --disable-lirc \ + --disable-openssl \ + --disable-orc \ + --disable-libwrap \ + --disable-oss \ + --disable-esound \ + --disable-jack \ + --disable-gconf \ + --enable-samplerate \ + --enable-alsa \ + --enable-dbus \ + --enable-udev \ + --with-speex + +pulseaudio-install: + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/dbus-1 + $(CP) $(WRKINST)/etc/dbus-1/* \ + $(IDIR_PULSEAUDIO)/etc/dbus-1 + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/etc/pulse + $(CP) $(WRKINST)/etc/pulse/* \ + $(IDIR_PULSEAUDIO)/etc/pulse + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ + $(IDIR_PULSEAUDIO)/usr/bin + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpulse*.so* \ + $(IDIR_PULSEAUDIO)/usr/lib + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio + $(CP) $(WRKINST)/usr/lib/pulseaudio/libpulse*.so* \ + $(IDIR_PULSEAUDIO)/usr/lib/pulseaudio + $(INSTALL_DIR) $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules + $(CP) $(WRKINST)/usr/lib/pulse-$(PKG_VERSION)/modules/*.so \ + $(IDIR_PULSEAUDIO)/usr/lib/pulse-$(PKG_VERSION)/modules + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pulseaudio/files/pulseaudio.init b/package/pulseaudio/files/pulseaudio.init new file mode 100644 index 000000000..f928e3fe6 --- /dev/null +++ b/package/pulseaudio/files/pulseaudio.init @@ -0,0 +1,32 @@ +#!/bin/sh +#PKG pulseaudio +#INIT 60 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pulseaudio:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + if [ ! -d /var/run/pulse ]; then + mkdir -p /var/run/pulse/ && chown -R pulse.pulse /var/run/pulse && chmod 750 /var/run/pulse + fi + if [ ! -d /var/lib/pulse ]; then + mkdir -p /var/lib/pulse/.pulse-cookie && chown -R pulse.pulse /var/lib/pulse && chmod 750 /var/lib/pulse + fi + /usr/bin/pulseaudio $pulseaudio_flags + ;; +stop) + kill $(pgrep -f /usr/bin/pulseaudio) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + exit 1 +esac +exit $? diff --git a/package/pulseaudio/files/pulseaudio.postinst b/package/pulseaudio/files/pulseaudio.postinst new file mode 100644 index 000000000..b339de93f --- /dev/null +++ b/package/pulseaudio/files/pulseaudio.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pulseaudio pulseaudio NO +gid=$(get_next_gid) +add_user pulse $(get_next_uid) $gid /var/run/pulse +add_group pulse $gid +add_rcconf pulseaudio_flags pulseaudio_flags "-D --system --disallow-exit --disallow-module-loading --disable-shm --exit-idle-time=-1 --realtime=false" diff --git a/package/qingy/Makefile b/package/qingy/Makefile index 381d252d8..4e095f2b2 100644 --- a/package/qingy/Makefile +++ b/package/qingy/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qingy PKG_VERSION:= 1.0.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1e0912655e240adfd0ce5ced30bbc685 PKG_DESCR:= a DirectFB getty replacement PKG_SECTION:= misc diff --git a/package/qingy/patches/patch-src_libraries_misc_h b/package/qingy/patches/patch-src_libraries_misc_h new file mode 100644 index 000000000..22ee9c890 --- /dev/null +++ b/package/qingy/patches/patch-src_libraries_misc_h @@ -0,0 +1,10 @@ +--- qingy-1.0.0.orig/src/libraries/misc.h 2008-11-27 10:29:01.000000000 +0100 ++++ qingy-1.0.0/src/libraries/misc.h 2014-01-20 07:38:44.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <config.h> + #endif + ++#include <time.h> + #include "qingy_constants.h" + + /* Computes the integer part of the base 10 log */ diff --git a/package/qingy/patches/patch-src_libraries_vt_c b/package/qingy/patches/patch-src_libraries_vt_c new file mode 100644 index 000000000..84a9842a8 --- /dev/null +++ b/package/qingy/patches/patch-src_libraries_vt_c @@ -0,0 +1,39 @@ +--- qingy-1.0.0.orig/src/libraries/vt.c 2008-11-25 12:21:28.000000000 +0100 ++++ qingy-1.0.0/src/libraries/vt.c 2014-01-20 07:53:43.000000000 +0100 +@@ -98,14 +98,15 @@ static int getfd() + int switch_to_tty(int tty) + { + char *ttyname = create_tty_name(tty); ++ FILE *_stdin, *_stdout, *_stderr; + + if (!ttyname) return 0; + /* we set stdin, stdout and stderr to the new tty */ +- stdin = freopen(ttyname, "r", stdin); +- stdout = freopen(ttyname, "w", stdout); +- stderr = freopen(ttyname, "w", stderr); ++ _stdin = freopen(ttyname, "r", stdin); ++ _stdout = freopen(ttyname, "w", stdout); ++ _stderr = freopen(ttyname, "w", stderr); + free(ttyname); +- if (!stdin || !stdout || !stderr) return 0; ++ if (!_stdin || !_stdout || !_stderr) return 0; + + return 1; + } +@@ -197,6 +198,7 @@ void stderr_disable(void) + void stderr_enable(int *vt) + { + char *ttyname; ++ FILE *_stderr; + + if (!vt) + ttyname = create_tty_name(get_active_tty()); +@@ -205,7 +207,7 @@ void stderr_enable(int *vt) + + if (!ttyname) return; + +- stderr = fopen(ttyname, "w"); ++ _stderr = freopen(ttyname, "w", stderr); + free(ttyname); + } + diff --git a/package/speex/Makefile b/package/speex/Makefile index bacc1919e..986e12f3f 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= speex PKG_VERSION:= 1.2rc1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= c4438b22c08e5811ff10e2b06ee9b9ae PKG_DESCR:= an open source patent-free speech compression codec PKG_SECTION:= libs @@ -26,6 +26,6 @@ XAKE_FLAGS+= bin_PROGRAMS="" libspeex-install: ${INSTALL_DIR} ${IDIR_LIBSPEEX}/usr/lib - ${CP} ${WRKINST}/usr/lib/libspeex.so* ${IDIR_LIBSPEEX}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libspeex*.so* ${IDIR_LIBSPEEX}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tcl/Makefile b/package/tcl/Makefile index f45317d8f..df231ffdc 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcl PKG_VERSION:= 8.5.9 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 8512d8db3233041dd68a81476906012a PKG_DESCR:= TCL scripting language PKG_SECTION:= lang diff --git a/package/tcl/patches/patch-generic_tcl_h b/package/tcl/patches/patch-generic_tcl_h new file mode 100644 index 000000000..6263ba8f1 --- /dev/null +++ b/package/tcl/patches/patch-generic_tcl_h @@ -0,0 +1,11 @@ +--- tcl8.5.9.orig/generic/tcl.h 2010-08-04 19:02:39.000000000 +0200 ++++ tcl8.5.9/generic/tcl.h 2014-01-20 11:18:37.000000000 +0100 +@@ -19,6 +19,8 @@ + #ifndef _TCL + #define _TCL + ++#include <sys/stat.h> ++ + /* + * For C++ compilers, use extern "C" + */ diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in index 7c4a9ca93..38340c80b 100644 --- a/package/tcl/patches/patch-unix_Makefile_in +++ b/package/tcl/patches/patch-unix_Makefile_in @@ -1,5 +1,5 @@ ---- tcl8.5.8.orig/unix/Makefile.in 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/Makefile.in 2009-11-20 21:59:51.000000000 +0100 +--- tcl8.5.9.orig/unix/Makefile.in 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/Makefile.in 2014-01-20 11:13:05.000000000 +0100 @@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) @@ -10,7 +10,7 @@ # Flags to pass to the linker LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -745,7 +746,7 @@ install-binaries: binaries +@@ -737,7 +738,7 @@ install-binaries: binaries fi @EXTRA_INSTALL_BINARIES@ diff --git a/package/tcl/patches/patch-unix_configure b/package/tcl/patches/patch-unix_configure index 393c2b45e..380b8d591 100644 --- a/package/tcl/patches/patch-unix_configure +++ b/package/tcl/patches/patch-unix_configure @@ -1,6 +1,6 @@ ---- tcl8.5.8.orig/unix/configure 2009-11-13 19:38:45.000000000 +0100 -+++ tcl8.5.8/unix/configure 2011-01-13 16:22:59.000000000 +0100 -@@ -7968,9 +7968,6 @@ fi +--- tcl8.5.9.orig/unix/configure 2010-09-08 19:40:48.000000000 +0200 ++++ tcl8.5.9/unix/configure 2014-01-20 11:13:05.000000000 +0100 +@@ -7983,9 +7983,6 @@ fi LD_SEARCH_FLAGS="" LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" @@ -10,7 +10,7 @@ PLAT_OBJS='${MAC_OSX_OBJS}' PLAT_SRCS='${MAC_OSX_SRCS}' -@@ -17646,11 +17643,6 @@ _ACEOF +@@ -17578,11 +17575,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF @@ -22,7 +22,7 @@ #define TCL_WIDE_CLICKS 1 _ACEOF -@@ -18817,7 +18809,7 @@ HTML_DIR='$(DISTDIR)/html' +@@ -18749,7 +18741,7 @@ HTML_DIR='$(DISTDIR)/html' # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index b526371ef..022a978c1 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -34,6 +34,7 @@ openbsd() { pkg_add -v intltool pkg_add -v screen-- pkg_add -v vim--no_x11 + pkg_add -v py-libxml } netbsd() { diff --git a/scripts/m4 b/scripts/m4 deleted file mode 100755 index 8456bce21..000000000 --- a/scripts/m4 +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -if [ -z "$(which gm4 2>/dev/null)" ];then - /usr/bin/m4 "$@" -else - gm4 "$@" -fi diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi new file mode 100644 index 000000000..82f9b77a8 --- /dev/null +++ b/target/arm/kernel/raspberry-pi @@ -0,0 +1,17 @@ +CONFIG_ARM=y +CONFIG_FIQ=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_ARCH_BCM2708=y +CONFIG_MACH_BCM2708=y +CONFIG_BCM2708_GPIO=y +CONFIG_BCM2708_VCMEM=y +CONFIG_BCM2708_DMAER=y +CONFIG_PREEMPT=y +CONFIG_AEABI=y +CONFIG_VFP=y +CONFIG_DTC=y +CONFIG_OF=y +CONFIG_BCM2708_VCHIQ=y diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 3fa60178e..3f9d978f1 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_INPUT select ADK_PACKAGE_BCM2835_FIRMWARE select ADK_TARGET_KERNEL_ZIMAGE + select ADK_USE_KERNEL_MINICONFIG help Raspberry PI diff --git a/target/config/Config.in b/target/config/Config.in index 970bd8516..2b9d0f396 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -162,6 +162,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI choice prompt "Qemu MICROBLAZE Emulation" diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index c22ae210c..11d64d044 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -110,7 +110,7 @@ config ADK_KERNEL_NFSD_V4 default n config ADK_KPACKAGE_KMOD_NFSD - prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" + prompt "kmod-nfsd......................... NFS server support" tristate default n select ADK_KERNEL_EXPORTFS diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 8bf3aafe6..491b04c92 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -26,6 +26,7 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_NO_HZ=y CONFIG_PRINTK=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_BUG=n CONFIG_FUTEX=y CONFIG_EPOLL=y diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index e8862ea44..519250f0b 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -1,13 +1,16 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n + select ADK_PACKAGE_MPDBOX select ADK_PACKAGE_LIBMPDCLIENT select ADK_PACKAGE_MPC select ADK_PACKAGE_MPD select ADK_PACKAGE_MPD_WITH_ALSA + select ADK_PACKAGE_MPD_WITH_PULSE select ADK_PACKAGE_MPD_WITH_MP3 select ADK_PACKAGE_MPD_WITH_MP4 select ADK_PACKAGE_MPD_WITH_OGG + select ADK_PACKAGE_MPD_WITH_OPUS select ADK_PACKAGE_MPD_WITH_FLAC select ADK_PACKAGE_MPD_WITH_WAV select ADK_PACKAGE_MPD_WITH_MMS @@ -16,7 +19,12 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE select ADK_PACKAGE_MPD_WITH_HTTPD + select ADK_PACKAGE_NFS_UTILS + select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS + select ADK_PACKAGE_NFS_UTILS_CLIENT + select ADK_PACKAGE_CPUFREQUTILS select ADK_PACKAGE_FILE + select ADK_PACKAGE_HTOP select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_DROPBEAR_WITH_UTMP select ADK_PACKAGE_FFMPEG |