From 44f09b2c4ac51815b8996ff637b78c0a462e5382 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 12 Jul 2013 17:11:54 +0200 Subject: add ntpd support for mpdbox, fix smbclient package --- package/busybox/Makefile | 2 +- package/busybox/config/networking/Config.in | 2 +- package/busybox/files/busybox.postinst | 2 ++ package/busybox/files/ntpd.init | 27 +++++++++++++++++++++++++++ package/libtheora/Makefile | 4 ++-- package/mpd/Makefile | 3 ++- package/samba/Makefile | 19 ++++++++++++++----- 7 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 package/busybox/files/ntpd.init (limited to 'package') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 9fe1ef52a..7ab3da9db 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.20.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 233ee996d..0ca0c3525 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -755,7 +755,7 @@ config BUSYBOX_NTPD config BUSYBOX_FEATURE_NTPD_SERVER bool "Make ntpd usable as a NTP server" - default y + default n depends on BUSYBOX_NTPD help Make ntpd usable as a NTP server. If you disable this option diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst index f9f8e212b..c71a536ce 100644 --- a/package/busybox/files/busybox.postinst +++ b/package/busybox/files/busybox.postinst @@ -7,3 +7,5 @@ add_rcconf watchdog watchdog NO add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20' add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32' add_rcconf inetd inetd NO +add_rcconf ntpd ntpd NO +add_rcconf ntpd_flags ntpd_flags '-p time.fu-berlin.de' diff --git a/package/busybox/files/ntpd.init b/package/busybox/files/ntpd.init new file mode 100644 index 000000000..180f161a7 --- /dev/null +++ b/package/busybox/files/ntpd.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG busybox +#INIT 60 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${ntpd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/sbin/ntpd $ntpd_flags + ;; +stop) + kill $(pgrep -f /usr/sbin/ntpd) + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile index 7a6437c49..a1f26b7fd 100644 --- a/package/libtheora/Makefile +++ b/package/libtheora/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 292ab65cedd5021d6b7ddd117e07cd8e PKG_DESCR:= Theora video codec PKG_SECTION:= libs -PKG_DEPENDS:= libsdl libogg libvorbis -PKG_BUILDDEP:= sdl libogg libvorbis +PKG_DEPENDS:= libogg libvorbis +PKG_BUILDDEP:= libogg libvorbis PKG_URL:= http://www.theora.org/ PKG_SITES:= http://downloads.xiph.org/releases/theora/ diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 7b909c8b9..7a9a61013 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.17.4 -PKG_RELEASE:= 6 +PKG_RELEASE:= 7 PKG_MD5SUM:= ab408a61f49f215ce77ed0cf1deed6e1 PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia @@ -109,6 +109,7 @@ CONFIGURE_ARGS+= --disable-httpd-output \ --disable-mpc \ --disable-wavpack \ --disable-sqlite \ + --disable-mpg123 \ --with-zeroconf=no ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},) diff --git a/package/samba/Makefile b/package/samba/Makefile index 2714b67b3..1c9677568 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba PKG_VERSION:= 3.6.16 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 12c6785802813c2c5bf66e5c4c4e1d93 PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs @@ -16,15 +16,20 @@ PKG_SITES:= http://samba.org/samba/ftp/stable/ PKG_ARCH_DEPENDS:= !avr32 -PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD +PKG_SUBPKGS:= SAMBA SAMBA_CLIENT SAMBA_PASSWD SAMBA_LIB +PKGSD_SAMBA_CLIENT:= NetBIOS/SMB client +PKGSS_SAMBA_CLIENT:= libreadline samba-lib +PKGSD_SAMBA_PASSWD:= SMB password utility +PKGSD_SAMBA_LIB:= SMB libraries WRKSRC= ${WRKDIST}/source3 include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_PASSWD},${PKG_SECTION})) +$(eval $(call PKG_template,SAMBA_LIB,samba-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SAMBA_LIB},${PKG_SECTION})) TARGET_LDFLAGS+= -Wl,-rpath -Wl,/usr/lib/samba -lintl CONFIGURE_ENV+= samba_cv_CC_NEGATIVE_ENUM_VALUES=no \ @@ -57,7 +62,8 @@ post-install: ${IDIR_SAMBA}/usr/lib/samba/charset ${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba ${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin - ${CP} ${WRKINST}/usr/lib/samba/*.so* ${IDIR_SAMBA}/usr/lib/samba + ${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \ + ${IDIR_SAMBA}/usr/lib/samba ${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs ${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba ${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin @@ -66,5 +72,8 @@ post-install: ${INSTALL_DIR} ${IDIR_SAMBA_CLIENT}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \ ${IDIR_SAMBA_CLIENT}/usr/bin + ${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib/samba + $(CP) ${WRKINST}/usr/lib/samba/{libtalloc,libtdb,libtevent}.* \ + ${IDIR_SAMBA_LIB}/usr/lib/samba include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3