From c232e31116a1f743f0caa2a93678cb1abe198d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 26 Sep 2018 10:12:01 +0200 Subject: Add dependencies to personal-pkgs-repo --- personal-pkgs-repo/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'personal-pkgs-repo') diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index f4f5e18..81a539a 100644 --- a/personal-pkgs-repo/Makefile +++ b/personal-pkgs-repo/Makefile @@ -8,14 +8,15 @@ 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) include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - TITLE:=Package with repository key + TITLE:=Package with repository key and meta dependencies + DEPENDS:=+shellrc-zsh +shellrc-ash endef define Build/Compile -- cgit v1.2.3 From c3e94cf7d03f4876e133c2a04ad4d490402f435e 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 little cleanup --- personal-pkgs-repo/Makefile | 21 +++++++++++++++++++-- personal-pkgs-repo/files/updater.lua | 17 ++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) (limited to 'personal-pkgs-repo') diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index 81a539a..3b150e4 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.1 +PKG_VERSION:=1.2 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) TITLE:=Package with repository key and meta dependencies - DEPENDS:=+shellrc-zsh +shellrc-ash endef define Build/Compile @@ -33,4 +32,22 @@ define Package/$(PKG_NAME)/install $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/personal-pkgs.lua endef +BOARD=turris +ifeq ($(CONFIG_TARGET_mvebu_Turris-Omnia),y) +BOARD=omnia +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/turris3x/$(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..2bf7636 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/turris3x/" .. 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 From 27ea9124b86704dda7cd5d386dd9bbbbee9d9a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 27 Sep 2018 15:27:22 +0200 Subject: personal-pkgs-repo: add opkg-wrapper ignore for this repository --- personal-pkgs-repo/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'personal-pkgs-repo') diff --git a/personal-pkgs-repo/Makefile b/personal-pkgs-repo/Makefile index 3b150e4..2c28564 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.2 +PKG_VERSION:=1.3 PKG_MAINTAINER:=Karel Kočí PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -30,6 +30,9 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/updater/conf.d $(INSTALL_CONF) ./files/updater.lua $(1)/etc/updater/conf.d/personal-pkgs.lua + + $(INSTALL_DIR) $(1)/etc/updater/opkg-ignore + echo ' personal ' >$(1)/etc/updater/opkg-ignore/personal-pkgs endef BOARD=turris -- cgit v1.2.3