diff --git a/hardware/omnia/rainbow-omnia/Makefile b/hardware/omnia/rainbow-omnia/Makefile index c308f1e935ad0459da6533afa0970e243e49abe6..b5f7ca905fd6a8585d40f60e56750b0d74cab5f3 100644 --- a/hardware/omnia/rainbow-omnia/Makefile +++ b/hardware/omnia/rainbow-omnia/Makefile @@ -1,35 +1,43 @@ # -## 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:=2 + 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 + PROVIDES:=turris-rainbow + 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 +49,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)) diff --git a/hardware/omnia/rescue-mode-omnia/Makefile b/hardware/omnia/rescue-mode-omnia/Makefile index f874664455e6a94f8994966667fc319b8cf50cd9..15b08a88711731d84ff672f64d73fd5c18cba5bb 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:=2 -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 +turris-rainbow + 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)) diff --git a/hardware/start-indicator/Makefile b/hardware/start-indicator/Makefile index bf25b47dee700c4df723c690e64af40e7993e6fd..96faa0af2e6a18998a92d3d2fff79ec65f580611 100644 --- a/hardware/start-indicator/Makefile +++ b/hardware/start-indicator/Makefile @@ -1,44 +1,44 @@ # -## 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:=2 + 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 + DEPENDS:=+turris-rainbow 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)) diff --git a/hardware/turris1x/rainbow/Makefile b/hardware/turris1x/turris1x-rainbow/Makefile similarity index 52% rename from hardware/turris1x/rainbow/Makefile rename to hardware/turris1x/turris1x-rainbow/Makefile index f67254d85890e271578ebe141b0ce8ec13c4f322..52bdd6067cef9b823dac41eed92015ef3e0cf051 100644 --- a/hardware/turris1x/rainbow/Makefile +++ b/hardware/turris1x/turris1x-rainbow/Makefile @@ -1,47 +1,43 @@ # -## 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_NAME:=turris1x-rainbow PKG_VERSION:=17 +PKG_RELEASE:=2 + 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||TARGET_mpc85xx_p2020_TURRIS) +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 -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 +define Package/turris1x-rainbow/conffiles +/etc/config/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 -define Package/$(PKG_NAME)/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/ @@ -53,24 +49,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/turris1x-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/turris1x-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 -endif -$(eval $(call BuildPackage,$(PKG_NAME))) +$(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 diff --git a/web/luci-app-rainbow/Makefile b/web/luci-app-rainbow/Makefile index 66a3cbb60d1914f8cea1aecc2629c0114d4d0669..065b848836c04e8fa6f0b3778e8a3f99f4dd0538 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_RELEASE:=3 + 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 +turris-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))