diff --git a/.gitignore b/.gitignore index a6883c2..bacbfa7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ SKIP_IMAGES .pc *-pc apt-cacher-ng/ +stage2/01-sys-tweaks/files/authorized_keys diff --git a/README.md b/README.md index c8b9e2b..9a5938c 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The following environment variables are supported: be built and cached. Note, `WORK_DIR` stores a complete copy of the target system for each build stage, amounting to tens of gigabytes in the case of Raspbian. - + **CAUTION**: If your working directory is on an NTFS partition you probably won't be able to build. Make sure this is a proper Linux filesystem. * `DEPLOY_DIR` (Default: `"$BASE_DIR/deploy"`) @@ -73,6 +73,39 @@ The following environment variables are supported: Setting to '1' enables the QEMU mode - creating an image that can be mounted via QEMU for an emulated environment. These images include "-qemu" in the image file name. + * `LAST_STAGE` (Default: `"5"`) + + If you wish to build up to a specified stage (such as building up to stage 2 for a lite system) + + * `RPI_LOCALHOST` (Default: `"raspberrypi"`) + + Your image hostname. + + * `RPI_USERNAME` (Default: `"pi"`) + + Default non priviledged user name. + + * `RPI_USERPASS` (Default: `"raspberry"`) + + Default user password. + + * `RPI_ROOTPASS` (Default: `"root"`) + + root user default password. + + * `KEYBOARD_LANG` (Default: `"gb"`) + + Change the keyboard default mapping (gb=qwerty, fr=azerty). + + * `FREE_SPACE_MB` (Default: 400) + + Add a free space in the partition (value in megabyte). If Qemu image is generated it could be usefull to have a lot of free space. + + * `USE_SSH` (Default: `"0"`) + + For security SSH server is disabled by default so if you want to activate it set this to `"1"`. + If `stage2/01-sys-tweaks/files/authorized_keys` is present then it will be copied in `/root/.ssh/` + A simple example for building Raspbian: @@ -213,6 +246,8 @@ maintenance and allows for more easy customization. ### Stage specification +If you wish to skip some steps you can add an empty file `SKIP` in the directory. +It works in `./stage*` or in `./stage*/**-whatever`. If you wish to build up to a specified stage (such as building up to stage 2 for a lite system), place an empty file named `SKIP` in each of the `./stage` directories you wish not to include. @@ -271,4 +306,4 @@ To resolve this, ensure that the following files are available (install them if /usr/bin/qemu-arm-static ``` -You may also need to load the module by hand - run `modprobe binfmt_misc`. +You may also need to load the module by hand - run `modprobe binfmt_misc`. \ No newline at end of file diff --git a/build.sh b/build.sh index ebeb46a..a155220 100755 --- a/build.sh +++ b/build.sh @@ -133,9 +133,17 @@ if [ -z "${IMG_NAME}" ]; then fi export USE_QEMU="${USE_QEMU:-0}" -export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}" +export LAST_STAGE=${LAST_STAGE:-5} +export FREE_SPACE_MB=${FREE_SPACE_MB:-400} +export RPI_LOCALHOST=${RPI_LOCALHOST:-"raspberrypi"} +export RPI_USERNAME=${RPI_USERNAME:-"pi"} +export RPI_USERPASS=${RPI_USERPASS:-"raspberry"} +export RPI_ROOTPASS=${RPI_ROOTPASS:-"root"} +export KEYBOARD_LANG=${KEYBOARD_LANG:-"gb"} +export USE_SSH=${USE_SSH:-0} -BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +export IMG_DATE=${IMG_DATE:-"$(date +%Y-%m-%d)"} +export BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export SCRIPT_DIR="${BASE_DIR}/scripts" export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}" export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"} @@ -169,14 +177,22 @@ export QUILT_REFRESH_ARGS="-p ab" source "${SCRIPT_DIR}/common" # shellcheck source=scripts/dependencies_check source "${SCRIPT_DIR}/dependencies_check" +mkdir -p "${WORK_DIR}" +# LAST_STAGE validation +if [[ "${LAST_STAGE,,}" =~ ^(2|4|5)$ ]]; then + log "Valid LAST_STAGE: $LAST_STAGE" +else + log "ERROR INVALID LAST_STAGE: $LAST_STAGE, try 2, 4 or 5" + exit 2 +fi dependencies_check "${BASE_DIR}/depends" -mkdir -p "${WORK_DIR}" log "Begin ${BASE_DIR}" -for STAGE_DIR in "${BASE_DIR}/stage"*; do +for i in $( seq 0 $LAST_STAGE); do + STAGE_DIR=${BASE_DIR}/stage$i run_stage done diff --git a/config.exemple b/config.exemple new file mode 100644 index 0000000..607c229 --- /dev/null +++ b/config.exemple @@ -0,0 +1,10 @@ +IMG_NAME="Raspbian" +USE_QEMU=1 +USE_SSH=1 +LAST_STAGE=5 +FREE_SPACE_MB=500 +KEYBOARD_LANG="gb" +RPI_LOCALHOST="raspberrypi" +RPI_USERNAME="pi" +RPI_USERPASS="raspberry" +RPI_ROOTPASS="root" diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index cd284ac..a19f31d 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -8,8 +8,8 @@ on_chroot << EOF hardlink -t /usr/share/doc EOF -if [ -d "${ROOTFS_DIR}/home/pi/.config" ]; then - chmod 700 "${ROOTFS_DIR}/home/pi/.config" +if [ -d "${ROOTFS_DIR}/home/${RPI_USERNAME}/.config" ]; then + chmod 700 "${ROOTFS_DIR}/home/${RPI_USERNAME}/.config" fi rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" diff --git a/export-image/prerun.sh b/export-image/prerun.sh index 0ac7181..26a411e 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -16,6 +16,11 @@ ROUND_SIZE="$((4 * 1024 * 1024))" ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192)) IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE)) +if [ "${USE_QEMU}" = "1" ]; then + log "Added ${FREE_SPACE_MB} to qemu image (${IMG_SIZE})" + IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (FREE_SPACE_MB * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE)) +fi + truncate -s "${IMG_SIZE}" "${IMG_FILE}" fdisk -H 255 -S 63 "${IMG_FILE}" </dev/null 2>&1; then - adduser --disabled-password --gecos "" pi +if ! id -u ${RPI_USERNAME} >/dev/null 2>&1; then + adduser --disabled-password --gecos "" ${RPI_USERNAME} fi -echo "pi:raspberry" | chpasswd -echo "root:root" | chpasswd +echo "${RPI_USERNAME}:${RPI_USERPASS}" | chpasswd +echo "root:${RPI_ROOTPASS}" | 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-patches/series b/stage1/02-net-tweaks/00-patches/series deleted file mode 100644 index 3dc19a2..0000000 --- a/stage1/02-net-tweaks/00-patches/series +++ /dev/null @@ -1 +0,0 @@ -01-hosts.diff diff --git a/stage1/02-net-tweaks/00-run.sh b/stage1/02-net-tweaks/00-run.sh index 96a1774..2198801 100755 --- a/stage1/02-net-tweaks/00-run.sh +++ b/stage1/02-net-tweaks/00-run.sh @@ -4,3 +4,6 @@ install -m 644 files/ipv6.conf "${ROOTFS_DIR}/etc/modprobe.d/ipv6.conf" install -m 644 files/hostname "${ROOTFS_DIR}/etc/hostname" ln -sf /dev/null "${ROOTFS_DIR}/etc/systemd/network/99-default.link" + +echo "${RPI_LOCALHOST}" > "${ROOTFS_DIR}/etc/hostname" +echo "127.0.1.1 ${RPI_LOCALHOST}" >> "${ROOTFS_DIR}/etc/hosts" diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index 41e9435..906e321 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/stage2/01-sys-tweaks/00-debconf @@ -1,32 +1,38 @@ # Encoding to use on the console: # Choices: ARMSCII-8, CP1251, CP1255, CP1256, GEORGIAN-ACADEMY, GEORGIAN-PS, IBM1133, ISIRI-3342, ISO-8859-1, ISO-8859-10, ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16, ISO-8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8, ISO-8859-9, KOI8-R, KOI8-U, TIS-620, UTF-8, VISCII console-setup console-setup/charmap47 select UTF-8 + # Character set to support: # Choices: . Arabic, # Armenian, # Cyrillic - KOI8-R and KOI8-U, # Cyrillic - non-Slavic languages, # Cyrillic - Slavic languages (also Bosnian and Serbian Latin), . Ethiopic, # Georgian, # Greek, # Hebrew, # Lao, # Latin1 and Latin5 - western Europe and Turkic languages, # Latin2 - central Europe and Romanian, # Latin3 and Latin8 - Chichewa; Esperanto; Irish; Maltese and Welsh, # Latin7 - Lithuanian; Latvian; Maori and Marshallese, . Latin - Vietnamese, # Thai, . Combined - Latin; Slavic Cyrillic; Hebrew; basic Arabic, . Combined - Latin; Slavic Cyrillic; Greek, . Combined - Latin; Slavic and non-Slavic Cyrillic, Guess optimal character set console-setup console-setup/codeset47 select Guess optimal character set + # Font for the console: # Choices: Fixed, Goha, GohaClassic, Terminus, TerminusBold, TerminusBoldVGA, VGA, Do not change the boot/kernel font, Let the system select a suitable font console-setup console-setup/fontface47 select Do not change the boot/kernel font + # Geographic area: # Choices: Africa, America, Antarctica, Australia, Arctic Ocean, Asia, Atlantic Ocean, Europe, Indian Ocean, Pacific Ocean, System V timezones, US, None of the above tzdata tzdata/Areas select Etc + # Time zone: # Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu tzdata tzdata/Zones/Etc select UTC + # 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 + # Keyboard model: # Choices: A4Tech KB-21, A4Tech KBS-8, A4Tech Wireless Desktop RFKB-23, Acer AirKey V, Acer C300, Acer Ferrari 4000, Acer Laptop, Advance Scorpius KI, Amiga, Apple, Apple Aluminium Keyboard (ANSI), Apple Aluminium Keyboard (ISO), Apple Aluminium Keyboard (JIS), Apple Laptop, Asus Laptop, Atari TT, Azona RF2300 wireless Internet Keyboard, BTC 5090, BTC 5113RF Multimedia, BTC 5126T, BTC 6301URF, BTC 9000, BTC 9000A, BTC 9001AH, BTC 9019U, BTC 9116U Mini Wireless Internet and Gaming, BenQ X-Touch, BenQ X-Touch 730, BenQ X-Touch 800, Brother Internet Keyboard, Cherry B.UNLIMITED, Cherry Blue Line CyBo@rd, Cherry Blue Line CyBo@rd (alternate option), Cherry CyBo@rd USB-Hub, Cherry CyMotion Expert, Cherry CyMotion Master Linux, Cherry CyMotion Master XPress, Chicony Internet Keyboard, Chicony KB-9885, Chicony KU-0108, Chicony KU-0420, Classmate PC, Compaq Easy Access Keyboard, Compaq Internet Keyboard (13 keys), Compaq Internet Keyboard (18 keys), Compaq Internet Keyboard (7 keys), Compaq iPaq Keyboard, Creative Desktop Wireless 7000, DTK2000, Dell, Dell 101-key PC, Dell Laptop/notebook Inspiron 6xxx/8xxx, Dell Laptop/notebook Precision M series, Dell Latitude series laptop, Dell Precision M65, Dell SK-8125, Dell SK-8135, Dell USB Multimedia Keyboard, Dexxa Wireless Desktop Keyboard, Diamond 9801 / 9802 series, Ennyah DKB-1008, Everex STEPnote, FL90, Fujitsu-Siemens Computers AMILO laptop, Generic 101-key PC, Generic 102-key (Intl) PC, Generic 104-key PC, Generic 105-key (Intl) PC, Genius Comfy KB-12e, Genius Comfy KB-16M / Genius MM Keyboard KWD-910, Genius Comfy KB-21e-Scroll, Genius KB-19e NB, Genius KKB-2050HS, Gyration, HTC Dream, Happy Hacking Keyboard, Happy Hacking Keyboard for Mac, Hewlett-Packard Internet Keyboard, Hewlett-Packard Mini 110 Notebook, Hewlett-Packard Omnibook 500 FA, Hewlett-Packard Omnibook 5xx, Hewlett-Packard Omnibook 6000/6100, Hewlett-Packard Omnibook XE3 GC, Hewlett-Packard Omnibook XE3 GF, Hewlett-Packard Omnibook XT1000, Hewlett-Packard Pavilion ZT11xx, Hewlett-Packard Pavilion dv5, Hewlett-Packard SK-250x Multimedia Keyboard, Hewlett-Packard nx9020, Honeywell Euroboard, Htc Dream phone, IBM Rapid Access, IBM Rapid Access II, IBM Space Saver, IBM ThinkPad 560Z/600/600E/A22E, IBM ThinkPad R60/T60/R61/T61, IBM ThinkPad Z60m/Z60t/Z61m/Z61t, Keytronic FlexPro, Kinesis, Laptop/notebook Compaq (eg. Armada) Laptop Keyboard, Laptop/notebook Compaq (eg. Presario) Internet Keyboard, Laptop/notebook eMachines m68xx, Logitech Access Keyboard, Logitech Cordless Desktop, Logitech Cordless Desktop (alternate option), Logitech Cordless Desktop EX110, Logitech Cordless Desktop LX-300, Logitech Cordless Desktop Navigator, Logitech Cordless Desktop Optical, Logitech Cordless Desktop Pro (alternate option 2), Logitech Cordless Desktop iTouch, Logitech Cordless Freedom/Desktop Navigator, Logitech G15 extra keys via G15daemon, Logitech Generic Keyboard, Logitech Internet 350 Keyboard, Logitech Internet Keyboard, Logitech Internet Navigator Keyboard, Logitech Media Elite Keyboard, Logitech Ultra-X Cordless Media Desktop Keyboard, Logitech Ultra-X Keyboard, Logitech diNovo Edge Keyboard, Logitech diNovo Keyboard, Logitech iTouch, Logitech iTouch Cordless Keyboard (model Y-RB6), Logitech iTouch Internet Navigator Keyboard SE, Logitech iTouch Internet Navigator Keyboard SE (USB), MacBook/MacBook Pro, MacBook/MacBook Pro (Intl), Macintosh, Macintosh Old, Memorex MX1998, Memorex MX2500 EZ-Access Keyboard, Memorex MX2750, Microsoft Comfort Curve Keyboard 2000, Microsoft Internet Keyboard, Microsoft Internet Keyboard Pro\, Swedish, Microsoft Natural, Microsoft Natural Keyboard Elite, Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro, Microsoft Natural Keyboard Pro OEM, Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro, Microsoft Natural Wireless Ergonomic Keyboard 4000, Microsoft Natural Wireless Ergonomic Keyboard 7000, Microsoft Office Keyboard, Microsoft Wireless Multimedia Keyboard 1.0A, Northgate OmniKey 101, OLPC, Ortek MCK-800 MM/Internet keyboard, PC-98xx Series, Propeller Voyager (KTEZ-1000), QTronix Scorpius 98N+, SILVERCREST Multimedia Wireless Keyboard, SK-1300, SK-2500, SK-6200, SK-7100, SVEN Ergonomic 2500, SVEN Slim 303, Samsung SDM 4500P, Samsung SDM 4510P, Sanwa Supply SKB-KG3, Sun Type 4, Sun Type 5, Sun Type 6 (Japanese layout), Sun Type 6 USB (Japanese layout), Sun Type 6 USB (Unix layout), Sun Type 6/7 USB, Sun Type 6/7 USB (European layout), Sun Type 7 USB, Sun Type 7 USB (European layout), Sun Type 7 USB (Japanese layout) / Japanese 106-key, Sun Type 7 USB (Unix layout), Super Power Multimedia Keyboard, Symplon PaceBook (tablet PC), Targa Visionary 811, Toshiba Satellite S3000, Trust Direct Access Keyboard, Trust Slimline, Trust Wireless Keyboard Classic, TypeMatrix EZ-Reach 2020, TypeMatrix EZ-Reach 2030 PS2, TypeMatrix EZ-Reach 2030 USB, TypeMatrix EZ-Reach 2030 USB (102/105:EU mode), TypeMatrix EZ-Reach 2030 USB (106:JP mode), Unitek KB-1925, ViewSonic KU-306 Internet Keyboard, Winbook Model XP5, Yahoo! Internet Keyboard keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC + # Keymap to use: # Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Bosnian, Brazilian, British English, Bulgarian, Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Ukrainian, Uyghur, Vietnamese -keyboard-configuration keyboard-configuration/xkb-keymap select gb +keyboard-configuration keyboard-configuration/xkb-keymap select ${KEYBOARD_LANG} + # Compose key: # Choices: No compose key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Logo key, Caps Lock keyboard-configuration keyboard-configuration/compose select No compose key + # Use Control+Alt+Backspace to terminate the X server? keyboard-configuration keyboard-configuration/ctrl_alt_bksp boolean true -# Keyboard layout: -# Choices: English (UK), English (UK) - English (UK\, Colemak), English (UK) - English (UK\, Dvorak with UK punctuation), English (UK) - English (UK\, Dvorak), English (UK) - English (UK\, Macintosh international), English (UK) - English (UK\, Macintosh), English (UK) - English (UK\, extended WinKeys), English (UK) - English (UK\, international with dead keys), Other -keyboard-configuration keyboard-configuration/variant select English (UK) diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 4e9c7d0..4cdd7a7 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -15,29 +15,44 @@ on_chroot << EOF systemctl disable hwclock.sh systemctl disable nfs-common systemctl disable rpcbind -systemctl disable ssh systemctl enable regenerate_ssh_host_keys EOF if [ "${USE_QEMU}" = "1" ]; then - echo "enter QEMU mode" + log "enter QEMU mode" install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/" on_chroot << EOF systemctl disable resize2fs_once EOF - echo "leaving QEMU mode" + log "leaving QEMU mode" else on_chroot << EOF systemctl enable resize2fs_once EOF fi +if [ "${USE_SSH}" = "1" ]; then + on_chroot << EOF +systemctl enable ssh +EOF + + if [[ -e files/authorized_keys ]]; then + log "Copy authorized_keys in root ssh directory" + install -d "${ROOTFS_DIR}/root/.ssh" + install -m 644 files/authorized_keys "${ROOTFS_DIR}/root/.ssh/" + fi +else + on_chroot << EOF +systemctl disable ssh +EOF +fi + on_chroot << \EOF for GRP in input spi i2c gpio; do groupadd -f -r "$GRP" done for GRP in adm dialout cdrom audio users sudo video games plugdev input gpio spi i2c netdev; do - adduser pi $GRP + adduser ${RPI_USERNAME} $GRP done EOF @@ -45,8 +60,4 @@ on_chroot << EOF setupcon --force --save-only -v EOF -on_chroot << EOF -usermod --pass='*' root -EOF - rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key* diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh index 08c6c1e..6b81765 100755 --- a/stage4/02-extras/00-run.sh +++ b/stage4/02-extras/00-run.sh @@ -13,13 +13,14 @@ 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/${RPI_USERNAME}/python_games" +tar xvf files/python_games.tar.gz -C "${ROOTFS_DIR}/home/${RPI_USERNAME}/python_games" --strip-components=1 +chown 1000:1000 "${ROOTFS_DIR}/home/${RPI_USERNAME}/python_games" -Rv +chmod +x "${ROOTFS_DIR}/home/${RPI_USERNAME}/python_games/launcher.sh" + #Alacarte fixes -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" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/pi/.local/share/desktop-directories" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${RPI_USERNAME}/.local" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${RPI_USERNAME}/.local/share" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${RPI_USERNAME}/.local/share/applications" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${RPI_USERNAME}/.local/share/desktop-directories"