Ensure consistency in the naming Enapter Industrial Linux distro

Enapter · Jun 4, 2024 · 7e6292a · 7e6292a
1 parent 7ebd145
commit 7e6292a
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/bin/prepare-environments.sh b/bin/prepare-environments.sh
@@ -13,10 +13,10 @@ else
   export DISTRO_VERSION="$CI_COMMIT_TAG"
 fi
 
-export IMG_ARTIFACT_NAME="enapter-linux-${DISTRO_VERSION}.zip"
-export IMG_FILE_ARTIFACT_NAME="enapter-linux-${DISTRO_VERSION}.img"
-export UPDATE_ARTIFACT_NAME="enapter-linux-update-${DISTRO_VERSION}.zip"
-export VMDK_ARTIFACT_NAME="enapter-linux-${DISTRO_VERSION}.vmdk"
+export IMG_ARTIFACT_NAME="enapter-industrial-linux-${DISTRO_VERSION}.zip"
+export IMG_FILE_ARTIFACT_NAME="enapter-industrial-linux-${DISTRO_VERSION}.img"
+export UPDATE_ARTIFACT_NAME="enapter-industrial-linux-update-${DISTRO_VERSION}.zip"
+export VMDK_ARTIFACT_NAME="enapter-industrial-linux-${DISTRO_VERSION}.vmdk"
 
 export SSTATE_DIR=/home/build/sstate-cache
 export DL_DIR=/home/build/downloads

diff --git a/docker/bin/build-intel-x86-64.sh b/docker/bin/build-intel-x86-64.sh
@@ -12,7 +12,7 @@ cd "/home/build/enapter-linux-build/repositories/poky"
 source oe-init-build-env ../../machine/
 cd ..
 
-bitbake enapter-linux-image
+bitbake enapter-industrial-linux-image
 
 /home/build/bin/save-sstate.sh
 /home/build/bin/prepare-artifacts.sh
diff --git a/docker/bin/debug-intel-x86-64.sh b/docker/bin/debug-intel-x86-64.sh
@@ -12,4 +12,4 @@ cd ..
 # pip3 install -r /home/build/enapter-linux-build/repositories/poky/bitbake/toaster-requirements.txt
 # source toaster start webport=0.0.0.0:8080
 
-echo "/home/build/bin/sync-sources.sh && bitbake -k enapter-linux-image"
+echo "/home/build/bin/sync-sources.sh && bitbake -k enapter-industrial-linux-image"
diff --git a/docker/bin/prepare-artifacts.sh b/docker/bin/prepare-artifacts.sh
@@ -4,9 +4,9 @@
 
 set -ex
 
-wic_file="enapter-linux-image-intel-corei7-64.rootfs.wic"
-vmdk_file="enapter-linux-image-intel-corei7-64.rootfs.wic.vmdk"
-update_file="enapter-linux-update.zip"
+wic_file="enapter-industrial-linux-image-intel-corei7-64.rootfs.wic"
+vmdk_file="enapter-industrial-linux-image-intel-corei7-64.rootfs.wic.vmdk"
+update_file="enapter-industrial-linux-update.zip"
 
 update_dir=/home/build/update
 images_dir=/home/build/images
@@ -18,7 +18,7 @@ img_path="$deploy_dir/$IMG_FILE_ARTIFACT_NAME"
 vmdk_path="$deploy_dir/$vmdk_file"
 
 rm -rf "$update_dir"
-rm -f "enapter-linux-*"
+rm -f "enapter-industrial-linux-*"
 
 mkdir -p "$update_dir"
 enapter_files="rootfs.img bzImage initrd version.txt"

diff --git a/machine/conf/distro/enapter-linux.conf → ...conf/distro/enapter-industrial-linux.conf b/machine/conf/distro/enapter-linux.conf → ...conf/distro/enapter-industrial-linux.conf
@@ -1,5 +1,5 @@
-DISTRO = "enapter-linux"
-DISTRO_NAME = "Enapter Linux"
+DISTRO = "enapter-industrial-linux"
+DISTRO_NAME = "Enapter Industrial Linux"
 DISTRO_CODENAME = "genapter"
 PACKAGE_CLASSES = "package_rpm"
 USER_CLASSES = "buildstats"

