diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/bluez | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/bluez')
| -rw-r--r-- | package/bluez/Makefile | 15 | ||||
| -rw-r--r-- | package/bluez/files/bluez.init | 3 | ||||
| -rw-r--r-- | package/bluez/ipkg/bluez.control | 5 |
3 files changed, 10 insertions, 13 deletions
diff --git a/package/bluez/Makefile b/package/bluez/Makefile index ff067cf0f..4dd1467a5 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -6,14 +6,18 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bluez -PKG_VERSION:= 4.12 +PKG_VERSION:= 4.40 PKG_RELEASE:= 1 -PKG_MD5SUM:= e599d7f4ed7e022c85e485934f29a340 -MASTER_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} +PKG_MD5SUM:= a25fa37c97c309338649f6a5fd4cea76 +PKG_DESCR:= bluetooth libraries and applications +PKG_SECTION:= bluetooth +PKG_DEPENDS:= kmod-bluetooth +PKG_URL:= http://www.bluez.org +PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,BLUEZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-tools \ @@ -40,8 +44,5 @@ post-install: ${IDIR_BLUEZ}/etc/bluetooth/ $(INSTALL_DATA) $(WRKINST)/etc/dbus-1/system.d/bluetooth.conf \ $(IDIR_BLUEZ)/etc/dbus-1/system.d - ${INSTALL_DIR} ${IDIR_BLUEZ}/etc/init.d - ${INSTALL_BIN} ./files/bluez.init \ - ${IDIR_BLUEZ}/etc/init.d/bluez include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init index 20c128ad0..6a61d38cd 100644 --- a/package/bluez/files/bluez.init +++ b/package/bluez/files/bluez.init @@ -1,5 +1,6 @@ #!/bin/sh -#FWINIT 90 +#PKG bluez +#INIT 90 . /etc/rc.conf case $1 in diff --git a/package/bluez/ipkg/bluez.control b/package/bluez/ipkg/bluez.control deleted file mode 100644 index 0b32376ad..000000000 --- a/package/bluez/ipkg/bluez.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: bluez -Priority: optional -Section: net -Description: Bluez libs and apps -Depends: kmod-bluetooth |