##// END OF EJS Templates
Changes to enable buster image generation...
vidal -
r152:ce65ef158122
parent child
Show More
@@ -0,0 +1,90
1 # Configuration file raspi3 Stretch IFÉ 2017/04/15
2 #
3 APT_SERVER=ftp.fr.debian.org
4 APT_INCLUDES="gnupg,gnupg2,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\
5 gettext,build-essential,git,cmake,libjson-c-dev,unzip,usbutils,\
6 bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,\
7 pkg-config,checkinstall,menulibre,libnotify-bin,python3,python3-dev,\
8 python,python-dev,python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\
9 python-tk,python3-tk,python3-scipy,pandoc,python-pypandoc,python3-pypandoc,\
10 python-pandocfilters,python3-pandocfilters,\
11 python-geopy,python3-geopy,python-pip,python3-pip,\
12 pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,\
13 pmount,ntpdate,\
14 texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration,\
15 icedtea-8-plugin,openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,libqtwebkit-dev,libqt5webkit5-dev,\
16 libudev-dev,libzzip-dev,zlib1g-dev,libcanberra-gtk-module,libnss-myhostname,libfreetype6-dev,libpng16-16,\
17 nmap,libltdl-dev,dbus-user-session,debian-archive-keyring,\
18 xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\
19 tightvncserver,geany,geany-plugin-py,geany-plugin-markdown,firefox-esr,firefox-esr-l10n-fr"
20 #----------------------
21 RPI_MODEL=3
22 RELEASE="buster"
23 HOSTNAME="raspife3"
24 PASSWORD="***********"
25 USER_PASSWORD="***********"
26 DEFLOCAL="fr_FR.UTF-8"
27 TIMEZONE="Europe/Paris"
28 EXPANDROOT=false
29 #-----------------------
30 XKB_MODEL="pc105"
31 XKB_LAYOUT="fr"
32 XKB_VARIANT="latin9"
33 XKB_OPTIONS=""
34 #------------------------
35 ENABLE_DHCP=true
36 #------------------------
37 ENABLE_CONSOLE=false
38 ENABLE_I2C=true
39 ENABLE_SPI=true
40 ENABLE_IPV6=true
41 ENABLE_SSHD=true
42 ENABLE_NONFREE=true
43 ENABLE_WIRELESS=true
44 ENABLE_RSYSLOG=true
45 ENABLE_SOUND=true
46 ENABLE_HWRANDOM=true
47 ENABLE_MINGPU=true
48 ENABLE_DBUS=true
49 ENABLE_XORG=true
50 ENABLE_WM="lxdm"
51 #------------------------
52 ENABLE_MINBASE=false
53 ENABLE_REDUCE=false
54 ENABLE_UBOOT=false
55 ENABLE_FBTURBO=true
56 ENABLE_IPTABLES=false
57 ENABLE_USER=true
58 USER_NAME=ens-ife
59 ENABLE_ROOT=true
60 ENABLE_HARDNET=true
61 ENABLE_INITRAMFS=true
62 ENABLE_IFNAMES=true
63 #------------------------
64 ENABLE_ROOT_SSH=false
65 SSH_LIMIT_USERS=false
66 SSH_ROOT_PUB_KEY="/home/*******/.ssh/authorized_keys"
67 SSH_USER_PUB_KEY="/home/*******/.ssh/authorized_keys"
68 #------------------------
69 BUILD_KERNEL=true
70 KERNEL_REDUCE=false
71 KERNEL_HEADERS=true
72 KERNEL_REMOVESRC=true
73 KERNELSRC_CLEAN=true
74 KERNELSRC_CONFIG=true
75 #------------------------
76 REDUCE_APT=false
77 REDUCE_DOC=true
78 REDUCE_MAN=false
79 REDUCE_HWDB=true
80 REDUCE_BASH=false
81 REDUCE_SSHD=false
82 REDUCE_LOCALE=false
83 #-------------------------
84 ENABLE_CRYPTFS=false
85 #-------------------------
86 BASEDIR=/data/RpiGenImage/Images/${RELEASE}
87 DATE=`date +%Y-%m-%d`
88 IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}
89
90
@@ -24,11 +24,17 if [ "$RELEASE" = "stretch" ] ; then
24 24 EXCLUDES="--exclude=init,systemd-sysv"
25 25 fi
26 26
27 # Exclude packages if required by Debian buster release
28 if [ "$RELEASE" = "buster" ] ; then
29 EXCLUDES="--exclude=init,systemd-sysv"
30 fi
31
27 32 # Base debootstrap (unpack only)
28 33 http_proxy=${APT_PROXY} debootstrap ${EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
29 34
30 # Copy qemu emulator binary to chroot
31 install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
35 # Copy qemu emulator binary to chroot modified for changes in _apt management in buster
36 #install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
37 install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
32 38
33 39 # Copy debian-archive-keyring.pgp
34 40 mkdir -p "${R}/usr/share/keyrings"
@@ -21,7 +21,8 if [ "$BUILD_KERNEL" = false ] ; then
21 21
22 22 # Upgrade collabora package index and install collabora keyring
23 23 chroot_exec apt-get -qq -y update
24 chroot_exec apt-get -qq -y --allow-unauthenticated install collabora-obs-archive-keyring
24 # Removed --allow-unauthenticated as suggested after modification on _apt privileges
25 chroot_exec apt-get -qq -y install collabora-obs-archive-keyring
25 26 else # BUILD_KERNEL=true
26 27 # Install APT sources.list
27 28 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
@@ -73,8 +73,8 else
73 73 CMDLINE="${CMDLINE} net.ifnames=1"
74 74 fi
75 75
76 # Set init to systemd if required by Debian release
77 if [ "$RELEASE" = "stretch" ] ; then
76 # Set init to systemd if required by Debian release stretch or buster
77 if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
78 78 CMDLINE="${CMDLINE} init=/bin/systemd"
79 79 fi
80 80
@@ -56,8 +56,8 fi
56 56 # Remove empty settings from network configuration
57 57 sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/eth.network"
58 58
59 # Move systemd network configuration if required by Debian release
60 if [ "$RELEASE" = "stretch" ] ; then
59 # Move systemd network configuration if required by Debian release stretch or buster
60 if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
61 61 mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
62 62 rm -fr "${ETC_DIR}/systemd/network"
63 63 fi
@@ -32,6 +32,9 if [ "$ENABLE_FBTURBO" = true ] ; then
32 32 chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
33 33 elif [ "$RELEASE" = "stretch" ] ; then
34 34 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
35 # removed --allow-unauthenticated as recommended after amendment on _apt privileges
36 elif [ "$RELEASE" = "buster" ] ; then
37 chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
35 38 fi
36 39
37 40 # Build and install fbturbo driver inside chroot
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant