mirror of
https://github.com/openwrt/openwrt.git
synced 2024-11-23 09:56:19 +08:00
scripts: fix various typos
This only affects typos in comments or user-facing output. Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> [only picks changes to scripts, drop "commandline" replacement, fix case for "arbitrary", improve commit message] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
76fff69180
commit
08622de7d6
@ -4697,7 +4697,7 @@ sub process {
|
|||||||
## $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
|
## $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
|
||||||
##
|
##
|
||||||
## # Remove any bracketed sections to ensure we do not
|
## # Remove any bracketed sections to ensure we do not
|
||||||
## # falsly report the parameters of functions.
|
## # falsely report the parameters of functions.
|
||||||
## my $ln = $line;
|
## my $ln = $line;
|
||||||
## while ($ln =~ s/\([^\(\)]*\)//g) {
|
## while ($ln =~ s/\([^\(\)]*\)//g) {
|
||||||
## }
|
## }
|
||||||
|
@ -207,7 +207,7 @@ class GitHubCommitTsCache(object):
|
|||||||
|
|
||||||
|
|
||||||
class DownloadGitHubTarball(object):
|
class DownloadGitHubTarball(object):
|
||||||
"""Download and repack archive tarabll from GitHub.
|
"""Download and repack archive tarball from GitHub.
|
||||||
|
|
||||||
Compared with the method of packing after cloning the whole repo, this
|
Compared with the method of packing after cloning the whole repo, this
|
||||||
method is more friendly to users with fragile internet connection.
|
method is more friendly to users with fragile internet connection.
|
||||||
@ -220,7 +220,7 @@ class DownloadGitHubTarball(object):
|
|||||||
|
|
||||||
- GitHub archives do not contain source codes for submodules.
|
- GitHub archives do not contain source codes for submodules.
|
||||||
|
|
||||||
- GitHub archives seem to respect .gitattributes and ignore pathes with
|
- GitHub archives seem to respect .gitattributes and ignore paths with
|
||||||
export-ignore attributes.
|
export-ignore attributes.
|
||||||
|
|
||||||
For the first two issues, the method will fail loudly to allow fallback to
|
For the first two issues, the method will fail loudly to allow fallback to
|
||||||
|
@ -569,7 +569,7 @@ while [ -n "$1" ]; do
|
|||||||
echo -e " Most commands also take a --cflags parameter which " >&2
|
echo -e " Most commands also take a --cflags parameter which " >&2
|
||||||
echo -e " is used to specify C flags to be passed to the " >&2
|
echo -e " is used to specify C flags to be passed to the " >&2
|
||||||
echo -e " cross compiler when performing tests." >&2
|
echo -e " cross compiler when performing tests." >&2
|
||||||
echo -e " This paremter may be repeated multiple times." >&2
|
echo -e " This parameter may be repeated multiple times." >&2
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ from sys import argv
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
if len(argv) != 2:
|
if len(argv) != 2:
|
||||||
print("JSON info files script requires ouput file as argument")
|
print("JSON info files script requires output file as argument")
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
output_path = Path(argv[1])
|
output_path = Path(argv[1])
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
# This is appended to the factory image and is tested by the Linksys Upgrader - as observed in civic.
|
# This is appended to the factory image and is tested by the Linksys Upgrader - as observed in civic.
|
||||||
# The footer is 256 bytes. The format is:
|
# The footer is 256 bytes. The format is:
|
||||||
# .LINKSYS. This is detected by the Linksys upgrader before continuing with upgrade. (9 bytes)
|
# .LINKSYS. This is detected by the Linksys upgrader before continuing with upgrade. (9 bytes)
|
||||||
# <VERSION> The version number of upgrade. Not checked so use arbitary value (8 bytes)
|
# <VERSION> The version number of upgrade. Not checked so use arbitrary value (8 bytes)
|
||||||
# <TYPE> Model of target device, padded (0x20) to (15 bytes)
|
# <TYPE> Model of target device, padded (0x20) to (15 bytes)
|
||||||
# <CRC> CRC checksum of the image to flash (8 byte)
|
# <CRC> CRC checksum of the image to flash (8 byte)
|
||||||
# <padding> Padding (0x20) (7 bytes)
|
# <padding> Padding (0x20) (7 bytes)
|
||||||
# <signature> Signature of signer. Not checked so use Arbitary value (16 bytes)
|
# <signature> Signature of signer. Not checked so use arbitrary value (16 bytes)
|
||||||
# <padding> Padding (0x00) (192 bytes)
|
# <padding> Padding (0x00) (192 bytes)
|
||||||
# 0x0A (1 byte)
|
# 0x0A (1 byte)
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
function usage {
|
function usage {
|
||||||
echo "Usage: prepare_image image_type kernel_image rootfs_image header_size"
|
echo "Usage: prepare_image image_type kernel_image rootfs_image header_size"
|
||||||
echo "Padd root and kernel image to the correct size and append the jffs2 start marker as needed"
|
echo "Pad root and kernel image to the correct size and append the jffs2 start marker as needed"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,12 +3,12 @@
|
|||||||
# directory where search for images
|
# directory where search for images
|
||||||
TOP_DIR="${TOP_DIR:-./bin/targets}"
|
TOP_DIR="${TOP_DIR:-./bin/targets}"
|
||||||
# key to sign images
|
# key to sign images
|
||||||
BUILD_KEY="${BUILD_KEY:-key-build}" # TODO unifiy naming?
|
BUILD_KEY="${BUILD_KEY:-key-build}" # TODO unify naming?
|
||||||
# remove other signatures (added e.g. by buildbot)
|
# remove other signatures (added e.g. by buildbot)
|
||||||
REMOVE_OTER_SIGNATURES="${REMOVE_OTER_SIGNATURES:-1}"
|
REMOVE_OTER_SIGNATURES="${REMOVE_OTER_SIGNATURES:-1}"
|
||||||
|
|
||||||
# find all sysupgrade images in TOP_DIR
|
# find all sysupgrade images in TOP_DIR
|
||||||
# factory images don't need signatures as non OpenWrt system doen't check them anyway
|
# factory images don't need signatures as non OpenWrt system doesn't check them anyway
|
||||||
for image in $(find $TOP_DIR -type f -name "*-sysupgrade.bin"); do
|
for image in $(find $TOP_DIR -type f -name "*-sysupgrade.bin"); do
|
||||||
# check if image actually support metadata
|
# check if image actually support metadata
|
||||||
if fwtool -i /dev/null "$image"; then
|
if fwtool -i /dev/null "$image"; then
|
||||||
|
@ -7,9 +7,9 @@
|
|||||||
###
|
###
|
||||||
### The script compares locally compiled package with the package indexes
|
### The script compares locally compiled package with the package indexes
|
||||||
### available upstream. This way the storage impact of optimizations or
|
### available upstream. This way the storage impact of optimizations or
|
||||||
### feature modifiactions is easy to see.
|
### feature modifications is easy to see.
|
||||||
###
|
###
|
||||||
### If no environmental variables are set the scritp reads the current
|
### If no environmental variables are set the script reads the current
|
||||||
### .config file. The evaluated env variables are the following:
|
### .config file. The evaluated env variables are the following:
|
||||||
###
|
###
|
||||||
### TARGET SUBTARGET ARCH PACKAGES BIN_DIR BASE_URL CHECK_INSTALLED
|
### TARGET SUBTARGET ARCH PACKAGES BIN_DIR BASE_URL CHECK_INSTALLED
|
||||||
|
@ -772,7 +772,7 @@ sub writeOutFirmware {
|
|||||||
$_->{'name'}, $filename);
|
$_->{'name'}, $filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
# If the next parition is before the end of the current image, then rewind.
|
# If the next partition is before the end of the current image, then rewind.
|
||||||
elsif ($_->{'offset'} < $end_point) {
|
elsif ($_->{'offset'} < $end_point) {
|
||||||
$debug and printf("Rewound %s before <%s> in \"%s\"\n",
|
$debug and printf("Rewound %s before <%s> in \"%s\"\n",
|
||||||
(($end_point - $_->{'offset'}) >= $block_size ?
|
(($end_point - $_->{'offset'}) >= $block_size ?
|
||||||
@ -971,7 +971,7 @@ if (!GetOptions("d|debug" => \$debug,
|
|||||||
print " [-b|--redboot] <file> Input/Output RedBoot filename\n";
|
print " [-b|--redboot] <file> Input/Output RedBoot filename\n";
|
||||||
print " [-s|--sysconf] <file> Input/Output SysConf filename\n";
|
print " [-s|--sysconf] <file> Input/Output SysConf filename\n";
|
||||||
print " [-L|--loader] <file> Second stage boot loader filename\n";
|
print " [-L|--loader] <file> Second stage boot loader filename\n";
|
||||||
print " [-k|--kernel] <file> Input/Ouptut Kernel filename\n";
|
print " [-k|--kernel] <file> Input/Output Kernel filename\n";
|
||||||
print " [-r|--ramdisk] <file> Input/Output Ramdisk filename(s)\n";
|
print " [-r|--ramdisk] <file> Input/Output Ramdisk filename(s)\n";
|
||||||
print " [-f|--fisdir] <file> Input/Output FIS directory filename\n";
|
print " [-f|--fisdir] <file> Input/Output FIS directory filename\n";
|
||||||
print " [-m|--microcode] <file> Input/Output Microcode filename\n";
|
print " [-m|--microcode] <file> Input/Output Microcode filename\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user