Skip to content

Commit

Permalink
Changing product name to 'Kubos Linux'
Browse files Browse the repository at this point in the history
  • Loading branch information
Catherine Garabedian committed Jan 19, 2018
1 parent 2c0b32a commit f6185ce
Show file tree
Hide file tree
Showing 20 changed files with 35 additions and 34 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# KubOS Linux
# Kubos Linux

## Overview

Expand Down Expand Up @@ -32,17 +32,17 @@ 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.
There are several commands and variables in the build process which use relative file paths to navigate between the components.

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

Expand Down
4 changes: 2 additions & 2 deletions board/kubos/at91sam9g20isis/kubos-kernel.its
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions board/kubos/beaglebone-black/kubos-kernel.its
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions board/kubos/pumpkin-mbm2/kubos-kernel.its
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion changelog.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KubOS Linux Changelog
Kubos Linux Changelog
=====================

v1.1 - Jan 19 2018
Expand All @@ -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:
~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion common/linux-kubos.config
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/overlay/etc/init.d/S99kubos-verify
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/at91sam9g20isis_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/beaglebone-black_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/generic-kubos_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/pumpkin-mbm2_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tools/at91sam9g20isis/kubos-nor-flash.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
#############################################################################
#
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/format-aux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions tools/format-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions tools/format-sd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/kpack-NOR.its
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down
6 changes: 3 additions & 3 deletions tools/kpack.its
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
};
Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-nor-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tools/kubos-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f6185ce

Please sign in to comment.