From 6ac11161ca679cbd0b22b438de6fd1087b83979c Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Mon, 3 Jul 2017 06:40:57 +0000 Subject: [PATCH] Move substage to root directory --- build.sh | 6 ++---- {stage0/00-substage/files => files}/50raspi | 0 {stage0/00-substage/files => files}/cmdline.txt | 0 {stage0/00-substage/files => files}/config.txt | 0 {stage0/00-substage/files => files}/console-setup | 0 {stage0/00-substage/files => files}/fstab | 0 {stage0/00-substage/files => files}/interfaces | 0 {stage0/00-substage/files => files}/ipv6.conf | 0 {stage0/00-substage/files => files}/noclear.conf | 0 {stage0/00-substage/files => files}/policy-rc.d | 0 {stage0/00-substage/files => files}/raspberrypi.gpg | Bin .../00-substage/files => files}/raspberrypi.gpg.key | 0 {stage0/00-substage/files => files}/raspi.list | 0 .../regenerate_ssh_host_keys.service | 0 {stage0/00-substage/files => files}/resize2fs_once | 0 {stage0/00-substage/files => files}/resolv.conf | 0 {stage0/00-substage/files => files}/sources.list | 0 {stage0/00-substage/files => files}/ttyoutput.conf | 0 {stage0/00-substage/files => files}/wait.conf | 0 .../00-substage/files => files}/wpa_supplicant.conf | 0 .../patches => patches}/01/01-bashrc.diff | 0 .../patches => patches}/01/02-persistant-net.diff | 0 .../patches => patches}/01/03-no-root-login.diff | 0 {stage0/00-substage/patches => patches}/01/series | 0 .../patches => patches}/02/01-useradd.diff | 0 .../00-substage/patches => patches}/02/02-swap.diff | 0 .../patches => patches}/02/04-inputrc.diff | 0 .../00-substage/patches => patches}/02/05-path.diff | 0 .../patches => patches}/02/06-rc_local.diff | 0 .../patches => patches}/02/07-resize-init.diff | 0 {stage0/00-substage/patches => patches}/02/series | 0 stage0/00-substage/00-run.sh => run.sh | 4 ++-- 32 files changed, 4 insertions(+), 6 deletions(-) rename {stage0/00-substage/files => files}/50raspi (100%) rename {stage0/00-substage/files => files}/cmdline.txt (100%) rename {stage0/00-substage/files => files}/config.txt (100%) rename {stage0/00-substage/files => files}/console-setup (100%) rename {stage0/00-substage/files => files}/fstab (100%) rename {stage0/00-substage/files => files}/interfaces (100%) rename {stage0/00-substage/files => files}/ipv6.conf (100%) rename {stage0/00-substage/files => files}/noclear.conf (100%) rename {stage0/00-substage/files => files}/policy-rc.d (100%) rename {stage0/00-substage/files => files}/raspberrypi.gpg (100%) rename {stage0/00-substage/files => files}/raspberrypi.gpg.key (100%) rename {stage0/00-substage/files => files}/raspi.list (100%) rename {stage0/00-substage/files => files}/regenerate_ssh_host_keys.service (100%) rename {stage0/00-substage/files => files}/resize2fs_once (100%) rename {stage0/00-substage/files => files}/resolv.conf (100%) rename {stage0/00-substage/files => files}/sources.list (100%) rename {stage0/00-substage/files => files}/ttyoutput.conf (100%) rename {stage0/00-substage/files => files}/wait.conf (100%) rename {stage0/00-substage/files => files}/wpa_supplicant.conf (100%) rename {stage0/00-substage/patches => patches}/01/01-bashrc.diff (100%) rename {stage0/00-substage/patches => patches}/01/02-persistant-net.diff (100%) rename {stage0/00-substage/patches => patches}/01/03-no-root-login.diff (100%) rename {stage0/00-substage/patches => patches}/01/series (100%) rename {stage0/00-substage/patches => patches}/02/01-useradd.diff (100%) rename {stage0/00-substage/patches => patches}/02/02-swap.diff (100%) rename {stage0/00-substage/patches => patches}/02/04-inputrc.diff (100%) rename {stage0/00-substage/patches => patches}/02/05-path.diff (100%) rename {stage0/00-substage/patches => patches}/02/06-rc_local.diff (100%) rename {stage0/00-substage/patches => patches}/02/07-resize-init.diff (100%) rename {stage0/00-substage/patches => patches}/02/series (100%) rename stage0/00-substage/00-run.sh => run.sh (98%) diff --git a/build.sh b/build.sh index 4543e69..78eca44 100755 --- a/build.sh +++ b/build.sh @@ -37,8 +37,6 @@ dependencies_check "$BASE_DIR/depends" mkdir -p "$DEPLOY_DIR" mkdir -p "$MOUNT_DIR" -SUB_STAGE_DIR="$BASE_DIR/stage0/00-substage" +cd "$BASE_DIR" -cd "$SUB_STAGE_DIR" - -"$SUB_STAGE_DIR/00-run.sh" +./run.sh diff --git a/stage0/00-substage/files/50raspi b/files/50raspi similarity index 100% rename from stage0/00-substage/files/50raspi rename to files/50raspi diff --git a/stage0/00-substage/files/cmdline.txt b/files/cmdline.txt similarity index 100% rename from stage0/00-substage/files/cmdline.txt rename to files/cmdline.txt diff --git a/stage0/00-substage/files/config.txt b/files/config.txt similarity index 100% rename from stage0/00-substage/files/config.txt rename to files/config.txt diff --git a/stage0/00-substage/files/console-setup b/files/console-setup similarity index 100% rename from stage0/00-substage/files/console-setup rename to files/console-setup diff --git a/stage0/00-substage/files/fstab b/files/fstab similarity index 100% rename from stage0/00-substage/files/fstab rename to files/fstab diff --git a/stage0/00-substage/files/interfaces b/files/interfaces similarity index 100% rename from stage0/00-substage/files/interfaces rename to files/interfaces diff --git a/stage0/00-substage/files/ipv6.conf b/files/ipv6.conf similarity index 100% rename from stage0/00-substage/files/ipv6.conf rename to files/ipv6.conf diff --git a/stage0/00-substage/files/noclear.conf b/files/noclear.conf similarity index 100% rename from stage0/00-substage/files/noclear.conf rename to files/noclear.conf diff --git a/stage0/00-substage/files/policy-rc.d b/files/policy-rc.d similarity index 100% rename from stage0/00-substage/files/policy-rc.d rename to files/policy-rc.d diff --git a/stage0/00-substage/files/raspberrypi.gpg b/files/raspberrypi.gpg similarity index 100% rename from stage0/00-substage/files/raspberrypi.gpg rename to files/raspberrypi.gpg diff --git a/stage0/00-substage/files/raspberrypi.gpg.key b/files/raspberrypi.gpg.key similarity index 100% rename from stage0/00-substage/files/raspberrypi.gpg.key rename to files/raspberrypi.gpg.key diff --git a/stage0/00-substage/files/raspi.list b/files/raspi.list similarity index 100% rename from stage0/00-substage/files/raspi.list rename to files/raspi.list diff --git a/stage0/00-substage/files/regenerate_ssh_host_keys.service b/files/regenerate_ssh_host_keys.service similarity index 100% rename from stage0/00-substage/files/regenerate_ssh_host_keys.service rename to files/regenerate_ssh_host_keys.service diff --git a/stage0/00-substage/files/resize2fs_once b/files/resize2fs_once similarity index 100% rename from stage0/00-substage/files/resize2fs_once rename to files/resize2fs_once diff --git a/stage0/00-substage/files/resolv.conf b/files/resolv.conf similarity index 100% rename from stage0/00-substage/files/resolv.conf rename to files/resolv.conf diff --git a/stage0/00-substage/files/sources.list b/files/sources.list similarity index 100% rename from stage0/00-substage/files/sources.list rename to files/sources.list diff --git a/stage0/00-substage/files/ttyoutput.conf b/files/ttyoutput.conf similarity index 100% rename from stage0/00-substage/files/ttyoutput.conf rename to files/ttyoutput.conf diff --git a/stage0/00-substage/files/wait.conf b/files/wait.conf similarity index 100% rename from stage0/00-substage/files/wait.conf rename to files/wait.conf diff --git a/stage0/00-substage/files/wpa_supplicant.conf b/files/wpa_supplicant.conf similarity index 100% rename from stage0/00-substage/files/wpa_supplicant.conf rename to files/wpa_supplicant.conf diff --git a/stage0/00-substage/patches/01/01-bashrc.diff b/patches/01/01-bashrc.diff similarity index 100% rename from stage0/00-substage/patches/01/01-bashrc.diff rename to patches/01/01-bashrc.diff diff --git a/stage0/00-substage/patches/01/02-persistant-net.diff b/patches/01/02-persistant-net.diff similarity index 100% rename from stage0/00-substage/patches/01/02-persistant-net.diff rename to patches/01/02-persistant-net.diff diff --git a/stage0/00-substage/patches/01/03-no-root-login.diff b/patches/01/03-no-root-login.diff similarity index 100% rename from stage0/00-substage/patches/01/03-no-root-login.diff rename to patches/01/03-no-root-login.diff diff --git a/stage0/00-substage/patches/01/series b/patches/01/series similarity index 100% rename from stage0/00-substage/patches/01/series rename to patches/01/series diff --git a/stage0/00-substage/patches/02/01-useradd.diff b/patches/02/01-useradd.diff similarity index 100% rename from stage0/00-substage/patches/02/01-useradd.diff rename to patches/02/01-useradd.diff diff --git a/stage0/00-substage/patches/02/02-swap.diff b/patches/02/02-swap.diff similarity index 100% rename from stage0/00-substage/patches/02/02-swap.diff rename to patches/02/02-swap.diff diff --git a/stage0/00-substage/patches/02/04-inputrc.diff b/patches/02/04-inputrc.diff similarity index 100% rename from stage0/00-substage/patches/02/04-inputrc.diff rename to patches/02/04-inputrc.diff diff --git a/stage0/00-substage/patches/02/05-path.diff b/patches/02/05-path.diff similarity index 100% rename from stage0/00-substage/patches/02/05-path.diff rename to patches/02/05-path.diff diff --git a/stage0/00-substage/patches/02/06-rc_local.diff b/patches/02/06-rc_local.diff similarity index 100% rename from stage0/00-substage/patches/02/06-rc_local.diff rename to patches/02/06-rc_local.diff diff --git a/stage0/00-substage/patches/02/07-resize-init.diff b/patches/02/07-resize-init.diff similarity index 100% rename from stage0/00-substage/patches/02/07-resize-init.diff rename to patches/02/07-resize-init.diff diff --git a/stage0/00-substage/patches/02/series b/patches/02/series similarity index 100% rename from stage0/00-substage/patches/02/series rename to patches/02/series diff --git a/stage0/00-substage/00-run.sh b/run.sh similarity index 98% rename from stage0/00-substage/00-run.sh rename to run.sh index c194c26..a622b29 100755 --- a/stage0/00-substage/00-run.sh +++ b/run.sh @@ -45,7 +45,7 @@ EOF install -m 644 files/cmdline.txt "$ROOTFS_DIR/boot" install -m 644 files/config.txt "$ROOTFS_DIR/boot" -apply_patches "$BASE_DIR/stage0/00-substage/patches/01" +apply_patches "$BASE_DIR/patches/01" install -d "$ROOTFS_DIR/etc/systemd/system/getty@tty1.service.d" install -m 644 files/noclear.conf "$ROOTFS_DIR/etc/systemd/system/getty@tty1.service.d/noclear.conf" @@ -146,7 +146,7 @@ on_chroot << EOF apt-get install --no-install-recommends -y cifs-utils EOF -apply_patches "$BASE_DIR/stage0/00-substage/patches/02" +apply_patches "$BASE_DIR/patches/02" install -m 644 files/regenerate_ssh_host_keys.service "$ROOTFS_DIR/lib/systemd/system/" install -m 755 files/resize2fs_once "$ROOTFS_DIR/etc/init.d/"