diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 6 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 4 | ||||
| -rw-r--r-- | scripts/package-build/linux-kernel/README.md | 4 | ||||
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-kernel.sh | 2 | ||||
| -rwxr-xr-x | scripts/package-build/linux-kernel/build-mellanox-ofed.sh | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 79ed9ce4..6ac4b73e 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -102,7 +102,7 @@ parser.add_argument('--iso', help='ISO file to install') parser.add_argument('--disk', help='name of disk image file', nargs='?') parser.add_argument('--keep', help='Do not remove disk-image after installation', action='store_true', default=False) -parser.add_argument('--silent', help='Do not show output on stdout unless an error has occured', +parser.add_argument('--silent', help='Do not show output on stdout unless an error has occurred', action='store_true', default=False) parser.add_argument('--debug', help='Send all debug output to stdout', action='store_true', default=False) @@ -1244,13 +1244,13 @@ except pexpect.exceptions.TIMEOUT: EXCEPTION = 1 except pexpect.exceptions.ExceptionPexpect: - log.error('Exeption while executing QEMU') + log.error('Exception while executing QEMU') log.error('Is qemu working on this system?') log.error(traceback.format_exc()) EXCEPTION = 1 except Exception: - log.error('Unknown error occured!') + log.error('Unknown error occurred!') traceback.print_exc() EXCEPTION = 1 diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index f8c70327..a311c2d8 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -370,7 +370,7 @@ def build(): shutil.copytree(sb_certs, f'{lb_config_dir}/includes.chroot/var/lib/shim-signed/mok') # Switch to the build directory, this is crucial for the live-build work - # because the efective build config files etc. are there. + # because the effective build config files etc. are there. # # All directory paths from this point must be relative to BUILD_DIR, # not to the vyos-build repository root. @@ -404,7 +404,7 @@ def build(): # Initialize Git object from our repository try: repo = git.Repo('.', search_parent_directories=True) - # Retrieve the Git commit ID of the repository, 14 charaters will be sufficient + # Retrieve the Git commit ID of the repository, 14 characters will be sufficient build_git = repo.head.object.hexsha[:14] # Retrieve git branch name or current tag diff --git a/scripts/package-build/linux-kernel/README.md b/scripts/package-build/linux-kernel/README.md index 927e880c..cc02262a 100644 --- a/scripts/package-build/linux-kernel/README.md +++ b/scripts/package-build/linux-kernel/README.md @@ -22,8 +22,8 @@ folder. ### Config The Kernel configuration used is [x86_64_vyos_defconfig](x86_64_vyos_defconfig) -which will be copied on demand during the Pipeline run into the `arch/x86/configs`i -direcotry of the Kernel source tree. +which will be copied on demand during the Pipeline run into the `arch/x86/configs` +directory of the Kernel source tree. Other configurations can be added in the future easily. diff --git a/scripts/package-build/linux-kernel/build-kernel.sh b/scripts/package-build/linux-kernel/build-kernel.sh index cae3d8db..a0364897 100755 --- a/scripts/package-build/linux-kernel/build-kernel.sh +++ b/scripts/package-build/linux-kernel/build-kernel.sh @@ -44,7 +44,7 @@ do done # VyOS requires some small Kernel Patches - apply them here -# It's easier to habe them here and make use of the upstream +# It's easier to have them here and make use of the upstream # repository instead of maintaining a full Kernel Fork. # Saving time/resources is essential :-) PATCH_DIR=${CWD}/patches/kernel diff --git a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh index 3f8a50f0..a810d765 100755 --- a/scripts/package-build/linux-kernel/build-mellanox-ofed.sh +++ b/scripts/package-build/linux-kernel/build-mellanox-ofed.sh @@ -53,7 +53,7 @@ fi # Verify integrity echo "${DRIVER_SHA1} ${DRIVER_FILE}" | sha1sum -c - if [ $? != 0 ]; then - echo SHA1 checksum missmatch + echo SHA1 checksum mismatch exit 1 fi |