I forgot to add that upstream has changed the Makefile procedure and all the patches have been fixed upstream so they can be deleted
On Thu, Jul 18, 2013 at 5:24 PM, alpha sparc <alphasp...@gmail.com> wrote: > This patch updates the minidlna package in OpenWRT to 1.1.0. > The upstream developers renamed the binary of minidlna to minidlnad so > we have to make the changes accordingly to luci-minidlna. > All the path to /usr/bin/minidlna should be renamed to /usr/bin/minidlnad. > However during testing I found that "/etc/init.d/minidlna stop" does > not kill the service can someone test the patch and help me resolve > the issue? > > Index: feeds/packages/multimedia/minidlna/Makefile > =================================================================== > --- feeds/packages/multimedia/minidlna/Makefile (revision 37381) > +++ feeds/packages/multimedia/minidlna/Makefile (working copy) > @@ -8,12 +8,12 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=minidlna > -PKG_VERSION:=1.0.25 > +PKG_VERSION:=1.1.0 > PKG_RELEASE:=1 > > -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz > +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz > PKG_SOURCE_URL:=@SF/minidlna > -PKG_MD5SUM:=d966256baf2f9b068b9de871ab5dade5 > +PKG_MD5SUM:=26484a84af3fceafdee26595aae097f7 > > PKG_BUILD_PARALLEL:=0 > PKG_BUILD_DEPENDS:=util-linux > @@ -38,6 +38,7 @@ define Package/minidlna/description > endef > > define Package/minidlna/conffiles > +/etc/config/minidlna > /etc/minidlna.conf > endef > > @@ -64,20 +65,19 @@ MAKE_FLAGS +=\ > LDFLAGS="$(TARGET_LDFLAGS)" \ > ICONV_LIBS="-liconv $(if $(INTL_FULL),-lintl)" \ > > -MAKE_VARS +=\ > - PREFIX="$(STAGING_DIR)/usr" \ > - ICONV_PREFIX="$(ICONV_PREFIX)" \ > - INTL_PREFIX="$(INTL_PREFIX)" \ > - OS_NAME="OpenWrt Linux" \ > - OS_VERSION="$(LINUX_VERSION)" \ > - OS_URL="http://openwrt.org/"; \ > - DB_PATH="/var/run/minidlna" \ > - LOG_PATH="/var/log" \ > - > +CONFIGURE_ARGS += \ > + --program-prefix="$(STAGING_DIR)/usr" \ > + --with-libiconv-prefix="$(ICONV_PREFIX)" \ > + --with-libintl-prefix="$(INTL_PREFIX)" \ > + --with-os-name="OpenWrt Linux" \ > + --with-os-version="$(LINUX_VERSION)" \ > + --with-os-url="http://openwrt.org/"; \ > + --with-db-path="/var/run/minidlna" \ > + --with-log-path="/var/log" \ > > define Package/minidlna/install > $(INSTALL_DIR) $(1)/usr/bin > - $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlna $(1)/usr/bin/ > + $(INSTALL_BIN) $(PKG_BUILD_DIR)/minidlnad $(1)/usr/bin/ > $(INSTALL_DIR) $(1)/etc/init.d > $(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna > $(INSTALL_DIR) $(1)/etc/config > Index: feeds/packages/multimedia/minidlna/Makefile > =================================================================== > --- feeds/packages/multimedia/minidlna/files/minidlna.init (revision > 37381) > +++ feeds/packages/multimedia/minidlna/files/minidlna.init (working copy) > @@ -88,9 +88,9 @@ start() { > > mkdir -m 0755 -p $db_dir > mkdir -m 0755 -p $log_dir > - service_start /usr/bin/minidlna -f "$MINIDLNA_CONFIG_FILE" > + service_start /usr/bin/minidlnad -f "$MINIDLNA_CONFIG_FILE" > } > > stop() { > - service_stop /usr/bin/minidlna > + service_stop /usr/bin/minidlnad > } _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
