Browse Source

Merge pull request #151 from oleorhagen/fx

Some small fixes
2.0.x
oleorhagen 5 years ago
committed by GitHub
parent
commit
6808e9704e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      LICENSE
  2. 3
      LIC_FILES_CHKSUM.sha256
  3. 4
      configs/raspberrypi_config
  4. 4
      mender-convert-extract
  5. 4
      mender-convert-modify
  6. 4
      mender-convert-package

2
LICENSE

@ -1,4 +1,4 @@
Copyright 2019 Northern.tech AS
Copyright 2020 Northern.tech AS
All content in this project is licensed under the Apache License v2, unless
indicated otherwise.

3
LIC_FILES_CHKSUM.sha256

@ -1 +1,2 @@
beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE
32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE

4
configs/raspberrypi_config

@ -48,7 +48,7 @@ function platform_modify() {
# Ubuntu Server images actually use U-boot by default on RPi3 and the
# layout is slightly different on the boot partition. That is why we need
# additional logic here to determinant what we are converting.
# additional logic here to determine what we are converting.
if [ -e work/boot/uboot.bin ] && [ -e work/boot/vmlinuz ]; then
RASPBERRYPI_KERNEL_IMAGE="vmlinuz"
RASPBERRYPI_BOOTLOADER_IMAGE="uboot.bin"
@ -67,7 +67,7 @@ function platform_modify() {
run_and_log_cmd "sudo cp work/rpi/binaries/uboot-git-log.txt work/boot"
# Raspberry Pi applications expect to find this on the device and in some
# cases parse the options to determinate functionality.
# cases parse the options to determine the functionality.
run_and_log_cmd "sudo ln -fs /uboot/config.txt work/rootfs/boot/config.txt"
run_and_log_cmd "sudo ln -fs /uboot/overlays work/rootfs/boot/overlays"
run_and_log_cmd "sudo ln -fs /uboot/cmdline.txt work/rootfs/boot/cmdline.txt"

4
mender-convert-extract

@ -1,6 +1,6 @@
#! /usr/bin/env bash
#
# Copyright 2019 Northern.tech AS
# Copyright 2020 Northern.tech AS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ disk_image=""
while (( "$#" )); do
case "$1" in
-o | --overlay)
overlays+="${2}"
overlays+=("${2}")
shift 2
;;
-c | --config)

4
mender-convert-modify

@ -1,6 +1,6 @@
#! /usr/bin/env bash
#
# Copyright 2019 Northern.tech AS
# Copyright 2020 Northern.tech AS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -49,7 +49,7 @@ declare -a configs=("configs/mender_convert_config")
while (( "$#" )); do
case "$1" in
-o | --overlay)
overlays+="${2}"
overlays+=("${2}")
shift 2
;;
-c | --config)

4
mender-convert-package

@ -1,6 +1,6 @@
#! /usr/bin/env bash
#
# Copyright 2019 Northern.tech AS
# Copyright 2020 Northern.tech AS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -44,7 +44,7 @@ declare -a configs=("configs/mender_convert_config")
while (( "$#" )); do
case "$1" in
-o | --overlay)
overlays+="${2}"
overlays+=("${2}")
shift 2
;;
-c | --config)

Loading…
Cancel
Save