From 44c7a2a60c8bc517b86b79d1ccbaef4581204b84 Mon Sep 17 00:00:00 2001 From: German Ferrero Date: Wed, 13 Nov 2019 13:15:47 -0300 Subject: [PATCH] add access point step and remove upper stages --- stage2/EXPORT_IMAGE | 4 --- stage2/EXPORT_NOOBS | 2 -- stage3/00-enable-access-point/00-packages | 2 ++ stage3/00-enable-access-point/01-run.sh | 10 +++++++ .../00-enable-access-point/files/dhcpcd.conf | 3 +++ .../00-enable-access-point/files/dnsmasq.conf | 2 ++ .../00-enable-access-point/files/hostapd.conf | 12 +++++++++ stage3/00-install-packages/00-debconf | 2 -- stage3/00-install-packages/00-packages | 15 ----------- stage3/00-install-packages/00-packages-nr | 6 ----- stage3/00-install-packages/01-run.sh | 8 ------ stage3/01-tweaks/00-run.sh | 3 --- stage3/ESPORT_NOOBS | 2 ++ stage3/EXPORT_IMAGE | 4 +++ stage4/00-install-packages/00-debconf | 2 -- stage4/00-install-packages/00-packages | 26 ------------------- stage4/00-install-packages/00-packages-nr | 2 -- stage4/00-install-packages/01-packages | 22 ---------------- stage4/00-install-packages/02-packages | 4 --- stage4/01-console-autologin/00-run.sh | 5 ---- stage4/02-extras/00-run.sh | 7 ----- stage4/03-magpi/00-run.sh | 15 ----------- stage4/03-magpi/files/.gitignore | 1 - stage4/04-enable-xcompmgr/00-run.sh | 5 ---- stage4/EXPORT_IMAGE | 4 --- stage4/EXPORT_NOOBS | 2 -- stage4/prerun.sh | 5 ---- stage5/00-install-extras/00-packages | 15 ----------- stage5/00-install-libreoffice/00-packages | 3 --- stage5/EXPORT_IMAGE | 4 --- stage5/EXPORT_NOOBS | 2 -- stage5/prerun.sh | 5 ---- 32 files changed, 35 insertions(+), 169 deletions(-) delete mode 100644 stage2/EXPORT_IMAGE delete mode 100644 stage2/EXPORT_NOOBS create mode 100644 stage3/00-enable-access-point/00-packages create mode 100755 stage3/00-enable-access-point/01-run.sh create mode 100644 stage3/00-enable-access-point/files/dhcpcd.conf create mode 100644 stage3/00-enable-access-point/files/dnsmasq.conf create mode 100644 stage3/00-enable-access-point/files/hostapd.conf delete mode 100644 stage3/00-install-packages/00-debconf delete mode 100644 stage3/00-install-packages/00-packages delete mode 100644 stage3/00-install-packages/00-packages-nr delete mode 100755 stage3/00-install-packages/01-run.sh delete mode 100755 stage3/01-tweaks/00-run.sh create mode 100644 stage3/ESPORT_NOOBS create mode 100644 stage3/EXPORT_IMAGE 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 100644 stage4/00-install-packages/01-packages delete mode 100644 stage4/00-install-packages/02-packages delete mode 100755 stage4/01-console-autologin/00-run.sh delete mode 100755 stage4/02-extras/00-run.sh delete mode 100755 stage4/03-magpi/00-run.sh delete mode 100644 stage4/03-magpi/files/.gitignore delete mode 100755 stage4/04-enable-xcompmgr/00-run.sh delete mode 100644 stage4/EXPORT_IMAGE delete mode 100644 stage4/EXPORT_NOOBS delete mode 100755 stage4/prerun.sh delete mode 100644 stage5/00-install-extras/00-packages delete mode 100644 stage5/00-install-libreoffice/00-packages delete mode 100644 stage5/EXPORT_IMAGE delete mode 100644 stage5/EXPORT_NOOBS delete mode 100755 stage5/prerun.sh diff --git a/stage2/EXPORT_IMAGE b/stage2/EXPORT_IMAGE deleted file mode 100644 index aa8f936..0000000 --- a/stage2/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="-lite" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage2/EXPORT_NOOBS b/stage2/EXPORT_NOOBS deleted file mode 100644 index 136cc77..0000000 --- a/stage2/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian Lite" -NOOBS_DESCRIPTION="A port of Debian with no desktop environment" diff --git a/stage3/00-enable-access-point/00-packages b/stage3/00-enable-access-point/00-packages new file mode 100644 index 0000000..8915d98 --- /dev/null +++ b/stage3/00-enable-access-point/00-packages @@ -0,0 +1,2 @@ +hostapd +dnsmasq diff --git a/stage3/00-enable-access-point/01-run.sh b/stage3/00-enable-access-point/01-run.sh new file mode 100755 index 0000000..3b15e1c --- /dev/null +++ b/stage3/00-enable-access-point/01-run.sh @@ -0,0 +1,10 @@ +#!/bin/bash -e + +# Setup an static ip to wlan0 +cat files/dhcpcd.conf >> ${ROOTFS_DIR}/etc/dhcpcd.conf +# Setup dhcp server for rpi to serve clients +cat files/dnsmasq.conf >> /etc/dnsmasq.conf +# Setup access point in hostapd/hostapd.conf +cat files/hostapd.conf >> /etc/hostapd/hostapd.conf +# Point default/hostapd conf to hostapd/hostapd.conf +sed -i "s/#DAEMON_CONF=\"\"/DAEMON_CONF=\"/etc/hostapd/hostapd.conf\"/" "{$ROOTFS_DIR}/etc/default/hostapd" diff --git a/stage3/00-enable-access-point/files/dhcpcd.conf b/stage3/00-enable-access-point/files/dhcpcd.conf new file mode 100644 index 0000000..2a1ac4c --- /dev/null +++ b/stage3/00-enable-access-point/files/dhcpcd.conf @@ -0,0 +1,3 @@ +interface wlan0 + static ip_address=192.168.0.10/24 + nohook wpa_supplicant diff --git a/stage3/00-enable-access-point/files/dnsmasq.conf b/stage3/00-enable-access-point/files/dnsmasq.conf new file mode 100644 index 0000000..d2291eb --- /dev/null +++ b/stage3/00-enable-access-point/files/dnsmasq.conf @@ -0,0 +1,2 @@ +interface=wlan0 + dhcp-range=192.168.0.11,192.168.0.30,255.255.255.0,24h diff --git a/stage3/00-enable-access-point/files/hostapd.conf b/stage3/00-enable-access-point/files/hostapd.conf new file mode 100644 index 0000000..ed27415 --- /dev/null +++ b/stage3/00-enable-access-point/files/hostapd.conf @@ -0,0 +1,12 @@ +interface=wlan0 +driver=nl80211 +ssid=SoporteRemoto +channel=6 +# Operation mode: IEEE 802.11g (2.4 GHz) +hw_mode=g +# Disable mac address control list +macaddr_acl=0 +# Enable both Open System and Shared Keys auth systems +auth_algs=3 +# Ensure the ssid is beaconed +ignore_broadcast_ssid=0 diff --git a/stage3/00-install-packages/00-debconf b/stage3/00-install-packages/00-debconf deleted file mode 100644 index 7dbd12e..0000000 --- a/stage3/00-install-packages/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Adobe Flash Player. Copyright 1996-2015. Adobe Systems Incorporated. All Rights Reserved. -rpi-chromium-mods rpi-chromium-mods/adobe note diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages deleted file mode 100644 index eac74ea..0000000 --- a/stage3/00-install-packages/00-packages +++ /dev/null @@ -1,15 +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 -qpdfview gtk2-engines alsa-utils -desktop-base -git -omxplayer -raspberrypi-artwork -policykit-1 -gvfs -rfkill -chromium-browser rpi-chromium-mods -gldriver-test -fonts-droid-fallback -fonts-liberation2 -obconf -arandr diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr deleted file mode 100644 index ffc324b..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 -mousepad -lxde lxtask menu-xdg -zenity xdg-utils -gvfs-backends gvfs-fuse -lightdm gnome-themes-standard-data gnome-icon-theme diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh deleted file mode 100755 index d768747..0000000 --- a/stage3/00-install-packages/01-run.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF -update-alternatives --install /usr/bin/x-www-browser \ - x-www-browser /usr/bin/chromium-browser 86 -update-alternatives --install /usr/bin/gnome-www-browser \ - gnome-www-browser /usr/bin/chromium-browser 86 -EOF diff --git a/stage3/01-tweaks/00-run.sh b/stage3/01-tweaks/00-run.sh deleted file mode 100755 index 5da7c1a..0000000 --- a/stage3/01-tweaks/00-run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -e - -rm -f "${ROOTFS_DIR}/etc/systemd/system/dhcpcd.service.d/wait.conf" diff --git a/stage3/ESPORT_NOOBS b/stage3/ESPORT_NOOBS new file mode 100644 index 0000000..ba76634 --- /dev/null +++ b/stage3/ESPORT_NOOBS @@ -0,0 +1,2 @@ +NOOBS_NAME="SoporteRemoto" +NOOBS_DESCRIPTION="A port of Raspbian Lite for SoporteRemoto" diff --git a/stage3/EXPORT_IMAGE b/stage3/EXPORT_IMAGE new file mode 100644 index 0000000..5f95bf6 --- /dev/null +++ b/stage3/EXPORT_IMAGE @@ -0,0 +1,4 @@ +IMG_SUFFIX="-soporteremoto" +if [ "${USE_QEMU}" = "1" ]; then + export IMG_SUFFIX="${IMG_SUFFIX}-qemu" +fi diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf deleted file mode 100644 index 87932e2..0000000 --- a/stage4/00-install-packages/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Enable realtime process priority? -jackd2 jackd/tweak_rt_limits boolean true diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages deleted file mode 100644 index 7dadd73..0000000 --- a/stage4/00-install-packages/00-packages +++ /dev/null @@ -1,26 +0,0 @@ -python python3-pygame python-pygame python-tk -python3 python3-tk thonny -python3-pgzero -python-serial python3-serial -python-picamera python3-picamera -debian-reference-en dillo -raspberrypi-net-mods raspberrypi-ui-mods -python-pip python3-pip -python3-numpy -pypy -alacarte rc-gui sense-hat -tree -libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr -geany -piclone -wiringpi pigpio python-pigpio python3-pigpio raspi-gpio python-gpiozero python3-gpiozero python3-rpi.gpio -python-spidev python3-spidev -python-twython python3-twython -python-smbus python3-smbus -python-flask python3-flask -python-picraft python3-picraft -pprompt -piwiz -rp-prefapps -ffmpeg -vlc diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr deleted file mode 100644 index b904b80..0000000 --- a/stage4/00-install-packages/00-packages-nr +++ /dev/null @@ -1,2 +0,0 @@ -pi-package -realvnc-vnc-server diff --git a/stage4/00-install-packages/01-packages b/stage4/00-install-packages/01-packages deleted file mode 100644 index fdf5e73..0000000 --- a/stage4/00-install-packages/01-packages +++ /dev/null @@ -1,22 +0,0 @@ -python-automationhat python3-automationhat -python-blinkt python3-blinkt -python-cap1xxx python3-cap1xxx -python-drumhat python3-drumhat -python-envirophat python3-envirophat -python-explorerhat python3-explorerhat -python-fourletterphat python3-fourletterphat -python-microdotphat python3-microdotphat -python-mote python3-mote -python-motephat python3-motephat -python-phatbeat python3-phatbeat -python-pianohat python3-pianohat -python-piglow python3-piglow -python-rainbowhat python3-rainbowhat -python-scrollphat python3-scrollphat -python-scrollphathd python3-scrollphathd -python-sn3218 python3-sn3218 -python-skywriter python3-skywriter -python-touchphat python3-touchphat -python-buttonshim python3-buttonshim -python-unicornhathd python3-unicornhathd -python-pantilthat python3-pantilthat diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages deleted file mode 100644 index fc43d17..0000000 --- a/stage4/00-install-packages/02-packages +++ /dev/null @@ -1,4 +0,0 @@ -hunspell-en-gb -hyphen-en-gb -wamerican -wbritish diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh deleted file mode 100755 index 665dcdb..0000000 --- a/stage4/01-console-autologin/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4 -EOF diff --git a/stage4/02-extras/00-run.sh b/stage4/02-extras/00-run.sh deleted file mode 100755 index 6a24f82..0000000 --- a/stage4/02-extras/00-run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -e - -#Alacarte fixes -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/applications" -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.local/share/desktop-directories" diff --git a/stage4/03-magpi/00-run.sh b/stage4/03-magpi/00-run.sh deleted file mode 100755 index cc5a820..0000000 --- a/stage4/03-magpi/00-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e - -magpi_regex="MagPi[[:digit:]]*.pdf" -magpi_loc="https://www.raspberrypi.org/magpi-issues" -magpi_latest="$(curl "$magpi_loc/?C=M;O=D" -s | grep "$magpi_regex" -m 1 -o | head -n 1)" - -if [ ! -f "files/$magpi_latest" ]; then - find files/ -regextype grep -regex "files/$magpi_regex" -delete - wget "$magpi_loc/$magpi_latest" -O "files/$magpi_latest" -fi - -file "files/$magpi_latest" | grep -q "PDF document" - -install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi" -install -v -o 1000 -g 1000 -m 644 "files/$magpi_latest" "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/MagPi/" diff --git a/stage4/03-magpi/files/.gitignore b/stage4/03-magpi/files/.gitignore deleted file mode 100644 index a136337..0000000 --- a/stage4/03-magpi/files/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pdf diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh deleted file mode 100755 index ad6298d..0000000 --- a/stage4/04-enable-xcompmgr/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - raspi-config nonint do_xcompmgr 0 -EOF diff --git a/stage4/EXPORT_IMAGE b/stage4/EXPORT_IMAGE deleted file mode 100644 index 79ec11a..0000000 --- a/stage4/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage4/EXPORT_NOOBS b/stage4/EXPORT_NOOBS deleted file mode 100644 index 2ef6d7b..0000000 --- a/stage4/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian" -NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop" diff --git a/stage4/prerun.sh b/stage4/prerun.sh deleted file mode 100755 index 9acd13c..0000000 --- a/stage4/prerun.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -if [ ! -d "${ROOTFS_DIR}" ]; then - copy_previous -fi diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages deleted file mode 100644 index 0deac83..0000000 --- a/stage5/00-install-extras/00-packages +++ /dev/null @@ -1,15 +0,0 @@ -mu-editor -sonic-pi -scratch nuscratch scratch2 scratch3 -smartsim - -minecraft-pi python-minecraftpi -python-sense-emu sense-emu-tools python-sense-emu-doc - -wolfram-engine -claws-mail -greenfoot-unbundled bluej -nodered -realvnc-vnc-viewer - -python-games diff --git a/stage5/00-install-libreoffice/00-packages b/stage5/00-install-libreoffice/00-packages deleted file mode 100644 index 148e7b9..0000000 --- a/stage5/00-install-libreoffice/00-packages +++ /dev/null @@ -1,3 +0,0 @@ -libreoffice-pi -libreoffice-help-en-gb -libreoffice-l10n-en-gb diff --git a/stage5/EXPORT_IMAGE b/stage5/EXPORT_IMAGE deleted file mode 100644 index a81a844..0000000 --- a/stage5/EXPORT_IMAGE +++ /dev/null @@ -1,4 +0,0 @@ -IMG_SUFFIX="-full" -if [ "${USE_QEMU}" = "1" ]; then - export IMG_SUFFIX="${IMG_SUFFIX}-qemu" -fi diff --git a/stage5/EXPORT_NOOBS b/stage5/EXPORT_NOOBS deleted file mode 100644 index cb10203..0000000 --- a/stage5/EXPORT_NOOBS +++ /dev/null @@ -1,2 +0,0 @@ -NOOBS_NAME="Raspbian Full" -NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications" diff --git a/stage5/prerun.sh b/stage5/prerun.sh deleted file mode 100755 index 9acd13c..0000000 --- a/stage5/prerun.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -if [ ! -d "${ROOTFS_DIR}" ]; then - copy_previous -fi