From 4e13dee69990ec23dea4024bbcc42be3d0f84a78 Mon Sep 17 00:00:00 2001
From: Kevin Klues <kklues@nvidia.com>
Date: Tue, 12 Nov 2019 18:24:16 +0000
Subject: [PATCH 1/4] Update native-elf-format script to have consistent
 whitespace

Signed-off-by: Kevin Klues <kklues@nvidia.com>
---
 mk/native-elf-format | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mk/native-elf-format b/mk/native-elf-format
index 581654c3..64331536 100644
--- a/mk/native-elf-format
+++ b/mk/native-elf-format
@@ -25,10 +25,10 @@ $1 ~ "Class:" {
     }
 $1 ~ "Data:"  {
         if (match($0, "little")) {
-            elfdata = "LSB";
- 	} else {
-            elfdata = "MSB";
-	}
+                elfdata = "LSB";
+         } else {
+                elfdata = "MSB";
+        }
     }
 $1 ~ "Machine:" {
         if (match($0, "Intel.*386")) {

From f8a11b3076a81e1224ecb91736c605bcd1683df3 Mon Sep 17 00:00:00 2001
From: Kevin Klues <kklues@nvidia.com>
Date: Tue, 12 Nov 2019 21:31:35 +0000
Subject: [PATCH 2/4] Make the native-elf-format script executable

Previously, attempting to execute this command was failing because of
the incorrect permissions
---
 mk/native-elf-format | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 mk/native-elf-format

diff --git a/mk/native-elf-format b/mk/native-elf-format
old mode 100644
new mode 100755

From 5d2f30efb94a03f12c11dcbc33eb7257fa309bca Mon Sep 17 00:00:00 2001
From: Kevin Klues <kklues@nvidia.com>
Date: Tue, 12 Nov 2019 18:42:33 +0000
Subject: [PATCH 3/4] Update docker makefile to allow for bash completion of
 valid targets

Signed-off-by: Kevin Klues <kklues@nvidia.com>
---
 mk/docker.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mk/docker.mk b/mk/docker.mk
index 450e14e5..515d4992 100644
--- a/mk/docker.mk
+++ b/mk/docker.mk
@@ -13,8 +13,12 @@
 # limitations under the License.
 #
 
+DOCKER_TARGETS = ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1
+
 docker: SHELL:=/bin/bash
-docker: ubuntu18.04 ubuntu16.04 debian10 debian9 centos7 amazonlinux1 amazonlinux2 opensuse-leap15.1
+docker: $(DOCKER_TARGETS)
+
+$(DOCKER_TARGETS): # Added to explicity define possible targets for bash completion
 
 ubuntu%: ARCH := amd64
 ubuntu%:

From 1e72c3a444e34b731a3c48e61b375f6b713a92ea Mon Sep 17 00:00:00 2001
From: Kevin Klues <kklues@nvidia.com>
Date: Tue, 12 Nov 2019 18:46:26 +0000
Subject: [PATCH 4/4] Update README with new build instructions

Signed-off-by: Kevin Klues <kklues@nvidia.com>
---
 README.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e1ff6fb4..0da4f7a1 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,26 @@ The implementation relies on kernel primitives and is designed to be agnostic of
 
 ## Installing the library
 ### From packages
-Refer to the [repository configuration](https://nvidia.github.io/libnvidia-container/) for your Linux distribution.
+Configure the [package repository](https://nvidia.github.io/libnvidia-container/) for your Linux distribution.
+
+Install the packages:
+```bash
+libnvidia-container1
+libnvidia-container-tools
+```
 
 ### From sources
 With Docker:
 ```bash
-# Generate packages for a given distribution in the dist/ directory
-make docker-ubuntu:16.04
+# Generate docker images for a supported <os><version>
+make {ubuntu18.04, ubuntu16.04, debian10, debian9, centos7, amazonlinux1, amazonlinux2, opensuse-leap15.1}
+
+# Or generate docker images for all supported distributions in the dist/ directory
+make docker
 ````
 
+The resulting images have the name `nvidia/libnvidia-container/<os>:<version>`
+
 Without Docker:
 ```bash
 make install