run_qemu: Add extra-dirs option

Depending on the use case run_qemu may need additional user space
software.  ndctl was specifically included and built within the root
image due to the initial run_qemu use case to test pmem/dax/cxl.

One option would be to hard code the addition of each user space source
tree similar to ndctl.  This is not desirable for a few reasons.

	1) Additional source trees will start to bloat the root image.
	2) ndctl was added with very specific directory locations.  Some
	   users have worked around this with symlinks but it is
	   inflexible.
	3) making source trees optional bloats the parameter space for
	   run_qemu
	4) building each user package is very specific to each package

A better alternative is to allow the user to specify additional source
trees; in different locations.  This allows different kernel/user space
source combinations in whatever combination the user requires at a
specific time.

Add the extra-dirs option.  The extra-dirs option specifies a file
containing a list of paths to user source trees.  Each of these source
trees is installed in the /root home directory of the guest image.

Building of source trees is left to the user.

Signed-off-by: Ira Weiny <[email protected]>

Author: weiny2

parser_generator.m4

@@ -34,6 +34,7 @@ exit 11  #)Created by argbash-init v2.9.0
 # ARG_OPTIONAL_BOOLEAN([debug], [v], [Debug script problems (enables set -x)], )
 # ARG_OPTIONAL_BOOLEAN([ndctl-build], , [Enable ndctl build in root image], [on])
 # ARG_OPTIONAL_BOOLEAN([kern-selftests], , [Enable kernel selftest build in root image (Warning: This option can take a long time and requires many support packages on the host; including some 32 bit)], [off])
+# ARG_OPTIONAL_SINGLE([extra-dirs], , [Specify a file with a list of directories (or files) to be copied to the /root directory within the image.], [])
 # ARG_OPTIONAL_INCREMENTAL([quiet], [q], [quieten some output, can be repeated multiple times to quieten even more], )
 # ARG_OPTIONAL_BOOLEAN([gdb], , [Wait for gdb to connect for kernel debug (port 10000)], )
 # ARG_OPTIONAL_BOOLEAN([gdb-qemu], , [Start qemu with gdb], )

run_qemu.sh

@@ -144,6 +144,21 @@ distro_vars="${script_dir}/${_distro}_vars.sh"
 
 pushd "$_arg_working_dir" > /dev/null || fail "couldn't cd to $_arg_working_dir"
 
+# save the working directory
+working_dir=$(pwd)
+
+# make a path canonical to the working dir
+make_canonical_path()
+{
+	local p=$1
+
+	p=$(eval echo $p)
+	pushd $working_dir > /dev/null
+	p=$(realpath $p)
+	popd > /dev/null
+	echo $p
+}
+
 set_valid_mkosi_ver()
 {
 	"$mkosi_bin" --version
@@ -1156,6 +1171,23 @@ make_rootfs()
 		fi
 	fi
 
+	if [[ "$_arg_extra_dirs" ]]; then
+		extra_dirs=$(make_canonical_path $_arg_extra_dirs)
+		if [[ ! -f $extra_dirs ]]; then
+			fail "$extra_dirs not found"
+		fi
+		echo "Installing extra directories and files from: $extra_dirs"
+		for d in `cat "$extra_dirs"`; do
+			d=$(make_canonical_path $d)
+			echo "     $d"
+			if [[ -e $d ]]; then
+				rsync -a "$d" mkosi.extra/root/
+			else
+				fail "$d not found"
+			fi
+		done
+	fi
+
 	# timedatectl defaults to UTC when /etc/localtime is missing
 	local bld_tz; bld_tz=$( timedatectl | awk '/zone:/ { print $3 }' )
 	# v15 commit f11325afa02c "Adopt systemd-firstboot"