Merge pull request #224 from cronyx/master

fix building scripts
2022-05-15 14:31:42 +03:00 · 2022-05-15 14:31:42 +03:00 · 2126a1753a
parent 6f854b839b 770725e857
commit 2126a1753a
11 changed files with 55 additions and 15 deletions
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_ultimate_defconfig
@ -75,6 +75,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_MAJESTIC_FONTS=y
 BR2_PACKAGE_MAJESTIC_HI3516CV300=y
+# BR2_PACKAGE_MAJESTIC_ULTIMATE is not set
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_ultimate_defconfig
@ -76,6 +76,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_MAJESTIC_FONTS=y
 BR2_PACKAGE_MAJESTIC_HI3516EV300=y
+BR2_PACKAGE_MAJESTIC_ULTIMATE=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
--- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig
+++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_ultimate_defconfig
@ -76,6 +76,7 @@ BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_MAJESTIC_FONTS=y
 BR2_PACKAGE_MAJESTIC_HI3516EV300=y
+BR2_PACKAGE_MAJESTIC_ULTIMATE=y
 BR2_PACKAGE_MBEDTLS_OPENIPC=y
 # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
 # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
--- a/building.sh
+++ b/building.sh
@ -1,12 +1,13 @@
 #!/bin/bash
 #
-# OpenIPC.org | v.20220224
+# OpenIPC.org | v.20220515
 #

 MAX_KERNEL_SIZE=0x200000               #    2MiB,  2097152
+MAX_KERNEL_SIZE_ULTIMATE=0x300000      #    3MiB,  3145728
 MAX_KERNEL_SIZE_EXPERIMENTAL=0x3E8480  # ~3.9MiB,  4097152
 MAX_ROOTFS_SIZE=0x500000               #    5MiB,  5242880
