aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2018-02-22 10:34:43 +0100
committerKarel Kočí <karel.koci@nic.cz>2018-02-22 11:06:16 +0100
commit3678bcabe38b6e71ea234392a9fcd119d36c6313 (patch)
tree98986ce25cc7e7895c845ce47053e2b9bf839966
parent548dbd4dd1a7c755caa30d480f2ba07cce517730 (diff)
downloadturris-myrepo-3678bcabe38b6e71ea234392a9fcd119d36c6313.tar.gz
turris-myrepo-3678bcabe38b6e71ea234392a9fcd119d36c6313.tar.bz2
turris-myrepo-3678bcabe38b6e71ea234392a9fcd119d36c6313.zip
Revert "Fix for changes to updater's master"
This reverts commit 3e31c485fef5b7fa5f7f21ad5dfc7ac92a03e5b1.
-rw-r--r--updater-ng/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/updater-ng/Makefile b/updater-ng/Makefile
index 8eea0ee..a154661 100644
--- a/updater-ng/Makefile
+++ b/updater-ng/Makefile
@@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Package/$(PKG_NAME)
TITLE:=The next generation updater
- DEPENDS:=+liblua +libevent2 +usign +libcurl +vixie-cron +ca-certificates +libc
+ DEPENDS:=+liblua +libevent2 +usign +libcurl +vixie-cron +ca-certificates
endef
define Package/$(PKG_NAME)/install
@@ -30,9 +30,9 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/opkg-trans $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/pkgupdate $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater.sh $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater-unstuck.sh $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/updater-wipe.sh $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/updater.sh $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/updater-unstuck.sh $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/updater-wipe.sh $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/updater
$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/entry.lua $(1)/etc/updater
@@ -56,10 +56,10 @@ ifneq ($(PKG_BRANCH),)
endif
$(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/updater/init $(1)/etc/init.d/updater
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/init $(1)/etc/init.d/updater
$(INSTALL_DIR) $(1)/etc/cron.d
- $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/updater/cron $(1)/etc/cron.d/updater
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/cron $(1)/etc/cron.d/updater
endef
define Package/$(PKG_NAME)/conffiles