diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/01-build-debian_amd64-rw-light-jau.cfg | 47 | ||||
| -rw-r--r-- | scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg | 48 | ||||
| -rw-r--r-- | scripts/01-build-debian_amd64-rw-lightxdev.cfg | 47 | ||||
| -rw-r--r-- | scripts/01-build-raspi-rw-light-jau.cfg | 47 | ||||
| -rw-r--r-- | scripts/01-build-raspi-rw-lightxdev-jau.cfg | 2 | ||||
| -rw-r--r-- | scripts/02-build-raspi-ro-smalldesk-jau.cfg | 2 | ||||
| -rw-r--r-- | scripts/03-build-debian_amd64-ro-rescue-jau.cfg | 2 | ||||
| -rw-r--r-- | scripts/qcow2_handling | 31 |
8 files changed, 208 insertions, 18 deletions
diff --git a/scripts/01-build-debian_amd64-rw-light-jau.cfg b/scripts/01-build-debian_amd64-rw-light-jau.cfg new file mode 100644 index 0000000..00b3378 --- /dev/null +++ b/scripts/01-build-debian_amd64-rw-light-jau.cfg @@ -0,0 +1,47 @@ +#! /bin/bash + +export TARGET_RASPI="0" +export TARGET_ARCH="amd64" + +export RELEASE=bullseye +# export RELEASE=buster + +# Produce a read-only rootfs +# export ROOTFS_RO=1 +# export REDUCED_FOOTPRINT=1 + +export APT_PROXY=http://jordan:3142 + +export CUSTOM_NAME="DebAmd64Light" +export CUSTOM_VERSION="1.2-rw" + +export PI_GEN="pi-gen (custom branch)" + +export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}" +export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work" +export IMG_FILENAME=${IMG_NAME} + +export DEPLOY_DIR=/data/diskimages +export DEPLOY_ZIP=0 + +#export USE_QEMU=1 + +export TARGET_HOSTNAME=deb11amd64 + +export LOCALE_DEFAULT=en_US.UTF-8 +export KEYBOARD_KEYMAP=us +export KEYBOARD_LAYOUT="English (US)" +export TIMEZONE_DEFAULT="Europe/Berlin" + +export FIRST_USER_NAME="pi" +export FIRST_USER_PASS="pi" +export ENABLE_SSH=1 +export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx" +export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]" +export PUBKEY_ONLY_SSH=1 + +export STAGE_LIST="stage0 stage1 stage2" +#export SKIP_STAGE_LIST="stage0 stage1 stage2" + +#export SKIP_IMAGES_LIST="stage2" + diff --git a/scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg b/scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg new file mode 100644 index 0000000..25feaa6 --- /dev/null +++ b/scripts/01-build-debian_amd64-rw-lightxdev-jau.cfg @@ -0,0 +1,48 @@ +#! /bin/bash + +export TARGET_RASPI="0" +export TARGET_ARCH="amd64" + +export RELEASE=bullseye +# export RELEASE=buster + +# Produce a read-only rootfs +# export ROOTFS_RO=1 +# export REDUCED_FOOTPRINT=1 + +export APT_PROXY=http://jordan:3142 + +export CUSTOM_NAME="DebAmd64LightDev" +export CUSTOM_VERSION="1.2-rw" + +export PI_GEN="pi-gen (custom branch)" + +export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}" +export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work" +export IMG_FILENAME=${IMG_NAME} + +export DEPLOY_DIR=/data/diskimages +export DEPLOY_ZIP=0 + +#export USE_QEMU=1 + +export TARGET_HOSTNAME=deb11amd64 + +export LOCALE_DEFAULT=en_US.UTF-8 +export KEYBOARD_KEYMAP=us +export KEYBOARD_LAYOUT="English (US)" +export TIMEZONE_DEFAULT="Europe/Berlin" + +export FIRST_USER_NAME="pi" +export FIRST_USER_PASS="pi" +export ENABLE_SSH=1 +export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx" +export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]" +export PUBKEY_ONLY_SSH=1 + +export STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev" +#export SKIP_STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev" + +#export SKIP_IMAGES_LIST="stage2 stage3a stage3a_dev" +export SKIP_IMAGES_LIST="stage2 stage3a" + diff --git a/scripts/01-build-debian_amd64-rw-lightxdev.cfg b/scripts/01-build-debian_amd64-rw-lightxdev.cfg new file mode 100644 index 0000000..cc95db5 --- /dev/null +++ b/scripts/01-build-debian_amd64-rw-lightxdev.cfg @@ -0,0 +1,47 @@ +#! /bin/bash + +export TARGET_RASPI="0" +export TARGET_ARCH="amd64" + +export RELEASE=bullseye +# export RELEASE=buster + +# Produce a read-only rootfs +# export ROOTFS_RO=1 +# export REDUCED_FOOTPRINT=1 + +# export APT_PROXY=http://jordan:3142 + +export CUSTOM_NAME="DebAmd64LightDev" +export CUSTOM_VERSION="1.2-rw" + +export PI_GEN="pi-gen (custom branch)" + +export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}" +export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work" +export IMG_FILENAME=${IMG_NAME} + +export DEPLOY_DIR=/data/diskimages +export DEPLOY_ZIP=0 + +#export USE_QEMU=1 + +export TARGET_HOSTNAME=deb11amd64 + +export LOCALE_DEFAULT=en_US.UTF-8 +export KEYBOARD_KEYMAP=us +export KEYBOARD_LAYOUT="English (US)" +export TIMEZONE_DEFAULT="Europe/Berlin" + +export FIRST_USER_NAME="pi" +export FIRST_USER_PASS="pi" +export ENABLE_SSH=1 +# export PUBKEY_SSH_FIRST_USER="ssh-rsa long-number my@machine" +# export PUBKEY_ONLY_SSH=1 + +export STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev" +#export SKIP_STAGE_LIST="stage0 stage1 stage2 stage3a stage3a_dev" + +#export SKIP_IMAGES_LIST="stage2 stage3a stage3a_dev" +export SKIP_IMAGES_LIST="stage2 stage3a" + diff --git a/scripts/01-build-raspi-rw-light-jau.cfg b/scripts/01-build-raspi-rw-light-jau.cfg new file mode 100644 index 0000000..bf1546d --- /dev/null +++ b/scripts/01-build-raspi-rw-light-jau.cfg @@ -0,0 +1,47 @@ +#! /bin/bash + +export TARGET_RASPI="1" +export TARGET_ARCH="arm64" + +export RELEASE=bullseye +# export RELEASE=buster + +# Produce a read-only rootfs +# export ROOTFS_RO=1 +# export REDUCED_FOOTPRINT=1 + +export APT_PROXY=http://jordan:3142 + +export CUSTOM_NAME="RaspiArm64Light" +export CUSTOM_VERSION="1.2-rw" + +export PI_GEN="pi-gen (jau branch)" + +export IMG_NAME="${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}" +export WORK_DIR="/data/${CUSTOM_NAME}-${CUSTOM_VERSION}-${TARGET_ARCH}-work" +export IMG_FILENAME=${IMG_NAME} + +export DEPLOY_DIR=/data/diskimages +export DEPLOY_ZIP=0 + +#export USE_QEMU=1 + +export TARGET_HOSTNAME=deb11arm64raspi + +export LOCALE_DEFAULT=en_US.UTF-8 +export KEYBOARD_KEYMAP=us +export KEYBOARD_LAYOUT="English (US)" +export TIMEZONE_DEFAULT="Europe/Berlin" + +export FIRST_USER_NAME="pi" +export FIRST_USER_PASS="pi" +export ENABLE_SSH=1 +export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx" +export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]" +export PUBKEY_ONLY_SSH=1 + +export STAGE_LIST="stage0 stage1 stage2" +#export SKIP_STAGE_LIST="stage0 stage1 stage2" + +#export SKIP_IMAGES_LIST="stage2" + diff --git a/scripts/01-build-raspi-rw-lightxdev-jau.cfg b/scripts/01-build-raspi-rw-lightxdev-jau.cfg index a79c956..66c0e3a 100644 --- a/scripts/01-build-raspi-rw-lightxdev-jau.cfg +++ b/scripts/01-build-raspi-rw-lightxdev-jau.cfg @@ -12,7 +12,7 @@ export RELEASE=bullseye export APT_PROXY=http://jordan:3142 -export CUSTOM_NAME="RaspiArm64LightDevJau" +export CUSTOM_NAME="RaspiArm64LightDev" export CUSTOM_VERSION="1.2-rw" export PI_GEN="pi-gen (jau branch)" diff --git a/scripts/02-build-raspi-ro-smalldesk-jau.cfg b/scripts/02-build-raspi-ro-smalldesk-jau.cfg index 52f8ddc..35bbb00 100644 --- a/scripts/02-build-raspi-ro-smalldesk-jau.cfg +++ b/scripts/02-build-raspi-ro-smalldesk-jau.cfg @@ -12,7 +12,7 @@ export REDUCED_FOOTPRINT=1 export APT_PROXY=http://jordan:3142 -export CUSTOM_NAME="RaspiArm64SmallDeskJau" +export CUSTOM_NAME="RaspiArm64SmallDesk" export CUSTOM_VERSION="1.2-ro" export PI_GEN="pi-gen (jau branch)" diff --git a/scripts/03-build-debian_amd64-ro-rescue-jau.cfg b/scripts/03-build-debian_amd64-ro-rescue-jau.cfg index 76de7bc..5ccc5ef 100644 --- a/scripts/03-build-debian_amd64-ro-rescue-jau.cfg +++ b/scripts/03-build-debian_amd64-ro-rescue-jau.cfg @@ -12,7 +12,7 @@ export ROOTFS_RO=1 export APT_PROXY=http://jordan:3142 -export CUSTOM_NAME="DebAmd64RescueJau" +export CUSTOM_NAME="DebAmd64Rescue" export CUSTOM_VERSION="1.2-ro" export PI_GEN="pi-gen (jau branch)" diff --git a/scripts/qcow2_handling b/scripts/qcow2_handling index 770d074..e996e8f 100644 --- a/scripts/qcow2_handling +++ b/scripts/qcow2_handling @@ -394,7 +394,21 @@ function make_bootable_image() { exit 1 fi - if false ; then + if [ "${ROOTFS_RO}" = "1" ] ; then + echo "Setup hard devicenames" + BOOT_DEV_NAME="\/dev\/mmcblk0p1" + echo "Boot: $BOOT_DEV_NAME" + ROOT_DEV_NAME="\/dev\/mmcblk0p2" + echo "Root1: $ROOT_DEV_NAME" + + echo "Set hard device names in fstab (rootfs ro -> /boot uncommented)" + sed -i "s/BOOTDEV/${BOOT_DEV_NAME}/" "${MOUNTROOT}/etc/fstab" + sed -i "s/ROOTDEV/${ROOT_DEV_NAME}/" "${MOUNTROOT}/etc/fstab" + if [ "${TARGET_RASPI}" = "1" ]; then + echo "Set rootfs ro hard device name in cmdline, required" + sed -i "s/ROOTDEV/${ROOT_DEV_NAME}/" "${MOUNTROOT}/boot/sys_${TARGET_ARCH}_000/cmdline.txt" + fi + else echo "Setup PARTUUIDs" BOOT_PARTUUID="${IMGID}-01" echo "Boot: $BOOT_PARTUUID" @@ -402,26 +416,13 @@ function make_bootable_image() { echo "Root1: $ROOT_PARTUUID" if [ ! -z "$BOOT_PARTUUID" ] && [ ! -z "$ROOT_PARTUUID" ]; then - echo "Set UUIDs to make it bootable" + echo "Set UUIDs to make it bootable, required." sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${MOUNTROOT}/etc/fstab" sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${MOUNTROOT}/etc/fstab" if [ "${TARGET_RASPI}" = "1" ]; then sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${MOUNTROOT}/boot/sys_${TARGET_ARCH}_000/cmdline.txt" fi fi - else - echo "Setup hard devicenames" - BOOT_DEV_NAME="\/dev\/mmcblk0p1" - echo "Boot: $BOOT_DEV_NAME" - ROOT_DEV_NAME="\/dev\/mmcblk0p2" - echo "Root1: $ROOT_DEV_NAME" - - echo "Set hard device names to make it bootable" - sed -i "s/BOOTDEV/${BOOT_DEV_NAME}/" "${MOUNTROOT}/etc/fstab" - sed -i "s/ROOTDEV/${ROOT_DEV_NAME}/" "${MOUNTROOT}/etc/fstab" - if [ "${TARGET_RASPI}" = "1" ]; then - sed -i "s/ROOTDEV/${ROOT_DEV_NAME}/" "${MOUNTROOT}/boot/sys_${TARGET_ARCH}_000/cmdline.txt" - fi fi echo "Umount image ${EXPORT_IMAGE}" |