-MAX_KERNEL_SIZE_ULTIMATE=0xC80000      # 12,5MiB, 13107200
+MAX_ROOTFS_SIZE_ULTIMATE=0xA00000      #   10MiB,  10485760

 clone() {
  sudo apt-get update -y ; apt-get install -y bc build-essential git unzip rsync autotools-dev automake libtool
@ -32,10 +33,13 @@ should_fit() {
 }

 rename() {
-  should_fit uImage $MAX_KERNEL_SIZE
-  should_fit rootfs.squashfs $MAX_ROOTFS_SIZE
-  # If board have "_ultimate" as part...
-  # should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE
+  if grep -q ultimate_defconfig ./output/.config; then
+      should_fit uImage $MAX_KERNEL_SIZE_ULTIMATE
+      should_fit rootfs.squashfs $MAX_ROOTFS_SIZE_ULTIMATE
+  else
+      should_fit uImage $MAX_KERNEL_SIZE
+      should_fit rootfs.squashfs $MAX_ROOTFS_SIZE
+  fi
  mv -v ./output/images/uImage ./output/images/uImage.${soc}
  mv -v ./output/images/rootfs.squashfs ./output/images/rootfs.squashfs.${soc}
  mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${soc}.cpio
@ -245,6 +249,11 @@ hi3516cv300() {
  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename
 }

+hi3516cv300_ultimate() {
+  soc="hi3516cv300"
+  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_ultimate all && rename
+}
+
 hi3516ev100() {
  soc="hi3516ev100"
  fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename
@ -563,6 +572,7 @@ xm550() {
 # hi3516dv100                   # OpenIPC
 #
 # hi3516cv300                   # OpenIPC
+# hi3516cv300_ultimate          # OpenIPC_ultimate version
 # hi3516ev100                   # OpenIPC
 #
 # hi3516dv200                   # OpenIPC
@ -570,7 +580,7 @@ xm550() {
 # hi3516ev200_dozor             # Dozor
 # hi3516ev200_eltis             # Eltis
 # hi3516ev200_vixand            # Vixand
-hi3516ev200_ultimate          # OpenIPC_ultimate version
+# hi3516ev200_ultimate          # OpenIPC_ultimate version
 # hi3516ev300                   # OpenIPC
 # hi3516ev300_dev               # OpenIPC development
 # hi3516ev300_glibc             # testing..
--- a/general/package/majestic-hi3516cv300/Config.in
+++ b/general/package/majestic-hi3516cv300/Config.in
@ -5,3 +5,8 @@ config BR2_PACKAGE_MAJESTIC_HI3516CV300
 	  Tiny but powerful IPC streaming software

 	  https://openipc.org
+
+config BR2_PACKAGE_MAJESTIC_ULTIMATE
+        bool "Use this option for the ultimate build"
+        default n
+
--- a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
+++ b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
@ -10,6 +10,12 @@ MAJESTIC_HI3516CV300_SITE = https://openipc.s3-eu-west-1.amazonaws.com
 MAJESTIC_HI3516CV300_LICENSE = MIT
 MAJESTIC_HI3516CV300_LICENSE_FILES = LICENSE

+ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y)
+MAJESTIC_HI3516СV300_SOURCE = majestic.hi3516сv300.ultimate.master.tar.bz2
+else
+MAJESTIC_HI3516СV300_SOURCE = majestic.hi3516сv300.lite.master.tar.bz2
+endif
+
 define MAJESTIC_HI3516CV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
 	$(INSTALL) -m 644 $(@D)/majestic-mini.yaml $(TARGET_DIR)/etc/majestic.yaml
--- a/general/package/majestic-hi3516ev300/Config.in
+++ b/general/package/majestic-hi3516ev300/Config.in
@ -5,3 +5,7 @@ config BR2_PACKAGE_MAJESTIC_HI3516EV300
 	  Tiny but powerful IPC streaming software

 	  https://openipc.org
+
+config BR2_PACKAGE_MAJESTIC_ULTIMATE
+ 	bool "Use this option for the ultimate build"
+	default n
--- a/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk
+++ b/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk
@ -10,11 +10,11 @@ MAJESTIC_HI3516EV300_SITE = https://openipc.s3-eu-west-1.amazonaws.com
 MAJESTIC_HI3516EV300_LICENSE = MIT
 MAJESTIC_HI3516EV300_LICENSE_FILES = LICENSE

-#ifeq ($(BR2_PACKAGE_MAJESTIC_HI3516EV300_ULTIMATE),y)
-#MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.ultimate.master.tar.bz2
-#else
-#MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.master.tar.bz2
-#endif
+ifeq ($(BR2_PACKAGE_MAJESTIC_ULTIMATE),y)
+MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.ultimate.master.tar.bz2
+else
+MAJESTIC_HI3516EV300_SOURCE = majestic.hi3516ev300.lite.master.tar.bz2
+endif

 define MAJESTIC_HI3516EV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
--- a/scripts/executing_commands_for_glibc.sh
+++ b/scripts/executing_commands_for_glibc.sh
@ -5,7 +5,11 @@

 date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
 date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
-echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+if grep -q ultimate_defconfig ${BR2_CONFIG}; then
+    echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release
+else
+    echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+fi
 #
 echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"'
 #
--- a/scripts/executing_commands_for_musl.sh
+++ b/scripts/executing_commands_for_musl.sh
@ -5,7 +5,11 @@

 date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
 date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
-echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+if grep -q ultimate_defconfig ${BR2_CONFIG}; then
+    echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release
+else
+    echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+fi
 #
 echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"'
 #
--- a/scripts/executing_commands_for_uclibc.sh
+++ b/scripts/executing_commands_for_uclibc.sh
@ -5,7 +5,11 @@

 date "+OPENIPC_VERSION=2.2.%m.%d" >>${TARGET_DIR}/usr/lib/os-release
 date "+GITHUB_VERSION=\"${BRANCH_NAME}+${GIT_HASH}, %Y-%m-%d\"" >>${TARGET_DIR}/usr/lib/os-release
-echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+if grep -q ultimate_defconfig ${BR2_CONFIG}; then
+    echo "BUILD_OPTION=ultimate" >>${TARGET_DIR}/usr/lib/os-release
+else
+    echo "BUILD_OPTION=lite" >>${TARGET_DIR}/usr/lib/os-release
+fi
 #
 echo 'Note: BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"'
 #