From 9daf08fb38bd0857af79c12bfba14ad1a873ad95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 27 Sep 2018 11:13:09 +0200 Subject: personal-pkgs-repo: Add opkg feed hack and shellrc autoinstall --- personal-pkgs-repo/Makefile | 29 ++++++++++++++++++++++++++++- personal-pkgs-repo/files/updater.lua | 17 ++++++----------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index f4f5e18..a8d0c90 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=personal-pkgs-repo -PKG_VERSION:=1 +PKG_VERSION:=1.1 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -32,4 +32,31 @@ define Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/personal-pkgs.lua endef +ifeq ($(CONFIG_TARGET_PROFILE),"DEVICE_turris-omnia") +BOARD=omnia +else +ifeq ($(CONFIG_TARGET_PROFILE),"TURRIS") +BOARD=turris +else +ifeq ($(CONFIG_TARGET_PROFILE),"DEVICE_cznic-mox") +BOARD:=mox +else +$(error This repository does not support profile: $(CONFIG_TARGET_PROFILE)) +endif +endif +endif + +define Package/$(PKG_NAME)/postinst +#!/bin/sh +feedsfile="$$IPKG_INSTROOT/etc/opkg/customfeeds.conf" +sed -i '/^src\/gz personal/d' "$$feedsfile" +echo "src/gz personal https://cynerd.cz/repo/openwrt/$(BOARD)" >> "$$feedsfile" +endef + +define Package/$(PKG_NAME)/prerm +#!/bin/sh +feedsfile="$$IPKG_INSTROOT/etc/opkg/customfeeds.conf" +sed -i '/^src\/gz personal/d' "$$feedsfile" +endef + $(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/personal-pkgs-repo/files/updater.lua b/personal-pkgs-repo/files/updater.lua index 9c29984..859c780 100644 --- a/personal-pkgs-repo/files/updater.lua +++ b/personal-pkgs-repo/files/updater.lua @@ -7,17 +7,12 @@ else DIE("Unsupported board!") end -if version_match(turris_version, '<4.0') then - Repository("personal-pkgs", "https://cynerd.cz/repo/turris3x/" .. board, { - pubkey = "file:///etc/updater/keys/personal-pkgs.pub", - ocsp = false - }) -else - Repository("personal-pkgs", "https://cynerd.cz/repo/openwrt/" .. board, { - pubkey = "file:///etc/updater/keys/personal-pkgs.pub", - ocsp = false - }) -end +Repository("personal-pkgs", "https://cynerd.cz/repo/openwrt/" .. board, { + pubkey = "file:///etc/updater/keys/personal-pkgs.pub", + ocsp = false +}) Install("personal-pkgs-repo") Package("personal-pkgs-repo", { replan = "finished" }) + +Install("shellrc-zsh", "shellrc-ash") -- cgit v1.2.3