From be4bfa0c13174b4d6c514df30098ab33a1553d8f Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:14:23 -0700 Subject: [PATCH 01/29] Addede comments and default image name --- build.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/build.sh b/build.sh index e3f7a6e..568ccbc 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,13 @@ run_sub_stage() { log "Begin ${SUB_STAGE_DIR}" + pushd ${SUB_STAGE_DIR} > /dev/null + + # Loop through each substage for i in {00..99}; do + + # Check for debconf stage if [ -f ${i}-debconf ]; then log "Begin ${SUB_STAGE_DIR}/${i}-debconf" on_chroot sh -e - << EOF @@ -14,6 +19,8 @@ SELEOF EOF log "End ${SUB_STAGE_DIR}/${i}-debconf" fi + + # Install any packages with no-install-recommends set if [ -f ${i}-packages-nr ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages-nr" PACKAGES=`cat $i-packages-nr | tr '\n' ' '` @@ -24,6 +31,8 @@ EOF fi log "End ${SUB_STAGE_DIR}/${i}-packages-nr" fi + + # Install any packages normally if [ -f ${i}-packages ]; then log "Begin ${SUB_STAGE_DIR}/${i}-packages" PACKAGES=`cat $i-packages | tr '\n' ' '` @@ -34,6 +43,8 @@ EOF fi log "End ${SUB_STAGE_DIR}/${i}-packages" fi + + # Apply any patches if [ -d ${i}-patches ]; then log "Begin ${SUB_STAGE_DIR}/${i}-patches" pushd ${STAGE_WORK_DIR} > /dev/null @@ -60,11 +71,15 @@ EOF popd > /dev/null log "End ${SUB_STAGE_DIR}/${i}-patches" fi + + # Run the substages run script if [ -x ${i}-run.sh ]; then log "Begin ${SUB_STAGE_DIR}/${i}-run.sh" ./${i}-run.sh log "End ${SUB_STAGE_DIR}/${i}-run.sh" fi + + # Run the substages chroot script if [ -f ${i}-run-chroot ]; then log "Begin ${SUB_STAGE_DIR}/${i}-run-chroot" on_chroot sh -e - < ${i}-run-chroot @@ -77,49 +92,77 @@ EOF run_stage(){ log "Begin ${STAGE_DIR}" + pushd ${STAGE_DIR} > /dev/null + + # Unmount this stage's folder on the filesystem unmount ${WORK_DIR}/${STAGE} + + # Set the working directory for this stage STAGE_WORK_DIR=${WORK_DIR}/${STAGE} + + # Set the root directory for this stage ROOTFS_DIR=${STAGE_WORK_DIR}/rootfs + + # Check to see if we should skip this stage (seemingly never) if [ ! -f SKIP ]; then + + # Clean the rootfs, if requested if [ "${CLEAN}" = "1" ]; then if [ -d ${ROOTFS_DIR} ]; then rm -rf ${ROOTFS_DIR} fi fi + + # Run the pre-run script if [ -x prerun.sh ]; then log "Begin ${STAGE_DIR}/prerun.sh" ./prerun.sh log "End ${STAGE_DIR}/prerun.sh" fi + + # For each substage, run the run_sub_stage command for it for SUB_STAGE_DIR in ${STAGE_DIR}/*; do if [ -d ${SUB_STAGE_DIR} ]; then run_sub_stage fi done fi + + # Unmount the stag again unmount ${WORK_DIR}/${STAGE} + + # Set the previous stage info to this stage for the next stage to use PREV_STAGE=${STAGE} PREV_STAGE_DIR=${STAGE_DIR} PREV_ROOTFS_DIR=${ROOTFS_DIR} + popd > /dev/null + log "End ${STAGE_DIR}" } +# Require Root to run if [ "$(id -u)" != "0" ]; then echo "Please run as root" 1>&2 exit 1 fi +# Source a config file if it exists if [ -f config ]; then source config fi +# Set image name +#TODO: Add way to set this, plus defaults. Defaulting to raspbian for now +IMG_NAME="raspbian" + if [ -z "${IMG_NAME}" ]; then echo "IMG_NAME not set" 1>&2 exit 1 fi +# Set other env variables export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"} export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -151,9 +194,11 @@ export -f on_chroot export -f copy_previous export -f update_issue +# Create working directory mkdir -p ${WORK_DIR} log "Begin ${BASE_DIR}" +# Successively build each stage for STAGE_DIR in ${BASE_DIR}/stage*; do STAGE=$(basename ${STAGE_DIR}) run_stage From 953a40e0036df685cfd34cc39e31dcda587c9185 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:15:13 -0700 Subject: [PATCH 02/29] Created an initial script that builds an image from a generated stage rootfs --- create-image.sh | 157 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100755 create-image.sh diff --git a/create-image.sh b/create-image.sh new file mode 100755 index 0000000..300dd03 --- /dev/null +++ b/create-image.sh @@ -0,0 +1,157 @@ +#!/bin/bash + +for i in "$@" +do +case $i in + # Path to the working directory from which to build the image + -p=*|--path=*) + WORKSPACE_PATH="${i#*=}" + shift + ;; + + # Name for image + -n=*|--name=*) + IMAGE_NAME="${i#*=}" + shift + ;; + + # unknown option + *) + ;; +esac +done + +if [ ${EUID} -ne 0 ]; then + echo "this tool must be run as root" + exit 1 +fi + +if [ -z "$IMAGE_NAME" ] +then + echo "No image name specified, defaulting to \"raspbian\"" + IMAGE_NAME="raspbian" +fi + +if [ -z "$WORKSPACE_PATH" ] +then + echo "You must specify a workspace path. Ex) --path=./work/2016-05-02-openrov/stage3" + exit 2 +fi + +work_path=$(readlink -f $WORKSPACE_PATH) + +if [ ! -d "$work_path" ] +then + echo "Error resolving workspace path. Does not exist: work_path=\"${work_path}\"" + exit 3 +fi + +echo "Creating image using rootfs in: ${work_path}" + +bootsize="64M" +deb_release="jessie" + +mkdir -p rpi + +# define destination folder where created image file will be stored +buildenv="${PWD}/rpi" + +# Set directory of rootfs and bootfs +rootfs="${buildenv}/rootfs" +bootfs="${buildenv}/boot" + +today=`date +%Y%m%d` + +mkdir -p ${buildenv} + +# Construct image name +image="${buildenv}/images/${IMAGE_NAME}_${deb_release}_${today}.img" + +# Create a blank image file +dd if=/dev/zero of=${image} bs=1MB count=3800 + +# Mount it on the loop back adapter +device=`losetup -f --show ${image}` + +echo "image ${image} created and mounted as ${device}" + +# Set up partition descriptor +fdisk ${device} << EOF +n +p +1 + ++${bootsize} +t +c +n +p +2 + + +w +EOF + + +if [ "${image}" != "" ]; then + # Delete the loopback device + losetup -d ${device} + + # Mount the disk image + device=`kpartx -va ${image} | sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1` + echo device + device="/dev/mapper/${device}" + echo device + + # Get paths to boot and root partitions + bootp=${device}p1 + rootp=${device}p2 +fi + +# Create the filesystems +mkfs.vfat ${bootp} +mkfs.ext4 ${rootp} + +# Set the path to the rootfs +mkdir -p ${rootfs} + +# Mount the rootfs to the root partition +mount ${rootp} ${rootfs} + +# copy +rootfs_work="${work_path}/rootfs" +rsync -a ${rootfs_work}/ ${rootfs} + +# Remove the contents of the boot folder, but not the boot folder itself +rm -rf ${rootfs}/boot/* + +#unmount +umount ${rootp} + +sync + +bootfs_work="${rootfs_work}/boot" +mkdir -p ${bootfs} + +mount ${bootp} ${bootfs} + +cp -R ${bootfs_work}/* ${bootfs} + +umount ${bootfs} + +sync + +rm -rf ${rootfs} +rm -rf ${bootfs} + +# Remove device mapper bindings. Avoids running out of loop devices if run repeatedly. +dmsetup remove_all + +echo "finishing ${image}" + +if [ "${image}" != "" ]; then + kpartx -d ${image} + echo "created image ${image}" +fi + +echo "done." From fcac3a1456f0513dd25eb5a9b3497b9f17f92edb Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:16:03 -0700 Subject: [PATCH 03/29] Added alternate chroot function that uses systemd-nspawn instead of chroot, for host systems that use systemd. Haven't tested yet. --- scripts/common | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/common b/scripts/common index 814f37f..936e0a4 100644 --- a/scripts/common +++ b/scripts/common @@ -63,6 +63,11 @@ on_chroot() { chroot ${ROOTFS_DIR}/ "$@" } +# This should be used if building on a system that uses systemd (?) +on_chroot2() { + systemd-nspawn -D ${ROOTFS_DIR}/ "$@" +} + update_issue() { echo -e "Raspberry Pi reference ${DATE}\nGenerated using Pi-gen, https://github.com/RPi-Distro/Pi-gen, ${1}" > ${ROOTFS_DIR}/etc/rpi-issue } From e13e2ee2ede69bf14d6b8b06a1747b96d1a00d28 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:16:52 -0700 Subject: [PATCH 04/29] Added comments --- stage0/01-configure-apt/00-run.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stage0/01-configure-apt/00-run.sh b/stage0/01-configure-apt/00-run.sh index 9b2bd2e..99adb68 100755 --- a/stage0/01-configure-apt/00-run.sh +++ b/stage0/01-configure-apt/00-run.sh @@ -1,8 +1,10 @@ #!/bin/bash -e +# Install source lists install -m 644 files/sources.list ${ROOTFS_DIR}/etc/apt/ install -m 644 files/raspi.list ${ROOTFS_DIR}/etc/apt/sources.list.d/ +# Set up proxy, if it exists if [ -n "$APT_PROXY" ]; then install -m 644 files/51cache ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache sed ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache -i -e "s|APT_PROXY|${APT_PROXY}|" @@ -10,8 +12,13 @@ else rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache fi +# Add the raspberry pi gpg key on_chroot apt-key add - < files/raspberrypi.gpg.key + +# Update and dist upgrade on_chroot sh -e - << EOF + apt-get update apt-get dist-upgrade -y + EOF From a015170c39bd5738cce925684195f19df0c53f30 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:17:38 -0700 Subject: [PATCH 05/29] Added step to install fstab file, otherwise booting fails in created image because the fstab is empty --- stage1/01-sys-tweaks/00-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index 5c6ce7e..ac7c428 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -3,7 +3,7 @@ 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 install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d -#install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab TODO: Necessary in systemd? +install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab on_chroot sh -e - </dev/null 2>&1; then From e5533608a24915ba9ada9b483e2471d75020e77b Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:21:01 -0700 Subject: [PATCH 06/29] Elaborated on original fstab file --- stage1/01-sys-tweaks/files/fstab | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stage1/01-sys-tweaks/files/fstab b/stage1/01-sys-tweaks/files/fstab index 68e5816..3024bcf 100644 --- a/stage1/01-sys-tweaks/files/fstab +++ b/stage1/01-sys-tweaks/files/fstab @@ -1,3 +1,5 @@ proc /proc proc defaults 0 0 -/dev/mmcblk0p1 /boot vfat defaults 0 2 +/dev/mmcblk0p1 /boot vfat defaults,noatime 0 2 /dev/mmcblk0p2 / ext4 defaults,noatime 0 1 +tmpfs /tmp tmpfs defaults,noatime,nodev,nosuid,mode=1777 0 0 +tmpfs /var/log tmpfs defaults,size=20m,noatime,nodev,nosuid,mode=1777 0 0 \ No newline at end of file From 0e6041b131a4bc64880d2c56de794f08c2369f1f Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:21:30 -0700 Subject: [PATCH 07/29] Update, reconfigure, and set default locale info --- stage2/01-sys-tweaks/00-debconf | 4 ++-- stage2/01-sys-tweaks/01-run.sh | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index afd3914..214b497 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/stage2/01-sys-tweaks/00-debconf @@ -9,10 +9,10 @@ tzdata tzdata/Areas select Etc tzdata tzdata/Zones/Etc select UTC # Locales to be generated: # Choices: All locales, aa_DJ ISO-8859-1, aa_DJ.UTF-8 UTF-8, aa_ER UTF-8, aa_ER@saaho UTF-8, aa_ET UTF-8, af_ZA ISO-8859-1, af_ZA.UTF-8 UTF-8, ak_GH UTF-8, am_ET UTF-8, an_ES ISO-8859-15, an_ES.UTF-8 UTF-8, anp_IN UTF-8, ar_AE ISO-8859-6, ar_AE.UTF-8 UTF-8, ar_BH ISO-8859-6, ar_BH.UTF-8 UTF-8, ar_DZ ISO-8859-6, ar_DZ.UTF-8 UTF-8, ar_EG ISO-8859-6, ar_EG.UTF-8 UTF-8, ar_IN UTF-8, ar_IQ ISO-8859-6, ar_IQ.UTF-8 UTF-8, ar_JO ISO-8859-6, ar_JO.UTF-8 UTF-8, ar_KW ISO-8859-6, ar_KW.UTF-8 UTF-8, ar_LB ISO-8859-6, ar_LB.UTF-8 UTF-8, ar_LY ISO-8859-6, ar_LY.UTF-8 UTF-8, ar_MA ISO-8859-6, ar_MA.UTF-8 UTF-8, ar_OM ISO-8859-6, ar_OM.UTF-8 UTF-8, ar_QA ISO-8859-6, ar_QA.UTF-8 UTF-8, ar_SA ISO-8859-6, ar_SA.UTF-8 UTF-8, ar_SD ISO-8859-6, ar_SD.UTF-8 UTF-8, ar_SS UTF-8, ar_SY ISO-8859-6, ar_SY.UTF-8 UTF-8, ar_TN ISO-8859-6, ar_TN.UTF-8 UTF-8, ar_YE ISO-8859-6, ar_YE.UTF-8 UTF-8, as_IN UTF-8, ast_ES ISO-8859-15, ast_ES.UTF-8 UTF-8, ayc_PE UTF-8, az_AZ UTF-8, be_BY CP1251, be_BY.UTF-8 UTF-8, be_BY@latin UTF-8, bem_ZM UTF-8, ber_DZ UTF-8, ber_MA UTF-8, bg_BG CP1251, bg_BG.UTF-8 UTF-8, bho_IN UTF-8, bn_BD UTF-8, bn_IN UTF-8, bo_CN UTF-8, bo_IN UTF-8, br_FR ISO-8859-1, br_FR.UTF-8 UTF-8, br_FR@euro ISO-8859-15, brx_IN UTF-8, bs_BA ISO-8859-2, bs_BA.UTF-8 UTF-8, byn_ER UTF-8, ca_AD ISO-8859-15, ca_AD.UTF-8 UTF-8, ca_ES ISO-8859-1, ca_ES.UTF-8 UTF-8, ca_ES.UTF-8@valencia UTF-8, ca_ES@euro ISO-8859-15, ca_ES@valencia ISO-8859-15, ca_FR ISO-8859-15, ca_FR.UTF-8 UTF-8, ca_IT ISO-8859-15, ca_IT.UTF-8 UTF-8, cmn_TW UTF-8, crh_UA UTF-8, cs_CZ ISO-8859-2, cs_CZ.UTF-8 UTF-8, csb_PL UTF-8, cv_RU UTF-8, cy_GB ISO-8859-14, cy_GB.UTF-8 UTF-8, da_DK ISO-8859-1, da_DK.UTF-8 UTF-8, de_AT ISO-8859-1, de_AT.UTF-8 UTF-8, de_AT@euro ISO-8859-15, de_BE ISO-8859-1, de_BE.UTF-8 UTF-8, de_BE@euro ISO-8859-15, de_CH ISO-8859-1, de_CH.UTF-8 UTF-8, de_DE ISO-8859-1, de_DE.UTF-8 UTF-8, de_DE@euro ISO-8859-15, de_LI.UTF-8 UTF-8, de_LU ISO-8859-1, de_LU.UTF-8 UTF-8, de_LU@euro ISO-8859-15, doi_IN UTF-8, dv_MV UTF-8, dz_BT UTF-8, el_CY ISO-8859-7, el_CY.UTF-8 UTF-8, el_GR ISO-8859-7, el_GR.UTF-8 UTF-8, en_AG UTF-8, en_AU ISO-8859-1, en_AU.UTF-8 UTF-8, en_BW ISO-8859-1, en_BW.UTF-8 UTF-8, en_CA ISO-8859-1, en_CA.UTF-8 UTF-8, en_DK ISO-8859-1, en_DK.ISO-8859-15 ISO-8859-15, en_DK.UTF-8 UTF-8, en_GB ISO-8859-1, en_GB.ISO-8859-15 ISO-8859-15, en_GB.UTF-8 UTF-8, en_HK ISO-8859-1, en_HK.UTF-8 UTF-8, en_IE ISO-8859-1, en_IE.UTF-8 UTF-8, en_IE@euro ISO-8859-15, en_IN UTF-8, en_NG UTF-8, en_NZ ISO-8859-1, en_NZ.UTF-8 UTF-8, en_PH ISO-8859-1, en_PH.UTF-8 UTF-8, en_SG ISO-8859-1, en_SG.UTF-8 UTF-8, en_US ISO-8859-1, en_US.ISO-8859-15 ISO-8859-15, en_US.UTF-8 UTF-8, en_ZA ISO-8859-1, en_ZA.UTF-8 UTF-8, en_ZM UTF-8, en_ZW ISO-8859-1, en_ZW.UTF-8 UTF-8, eo ISO-8859-3, eo.UTF-8 UTF-8, es_AR ISO-8859-1, es_AR.UTF-8 UTF-8, es_BO ISO-8859-1, es_BO.UTF-8 UTF-8, es_CL ISO-8859-1, es_CL.UTF-8 UTF-8, es_CO ISO-8859-1, es_CO.UTF-8 UTF-8, es_CR ISO-8859-1, es_CR.UTF-8 UTF-8, es_CU UTF-8, es_DO ISO-8859-1, es_DO.UTF-8 UTF-8, es_EC ISO-8859-1, es_EC.UTF-8 UTF-8, es_ES ISO-8859-1, es_ES.UTF-8 UTF-8, es_ES@euro ISO-8859-15, es_GT ISO-8859-1, es_GT.UTF-8 UTF-8, es_HN ISO-8859-1, es_HN.UTF-8 UTF-8, es_MX ISO-8859-1, es_MX.UTF-8 UTF-8, es_NI ISO-8859-1, es_NI.UTF-8 UTF-8, es_PA ISO-8859-1, es_PA.UTF-8 UTF-8, es_PE ISO-8859-1, es_PE.UTF-8 UTF-8, es_PR ISO-8859-1, es_PR.UTF-8 UTF-8, es_PY ISO-8859-1, es_PY.UTF-8 UTF-8, es_SV ISO-8859-1, es_SV.UTF-8 UTF-8, es_US ISO-8859-1, es_US.UTF-8 UTF-8, es_UY ISO-8859-1, es_UY.UTF-8 UTF-8, es_VE ISO-8859-1, es_VE.UTF-8 UTF-8, et_EE ISO-8859-1, et_EE.ISO-8859-15 ISO-8859-15, et_EE.UTF-8 UTF-8, eu_ES ISO-8859-1, eu_ES.UTF-8 UTF-8, eu_ES@euro ISO-8859-15, eu_FR ISO-8859-1, eu_FR.UTF-8 UTF-8, eu_FR@euro ISO-8859-15, fa_IR UTF-8, ff_SN UTF-8, fi_FI ISO-8859-1, fi_FI.UTF-8 UTF-8, fi_FI@euro ISO-8859-15, fil_PH UTF-8, fo_FO ISO-8859-1, fo_FO.UTF-8 UTF-8, fr_BE ISO-8859-1, fr_BE.UTF-8 UTF-8, fr_BE@euro ISO-8859-15, fr_CA ISO-8859-1, fr_CA.UTF-8 UTF-8, fr_CH ISO-8859-1, fr_CH.UTF-8 UTF-8, fr_FR ISO-8859-1, fr_FR.UTF-8 UTF-8, fr_FR@euro ISO-8859-15, fr_LU ISO-8859-1, fr_LU.UTF-8 UTF-8, fr_LU@euro ISO-8859-15, fur_IT UTF-8, fy_DE UTF-8, fy_NL UTF-8, ga_IE ISO-8859-1, ga_IE.UTF-8 UTF-8, ga_IE@euro ISO-8859-15, gd_GB ISO-8859-15, gd_GB.UTF-8 UTF-8, gez_ER UTF-8, gez_ER@abegede UTF-8, gez_ET UTF-8, gez_ET@abegede UTF-8, gl_ES ISO-8859-1, gl_ES.UTF-8 UTF-8, gl_ES@euro ISO-8859-15, gu_IN UTF-8, gv_GB ISO-8859-1, gv_GB.UTF-8 UTF-8, ha_NG UTF-8, hak_TW UTF-8, he_IL ISO-8859-8, he_IL.UTF-8 UTF-8, hi_IN UTF-8, hne_IN UTF-8, hr_HR ISO-8859-2, hr_HR.UTF-8 UTF-8, hsb_DE ISO-8859-2, hsb_DE.UTF-8 UTF-8, ht_HT UTF-8, hu_HU ISO-8859-2, hu_HU.UTF-8 UTF-8, hy_AM UTF-8, hy_AM.ARMSCII-8 ARMSCII-8, ia_FR UTF-8, id_ID ISO-8859-1, id_ID.UTF-8 UTF-8, ig_NG UTF-8, ik_CA UTF-8, is_IS ISO-8859-1, is_IS.UTF-8 UTF-8, it_CH ISO-8859-1, it_CH.UTF-8 UTF-8, it_IT ISO-8859-1, it_IT.UTF-8 UTF-8, it_IT@euro ISO-8859-15, iu_CA UTF-8, iw_IL ISO-8859-8, iw_IL.UTF-8 UTF-8, ja_JP.EUC-JP EUC-JP, ja_JP.UTF-8 UTF-8, ka_GE GEORGIAN-PS, ka_GE.UTF-8 UTF-8, kk_KZ PT154, kk_KZ RK1048, kk_KZ.UTF-8 UTF-8, kl_GL ISO-8859-1, kl_GL.UTF-8 UTF-8, km_KH UTF-8, kn_IN UTF-8, ko_KR.EUC-KR EUC-KR, ko_KR.UTF-8 UTF-8, kok_IN UTF-8, ks_IN UTF-8, ks_IN@devanagari UTF-8, ku_TR ISO-8859-9, ku_TR.UTF-8 UTF-8, kw_GB ISO-8859-1, kw_GB.UTF-8 UTF-8, ky_KG UTF-8, lb_LU UTF-8, lg_UG ISO-8859-10, lg_UG.UTF-8 UTF-8, li_BE UTF-8, li_NL UTF-8, lij_IT UTF-8, lo_LA UTF-8, lt_LT ISO-8859-13, lt_LT.UTF-8 UTF-8, lv_LV ISO-8859-13, lv_LV.UTF-8 UTF-8, lzh_TW UTF-8, mag_IN UTF-8, mai_IN UTF-8, mg_MG ISO-8859-15, mg_MG.UTF-8 UTF-8, mhr_RU UTF-8, mi_NZ ISO-8859-13, mi_NZ.UTF-8 UTF-8, mk_MK ISO-8859-5, mk_MK.UTF-8 UTF-8, ml_IN UTF-8, mn_MN UTF-8, mni_IN UTF-8, mr_IN UTF-8, ms_MY ISO-8859-1, ms_MY.UTF-8 UTF-8, mt_MT ISO-8859-3, mt_MT.UTF-8 UTF-8, my_MM UTF-8, nan_TW UTF-8, nan_TW@latin UTF-8, nb_NO ISO-8859-1, nb_NO.UTF-8 UTF-8, nds_DE UTF-8, nds_NL UTF-8, ne_NP UTF-8, nhn_MX UTF-8, niu_NU UTF-8, niu_NZ UTF-8, nl_AW UTF-8, nl_BE ISO-8859-1, nl_BE.UTF-8 UTF-8, nl_BE@euro ISO-8859-15, nl_NL ISO-8859-1, nl_NL.UTF-8 UTF-8, nl_NL@euro ISO-8859-15, nn_NO ISO-8859-1, nn_NO.UTF-8 UTF-8, nr_ZA UTF-8, nso_ZA UTF-8, oc_FR ISO-8859-1, oc_FR.UTF-8 UTF-8, om_ET UTF-8, om_KE ISO-8859-1, om_KE.UTF-8 UTF-8, or_IN UTF-8, os_RU UTF-8, pa_IN UTF-8, pa_PK UTF-8, pap_AN UTF-8, pap_AW UTF-8, pap_CW UTF-8, pl_PL ISO-8859-2, pl_PL.UTF-8 UTF-8, ps_AF UTF-8, pt_BR ISO-8859-1, pt_BR.UTF-8 UTF-8, pt_PT ISO-8859-1, pt_PT.UTF-8 UTF-8, pt_PT@euro ISO-8859-15, quz_PE UTF-8, ro_RO ISO-8859-2, ro_RO.UTF-8 UTF-8, ru_RU ISO-8859-5, ru_RU.CP1251 CP1251, ru_RU.KOI8-R KOI8-R, ru_RU.UTF-8 UTF-8, ru_UA KOI8-U, ru_UA.UTF-8 UTF-8, rw_RW UTF-8, sa_IN UTF-8, sat_IN UTF-8, sc_IT UTF-8, sd_IN UTF-8, sd_IN@devanagari UTF-8, se_NO UTF-8, shs_CA UTF-8, si_LK UTF-8, sid_ET UTF-8, sk_SK ISO-8859-2, sk_SK.UTF-8 UTF-8, sl_SI ISO-8859-2, sl_SI.UTF-8 UTF-8, so_DJ ISO-8859-1, so_DJ.UTF-8 UTF-8, so_ET UTF-8, so_KE ISO-8859-1, so_KE.UTF-8 UTF-8, so_SO ISO-8859-1, so_SO.UTF-8 UTF-8, sq_AL ISO-8859-1, sq_AL.UTF-8 UTF-8, sq_MK UTF-8, sr_ME UTF-8, sr_RS UTF-8, sr_RS@latin UTF-8, ss_ZA UTF-8, st_ZA ISO-8859-1, st_ZA.UTF-8 UTF-8, sv_FI ISO-8859-1, sv_FI.UTF-8 UTF-8, sv_FI@euro ISO-8859-15, sv_SE ISO-8859-1, sv_SE.ISO-8859-15 ISO-8859-15, sv_SE.UTF-8 UTF-8, sw_KE UTF-8, sw_TZ UTF-8, szl_PL UTF-8, ta_IN UTF-8, ta_LK UTF-8, te_IN UTF-8, tg_TJ KOI8-T, tg_TJ.UTF-8 UTF-8, th_TH TIS-620, th_TH.UTF-8 UTF-8, the_NP UTF-8, ti_ER UTF-8, ti_ET UTF-8, tig_ER UTF-8, tk_TM UTF-8, tl_PH ISO-8859-1, tl_PH.UTF-8 UTF-8, tn_ZA UTF-8, tr_CY ISO-8859-9, tr_CY.UTF-8 UTF-8, tr_TR ISO-8859-9, tr_TR.UTF-8 UTF-8, ts_ZA UTF-8, tt_RU UTF-8, tt_RU@iqtelif UTF-8, ug_CN UTF-8, uk_UA KOI8-U, uk_UA.UTF-8 UTF-8, unm_US UTF-8, ur_IN UTF-8, ur_PK UTF-8, uz_UZ ISO-8859-1, uz_UZ.UTF-8 UTF-8, uz_UZ@cyrillic UTF-8, ve_ZA UTF-8, vi_VN UTF-8, wa_BE ISO-8859-1, wa_BE.UTF-8 UTF-8, wa_BE@euro ISO-8859-15, wae_CH UTF-8, wal_ET UTF-8, wo_SN UTF-8, xh_ZA ISO-8859-1, xh_ZA.UTF-8 UTF-8, yi_US CP1255, yi_US.UTF-8 UTF-8, yo_NG UTF-8, yue_HK UTF-8, zh_CN GB2312, zh_CN.GB18030 GB18030, zh_CN.GBK GBK, zh_CN.UTF-8 UTF-8, zh_HK BIG5-HKSCS, zh_HK.UTF-8 UTF-8, zh_SG GB2312, zh_SG.GBK GBK, zh_SG.UTF-8 UTF-8, zh_TW BIG5, zh_TW.EUC-TW EUC-TW, zh_TW.UTF-8 UTF-8, zu_ZA ISO-8859-1, zu_ZA.UTF-8 UTF-8 -locales locales/locales_to_be_generated multiselect en_GB.UTF-8 UTF-8 +locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8 # Default locale for the system environment: # Choices: None, C.UTF-8, en_GB.UTF-8 -locales locales/default_environment_locale select en_GB.UTF-8 +locales locales/default_environment_locale select en_US.UTF-8 # Key to function as AltGr: # Choices: The default for the keyboard layout, No AltGr key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Alt, Left Logo key, Keypad Enter key, Both Logo keys, Both Alt keys keyboard-configuration keyboard-configuration/altgr select The default for the keyboard layout diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 2813047..b034521 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -10,6 +10,11 @@ install -m 644 files/ttyoutput.conf ${ROOTFS_DIR}/etc/systemd/system/rc-local. install -m 644 files/50raspi ${ROOTFS_DIR}/etc/apt/apt.conf.d/ install -m 644 files/98-rpi.conf ${ROOTFS_DIR}/etc/sysctl.d/ +on_chroot sh -e - < Date: Mon, 2 May 2016 12:29:36 -0700 Subject: [PATCH 08/29] Updated readme with example usage --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 74d54f9..54d98fb 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,7 @@ #Dependencies `quilt kpartx realpath qemu-user-static debootstrap zerofree` + +# Example usage to build a bootable raspbian lite image: +sudo ./build.sh +sudo ./create-image.sh --path=./work/2016-05-02-raspbian/stage3 --name="raspbian-lite" \ No newline at end of file From 4dc06c7f7c696156586570fc5b2bbca8e17fcfc8 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 12:31:43 -0700 Subject: [PATCH 09/29] Added boot tweak substage to stage2. Having the init_resize at the end of cmdline.txt causes boot failure after first boot for some reason. Changed some default network details. Disabled bluetooth for normal UART operation and serial console --- stage2/03-boot-tweaks/00-run.sh | 5 ++ stage2/03-boot-tweaks/files/cmdline.txt | 1 + stage2/03-boot-tweaks/files/config.txt | 59 +++++++++++++++++++++ stage2/03-boot-tweaks/files/interfaces | 11 ++++ stage2/{03-cleanup => 04-cleanup}/00-run.sh | 0 5 files changed, 76 insertions(+) create mode 100755 stage2/03-boot-tweaks/00-run.sh create mode 100644 stage2/03-boot-tweaks/files/cmdline.txt create mode 100644 stage2/03-boot-tweaks/files/config.txt create mode 100644 stage2/03-boot-tweaks/files/interfaces rename stage2/{03-cleanup => 04-cleanup}/00-run.sh (100%) diff --git a/stage2/03-boot-tweaks/00-run.sh b/stage2/03-boot-tweaks/00-run.sh new file mode 100755 index 0000000..6dfe897 --- /dev/null +++ b/stage2/03-boot-tweaks/00-run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -ex + +install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/ +install -m 644 files/config.txt ${ROOTFS_DIR}/boot/ +install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/ \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/cmdline.txt b/stage2/03-boot-tweaks/files/cmdline.txt new file mode 100644 index 0000000..5a9f603 --- /dev/null +++ b/stage2/03-boot-tweaks/files/cmdline.txt @@ -0,0 +1 @@ +dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/config.txt b/stage2/03-boot-tweaks/files/config.txt new file mode 100644 index 0000000..bf60b1e --- /dev/null +++ b/stage2/03-boot-tweaks/files/config.txt @@ -0,0 +1,59 @@ +# For more options and information see +# http://www.raspberrypi.org/documentation/configuration/config-txt.md +# Some settings may impact device functionality. See link above for details + +# uncomment if you get no picture on HDMI for a default "safe" mode +#hdmi_safe=1 + +# uncomment this if your display has a black border of unused pixels visible +# and your display can output without overscan +#disable_overscan=1 + +# uncomment the following to adjust overscan. Use positive numbers if console +# goes off screen, and negative if there is too much border +#overscan_left=16 +#overscan_right=16 +#overscan_top=16 +#overscan_bottom=16 + +# uncomment to force a console size. By default it will be display's size minus +# overscan. +#framebuffer_width=1280 +#framebuffer_height=720 + +# uncomment if hdmi display is not detected and composite is being output +#hdmi_force_hotplug=1 + +# uncomment to force a specific HDMI mode (this will force VGA) +#hdmi_group=1 +#hdmi_mode=1 + +# uncomment to force a HDMI mode rather than DVI. This can make audio work in +# DMT (computer monitor) modes +#hdmi_drive=2 + +# uncomment to increase signal to HDMI, if you have interference, blanking, or +# no display +#config_hdmi_boost=4 + +# uncomment for composite PAL +#sdtv_mode=2 + +#uncomment to overclock the arm. 700 MHz is the default. +#arm_freq=800 + +# Uncomment some or all of these to enable the optional hardware interfaces +#dtparam=i2c_arm=on +#dtparam=i2s=on +#dtparam=spi=on + +# Uncomment this to enable the lirc-rpi module +#dtoverlay=lirc-rpi + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +# Disable bluetooth and move UART back to the original pllc +dtoverlay=pi3-disable-bt \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/interfaces b/stage2/03-boot-tweaks/files/interfaces new file mode 100644 index 0000000..c4e2c97 --- /dev/null +++ b/stage2/03-boot-tweaks/files/interfaces @@ -0,0 +1,11 @@ +auto lo + +iface lo inet loopback +iface eth0 inet dhcp + +allow-hotplug eth0 +iface eth0 inet dhcp +metric 0 +address 192.168.0.100 +netmask 255.255.255.0 +gateway 192.168.0.1 \ No newline at end of file diff --git a/stage2/03-cleanup/00-run.sh b/stage2/04-cleanup/00-run.sh similarity index 100% rename from stage2/03-cleanup/00-run.sh rename to stage2/04-cleanup/00-run.sh From 8b46b7544c1492306abc0176c6a742637ddb0b7f Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Mon, 2 May 2016 14:15:42 -0700 Subject: [PATCH 10/29] Made fix to create-image script. Create rpi/images dir before using dd --- create-image.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/create-image.sh b/create-image.sh index 300dd03..4b20210 100755 --- a/create-image.sh +++ b/create-image.sh @@ -51,8 +51,6 @@ echo "Creating image using rootfs in: ${work_path}" bootsize="64M" deb_release="jessie" -mkdir -p rpi - # define destination folder where created image file will be stored buildenv="${PWD}/rpi" @@ -63,6 +61,7 @@ bootfs="${buildenv}/boot" today=`date +%Y%m%d` mkdir -p ${buildenv} +mkdir -p ${buildenv}/images # Construct image name image="${buildenv}/images/${IMAGE_NAME}_${deb_release}_${today}.img" From d4a8b428f9b911b2b981da67136a5b45dbc9c160 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Tue, 3 May 2016 12:52:03 -0700 Subject: [PATCH 11/29] Added vscode to gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9f52a0f..ef9ec70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ deploy/* work/* -config +.vscode/* From 4305c12651937e87e23129acbd579eed1004d41a Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:08:10 -0700 Subject: [PATCH 12/29] Added new build options for the build.sh script --- build.sh | 87 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index 568ccbc..a0318b7 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,9 @@ #!/bin/bash -e +##--------------------------- +## Functions +##--------------------------- + run_sub_stage() { log "Begin ${SUB_STAGE_DIR}" @@ -142,36 +146,93 @@ run_stage(){ log "End ${STAGE_DIR}" } + + +##--------------------------- +## Start Build +##--------------------------- + # Require Root to run if [ "$(id -u)" != "0" ]; then echo "Please run as root" 1>&2 exit 1 fi +# Handle input options +for i in "$@" +do +case $i in + + --imagename=*) + IMG_NAME="${i#*=}" + shift + ;; + + # Username to use in rootfs + --username=*) + USER_NAME="${i#*=}" + shift + ;; + + # Hostname to use in rootfs + --password=*) + PASS_WORD="${i#*=}" + shift + ;; + + # Hostname to use in rootfs + --hostname=*) + HOST_NAME="${i#*=}" + shift + ;; + + # unknown option + *) + ;; +esac +done + +if [ -z "${IMG_NAME}" ]; +then + echo "No image name specified, defaulting to \"raspbian\"" + IMG_NAME="raspbian" +fi + +if [ -z "$USER_NAME" ] +then + echo "No username specified, defaulting to \"pi\"" + USER_NAME="pi" +fi + +if [ -z "$PASS_WORD" ] +then + echo "No username specified, defaulting to \"raspberry\"" + PASS_WORD="raspberry" +fi + +if [ -z "$HOST_NAME" ] +then + echo "No hostname specified, defaulting to \"raspberrypi\"" + HOST_NAME="raspberrypi" +fi + # Source a config file if it exists if [ -f config ]; then source config fi -# Set image name -#TODO: Add way to set this, plus defaults. Defaulting to raspbian for now -IMG_NAME="raspbian" - -if [ -z "${IMG_NAME}" ]; then - echo "IMG_NAME not set" 1>&2 - exit 1 -fi - -# Set other env variables -export IMG_DATE=${IMG_DATE:-"$(date -u +%Y-%m-%d)"} +# Set and export other env variables +export USER_NAME +export HOST_NAME +export PASS_WORD +export IMG_NAME export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export SCRIPT_DIR="${BASE_DIR}/scripts" -export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}" +export WORK_DIR="${BASE_DIR}/work/${IMG_NAME}" export LOG_FILE="${WORK_DIR}/build.log" export CLEAN -export IMG_NAME export APT_PROXY export STAGE From 84c0305b45198a2f20e4d34561f5c76ea22afe7b Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:08:30 -0700 Subject: [PATCH 13/29] Added new options to create-image script --- create-image.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/create-image.sh b/create-image.sh index 4b20210..bf31ec1 100755 --- a/create-image.sh +++ b/create-image.sh @@ -3,15 +3,15 @@ for i in "$@" do case $i in - # Path to the working directory from which to build the image - -p=*|--path=*) - WORKSPACE_PATH="${i#*=}" + # Name for image + -i=*|--imagename=*) + IMAGE_NAME="${i#*=}" shift ;; - # Name for image - -n=*|--name=*) - IMAGE_NAME="${i#*=}" + # Which stage to create image from + -s=*|--stage=*) + STAGE_NUM="${i#*=}" shift ;; @@ -32,12 +32,14 @@ then IMAGE_NAME="raspbian" fi -if [ -z "$WORKSPACE_PATH" ] +if [ -z "$STAGE_NUM" ] then - echo "You must specify a workspace path. Ex) --path=./work/2016-05-02-openrov/stage3" + echo "No stage specified, aborting." exit 2 fi +WORKSPACE_PATH="./work/${IMAGE_NAME}/stage${STAGE_NUM}" + work_path=$(readlink -f $WORKSPACE_PATH) if [ ! -d "$work_path" ] @@ -52,7 +54,7 @@ bootsize="64M" deb_release="jessie" # define destination folder where created image file will be stored -buildenv="${PWD}/rpi" +buildenv="${PWD}/images" # Set directory of rootfs and bootfs rootfs="${buildenv}/rootfs" @@ -64,7 +66,7 @@ mkdir -p ${buildenv} mkdir -p ${buildenv}/images # Construct image name -image="${buildenv}/images/${IMAGE_NAME}_${deb_release}_${today}.img" +image="${buildenv}/images/${IMAGE_NAME}.img" # Create a blank image file dd if=/dev/zero of=${image} bs=1MB count=3800 From 0c5b7702331d1c494dc431eaa07e964099aa4f39 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:08:58 -0700 Subject: [PATCH 14/29] Added script for making .sh files executable --- mod_scripts.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 mod_scripts.sh diff --git a/mod_scripts.sh b/mod_scripts.sh new file mode 100755 index 0000000..44d5fc6 --- /dev/null +++ b/mod_scripts.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +find ./ -path ./work -prune -o -name "*.sh" -exec chmod +x {} \; From 3e356e0e158b0cff18c1eaa72b193f0e61ea2cc6 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:09:06 -0700 Subject: [PATCH 15/29] Fixed git ignore --- images/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/.gitignore diff --git a/images/.gitignore b/images/.gitignore new file mode 100644 index 0000000..e69de29 From 21cf9e8e80c0e294039434c4cfa906c7eba9e64b Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:09:35 -0700 Subject: [PATCH 16/29] Whitespace fix --- stage0/01-configure-apt/00-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage0/01-configure-apt/00-run.sh b/stage0/01-configure-apt/00-run.sh index 99adb68..53c6fc5 100755 --- a/stage0/01-configure-apt/00-run.sh +++ b/stage0/01-configure-apt/00-run.sh @@ -16,7 +16,7 @@ fi on_chroot apt-key add - < files/raspberrypi.gpg.key # Update and dist upgrade -on_chroot sh -e - << EOF +on_chroot sh -e - < Date: Thu, 5 May 2016 15:11:03 -0700 Subject: [PATCH 17/29] Made username, password, and hostname generic --- stage1/01-sys-tweaks/00-run.sh | 6 +++--- stage1/02-net-tweaks/00-patches/01-hosts.diff | 9 --------- stage1/02-net-tweaks/00-run.sh | 13 +++++++++++-- stage1/02-net-tweaks/files/hostname | 1 - stage2/01-sys-tweaks/01-run.sh | 14 +++++++------- 5 files changed, 21 insertions(+), 22 deletions(-) delete mode 100644 stage1/02-net-tweaks/00-patches/01-hosts.diff delete mode 100644 stage1/02-net-tweaks/files/hostname diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh index ac7c428..f6f118e 100755 --- a/stage1/01-sys-tweaks/00-run.sh +++ b/stage1/01-sys-tweaks/00-run.sh @@ -6,10 +6,10 @@ install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab on_chroot sh -e - </dev/null 2>&1; then - adduser --disabled-password --gecos "" pi +if ! id -u ${USER_NAME} >/dev/null 2>&1; then + adduser --disabled-password --gecos "" ${USER_NAME} fi -echo "pi:raspberry" | chpasswd +echo "${USER_NAME}:${PASS_WORD}" | chpasswd echo "root:root" | chpasswd EOF diff --git a/stage1/02-net-tweaks/00-patches/01-hosts.diff b/stage1/02-net-tweaks/00-patches/01-hosts.diff deleted file mode 100644 index ad07ae5..0000000 --- a/stage1/02-net-tweaks/00-patches/01-hosts.diff +++ /dev/null @@ -1,9 +0,0 @@ -Index: jessie-stage1/rootfs/etc/hosts -=================================================================== ---- jessie-stage1.orig/rootfs/etc/hosts -+++ jessie-stage1/rootfs/etc/hosts -@@ -3,3 +3,4 @@ - ff02::1 ip6-allnodes - ff02::2 ip6-allrouters - -+127.0.1.1 raspberrypi diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh index fd6609a..3649d7b 100755 --- a/stage1/02-net-tweaks/00-run.sh +++ b/stage1/02-net-tweaks/00-run.sh @@ -2,8 +2,17 @@ install -m 644 files/ipv6.conf ${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/interfaces -install -m 644 files/hostname ${ROOTFS_DIR}/etc/hostname -on_chroot sh -e - << EOF +cat < ${ROOTFS_DIR}/etc/hostname +${HOST_NAME} +EOF + +# Append hostname +cat <> ${ROOTFS_DIR}/etc/hosts + +127.0.1.1 ${HOST_NAME} +EOF + +on_chroot sh -e - < Date: Thu, 5 May 2016 15:11:33 -0700 Subject: [PATCH 18/29] Fixed issue with ordering of patch step vs install step where patches got applied to files that hadn't been installed yet --- stage1/02-net-tweaks/00-patches/series | 2 -- .../01-persistant-net.diff} | 0 stage1/02-net-tweaks/01-patches/series | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 stage1/02-net-tweaks/00-patches/series rename stage1/02-net-tweaks/{00-patches/02-persistant-net.diff => 01-patches/01-persistant-net.diff} (100%) create mode 100644 stage1/02-net-tweaks/01-patches/series diff --git a/stage1/02-net-tweaks/00-patches/series b/stage1/02-net-tweaks/00-patches/series deleted file mode 100644 index 5299ca1..0000000 --- a/stage1/02-net-tweaks/00-patches/series +++ /dev/null @@ -1,2 +0,0 @@ -01-hosts.diff -02-persistant-net.diff diff --git a/stage1/02-net-tweaks/00-patches/02-persistant-net.diff b/stage1/02-net-tweaks/01-patches/01-persistant-net.diff similarity index 100% rename from stage1/02-net-tweaks/00-patches/02-persistant-net.diff rename to stage1/02-net-tweaks/01-patches/01-persistant-net.diff diff --git a/stage1/02-net-tweaks/01-patches/series b/stage1/02-net-tweaks/01-patches/series new file mode 100644 index 0000000..1c505d3 --- /dev/null +++ b/stage1/02-net-tweaks/01-patches/series @@ -0,0 +1 @@ +01-persistant-net.diff From 889ee2728d25883de5a553c3e1dae922c58a45f1 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:11:58 -0700 Subject: [PATCH 19/29] Broke up packages over multiple lines for readability --- stage2/01-sys-tweaks/00-packages | 41 ++++++++++++++++++++++++++------ stage2/02-net-tweaks/00-packages | 8 ++++++- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 583a936..290dd93 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -1,13 +1,40 @@ -ssh locales less fbset sudo psmisc strace module-init-tools ed ncdu crda -console-setup keyboard-configuration debconf-utils parted unzip -build-essential manpages-dev python bash-completion gdb pkg-config -python-rpi.gpio v4l-utils +ssh +locales +less +fbset +sudo +psmisc +strace +module-init-tools +ed +ncdu +crda +console-setup +keyboard-configuration +debconf-utils +parted +unzip +build-essential +manpages-dev +python +bash-completion +gdb +pkg-config +python-rpi.gpio +v4l-utils avahi-daemon lua5.1 luajit -hardlink ca-certificates curl -fake-hwclock ntp nfs-common usbutils -libraspberrypi-dev libraspberrypi-doc libfreetype6-dev +hardlink +ca-certificates +curl +fake-hwclock +ntp +nfs-common +usbutils +libraspberrypi-dev +libraspberrypi-doc +libfreetype6-dev dosfstools dphys-swapfile raspberrypi-sys-mods diff --git a/stage2/02-net-tweaks/00-packages b/stage2/02-net-tweaks/00-packages index 14e534b..3a20079 100644 --- a/stage2/02-net-tweaks/00-packages +++ b/stage2/02-net-tweaks/00-packages @@ -1,2 +1,8 @@ -wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-ralink firmware-realtek +wpasupplicant +wireless-tools +firmware-atheros +firmware-brcm80211 +firmware-libertas +firmware-ralink +firmware-realtek dhcpcd5 From f2f7128cd61a13538a683b6f3c6652f59f8195f7 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:19:28 -0700 Subject: [PATCH 20/29] Updated readme --- README.md | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 54d98fb..d9da3e3 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,29 @@ #TODO -1. Image export -1. NOOBS export -1. Simplify running a single stage -1. Documentation +- NOOBS export +- Simplify running a single stage +- Documentation #Dependencies - `quilt kpartx realpath qemu-user-static debootstrap zerofree` -# Example usage to build a bootable raspbian lite image: -sudo ./build.sh -sudo ./create-image.sh --path=./work/2016-05-02-raspbian/stage3 --name="raspbian-lite" \ No newline at end of file +# Example build script: + +```bash +#!/bin/bash -e + +# Set build variables +USERNAME=pi +PASSWORD=raspberry +HOSTNAME=raspberrypi +IMAGENAME="raspbian-lite-$(date +%Y-%m-%d)" +STAGE=2 + +# Build rootfs +sudo ./build.sh --username=${USERNAME} --password=${PASSWORD} --hostname=${HOSTNAME} --imagename=${IMAGENAME} + +# Create .img +sudo ./create-image.sh --imagename=${IMAGENAME} --stage=${STAGE} + +# Resulting image will be at images/${IMAGENAME} +``` \ No newline at end of file From 332750c2e42f12fa73c8fca4c4d5d520a87ee5fa Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:22:10 -0700 Subject: [PATCH 21/29] Removed default stages 3 and 4 from master, since I only want to focus on a raspbian lite base --- stage3/00-install-packages/00-packages | 8 --- stage3/00-install-packages/00-packages-nr | 6 --- stage3/01-tweaks/00-patches/01-lightdm.diff | 13 ----- stage3/01-tweaks/00-patches/series | 1 - stage3/01-tweaks/00-run.sh | 15 ------ stage3/01-tweaks/files/55-storage.pkla | 6 --- stage3/01-tweaks/files/75source-profile | 2 - stage3/prerun.sh | 4 -- stage4/00-install-packages/00-debconf | 4 -- stage4/00-install-packages/00-packages | 27 ---------- stage4/00-install-packages/00-packages-nr | 3 -- stage4/01-tweaks/00-run.sh | 5 -- stage4/01-tweaks/files/40-scratch.rules | 1 - stage4/02-extras/00-patches/0-autologin.diff | 13 ----- stage4/02-extras/00-patches/series | 1 - stage4/02-extras/00-run.sh | 54 -------------------- stage4/02-extras/files/.gitignore | 2 - stage4/03-cleanup/00-run.sh | 5 -- stage4/EXPORT_IMAGE | 0 stage4/EXPORT_NOOBS | 0 stage4/prerun.sh | 4 -- 21 files changed, 174 deletions(-) delete mode 100644 stage3/00-install-packages/00-packages delete mode 100644 stage3/00-install-packages/00-packages-nr delete mode 100644 stage3/01-tweaks/00-patches/01-lightdm.diff delete mode 100644 stage3/01-tweaks/00-patches/series delete mode 100755 stage3/01-tweaks/00-run.sh delete mode 100644 stage3/01-tweaks/files/55-storage.pkla delete mode 100644 stage3/01-tweaks/files/75source-profile delete mode 100755 stage3/prerun.sh delete mode 100644 stage4/00-install-packages/00-debconf delete mode 100644 stage4/00-install-packages/00-packages delete mode 100644 stage4/00-install-packages/00-packages-nr delete mode 100755 stage4/01-tweaks/00-run.sh delete mode 100644 stage4/01-tweaks/files/40-scratch.rules delete mode 100644 stage4/02-extras/00-patches/0-autologin.diff delete mode 100644 stage4/02-extras/00-patches/series delete mode 100755 stage4/02-extras/00-run.sh delete mode 100644 stage4/02-extras/files/.gitignore delete mode 100755 stage4/03-cleanup/00-run.sh delete mode 100644 stage4/EXPORT_IMAGE delete mode 100644 stage4/EXPORT_NOOBS delete mode 100755 stage4/prerun.sh diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages deleted file mode 100644 index fe83adc..0000000 --- a/stage3/00-install-packages/00-packages +++ /dev/null @@ -1,8 +0,0 @@ -gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav -xpdf gtk2-engines alsa-utils -desktop-base -git-core rpi-update -omxplayer -raspberrypi-artwork -policykit-1 -udisks diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr deleted file mode 100644 index 3915e3a..0000000 --- a/stage3/00-install-packages/00-packages-nr +++ /dev/null @@ -1,6 +0,0 @@ -xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo -epiphany-browser -lxde lxtask menu-xdg gksu -netsurf-gtk zenity xdg-utils -gvfs-backends gvfs-fuse -lightdm gnome-themes-standard-data gnome-icon-theme diff --git a/stage3/01-tweaks/00-patches/01-lightdm.diff b/stage3/01-tweaks/00-patches/01-lightdm.diff deleted file mode 100644 index b2a8c8b..0000000 --- a/stage3/01-tweaks/00-patches/01-lightdm.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf -=================================================================== ---- jessie-stage3.orig/rootfs/etc/lightdm/lightdm-gtk-greeter.conf -+++ jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf -@@ -16,7 +16,7 @@ - # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen - # - [greeter] --background=/usr/share/images/desktop-base/login-background.svg -+background=#ffffff - theme-name=Adwaita - #icon-theme-name= - #font-name= diff --git a/stage3/01-tweaks/00-patches/series b/stage3/01-tweaks/00-patches/series deleted file mode 100644 index e8bdcf5..0000000 --- a/stage3/01-tweaks/00-patches/series +++ /dev/null @@ -1 +0,0 @@ -01-lightdm.diff diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh deleted file mode 100755 index 0b0f1bc..0000000 --- a/stage3/01-tweaks/00-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e - -on_chroot sh -e - < files/python_games.hash -fi - -ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2 - -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games -tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1 -chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv -chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications" - -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" - -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/openbox -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxsession -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.themes -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/gtk-3.0 -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxpanel -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/Desktop - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/pcmanfm.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-0.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/openbox/lxde-pi-rc.xml ${ROOTFS_DIR}/home/pi/.config/openbox/ - -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxsession/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxsession/ -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/themes/PiX ${ROOTFS_DIR}/home/pi/.themes/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/gtk.css ${ROOTFS_DIR}/home/pi/.config/gtk-3.0/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/Trolltech.conf ${ROOTFS_DIR}/home/pi/.config/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/launchtaskbar.cfg ${ROOTFS_DIR}/home/pi/.config/lxpanel/ -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/profile/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxpanel/ diff --git a/stage4/02-extras/files/.gitignore b/stage4/02-extras/files/.gitignore deleted file mode 100644 index 589d776..0000000 --- a/stage4/02-extras/files/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -python_games.hash -python_games.tar.gz diff --git a/stage4/03-cleanup/00-run.sh b/stage4/03-cleanup/00-run.sh deleted file mode 100755 index 97bfb08..0000000 --- a/stage4/03-cleanup/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot sh -e - < Date: Thu, 5 May 2016 15:32:56 -0700 Subject: [PATCH 22/29] Removed stage 4 again --- stage4/00-install-packages/00-packages | 28 ------------- stage4/02-extras/00-run.sh | 57 -------------------------- 2 files changed, 85 deletions(-) delete mode 100644 stage4/00-install-packages/00-packages delete mode 100755 stage4/02-extras/00-run.sh diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages deleted file mode 100644 index 950e320..0000000 --- a/stage4/00-install-packages/00-packages +++ /dev/null @@ -1,28 +0,0 @@ -java-common oracle-java8-jdk -libreoffice-sdbc-hsqldb -sonic-pi -python idle python3-pygame python-pygame python-tk -python3 idle3 python3-tk -python3-pgzero -python-serial python3-serial -python-picamera python3-picamera -debian-reference-en dillo x2x -wolfram-engine -raspberrypi-net-mods raspberrypi-ui-mods -smartsim penguinspuzzle -python-pip python3-pip -python3-numpy -pypy -python3-pifacecommon python3-pifacedigitalio python3-pifacedigital-scratch-handler python-pifacecommon python-pifacedigitalio -minecraft-pi python-minecraftpi -alacarte rc-gui sense-hat -claws-mail -tree -scratch nuscratch -greenfoot bluej -nodered -libgl1-mesa-dri libgles1-mesa libgles2-mesa xcompmgr -geany -piclone -pulseaudio-module-bluetooth -wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh deleted file mode 100755 index 74c9d9e..0000000 --- a/stage4/02-extras/00-run.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -e - -HASH=`wget https://api.github.com/repos/KenT2/python-games/git/refs/heads/master -qO -| grep \"sha\" | cut -f 2 -d ':' | cut -f 2 -d \"` - -if [ -f files/python_games.hash ]; then - HASH_LOCAL=`cat files/python_games.hash` -fi - -if [ ! -e files/python_games.tar.gz ] || [ "$HASH" != "$HASH_LOCAL" ]; then - wget "https://github.com/KenT2/python-games/tarball/master" -O files/python_games.tar.gz - echo $HASH > files/python_games.hash -fi - -ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2 - -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games -tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1 -chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv -chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications" - -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" - -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/openbox -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxsession -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.themes -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/gtk-3.0 -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxpanel -install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/Desktop - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/pcmanfm.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-0.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/openbox/lxde-pi-rc.xml ${ROOTFS_DIR}/home/pi/.config/openbox/ - -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxsession/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxsession/ -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/themes/PiX ${ROOTFS_DIR}/home/pi/.themes/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/gtk.css ${ROOTFS_DIR}/home/pi/.config/gtk-3.0/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/Trolltech.conf ${ROOTFS_DIR}/home/pi/.config/ - -install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/launchtaskbar.cfg ${ROOTFS_DIR}/home/pi/.config/lxpanel/ -rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/profile/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxpanel/ From 766837b833954595256305442291b46e874a95b0 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 15:33:53 -0700 Subject: [PATCH 23/29] Fixed a missing merge conflict --- build.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.sh b/build.sh index a4a45a1..a45dd60 100755 --- a/build.sh +++ b/build.sh @@ -237,12 +237,8 @@ export IMG_NAME export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export SCRIPT_DIR="${BASE_DIR}/scripts" -<<<<<<< HEAD export WORK_DIR="${BASE_DIR}/work/${IMG_NAME}" -======= -export WORK_DIR="${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}" export DEPLOY_DIR="${BASE_DIR}/deploy" ->>>>>>> bdca3e3b48e72df796ec7b1a24a26c08b2dcfa67 export LOG_FILE="${WORK_DIR}/build.log" export CLEAN From c3c2c6dca2763a576956a4b0ef02d3b8cc88deed Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 16:26:43 -0700 Subject: [PATCH 24/29] Removed date part of image name, replaced with command line args --- export-image/03-finalise/01-run.sh | 8 ++++---- export-image/prerun.sh | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/export-image/03-finalise/01-run.sh b/export-image/03-finalise/01-run.sh index 4a7a46c..743d689 100755 --- a/export-image/03-finalise/01-run.sh +++ b/export-image/03-finalise/01-run.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" +IMG_FILE="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}.img" on_chroot sh -e - < /dev/null -zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE}) +zip ${DEPLOY_DIR}/${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE}) popd > /dev/null diff --git a/export-image/prerun.sh b/export-image/prerun.sh index aaf9bfa..fc52e33 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -1,11 +1,15 @@ #!/bin/bash -e -IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img" +IMG_FILE="${STAGE_WORK_DIR}/${IMG_NAME}${IMG_SUFFIX}.img" +echo "Doing cleanup first" unmount_image ${IMG_FILE} rm -f ${IMG_FILE} rm -rf ${ROOTFS_DIR} + +echo "Cleanup done" + mkdir -p ${ROOTFS_DIR} BOOT_SIZE=$(du -sh ${EXPORT_ROOTFS_DIR}/boot -B M | cut -f 1 | tr -d M) From 257d05a07069c1eafa4874dc8fafb298cfb50ff3 Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 17:05:35 -0700 Subject: [PATCH 25/29] Removed openrov bluetooth disabling stuff to make it mergeable with upstream --- stage2/03-boot-tweaks/00-run.sh | 5 -- stage2/03-boot-tweaks/files/cmdline.txt | 1 - stage2/03-boot-tweaks/files/config.txt | 59 --------------------- stage2/03-boot-tweaks/files/interfaces | 11 ---- stage2/{04-cleanup => 03-cleanup}/00-run.sh | 0 5 files changed, 76 deletions(-) delete mode 100755 stage2/03-boot-tweaks/00-run.sh delete mode 100644 stage2/03-boot-tweaks/files/cmdline.txt delete mode 100644 stage2/03-boot-tweaks/files/config.txt delete mode 100644 stage2/03-boot-tweaks/files/interfaces rename stage2/{04-cleanup => 03-cleanup}/00-run.sh (100%) diff --git a/stage2/03-boot-tweaks/00-run.sh b/stage2/03-boot-tweaks/00-run.sh deleted file mode 100755 index 6dfe897..0000000 --- a/stage2/03-boot-tweaks/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -ex - -install -m 644 files/cmdline.txt ${ROOTFS_DIR}/boot/ -install -m 644 files/config.txt ${ROOTFS_DIR}/boot/ -install -m 644 files/interfaces ${ROOTFS_DIR}/etc/network/ \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/cmdline.txt b/stage2/03-boot-tweaks/files/cmdline.txt deleted file mode 100644 index 5a9f603..0000000 --- a/stage2/03-boot-tweaks/files/cmdline.txt +++ /dev/null @@ -1 +0,0 @@ -dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/config.txt b/stage2/03-boot-tweaks/files/config.txt deleted file mode 100644 index bf60b1e..0000000 --- a/stage2/03-boot-tweaks/files/config.txt +++ /dev/null @@ -1,59 +0,0 @@ -# For more options and information see -# http://www.raspberrypi.org/documentation/configuration/config-txt.md -# Some settings may impact device functionality. See link above for details - -# uncomment if you get no picture on HDMI for a default "safe" mode -#hdmi_safe=1 - -# uncomment this if your display has a black border of unused pixels visible -# and your display can output without overscan -#disable_overscan=1 - -# uncomment the following to adjust overscan. Use positive numbers if console -# goes off screen, and negative if there is too much border -#overscan_left=16 -#overscan_right=16 -#overscan_top=16 -#overscan_bottom=16 - -# uncomment to force a console size. By default it will be display's size minus -# overscan. -#framebuffer_width=1280 -#framebuffer_height=720 - -# uncomment if hdmi display is not detected and composite is being output -#hdmi_force_hotplug=1 - -# uncomment to force a specific HDMI mode (this will force VGA) -#hdmi_group=1 -#hdmi_mode=1 - -# uncomment to force a HDMI mode rather than DVI. This can make audio work in -# DMT (computer monitor) modes -#hdmi_drive=2 - -# uncomment to increase signal to HDMI, if you have interference, blanking, or -# no display -#config_hdmi_boost=4 - -# uncomment for composite PAL -#sdtv_mode=2 - -#uncomment to overclock the arm. 700 MHz is the default. -#arm_freq=800 - -# Uncomment some or all of these to enable the optional hardware interfaces -#dtparam=i2c_arm=on -#dtparam=i2s=on -#dtparam=spi=on - -# Uncomment this to enable the lirc-rpi module -#dtoverlay=lirc-rpi - -# Additional overlays and parameters are documented /boot/overlays/README - -# Enable audio (loads snd_bcm2835) -dtparam=audio=on - -# Disable bluetooth and move UART back to the original pllc -dtoverlay=pi3-disable-bt \ No newline at end of file diff --git a/stage2/03-boot-tweaks/files/interfaces b/stage2/03-boot-tweaks/files/interfaces deleted file mode 100644 index c4e2c97..0000000 --- a/stage2/03-boot-tweaks/files/interfaces +++ /dev/null @@ -1,11 +0,0 @@ -auto lo - -iface lo inet loopback -iface eth0 inet dhcp - -allow-hotplug eth0 -iface eth0 inet dhcp -metric 0 -address 192.168.0.100 -netmask 255.255.255.0 -gateway 192.168.0.1 \ No newline at end of file diff --git a/stage2/04-cleanup/00-run.sh b/stage2/03-cleanup/00-run.sh similarity index 100% rename from stage2/04-cleanup/00-run.sh rename to stage2/03-cleanup/00-run.sh From 38b142e608856530aef23fb2e93235629ac9f53e Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 17:05:53 -0700 Subject: [PATCH 26/29] Added stages 3 and 4 back to make mergeable with upstream --- stage3/00-install-packages/00-packages | 8 +++ stage3/00-install-packages/00-packages-nr | 6 +++ stage3/01-tweaks/00-patches/01-lightdm.diff | 13 +++++ stage3/01-tweaks/00-patches/series | 1 + stage3/01-tweaks/00-run.sh | 15 ++++++ stage3/01-tweaks/files/55-storage.pkla | 6 +++ stage3/01-tweaks/files/75source-profile | 2 + stage3/prerun.sh | 4 ++ stage4/00-install-packages/00-debconf | 4 ++ stage4/00-install-packages/00-packages | 28 ++++++++++ stage4/00-install-packages/00-packages-nr | 3 ++ stage4/01-tweaks/00-run.sh | 5 ++ stage4/01-tweaks/files/40-scratch.rules | 1 + stage4/02-extras/00-patches/0-autologin.diff | 13 +++++ stage4/02-extras/00-patches/series | 1 + stage4/02-extras/00-run.sh | 57 ++++++++++++++++++++ stage4/02-extras/files/.gitignore | 2 + stage4/03-cleanup/00-run.sh | 5 ++ stage4/EXPORT_IMAGE | 0 stage4/EXPORT_NOOBS | 0 stage4/prerun.sh | 4 ++ 21 files changed, 178 insertions(+) create mode 100644 stage3/00-install-packages/00-packages create mode 100644 stage3/00-install-packages/00-packages-nr create mode 100644 stage3/01-tweaks/00-patches/01-lightdm.diff create mode 100644 stage3/01-tweaks/00-patches/series create mode 100755 stage3/01-tweaks/00-run.sh create mode 100644 stage3/01-tweaks/files/55-storage.pkla create mode 100644 stage3/01-tweaks/files/75source-profile create mode 100755 stage3/prerun.sh create mode 100644 stage4/00-install-packages/00-debconf create mode 100644 stage4/00-install-packages/00-packages create mode 100644 stage4/00-install-packages/00-packages-nr create mode 100755 stage4/01-tweaks/00-run.sh create mode 100644 stage4/01-tweaks/files/40-scratch.rules create mode 100644 stage4/02-extras/00-patches/0-autologin.diff create mode 100644 stage4/02-extras/00-patches/series create mode 100755 stage4/02-extras/00-run.sh create mode 100644 stage4/02-extras/files/.gitignore create mode 100755 stage4/03-cleanup/00-run.sh create mode 100644 stage4/EXPORT_IMAGE create mode 100644 stage4/EXPORT_NOOBS create mode 100755 stage4/prerun.sh diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages new file mode 100644 index 0000000..fe83adc --- /dev/null +++ b/stage3/00-install-packages/00-packages @@ -0,0 +1,8 @@ +gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav +xpdf gtk2-engines alsa-utils +desktop-base +git-core rpi-update +omxplayer +raspberrypi-artwork +policykit-1 +udisks diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr new file mode 100644 index 0000000..3915e3a --- /dev/null +++ b/stage3/00-install-packages/00-packages-nr @@ -0,0 +1,6 @@ +xserver-xorg-video-fbdev xserver-xorg xinit xserver-xorg-video-fbturbo +epiphany-browser +lxde lxtask menu-xdg gksu +netsurf-gtk zenity xdg-utils +gvfs-backends gvfs-fuse +lightdm gnome-themes-standard-data gnome-icon-theme diff --git a/stage3/01-tweaks/00-patches/01-lightdm.diff b/stage3/01-tweaks/00-patches/01-lightdm.diff new file mode 100644 index 0000000..b2a8c8b --- /dev/null +++ b/stage3/01-tweaks/00-patches/01-lightdm.diff @@ -0,0 +1,13 @@ +Index: jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf +=================================================================== +--- jessie-stage3.orig/rootfs/etc/lightdm/lightdm-gtk-greeter.conf ++++ jessie-stage3/rootfs/etc/lightdm/lightdm-gtk-greeter.conf +@@ -16,7 +16,7 @@ + # screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen + # + [greeter] +-background=/usr/share/images/desktop-base/login-background.svg ++background=#ffffff + theme-name=Adwaita + #icon-theme-name= + #font-name= diff --git a/stage3/01-tweaks/00-patches/series b/stage3/01-tweaks/00-patches/series new file mode 100644 index 0000000..e8bdcf5 --- /dev/null +++ b/stage3/01-tweaks/00-patches/series @@ -0,0 +1 @@ +01-lightdm.diff diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh new file mode 100755 index 0000000..0b0f1bc --- /dev/null +++ b/stage3/01-tweaks/00-run.sh @@ -0,0 +1,15 @@ +#!/bin/bash -e + +on_chroot sh -e - < files/python_games.hash +fi + +ln -sf pip3 ${ROOTFS_DIR}/usr/bin/pip-3.2 + +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/python_games +tar xvf files/python_games.tar.gz -C ${ROOTFS_DIR}/home/pi/python_games --strip-components=1 +chown 1000:1000 ${ROOTFS_DIR}/home/pi/python_games -Rv +chmod +x ${ROOTFS_DIR}/home/pi/python_games/launcher.sh + +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" + +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/applications" + +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/BlueJ/ "${ROOTFS_DIR}/home/pi/Documents/BlueJ Projects" +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/doc/Greenfoot/ "${ROOTFS_DIR}/home/pi/Documents/Greenfoot Projects" +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/scratch/Projects/Demos/ "${ROOTFS_DIR}/home/pi/Documents/Scratch Projects" + +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/openbox +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxsession +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.themes +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/gtk-3.0 +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/.config/lxpanel +install -v -o 1000 -g 1000 -d ${ROOTFS_DIR}/home/pi/Desktop + +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/pcmanfm.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/pcmanfm/LXDE-pi/desktop-items-0.conf ${ROOTFS_DIR}/home/pi/.config/pcmanfm/LXDE-pi/ + +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/openbox/lxde-pi-rc.xml ${ROOTFS_DIR}/home/pi/.config/openbox/ + +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxsession/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxsession/ +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/usr/share/themes/PiX ${ROOTFS_DIR}/home/pi/.themes/ + +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/gtk.css ${ROOTFS_DIR}/home/pi/.config/gtk-3.0/ + +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/usr/share/raspi-ui-overrides/Trolltech.conf ${ROOTFS_DIR}/home/pi/.config/ + +install -v -m 644 -o 1000 -g 1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/launchtaskbar.cfg ${ROOTFS_DIR}/home/pi/.config/lxpanel/ +rsync -a --chown=1000:1000 ${ROOTFS_DIR}/etc/xdg/lxpanel/profile/LXDE-pi ${ROOTFS_DIR}/home/pi/.config/lxpanel/ diff --git a/stage4/02-extras/files/.gitignore b/stage4/02-extras/files/.gitignore new file mode 100644 index 0000000..589d776 --- /dev/null +++ b/stage4/02-extras/files/.gitignore @@ -0,0 +1,2 @@ +python_games.hash +python_games.tar.gz diff --git a/stage4/03-cleanup/00-run.sh b/stage4/03-cleanup/00-run.sh new file mode 100755 index 0000000..97bfb08 --- /dev/null +++ b/stage4/03-cleanup/00-run.sh @@ -0,0 +1,5 @@ +#!/bin/bash -e + +on_chroot sh -e - < Date: Thu, 5 May 2016 17:08:44 -0700 Subject: [PATCH 27/29] Removed create_image script since it was added more cleanly upstream --- create-image.sh | 158 ------------------------------------------------ 1 file changed, 158 deletions(-) delete mode 100755 create-image.sh diff --git a/create-image.sh b/create-image.sh deleted file mode 100755 index bf31ec1..0000000 --- a/create-image.sh +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -for i in "$@" -do -case $i in - # Name for image - -i=*|--imagename=*) - IMAGE_NAME="${i#*=}" - shift - ;; - - # Which stage to create image from - -s=*|--stage=*) - STAGE_NUM="${i#*=}" - shift - ;; - - # unknown option - *) - ;; -esac -done - -if [ ${EUID} -ne 0 ]; then - echo "this tool must be run as root" - exit 1 -fi - -if [ -z "$IMAGE_NAME" ] -then - echo "No image name specified, defaulting to \"raspbian\"" - IMAGE_NAME="raspbian" -fi - -if [ -z "$STAGE_NUM" ] -then - echo "No stage specified, aborting." - exit 2 -fi - -WORKSPACE_PATH="./work/${IMAGE_NAME}/stage${STAGE_NUM}" - -work_path=$(readlink -f $WORKSPACE_PATH) - -if [ ! -d "$work_path" ] -then - echo "Error resolving workspace path. Does not exist: work_path=\"${work_path}\"" - exit 3 -fi - -echo "Creating image using rootfs in: ${work_path}" - -bootsize="64M" -deb_release="jessie" - -# define destination folder where created image file will be stored -buildenv="${PWD}/images" - -# Set directory of rootfs and bootfs -rootfs="${buildenv}/rootfs" -bootfs="${buildenv}/boot" - -today=`date +%Y%m%d` - -mkdir -p ${buildenv} -mkdir -p ${buildenv}/images - -# Construct image name -image="${buildenv}/images/${IMAGE_NAME}.img" - -# Create a blank image file -dd if=/dev/zero of=${image} bs=1MB count=3800 - -# Mount it on the loop back adapter -device=`losetup -f --show ${image}` - -echo "image ${image} created and mounted as ${device}" - -# Set up partition descriptor -fdisk ${device} << EOF -n -p -1 - -+${bootsize} -t -c -n -p -2 - - -w -EOF - - -if [ "${image}" != "" ]; then - # Delete the loopback device - losetup -d ${device} - - # Mount the disk image - device=`kpartx -va ${image} | sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1` - echo device - device="/dev/mapper/${device}" - echo device - - # Get paths to boot and root partitions - bootp=${device}p1 - rootp=${device}p2 -fi - -# Create the filesystems -mkfs.vfat ${bootp} -mkfs.ext4 ${rootp} - -# Set the path to the rootfs -mkdir -p ${rootfs} - -# Mount the rootfs to the root partition -mount ${rootp} ${rootfs} - -# copy -rootfs_work="${work_path}/rootfs" -rsync -a ${rootfs_work}/ ${rootfs} - -# Remove the contents of the boot folder, but not the boot folder itself -rm -rf ${rootfs}/boot/* - -#unmount -umount ${rootp} - -sync - -bootfs_work="${rootfs_work}/boot" -mkdir -p ${bootfs} - -mount ${bootp} ${bootfs} - -cp -R ${bootfs_work}/* ${bootfs} - -umount ${bootfs} - -sync - -rm -rf ${rootfs} -rm -rf ${bootfs} - -# Remove device mapper bindings. Avoids running out of loop devices if run repeatedly. -dmsetup remove_all - -echo "finishing ${image}" - -if [ "${image}" != "" ]; then - kpartx -d ${image} - echo "created image ${image}" -fi - -echo "done." From 134671a5fb36411b2a6ae9ee19a2d7988785e1de Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 17:09:13 -0700 Subject: [PATCH 28/29] Removed mod_script util --- mod_scripts.sh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 mod_scripts.sh diff --git a/mod_scripts.sh b/mod_scripts.sh deleted file mode 100755 index 44d5fc6..0000000 --- a/mod_scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -find ./ -path ./work -prune -o -name "*.sh" -exec chmod +x {} \; From 2bc5b218c42b4894f40e8a9ec5593a3a23c079fd Mon Sep 17 00:00:00 2001 From: Charles Cross Date: Thu, 5 May 2016 17:12:08 -0700 Subject: [PATCH 29/29] Removed images dir, updated readme example --- README.md | 6 +----- images/.gitignore | 0 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 images/.gitignore diff --git a/README.md b/README.md index d9da3e3..4db8cad 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,9 @@ USERNAME=pi PASSWORD=raspberry HOSTNAME=raspberrypi IMAGENAME="raspbian-lite-$(date +%Y-%m-%d)" -STAGE=2 # Build rootfs sudo ./build.sh --username=${USERNAME} --password=${PASSWORD} --hostname=${HOSTNAME} --imagename=${IMAGENAME} -# Create .img -sudo ./create-image.sh --imagename=${IMAGENAME} --stage=${STAGE} - -# Resulting image will be at images/${IMAGENAME} +# Resulting images will be in deploy/ ``` \ No newline at end of file diff --git a/images/.gitignore b/images/.gitignore deleted file mode 100644 index e69de29..0000000