summaryrefslogtreecommitdiff
path: root/updater-ng
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2018-10-09 09:46:50 +0200
committerKarel Kočí <karel.koci@nic.cz>2018-10-09 09:46:50 +0200
commitd32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab (patch)
tree10de57d473e03555dae6094ca40d5f82896cc357 /updater-ng
parente48d2180906f69009fc830b5a1f5696c6e6ab88e (diff)
downloadopenwrt-personal-pkgs-d32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab.tar.gz
openwrt-personal-pkgs-d32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab.tar.bz2
openwrt-personal-pkgs-d32f4c85ac3634a3a4c35d4fec7dc8131c9cfcab.zip
Revert "updater-ng: for now use opkg-wrapper-ignore branch instead of master"
This reverts commit 3fe1aa96acf4eefb8769d25a0aaa0a5a65be8ea7.
Diffstat (limited to 'updater-ng')
-rw-r--r--updater-ng/Makefile4
1 files changed, 1 insertions, 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 <packaging@turris.cz>
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