diff --git a/README.md b/README.md index f86a270c..268ef8c0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# KubOS Linux +# Kubos Linux ## Overview @@ -32,9 +32,9 @@ This folder contains the BuildRoot configuration files needed to build each OBC ## Installation -In order to build KubOS Linux, two components are needed: +In order to build Kubos Linux, two components are needed: -- The [kubos-linux-build repo](https://github.com/kubos/kubos-linux-build) - Contains the configurations, patches, and extra tools needed to build KubOS Linux +- The [kubos-linux-build repo](https://github.com/kubos/kubos-linux-build) - Contains the configurations, patches, and extra tools needed to build Kubos Linux - [BuildRoot](https://buildroot.org/) - The actual build system These components should be setup as children of the same parent directory. @@ -42,7 +42,7 @@ There are several commands and variables in the build process which use relative After the environment has been set up, all build commands will be run from the BuildRoot directory unless otherwise stated. -To set up a build environment and build KubOS Linux: +To set up a build environment and build Kubos Linux: Create a new parent folder to contain the build environment diff --git a/board/kubos/at91sam9g20isis/kubos-kernel.its b/board/kubos/at91sam9g20isis/kubos-kernel.its index 0ff095d1..509538ac 100644 --- a/board/kubos/at91sam9g20isis/kubos-kernel.its +++ b/board/kubos/at91sam9g20isis/kubos-kernel.its @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * KubOS Linux Kernel Package + * Kubos Linux Kernel Package * Contains: zImage */ /dts-v1/; / { - description = "KubOS Linux Kernel"; + description = "Kubos Linux Kernel"; #address-cells = <1>; images { diff --git a/board/kubos/beaglebone-black/kubos-kernel.its b/board/kubos/beaglebone-black/kubos-kernel.its index be7520ea..04a33332 100644 --- a/board/kubos/beaglebone-black/kubos-kernel.its +++ b/board/kubos/beaglebone-black/kubos-kernel.its @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * KubOS Linux Kernel Package + * Kubos Linux Kernel Package * Contains: zImage */ /dts-v1/; / { - description = "KubOS Linux Kernel"; + description = "Kubos Linux Kernel"; #address-cells = <1>; images { diff --git a/board/kubos/pumpkin-mbm2/kubos-kernel.its b/board/kubos/pumpkin-mbm2/kubos-kernel.its index be7520ea..04a33332 100644 --- a/board/kubos/pumpkin-mbm2/kubos-kernel.its +++ b/board/kubos/pumpkin-mbm2/kubos-kernel.its @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * KubOS Linux Kernel Package + * Kubos Linux Kernel Package * Contains: zImage */ /dts-v1/; / { - description = "KubOS Linux Kernel"; + description = "Kubos Linux Kernel"; #address-cells = <1>; images { diff --git a/changelog.rst b/changelog.rst index e7c688b8..4b16847d 100644 --- a/changelog.rst +++ b/changelog.rst @@ -1,4 +1,4 @@ -KubOS Linux Changelog +Kubos Linux Changelog ===================== v1.1 - Jan 19 2018 @@ -11,6 +11,7 @@ v1.1 - Jan 19 2018 - Adding support for iOBC SPI bus 1 - Improving the CircleCI automated testing - Removing deprecated Kubos packages +- Changing product name from "Kubos Linux" to "Kubos Linux" Community Contributions: ~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/common/linux-kubos.config b/common/linux-kubos.config index 77bbd884..049cd015 100644 --- a/common/linux-kubos.config +++ b/common/linux-kubos.config @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="-KubOS-1.0.3" +CONFIG_LOCALVERSION="-KubOS-1.1.0" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_KERNEL_LZ4=y # CONFIG_CROSS_MEMORY_ATTACH is not set diff --git a/common/overlay/etc/init.d/S99kubos-verify b/common/overlay/etc/init.d/S99kubos-verify index 0873bdc8..6e33fb23 100755 --- a/common/overlay/etc/init.d/S99kubos-verify +++ b/common/overlay/etc/init.d/S99kubos-verify @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# KubOS Linux Boot Finalization +# Kubos Linux Boot Finalization # # Update the U-Boot variables to indicate that we have successfully booted diff --git a/configs/at91sam9g20isis_defconfig b/configs/at91sam9g20isis_defconfig index fa4581c6..7188934a 100644 --- a/configs/at91sam9g20isis_defconfig +++ b/configs/at91sam9g20isis_defconfig @@ -9,7 +9,7 @@ BR2_GCC_ENABLE_LTO=y BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_HOST_GDB_SIM=y BR2_TARGET_GENERIC_HOSTNAME="Kubos" -BR2_TARGET_GENERIC_ISSUE="Welcome to KubOS Linux" +BR2_TARGET_GENERIC_ISSUE="Welcome to Kubos Linux" BR2_TARGET_GENERIC_ROOT_PASSWD="Kubos123" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/beaglebone-black_defconfig b/configs/beaglebone-black_defconfig index 20abd819..18d290c7 100644 --- a/configs/beaglebone-black_defconfig +++ b/configs/beaglebone-black_defconfig @@ -10,7 +10,7 @@ BR2_GCC_ENABLE_LTO=y BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_HOST_GDB_SIM=y BR2_TARGET_GENERIC_HOSTNAME="Kubos" -BR2_TARGET_GENERIC_ISSUE="Welcome to KubOS Linux" +BR2_TARGET_GENERIC_ISSUE="Welcome to Kubos Linux" BR2_TARGET_GENERIC_ROOT_PASSWD="Kubos123" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/generic-kubos_defconfig b/configs/generic-kubos_defconfig index 89a0789f..f2fd0973 100644 --- a/configs/generic-kubos_defconfig +++ b/configs/generic-kubos_defconfig @@ -7,7 +7,7 @@ BR2_GCC_ENABLE_LTO=y BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_HOST_GDB_SIM=y BR2_TARGET_GENERIC_HOSTNAME="Kubos" -BR2_TARGET_GENERIC_ISSUE="Welcome to KubOS Linux" +BR2_TARGET_GENERIC_ISSUE="Welcome to Kubos Linux" BR2_TARGET_GENERIC_ROOT_PASSWD="Kubos123" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/configs/pumpkin-mbm2_defconfig b/configs/pumpkin-mbm2_defconfig index 246b45f8..aad64303 100644 --- a/configs/pumpkin-mbm2_defconfig +++ b/configs/pumpkin-mbm2_defconfig @@ -10,7 +10,7 @@ BR2_GCC_ENABLE_LTO=y BR2_PACKAGE_HOST_GDB=y BR2_PACKAGE_HOST_GDB_SIM=y BR2_TARGET_GENERIC_HOSTNAME="Kubos" -BR2_TARGET_GENERIC_ISSUE="Welcome to KubOS Linux" +BR2_TARGET_GENERIC_ISSUE="Welcome to Kubos Linux" BR2_TARGET_GENERIC_ROOT_PASSWD="Kubos123" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y diff --git a/tools/at91sam9g20isis/kubos-nor-flash.tcl b/tools/at91sam9g20isis/kubos-nor-flash.tcl index 50d3cf25..b83df3e4 100644 --- a/tools/at91sam9g20isis/kubos-nor-flash.tcl +++ b/tools/at91sam9g20isis/kubos-nor-flash.tcl @@ -14,7 +14,7 @@ # limitations under the License. # ############################################################################# - # Flash KubOS Linux related NOR flash files on the at91sam9g20isis board + # Flash Kubos Linux related NOR flash files on the at91sam9g20isis board # using the SAM-BA flashing utility ############################################################################# # @@ -36,9 +36,9 @@ # ############################################################################# # - # Note: The iOBC must be connected, powered, and not running KubOS Linux + # Note: The iOBC must be connected, powered, and not running Kubos Linux # in order for this script to work. (If board is currently running - # KubOS Linux, reboot the board and hold down any key to boot into the + # Kubos Linux, reboot the board and hold down any key to boot into the # U-Boot CLI instead) # # This script will be passed as an argument when calling the SAM-BA flashing diff --git a/tools/format-aux.sh b/tools/format-aux.sh index 04db9b6d..37cf599b 100644 --- a/tools/format-aux.sh +++ b/tools/format-aux.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Create Auxiliary SD Card image for use with KubOS Linux on the +# Create Auxiliary SD Card image for use with Kubos Linux on the # Pumpkin MBM2 # # Inputs: diff --git a/tools/format-image.sh b/tools/format-image.sh index 4d238d1f..683db694 100755 --- a/tools/format-image.sh +++ b/tools/format-image.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Create SD Card image for use with KubOS Linux on the iOBC +# Create SD Card image for use with Kubos Linux on the iOBC # # Inputs: # * d {device} - sets the SD card device name for optional flashing (does not flash by default) @@ -139,9 +139,9 @@ if [ "${package}" -gt "2" ]; then fi -# Load the base version of KubOS Linux +# Load the base version of Kubos Linux if [ "${package}" -gt "1" ]; then - echo '\nBuilding the KubOS Linux base package' + echo '\nBuilding the Kubos Linux base package' export PATH=$PATH:/usr/bin/iobc_toolchain/usr/bin echo $PATH ./kubos-package.sh -k -b ${branch} -v base -o ${output} -t ${target} diff --git a/tools/format-sd.sh b/tools/format-sd.sh index e9c8faec..9e004fb7 100755 --- a/tools/format-sd.sh +++ b/tools/format-sd.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Format SD Card for use with KubOS Linux on the iOBC +# Format SD Card for use with Kubos Linux on the iOBC # # Inputs: # * d {device} - sets the SD card device name (default /dev/sdb) @@ -101,9 +101,9 @@ if [ "${package}" -lt "3" ]; then sleep 1 fi -# Load the base version of KubOS Linux +# Load the base version of Kubos Linux if [ "${package}" -gt "1" ]; then - echo '\nBuilding the KubOS Linux base package' + echo '\nBuilding the Kubos Linux base package' export PATH=$PATH:/usr/bin/iobc_toolchain/usr/bin echo $PATH ./kubos-package.sh -b ${branch} -v base diff --git a/tools/kpack-NOR.its b/tools/kpack-NOR.its index 5e8a8225..34292646 100644 --- a/tools/kpack-NOR.its +++ b/tools/kpack-NOR.its @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * KubOS Linux Upgrade Package + * Kubos Linux Upgrade Package * Contains: New zImage and rootfs image */ diff --git a/tools/kpack.its b/tools/kpack.its index 01286e34..e3573b4e 100644 --- a/tools/kpack.its +++ b/tools/kpack.its @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * KubOS Linux Upgrade Package + * Kubos Linux Upgrade Package * Contains: New kernel and rootfs image */ /dts-v1/; / { - description = "KubOS Linux Upgrade Package"; + description = "Kubos Linux Upgrade Package"; #address-cells = <1>; images { @@ -53,7 +53,7 @@ configurations { default = "config@1"; config@1 { - description = "Full KubOS Linux Upgrade"; + description = "Full Kubos Linux Upgrade"; kernel = "kernel@1"; rootfs = "rootfs@1"; }; diff --git a/tools/kubos-kernel.sh b/tools/kubos-kernel.sh index 83c1aaff..13d09f88 100755 --- a/tools/kubos-kernel.sh +++ b/tools/kubos-kernel.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# kubos-package: Create KubOS Linux Upgrade Package (kpack) +# kubos-package: Create Kubos Linux Upgrade Package (kpack) # input=kubos-kernel.its diff --git a/tools/kubos-nor-package.sh b/tools/kubos-nor-package.sh index 32a2781e..96685a1b 100755 --- a/tools/kubos-nor-package.sh +++ b/tools/kubos-nor-package.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# kubos-package: Create KubOS Linux Upgrade Package (kpack) +# kubos-package: Create Kubos Linux Upgrade Package (kpack) # version=$(date +%Y.%m.%d) diff --git a/tools/kubos-package.sh b/tools/kubos-package.sh index 1533dcd5..4fe646b1 100755 --- a/tools/kubos-package.sh +++ b/tools/kubos-package.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# kubos-package: Create KubOS Linux Upgrade Package (kpack) +# kubos-package: Create Kubos Linux Upgrade Package (kpack) # version=$(date +%Y.%m.%d)