From 1896739f8ccc1c691cd4ebcf71581b697d3ca537 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sat, 4 Dec 2021 00:44:59 +0300 Subject: [PATCH] Go to simple Majestic config --- general/package/majestic-hi3516av100/majestic-hi3516av100.mk | 2 +- general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk | 2 +- general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk | 2 +- general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk | 2 +- general/package/majestic-nt9856x/majestic-nt9856x.mk | 2 +- general/package/majestic-ssc335/majestic-ssc335.mk | 2 +- general/package/majestic-xm510/majestic-xm510.mk | 2 +- general/package/majestic-xm530/majestic-xm530.mk | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/general/package/majestic-hi3516av100/majestic-hi3516av100.mk b/general/package/majestic-hi3516av100/majestic-hi3516av100.mk index 89d1ec06..71af8fb6 100644 --- a/general/package/majestic-hi3516av100/majestic-hi3516av100.mk +++ b/general/package/majestic-hi3516av100/majestic-hi3516av100.mk @@ -12,7 +12,7 @@ MAJESTIC_HI3516AV100_LICENSE_FILES = LICENSE define MAJESTIC_HI3516AV100_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk b/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk index 99f315c6..89f1bad9 100644 --- a/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk +++ b/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk @@ -12,7 +12,7 @@ MAJESTIC_HI3516CV200_LICENSE_FILES = LICENSE define MAJESTIC_HI3516CV200_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/majestic.yaml $(@D)/majestic-mini.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk index 72569bc7..7b311d07 100644 --- a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk +++ b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk @@ -12,7 +12,7 @@ MAJESTIC_HI3516CV300_LICENSE_FILES = LICENSE define MAJESTIC_HI3516CV300_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk b/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk index 7ba085e6..c33ce9c1 100644 --- a/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk +++ b/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk @@ -12,7 +12,7 @@ MAJESTIC_HI3516CV500_LICENSE_FILES = LICENSE define MAJESTIC_HI3516CV500_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-nt9856x/majestic-nt9856x.mk b/general/package/majestic-nt9856x/majestic-nt9856x.mk index 067b2d49..db9d9e96 100644 --- a/general/package/majestic-nt9856x/majestic-nt9856x.mk +++ b/general/package/majestic-nt9856x/majestic-nt9856x.mk @@ -12,7 +12,7 @@ MAJESTIC_NT9856X_LICENSE_FILES = LICENSE define MAJESTIC_NT9856X_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-ssc335/majestic-ssc335.mk b/general/package/majestic-ssc335/majestic-ssc335.mk index a09342c8..c10116f7 100644 --- a/general/package/majestic-ssc335/majestic-ssc335.mk +++ b/general/package/majestic-ssc335/majestic-ssc335.mk @@ -12,7 +12,7 @@ MAJESTIC_SSC335_LICENSE_FILES = LICENSE define MAJESTIC_SSC335_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-xm510/majestic-xm510.mk b/general/package/majestic-xm510/majestic-xm510.mk index 8c654398..ddbac224 100644 --- a/general/package/majestic-xm510/majestic-xm510.mk +++ b/general/package/majestic-xm510/majestic-xm510.mk @@ -12,7 +12,7 @@ MAJESTIC_XM510_LICENSE_FILES = LICENSE define MAJESTIC_XM510_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic diff --git a/general/package/majestic-xm530/majestic-xm530.mk b/general/package/majestic-xm530/majestic-xm530.mk index 74b1d9bb..394e29a0 100644 --- a/general/package/majestic-xm530/majestic-xm530.mk +++ b/general/package/majestic-xm530/majestic-xm530.mk @@ -12,7 +12,7 @@ MAJESTIC_XM530_LICENSE_FILES = LICENSE define MAJESTIC_XM530_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc - $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + $(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic