From 369533ab04477b8fec3f1d8d17d0fada050fdb2d Mon Sep 17 00:00:00 2001
From: Cleber Rosa <crosa@redhat.com>
Date: Tue, 3 Aug 2021 16:42:53 -0400
Subject: [PATCH 1/3] Standardize "output_dir" positional parameter and usage
 message

There are parameters and variables and mentions about "output_d",
"output_dir", "output dir" and "data dir", but they refer to the same
thing.

Let's use a single name across them all to improve the user experience
and code readability.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 src/lib/cirros/ds/configdrive | 4 ++--
 src/lib/cirros/ds/ec2         | 4 ++--
 src/lib/cirros/ds/nocloud     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/cirros/ds/configdrive b/src/lib/cirros/ds/configdrive
index e2bebb0..dc5eaf1 100755
--- a/src/lib/cirros/ds/configdrive
+++ b/src/lib/cirros/ds/configdrive
@@ -12,7 +12,7 @@ SEED_POST_D="/var/lib/cloud/seed/configdrive"
 
 Usage() {
 	cat <<EOF
-Usage: ${0##*/} mode output_d
+Usage: ${0##*/} mode output_dir
 
    Datasource for openstack config drive
 EOF
@@ -168,7 +168,7 @@ while [ $# -ne 0 ]; do
 	shift;
 done
 
-[ $# -eq 2 ] || bad_Usage "must provide mode and output dir"
+[ $# -eq 2 ] || bad_Usage "must provide mode and output_dir"
 mode="$1"
 out_d="$2"
 
diff --git a/src/lib/cirros/ds/ec2 b/src/lib/cirros/ds/ec2
index 0f9efe2..f14200e 100755
--- a/src/lib/cirros/ds/ec2
+++ b/src/lib/cirros/ds/ec2
@@ -14,7 +14,7 @@ fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
 
 Usage() {
 	cat <<EOF
-Usage: ${0##*/} mode output_d
+Usage: ${0##*/} mode output_dir
 
    Datasource for EC2 metadata service
    Requires network.
@@ -110,7 +110,7 @@ while [ $# -ne 0 ]; do
 	shift;
 done
 
-[ $# -eq 2 ] || bad_Usage "must provide mode and data dir"
+[ $# -eq 2 ] || bad_Usage "must provide mode and output_dir"
 mode="$1"
 out_d="$2"
 
diff --git a/src/lib/cirros/ds/nocloud b/src/lib/cirros/ds/nocloud
index a18349a..4443442 100755
--- a/src/lib/cirros/ds/nocloud
+++ b/src/lib/cirros/ds/nocloud
@@ -12,7 +12,7 @@ LABEL="cidata"
 
 Usage() {
 	cat <<EOF
-Usage: ${0##*/} mode output_d
+Usage: ${0##*/} mode output_dir
 
    Datasource for 'nocloud' config disk.
 EOF
@@ -130,7 +130,7 @@ while [ $# -ne 0 ]; do
 	shift;
 done
 
-[ $# -eq 2 ] || bad_Usage "must provide mode and output dir"
+[ $# -eq 2 ] || bad_Usage "must provide mode and output_dir"
 mode="$1"
 out_d="$2"
 

From 44510de0712e15a03c90039f6230286af3d3afde Mon Sep 17 00:00:00 2001
From: Cleber Rosa <crosa@redhat.com>
Date: Wed, 4 Aug 2021 10:13:56 -0400
Subject: [PATCH 2/3] README.md: add Ubuntu 20.04 LTS as capable build
 environment

Both 18.04 LTS and 20.04 LTS are equally capable of building cirros,
so let's document this fact.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8d6db6..ccb5981 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Resulting images can be booted using QEMU. Several ways of booting are provided:
 
 # Build instructions
 
-The following works on Ubuntu 18.04 LTS, running on x86_64. Native building for other architectures is not recommended. Support for building under other distributions is limited and not tested.
+The following works on Ubuntu 18.04 LTS and 20.04 LTS, running on x86_64. Native building for other architectures is not recommended. Support for building under other distributions is limited and not tested.
 
 ## Clone sources
 

From 6134dedede1e51600618fe3535eb8c12f7085aa8 Mon Sep 17 00:00:00 2001
From: Cleber Rosa <crosa@redhat.com>
Date: Wed, 4 Aug 2021 10:29:22 -0400
Subject: [PATCH 3/3] bin/system-setup: add cpio, kmod and sudo to package
 requirements

Some minimal systems (including the official container images) won't
have those necessary packages installed.  Let's add them to the system
to allow for a successful build.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 bin/system-setup | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/system-setup b/bin/system-setup
index 2556684..d618b97 100755
--- a/bin/system-setup
+++ b/bin/system-setup
@@ -9,12 +9,14 @@ DEPS=(
     bc
     bison
     build-essential
+    cpio
     grub-common
     git
     dosfstools
     flex
     gdisk
     gettext
+    kmod
     kpartx
     libncurses5-dev
     mtools
@@ -23,6 +25,7 @@ DEPS=(
     qemu-utils
     quilt
     rsync
+    sudo
     texinfo
     unzip
     wget