##// END OF EJS Templates
Modifications to build buster images
vidal -
r204:a8639039065a
parent child
Show More
@@ -13,7 +13,7 if [ "$BUILD_KERNEL" = true ] ; then
13 13 # Copy existing kernel sources into chroot directory
14 14 if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
15 15 # Copy kernel sources
16 cp -r "${KERNELSRC_DIR}/*" "${R}/usr/src/linux"
16 cp -r "${KERNELSRC_DIR}/"* "${R}/usr/src/linux"
17 17
18 18 # Clean the kernel sources
19 19 if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
@@ -25,13 +25,13 if [ "$BUILD_KERNEL" = true ] ; then
25 25
26 26 # Fetch current RPi2/3 kernel sources
27 27 if [ -z "${KERNEL_BRANCH}" ] ; then
28 as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
28 as_nobody git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
29 29 else
30 as_nobody -u nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
31 fi
30 as_nobody git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
31 fi
32 32
33 33 # Copy downloaded kernel sources
34 mv "${temp_dir}/linux/*" "${R}/usr/src/linux/"
34 cp -r "${temp_dir}/linux/"* "${R}/usr/src/linux/"
35 35
36 36 # Remove temporary directory for kernel sources
37 37 rm -fr "${temp_dir}"
@@ -212,8 +212,13 CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""}
212 212
213 213 # Packages required in the chroot build environment
214 214 APT_INCLUDES=${APT_INCLUDES:=""}
215 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
216
215 # apt-transport-https has been removed from repositories
216 # this induces qemu error 383 which does not prevent building an image
217 if [ "$RELEASE" = "buster" ] ; then
218 APT_INCLUDES="${APT_INCLUDES},apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
219 else
220 APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
221 fi
217 222 # Packages required for bootstrapping
218 223 REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
219 224 MISSING_PACKAGES=""
@@ -1,7 +1,9
1 1 # Configuration file raspi3 Buster IFÉ 2017/11/01
2 2 #
3 APT_SERVER=ftp.fr.debian.org
4 APT_INCLUDES="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
3 APT_SERVER=debian.mirrors.ovh.net
4 APT_INCLUDES=""
5 APT_INCLUDES_LATE=""
6 APT_INCLUDES_LATE="gnupg,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
5 7 gettext,build-essential,git,cmake,libjson-c-dev,unzip,usbutils,\
6 8 bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,\
7 9 pkg-config,checkinstall,menulibre,libnotify-bin,pandoc,\
@@ -10,14 +12,17 python3-geopy,python3-pip,\
10 12 python,python-dev,python-pypandoc,python-scipy,python-tk,python-pandocfilters,\
11 13 python-geopy,python-pip,python-tk,pandoc,\
12 14 python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\
13 pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,\
14 pmount,ntpdate,ntp,\
15 pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,i2c-tools,python-smbus,policykit-1,\
16 pmount,ntpdate,ntp,rsync,\
15 17 texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration,\
16 icedtea-8-plugin,openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,libqtwebkit-dev,libqt5webkit5-dev,\
18 libqtwebkit-dev,libqt5webkit5-dev,\
17 19 libudev-dev,libzzip-dev,zlib1g-dev,libcanberra-gtk-module,libnss-myhostname,libfreetype6-dev,libpng16-16,\
18 nmap,libltdl-dev,dbus-user-session,debian-archive-keyring"
19 APT_INCLUDES_LATE="xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
20 tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr"
20 nmap,libltdl-dev,dbus-user-session,debian-archive-keyring,\
21 xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
22 tightvncserver,geany,geany-plugin-py,firefox-esr,firefox-esr-l10n-fr,jed"
23 #ca-certificates-java,icedtea-plugin,icedtea-netx,\
24 #openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,\
25 #openjdk-9-jdk,openjdk-9-jre,openjdk-9-jre-headless"
21 26 #----------------------
22 27 RPI_MODEL=3
23 28 RELEASE="buster"
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant