Raspi2-3_GenImage Commit - r341:c71b9798972e · Collaboration Tremplin des Sciences

add fixes pulled to dirty-master...

Unknown -

r341:c71b9798972e

parent child

Context file:

r341:c71b9798972e

Collapse all files

bootstrap.d/10-bootstrap.sh +1 -8

-            #!/bin/bash
             #
             # Debootstrap basic system
             #
             VARIANT=""
             COMPONENTS="main"
-            EXCLUDES=""
             # Use non-free Debian packages if needed
             if [ "$ENABLE_NONFREE" = true ] ; then
               VARIANT="--variant=minbase"
             fi
-            # Exclude packages if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-              EXCLUDES="--exclude=init,systemd-sysv"
-            fi
             # Base debootstrap (unpack only)
-            http_proxy=${APT_PROXY} debootstrap ${EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}"
+            http_proxy=${APT_PROXY} debootstrap "${APT_EXCLUDES}" --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}"
             # Copy qemu emulator binary to chroot
             install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"

bootstrap.d/11-apt.sh 0 -6

-            #!/bin/bash
             #
             # Setup APT repositories
             #
               echo "No precompiled kernel repositories were added"
             fi
-            #ipinfo=$(curl ipinfo.io | grep country )
-            #grep -o '\"[^"]*\"' $ipinfo | tr -d '"'
-            #grep -Po '"country":.*?[^\\]",' $(curl ipinfo.io | grep country )
-            #sed -i "s,http:,https:,g" "${ETC_DIR}/apt/sources.list"
             # Upgrade package index and update all installed packages and changed dependencies
             chroot_exec apt-get -qq -y update
             chroot_exec apt-get -qq -y -u dist-upgrade

bootstrap.d/12-locale.sh 0 -2

-            #!/bin/bash
             #
             # Setup Locales and keyboard settings
             #
             chroot_exec dpkg-reconfigure -f noninteractive tzdata
             # Install and setup default locale and keyboard configuration
             if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then
               # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug
               # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957

bootstrap.d/13-kernel.sh +3 -3

-            #!/bin/bash
             #
             # Build and Setup RPi2/3 Kernel
             #
                         echo "CONFIG_CRYPTO_XTS=y"
                         echo "CONFIG_CRYPTO_SHA512=y"
                         echo "CONFIG_CRYPTO_MANAGER=y"
-                      } >> "${KERNEL_DIR}"/.config
+                      } >> ${KERNEL_DIR}/.config
                     fi
                   fi
                   chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/source"
                 fi
               fi
-            elif [ "$BUILD_KERNEL" = false ] ; then
+            else # BUILD_KERNEL=false
               echo " Install precompiled kernel..."
               echo "error: not implemented"
               # Check if kernel installation was successful

bootstrap.d/14-fstab.sh 0 -2

-            #!/bin/bash
             #
             # Setup fstab and initramfs
             #
                 chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
               fi
             fi

bootstrap.d/15-rpi-config.sh +1 -3

-            #!/bin/bash
             #
             # Setup RPi2/3 config and cmdline
             #
             # Load hardware random module at boot
             if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then
-               sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${R}/lib/modules-load.d/rpi2.conf"
+              sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${R}/lib/modules-load.d/rpi2.conf"
             fi
             # Load sound module at boot
             # Install sysctl.d configuration files
             install_readonly files/sysctl.d/81-rpi-vm.conf "${ETC_DIR}/sysctl.d/81-rpi-vm.conf"

bootstrap.d/20-networking.sh 0 -1

-            #!/bin/bash
             #
             # Setup Networking
             #

bootstrap.d/21-firewall.sh +2 -1

-            #!/bin/bash
             #
             # Setup Firewall
             #
               # Create iptables configuration directory
               mkdir -p "${ETC_DIR}/iptables"
+              # make sure iptables-legacy is the used alternatives
+              #iptables-save and -restore are slaves of iptables and thus are set accordingly
               if ! [ "$RELEASE" = jessie ] ; then
             	chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
               fi

bootstrap.d/30-security.sh +2 -3

-            #!/bin/bash
             #
             # Setup users and security settings
             #
             # Setup default user
             if [ "$ENABLE_USER" = true ] ; then
