Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ mok_signing_key="/var/lib/shim-signed/mok/MOK.priv"
mok_certificate="/var/lib/shim-signed/mok/MOK.der"
```

NOTE: If any of the files specified by `mok_signing_key` and `mok_certificate` are non-existant, DKMS will re-create both files.
NOTE: If any of the files specified by `mok_signing_key` and `mok_certificate` are non-existent, DKMS will re-create both files.

The paths specified in `mok_signing_key`, `mok_certificate` and `sign_file` can use the variable `${kernelver}` to represent the target kernel version.

Expand Down
2 changes: 1 addition & 1 deletion dkms.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ NOTE: If any of the files specified by
.B mok_signing_key
and
.B mok_certificate
are non-existant, dkms will re-create both files.
are non-existent, dkms will re-create both files.

.B mok_signing_key
can also be a "pkcs11:..." string for PKCS#11 engine, as long as the
Expand Down
8 changes: 4 additions & 4 deletions dkms.in
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
# 5: prepare_build(): Patch ... as specified in dkms.conf cannot be found in ...
# 5: install: This module/version combo is already installed for kernel ...
# 6: prepare_build(): Application of patch ... failed.
# 6: install: You cannot install a module onto a non-existant kernel.
# 6: install: You cannot install a module onto a non-existent kernel.
# 6: install: Installation aborted.
# 6: install: Install Failed (depmod problems). Module rolled back to built state.
# 6: make_tarball(): Modules must already be in the built state before using mktarball.
Expand All @@ -73,7 +73,7 @@
# 12: setup_kernels_arches(): Could not determine architecture.
# 13: build: Aborting build of module ... for kernel ... due to missing BUILD_DEPENDS: ...
# 14: kernel_preinst/prerm: dkms kernel_preinst/prerm for kernel ... failed for module(s) ...
# 15: gloabl: a call to cd failed
# 15: global: a call to cd failed
# 16: setup_kernels_arches()/do_build()/do_install(): empty $kernelver or $arch
# 21: prepare_kernel(): Your kernel headers for kernel ... cannot be found ...
# 77: skipped due to BUILD_EXCLUSIVE
Expand Down Expand Up @@ -1723,7 +1723,7 @@ do_install()
# Make sure that kernel exists to install into
[[ -e $install_tree/$kernelver ]] || die 6 \
"The directory $install_tree/$kernelver doesn't exist." \
"You cannot install a module onto a non-existant kernel."
"You cannot install a module onto a non-existent kernel."

# Read the conf file
set_module_suffix "$kernelver"
Expand Down Expand Up @@ -2557,7 +2557,7 @@ make_tarball()
local -r binary_only_dir="$temp_dir_name/dkms_binaries_only"

echo ""
echo "Creating tarball structure to specifically accomodate binaries."
echo "Creating tarball structure to specifically accommodate binaries."

mkdir "$binary_only_dir"
echo "$module" > "$binary_only_dir/PACKAGE_NAME"
Expand Down
6 changes: 3 additions & 3 deletions dkms_common.postinst.in
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ fi

# On 1st installation, let us look for a directory
# in $MODDIR which matches $(uname -r). If none
# is found it is possible that buildd is being used
# is found it is possible that a build daemon is being used
# and that uname -r is giving us the name of the
# kernel used by the buildd machine.
# kernel used by the build daemon machine.
#
# If this is the case we try to build the kernel
# module for each kernel which has a directory in
# $MODDIR. Furthermore we will have to tell
# DKMS which architecture it should build the module
# for (e.g. if the buildd machine is using a
# for (e.g. if the build daemon machine is using a
# 2.6.24-23-xen 64bit kernel).
#
# NOTE: if the headers are not installed then the
Expand Down
2 changes: 1 addition & 1 deletion run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ remove_module_source_tree() {
/usr/src/*)
;;
*)
echo "Unsuported module source tree location '$p'"
echo "Unsupported module source tree location '$p'"
exit 1
;;
esac
Expand Down