summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Depends.mk1
-rw-r--r--package/Makefile2
-rw-r--r--package/alsa-lib/Makefile12
-rw-r--r--package/alsa-utils/Config.in3
-rw-r--r--package/alsa-utils/Makefile12
-rw-r--r--package/dnsmasq/Makefile5
-rw-r--r--package/dropbear/files/dropbear.init2
7 files changed, 19 insertions, 18 deletions
diff --git a/package/Depends.mk b/package/Depends.mk
index 96d25a34a..db7aaeb4d 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -2,6 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
aircrack-ng-compile: openssl-compile libpcap-compile
+alsa-utils-compile: alsa-lib-compile
apr-util-compile: expat-compile apr-compile
arpd-compile: libpcap-compile libdnet-compile libevent-compile
arpwatch-compile: libpcap-compile
diff --git a/package/Makefile b/package/Makefile
index 424c7493b..60fc52a25 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -200,7 +200,7 @@ package-$(ADK_PACKAGE_LIBPCAP) += libpcap
package-$(ADK_PACKAGE_LIBPCIACCESS) += libpciaccess
package-$(ADK_PACKAGE_LIBPNG) += libpng
package-$(ADK_PACKAGE_LIBPRI) += libpri
-ifeq (${ADK_NATIVE},n)
+ifneq (${ADK_NATIVE},y)
package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
endif
package-$(ADK_COMPILE_LIBSHOUT) += libshout
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 01f97a8b8..78d0b08df 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= alsa-lib
-PKG_VERSION:= 1.0.20
+PKG_VERSION:= 1.0.21a
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6e9080ba1faa5d3739d14dd76c62d8dc
+PKG_MD5SUM:= 914685deb8c23cb4b940a4173cf8efe4
PKG_DESCR:= ALSA sound library
PKG_SECTION:= libs
PKG_URL:= http://www.alsa-project.org
@@ -17,12 +17,12 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ALSA_LIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-python
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
index 64fc5ab94..0c5982c40 100644
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@@ -2,6 +2,7 @@ config ADK_PACKAGE_ALSA_UTILS
prompt "alsa-utils........................ ALSA utilities / mixer"
tristate
default n
+ select ADK_PACKAGE_ALSA_LIB
+ select ADK_PACKAGE_LIBPTHREAD
help
-
http://www.alsa-project.org/
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 1b0dc7eee..6cbc92509 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -4,11 +4,11 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= alsa-utils
-PKG_VERSION:= 1.0.20
+PKG_VERSION:= 1.0.21
PKG_RELEASE:= 1
-PKG_MD5SUM:= 6837e673ef19da96d8bd2f9e18cd9574
+PKG_MD5SUM:= 3672287c2608040d111ce45495ba7602
PKG_DESCR:= ALSA mixer utility
-PKG_SECTION:= libs
+PKG_SECTION:= utils
PKG_URL:= http://www.alsa-project.org
PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
ftp://ftp.alsa-project.org/pub/utils/
@@ -19,10 +19,10 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --disable-alsamixer
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 0cfa55f25..711a575fc 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
-PKG_VERSION:= 2.49
+PKG_VERSION:= 2.51
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7ccc861d8a733474f9c0a0a127006ee9
+PKG_MD5SUM:= 97465261a6de5258a3c3edfe51ca16a4
PKG_DESCR:= A lightweight DNS and DHCP server
PKG_SECTION:= net
PKG_URL:= http://thekelleys.org.uk/dnsmasq
@@ -17,7 +17,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
BUILD_STYLE:= auto
-INSTALL_STYLE= manual
MAKE_FLAGS+= BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}"
ifneq ($(ADK_IPV6),y)
MAKE_FLAGS+= COPTS="${TCFLAGS} -DNO_IPV6"
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index b1623c919..09eea25e4 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -10,7 +10,7 @@ bothlog() {
case $1 in
autostop) ;;
autostart)
- [[ $dropbear_flags = NO ]] && exit 0
+ [[ "$dropbear_flags" = "NO" ]] && exit 0
exec sh $0 start
;;
start)