diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 09:03:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-23 09:03:22 +0100 |
| commit | 1eadf796fec958bed24ec492603dba5bc790e167 (patch) | |
| tree | e6128ee8e24a80368489d81dca83f8f93f32368e | |
| parent | bf6f9b3575167dae9993a9a4b0086c8a2a276927 (diff) | |
| parent | 4d356d886b6c895112b920541ce1e063e7b68ee5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | package/libmodplug/Makefile | 8 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index 8f28b8e55..bb2b754aa 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -79,6 +79,7 @@ DEFCONFIG= ADK_DEBUG=n \ BUSYBOX_FEATURE_VI_REGEX_SEARCH=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n \ + ADK_KERNEL_BUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ diff --git a/package/libmodplug/Makefile b/package/libmodplug/Makefile index f08435ee4..421243c03 100644 --- a/package/libmodplug/Makefile +++ b/package/libmodplug/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libmodplug -PKG_VERSION:= 0.8.8.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= fddc3c704c5489de2a3cf0fedfec59db +PKG_VERSION:= 0.8.8.5 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5f30241db109d647781b784e62ddfaa1 PKG_DESCR:= a MOD player library PKG_SECTION:= libs PKG_URL:= http://modplug-xmms.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.4/} +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=modplug-xmms/libmodplug/0.8.8.5/} PKG_OPTS:= dev include $(TOPDIR)/mk/package.mk diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 40024fe97..3cb0517ac 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -235,7 +235,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS with the IRIX version of XFS. config ADK_KPACKAGE_KMOD_FUSE_FS - prompt "kmod-fs-fuse...................... Filesystem in Userspace support" + prompt "kmod-fuse-fs...................... Filesystem in Userspace support" tristate default n help |