From d32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 9 Oct 2018 09:46:50 +0200 Subject: Revert "updater-ng: for now use opkg-wrapper-ignore branch instead of master" This reverts commit 3fe1aa96acf4eefb8769d25a0aaa0a5a65be8ea7. --- updater-ng/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/updater-ng/Makefile b/updater-ng/Makefile index d243904..257ed8c 100644 --- a/updater-ng/Makefile +++ b/updater-ng/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=updater-ng PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_BRANCH:=opkg-wrapper-ignore +PKG_SOURCE_BRANCH:=master PKG_MAINTAINER:=CZ.NIC HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host PKG_BUILD_DEPENDS:=busybox @@ -166,8 +166,6 @@ 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 -- cgit v1.2.3