-              chroot_exec adduser --gecos "$USER_NAME" --add_extra_groups --disabled-password "$USER_NAME"
+              chroot_exec adduser --gecos $USER_NAME --add_extra_groups --disabled-password $USER_NAME
-              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" "$USER_NAME"
+              chroot_exec usermod -a -G sudo -p "${ENCRYPTED_USER_PASSWORD}" $USER_NAME
             fi
             # Setup root password or not

bootstrap.d/31-logging.sh 0 -1

-            #!/bin/bash
             #
             # Setup Logging
             #

bootstrap.d/32-sshd.sh +1 -2

-            #!/bin/bash
             #
             # Setup SSH settings and public keys
             #
               if [ "$ENABLE_REDUCE" = true ] && [ "$REDUCE_SSHD" = true ] ; then
                 sed "s|^DROPBEAR_EXTRA_ARGS=.*|DROPBEAR_EXTRA_ARGS=\"${DROPBEAR_ARGS}\"|g" "${ETC_DIR}/default/dropbear"
               fi
-            fi
+            fi
  No newline at end of file

bootstrap.d/41-uboot.sh +7 -7

-            #!/bin/bash
             #
             # Build and Setup U-Boot
             #
               install_readonly "${R}/tmp/u-boot/u-boot.bin" "${BOOT_DIR}/u-boot.bin"
               printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> "${BOOT_DIR}/config.txt"
+              # Install and setup U-Boot command file
               install_readonly files/boot/uboot.mkimage "${BOOT_DIR}/uboot.mkimage"
               printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat ${BOOT_DIR}/uboot.mkimage)" > "${BOOT_DIR}/uboot.mkimage"
                 sed -i '/.*initramfs.*/d' "${BOOT_DIR}/uboot.mkimage"
                 if [ "$BUILD_KERNEL" = false ] ; then
-                    # Remove dtbfile from U-Boot mkfile
+                  # Remove dtbfile from U-Boot mkfile
-                    sed -i '/.*dtbfile.*/d' "${BOOT_DIR}/uboot.mkimage"
+                  sed -i '/.*dtbfile.*/d' "${BOOT_DIR}/uboot.mkimage"
-                    printf "\nbootz \${kernel_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
+                  printf "\nbootz \${kernel_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
                 else
                   printf "\nbootz \${kernel_addr_r} - \${fdt_addr_r}" >> "${BOOT_DIR}/uboot.mkimage"
                 fi
                 sed -i "s|mmc|usb|g" "${BOOT_DIR}/uboot.mkimage"
               fi
+              # Set mkfile to use the correct dtb file
+              sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage"
               # Set mkfile to use the correct mach id
               if [ "$ENABLE_QEMU" = true ] ; then
                 sed -i "s/^\(setenv machid \).*/\10x000008e0/" "${BOOT_DIR}/uboot.mkimage"
               fi
-                # Set mkfile to use the correct dtb file
-              sed -i "s/^\(setenv dtbfile \).*/\1${DTB_FILE}/" "${BOOT_DIR}/uboot.mkimage"
               # Set mkfile to use kernel image
               sed -i "s/^\(fatload mmc 0:1 \${kernel_addr_r} \).*/\1${KERNEL_IMAGE}/" "${BOOT_DIR}/uboot.mkimage"

bootstrap.d/42-fbturbo.sh 0 -1

-            #!/bin/bash
             #
             # Build and Setup fbturbo Xorg driver
             #

bootstrap.d/50-firstboot.sh 0 -1

-            #!/bin/bash
             #
             # First boot actions
             #

bootstrap.d/99-reduce.sh 0 -1

-            #!/bin/bash
             #
             # Reduce system disk usage
             #

rpi23-gen-image.sh +127 -118

             export KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             # URLs