diff --git a/machine/conf/local.conf b/machine/conf/local.conf
@@ -1,5 +1,5 @@
 MACHINE ?= "intel-corei7-64"
-DISTRO ?= "enapter-linux"
+DISTRO ?= "enapter-industrial-linux"
 
 IMAGE_FSTYPES = "wic wic.vmdk"
 

diff --git a/...ecipes-core/images/enapter-linux-image.bb → .../images/enapter-industrial-linux-image.bb b/...ecipes-core/images/enapter-linux-image.bb → .../images/enapter-industrial-linux-image.bb
@@ -2,14 +2,14 @@ SUMMARY = "Enapter Linux Image."
 
 IMAGE_INSTALL = "shim-efi grub-efi"
 
-WKS_FILE = "enapter-linux-image.wks"
+WKS_FILE = "enapter-industrial-linux-image.wks"
 
 IMAGE_OVERHEAD_FACTOR = "1.0"
 IMAGE_ROOTFS_EXTRA_SPACE = "300000"
 
 inherit core-image
 
-do_rootfs[depends] += "enapter-linux-rootfs:do_image_complete enapter-linux-initramfs:do_image_complete virtual/kernel:do_deploy sbsigntool-native:do_populate_sysroot"
+do_rootfs[depends] += "enapter-industrial-linux-rootfs:do_image_complete enapter-industrial-linux-initramfs:do_image_complete virtual/kernel:do_deploy sbsigntool-native:do_populate_sysroot"
 
 copy_files_to_boot () {
     mkdir -p ${IMAGE_ROOTFS}/boot/EFI/enapter
@@ -19,8 +19,8 @@ copy_files_to_boot () {
 
     echo "${DISTRO_VERSION}" > ${IMAGE_ROOTFS}/boot/EFI/enapter/version.txt
 
-    cp ${DEPLOY_DIR_IMAGE}/enapter-linux-rootfs-${MACHINE}.rootfs.squashfs-zst ${IMAGE_ROOTFS}/boot/EFI/enapter/rootfs.img
-    cp ${DEPLOY_DIR_IMAGE}/enapter-linux-initramfs-${MACHINE}.cpio.gz ${IMAGE_ROOTFS}/boot/EFI/enapter/initrd
+    cp ${DEPLOY_DIR_IMAGE}/enapter-industrial-linux-rootfs-${MACHINE}.rootfs.squashfs-zst ${IMAGE_ROOTFS}/boot/EFI/enapter/rootfs.img
+    cp ${DEPLOY_DIR_IMAGE}/enapter-industrial-linux-initramfs-${MACHINE}.cpio.gz ${IMAGE_ROOTFS}/boot/EFI/enapter/initrd
     cp ${DEPLOY_DIR_IMAGE}/bzImage ${KERNEL_FILE}
     mv ${IMAGE_ROOTFS}/boot/EFI/BOOT/grub-efi-bootx64.efi ${GRUB_EFI_FILE}
 

diff --git a/...es-core/images/enapter-linux-initramfs.bb → ...ges/enapter-industrial-linux-initramfs.bb b/...es-core/images/enapter-linux-initramfs.bb → ...ges/enapter-industrial-linux-initramfs.bb
@@ -15,7 +15,7 @@ PACKAGE_INSTALL = "\
                   "
 
 IMAGE_FEATURES = ""
-export IMAGE_BASENAME = "enapter-linux-initramfs"
+export IMAGE_BASENAME = "enapter-industrial-linux-initramfs"
 IMAGE_NAME_SUFFIX ?= ""
 IMAGE_LINGUAS = ""
 IMAGE_INSTALL = ""

diff --git a/...cipes-core/images/enapter-linux-rootfs.bb → ...images/enapter-industrial-linux-rootfs.bb b/...cipes-core/images/enapter-linux-rootfs.bb → ...images/enapter-industrial-linux-rootfs.bb
diff --git a/...enapter-linux/wic/enapter-linux-image.wks → ...ux/wic/enapter-industrial-linux-image.wks b/...enapter-linux/wic/enapter-linux-image.wks → ...ux/wic/enapter-industrial-linux-image.wks