Merge branch 'hotfix/cti-fixes' into develop

hardware/omnia/omnia-support/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=omnia-support
-PKG_VERSION:=3.3
+PKG_VERSION:=3.4
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
@@ -12,17 +12,37 @@ PKG_BUILD_DEPENDS:=linux
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/omnia-generic-support
+  TITLE:=Turris Omnia essential generic support
+  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
+  RELEASE:=$(PKG_VERSION)-$(PKG_RELEASE)
+  DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia
+endef
+
+define Package/omnia-generic-support/description
+  Contains generic supporting files for Turris Omnia.
+endef
+
 define Package/omnia-support
   TITLE:=Turris Omnia essential support
-  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
-  DEPENDS:=@TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia \
-	  +mtd
+  DEPENDS:=+omnia-generic-support @TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia
 endef
 
 define Package/omnia-support/description
   Contains supporting files for Turris Omnia.
 endef
 
+define Package/omnia-cti-support
+  TITLE:=Turris Omnia CTI support
+  DEPENDS:=omnia-generic-support @TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia
+  PROVIDES:=omnia-support
+  CONFLICTS:=omnia-support
+endef
+
+define Package/omnia-cti-support/description
+  Contains supporting files for Turris Omnia that is part of CTI project.
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
@@ -30,18 +50,29 @@ endef
 Build/Configure:=
 
 define Build/Compile
+	sed -e 's|@CONTRACT@|cti|' files/contract-boot.txt | cat - files/boot.txt > "$(PKG_BUILD_DIR)"/boot-cti.txt
+	mkimage -T script -C none -n boot -d "$(PKG_BUILD_DIR)"/boot-cti.txt "$(PKG_BUILD_DIR)"/boot-cti.scr
+	mkimage -T script -C none -n boot -d files/boot.txt "$(PKG_BUILD_DIR)"/boot.scr
 	$(KERNEL_MAKE) zImage dtbs
 endef
 
-define Package/omnia-support/install
+define Package/omnia-generic-support/install
 	$(INSTALL_DIR) $(1)/boot
 	$(INSTALL_DATA) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/armada-385-turris-omnia-*.dtb "$(1)"/boot
-	mkimage -T script -C none -n boot -d files/boot.txt "$(1)"/boot/boot.scr
 	ln -s boot/boot.scr "$(1)"/boot.scr
-	$(INSTALL_DIR) $(1)/usr/sbin
 endef
 
-define Package/omnia-support/postinst
+define Package/omnia-support/install
+	$(INSTALL_DIR) $(1)/boot
+	$(INSTALL_DATA) "$(PKG_BUILD_DIR)"/boot.scr "$(1)"/boot/boot.scr
+endef
+
+define Package/omnia-cti-support/install
+	$(INSTALL_DIR) $(1)/boot
+	$(INSTALL_DATA) "$(PKG_BUILD_DIR)"/boot-cti.scr "$(1)"/boot/boot.scr
+endef
+
+define Package/omnia-generic-support/postinst
 #!/bin/sh
 # Link default Omnia dtb unless there is existing link
 DTB="$$IPKG_INSTROOT/boot/dtb"
@@ -49,3 +80,5 @@ DTB="$$IPKG_INSTROOT/boot/dtb"
 endef
 
 $(eval $(call BuildPackage,omnia-support))
+$(eval $(call BuildPackage,omnia-cti-support))
+$(eval $(call BuildPackage,omnia-generic-support))

updater/fix/Makefile

@@ -144,6 +144,11 @@ define Package/fix-pkglists-hardening-options/description
   enables appropriate options for hardening package list if hardening is enabled.
 endef
 
+define Package/fix-nor-update/description
+  Sometimes we need to trigger update of the content of NOR memory - like U-Boot
+  or rescue image. This fix updates it to the latest stable version.
+endef
+
 $(eval $(call FIX,sentinel-remove-invalid-firewall-rules,+firewall +uci))
 $(eval $(call FIX,samba-migrate-to-samba4,+samba4-server +uci))
 $(eval $(call FIX,updater-v65.0-alternatives-update,+updater-ng +uci,prerm))
@@ -158,3 +163,4 @@ $(eval $(call FIX,cleanup-cert-backup,+cert-backup))
 $(eval $(call FIX,edns-buffer-size,+resolver-conf +uci))
 $(eval $(call FIX,dhparam-to-cagen,+uci +turris-cagen))
 $(eval $(call FIX,pkglists-hardening-options,+pkglists +uci))
+$(eval $(call FIX,nor-update,+turris-nor-update +turris-nor-update-firmware))

updater/fix/files/nor-update

+#!/bin/sh
+exec nor-update