-            export KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
+            KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
-            export FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
+            FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
-            export WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
+            WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
-            export FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
+            COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
-            export UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
+            FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
-            export VIDEOCORE_URL=${VIDEOCORE_URL=https://github.com/raspberrypi/userland}
+            UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
+            VIDEOCORE_URL=${VIDEOCORE_URL=https://github.com/raspberrypi/userland}
-            # Firmware directory: Blank if download from github
-            export RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}
             # Build directories
-            export BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
+            BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
-            export BUILDDIR="${BASEDIR}/build"
+            BUILDDIR="${BASEDIR}/build"
             # Prepare date string for default image file name
             DATE="$(date +%Y-%m-%d)"
             if [ -z "$KERNEL_BRANCH" ] ; then
-              export IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-CURRENT-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
             else
-              export IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
+              IMAGE_NAME=${IMAGE_NAME:=${BASEDIR}/${DATE}-${KERNEL_ARCH}-${KERNEL_BRANCH}-rpi${RPI_MODEL}-${RELEASE}-${RELEASE_ARCH}}
             fi
             # Chroot directories
-            export R="${BUILDDIR}/chroot"
+            R="${BUILDDIR}/chroot"
-            export ETC_DIR="${R}/etc"
+            ETC_DIR="${R}/etc"
-            export LIB_DIR="${R}/lib"
+            LIB_DIR="${R}/lib"
-            export BOOT_DIR="${R}/boot/firmware"
+            BOOT_DIR="${R}/boot/firmware"
-            export KERNEL_DIR="${R}/usr/src/linux"
+            KERNEL_DIR="${R}/usr/src/linux"
-            export WLAN_FIRMWARE_DIR="${R}/lib/firmware/brcm"
+            WLAN_FIRMWARE_DIR="${R}/lib/firmware/brcm"
+            # Firmware directory: Blank if download from github
+            RPI_FIRMWARE_DIR=${RPI_FIRMWARE_DIR:=""}
             # General settings
-            export SET_ARCH=${SET_ARCH:=32}
+            SET_ARCH=${SET_ARCH:=32}
-            export HOSTNAME=${HOSTNAME:=rpi${RPI_MODEL}-${RELEASE}}
+            HOSTNAME=${HOSTNAME:=rpi${RPI_MODEL}-${RELEASE}}
-            export PASSWORD=${PASSWORD:=raspberry}
+            PASSWORD=${PASSWORD:=raspberry}
-            export USER_PASSWORD=${USER_PASSWORD:=raspberry}
+            USER_PASSWORD=${USER_PASSWORD:=raspberry}
-            export DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"}
+            DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"}
-            export TIMEZONE=${TIMEZONE:="Europe/Berlin"}
+            TIMEZONE=${TIMEZONE:="Europe/Berlin"}
-            export EXPANDROOT=${EXPANDROOT:=true}
+            EXPANDROOT=${EXPANDROOT:=true}
             # Keyboard settings
-            export XKB_MODEL=${XKB_MODEL:=""}
+            XKB_MODEL=${XKB_MODEL:=""}
-            export XKB_LAYOUT=${XKB_LAYOUT:=""}
+            XKB_LAYOUT=${XKB_LAYOUT:=""}
-            export XKB_VARIANT=${XKB_VARIANT:=""}
+            XKB_VARIANT=${XKB_VARIANT:=""}
-            export XKB_OPTIONS=${XKB_OPTIONS:=""}
+            XKB_OPTIONS=${XKB_OPTIONS:=""}
             # Network settings (DHCP)
-            export ENABLE_DHCP=${ENABLE_DHCP:=true}
+            ENABLE_DHCP=${ENABLE_DHCP:=true}
             # Network settings (static)
-            export NET_ADDRESS=${NET_ADDRESS:=""}
+            NET_ADDRESS=${NET_ADDRESS:=""}
-            export NET_GATEWAY=${NET_GATEWAY:=""}
+            NET_GATEWAY=${NET_GATEWAY:=""}
-            export NET_DNS_1=${NET_DNS_1:=""}
+            NET_DNS_1=${NET_DNS_1:=""}
-            export NET_DNS_2=${NET_DNS_2:=""}
+            NET_DNS_2=${NET_DNS_2:=""}
-            export NET_DNS_DOMAINS=${NET_DNS_DOMAINS:=""}
+            NET_DNS_DOMAINS=${NET_DNS_DOMAINS:=""}
-            export NET_NTP_1=${NET_NTP_1:=""}
+            NET_NTP_1=${NET_NTP_1:=""}
-            export NET_NTP_2=${NET_NTP_2:=""}
+            NET_NTP_2=${NET_NTP_2:=""}
             # APT settings
-            export APT_PROXY=${APT_PROXY:=""}
+            APT_PROXY=${APT_PROXY:=""}
-            export APT_SERVER=${APT_SERVER:="ftp.debian.org"}
+            APT_SERVER=${APT_SERVER:="ftp.debian.org"}
             # Feature settings
-            export ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
+            ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
-            export ENABLE_I2C=${ENABLE_I2C:=false}
+            ENABLE_I2C=${ENABLE_I2C:=false}
-            export ENABLE_SPI=${ENABLE_SPI:=false}
+            ENABLE_SPI=${ENABLE_SPI:=false}
-            export ENABLE_IPV6=${ENABLE_IPV6:=true}
+            ENABLE_IPV6=${ENABLE_IPV6:=true}
-            export ENABLE_SSHD=${ENABLE_SSHD:=true}
+            ENABLE_SSHD=${ENABLE_SSHD:=true}
-            export ENABLE_NONFREE=${ENABLE_NONFREE:=false}
+            ENABLE_NONFREE=${ENABLE_NONFREE:=false}
-            export ENABLE_WIRELESS=${ENABLE_WIRELESS:=false}
+            ENABLE_WIRELESS=${ENABLE_WIRELESS:=false}
-            export ENABLE_SOUND=${ENABLE_SOUND:=true}
+            ENABLE_SOUND=${ENABLE_SOUND:=true}
-            export ENABLE_DBUS=${ENABLE_DBUS:=true}
+            ENABLE_DBUS=${ENABLE_DBUS:=true}
-            export ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true}
+            ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true}
-            export ENABLE_MINGPU=${ENABLE_MINGPU:=false}
+            ENABLE_MINGPU=${ENABLE_MINGPU:=false}
-            export ENABLE_XORG=${ENABLE_XORG:=false}
+            ENABLE_XORG=${ENABLE_XORG:=false}
-            export ENABLE_WM=${ENABLE_WM:=""}
+            ENABLE_WM=${ENABLE_WM:=""}
-            export ENABLE_RSYSLOG=${ENABLE_RSYSLOG:=true}
+            ENABLE_RSYSLOG=${ENABLE_RSYSLOG:=true}
-            export ENABLE_USER=${ENABLE_USER:=true}
+            ENABLE_USER=${ENABLE_USER:=true}
-            export USER_NAME=${USER_NAME:="pi"}
+            USER_NAME=${USER_NAME:="pi"}
-            export ENABLE_ROOT=${ENABLE_ROOT:=false}
+            ENABLE_ROOT=${ENABLE_ROOT:=false}
-            export ENABLE_QEMU=${ENABLE_QEMU:=false}
+            ENABLE_QEMU=${ENABLE_QEMU:=false}
+            ENABLE_SYSVINIT=${ENABLE_SYSVINIT:=false}
             # SSH settings
