diff options
Diffstat (limited to 'updater-ng')
| -rw-r--r-- | updater-ng/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/updater-ng/Makefile b/updater-ng/Makefile index 562eb46..3dcbe66 100644 --- a/updater-ng/Makefile +++ b/updater-ng/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=updater-ng PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_BRANCH:=master +PKG_SOURCE_BRANCH:=opkg-wrapper-ignore PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host PKG_BUILD_DEPENDS:=busybox -include $(TOPDIR)/package/autopkg-branch.mk +include $(TOPDIR)/feeds/personal/autopkg-branch.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk $(call include_mk, python3-package.mk) @@ -32,12 +32,12 @@ define Package/$(PKG_NAME)/install $(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/supervisor/updater.sh $(1)/usr/bin/ - $(INSTALL_BIN) .//files/updater-wipe.sh $(1)/usr/bin/ + $(INSTALL_BIN) ./files/updater-wipe.sh $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/updater $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/conf.lua $(1)/etc/updater $(INSTALL_DIR) $(1)/etc/updater/conf.d - $(INSTALL_CONF) ./files/base.lua $(1)/etc/updater/conf.d/base.lua + $(INSTALL_CONF) ./files/turris.lua $(1)/etc/updater/conf.d/turris.lua $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/pkgupdate/configs/example.lua $(1)/etc/updater/conf.d/example.lua $(INSTALL_DIR) $(1)/etc/updater/hook_preupdate @@ -49,11 +49,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/updater.config $(1)/etc/config/updater -ifneq ($(PKG_BRANCH),) - echo >> $(1)/etc/config/updater - echo "config override 'override'" >> $(1)/etc/config/updater - echo " option branch '$(PKG_BRANCH)'" >> $(1)/etc/config/updater -endif $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pkgupdate/init $(1)/etc/init.d/updater @@ -166,6 +161,8 @@ define Package/$(PKG_NAME)-opkg/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/localrepo/content2localrepo $(1)/usr/share/updater/opkg-content2localrepo.sh $(INSTALL_DIR) $(1)/etc/updater/conf.d $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/opkg-wrapper/opkg.lua $(1)/etc/updater/conf.d/opkg.lua + $(INSTALL_DIR) $(1)/etc/updater/opkg-ignore + touch $(1)/etc/updater/opkg-ignore/.keep endef # We are calling migration to localrepo from updater-ng-opkg package posinst as |