From 34ceb21dd8063401f4d8662b7fbb9208ec34f796 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 14:54:53 +0100 Subject: [PATCH 01/17] rainbow: Drop strange mpc85xx_p2020_TURRIS target --- hardware/turris1x/rainbow/Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/rainbow/Makefile index f67254d85..a1a438f04 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/rainbow/Makefile @@ -22,21 +22,9 @@ include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) TITLE:=$(PKG_NAME) - DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor||TARGET_mpc85xx_p2020_TURRIS) + DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor) endef -ifneq ($(CONFIG_TARGET_mpc85xx_p2020_TURRIS),y) -# FIXME: Temporary, until rainbow is ported. - -define Build/Compile - echo 'echo "Rainbow not ported yet" >&2; exit 1' >$(PKG_BUILD_DIR)/rainbow -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/rainbow $(1)/usr/bin/ -endef -else define Build/Compile $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) endef @@ -71,6 +59,5 @@ define Package/$(PKG_NAME)/prerm /etc/init.d/rainbow disable rainbow all auto white endef -endif $(eval $(call BuildPackage,$(PKG_NAME))) -- GitLab From 5d223346a1b222fb8bcb1a00ff5c42d6f2f2f4ac Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:20:20 +0100 Subject: [PATCH 02/17] rainbow: Refactor package Makefile Make it compliant with recent standards --- hardware/turris1x/rainbow/Makefile | 49 ++++++++++++++++-------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/rainbow/Makefile index a1a438f04..ce89ee62e 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/rainbow/Makefile @@ -1,35 +1,42 @@ # -## Copyright (C) 2013 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2013-2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) # -## This is free software, licensed under the GNU General Public License v2. +## This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. -# # # + include $(TOPDIR)/rules.mk PKG_NAME:=rainbow PKG_VERSION:=17 +PKG_RELEASE:=1 + PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/rainbow.git -PKG_SOURCE:=$(PKG_NAME).tar.gz PKG_SOURCE_VERSION:=5d7d5c8c3bdec184bdb418e857a6d5a11726fac4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) + PKG_MAINTAINER:=CZ.NIC -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) - DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor) +define Package/rainbow + TITLE:=rainbow + URL:=https://gitlab.labs.nic.cz/turris/rainbow + DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor) +endef + +define Package/rainbow/conffiles +/etc/config/rainbow endef define Build/Compile $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) endef -define Package/$(PKG_NAME)/install +define Package/rainbow/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/rainbow $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d/ @@ -41,23 +48,21 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./files/rainbow_button_sync.sh $(1)/usr/bin/rainbow_button_sync.sh endef -define Package/$(PKG_NAME)/conffiles -/etc/config/rainbow -endef - -define Package/$(PKG_NAME)/postinst +define Package/rainbow/postinst #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { -/etc/init.d/rainbow enable -/etc/init.d/rainbow restart + /etc/init.d/rainbow enable + /etc/init.d/rainbow restart } endef -define Package/$(PKG_NAME)/prerm +define Package/rainbow/prerm #!/bin/sh -/etc/init.d/rainbow stop -/etc/init.d/rainbow disable -rainbow all auto white +[ -n "$$IPKG_INSTROOT" ] || { + /etc/init.d/rainbow stop + /etc/init.d/rainbow disable + rainbow all auto white +} endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,rainbow)) -- GitLab From cab9de6e4f3a66583f31f2bd2c3f7625f68a9942 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:30:52 +0100 Subject: [PATCH 03/17] rainbow: Provide common turris-rainbow package --- hardware/turris1x/rainbow/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/rainbow/Makefile index ce89ee62e..a7b8aea03 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/rainbow/Makefile @@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk define Package/rainbow TITLE:=rainbow URL:=https://gitlab.labs.nic.cz/turris/rainbow + PROVIDES:=turris-rainbow DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor) endef -- GitLab From 01f2f2cb62fc4ee94744aaf3b874dc106ab0438e Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:33:24 +0100 Subject: [PATCH 04/17] rainbow: Bump package release --- hardware/turris1x/rainbow/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/rainbow/Makefile index a7b8aea03..e290b7080 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/rainbow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rainbow PKG_VERSION:=17 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/rainbow.git -- GitLab From 63f47e9cb64c6693ee360e0e17bcee86b356cb12 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:15:31 +0100 Subject: [PATCH 05/17] rainbow-omnia: Refactor package Makefile Make it compliant with recent standards --- hardware/omnia/rainbow-omnia/Makefile | 51 +++++++++++++++------------ 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/hardware/omnia/rainbow-omnia/Makefile b/hardware/omnia/rainbow-omnia/Makefile index c308f1e93..376105517 100644 --- a/hardware/omnia/rainbow-omnia/Makefile +++ b/hardware/omnia/rainbow-omnia/Makefile @@ -1,35 +1,42 @@ # -## Copyright (C) 2013 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2016-2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) # -## This is free software, licensed under the GNU General Public License v2. +## This is free software, licensed under the GNU General Public License v3. # See /LICENSE for more information. -# # # + include $(TOPDIR)/rules.mk PKG_NAME:=rainbow-omnia PKG_VERSION:=3.1 +PKG_RELEASE:=1 + PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/rainbow_omnia.git -PKG_SOURCE:=$(PKG_NAME).tar.gz PKG_SOURCE_VERSION:=d4ded015bd5a400059ea20f2234a311e749dc519 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_MAINTAINER:=Robin Obůrka -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + +PKG_MAINTAINER:=CZ.NIC +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) - DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia +define Package/rainbow-omnia + TITLE:=rainbow-omnia + URL:=https://gitlab.labs.nic.cz/turris/rainbow_omnia + DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia +endef + +define Package/rainbow-omnia/conffiles +/etc/config/rainbow endef define Build/Compile $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) endef -define Package/$(PKG_NAME)/install +define Package/rainbow-omnia/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/rainbow $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d/ @@ -41,23 +48,21 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./files/rainbow_button_sync.sh $(1)/usr/bin/rainbow_button_sync.sh endef -define Package/$(PKG_NAME)/conffiles -/etc/config/rainbow -endef - -define Package/$(PKG_NAME)/postinst +define Package/rainbow-omnia/postinst #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { -/etc/init.d/rainbow enable -/etc/init.d/rainbow restart + /etc/init.d/rainbow enable + /etc/init.d/rainbow restart } endef -define Package/$(PKG_NAME)/prerm +define Package/rainbow-omnia/prerm #!/bin/sh -/etc/init.d/rainbow stop -/etc/init.d/rainbow disable -rainbow all auto white +[ -n "$$IPKG_INSTROOT" ] || { + /etc/init.d/rainbow stop + /etc/init.d/rainbow disable + rainbow all auto white +} endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,rainbow-omnia)) -- GitLab From 3f7f249f138ec40d4033b18b78b0d5832e3aa14e Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:30:41 +0100 Subject: [PATCH 06/17] rainbow-omnia: Provide common turris-rainbow package --- hardware/omnia/rainbow-omnia/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hardware/omnia/rainbow-omnia/Makefile b/hardware/omnia/rainbow-omnia/Makefile index 376105517..274add85e 100644 --- a/hardware/omnia/rainbow-omnia/Makefile +++ b/hardware/omnia/rainbow-omnia/Makefile @@ -25,7 +25,8 @@ include $(INCLUDE_DIR)/package.mk define Package/rainbow-omnia TITLE:=rainbow-omnia URL:=https://gitlab.labs.nic.cz/turris/rainbow_omnia - DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia + PROVIDES:=turris-rainbow + DEPENDS+=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia endef define Package/rainbow-omnia/conffiles -- GitLab From b6ddd6595e79af1d93eb6672b551f53d327d0c0c Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:34:17 +0100 Subject: [PATCH 07/17] rainbow-omnia: Bump package release --- hardware/omnia/rainbow-omnia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/omnia/rainbow-omnia/Makefile b/hardware/omnia/rainbow-omnia/Makefile index 274add85e..b5f7ca905 100644 --- a/hardware/omnia/rainbow-omnia/Makefile +++ b/hardware/omnia/rainbow-omnia/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rainbow-omnia PKG_VERSION:=3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/rainbow_omnia.git -- GitLab From 850f585738b16b5bc8f3659c626cc46022b46f1a Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:22:56 +0100 Subject: [PATCH 08/17] luci-app-rainbow: Refactor package Makefile Make it compliant with recent standards --- web/luci-app-rainbow/Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/web/luci-app-rainbow/Makefile b/web/luci-app-rainbow/Makefile index 66a3cbb60..045449106 100644 --- a/web/luci-app-rainbow/Makefile +++ b/web/luci-app-rainbow/Makefile @@ -1,22 +1,24 @@ # -## Copyright (C) 2015 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2015-2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) # ## This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. -# # # + include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-rainbow PKG_VERSION:=2 PKG_RELEASE:=2 + PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/luci-rainbow.git PKG_SOURCE_VERSION:=5828fadded08e4a15f2cf211c1a42d613743b58c PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_MAINTAINER:=Robin Obůrka -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + +PKG_MAINTAINER:=CZ.NIC +PKG_LICENSE:=GPL-2.0-or-later + PKG_BUILD_DEPENDS:=luci-base/host include $(INCLUDE_DIR)/package.mk @@ -27,16 +29,17 @@ else BOARD=turris endif -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) - DEPENDS:=+luci @(PACKAGE_rainbow-omnia||PACKAGE_rainbow) +define Package/luci-app-rainbow + TITLE:=luci-app-rainbow + URL:=https://gitlab.labs.nic.cz/turris/luci-rainbow + DEPENDS:=+luci @(PACKAGE_rainbow-omnia||PACKAGE_rainbow) endef define Build/Compile po2lmo $(PKG_BUILD_DIR)/rainbow.po $(PKG_BUILD_DIR)/rainbow.cs.lmo endef -define Package/$(PKG_NAME)/install +define Package/luci-app-rainbow/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/rainbow/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(BOARD)-luasrc/controller/rainbow/rainbow.lua $(1)/usr/lib/lua/luci/controller/rainbow/rainbow.lua @@ -47,4 +50,4 @@ define Package/$(PKG_NAME)/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/rainbow.cs.lmo $(1)/usr/lib/lua/luci/i18n/rainbow.cs.lmo endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,luci-app-rainbow)) -- GitLab From 95ec8d916417cfb1d57e5299265d506f88b1ae78 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:31:31 +0100 Subject: [PATCH 09/17] luci-app-rainbow: Use turris-rainbow dependency --- web/luci-app-rainbow/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/luci-app-rainbow/Makefile b/web/luci-app-rainbow/Makefile index 045449106..36dbd064c 100644 --- a/web/luci-app-rainbow/Makefile +++ b/web/luci-app-rainbow/Makefile @@ -32,7 +32,7 @@ endif define Package/luci-app-rainbow TITLE:=luci-app-rainbow URL:=https://gitlab.labs.nic.cz/turris/luci-rainbow - DEPENDS:=+luci @(PACKAGE_rainbow-omnia||PACKAGE_rainbow) + DEPENDS:=+luci +turris-rainbow endef define Build/Compile -- GitLab From b9c6da736d31f26658690f849ec8fb4e6cc980d3 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:35:10 +0100 Subject: [PATCH 10/17] luci-app-rainbow: Bump package release --- web/luci-app-rainbow/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/luci-app-rainbow/Makefile b/web/luci-app-rainbow/Makefile index 36dbd064c..065b84883 100644 --- a/web/luci-app-rainbow/Makefile +++ b/web/luci-app-rainbow/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-rainbow PKG_VERSION:=2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/luci-rainbow.git -- GitLab From 0819d8aec09db86c748d49266827ec8607e96611 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:21:44 +0100 Subject: [PATCH 11/17] start-indicator: Refactor package Makefile Make it compliant with recent standards --- hardware/start-indicator/Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hardware/start-indicator/Makefile b/hardware/start-indicator/Makefile index bf25b47de..4cb376bb6 100644 --- a/hardware/start-indicator/Makefile +++ b/hardware/start-indicator/Makefile @@ -1,44 +1,43 @@ # -## Copyright (C) 2018 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2018-2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) # ## This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. -# # # + include $(TOPDIR)/rules.mk PKG_NAME:=start-indicator PKG_VERSION:=0 +PKG_RELEASE:=1 + PKG_MAINTAINER:=CZ.NIC -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_LICENSE:=GPL-2.0-or-later include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) -endef - -define Build/Compile +define Package/start-indicator + TITLE:=start-indicator endef -define Package/$(PKG_NAME)/install +define Package/start-indicator/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/start-indicator.init $(1)/etc/init.d/start-indicator endef -define Package/$(PKG_NAME)/postinst +define Package/start-indicator/postinst #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { /etc/init.d/start-indicator enable } endef -define Package/$(PKG_NAME)/prerm +define Package/start-indicator/prerm #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { /etc/init.d/start-indicator disable } endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,start-indicator)) -- GitLab From af75b9b8fdbb123b4af7a0e88939999ee7214594 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:31:21 +0100 Subject: [PATCH 12/17] start-indicator: Use turris-rainbow dependency --- hardware/start-indicator/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/hardware/start-indicator/Makefile b/hardware/start-indicator/Makefile index 4cb376bb6..dc4b13794 100644 --- a/hardware/start-indicator/Makefile +++ b/hardware/start-indicator/Makefile @@ -18,6 +18,7 @@ include $(INCLUDE_DIR)/package.mk define Package/start-indicator TITLE:=start-indicator + DEPENDS:=+turris-rainbow endef define Package/start-indicator/install -- GitLab From 6d6ec08019d26088f18169b3eabe4f7a110b4a7b Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:36:06 +0100 Subject: [PATCH 13/17] start-indicator: Bump package release --- hardware/start-indicator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/start-indicator/Makefile b/hardware/start-indicator/Makefile index dc4b13794..96faa0af2 100644 --- a/hardware/start-indicator/Makefile +++ b/hardware/start-indicator/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=start-indicator PKG_VERSION:=0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=CZ.NIC PKG_LICENSE:=GPL-2.0-or-later -- GitLab From f2b55eb860d44f70ac002b385a9dc77745b86d5e Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:21:02 +0100 Subject: [PATCH 14/17] rescue-mode-omnia: Refactor package Makefile Make it compliant with recent standards --- hardware/omnia/rescue-mode-omnia/Makefile | 25 +++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/hardware/omnia/rescue-mode-omnia/Makefile b/hardware/omnia/rescue-mode-omnia/Makefile index f87466445..a45ca1c80 100644 --- a/hardware/omnia/rescue-mode-omnia/Makefile +++ b/hardware/omnia/rescue-mode-omnia/Makefile @@ -1,33 +1,32 @@ # -## Copyright (C) 2016 CZ.NIC z.s.p.o. (http://www.nic.cz/) +## Copyright (C) 2016-2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) # ## This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. -# # # + include $(TOPDIR)/rules.mk PKG_NAME:=rescue-mode-omnia PKG_VERSION:=4.1 -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_MAINTAINER:=Michal Hrusecky -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_RELEASE:=1 -include $(INCLUDE_DIR)/package.mk +PKG_MAINTAINER:=CZ.NIC +PKG_LICENSE:=GPL-2.0-or-later -define Package/$(PKG_NAME) - TITLE:=$(PKG_NAME) - DEPENDS:=+rainbow-omnia +mtd +btrfs-progs @TARGET_mvebu_Turris-Omnia @!ALL @!PACKAGE_oneshot @!PACKAGE_procd +schnapps -endef +include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME)/conffiles +define Package/rescue-mode-omnia + TITLE:=rescue-mode-omnia + DEPENDS:=+btrfs-progs +mtd +schnapps + DEPENDS+=@TARGET_mvebu_Turris-Omnia @!ALL @!PACKAGE_oneshot @!PACKAGE_procd endef define Build/Compile echo Building rescue mode endef -define Package/$(PKG_NAME)/install +define Package/rescue-mode-omnia/install $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/etc @@ -43,4 +42,4 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./files/passwd $(1)/etc/passwd endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,rescue-mode-omnia)) -- GitLab From 55f011f1dd8308e1c7182810235fc3267f4c79da Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:31:13 +0100 Subject: [PATCH 15/17] rescue-mode-omnia: Use turris-rainbow dependency --- hardware/omnia/rescue-mode-omnia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/omnia/rescue-mode-omnia/Makefile b/hardware/omnia/rescue-mode-omnia/Makefile index a45ca1c80..e05e2ff3b 100644 --- a/hardware/omnia/rescue-mode-omnia/Makefile +++ b/hardware/omnia/rescue-mode-omnia/Makefile @@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk define Package/rescue-mode-omnia TITLE:=rescue-mode-omnia - DEPENDS:=+btrfs-progs +mtd +schnapps + DEPENDS:=+btrfs-progs +mtd +schnapps +turris-rainbow DEPENDS+=@TARGET_mvebu_Turris-Omnia @!ALL @!PACKAGE_oneshot @!PACKAGE_procd endef -- GitLab From 2a4630caf0d63a0a06a736d869db683b01dbe3b3 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 15:36:58 +0100 Subject: [PATCH 16/17] rescue-mode-omnia: Bump package release --- hardware/omnia/rescue-mode-omnia/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/omnia/rescue-mode-omnia/Makefile b/hardware/omnia/rescue-mode-omnia/Makefile index e05e2ff3b..15b08a887 100644 --- a/hardware/omnia/rescue-mode-omnia/Makefile +++ b/hardware/omnia/rescue-mode-omnia/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rescue-mode-omnia PKG_VERSION:=4.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=CZ.NIC PKG_LICENSE:=GPL-2.0-or-later -- GitLab From 645dbae77a201d4020d89012a4b8132da0dd54b9 Mon Sep 17 00:00:00 2001 From: Vojtech Myslivec Date: Fri, 22 Nov 2019 17:22:59 +0100 Subject: [PATCH 17/17] turris1x-rainbow: Rename rainbow package --- .../{rainbow => turris1x-rainbow}/Makefile | 16 ++++++++-------- .../files/rainbow.config | 0 .../files/rainbow.cron | 0 .../files/rainbow.init | 0 .../files/rainbow_button_sync.sh | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename hardware/turris1x/{rainbow => turris1x-rainbow}/Makefile (84%) rename hardware/turris1x/{rainbow => turris1x-rainbow}/files/rainbow.config (100%) rename hardware/turris1x/{rainbow => turris1x-rainbow}/files/rainbow.cron (100%) rename hardware/turris1x/{rainbow => turris1x-rainbow}/files/rainbow.init (100%) rename hardware/turris1x/{rainbow => turris1x-rainbow}/files/rainbow_button_sync.sh (100%) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/turris1x-rainbow/Makefile similarity index 84% rename from hardware/turris1x/rainbow/Makefile rename to hardware/turris1x/turris1x-rainbow/Makefile index e290b7080..52bdd6067 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/turris1x-rainbow/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=rainbow +PKG_NAME:=turris1x-rainbow PKG_VERSION:=17 PKG_RELEASE:=2 @@ -22,14 +22,14 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/rainbow - TITLE:=rainbow +define Package/turris1x-rainbow + TITLE:=turris1x-rainbow URL:=https://gitlab.labs.nic.cz/turris/rainbow PROVIDES:=turris-rainbow DEPENDS:=@(TARGET_mpc85xx_p2020_nand||TARGET_mpc85xx_p2020_nor) endef -define Package/rainbow/conffiles +define Package/turris1x-rainbow/conffiles /etc/config/rainbow endef @@ -37,7 +37,7 @@ define Build/Compile $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) endef -define Package/rainbow/install +define Package/turris1x-rainbow/install $(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/rainbow $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d/ @@ -49,7 +49,7 @@ define Package/rainbow/install $(INSTALL_BIN) ./files/rainbow_button_sync.sh $(1)/usr/bin/rainbow_button_sync.sh endef -define Package/rainbow/postinst +define Package/turris1x-rainbow/postinst #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { /etc/init.d/rainbow enable @@ -57,7 +57,7 @@ define Package/rainbow/postinst } endef -define Package/rainbow/prerm +define Package/turris1x-rainbow/prerm #!/bin/sh [ -n "$$IPKG_INSTROOT" ] || { /etc/init.d/rainbow stop @@ -66,4 +66,4 @@ define Package/rainbow/prerm } endef -$(eval $(call BuildPackage,rainbow)) +$(eval $(call BuildPackage,turris1x-rainbow)) diff --git a/hardware/turris1x/rainbow/files/rainbow.config b/hardware/turris1x/turris1x-rainbow/files/rainbow.config similarity index 100% rename from hardware/turris1x/rainbow/files/rainbow.config rename to hardware/turris1x/turris1x-rainbow/files/rainbow.config diff --git a/hardware/turris1x/rainbow/files/rainbow.cron b/hardware/turris1x/turris1x-rainbow/files/rainbow.cron similarity index 100% rename from hardware/turris1x/rainbow/files/rainbow.cron rename to hardware/turris1x/turris1x-rainbow/files/rainbow.cron diff --git a/hardware/turris1x/rainbow/files/rainbow.init b/hardware/turris1x/turris1x-rainbow/files/rainbow.init similarity index 100% rename from hardware/turris1x/rainbow/files/rainbow.init rename to hardware/turris1x/turris1x-rainbow/files/rainbow.init diff --git a/hardware/turris1x/rainbow/files/rainbow_button_sync.sh b/hardware/turris1x/turris1x-rainbow/files/rainbow_button_sync.sh similarity index 100% rename from hardware/turris1x/rainbow/files/rainbow_button_sync.sh rename to hardware/turris1x/turris1x-rainbow/files/rainbow_button_sync.sh -- GitLab