-            export SSH_ENABLE_ROOT=${SSH_ENABLE_ROOT:=false}
+            SSH_ENABLE_ROOT=${SSH_ENABLE_ROOT:=false}
-            export SSH_DISABLE_PASSWORD_AUTH=${SSH_DISABLE_PASSWORD_AUTH:=false}
+            SSH_DISABLE_PASSWORD_AUTH=${SSH_DISABLE_PASSWORD_AUTH:=false}
-            export SSH_LIMIT_USERS=${SSH_LIMIT_USERS:=false}
+            SSH_LIMIT_USERS=${SSH_LIMIT_USERS:=false}
-            export SSH_ROOT_PUB_KEY=${SSH_ROOT_PUB_KEY:=""}
+            SSH_ROOT_PUB_KEY=${SSH_ROOT_PUB_KEY:=""}
-            export SSH_USER_PUB_KEY=${SSH_USER_PUB_KEY:=""}
+            SSH_USER_PUB_KEY=${SSH_USER_PUB_KEY:=""}
             # Advanced settings
-            export ENABLE_MINBASE=${ENABLE_MINBASE:=false}
+            ENABLE_MINBASE=${ENABLE_MINBASE:=false}
-            export ENABLE_REDUCE=${ENABLE_REDUCE:=false}
+            ENABLE_REDUCE=${ENABLE_REDUCE:=false}
-            export ENABLE_UBOOT=${ENABLE_UBOOT:=false}
+            ENABLE_UBOOT=${ENABLE_UBOOT:=false}
-            export UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
+            UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
-            export ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}
+            ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}
-            export ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
+            ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
-            export ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=true}
+            ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=true}
-            export VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
+            VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
-            export FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
+            FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
-            export ENABLE_HARDNET=${ENABLE_HARDNET:=false}
+            ENABLE_HARDNET=${ENABLE_HARDNET:=false}
-            export ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
+            ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
-            export ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}
+            ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}
-            export ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}
+            ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}
-            export ENABLE_IFNAMES=${ENABLE_IFNAMES:=true}
+            ENABLE_IFNAMES=${ENABLE_IFNAMES:=true}
-            export DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=}
+            DISABLE_UNDERVOLT_WARNINGS=${DISABLE_UNDERVOLT_WARNINGS:=}
             # Kernel compilation settings
