| @@ -223,10 +223,6 REDUCE_LOCALE=${REDUCE_LOCALE:=true} | |||
|
|
223 | 223 | ENABLE_CRYPTFS=${ENABLE_CRYPTFS:=false} |
|
|
224 | 224 | CRYPTFS_PASSWORD=${CRYPTFS_PASSWORD:=""} |
|
|
225 | 225 | CRYPTFS_MAPPING=${CRYPTFS_MAPPING:="secure"} |
|
|
226 | <<<<<<< HEAD | |
|
|
227 | CRYPTFS_CIPHER=${CRYPTFS_CIPHER:="aes-xts-plain64:sha512"} | |
|
|
228 | ======= | |
|
|
229 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 | |
|
|
230 | 226 | CRYPTFS_CIPHER=${CRYPTFS_CIPHER:="aes-xts-plain64"} |
|
|
231 | 227 | CRYPTFS_HASH=${CRYPTFS_HASH:="sha512"} |
|
|
232 | 228 | CRYPTFS_XTSKEYSIZE=${CRYPTFS_XTSKEYSIZE:=512} |
| @@ -240,20 +236,14 CHROOT_SCRIPTS=${CHROOT_SCRIPTS:=""} | |||
|
|
240 | 236 | |
|
|
241 | 237 | # Packages required in the chroot build environment |
|
|
242 | 238 | APT_INCLUDES=${APT_INCLUDES:=""} |
|
|
243 | <<<<<<< HEAD | |
|
|
244 | APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" | |
|
|
245 | ======= | |
|
|
246 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 | |
|
|
239 | ||
|
|
247 | 240 | APT_INCLUDES="${APT_INCLUDES},flex,bison,libssl-dev,apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd" |
|
|
248 | 241 | |
|
|
249 | 242 | # Packages to exclude from chroot build environment |
|
|
250 | 243 | APT_EXCLUDES=${APT_EXCLUDES:=""} |
|
|
251 | 244 | |
|
|
252 | 245 | # Packages required for bootstrapping |
|
|
253 | <<<<<<< HEAD | |
|
|
254 | REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo" | |
|
|
255 | ======= | |
|
|
256 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 | |
|
|
246 | ||
|
|
257 | 247 | REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus bison flex libssl-dev sudo" |
|
|
258 | 248 | MISSING_PACKAGES="" |
|
|
259 | 249 | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
