From 5e0d93d7f6bf382f2876656d3c8a97ff9a5a4a14 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Fri, 6 May 2011 23:49:28 -0500 Subject: [PATCH] Makefile, docs/spec, script/gentree, src: move gentree target config into target directory --- Makefile | 13 +- docs/spec | 9 +- script/gentree | 121 ++++++++++-------- src/pkg/.keep | 0 src/root/.keep | 0 .../amd64/SS4200/config}/conf/.keep | 0 .../amd64/SS4200/config}/conf/etc.md_size | 0 .../amd64/SS4200/config}/conf/home.md_size | 0 .../amd64/SS4200/config}/conf/root.md_size | 0 .../amd64/SS4200/config}/conf/var.md_size | 0 .../amd64/SS4200/config}/overlay/.keep | 0 .../SS4200/config}/overlay/boot/boot.config | 0 .../SS4200/config}/overlay/boot/loader.conf | 0 .../amd64/SS4200/config}/overlay/etc/bashrc | 0 .../amd64/SS4200/config}/overlay/etc/fstab | 0 .../amd64/SS4200/config}/overlay/etc/inputrc | 0 .../amd64/SS4200/config}/overlay/etc/rc.conf | 0 .../config}/overlay/etc/rc.d/saveconfig-early | 0 .../config}/overlay/etc/rc.d/saveconfig-late | 0 .../amd64/SS4200/config}/overlay/home/.keep | 0 .../SS4200/config}/overlay/sbin/saveconfig | 0 .../overlay/usr/local/etc/ssmtp/revaliases | 0 .../overlay/usr/local/etc/ssmtp/ssmtp.conf | 0 .../overlay/usr/share/skel/dot.bash_profile | 1 + .../config/overlay/usr/share/skel/dot.bashrc | 1 + .../amd64/SS4200/config}/overlay/zfs/.keep | 0 .../amd64/SS4200/config}/patch/.keep | 0 .../patch/boot_device.hints-ata-probe.patch | 0 .../etc_mail_mailer.conf-use-ssmtp.patch | 0 .../patch/etc_profile-sensible-defaults.patch | 0 .../patch/etc_rc.d_zfs-tmpfs-mountpoint.patch | 0 .../etc_rc.initdiskless-mount-anything.patch | 0 .../patch/etc_rc.initdiskless-no-rescue.patch | 0 .../patch/etc_ttys-serialconsole.patch | 0 ..._etc_gkrellmd.conf-sensible-defaults.patch | 0 .../usr_local_etc_sudoers-allow-wheel.patch | 0 36 files changed, 87 insertions(+), 58 deletions(-) delete mode 100644 src/pkg/.keep delete mode 100644 src/root/.keep rename {src => targets/amd64/SS4200/config}/conf/.keep (100%) rename {src => targets/amd64/SS4200/config}/conf/etc.md_size (100%) rename {src => targets/amd64/SS4200/config}/conf/home.md_size (100%) rename {src => targets/amd64/SS4200/config}/conf/root.md_size (100%) rename {src => targets/amd64/SS4200/config}/conf/var.md_size (100%) rename {src => targets/amd64/SS4200/config}/overlay/.keep (100%) rename {src => targets/amd64/SS4200/config}/overlay/boot/boot.config (100%) rename {src => targets/amd64/SS4200/config}/overlay/boot/loader.conf (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/bashrc (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/fstab (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/inputrc (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/rc.conf (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/rc.d/saveconfig-early (100%) rename {src => targets/amd64/SS4200/config}/overlay/etc/rc.d/saveconfig-late (100%) rename {src => targets/amd64/SS4200/config}/overlay/home/.keep (100%) rename {src => targets/amd64/SS4200/config}/overlay/sbin/saveconfig (100%) rename {src => targets/amd64/SS4200/config}/overlay/usr/local/etc/ssmtp/revaliases (100%) rename {src => targets/amd64/SS4200/config}/overlay/usr/local/etc/ssmtp/ssmtp.conf (100%) create mode 120000 targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bash_profile create mode 120000 targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bashrc rename {src => targets/amd64/SS4200/config}/overlay/zfs/.keep (100%) rename {src => targets/amd64/SS4200/config}/patch/.keep (100%) rename {src => targets/amd64/SS4200/config}/patch/boot_device.hints-ata-probe.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_mail_mailer.conf-use-ssmtp.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_profile-sensible-defaults.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_rc.d_zfs-tmpfs-mountpoint.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_rc.initdiskless-mount-anything.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_rc.initdiskless-no-rescue.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/etc_ttys-serialconsole.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/usr_local_etc_gkrellmd.conf-sensible-defaults.patch (100%) rename {src => targets/amd64/SS4200/config}/patch/usr_local_etc_sudoers-allow-wheel.patch (100%) diff --git a/Makefile b/Makefile index d6960a0..b56e5b3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ # Settables -srctree ?= src -worktree ?= tree +arch ?= amd64 +conf ?= SS4200 +target ?= targets/$(arch)/$(conf) +srctree ?= $(target)/world +worktree ?= $(target)/tree boot_pad ?= 1280 -image_sect ?= 1000944 +image_sect ?= 524288 # Generation scripts gentree = script/gentree @@ -74,11 +77,11 @@ $(worktree): $(worktree)/root $(worktree)/boot: $(srctree)/root $(checkroot) - $(gentree) -b $(srctree) -t $(worktree) + $(gentree) -a $(arch) -c $(conf) $(worktree)/root: $(srctree)/root $(checkroot) - $(gentree) -b $(srctree) -t $(worktree) + $(gentree) -a $(arch) -c $(conf) # Scrub everything clean clean: diff --git a/docs/spec b/docs/spec index fd90f21..4506e6b 100644 --- a/docs/spec +++ b/docs/spec @@ -57,16 +57,19 @@ targets/ / config/ - Target configuration goes here make.conf - Port build configuration file; copied to /etc/make.conf before build - port.options/ - Options framework config files, generated by 'make config' in a port directory; copied to /var/db/ports/ before build and scavenged therefrom afterwards - / - + port.options/ - Options framework config files, generated by 'make config' in a port directory; + / - copied to /var/db/ports/ before build and scavenged therefrom afterwards options - port.lst - List of leaf ports to build and install; dependencies will be installed automatically + conf/ - Confpack configuration: md_size files and previous save cpios + overlay/ - A tree of files to be placed into the target filesystem prior to package installation + patch/ - Patches applied to the target filesystem after all packages are installed ports@ - Symlink to ports tree to use for build; assume /usr/ports if missing world@ - Symlink to the proper world against which this target is to be built log/ - Logfiles generated by build system go here chroot/ - Chroot directory for isolating builds; seeded by world/root, so make sure the target world is built first bdeps/ - Port build dependencies; not installed in the final image, but useful for reducing build time of ports, since the chroot is cleared out after every build pkg/ - Assembled binary packages to be installed in final image - root/ - Final target image ready for packaging into image + tree/ - Directory for assembling final image Packages are built for a world, but specific to a target because they may have target-specific port_options or make.conf tweaks applied. diff --git a/script/gentree b/script/gentree index 770e8c9..dcecac0 100755 --- a/script/gentree +++ b/script/gentree @@ -11,15 +11,19 @@ targets="prepwork admin overlay packages patch prepboot preptmp prepetc imgboot pebkac() { [ "${*}" ] && printf "${*}\n\n" - echo "Usage: $(basename "${0}") <-b basedir> <-t stagedir> <-i pkgsdir> <-p patchdir>" - echo " <-r rootdir> <-l logfile> [-h] " + echo "********************************************************************************" + echo "Usage: $(basename "${0}") <-a arch> <-c conf> <-b basedir> <-t stagedir>" + echo ' <-i pkgsdir> <-p patchdir> <-r rootdir> <-l logfile> [-h] ' + echo " -a arch Arch for image target (default: current arch: $(uname -m))" + echo ' -c conf Conf name for image target (default: GENERIC)' echo ' -b basedir Basedir for automagic defaults' - echo ' -t stagedir Staging directory name (Default: ${base}/stage)' - echo ' -i pkgsdir Directory holding packages to install (Default: ${base}/pkg)' - echo ' -p patchdir Directory holding patches to apply (Default: ${base}/patch)' - echo ' -o overlaydir Directory holding an overlay tree (Default: ${base}/overlay)' - echo ' -r rootdir Directory holding the virgin source tree (Default: ${base}/root)' - echo ' -l logfile File to hold stderr spam (Default: ${stage}/gentree.log' + echo ' -t stagedir Staging directory name (${target}/tree)' + echo ' -r rootdir Directory holding the virgin source tree (${target}/world/root)' + echo ' -o overlaydir Directory holding an overlay tree (${target}/config/overlay)' + echo ' -i pkgsdir Directory holding packages to install (${target}/pkg)' + echo ' -p patchdir Directory holding patches to apply (${target}/config/patch)' + echo ' -d confdir Conf md_size files and old cpios (${target}/config/conf)' + echo ' -l logfile File to hold stderr spam (${stage}/gentree.log' echo ' -h Hello! >^-^<' echo '' echo 'Available targets:' @@ -30,16 +34,19 @@ pebkac() { exit 1 } -while getopts "b:t:i:p:o:r:l:h" opt +while getopts "a:c:b:t:r:o:i:p:w:l:h" opt do case "${opt}" in + a) arch="${OPTARG}" ;; + c) conf="${OPTARG}" ;; b) base="${OPTARG}" ;; - t) stage="${OPTARG}" ;; - i) pkgs="${OPTARG}" ;; - p) patch="${OPTARG}" ;; - o) overlay="${OPTARG}" ;; + t) tree="${OPTARG}" ;; r) root="${OPTARG}" ;; - l) logfile="${OPTARG}" ;; + o) ovly="${OPTARG}" ;; + i) pkgs="${OPTARG}" ;; + p) ptch="${OPTARG}" ;; + d) cnfd="${OPTARG}" ;; + l) logf="${OPTARG}" ;; h) pebkac ;; [?]) pebkac "Unrecognized option ${opt}" ;; esac @@ -48,8 +55,22 @@ shift $(( $OPTIND - 1 )) sequence="${*:-${targets}}" -base="${base:-/usr/home/cyberleo/world}" +base="${base:-$(dirname "${0}")/..}" #" base="$(realpath "${base}")" + +arch="${arch:-$(uname -m)}" +conf="${conf:-GENERIC}" + +target="${base}/targets/${arch}/${conf}" + +tree="${tree:-${target}/tree}" +root="${root:-${target}/world/root}" +ovly="${ovly:-${target}/config/overlay}" +pkgs="${pkgs:-${target}/pkg}" +ptch="${ptch:-${target}/config/patch}" +cnfd="${cnfd:-${target}/config/conf}" +logf="${logf:-${tree}/gentree.log}" + stage="${stage:-${base}/tree}" pkgs="${pkgs:-${base}/pkg}" patch="${patch:-${base}/patch}" @@ -57,13 +78,13 @@ overlay="${overlay:-${base}/overlay}" root="${root:-${base}/root}" logfile="${logfile:-${stage}/gentree.log}" -mkdir -p "${stage}" -stage="$(realpath "${stage}")" -sroot="${stage}/root" -sboot="${stage}/boot" -sconf="${stage}/conf" +mkdir -p "${tree}" +tree="$(realpath "${tree}")" +sroot="${tree}/root" +sboot="${tree}/boot" +sconf="${tree}/conf" -exec 2>>"${logfile}" +exec 2>>"${logf}" _log_to_stderr=yes # Helper functions @@ -82,7 +103,7 @@ onelink() { # Build steps do_prepwork() { log Prepare workspace - if [ -d "${stage}" -a \( -d "${sroot}" -o -d "${sboot}" -o -d "${sconf}" \) ] + if [ -d "${tree}" -a \( -d "${sroot}" -o -d "${sboot}" -o -d "${sconf}" \) ] then yn n " ${a_yellow}*${a_normal} Workspace already exists. Delete? [y/N]" || err Aborting chk rm -Rf "${sroot}" "${sboot}" "${sconf}" @@ -104,9 +125,9 @@ do_admin() { } do_overlay() { - log Apply overlay from "${overlay##${base}/}" - [ -d "${overlay}" ] || return - ( cd "${overlay}" && find . | cpio -p "${sroot}" ) || chk + log Apply overlay from "${ovly##${base}/}" + [ -d "${ovly}" ] || return + ( cd "${ovly}" && find . | cpio -p "${sroot}" ) || chk } do_packages() { @@ -122,15 +143,15 @@ do_packages() { } do_patch() { - log Apply patches from "${patch##${base}/}" - for file in "${patch}"/* + log Apply patches from "${ptch##${base}/}" + for file in "${ptch}"/* do note "... $(basename "${file}")" ( cd "${sroot}" && patch < "${file}" ) || chk # Remove .orig files - sed -e '/^+++ /!d; s/^+++ //; s/[ ]*[0-9: .+-]*$//' "${file}" | while read target + sed -e '/^+++ /!d; s/^+++ //; s/[ ]*[0-9: .+-]*$//' "${file}" | while read orig do - rm -f "${sroot}/${target}.orig" + rm -f "${sroot}/${orig}.orig" done || chk done } @@ -159,7 +180,7 @@ do_prepetc() { do_imgboot() { log Create boot imgsrc - chk mv "${sroot}/boot" "${stage}" + chk mv "${sroot}/boot" "${tree}" chk mkdir -p "${sroot}/boot" chk rm -f "${sboot}/kernel"/*.symbols # Gzipped kernel is okay @@ -204,12 +225,12 @@ do_imgconf() { chk mkdir -p "${sconf}/default" # Create packdirs for each - for pack in "${base}/conf"/*.md_size + for pack in "${cnfd}"/*.md_size do pack="$(basename "${pack%%.md_size}")" chk mkdir -p "${sconf}/base/${pack}" chk mkdir -p "${sconf}/default/${pack}" - ( cat "${base}/conf/${pack}.md_size" > "${sconf}/base/${pack}/md_size" ) || chk + ( cat "${cnfd}/${pack}.md_size" > "${sconf}/base/${pack}/md_size" ) || chk done chk chown -R :operator "${sconf}" ( find "${sconf}" -print0 | xargs -0 chmod o-rwx ) || chk @@ -221,52 +242,52 @@ do_imgetc() { chk touch "${sroot}/etc/diskless" # Touch /COPYRIGHT to provide an immutable time anchor for saveconfig chk touch "${sroot}/COPYRIGHT" - chk sleep 1 # Make sure diskless is at least one second older than everything in custom - chk mkdir -p "${stage}/pack" - chk mv "${sroot}/etc" "${stage}/pack" + chk sleep 1 # Make sure anchor is at least one second older than everything in custom + chk mkdir -p "${tree}/pack" + chk mv "${sroot}/etc" "${tree}/pack" chk mkdir -p "${sroot}/etc" - chk cp -p "${stage}/pack/etc/rc" "${stage}/pack/etc/rc.subr" "${stage}/pack/etc/rc.initdiskless" "${stage}/pack/etc/login.conf.db" "${stage}/pack/etc/diskless" "${sroot}/etc" + chk cp -p "${tree}/pack/etc/rc" "${tree}/pack/etc/rc.subr" "${tree}/pack/etc/rc.initdiskless" "${tree}/pack/etc/login.conf.db" "${tree}/pack/etc/diskless" "${sroot}/etc" # Make sure etc confpack exists; default if necessary chk mkdir -p "${sconf}/base/etc" chk mkdir -p "${sconf}/default/etc" [ -e "${sconf}/base/etc/md_size" ] || echo "10240" > "${sconf}/base/etc/md_size" - ( cd "${stage}/pack" && find etc | cpio -o ) | gzip -9 > "${sconf}/base/etc.cpio.gz" || chk - chk rm -Rf "${stage}/pack/etc" + ( cd "${tree}/pack" && find etc | cpio -o ) | gzip -9 > "${sconf}/base/etc.cpio.gz" || chk + chk rm -Rf "${tree}/pack/etc" } do_imgall() { log Create remaining confpacks - chk mkdir -p "${stage}/pack" - for pack in "${base}/conf"/*.md_size + chk mkdir -p "${tree}/pack" + for pack in "${cnfd}"/*.md_size do pack="$(basename "${pack%%.md_size}")" # Ignore etc, as it was processed in do_imgetc [ "${pack}" = "etc" ] && continue note "... ${pack}" - chk mv "${sroot}/${pack}" "${stage}/pack" + chk mv "${sroot}/${pack}" "${tree}/pack" chk mkdir -p "${sroot}/${pack}" - ( cd "${stage}/pack" && find "${pack}" | cpio -o ) | gzip -9 > "${sconf}/base/${pack}.cpio.gz" || chk - chk rm -Rf "${stage}/pack/${pack}" + ( cd "${tree}/pack" && find "${pack}" | cpio -o ) | gzip -9 > "${sconf}/base/${pack}.cpio.gz" || chk + chk rm -Rf "${tree}/pack/${pack}" done } do_custom() { log Patch in custom config - ( cd "${base}/conf" && find . | egrep -v '^\./.*\.md_size$' | cpio -p --link "${sconf}/default" ) || chk + ( cd "${cnfd}" && find . | egrep -v '^\./.*\.md_size$' | cpio -p --link "${sconf}/default" ) || chk # Make sure files in default are newer than the tagfile, so they will be caught by saveconfig find "${sconf}/default" -type f -print0 | xargs -0 touch # If there are scavenged cpio.gz confpacks, touch their contents as well. - chk mkdir -p "${stage}/pack" - chk rm -Rf "${stage}/pack"/* + chk mkdir -p "${tree}/pack" + chk rm -Rf "${tree}/pack"/* for file in "${sconf}/default"/*.cpio.gz do pack="$(basename "${file%%.cpio.gz}")" - zcat "${file}" | ( cd "${stage}/pack"; cpio -id ) || chk - find "${stage}/pack" -type f -print0 | xargs -0 touch - ( cd "${stage}/pack"; find . | cpio -o ) | gzip -9 > "${file}" - chk rm -Rf "${stage}/pack"/* + zcat "${file}" | ( cd "${tree}/pack"; cpio -id ) || chk + find "${tree}/pack" -type f -print0 | xargs -0 touch + ( cd "${tree}/pack"; find . | cpio -o ) | gzip -9 > "${file}" + chk rm -Rf "${tree}/pack"/* done } diff --git a/src/pkg/.keep b/src/pkg/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/root/.keep b/src/root/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/conf/.keep b/targets/amd64/SS4200/config/conf/.keep similarity index 100% rename from src/conf/.keep rename to targets/amd64/SS4200/config/conf/.keep diff --git a/src/conf/etc.md_size b/targets/amd64/SS4200/config/conf/etc.md_size similarity index 100% rename from src/conf/etc.md_size rename to targets/amd64/SS4200/config/conf/etc.md_size diff --git a/src/conf/home.md_size b/targets/amd64/SS4200/config/conf/home.md_size similarity index 100% rename from src/conf/home.md_size rename to targets/amd64/SS4200/config/conf/home.md_size diff --git a/src/conf/root.md_size b/targets/amd64/SS4200/config/conf/root.md_size similarity index 100% rename from src/conf/root.md_size rename to targets/amd64/SS4200/config/conf/root.md_size diff --git a/src/conf/var.md_size b/targets/amd64/SS4200/config/conf/var.md_size similarity index 100% rename from src/conf/var.md_size rename to targets/amd64/SS4200/config/conf/var.md_size diff --git a/src/overlay/.keep b/targets/amd64/SS4200/config/overlay/.keep similarity index 100% rename from src/overlay/.keep rename to targets/amd64/SS4200/config/overlay/.keep diff --git a/src/overlay/boot/boot.config b/targets/amd64/SS4200/config/overlay/boot/boot.config similarity index 100% rename from src/overlay/boot/boot.config rename to targets/amd64/SS4200/config/overlay/boot/boot.config diff --git a/src/overlay/boot/loader.conf b/targets/amd64/SS4200/config/overlay/boot/loader.conf similarity index 100% rename from src/overlay/boot/loader.conf rename to targets/amd64/SS4200/config/overlay/boot/loader.conf diff --git a/src/overlay/etc/bashrc b/targets/amd64/SS4200/config/overlay/etc/bashrc similarity index 100% rename from src/overlay/etc/bashrc rename to targets/amd64/SS4200/config/overlay/etc/bashrc diff --git a/src/overlay/etc/fstab b/targets/amd64/SS4200/config/overlay/etc/fstab similarity index 100% rename from src/overlay/etc/fstab rename to targets/amd64/SS4200/config/overlay/etc/fstab diff --git a/src/overlay/etc/inputrc b/targets/amd64/SS4200/config/overlay/etc/inputrc similarity index 100% rename from src/overlay/etc/inputrc rename to targets/amd64/SS4200/config/overlay/etc/inputrc diff --git a/src/overlay/etc/rc.conf b/targets/amd64/SS4200/config/overlay/etc/rc.conf similarity index 100% rename from src/overlay/etc/rc.conf rename to targets/amd64/SS4200/config/overlay/etc/rc.conf diff --git a/src/overlay/etc/rc.d/saveconfig-early b/targets/amd64/SS4200/config/overlay/etc/rc.d/saveconfig-early similarity index 100% rename from src/overlay/etc/rc.d/saveconfig-early rename to targets/amd64/SS4200/config/overlay/etc/rc.d/saveconfig-early diff --git a/src/overlay/etc/rc.d/saveconfig-late b/targets/amd64/SS4200/config/overlay/etc/rc.d/saveconfig-late similarity index 100% rename from src/overlay/etc/rc.d/saveconfig-late rename to targets/amd64/SS4200/config/overlay/etc/rc.d/saveconfig-late diff --git a/src/overlay/home/.keep b/targets/amd64/SS4200/config/overlay/home/.keep similarity index 100% rename from src/overlay/home/.keep rename to targets/amd64/SS4200/config/overlay/home/.keep diff --git a/src/overlay/sbin/saveconfig b/targets/amd64/SS4200/config/overlay/sbin/saveconfig similarity index 100% rename from src/overlay/sbin/saveconfig rename to targets/amd64/SS4200/config/overlay/sbin/saveconfig diff --git a/src/overlay/usr/local/etc/ssmtp/revaliases b/targets/amd64/SS4200/config/overlay/usr/local/etc/ssmtp/revaliases similarity index 100% rename from src/overlay/usr/local/etc/ssmtp/revaliases rename to targets/amd64/SS4200/config/overlay/usr/local/etc/ssmtp/revaliases diff --git a/src/overlay/usr/local/etc/ssmtp/ssmtp.conf b/targets/amd64/SS4200/config/overlay/usr/local/etc/ssmtp/ssmtp.conf similarity index 100% rename from src/overlay/usr/local/etc/ssmtp/ssmtp.conf rename to targets/amd64/SS4200/config/overlay/usr/local/etc/ssmtp/ssmtp.conf diff --git a/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bash_profile b/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bash_profile new file mode 120000 index 0000000..c4a522b --- /dev/null +++ b/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bash_profile @@ -0,0 +1 @@ +../../local/etc/bash-config/bash_profile \ No newline at end of file diff --git a/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bashrc b/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bashrc new file mode 120000 index 0000000..fce8dd0 --- /dev/null +++ b/targets/amd64/SS4200/config/overlay/usr/share/skel/dot.bashrc @@ -0,0 +1 @@ +../../local/etc/bash-config/bashrc \ No newline at end of file diff --git a/src/overlay/zfs/.keep b/targets/amd64/SS4200/config/overlay/zfs/.keep similarity index 100% rename from src/overlay/zfs/.keep rename to targets/amd64/SS4200/config/overlay/zfs/.keep diff --git a/src/patch/.keep b/targets/amd64/SS4200/config/patch/.keep similarity index 100% rename from src/patch/.keep rename to targets/amd64/SS4200/config/patch/.keep diff --git a/src/patch/boot_device.hints-ata-probe.patch b/targets/amd64/SS4200/config/patch/boot_device.hints-ata-probe.patch similarity index 100% rename from src/patch/boot_device.hints-ata-probe.patch rename to targets/amd64/SS4200/config/patch/boot_device.hints-ata-probe.patch diff --git a/src/patch/etc_mail_mailer.conf-use-ssmtp.patch b/targets/amd64/SS4200/config/patch/etc_mail_mailer.conf-use-ssmtp.patch similarity index 100% rename from src/patch/etc_mail_mailer.conf-use-ssmtp.patch rename to targets/amd64/SS4200/config/patch/etc_mail_mailer.conf-use-ssmtp.patch diff --git a/src/patch/etc_profile-sensible-defaults.patch b/targets/amd64/SS4200/config/patch/etc_profile-sensible-defaults.patch similarity index 100% rename from src/patch/etc_profile-sensible-defaults.patch rename to targets/amd64/SS4200/config/patch/etc_profile-sensible-defaults.patch diff --git a/src/patch/etc_rc.d_zfs-tmpfs-mountpoint.patch b/targets/amd64/SS4200/config/patch/etc_rc.d_zfs-tmpfs-mountpoint.patch similarity index 100% rename from src/patch/etc_rc.d_zfs-tmpfs-mountpoint.patch rename to targets/amd64/SS4200/config/patch/etc_rc.d_zfs-tmpfs-mountpoint.patch diff --git a/src/patch/etc_rc.initdiskless-mount-anything.patch b/targets/amd64/SS4200/config/patch/etc_rc.initdiskless-mount-anything.patch similarity index 100% rename from src/patch/etc_rc.initdiskless-mount-anything.patch rename to targets/amd64/SS4200/config/patch/etc_rc.initdiskless-mount-anything.patch diff --git a/src/patch/etc_rc.initdiskless-no-rescue.patch b/targets/amd64/SS4200/config/patch/etc_rc.initdiskless-no-rescue.patch similarity index 100% rename from src/patch/etc_rc.initdiskless-no-rescue.patch rename to targets/amd64/SS4200/config/patch/etc_rc.initdiskless-no-rescue.patch diff --git a/src/patch/etc_ttys-serialconsole.patch b/targets/amd64/SS4200/config/patch/etc_ttys-serialconsole.patch similarity index 100% rename from src/patch/etc_ttys-serialconsole.patch rename to targets/amd64/SS4200/config/patch/etc_ttys-serialconsole.patch diff --git a/src/patch/usr_local_etc_gkrellmd.conf-sensible-defaults.patch b/targets/amd64/SS4200/config/patch/usr_local_etc_gkrellmd.conf-sensible-defaults.patch similarity index 100% rename from src/patch/usr_local_etc_gkrellmd.conf-sensible-defaults.patch rename to targets/amd64/SS4200/config/patch/usr_local_etc_gkrellmd.conf-sensible-defaults.patch diff --git a/src/patch/usr_local_etc_sudoers-allow-wheel.patch b/targets/amd64/SS4200/config/patch/usr_local_etc_sudoers-allow-wheel.patch similarity index 100% rename from src/patch/usr_local_etc_sudoers-allow-wheel.patch rename to targets/amd64/SS4200/config/patch/usr_local_etc_sudoers-allow-wheel.patch -- 2.42.0