-            export BUILD_KERNEL=${BUILD_KERNEL:=true}
+            BUILD_KERNEL=${BUILD_KERNEL:=true}
-            export KERNEL_REDUCE=${KERNEL_REDUCE:=false}
+            KERNEL_REDUCE=${KERNEL_REDUCE:=false}
-            export KERNEL_THREADS=${KERNEL_THREADS:=1}
+            KERNEL_THREADS=${KERNEL_THREADS:=1}
-            export KERNEL_HEADERS=${KERNEL_HEADERS:=true}
+            KERNEL_HEADERS=${KERNEL_HEADERS:=true}
-            export KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
+            KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
-            export KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
+            KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
-            export KERNEL_OLDDEFCONFIG=${KERNEL_OLDDEFCONFIG:=false}
+            KERNEL_OLDDEFCONFIG=${KERNEL_OLDDEFCONFIG:=false}
-            export KERNEL_CCACHE=${KERNEL_CCACHE:=false}
+            KERNEL_CCACHE=${KERNEL_CCACHE:=false}
             # Kernel compilation from source directory settings
-            export KERNELSRC_DIR=${KERNELSRC_DIR:=""}
+            KERNELSRC_DIR=${KERNELSRC_DIR:=""}
-            export KERNELSRC_CLEAN=${KERNELSRC_CLEAN:=false}
+            KERNELSRC_CLEAN=${KERNELSRC_CLEAN:=false}
-            export KERNELSRC_CONFIG=${KERNELSRC_CONFIG:=true}
+            KERNELSRC_CONFIG=${KERNELSRC_CONFIG:=true}
-            export KERNELSRC_PREBUILT=${KERNELSRC_PREBUILT:=false}
+            KERNELSRC_PREBUILT=${KERNELSRC_PREBUILT:=false}
             # Reduce disk usage settings
-            export REDUCE_APT=${REDUCE_APT:=true}
+            REDUCE_APT=${REDUCE_APT:=true}
-            export REDUCE_DOC=${REDUCE_DOC:=true}
+            REDUCE_DOC=${REDUCE_DOC:=true}
-            export REDUCE_MAN=${REDUCE_MAN:=true}
+            REDUCE_MAN=${REDUCE_MAN:=true}
-            export REDUCE_VIM=${REDUCE_VIM:=false}
+            REDUCE_VIM=${REDUCE_VIM:=false}
-            export REDUCE_BASH=${REDUCE_BASH:=false}
+            REDUCE_BASH=${REDUCE_BASH:=false}
-            export REDUCE_HWDB=${REDUCE_HWDB:=true}
+            REDUCE_HWDB=${REDUCE_HWDB:=true}
-            export REDUCE_SSHD=${REDUCE_SSHD:=true}
+            REDUCE_SSHD=${REDUCE_SSHD:=true}
-            export REDUCE_LOCALE=${REDUCE_LOCALE:=true}
+            REDUCE_LOCALE=${REDUCE_LOCALE:=true}
             # Encrypted filesystem settings
             ENABLE_CRYPTFS=${ENABLE_CRYPTFS:=false}
             CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
             # Packages required in the chroot build environment
-            export APT_INCLUDES=${APT_INCLUDES:=""}
+            APT_INCLUDES=${APT_INCLUDES:=""}
             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup"
             # Packages required for bootstrapping
-            export REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"
+            REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo netselect-apt"
-            export MISSING_PACKAGES=""
+            MISSING_PACKAGES=""
             # Packages installed for c/c++ build environment in chroot (keep empty)
