Raspi2-3_GenImage Commit - r156:a741f36247ad · Collaboration Tremplin des Sciences

Cleaning repository -3-

vidal -

r156:a741f36247ad

parent child

Context file:

r156:a741f36247ad

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

             #
             # Debootstrap basic system
             #
             # Load utility functions
             . ./functions.sh
             VARIANT=""
             COMPONENTS="main"
             EXCLUDES=""
             # Use non-free Debian packages if needed
             if [ "$ENABLE_NONFREE" = true ] ; then
               COMPONENTS="main,non-free"
             fi
             # Use minbase bootstrap variant which only includes essential packages
             if [ "$ENABLE_MINBASE" = true ] ; then
               VARIANT="--variant=minbase"
             fi
             # Exclude packages if required by Debian release
-            if [ "$RELEASE" = "stretch" ] ; then
+            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-              EXCLUDES="--exclude=init,systemd-sysv"
-            fi
-            # Exclude packages if required by Debian buster release
-            if [ "$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}/debian"
             # Copy qemu emulator binary to chroot modified for changes in _apt management in buster
             #install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
             install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
             # Copy debian-archive-keyring.pgp
             mkdir -p "${R}/usr/share/keyrings"
             install_readonly /usr/share/keyrings/debian-archive-keyring.gpg "${R}/usr/share/keyrings/debian-archive-keyring.gpg"
             # Complete the bootstrapping process
             chroot_exec /debootstrap/debootstrap --second-stage
             # Mount required filesystems
             mount -t proc none "${R}/proc"
             mount -t sysfs none "${R}/sys"
             # Mount pseudo terminal slave if supported by Debian release
             if [ -d "${R}/dev/pts" ] ; then
               mount --bind /dev/pts "${R}/dev/pts"
             fi

bootstrap.d/42-fbturbo.sh +1 -6

             #
             # Build and Setup fbturbo Xorg driver
             #
             # Load utility functions
             . ./functions.sh
             if [ "$ENABLE_FBTURBO" = true ] ; then
               # Install c/c++ build environment inside the chroot
               chroot_install_cc
               # Copy existing fbturbo sources into chroot directory
               if [ -n "$FBTURBOSRC_DIR" ] && [ -d "$FBTURBOSRC_DIR" ] ; then
                 # Copy local fbturbo sources
                 cp -r "${FBTURBOSRC_DIR}" "${R}/tmp"
               else
                 # Create temporary directory for fbturbo sources
                 temp_dir=$(sudo -u nobody mktemp -d)
                 # Fetch fbturbo sources
                 sudo -u nobody git -C "${temp_dir}" clone "${FBTURBO_URL}"
                 # Move downloaded fbturbo sources
                 mv "${temp_dir}/xf86-video-fbturbo" "${R}/tmp/"
                 # Remove temporary directory for fbturbo sources
                 rm -fr "${temp_dir}"
               fi
               # Install Xorg build dependencies
-              if [ "$RELEASE" = "jessie" ] ; then
+              if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-                chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              elif [ "$RELEASE" = "stretch" ] ; then
-                chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
-              # removed --allow-unauthenticated as recommended after amendment on _apt privileges
-              elif [ "$RELEASE" = "buster" ] ; then
                 chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
               fi
               # Build and install fbturbo driver inside chroot
               chroot_exec /bin/bash -x <<'EOF'
             cd /tmp/xf86-video-fbturbo
             autoreconf -vi
             ./configure --prefix=/usr
             make
             make install
             EOF
               # Install fbturbo driver Xorg configuration
               install_readonly files/xorg/99-fbturbo.conf "${R}/usr/share/X11/xorg.conf.d/99-fbturbo.conf"
               # Remove Xorg build dependencies
               chroot_exec apt-get -qq -y --auto-remove purge xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
             fi

functions.sh +1 -3

             # This file contains utility functions used by rpi23-gen-image.sh
             cleanup (){
               set +x
               set +e
               # Identify and kill all processes still using files
               echo "killing processes using mount point ..."
               fuser -k "${R}"
               sleep 3
               fuser -9 -k -v "${R}"
               # Clean up temporary .password file
               if [ -r ".password" ] ; then
                 shred -zu .password
               fi
               # Clean up all temporary mount points
               echo "removing temporary mount points ..."
               umount -l "${R}/proc" 2> /dev/null
               umount -l "${R}/sys" 2> /dev/null
               umount -l "${R}/dev/pts" 2> /dev/null
               umount "$BUILDDIR/mount/boot/firmware" 2> /dev/null
               umount "$BUILDDIR/mount" 2> /dev/null
               cryptsetup close "${CRYPTFS_MAPPING}" 2> /dev/null
               losetup -d "$ROOT_LOOP" 2> /dev/null
               losetup -d "$FRMW_LOOP" 2> /dev/null
               trap - 0 1 2 3 6
             }
             chroot_exec() {
               # Exec command in chroot
               LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot ${R} $*
             }
             install_readonly() {
               # Install file with user read-only permissions
               install -o root -g root -m 644 $*
             }
             install_exec() {
               # Install file with root exec permissions
               install -o root -g root -m 744 $*
             }
             use_template () {
               # Test if configuration template file exists
               if [ ! -r "./templates/${CONFIG_TEMPLATE}" ] ; then
                 echo "error: configuration template ${CONFIG_TEMPLATE} not found"
                 exit 1
               fi
               # Load template configuration parameters
               . "./templates/${CONFIG_TEMPLATE}"
             }
             chroot_install_cc() {
               # Install c/c++ build environment inside the chroot
               if [ -z "${COMPILER_PACKAGES}" ] ; then
                 COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
-                if [ "$RELEASE" = "jessie" ] ; then
+                if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
                   chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-                elif [ "$RELEASE" = "stretch" ] ; then
-                  chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
                 fi
               fi
             }
             chroot_remove_cc() {
               # Remove c/c++ build environment from the chroot
               if [ ! -z "${COMPILER_PACKAGES}" ] ; then
                 chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
                 COMPILER_PACKAGES=""
               fi
             }

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