Raspi2-3_GenImage Commit - r204:a8639039065a · Collaboration Tremplin des Sciences

Modifications to build buster images

vidal -

r204:a8639039065a

parent child

Context file:

r204:a8639039065a

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

               # Copy existing kernel sources into chroot directory
               if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
                 # Copy kernel sources
-                cp -r "${KERNELSRC_DIR}/*" "${R}/usr/src/linux"
+                cp -r "${KERNELSRC_DIR}/"* "${R}/usr/src/linux"
                 # Clean the kernel sources
                 if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
                 # Fetch current RPi2/3 kernel sources
                 if [ -z "${KERNEL_BRANCH}" ] ; then
-                  as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
+                  as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                 else
-                  as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
+                  as_nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
-                fi
+               fi
                 # Copy downloaded kernel sources
-                mv "${temp_dir}/linux/*" "${R}/usr/src/linux/"
+                cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
                 # Remove temporary directory for kernel sources
                 rm -fr "${temp_dir}"

rpi23-gen-image.sh +7 -2

             # Packages required in the chroot build environment
             APT_INCLUDES=${APT_INCLUDES:=""}
-            APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+            # apt-transport-https has been removed from repositories
+            # this induces qemu error 383 which does not prevent building an image
+            if [ "$RELEASE" = "buster" ] ; then
+              APT_INCLUDES="${APT_INCLUDES},apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+            else
+              APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+            fi
             # Packages required for bootstrapping
             REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
             MISSING_PACKAGES=""

templates/raspife3-buster +13 -8

             # Configuration file raspi3 Buster IFÉ 2017/11/01
             #
-            APT_SERVER=ftp.fr.debian.org
+            APT_SERVER=debian.mirrors.ovh.net
-            APT_INCLUDES="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
+            APT_INCLUDES=""
+            APT_INCLUDES_LATE=""
+            APT_INCLUDES_LATE="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
             gettext,build-essential,git,cmake,libjson-c-dev,unzip,usbutils,\
             bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,\
             pkg-config,checkinstall,menulibre,libnotify-bin,pandoc,\
             python,python-dev,python-pypandoc,python-scipy,python-tk,python-pandocfilters,\
             python-geopy,python-pip,python-tk,pandoc,\
             python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\
-            pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,\
+            pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,i2c-tools,python-smbus,policykit-1,\
-            pmount,ntpdate,ntp,\
+            pmount,ntpdate,ntp,rsync,\
             texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration,\
-            icedtea-8-plugin,openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,libqtwebkit-dev,libqt5webkit5-dev,\
+            libqtwebkit-dev,libqt5webkit5-dev,\
             libudev-dev,libzzip-dev,zlib1g-dev,libcanberra-gtk-module,libnss-myhostname,libfreetype6-dev,libpng16-16,\
-            nmap,libltdl-dev,dbus-user-session,debian-archive-keyring"
+            nmap,libltdl-dev,dbus-user-session,debian-archive-keyring,\
-            APT_INCLUDES_LATE="xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
+            xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
-            tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr"
+            tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr,jed"
+            #ca-certificates-java,icedtea-plugin,icedtea-netx,\
+            #openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,\
+            #openjdk-9-jdk,openjdk-9-jre,openjdk-9-jre-headless"
             #----------------------
             RPI_MODEL=3
             RELEASE="buster"

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