From 6a2f0e4072ea16ea633d8741fc77f59f4d20b4f8 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 5 Jun 2022 11:00:53 +0200 Subject: [PATCH] fix c&p errors in BS --- .gitignore | 1 + archive-patches/ushare/ushare.init | 1 - make/applications.mk | 16 ++++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4d4a9c2..c0a3165 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ my-skel-* /*.patch /*.diff *.orig +*.rej custom.mk diff --git a/archive-patches/ushare/ushare.init b/archive-patches/ushare/ushare.init index cb40bf8..a85e63f 100755 --- a/archive-patches/ushare/ushare.init +++ b/archive-patches/ushare/ushare.init @@ -1,5 +1,4 @@ #!/bin/sh -set -x timeout=10 if [ $2 = 1 ]; then diff --git a/make/applications.mk b/make/applications.mk index ad7e73c..498626c 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -255,11 +255,11 @@ $(D)/minidlna: $(D)/zlib $(D)/sqlite $(D)/libexif $(D)/libjpeg $(D)/libid3tag $( --prefix=/ \ ; \ $(MAKE); \ - $(MAKE) install prefix=/ DESTDIR=$(TARGETPREFIX) - install -m 755 $(PATCHES)/minidlna/minidlna.init $(TARGETPREFIX)/etc/init.d/minidlna + $(MAKE) install prefix= DESTDIR=$(TARGETPREFIX) + install -m 755 $(PATCHES)/minidlna/minidlnad.init $(TARGETPREFIX)/etc/init.d/minidlnad pushd $(TARGETPREFIX)/etc/init.d - ln -sf minidlna $(TARGETPREFIX)/etc/init.d/S75minidlna - ln -sf minidlna $(TARGETPREFIX)/etc/init.d/K75minidlna + ln -sf minidlnad $(TARGETPREFIX)/etc/init.d/S75minidlnad + ln -sf minidlnad $(TARGETPREFIX)/etc/init.d/K75minidlnad $(REMOVE)/minidlna-$(MINIDLNA_VER) $(TOUCH) @@ -733,7 +733,7 @@ $(D)/ushare: $(D)/libupnp $(LIBGETTEXT) $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 $(MAKE) && \ $(MAKE) install && \ install -m 644 $(BUILD_TMP)/ushare-$(USHARE_VER)/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf - install -m 755 $(PATCHES)/ushare/ushare.init $(TARGETPREFIX)/etc/init.d/crond + install -m 755 $(PATCHES)/ushare/ushare.init $(TARGETPREFIX)/etc/init.d/ushare pushd $(TARGETPREFIX)/etc/init.d ln -sf ushare $(TARGETPREFIX)/etc/init.d/S75ushare ln -sf ushare $(TARGETPREFIX)/etc/init.d/K75ushare @@ -783,10 +783,10 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua $(D) cp -f $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/*.lua $(TARGETPREFIX)/share/xupnpd/ mv $(TARGETPREFIX)/share/xupnpd/xupnpd.lua $(TARGETPREFIX)/var/tuxbox/config ln -sf /var/tuxbox/config/xupnpd.lua $(TARGETPREFIX)/share/xupnpd/xupnpd.lua - install -m 755 $(PATCHES)/minidlna/minidlnad.init $(TARGETPREFIX)/etc/init.d/minidlnad + install -m 755 $(PATCHES)/xupnpd/xupnpd.init $(TARGETPREFIX)/etc/init.d/xupnpd pushd $(TARGETPREFIX)/etc/init.d - ln -sf minidlna $(TARGETPREFIX)/etc/init.d/S75minidlna - ln -sf minidlna $(TARGETPREFIX)/etc/init.d/K75minidlna + ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/S75xupnpd + ln -sf xupnpd $(TARGETPREFIX)/etc/init.d/K75xupnpd $(REMOVE)/xupnpd-git-$(XUPNPD_GIT) $(TOUCH) -- 2.39.5