Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Building on Ubuntu 20.04 LTS / cloud-init parameter #68

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Building on Ubuntu 20.04 LTS / cloud-init parameter #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
369533a
Standardize "output_dir" positional parameter and usage message
clebergnu Aug 3, 2021
44510de
README.md: add Ubuntu 20.04 LTS as capable build environment
clebergnu Aug 4, 2021
6134ded
bin/system-setup: add cpio, kmod and sudo to package requirements
clebergnu Aug 4, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this commit can be dropped

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 . can you drop this commit ?


## Clone sources

Expand Down
3 changes: 3 additions & 0 deletions bin/system-setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ DEPS=(
bc
bison
build-essential
cpio
grub-common
git
dosfstools
flex
gdisk
gettext
kmod
kpartx
libncurses5-dev
mtools
Expand All @@ -23,6 +25,7 @@ DEPS=(
qemu-utils
quilt
rsync
sudo
texinfo
unzip
wget
Expand Down
4 changes: 2 additions & 2 deletions src/lib/cirros/ds/configdrive
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here I would leave as it was

mode="$1"
out_d="$2"

Expand Down
4 changes: 2 additions & 2 deletions src/lib/cirros/ds/ec2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

similar here (with s/data/output/)

mode="$1"
out_d="$2"

Expand Down
4 changes: 2 additions & 2 deletions src/lib/cirros/ds/nocloud
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

mode="$1"
out_d="$2"

Expand Down