-            export COMPILER_PACKAGES=""
+            COMPILER_PACKAGES=""
+            #ipinfo=$(curl ipinfo.io | grep country )
+            #grep -o '\"[^"]*\"' $ipinfo | tr -d '"'
+            #grep -Po '"country":.*?[^\\]",' $(curl ipinfo.io | grep country )
+            #sed -i "s,http:,https:,g" "${ETC_DIR}/apt/sources.list"
             #autconfigure best apt server to not spam ftp.debian.org
             #rm files/apt/sources.list
             #netselect-apt does not know buster yet
             else
               netselect-apt --arch "$RELEASE_ARCH" --tests 10 --sources --outfile "$(pwd)/files/apt/sources.list" -d "$RLS"
             fi
+            #sed and cut the result string so we can use it as APT_SERVER
             APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3)
             APT_SERVER=${APT_SERVER::-1}
             # Check if all required packages are installed on the build system
             for package in $REQUIRED_PACKAGES ; do
-              if [ "$(dpkg-query -W -f='${Status}' "$package")" != "install ok installed" ] ; then
+              if [ "$(dpkg-query -W -f='${Status}' $package)" != "install ok installed" ] ; then
                 MISSING_PACKAGES="${MISSING_PACKAGES} $package"
               fi
             done
               exit 1
             fi
+            set -x
             # Call "cleanup" function on various signals and errors
             trap cleanup 0 1 2 3 6
               KERNELSRC_CONFIG=false
             fi
-            set -x
+            # Configure qemu compatible kernel
+            if [ "$ENABLE_QEMU" = true ] ; then
+              DTB_FILE=vexpress-v2p-ca15_a7.dtb
+              UBOOT_CONFIG=vexpress_ca15_tc2_defconfig
+              KERNEL_DEFCONFIG="vexpress_defconfig"
+              if [ "$KERNEL_MENUCONFIG" = false ] ; then
+                KERNEL_OLDDEFCONFIG=true
+              fi
+            fi
             # Execute bootstrap scripts
             for SCRIPT in bootstrap.d/*.sh; do
-              head -n 4 "$SCRIPT"
+              head -n 3 "$SCRIPT"
               . "$SCRIPT"
             done
             rm -f "${R}${QEMU_BINARY}"
             if [ "$ENABLE_QEMU" = true ] ; then
-              # Configure qemu compatible kernel
-              DTB_FILE=vexpress-v2p-ca15_a7.dtb
-              UBOOT_CONFIG=vexpress_ca15_tc2_defconfig
-              KERNEL_DEFCONFIG="vexpress_defconfig"
-              if [ "$KERNEL_MENUCONFIG" = false ] ; then
-                KERNEL_OLDDEFCONFIG=true
-              fi
               # Setup QEMU directory
               mkdir "${BASEDIR}/qemu"
               # Write firmware/boot partition tables
               sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
-            "${TABLE_SECTORS}","${FRMW_SECTORS}",c,*
+            ${TABLE_SECTORS},${FRMW_SECTORS},c,*
             EOM
               # Write root partition table
               sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null <<EOM
-            "${TABLE_SECTORS}","${ROOT_SECTORS}",83
+            ${TABLE_SECTORS},${ROOT_SECTORS},83
             EOM
               # Setup temporary loop devices
               # Write partition table
               sfdisk -q -L -uS -f "$IMAGE_NAME.img" 2> /dev/null <<EOM
-            "${TABLE_SECTORS}","${FRMW_SECTORS}",c,*
+            ${TABLE_SECTORS},${FRMW_SECTORS},c,*
-            "${ROOT_OFFSET}","${ROOT_SECTORS}",83
+            ${ROOT_OFFSET},${ROOT_SECTORS},83
             EOM
               # Setup temporary loop devices
               # Setup password keyfile
               touch .password
               chmod 600 .password
-              echo -n "${CRYPTFS_PASSWORD}" > .password
+              echo -n ${CRYPTFS_PASSWORD} > .password
               # Initialize encrypted partition
               echo "YES" | cryptsetup luksFormat "${ROOT_LOOP}" -c "${CRYPTFS_CIPHER}" -s "${CRYPTFS_XTSKEYSIZE}" .password

General Comments 0

Écrire
Preview

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages